summaryrefslogtreecommitdiff
path: root/xmloff
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2005-04-18 14:03:28 +0000
committerOliver Bolte <obo@openoffice.org>2005-04-18 14:03:28 +0000
commit4d7879bcad4603541537b0ef77e54dc5f913461a (patch)
tree50da6e725e45f531a887129898756d81e5c372de /xmloff
parent6de9404c01c4382bcac4a7530535ec156d3f03aa (diff)
INTEGRATION: CWS fr8fix1 (1.115.14); FILE MERGED
2005/04/08 15:33:41 dvo 1.115.14.1: #121136# do not use outline numbering for outlines in lists
Diffstat (limited to 'xmloff')
-rw-r--r--xmloff/source/text/txtimp.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index 81a1065a4251..7a4653525a33 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: txtimp.cxx,v $
*
- * $Revision: 1.115 $
+ * $Revision: 1.116 $
*
- * last change: $Author: vg $ $Date: 2005-03-23 12:41:50 $
+ * last change: $Author: obo $ $Date: 2005-04-18 15:03:28 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -1202,7 +1202,7 @@ OUString XMLTextImportHelper::SetStyleAndAttrs(
}
// outline level; set after list style has been set
- if( bPara && nOutlineLevel != -1 )
+ if( bPara && nOutlineLevel != -1 && ! IsInList() )
{
// find list style name
OUString sListStyle;