diff options
author | Matteo Casalin <matteo.casalin@yahoo.com> | 2013-12-08 16:21:14 +0100 |
---|---|---|
committer | Matteo Casalin <matteo.casalin@yahoo.com> | 2013-12-15 09:26:33 +0100 |
commit | afe6738b717f89a14be62fcf4645ec4d53642edd (patch) | |
tree | c3f13953ee37a47b61fde2bf41ae464260c33334 /filter/source | |
parent | 4ba63be415a959a6b8891c5a7924e527f93c6afd (diff) |
Fix static linkage and use SAL_N_ELEMENTS
Change-Id: Iced21e010b3c06a5f36731f63d41ab55a5c8a2e4
Diffstat (limited to 'filter/source')
-rw-r--r-- | filter/source/msfilter/util.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/filter/source/msfilter/util.cxx b/filter/source/msfilter/util.cxx index 614c3aca715f..bf5648d508cb 100644 --- a/filter/source/msfilter/util.cxx +++ b/filter/source/msfilter/util.cxx @@ -1088,10 +1088,10 @@ static const CustomShapeTypeTranslationTable pCustomShapeTypeTranslationTable[] { "ooxml-ribbon", "ribbon" }, }; -struct { +static struct { const char* sDML; MSO_SPT nVML; -} pDMLToVMLTable[] = { +} const pDMLToVMLTable[] = { {"notPrimitive", mso_sptNotPrimitive}, {"rectangle", mso_sptRectangle}, {"roundRectangle", mso_sptRoundRectangle}, @@ -1307,7 +1307,7 @@ const char* GetOOXMLPresetGeometry( const char* sShapeType ) if( pCustomShapeTypeTranslationHashMap == NULL ) { pCustomShapeTypeTranslationHashMap = new CustomShapeTypeTranslationHashMap (); - for( unsigned int i = 0; i < sizeof( pCustomShapeTypeTranslationTable )/sizeof( CustomShapeTypeTranslationTable ); i ++ ) + for( unsigned int i = 0; i < SAL_N_ELEMENTS(pCustomShapeTypeTranslationTable); ++i ) { (*pCustomShapeTypeTranslationHashMap)[ pCustomShapeTypeTranslationTable[ i ].sOOo ] = pCustomShapeTypeTranslationTable[ i ].sMSO; } |