odfmetadata4: #i109600#: refactor insertion of TOX:

SwDoc::InsertTableOf(): do not create a SwTOXBaseSection.
SwNodes::InsertTextSection(): take SwTOXBase parameter.
SwSectionNode ctor: if SwTOXBase is given, create SwTOXBaseSection.
remove gross hack SwSectionNode::SetNewSection().
SwUnodo{Ins,Del}Section: adapt to store SwSection/SwTOXBase.

1 files changed, 13 insertions, 11 deletions

diff --git a/sw/inc/ndarr.hxx b/sw/inc/ndarr.hxx
index 787edb8f0ae6..df629c188dd5 100644
--- a/sw/inc/ndarr.hxx
+++ b/sw/inc/ndarr.hxx
@@ -25,19 +25,19 @@
  *
  ************************************************************************/
 
-#ifndef _NDARR_HXX
-#define _NDARR_HXX
+#ifndef SW_NDARR_HXX
+#define SW_NDARR_HXX
+
+#include <vector>
 
 #include <com/sun/star/embed/XEmbeddedObject.hpp>
+
 #include <svl/svarray.hxx>
+#include <svtools/embedhlp.hxx>
 
-#ifndef _BPARR_HXX
 #include <bparr.hxx>
-#endif
 #include <ndtyp.hxx>
 
-#include <svtools/embedhlp.hxx>
-#include <vector>
 
 class Graphic;
 class GraphicObject;
@@ -57,6 +57,7 @@ class SwOutlineNodes;
 class SwPaM;
 class SwSection;
 class SwSectionFmt;
+class SwTOXBase;
 class SwSectionNode;
 class SwStartNode;
 class SwTableBoxFmt;
@@ -310,12 +311,13 @@ public:
                     USHORT nMode = 0, SwHistory* pHistory = 0 );
 
         // fuege eine neue SwSection ein
-    SwSectionNode* InsertSection( const SwNodeIndex& rNdIdx,
+    SwSectionNode* InsertTextSection(SwNodeIndex const& rNdIdx,
                                 SwSectionFmt& rSectionFmt,
-                                const SwSection&,
-                                const SwNodeIndex* pEnde,
-                                BOOL bInsAtStart = TRUE,
-                                BOOL bCreateFrms = TRUE );
+                                SwSection const&,
+                                SwTOXBase const*const pTOXBase,
+                                SwNodeIndex const*const pEnde,
+                                bool const bInsAtStart = true,
+                                bool const bCreateFrms = true);
 
         // in welchem Doc steht das Nodes-Array ?
             SwDoc* GetDoc()         { return pMyDoc; }