diff options
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/drawingml/textbodypropertiescontext.cxx | 2 | ||||
| -rw-r--r-- | oox/source/ole/olehelper.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/oox/source/drawingml/textbodypropertiescontext.cxx b/oox/source/drawingml/textbodypropertiescontext.cxx index bf2feb132e0a..8b1c6db6a791 100644 --- a/oox/source/drawingml/textbodypropertiescontext.cxx +++ b/oox/source/drawingml/textbodypropertiescontext.cxx @@ -66,7 +66,7 @@ TextBodyPropertiesContext::TextBodyPropertiesContext( ContextHandler2Helper cons // ST_Coordinate OUString sValue; sal_Int32 aIns[] = { XML_lIns, XML_tIns, XML_rIns, XML_bIns }; - for( sal_Int32 i = 0; i < sal_Int32(SAL_N_ELEMENTS( aIns )); i++) + for( sal_Int32 i = 0; i < sal_Int32(std::size( aIns )); i++) { sValue = rAttribs.getStringDefaulted( aIns[i] ); if( !sValue.isEmpty() ) diff --git a/oox/source/ole/olehelper.cxx b/oox/source/ole/olehelper.cxx index f3f73b52f5ed..d953cf17f9da 100644 --- a/oox/source/ole/olehelper.cxx +++ b/oox/source/ole/olehelper.cxx @@ -172,7 +172,7 @@ classIdToGUIDCNamePairMap::classIdToGUIDCNamePairMap() { AX_GUID_SCROLLBAR, "ScrollBar"}, } }; - int const length = SAL_N_ELEMENTS( initialCntrlData ); + int const length = std::size( initialCntrlData ); IdCntrlData const * pData = initialCntrlData; for ( int index = 0; index < length; ++index, ++pData ) mnIdToGUIDCNamePairMap[ pData->nId ] = pData->aData; |