Assert: No formatting during xml export

3 files changed, 31 insertions, 8 deletions

diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index de6d8efb19b2..9444781a3b96 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: doc.hxx,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: jp $ $Date: 2000-11-28 20:33:09 $
+ *  last change: $Author: ama $ $Date: 2000-12-06 12:26:05 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -410,7 +410,9 @@ class SwDoc
     sal_Bool    bInsOnlyTxtGlssry : 1;  // True: insert 'only text' glossary into doc
     sal_Bool    bContains_MSVBasic : 1; // True: MS-VBasic exist is in our storage
     sal_Bool    bPurgeOLE : 1;          // TRUE: Purge OLE-Objects
-
+#ifndef PRODUCT
+    sal_Bool    bXMLExport : 1;         // TRUE: during XML export
+#endif
     // -------------------------------------------------------------------
     // static - Members
     static SvStringsDtor    *pTextNmArray,          // Array fuer alle
@@ -576,7 +578,10 @@ public:
 
     sal_Bool IsPurgeOLE() const             { return bPurgeOLE; }
     void SetPurgeOLE( sal_Bool bFlag )      { bPurgeOLE = bFlag; }
-
+#ifndef PRODUCT
+    sal_Bool InXMLExport() const            { return bXMLExport; }
+    void SetXMLExport( sal_Bool bFlag )     { bXMLExport = bFlag; }
+#endif
         // das Dokument im Browse-Modus anzeigen
     void SetBrowseMode( sal_Bool bFlag = sal_True )     { bBrowseMode = bFlag; }
     sal_Bool IsBrowseMode() const                       { return bBrowseMode; }
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index 24d86275dfa5..6f28781d8165 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: docnew.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: jp $ $Date: 2000-10-13 08:32:17 $
+ *  last change: $Author: ama $ $Date: 2000-12-06 12:24:14 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -321,6 +321,9 @@ SwDoc::SwDoc() :
     bIsRedlineMove =
     bInsOnlyTxtGlssry =
     bContains_MSVBasic =
+#ifndef PRODUCT
+    bXMLExport =
+#endif
                                 FALSE;
 
     bGroupUndo =
diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx
index 9c4f539154d5..dab5f7d59f14 100644
--- a/sw/source/core/layout/calcmove.cxx
+++ b/sw/source/core/layout/calcmove.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: calcmove.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-19 00:08:21 $
+ *  last change: $Author: ama $ $Date: 2000-12-06 12:27:40 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -926,6 +926,21 @@ void SwCntntFrm::MakeAll()
     LockJoin();
     PROTOCOL_ENTER( this, PROT_MAKEALL, 0, 0 )
 
+#ifndef PRODUCT
+    SwDoc *pDoc = GetAttrSet()->GetDoc();
+    if( pDoc )
+    {
+        static sal_Bool bWarn = sal_False;
+        if( pDoc->InXMLExport() )
+        {
+            ASSERT( bWarn, "Formatting during XML-export!" );
+            bWarn = sal_True;
+        }
+        else
+            bWarn = sal_False;
+    }
+#endif
+
     //uebernimmt im DTor die Benachrichtigung
     SwCntntNotify *pNotify = new SwCntntNotify( this );