masterfix DEV300: #i10000# build breaker in swooo/DEV300_m103

6 files changed, 21 insertions, 11 deletions

diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index 125a6e0dcd..08d4d63860 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -564,7 +564,7 @@ public:
     sal_Bool HasOtherCnt() const; // gibt es Rahmen, Fussnoten, ...
 
     /* Anwenden der ViewOptions mit Start-/EndAction */
-    inline void ApplyViewOptions( const SwViewOption &rOpt );
+    virtual void ApplyViewOptions( const SwViewOption &rOpt );
 
     // Text innerhalb der Selektion erfragen
     // Returnwert liefert sal_False, wenn der selektierte Bereich
@@ -940,13 +940,6 @@ private:
     const SwEditShell &operator=(const SwEditShell &);
 };
 
-inline void SwEditShell::ApplyViewOptions( const SwViewOption &rOpt )
-{
-    SwCrsrShell::StartAction();
-    ViewShell::ApplyViewOptions( rOpt );
-    SwEditShell::EndAction();
-}
-
 inline const sfx2::LinkManager& SwEditShell::GetLinkManager() const
 {	return ((SwEditShell*)this)->GetLinkManager();	}
 
diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx
index f717106015..c553a55edf 100644
--- a/sw/inc/viewsh.hxx
+++ b/sw/inc/viewsh.hxx
@@ -439,7 +439,7 @@ public:
     void LayoutIdle();
 
     inline const SwViewOption *GetViewOptions() const { return pOpt; }
-           void  ApplyViewOptions( const SwViewOption &rOpt );
+    virtual void  ApplyViewOptions( const SwViewOption &rOpt );
            void  SetUIOptions( const SwViewOption &rOpt );
            void  SetReadonlyOption(sal_Bool bSet);   // Readonly-Bit d. ViewOptions setzen
            void  SetPDFExportOption(sal_Bool bSet);   // set/reset PDF export mode
diff --git a/sw/source/core/edit/editsh.cxx b/sw/source/core/edit/editsh.cxx
index 43f81d4ca7..7566dd74a4 100644
--- a/sw/source/core/edit/editsh.cxx
+++ b/sw/source/core/edit/editsh.cxx
@@ -1194,3 +1194,11 @@ void SwEditShell::CountWords( SwDocStat& rStat ) const
     FOREACHPAM_END()
 }
 
+void SwEditShell::ApplyViewOptions( const SwViewOption &rOpt )
+{
+    SwCrsrShell::StartAction();
+    ViewShell::ApplyViewOptions( rOpt );
+    SwEditShell::EndAction();
+}
+
+
diff --git a/sw/source/ui/inc/wrtsh.hxx b/sw/source/ui/inc/wrtsh.hxx
index f1e82a1d4c..03b5f8eb61 100644
--- a/sw/source/ui/inc/wrtsh.hxx
+++ b/sw/source/ui/inc/wrtsh.hxx
@@ -452,6 +452,8 @@ typedef sal_Bool (SwWrtShell:: *FNSimpleMove)();
     // die Core erzeugt eine Selektion, das SttSelect muss gerufen werden
     virtual void NewCoreSelection();
 
+    virtual void ApplyViewOptions( const SwViewOption &rOpt );
+
     // autom. Update von Vorlagen
     void AutoUpdateFrame(SwFrmFmt* pFmt, const SfxItemSet& rStyleSet);
     void AutoUpdatePara(SwTxtFmtColl* pColl, const SfxItemSet& rStyleSet);
diff --git a/sw/source/ui/uno/unotxdoc.cxx b/sw/source/ui/uno/unotxdoc.cxx
index 800570adf8..c8441ea44f 100755
--- a/sw/source/ui/uno/unotxdoc.cxx
+++ b/sw/source/ui/uno/unotxdoc.cxx
@@ -4150,8 +4150,6 @@ SwViewOptionAdjust_Impl::SwViewOptionAdjust_Impl( ViewShell& rSh, const SwViewOp
 SwViewOptionAdjust_Impl::~SwViewOptionAdjust_Impl()
 {
     m_rShell.ApplyViewOptions( m_aOldViewOptions );
-    //#i115062# invalidate meta character slot
-    m_rShell.GetView().GetViewFrame()->GetBindings().Invalidate( FN_VIEW_META_CHARS );
 }
 
 
diff --git a/sw/source/ui/wrtsh/wrtsh1.cxx b/sw/source/ui/wrtsh/wrtsh1.cxx
index e85aa2e1c6..b442ec13e3 100644
--- a/sw/source/ui/wrtsh/wrtsh1.cxx
+++ b/sw/source/ui/wrtsh/wrtsh1.cxx
@@ -98,6 +98,7 @@
 #include <ndtxt.hxx>
 #include <editeng/acorrcfg.hxx>
 #include <IMark.hxx>
+#include <sfx2/bindings.hxx>
 
 // -> #111827#
 #include <SwRewriter.hxx>
@@ -1901,3 +1902,11 @@ String SwWrtShell::GetSelDescr() const
     return aResult;
 }
 
+void SwWrtShell::ApplyViewOptions( const SwViewOption &rOpt )
+{
+    SwFEShell::ApplyViewOptions( rOpt );
+    //#i115062# invalidate meta character slot
+    GetView().GetViewFrame()->GetBindings().Invalidate( FN_VIEW_META_CHARS );
+}
+
+