6 files changed, 10 insertions, 11 deletions
diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx
index 49b3af998897..8b741562b2e1 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 47ce516701f2..1c7c129a6573 100644
--- a/sw/source/filter/html/htmlforw.cxx
+++ b/sw/source/filter/html/htmlforw.cxx
@@ -68,12 +68,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 1fe0e4898395..265e9234e3fc 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -5088,7 +5088,7 @@ void _TblSaveStruct::MakeTable( sal_uInt16 nWidth, SwPosition& rPos, SwDoc *pDoc
     SwTableNode *pTblNd = pTCntxt->GetTableNode();
     OSL_ENSURE( 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/html/htmlvsh.hxx b/sw/source/filter/html/htmlvsh.hxx
index 99343566048a..aa8159b3858e 100644
--- a/sw/source/filter/html/htmlvsh.hxx
+++ b/sw/source/filter/html/htmlvsh.hxx
@@ -35,7 +35,8 @@ class ViewShell;
 
 class SwHTMLViewShellClient : public SwClient
 {
-    virtual void Modify( SfxPoolItem *pOld, SfxPoolItem *pNew );
+protected:
+    virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew );
 
 public:
 
@@ -46,7 +47,7 @@ public:
     void Register( ViewShell *pVsh );
     void DeRegister();
 
-    /*inline*/ ViewShell *GetViewShell(); // im swhtml.cxx
+    ViewShell *GetViewShell();
 };
 
 
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 88aaad70f09f..393787297392 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -924,15 +924,15 @@ if( pSttNdIdx->GetIndex()+1 == pPam->GetBound( sal_False ).nNode.GetIndex() )
 #endif
 }
 
-void SwHTMLParser::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew )
+void SwHTMLParser::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew )
 {
     switch( pOld ? pOld->Which() : pNew ? pNew->Which() : 0 )
     {
     case RES_OBJECTDYING:
-        if( ((SwPtrMsgPoolItem *)pOld)->pObject == pRegisteredIn )
+        if( ((SwPtrMsgPoolItem *)pOld)->pObject == GetRegisteredIn() )
         {
             // dann uns selbst beenden
-            pRegisteredIn->Remove( this );
+            GetRegisteredInNonConst()->Remove( this );
             ReleaseRef();                   // ansonsten sind wir fertig!
         }
         break;
diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx
index ae072aa7ec2e..0df5b3923f79 100644
--- a/sw/source/filter/html/swhtml.hxx
+++ b/sw/source/filter/html/swhtml.hxx
@@ -920,7 +920,7 @@ protected:
     virtual ~SwHTMLParser();
 
     // wird das Dok geloescht, ist auch der Parser zu loeschen
-    virtual void Modify( SfxPoolItem *pOld, SfxPoolItem *pNew );
+    virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew );
 
     virtual void AddMetaUserDefined( ::rtl::OUString const & i_rMetaName );