[Libreoffice-commits] .: 2 commits - sd/source

[Tor Lillqvist]

 sd/source/filter/eppt/pptexanimations.cxx |    6 +++++-
 sd/source/filter/eppt/pptx-epptooxml.cxx  |    6 +++++-
 sd/source/filter/ppt/pptin.cxx            |    2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

New commits:
commit 2f432afdf6335d2e0a777cf89ceebe99550328d8
Author: Tor Lillqvist <tml at iki.fi>
Date:   Fri Mar 2 12:16:45 2012 +0200

    WaE: equality comparison with extraneous parentheses

diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 1f8fd68..2d18836 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -740,7 +740,7 @@ sal_Bool ImplSdPPTImport::Import()
                     ((SdPage*)pNotesClone)->SetLayoutName( aLayoutName );
                 }
             }
-            else if ( ( pPersist->bStarDrawFiller == sal_False ) )
+            else if ( pPersist->bStarDrawFiller == sal_False )
             {
                 PptSlidePersistEntry* pE = pPersist;
                 while( ( pE->aSlideAtom.nFlags & 4 ) && pE->aSlideAtom.nMasterId )
commit 51e3df40bc757b46636a3d74681a597fe35063ba
Author: Tor Lillqvist <tml at iki.fi>
Date:   Fri Mar 2 12:15:35 2012 +0200

    WaE: indexes past the end of an array

diff --git a/sd/source/filter/eppt/pptexanimations.cxx b/sd/source/filter/eppt/pptexanimations.cxx
index 9705c38..1e65805 100644
--- a/sd/source/filter/eppt/pptexanimations.cxx
+++ b/sd/source/filter/eppt/pptexanimations.cxx
@@ -964,7 +964,11 @@ sal_Int16 AnimationExporter::exportAnimPropertySet( SvStream& rStrm, const Refer
 
     // storing user data into pAny, to allow direct access later
     const Sequence< NamedValue > aUserData = xNode->getUserData();
-    const ::com::sun::star::uno::Any* pAny[ DFF_ANIM_PROPERTY_ID_COUNT ];
+
+    // ids start from 1, DFF_ANIM_PROPERTY_ID_COUNT is the highest id
+    // number
+    const ::com::sun::star::uno::Any* pAny[ DFF_ANIM_PROPERTY_ID_COUNT + 1 ];
+
     GetUserData( aUserData, pAny, sizeof( pAny ) );
 
     if( pAny[ DFF_ANIM_AFTEREFFECT ] )
diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx
index 4811289..1c11a69 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -986,7 +986,11 @@ void PowerPointExport::WriteAnimationNodeCommonPropsStart( FSHelperPtr pFS, cons
     }
 
     const Sequence< NamedValue > aUserData = rXNode->getUserData();
-    const Any* pAny[ DFF_ANIM_PROPERTY_ID_COUNT ];
+
+    // ids start from 1, DFF_ANIM_PROPERTY_ID_COUNT is the highest id
+    // number
+    const Any* pAny[ DFF_ANIM_PROPERTY_ID_COUNT + 1];
+
     AnimationExporter::GetUserData( aUserData, pAny, sizeof( pAny ) );
 
     sal_Int16 nType = 0;