diff options
Diffstat (limited to 'writerfilter/source')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 5 | ||||
| -rw-r--r-- | writerfilter/source/dmapper/StyleSheetTable.cxx | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 653d6ef762af..bfa18c4175f3 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -2167,7 +2167,7 @@ style::NumberingType:: CHARS_CYRILLIC_LOWER_LETTER_N_SR*/ }; - for( sal_uInt32 nNum = 0; nNum < sizeof(aNumberingPairs)/sizeof( NumberingPairs ); ++nNum) + for( sal_uInt32 nNum = 0; nNum < SAL_N_ELEMENTS(aNumberingPairs); ++nNum) { if( /*sCommand*/sNumber.equalsAscii(aNumberingPairs[nNum].cWordName )) { @@ -3098,8 +3098,7 @@ void DomainMapper_Impl::handleAuthor //search for a field mapping OUString sFieldServiceName; sal_uInt16 nMap = 0; - for( ; nMap < sizeof(aDocProperties) / sizeof(DocPropertyMap); - ++nMap ) + for( ; nMap < SAL_N_ELEMENTS(aDocProperties); ++nMap ) { if ((rFirstParam.equalsAscii(aDocProperties[nMap].pDocPropertyName)) && (!xPropertySetInfo->hasPropertyByName(rFirstParam))) { diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx index 14ae7fdbf92f..8519e176eebf 100644 --- a/writerfilter/source/dmapper/StyleSheetTable.cxx +++ b/writerfilter/source/dmapper/StyleSheetTable.cxx @@ -187,7 +187,7 @@ void lcl_mergeProps( PropertyMapPtr pToFill, PropertyMapPtr pToAdd, TblStyleTyp ( nStyleId == TBL_STYLE_FIRSTCOL ) }; - for ( unsigned i = 0 ; i != sizeof(pPropsToCheck) / sizeof(PropertyIds); i++ ) + for ( unsigned i = 0 ; i != SAL_N_ELEMENTS(pPropsToCheck); i++ ) { PropertyIds nId = pPropsToCheck[i]; boost::optional<PropertyMap::Property> pProp = pToAdd->getProperty(nId); @@ -232,7 +232,7 @@ PropertyMapPtr TableStyleSheetEntry::GetLocalPropertiesFromMask( sal_Int32 nMask // Get the properties applying according to the mask PropertyMapPtr pProps( new PropertyMap( ) ); - for (size_t i = 0; i < sizeof(aOrderedStyleTable)/sizeof(aOrderedStyleTable[0]); ++i) + for (size_t i = 0; i < SAL_N_ELEMENTS(aOrderedStyleTable); ++i) { TblStylePrs::iterator pIt = m_aStyles.find( aOrderedStyleTable[ i ].type ); if ( ( nMask & aOrderedStyleTable[ i ].mask ) && ( pIt != m_aStyles.end( ) ) ) @@ -1429,7 +1429,7 @@ OUString StyleSheetTable::ConvertStyleName( const OUString& rWWName, bool bExten } if(m_pImpl->m_aStyleNameMap.empty()) { - for( sal_uInt32 nPair = 0; nPair < sizeof(aStyleNamePairs) / sizeof( sal_Char*) / 2; ++nPair) + for( sal_uInt32 nPair = 0; nPair < SAL_N_ELEMENTS(aStyleNamePairs)/2; ++nPair) { OUString aFrom = OUString::createFromAscii(aStyleNamePairs[2 * nPair]); OUString aTo = OUString::createFromAscii(aStyleNamePairs[2 * nPair + 1]); |