- fixed: do not export redlines in block mode

2 files changed, 19 insertions, 14 deletions

diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index e47c3f5a6b4b..f83025028bc2 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: txtparae.cxx,v $
  *
- *  $Revision: 1.48 $
+ *  $Revision: 1.49 $
  *
- *  last change: $Author: dvo $ $Date: 2001-01-19 19:19:50 $
+ *  last change: $Author: dvo $ $Date: 2001-01-25 11:33:41 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -751,7 +751,7 @@ XMLTextParagraphExport::XMLTextParagraphExport(
     pFieldExport = new XMLTextFieldExport( rExp );
     pSectionExport = new XMLSectionExport( rExp, *this );
     pIndexMarkExport = new XMLIndexMarkExport( rExp, *this );
-    pRedlineExport = new XMLRedlineExport( rExp );
+    pRedlineExport = IsBlockMode() ? NULL : new XMLRedlineExport( rExp );
 }
 
 XMLTextParagraphExport::~XMLTextParagraphExport()
@@ -1056,12 +1056,12 @@ void XMLTextParagraphExport::exportTextContentEnumeration(
                                         bAutoStyles );
 
             // export start + end redlines (for wholly redlined tables)
-            if (! bAutoStyles)
+            if ((! bAutoStyles) && (NULL != pRedlineExport))
                 pRedlineExport->ExportStartOrEndRedline(xTxtCntnt, sal_True);
 
             exportTable( xTxtCntnt, bAutoStyles, bProgress  );
 
-            if (! bAutoStyles)
+            if ((! bAutoStyles) && (NULL != pRedlineExport))
                 pRedlineExport->ExportStartOrEndRedline(xTxtCntnt, sal_False);
 
             bHasContent = sal_True;
@@ -1292,7 +1292,8 @@ void XMLTextParagraphExport::exportTextRangeEnumeration(
             }
             else if (sType.equals(sRedline))
             {
-                pRedlineExport->ExportChange(xPropSet, bAutoStyles);
+                if (NULL != pRedlineExport)
+                    pRedlineExport->ExportChange(xPropSet, bAutoStyles);
             }
             else
                 DBG_ERROR("unknown text portion type");
@@ -2298,7 +2299,8 @@ void XMLTextParagraphExport::exportTextDeclarations()
 
 void XMLTextParagraphExport::exportTrackedChanges(sal_Bool bAutoStyles)
 {
-    pRedlineExport->ExportChangesList( bAutoStyles );
+    if (NULL != pRedlineExport)
+        pRedlineExport->ExportChangesList( bAutoStyles );
 }
 
 void XMLTextParagraphExport::exportTextAutoStyles()
diff --git a/xmloff/source/text/txtsecte.cxx b/xmloff/source/text/txtsecte.cxx
index 845e38038852..9cd3fcb75cf4 100644
--- a/xmloff/source/text/txtsecte.cxx
+++ b/xmloff/source/text/txtsecte.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: txtsecte.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: dvo $ $Date: 2001-01-19 19:19:50 $
+ *  last change: $Author: dvo $ $Date: 2001-01-25 11:33:41 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -285,16 +285,18 @@ void XMLTextParagraphExport::exportListAndSectionChange(
                 while ((aOldForward != aOldStack.end()) &&
                        (*aOldForward != *aOld))
                 {
-                    pRedlineExport->ExportStartOrEndRedline(*aOldForward,
-                                                            sal_False);
+                    if (NULL != pRedlineExport)
+                        pRedlineExport->ExportStartOrEndRedline(*aOldForward,
+                                                                sal_False);
                     pSectionExport->ExportSectionEnd(*aOldForward,
                                                      bAutoStyles);
                     aOldForward++;
                 }
                 if (aOldForward != aOldStack.end())
                 {
-                    pRedlineExport->ExportStartOrEndRedline(*aOldForward,
-                                                            sal_False);
+                    if (NULL != pRedlineExport)
+                        pRedlineExport->ExportStartOrEndRedline(*aOldForward,
+                                                                sal_False);
                     pSectionExport->ExportSectionEnd(*aOldForward,
                                                      bAutoStyles);
                 }
@@ -304,7 +306,8 @@ void XMLTextParagraphExport::exportListAndSectionChange(
             // (order: oldest to newest)
             while (aNew != aNewStack.rend())
             {
-                pRedlineExport->ExportStartOrEndRedline(*aNew, sal_True);
+                if (NULL != pRedlineExport)
+                    pRedlineExport->ExportStartOrEndRedline(*aNew, sal_True);
                 pSectionExport->ExportSectionStart(*aNew, bAutoStyles);
                 aNew++;
             }