Skip to content

C
core
Kaydet (Commit) 615a2470 authored tarafından Julien Nabet's avatar Julien Nabet
Dosyalara gözat
Seçenekler

Some cppcheck cleaning

üst 510d9030
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 5 deletions
sd/source/filter/eppt/eppt.cxx
Dosyayı görüntüle @ 615a2470
...@@ -237,10 +237,11 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_ ...@@ -237,10 +237,11 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_
aAny >>= aAs; aAny >>= aAs;
nSpeed = (sal_uInt8)aAs; nSpeed = (sal_uInt8)aAs;
} }
sal_Int16 nTT = 0, nTST = 0; sal_Int16 nTT = 0;
if ( GetPropertyValue( aAny, mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "TransitionType" ) ) ) if ( GetPropertyValue( aAny, mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "TransitionType" ) ) )
&& ( aAny >>= nTT ) ) && ( aAny >>= nTT ) )
{ {
sal_Int16 nTST = 0;
if ( GetPropertyValue( aAny, mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "TransitionSubtype" ) ) ) if ( GetPropertyValue( aAny, mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "TransitionSubtype" ) ) )
&& ( aAny >>= nTST ) ) && ( aAny >>= nTST ) )
nTransitionType = GetTransition( nTT, nTST, eFe, nDirection ); nTransitionType = GetTransition( nTT, nTST, eFe, nDirection );
......
sd/source/filter/eppt/epptso.cxx
Dosyayı görüntüle @ 615a2470
...@@ -135,7 +135,6 @@ PPTExBulletProvider::~PPTExBulletProvider() ...@@ -135,7 +135,6 @@ PPTExBulletProvider::~PPTExBulletProvider()
sal_uInt16 PPTExBulletProvider::GetId( const ByteString& rUniqueId, Size& rGraphicSize ) sal_uInt16 PPTExBulletProvider::GetId( const ByteString& rUniqueId, Size& rGraphicSize )
{ {
sal_uInt16 nRetValue = 0xffff; sal_uInt16 nRetValue = 0xffff;
sal_uInt32 nId = 0;
if ( rUniqueId.Len() ) if ( rUniqueId.Len() )
{ {
...@@ -169,8 +168,7 @@ sal_uInt16 PPTExBulletProvider::GetId( const ByteString& rUniqueId, Size& rGraph ...@@ -169,8 +168,7 @@ sal_uInt16 PPTExBulletProvider::GetId( const ByteString& rUniqueId, Size& rGraph
aGraphicObject = GraphicObject( aMappedGraphic ); aGraphicObject = GraphicObject( aMappedGraphic );
} }
} }
sal_uInt32 nId = pGraphicProv->GetBlibID( aBuExPictureStream, aGraphicObject.GetUniqueID(), aRect, NULL, NULL );
nId = pGraphicProv->GetBlibID( aBuExPictureStream, aGraphicObject.GetUniqueID(), aRect, NULL, NULL );
if ( nId && ( nId < 0x10000 ) ) if ( nId && ( nId < 0x10000 ) )
nRetValue = (sal_uInt16)nId - 1; nRetValue = (sal_uInt16)nId - 1;
...@@ -3248,7 +3246,6 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a ...@@ -3248,7 +3246,6 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
{ {
continue; continue;
} }
sal_Int32 nPlacementID = -1;
sal_Bool bClientData = ( bEffect || ( eCa != ::com::sun::star::presentation::ClickAction_NONE ) || sal_Bool bClientData = ( bEffect || ( eCa != ::com::sun::star::presentation::ClickAction_NONE ) ||
nPlaceHolderAtom || nOlePictureId ); nPlaceHolderAtom || nOlePictureId );
...@@ -3256,6 +3253,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a ...@@ -3256,6 +3253,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
{ {
if ( nPlaceHolderAtom ) if ( nPlaceHolderAtom )
{ {
sal_Int32 nPlacementID = -1;
if ( ( mnTextStyle == EPP_TEXTSTYLE_TITLE ) || ( mnTextStyle == EPP_TEXTSTYLE_BODY ) ) if ( ( mnTextStyle == EPP_TEXTSTYLE_TITLE ) || ( mnTextStyle == EPP_TEXTSTYLE_BODY ) )
nPlacementID = nIndices++; nPlacementID = nIndices++;
else else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment