summaryrefslogtreecommitdiff
path: root/xmloff
diff options
context:
space:
mode:
authorOliver Düsterhoff <od@openoffice.org>2009-12-11 10:56:15 +0000
committerOliver Düsterhoff <od@openoffice.org>2009-12-11 10:56:15 +0000
commit857eddc807fb510fafe93f230dc68ade85727a77 (patch)
tree6783ce64e22c078fcd15591f3130eab649773b00 /xmloff
parent12c7dc97e4470d70a9df30429c3dc51343682c07 (diff)
#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.
Diffstat (limited to 'xmloff')
-rw-r--r--xmloff/source/text/txtimp.cxx10
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 ) );
+ }
}
// <--
}