slideshow/source/engine/attributemap.cxx | 2 +- slideshow/source/engine/shapes/shapeimporter.cxx | 4 ++-- slideshow/source/engine/transitions/transitionfactorytab.cxx | 7 +++---- 3 files changed, 6 insertions(+), 7 deletions(-)
New commits: commit 9c59cd15b150638c845bbc275b9b04460afc23bd Author: Thorsten Behrens <tbehr...@suse.com> Date: Mon Jan 9 18:56:42 2012 +0100 Use SAL_N_ELEMENTS in slideshow where possible. diff --git a/slideshow/source/engine/attributemap.cxx b/slideshow/source/engine/attributemap.cxx index beb403a..006a830 100644 --- a/slideshow/source/engine/attributemap.cxx +++ b/slideshow/source/engine/attributemap.cxx @@ -79,7 +79,7 @@ namespace slideshow }; static AnimateAttributeMap aMap( lcl_attributeMap, - sizeof(lcl_attributeMap)/sizeof(*lcl_attributeMap), + SAL_N_ELEMENTS(lcl_attributeMap), false ); AttributeType eAttributeType = ATTRIBUTE_INVALID; diff --git a/slideshow/source/engine/shapes/shapeimporter.cxx b/slideshow/source/engine/shapes/shapeimporter.cxx index 8294643..f9df63b 100644 --- a/slideshow/source/engine/shapes/shapeimporter.cxx +++ b/slideshow/source/engine/shapes/shapeimporter.cxx @@ -311,7 +311,7 @@ ShapeSharedPtr ShapeImporter::createShape( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.sfx2.PluginObject" )), aPropertyValues, - sizeof(aPropertyValues)/sizeof(*aPropertyValues), + SAL_N_ELEMENTS(aPropertyValues), mrContext ); } else if( shapeType.equalsAsciiL( @@ -334,7 +334,7 @@ ShapeSharedPtr ShapeImporter::createShape( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.sfx2.AppletObject" )), aPropertyValues, - sizeof(aPropertyValues)/sizeof(*aPropertyValues), + SAL_N_ELEMENTS(aPropertyValues), mrContext ); } else if( shapeType.equalsAsciiL( diff --git a/slideshow/source/engine/transitions/transitionfactorytab.cxx b/slideshow/source/engine/transitions/transitionfactorytab.cxx index 2ceed34..f5cea7b 100644 --- a/slideshow/source/engine/transitions/transitionfactorytab.cxx +++ b/slideshow/source/engine/transitions/transitionfactorytab.cxx @@ -2120,9 +2120,8 @@ static const TransitionInfo lcl_transitionInfo[] = const TransitionInfo* TransitionFactory::getTransitionInfo( sal_Int16 nTransitionType, sal_Int16 nTransitionSubType ) { - static const ::std::size_t lcl_tableSize( - sizeof(lcl_transitionInfo)/sizeof(TransitionInfo) ); - static const TransitionInfo* pTableEnd = lcl_transitionInfo+lcl_tableSize; + static const TransitionInfo* pTableEnd = lcl_transitionInfo+ + SAL_N_ELEMENTS(lcl_transitionInfo); const TransitionInfo* pRes = ::std::find_if( lcl_transitionInfo, pTableEnd, @@ -2137,7 +2136,7 @@ const TransitionInfo* TransitionFactory::getTransitionInfo( const TransitionInfo* TransitionFactory::getRandomTransitionInfo() { return lcl_transitionInfo + getRandomOrdinal( - sizeof(lcl_transitionInfo) / sizeof(TransitionInfo) + SAL_N_ELEMENTS(lcl_transitionInfo) - 1 /* exclude random transition at end of table */ ); } _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits