mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

coverity#704291 Logically dead code

Browse Source 
Change-Id: Icfdb7178ea89f2a3bd9680cf1b2c017b5058bb83
This commit is contained in:
Caolán McNamara
2014-03-31 11:02:12 +01:00
parent 4df99bdc5b
commit 3daa47e87a
1 changed files with 25 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
sd/source/filter/ppt/pptinanimations.cxx
View File

@@ -2165,7 +2165,7 @@ void AnimationImporter::importCommandContainer( const Atom* pAtom, const Referen
DBG_ASSERT( pAtom && pAtom->getType() == DFF_msofbtAnimCommand && xCommand.is(), "invalid call to ppt::AnimationImporter::importCommandContainer()!"); DBG_ASSERT( pAtom && pAtom->getType() == DFF_msofbtAnimCommand && xCommand.is(), "invalid call to ppt::AnimationImporter::importCommandContainer()!");
if( pAtom && xCommand.is() ) if( pAtom && xCommand.is() )
{ {
sal_Int32 nBits = 0, nType = 0; sal_Int32 nBits = 0;
Any aValue; Any aValue;
const Atom* pChildAtom = pAtom->findFirstChildAtom(); const Atom* pChildAtom = pAtom->findFirstChildAtom();
@@ -2230,47 +2230,33 @@ void AnimationImporter::importCommandContainer( const Atom* pAtom, const Referen
NamedValue aParamValue; NamedValue aParamValue;
switch( nType ) if ( aParam == "onstopaudio" )
{ {
case 0: // event nCommand = EffectCommands::STOPAUDIO;
case 1: // call }
if ( aParam == "onstopaudio" ) else if ( aParam == "play" )
{
nCommand = EffectCommands::PLAY;
}
else if( aParam.startsWith( "playFrom" ) )
{
const OUString aMediaTime( aParam.copy( 9, aParam.getLength() - 10 ) );
rtl_math_ConversionStatus eStatus;
double fMediaTime = ::rtl::math::stringToDouble( aMediaTime, (sal_Unicode)('.'), (sal_Unicode)(','), &eStatus, NULL );
if( eStatus == rtl_math_ConversionStatus_Ok )
{ {
nCommand = EffectCommands::STOPAUDIO; aParamValue.Name = "MediaTime";
aParamValue.Value <<= fMediaTime;
} }
else if ( aParam == "play" ) nCommand = EffectCommands::PLAY;
{ }
nCommand = EffectCommands::PLAY; else if ( aParam == "togglePause" )
} {
else if( aParam.startsWith( "playFrom" ) ) nCommand = EffectCommands::TOGGLEPAUSE;
{ }
const OUString aMediaTime( aParam.copy( 9, aParam.getLength() - 10 ) ); else if ( aParam == "stop" )
rtl_math_ConversionStatus eStatus; {
double fMediaTime = ::rtl::math::stringToDouble( aMediaTime, (sal_Unicode)('.'), (sal_Unicode)(','), &eStatus, NULL ); nCommand = EffectCommands::STOP;
if( eStatus == rtl_math_ConversionStatus_Ok )
{
aParamValue.Name = "MediaTime";
aParamValue.Value <<= fMediaTime;
}
nCommand = EffectCommands::PLAY;
}
else if ( aParam == "togglePause" )
{
nCommand = EffectCommands::TOGGLEPAUSE;
}
else if ( aParam == "stop" )
{
nCommand = EffectCommands::STOP;
}
break;
case 2: // verb
{
aParamValue.Name = "Verb";
aParamValue.Value <<= aParam.toInt32();
nCommand = EffectCommands::VERB;
}
break;
} }
xCommand->setCommand( nCommand ); xCommand->setCommand( nCommand );