summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--xmloff/source/text/txtparae.cxx13
-rw-r--r--xmloff/source/text/txtparai.cxx7
2 files changed, 9 insertions, 11 deletions
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index d1c874f6fc94..46e176124081 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: txtparae.cxx,v $
*
- * $Revision: 1.21 $
+ * $Revision: 1.22 $
*
- * last change: $Author: mib $ $Date: 2000-11-16 13:23:56 $
+ * last change: $Author: dvo $ $Date: 2000-11-16 16:37:44 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -893,8 +893,12 @@ void XMLTextParagraphExport::exportTextContentEnumeration(
if( !bAutoStyles )
{
aNextNumInfo.Reset();
- exportListChange( aPrevNumInfo, aNextNumInfo );
}
+
+ exportListAndSectionChange( xCurrentTextSection, xTxtCntnt,
+ aPrevNumInfo, aNextNumInfo,
+ bAutoStyles );
+
exportTable( xTxtCntnt, bAutoStyles );
bHasContent = sal_True;
}
@@ -1090,7 +1094,6 @@ void XMLTextParagraphExport::exportTextRangeEnumeration(
sBookmark,
lcl_XmlBookmarkElements,
bAutoStyles);
- bPrevCharIsSpace = sal_False;
}
else if (sType.equals(sReferenceMark))
{
@@ -1098,13 +1101,11 @@ void XMLTextParagraphExport::exportTextRangeEnumeration(
sReferenceMark,
lcl_XmlReferenceElements,
bAutoStyles);
- bPrevCharIsSpace = sal_False;
}
else if (sType.equals(sDocumentIndexMark))
{
exportIndexMark(xPropSet,
bAutoStyles);
- bPrevCharIsSpace = sal_False;
}
else
DBG_ERROR("unknown text portion type");
diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx
index d98f8c65d225..501a44000f31 100644
--- a/xmloff/source/text/txtparai.cxx
+++ b/xmloff/source/text/txtparai.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: txtparai.cxx,v $
*
- * $Revision: 1.9 $
+ * $Revision: 1.10 $
*
- * last change: $Author: mib $ $Date: 2000-11-15 14:01:55 $
+ * last change: $Author: dvo $ $Date: 2000-11-16 16:37:44 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -987,7 +987,6 @@ SvXMLImportContext *XMLImpSpanContext_Impl::CreateChildContext(
break;
case XML_TOK_TEXT_REFERENCE:
- rIgnoreLeadingSpace = sal_False;
case XML_TOK_TEXT_BOOKMARK:
case XML_TOK_TEXT_BOOKMARK_START:
case XML_TOK_TEXT_BOOKMARK_END:
@@ -1000,14 +999,12 @@ SvXMLImportContext *XMLImpSpanContext_Impl::CreateChildContext(
pContext = new XMLStartReferenceContext_Impl( rImport,
nPrefix, rLocalName,
rHints, xAttrList );
- rIgnoreLeadingSpace = sal_False;
break;
case XML_TOK_TEXT_REFERENCE_END:
pContext = new XMLEndReferenceContext_Impl( rImport,
nPrefix, rLocalName,
rHints, xAttrList );
- rIgnoreLeadingSpace = sal_False;
break;
case XML_TOK_TEXT_TEXTBOX: