diff options
Diffstat (limited to 'xmloff/source/text/txtstyli.cxx')
| -rw-r--r-- | xmloff/source/text/txtstyli.cxx | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/xmloff/source/text/txtstyli.cxx b/xmloff/source/text/txtstyli.cxx index db30837502b4..b80c23131f6d 100644 --- a/xmloff/source/text/txtstyli.cxx +++ b/xmloff/source/text/txtstyli.cxx @@ -355,23 +355,23 @@ void XMLTextStyleContext::Finish( bool bOverwrite ) } } - if (m_bHasMasterPageName) + if (!m_bHasMasterPageName) + return; + + OUString sDisplayName( + GetImport().GetStyleDisplayName( + XmlStyleFamily::MASTER_PAGE, m_sMasterPageName)); + // The families container must exist + const Reference < XNameContainer >& rPageStyles = + GetImport().GetTextImport()->GetPageStyles(); + + OUString const sPageDescName("PageDescName"); + if( ( sDisplayName.isEmpty() || + (rPageStyles.is() && + rPageStyles->hasByName( sDisplayName )) ) && + xPropSetInfo->hasPropertyByName( sPageDescName ) ) { - OUString sDisplayName( - GetImport().GetStyleDisplayName( - XmlStyleFamily::MASTER_PAGE, m_sMasterPageName)); - // The families container must exist - const Reference < XNameContainer >& rPageStyles = - GetImport().GetTextImport()->GetPageStyles(); - - OUString const sPageDescName("PageDescName"); - if( ( sDisplayName.isEmpty() || - (rPageStyles.is() && - rPageStyles->hasByName( sDisplayName )) ) && - xPropSetInfo->hasPropertyByName( sPageDescName ) ) - { - xPropSet->setPropertyValue( sPageDescName, Any(sDisplayName) ); - } + xPropSet->setPropertyValue( sPageDescName, Any(sDisplayName) ); } } |