diff options
| author | Michael Stahl <mst@openoffice.org> | 2010-12-17 11:01:27 +0100 |
|---|---|---|
| committer | Michael Stahl <mst@openoffice.org> | 2010-12-17 11:01:27 +0100 |
| commit | eb7c307f5b21801a27bff7fa4a664871fcb0cabd (patch) | |
| tree | e56f33e90a99031741c03b53bb67e9ac83cd0038 /xmloff/source/style/xmlnume.cxx | |
| parent | 82bf0438815153bfc8ae2c40d01142179fbdb09b (diff) | |
sw34bf03: #i116149#: ODF: do not export prefix/suffix on image list styles
Diffstat (limited to 'xmloff/source/style/xmlnume.cxx')
| -rw-r--r-- | xmloff/source/style/xmlnume.cxx | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/xmloff/source/style/xmlnume.cxx b/xmloff/source/style/xmlnume.cxx index 5bc581c7af0b..99d92120e238 100644 --- a/xmloff/source/style/xmlnume.cxx +++ b/xmloff/source/style/xmlnume.cxx @@ -298,15 +298,25 @@ void SvxXMLNumRuleExport::exportLevelStyle( INT32 nLevel, sTmp.append( nLevel + 1 ); GetExport().AddAttribute( XML_NAMESPACE_TEXT, XML_LEVEL, sTmp.makeStringAndClear() ); // #i110694#: no style-name on list-level-style-image - if ((sTextStyleName.getLength() > 0) && (NumberingType::BITMAP != eType)) + // #i116149#: neither prefix/suffix + if (NumberingType::BITMAP != eType) { - GetExport().AddAttribute( XML_NAMESPACE_TEXT, XML_STYLE_NAME, - GetExport().EncodeStyleName( sTextStyleName ) ); + if (sTextStyleName.getLength() > 0) + { + GetExport().AddAttribute( XML_NAMESPACE_TEXT, XML_STYLE_NAME, + GetExport().EncodeStyleName( sTextStyleName ) ); + } + if (sPrefix.getLength() > 0) + { + GetExport().AddAttribute( XML_NAMESPACE_STYLE, XML_NUM_PREFIX, + sPrefix ); + } + if (sSuffix.getLength() > 0) + { + GetExport().AddAttribute( XML_NAMESPACE_STYLE, XML_NUM_SUFFIX, + sSuffix ); + } } - if( sPrefix.getLength() > 0 ) - GetExport().AddAttribute( XML_NAMESPACE_STYLE, XML_NUM_PREFIX, sPrefix ); - if( sSuffix.getLength() > 0 ) - GetExport().AddAttribute( XML_NAMESPACE_STYLE, XML_NUM_SUFFIX, sSuffix ); enum XMLTokenEnum eElem = XML_LIST_LEVEL_STYLE_NUMBER; if( NumberingType::CHAR_SPECIAL == eType ) |