diff options
| author | Armin Le Grand <alg@apache.org> | 2012-07-18 11:43:35 +0000 |
|---|---|---|
| committer | Armin Le Grand <alg@apache.org> | 2012-07-18 11:43:35 +0000 |
| commit | 876efd1552d36cfc69e20c840cf4419320bfc854 (patch) | |
| tree | ff7765d7091d09f68547452b1a74a24fc0bec123 /sd | |
| parent | 68cf4bfa2770a8a8d6b78221bb9f1b699219b833 (diff) | |
sd, sfx2, writerfilter, xmloff: fix some warnings
Patch by: Michael Stahl
Notes
Notes:
prefer: 89f08dce89adfddd3fb8e00b7a7a9c5da2a4943e
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/core/sdpage.cxx | 6 | ||||
| -rw-r--r-- | sd/source/filter/ppt/pptanimations.hxx | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index 24aa884c4f1d..e53a4367b582 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -1401,7 +1401,7 @@ void findAutoLayoutShapesImpl( SdPage& rPage, const LayoutDescriptor& rDescripto bool bMissing = false; // for each entry in the layoutdescriptor, arrange a presentation shape - for( i = 0; (i < PRESOBJ_MAX) && (rDescriptor.meKind[i] != PRESOBJ_NONE); i++ ) + for (i = 0; (i < MAX_PRESOBJS) && (rDescriptor.meKind[i] != PRESOBJ_NONE); i++) { PresObjKind eKind = rDescriptor.meKind[i]; SdrObject* pObj = 0; @@ -1423,7 +1423,7 @@ void findAutoLayoutShapesImpl( SdPage& rPage, const LayoutDescriptor& rDescripto if( bMissing && bInit ) { // for each entry in the layoutdescriptor, look for an alternative shape - for( i = 0; (i < PRESOBJ_MAX) && (rDescriptor.meKind[i] != PRESOBJ_NONE); i++ ) + for (i = 0; (i < MAX_PRESOBJS) && (rDescriptor.meKind[i] != PRESOBJ_NONE); i++) { if( rShapes[i] ) continue; @@ -1583,7 +1583,7 @@ void SdPage::SetAutoLayout(AutoLayout eLayout, sal_Bool bInit, sal_Bool bCreate int i; // for each entry in the layoutdescriptor, arrange a presentation shape - for( i = 0; (i < PRESOBJ_MAX) && (aDescriptor.meKind[i] != PRESOBJ_NONE); i++ ) + for (i = 0; (i < MAX_PRESOBJS) && (aDescriptor.meKind[i] != PRESOBJ_NONE); i++) { PresObjKind eKind = aDescriptor.meKind[i]; SdrObject* pObj = InsertAutoLayoutShape( aLayoutShapes[i], eKind, aDescriptor.mbVertical[i], aRectangle[i], bInit ); diff --git a/sd/source/filter/ppt/pptanimations.hxx b/sd/source/filter/ppt/pptanimations.hxx index 0de836e9ced1..533eab24610d 100644 --- a/sd/source/filter/ppt/pptanimations.hxx +++ b/sd/source/filter/ppt/pptanimations.hxx @@ -118,7 +118,7 @@ namespace ppt #define DFF_ANIM_GROUP_ID 19 #define DFF_ANIM_NODE_TYPE 20 #define DFF_ANIM_VOLUME 22 -#define DFF_ANIM_PROPERTY_ID_COUNT DFF_ANIM_VOLUME +#define DFF_ANIM_PROPERTY_ID_COUNT (DFF_ANIM_VOLUME + 1) |