diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-10-13 11:16:05 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-10-13 11:16:05 +0000 |
| commit | 0d4ac6a10fb1df182abddd09d5e095cf48ba107d (patch) | |
| tree | e8d0cfcb83d9e2681726f50ba6affbf80a61561c /xmloff/source/style/xmlnume.cxx | |
| parent | bbbf1abd1965b3c5a20415206837372edff54f5c (diff) | |
INTEGRATION: CWS swqbf87 (1.26.24); FILE MERGED
2006/10/05 09:54:22 od 1.26.24.2: RESYNC: (1.26-1.27); FILE MERGED
2006/09/28 14:10:41 od 1.26.24.1: #i69627# method <SvxXMLNumRuleExport::exportOutline()>
- consider <SvXMLExport::writeOutlineStyleAsNormalListStyle()>
on writing the outline style
Diffstat (limited to 'xmloff/source/style/xmlnume.cxx')
| -rw-r--r-- | xmloff/source/style/xmlnume.cxx | 28 |
1 files changed, 23 insertions, 5 deletions
diff --git a/xmloff/source/style/xmlnume.cxx b/xmloff/source/style/xmlnume.cxx index f86cf4a0e549..d0c817d1ebf1 100644 --- a/xmloff/source/style/xmlnume.cxx +++ b/xmloff/source/style/xmlnume.cxx @@ -4,9 +4,9 @@ * * $RCSfile: xmlnume.cxx,v $ * - * $Revision: 1.27 $ + * $Revision: 1.28 $ * - * last change: $Author: obo $ $Date: 2006-09-17 10:59:17 $ + * last change: $Author: obo $ $Date: 2006-10-13 12:16:05 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -741,9 +741,27 @@ void SvxXMLNumRuleExport::exportOutline() if( xNumRule.is() ) { - SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_TEXT, - XML_OUTLINE_STYLE, sal_True, sal_True ); - exportLevelStyles( xNumRule, sal_True ); + // --> OD 2006-09-27 #i69627# + if ( GetExport().writeOutlineStyleAsNormalListStyle() ) + { + OUString sOutlineStyleName; + { + Reference<XPropertySet> xNumRulePropSet( + xCNSupplier->getChapterNumberingRules(), UNO_QUERY ); + if (xNumRulePropSet.is()) + { + OUString sName( RTL_CONSTASCII_USTRINGPARAM("Name") ); + xNumRulePropSet->getPropertyValue( sName ) >>= sOutlineStyleName; + } + } + exportNumberingRule( sOutlineStyleName, xNumRule ); + } + else + { + SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_TEXT, + XML_OUTLINE_STYLE, sal_True, sal_True ); + exportLevelStyles( xNumRule, sal_True ); + } } } } |