Commits

obo  committed 537a06a

masterfix DEV300: #i10000# build breaker in sw

  • Participants
  • Parent commits 928ab09

Comments (0)

Files changed (6)

File sw/inc/editsh.hxx

 	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
 	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();	}
 

File sw/inc/viewsh.hxx

 	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

File sw/source/core/edit/editsh.cxx

     FOREACHPAM_END()
 }
 
+void SwEditShell::ApplyViewOptions( const SwViewOption &rOpt )
+{
+	SwCrsrShell::StartAction();
+	ViewShell::ApplyViewOptions( rOpt );
+	SwEditShell::EndAction();
+}
+
+

File sw/source/ui/inc/wrtsh.hxx

 	// 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);

File sw/source/ui/uno/unotxdoc.cxx

 SwViewOptionAdjust_Impl::~SwViewOptionAdjust_Impl()
 {
     m_rShell.ApplyViewOptions( m_aOldViewOptions );
-    //#i115062# invalidate meta character slot
-    m_rShell.GetView().GetViewFrame()->GetBindings().Invalidate( FN_VIEW_META_CHARS );
 }
 
 

File sw/source/ui/wrtsh/wrtsh1.cxx

 #include <ndtxt.hxx>
 #include <editeng/acorrcfg.hxx>
 #include <IMark.hxx>
+#include <sfx2/bindings.hxx>
 
 // -> #111827#
 #include <SwRewriter.hxx>
     return aResult;
 }
 
+void SwWrtShell::ApplyViewOptions( const SwViewOption &rOpt )
+{
+	SwFEShell::ApplyViewOptions( rOpt );
+    //#i115062# invalidate meta character slot
+    GetView().GetViewFrame()->GetBindings().Invalidate( FN_VIEW_META_CHARS );
+}
+
+