diff options
Diffstat (limited to 'writerfilter/source/dmapper/PropertyMap.cxx')
| -rw-r--r-- | writerfilter/source/dmapper/PropertyMap.cxx | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx index 5f8d9a906ba3..c1980623b072 100644 --- a/writerfilter/source/dmapper/PropertyMap.cxx +++ b/writerfilter/source/dmapper/PropertyMap.cxx @@ -331,23 +331,23 @@ void PropertyMap::dumpXml() const void PropertyMap::InsertProps( const PropertyMapPtr& rMap, const bool bOverwrite ) { - if ( rMap ) + if ( !rMap ) + return; + + for ( const auto& rPropPair : rMap->m_vMap ) { - for ( const auto& rPropPair : rMap->m_vMap ) + if ( bOverwrite || !m_vMap.count(rPropPair.first) ) { - if ( bOverwrite || !m_vMap.count(rPropPair.first) ) - { - if ( !bOverwrite && !rPropPair.second.getIsDocDefault() ) - m_vMap.insert(std::make_pair(rPropPair.first, PropValue(rPropPair.second.getValue(), rPropPair.second.getGrabBagType(), true))); - else - m_vMap[rPropPair.first] = rPropPair.second; - } + if ( !bOverwrite && !rPropPair.second.getIsDocDefault() ) + m_vMap.insert(std::make_pair(rPropPair.first, PropValue(rPropPair.second.getValue(), rPropPair.second.getGrabBagType(), true))); + else + m_vMap[rPropPair.first] = rPropPair.second; } + } - insertTableProperties( rMap.get(), bOverwrite ); + insertTableProperties( rMap.get(), bOverwrite ); - Invalidate(); - } + Invalidate(); } void PropertyMap::insertTableProperties( const PropertyMap*, const bool ) @@ -892,22 +892,22 @@ void SectionPropertyMap::CopyHeaderFooter( const uno::Reference< beans::XPropert xPrevStyle->getPropertyValue( sFooterIsShared ) >>= bFooterIsShared; } - if ( bHasPrevFooter ) + if ( !bHasPrevFooter ) + return; + + uno::Reference< beans::XMultiPropertySet > xMultiSet( xStyle, uno::UNO_QUERY_THROW ); + uno::Sequence<OUString> aProperties { sFooterIsOn, sFooterIsShared }; + uno::Sequence<uno::Any> aValues { uno::makeAny( true ), uno::makeAny( bFooterIsShared ) }; + xMultiSet->setPropertyValues( aProperties, aValues ); + if ( !bOmitRightFooter ) { - uno::Reference< beans::XMultiPropertySet > xMultiSet( xStyle, uno::UNO_QUERY_THROW ); - uno::Sequence<OUString> aProperties { sFooterIsOn, sFooterIsShared }; - uno::Sequence<uno::Any> aValues { uno::makeAny( true ), uno::makeAny( bFooterIsShared ) }; - xMultiSet->setPropertyValues( aProperties, aValues ); - if ( !bOmitRightFooter ) - { - CopyHeaderFooterTextProperty( xPrevStyle, xStyle, - PROP_FOOTER_TEXT ); - } - if ( !bFooterIsShared && !bOmitLeftFooter ) - { - CopyHeaderFooterTextProperty( xPrevStyle, xStyle, - PROP_FOOTER_TEXT_LEFT ); - } + CopyHeaderFooterTextProperty( xPrevStyle, xStyle, + PROP_FOOTER_TEXT ); + } + if ( !bFooterIsShared && !bOmitLeftFooter ) + { + CopyHeaderFooterTextProperty( xPrevStyle, xStyle, + PROP_FOOTER_TEXT_LEFT ); } } |