CWS swlayoutrefactoring: #i81480#: enable sw code to use multiple layouts

10 files changed, 13 insertions, 14 deletions

diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx
index 7edd84270886..90646581da81 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -57,6 +57,7 @@
 #include <editeng/spltitem.hxx>
 #include <editeng/orphitem.hxx>
 #include <svx/xoutbmp.hxx>
+#include <svx/svdobj.hxx>
 #include <editeng/langitem.hxx>
 #include <editeng/frmdiritem.hxx>
 #include <svtools/htmlout.hxx>
@@ -86,8 +87,6 @@
 #include <txtftn.hxx>
 #include <fmtftn.hxx>
 // FOOTNOTES
-#include <dcontact.hxx>
-
 #include "doc.hxx"
 #include "swerror.h"
 #include "charatr.hxx"
diff --git a/sw/source/filter/html/htmlforw.cxx b/sw/source/filter/html/htmlforw.cxx
index 85c4e9846857..7ca40f104809 100644
--- a/sw/source/filter/html/htmlforw.cxx
+++ b/sw/source/filter/html/htmlforw.cxx
@@ -67,12 +67,11 @@
 #include "pam.hxx"
 #include "doc.hxx"
 #include "ndtxt.hxx"
-#include "dcontact.hxx"
 #include "flypos.hxx"
 #include "wrthtml.hxx"
 #include "htmlfly.hxx"
 #include "htmlform.hxx"
-
+#include "frmfmt.hxx"
 
 using namespace ::com::sun::star;
 using ::rtl::OUString;
diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx
index df9f43fafa41..89f959ecd911 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -5129,7 +5129,7 @@ void _TblSaveStruct::MakeTable( sal_uInt16 nWidth, SwPosition& rPos, SwDoc *pDoc
     SwTableNode *pTblNd = pTCntxt->GetTableNode();
     ASSERT( pTblNd, "Wo ist der Tabellen-Node" );
 
-    if( pDoc->GetRootFrm() && pTblNd )
+    if( pDoc->GetCurrentViewShell() && pTblNd ) //swmod 071108//swmod 071225
     {
         // Existiert schon ein Layout, dann muss an dieser Tabelle die
         // BoxFrames neu erzeugt werden.
diff --git a/sw/source/filter/rtf/rtfatr.cxx b/sw/source/filter/rtf/rtfatr.cxx
index 7dcb732df601..0482612ba07f 100644
--- a/sw/source/filter/rtf/rtfatr.cxx
+++ b/sw/source/filter/rtf/rtfatr.cxx
@@ -1941,7 +1941,7 @@ Writer& OutRTF_SwTblNode(Writer& rWrt, const SwTableNode & rNode)
         const SwTableLine* pLine = pBoxArr[ 0 ]->GetBox()->GetUpper();
         // Zeilenhoehe ausgeben
         long nHeight = 0;
-        if( bFixRowHeight && rWrt.pDoc->GetRootFrm() )
+        if( bFixRowHeight && rWrt.pDoc->GetCurrentViewShell() ) //swmod 071108//swmod 071225
         {
             nHeight = -pRow->GetPos();      //neg. => abs. height!
             if( nLine )
diff --git a/sw/source/filter/rtf/swparrtf.cxx b/sw/source/filter/rtf/swparrtf.cxx
index 5a5e7a65e0a7..95f84fece986 100644
--- a/sw/source/filter/rtf/swparrtf.cxx
+++ b/sw/source/filter/rtf/swparrtf.cxx
@@ -1061,7 +1061,7 @@ SwTableNode * InsertedTableClient::GetTableNode()
 }
 
 InsertedTablesManager::InsertedTablesManager(const SwDoc &rDoc)
-    : mbHasRoot(rDoc.GetRootFrm())
+    : mbHasRoot(rDoc.GetCurrentLayout())    //swmod 080218
 {
 }
 
diff --git a/sw/source/filter/ww1/fltshell.cxx b/sw/source/filter/ww1/fltshell.cxx
index 2cf1ca325a5b..27295e9e7bce 100644
--- a/sw/source/filter/ww1/fltshell.cxx
+++ b/sw/source/filter/ww1/fltshell.cxx
@@ -430,7 +430,7 @@ void SwFltControlStack::SetAttrInDoc(const SwPosition& rTmpPos, SwFltStackEntry*
                 pFmt->SetFmtAttr(aAnchor);
                 // Damit die Frames bei Einfuegen in existierendes Doc
                 //  erzeugt werden (erst nach Setzen des Ankers!):
-                if(pDoc->GetRootFrm()
+                if(pDoc->GetCurrentViewShell()  //swmod 071108//swmod 071225
                    && (FLY_AT_PARA == pFmt->GetAnchor().GetAnchorId()))
                 {
                     pFmt->MakeFrms();
@@ -1606,7 +1606,7 @@ void SwFltOutDoc::EndTable()
     rStack.SetAttr( *pPaM->GetPoint(), 0, FALSE );
     rEndStack.SetAttr( *pPaM->GetPoint(), 0, FALSE );
 
-    if (GetDoc().GetRootFrm()){
+    if (GetDoc().GetCurrentViewShell()){    //swmod 071108//swmod 071225
         SwTableNode* pTableNode = GetDoc().IsIdxInTbl(
             pPaM->GetPoint()->nNode);
         pTableNode->DelFrms();
diff --git a/sw/source/filter/ww8/ww8graf2.cxx b/sw/source/filter/ww8/ww8graf2.cxx
index 7bfa32992f9c..cf9c73ecf4b1 100644
--- a/sw/source/filter/ww8/ww8graf2.cxx
+++ b/sw/source/filter/ww8/ww8graf2.cxx
@@ -42,7 +42,6 @@
 #include <sfx2/app.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/fcontnr.hxx>
-#include <dcontact.hxx>
 #include <grfatr.hxx>           // class SwCropGrf
 #include <fmtflcnt.hxx>
 #include <fmtanchr.hxx>
@@ -409,7 +408,7 @@ SwFlyFrmFmt* SwWW8ImplReader::MakeGrafNotInCntnt(const WW8PicDesc& rPD,
         &aFlySet, &rGrfSet, NULL);
 
     // Damit die Frames bei Einfuegen in existierendes Doc erzeugt werden:
-    if (rDoc.GetRootFrm() &&
+    if (rDoc.GetCurrentViewShell() &&   //swmod 071108//swmod 071225
         (FLY_AT_PARA == pFlyFmt->GetAnchor().GetAnchorId()))
     {
         pFlyFmt->MakeFrms();
diff --git a/sw/source/filter/xml/wrtxml.cxx b/sw/source/filter/xml/wrtxml.cxx
index 4107657e8554..2cd4acaa3f5a 100644
--- a/sw/source/filter/xml/wrtxml.cxx
+++ b/sw/source/filter/xml/wrtxml.cxx
@@ -469,7 +469,7 @@ pGraphicHelper = SvXMLGraphicHelper::Create( xStg,
         }
     }
 
-    if( pDoc->GetRootFrm() && pDoc->GetDocStat().nPage > 1 &&
+    if( pDoc->GetCurrentViewShell() && pDoc->GetDocStat().nPage > 1 &&  //swmod 071108//swmod 071225
         !(bOrganizerMode || bBlock || bErr) )
     {
 //          DBG_ASSERT( !pDoc->GetDocStat().bModified,
diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx
index 77dd1e63f53c..26014d58655d 100644
--- a/sw/source/filter/xml/xmlexp.cxx
+++ b/sw/source/filter/xml/xmlexp.cxx
@@ -51,6 +51,7 @@
 #include <doc.hxx>
 #include <swmodule.hxx>
 #include <docsh.hxx>
+#include <viewsh.hxx>
 #include <docstat.hxx>
 #include <swerror.h>
 #include <unotext.hxx>
@@ -583,7 +584,8 @@ void SwXMLExport::SetBodyAttributes()
             if( pText )
             {
                 SwDoc *pDoc = pText->GetDoc();
-                if( pDoc && pDoc->GetPageCount() > 1 )
+                if( pDoc && pDoc->GetCurrentViewShell() &&
+                    pDoc->GetCurrentViewShell()->GetPageCount() > 1 )
                 {
                     sal_Bool bValue = sal_True;
                     rtl::OUStringBuffer sBuffer;
diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index 4b6af56066fc..267bdfa80b30 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -2849,7 +2849,7 @@ void SwXMLTableContext::MakeTable()
     }
 
     // ??? this is always false: root frame is only created in ViewShell::Init
-    if( pTableNode->GetDoc()->GetRootFrm() )
+    if( pTableNode->GetDoc()->GetCurrentViewShell() )   //swmod 071108//swmod 071225
     {
         pTableNode->DelFrms();
         SwNodeIndex aIdx( *pTableNode->EndOfSectionNode(), 1 );