summaryrefslogtreecommitdiff
path: root/xmloff
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2007-01-22 10:50:43 +0000
committerOliver Bolte <obo@openoffice.org>2007-01-22 10:50:43 +0000
commit6f4300c6c51f12449d6c811963efe26ae35dc262 (patch)
tree6669c6e80bd4d0ada80d2655378372f4808eb28f /xmloff
parentcc9756501ed480ec721a674ed2cb0f501e577385 (diff)
INTEGRATION: CWS swqbf92 (1.124.34); FILE MERGED
2007/01/12 14:16:12 od 1.124.34.1: #i73361# method <XMLTextImportHelper::SetStyleAndAttrs(..)> - don't care about automatic paragraph style on finding candidates for the assignment of paragraph styles to a certain outline list level
Diffstat (limited to 'xmloff')
-rw-r--r--xmloff/source/text/txtimp.cxx17
1 files changed, 10 insertions, 7 deletions
diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index 8da65159dbbd..562d31b3d122 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: txtimp.cxx,v $
*
- * $Revision: 1.124 $
+ * $Revision: 1.125 $
*
- * last change: $Author: ihi $ $Date: 2006-11-15 12:40:52 $
+ * last change: $Author: obo $ $Date: 2007-01-22 11:50:43 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -1272,11 +1272,14 @@ OUString XMLTextImportHelper::SetStyleAndAttrs(
{
bOutlineStyleCandidate = false;
}
- else if ( pStyle && /* automatic paragraph style */
- pStyle->IsListStyleSet() )
- {
- bOutlineStyleCandidate = false;
- }
+ // --> OD 2007-01-11 #i73361#
+ // The automatic paragraph style doesn't have to be considered.
+// else if ( pStyle && /* automatic paragraph style */
+// pStyle->IsListStyleSet() )
+// {
+// bOutlineStyleCandidate = false;
+// }
+ // <--
else
{
bOutlineStyleCandidate = true;