Merge remote-tracking branch 'origin/master' into frameworks

This commit is contained in:
Montel Laurent 2015-08-16 10:52:13 +02:00
commit 2f95249a58

View file

@ -4001,10 +4001,8 @@ void Document::processAction( const Action * action )
d->m_scripter = new Scripter( d );
d->m_scripter->execute( linkrendition->scriptType(), linkrendition->script() );
}
else
{
emit processRenditionAction( static_cast< const RenditionAction * >( action ) );
}
emit processRenditionAction( static_cast< const RenditionAction * >( action ) );
} break;
}
}