[Libreoffice-commits] .: sd/source

[Julien Nabet]

 sd/source/filter/eppt/eppt.cxx   |    3 ++-
 sd/source/filter/eppt/epptso.cxx |    6 ++----
 2 files changed, 4 insertions(+), 5 deletions(-)

New commits:
commit 16a4fe9ce18d3f519569a8397fcb544a63ff7878
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sat Jan 29 17:42:20 2011 +0100

    Some cppcheck cleaning

diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx
index 97ef460..0a44080 100644
--- a/sd/source/filter/eppt/eppt.cxx
+++ b/sd/source/filter/eppt/eppt.cxx
@@ -237,10 +237,11 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_
             aAny >>= aAs;
             nSpeed = (sal_uInt8)aAs;
         }
-        sal_Int16 nTT = 0, nTST = 0;
+        sal_Int16 nTT = 0;
         if ( GetPropertyValue( aAny, mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "TransitionType" ) ) )
             && ( aAny >>= nTT ) )
         {
+            sal_Int16 nTST = 0;
             if ( GetPropertyValue( aAny, mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "TransitionSubtype" ) ) )
                 && ( aAny >>= nTST ) )
                 nTransitionType = GetTransition( nTT, nTST, eFe, nDirection );
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index 4733296..874cc84 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -135,7 +135,6 @@ PPTExBulletProvider::~PPTExBulletProvider()
 sal_uInt16 PPTExBulletProvider::GetId( const ByteString& rUniqueId, Size& rGraphicSize )
 {
     sal_uInt16 nRetValue = 0xffff;
-    sal_uInt32 nId = 0;
 
     if ( rUniqueId.Len() )
     {
@@ -169,8 +168,7 @@ sal_uInt16 PPTExBulletProvider::GetId( const ByteString& rUniqueId, Size& rGraph
                 aGraphicObject = GraphicObject( aMappedGraphic );
             }
         }
-
-        nId = pGraphicProv->GetBlibID( aBuExPictureStream, aGraphicObject.GetUniqueID(), aRect, NULL, NULL );
+        sal_uInt32 nId = pGraphicProv->GetBlibID( aBuExPictureStream, aGraphicObject.GetUniqueID(), aRect, NULL, NULL );
 
         if ( nId && ( nId < 0x10000 ) )
             nRetValue = (sal_uInt16)nId - 1;
@@ -3248,7 +3246,6 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
             {
                 continue;
             }
-            sal_Int32 nPlacementID = -1;
 
             sal_Bool bClientData = ( bEffect || ( eCa != ::com::sun::star::presentation::ClickAction_NONE ) ||
                                         nPlaceHolderAtom || nOlePictureId );
@@ -3256,6 +3253,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
             {
                 if ( nPlaceHolderAtom )
                 {
+                    sal_Int32 nPlacementID = -1;
                     if ( ( mnTextStyle == EPP_TEXTSTYLE_TITLE ) || ( mnTextStyle == EPP_TEXTSTYLE_BODY ) )
                         nPlacementID = nIndices++;
                     else