diff options
| author | Oliver Bolte <obo@openoffice.org> | 2009-12-14 12:45:03 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2009-12-14 12:45:03 +0000 |
| commit | 97463bc311d99f3a70431e7858ec8be43b0c21b2 (patch) | |
| tree | bea85aab9cb28815d6c00b4e23a42d114e8d5602 | |
| parent | 9b579030e34e57c9a66369cac7be44fd60454733 (diff) | |
CWS-TOOLING: integrate CWS sw32bf09
2009-12-11 11:56:15 +0100 od r277785 : #i107610# method <XMLTextImportHelper::SetOutlineStyles(..)>
- correction of fix for issue 106218 to assure that paragraph style which
are already applied to the outline style stay assigned.
| -rw-r--r-- | xmloff/source/text/txtimp.cxx | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx index 5e59f12ee6..b26953b3df 100644 --- a/xmloff/source/text/txtimp.cxx +++ b/xmloff/source/text/txtimp.cxx @@ -1661,8 +1661,14 @@ void XMLTextImportHelper::SetOutlineStyles( sal_Bool bSetEmptyLevels ) pProps->Name = sHeadingStyleName; for ( sal_Int32 i = 0; i < nCount; ++i ) { - pProps->Value <<= sChosenStyles[i]; - xChapterNumbering->replaceByIndex( i, makeAny( aProps ) ); + // --> OD 2009-12-11 #i107610# + if ( bSetEmptyLevels || + sChosenStyles[i].getLength() > 0 ) + // <-- + { + pProps->Value <<= sChosenStyles[i]; + xChapterNumbering->replaceByIndex( i, makeAny( aProps ) ); + } } // <-- } |