diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2012-10-13 12:28:24 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2012-10-13 12:31:13 +0200 |
| commit | 2a777a1014365c3cdf5902fcfd67e9bb77baedd1 (patch) | |
| tree | 8e876cc68cd06b9b87c144269a722c5892bfdbf1 /writerfilter/source/dmapper/DomainMapperTableHandler.cxx | |
| parent | 681e894b1ffa536ea3ccb5071465fbd1b0e34cc3 (diff) | |
writerfilter: fix new clang warnings
Change-Id: I0f7cec0f300290fe3ea465f344cfda642824ed0b
Diffstat (limited to 'writerfilter/source/dmapper/DomainMapperTableHandler.cxx')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapperTableHandler.cxx | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx index f8786c9ed32e..e6d63f5d69e1 100644 --- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx +++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx @@ -545,19 +545,19 @@ CellPropertyValuesSeq_t DomainMapperTableHandler::endTableGetCellProperties(Tabl if ( rInfo.pTableDefaults->size( ) ) pAllCellProps->insert( rInfo.pTableDefaults ); - // Fill the cell properties with the ones of the style - sal_Int32 nCellStyleMask = 0; - const PropertyMap::iterator aCnfStyleIter = + // Fill the cell properties with the ones of the style + sal_Int32 nCellStyleMask = 0; + const PropertyMap::iterator aCnfStyleIter = aCellIterator->get()->find( PropertyDefinition( PROP_CNF_STYLE, false ) ); - if ( aCnfStyleIter != aCellIterator->get( )->end( ) ) - { - if ( rInfo.pTableStyle ) { - OUString sMask; - aCnfStyleIter->second >>= sMask; - nCellStyleMask = sMask.toInt32( 2 ); - } - aCellIterator->get( )->erase( aCnfStyleIter ); + if ( aCnfStyleIter != aCellIterator->get( )->end( ) ) + { + if ( rInfo.pTableStyle ) { + OUString sMask; + aCnfStyleIter->second >>= sMask; + nCellStyleMask = sMask.toInt32( 2 ); } + aCellIterator->get( )->erase( aCnfStyleIter ); + } if ( rInfo.pTableStyle ) { |