From f6c764706cd411d3353666da91b334a899a12154 Mon Sep 17 00:00:00 2001
From: obo <obo@openoffice.org>
Date: Wed, 16 Mar 2011 13:45:30 +0100
Subject: masterfix DEV300: #i10000# build breaker in sw

---
 sw/inc/editsh.hxx | 9 +--------
 sw/inc/viewsh.hxx | 2 +-
 2 files changed, 2 insertions(+), 9 deletions(-)

(limited to 'sw/inc')

diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index d75839f5736c..43992dc7b359 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 647a8f7f2048..2daf85092b40 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
-- 
cgit