diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-02-05 09:49:54 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-02-05 09:49:54 +0000 |
| commit | 383de766d2c7e27b800bd01a29269c5183ec3d7f (patch) | |
| tree | e292a91016fe82f3eef5f3a2096aacc61f7056cb /xmloff | |
| parent | d873fc8f38be60f00bfeab3c1bb88fb1c49b59f3 (diff) | |
INTEGRATION: CWS swqbf95_SRC680 (1.124.30.1.2); FILE MERGED
2007/01/29 12:28:33 od 1.124.30.1.2.1: #i73973# method <lcl_HasListStyle(..)>
- apply special case, that found list style equals the chapter
numbering, also to the found list styles of the parent styles.
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/text/txtimp.cxx | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx index 562d31b3d122..285deb3c678e 100644 --- a/xmloff/source/text/txtimp.cxx +++ b/xmloff/source/text/txtimp.cxx @@ -4,9 +4,9 @@ * * $RCSfile: txtimp.cxx,v $ * - * $Revision: 1.125 $ + * $Revision: 1.126 $ * - * last change: $Author: obo $ $Date: 2007-01-22 11:50:43 $ + * last change: $Author: vg $ $Date: 2007-02-05 10:49:54 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1380,6 +1380,9 @@ void XMLTextImportHelper::AddOutlineStyleCandidate( const sal_Int8 nOutlineLevel // --> OD 2006-10-12 #i69629# // helper method to determine, if a paragraph style has a list style (inclusive // an empty one) inherits a list style (inclusive an empty one) from one of its parents +// --> OD 2007-01-29 #i73973# +// apply special case, that found list style equals the chapter numbering, also +// to the found list styles of the parent styles. sal_Bool lcl_HasListStyle( OUString sStyleName, const Reference < XNameContainer >& xParaStyles, SvXMLImport& rImport, @@ -1451,6 +1454,19 @@ sal_Bool lcl_HasListStyle( OUString sStyleName, { // list style found bRet = sal_True; + // --> OD 2007-01-29 #i73973# + // special case: the found list style equals the chapter numbering + Reference< XPropertySet > xPropSet( xPropState, UNO_QUERY ); + if ( xPropSet.is() ) + { + OUString sListStyle; + xPropSet->getPropertyValue( sNumberingStyleName ) >>= sListStyle; + if ( sListStyle == sOutlineStyleName ) + { + bRet = sal_False; + } + } + // <-- break; } else |