#89892# paragraphs in text frames shouldn't assume the list level of the surrounding

(anchor) paragraphs

2 files changed, 36 insertions, 5 deletions

diff --git a/xmloff/source/text/XMLTextFrameContext.cxx b/xmloff/source/text/XMLTextFrameContext.cxx
index 6eedeacf45a7..c1c87cbcbd11 100644
--- a/xmloff/source/text/XMLTextFrameContext.cxx
+++ b/xmloff/source/text/XMLTextFrameContext.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XMLTextFrameContext.cxx,v $
  *
- *  $Revision: 1.46 $
+ *  $Revision: 1.47 $
  *
- *  last change: $Author: dvo $ $Date: 2001-06-29 21:07:22 $
+ *  last change: $Author: dvo $ $Date: 2001-07-25 13:29:47 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -139,10 +139,20 @@
 #include "XMLImageMapContext.hxx"
 #endif
 
-#ifndef _XMLTEXTLISTBLOCKCONTEXT_HXX
+#ifndef _XMLTEXTFRAMECONTEXT_HXX
 #include "XMLTextFrameContext.hxx"
 #endif
 
+#ifndef _XMLOFF_XMLTEXTLISTBLOCKCONTEXT_HXX
+#include "XMLTextListBlockContext.hxx"
+#endif
+
+#ifndef _XMLOFF_XMLTEXTLISTITEMCONTEXT_HXX
+#include "XMLTextListItemContext.hxx"
+#endif
+
+
+
 
 using namespace ::rtl;
 using namespace ::com::sun::star;
@@ -628,6 +638,13 @@ void XMLTextFrameContext::Create( sal_Bool bHRefOrBase64 )
         Reference < XText > xTxt = xTxtFrame->getText();
         xOldTextCursor = xTxtImport->GetCursor();
         xTxtImport->SetCursor( xTxt->createTextCursor() );
+
+        // remember old list item and block (#89892#) and reset them
+        // for the text frame
+        xListBlock = xTxtImport->GetListBlock();
+        xListItem = xTxtImport->GetListItem();
+        xTxtImport->SetListBlock( NULL );
+        xTxtImport->SetListItem( NULL );
     }
 
 }
@@ -910,6 +927,16 @@ void XMLTextFrameContext::EndElement()
         GetImport().GetTextImport()->DeleteParagraph();
         GetImport().GetTextImport()->SetCursor( xOldTextCursor );
     }
+
+    // reinstall old list item (if necessary) #89892#
+    if ( xListBlock.Is() )
+    {
+        GetImport().GetTextImport()->SetListBlock(
+            (XMLTextListBlockContext*)&xListBlock );
+        GetImport().GetTextImport()->SetListItem(
+            (XMLTextListItemContext*)&xListItem );
+    }
+
     if (( nType == XML_TEXT_FRAME_APPLET || nType == XML_TEXT_FRAME_PLUGIN ) && xPropSet.is())
         GetImport().GetTextImport()->endAppletOrPlugin( xPropSet, aParamMap);
 }
diff --git a/xmloff/source/text/XMLTextFrameContext.hxx b/xmloff/source/text/XMLTextFrameContext.hxx
index 6d1cbd325918..a8b528dd58d2 100644
--- a/xmloff/source/text/XMLTextFrameContext.hxx
+++ b/xmloff/source/text/XMLTextFrameContext.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XMLTextFrameContext.hxx,v $
  *
- *  $Revision: 1.14 $
+ *  $Revision: 1.15 $
  *
- *  last change: $Author: mib $ $Date: 2001-06-28 13:18:56 $
+ *  last change: $Author: dvo $ $Date: 2001-07-25 13:29:47 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -114,6 +114,10 @@ class XMLTextFrameContext : public SvXMLImportContext
     ::com::sun::star::uno::Reference <
         ::com::sun::star::io::XOutputStream > xBase64Stream;
 
+    /// old list item and block (#89891#)
+    SvXMLImportContextRef xListBlock;
+    SvXMLImportContextRef xListItem;
+
     const ::rtl::OUString sWidth;
     const ::rtl::OUString sRelativeWidth;
     const ::rtl::OUString sHeight;