diff options
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/uibase/app/docsh.cxx | 1 | ||||
| -rw-r--r-- | sw/source/uibase/inc/view.hxx | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx index 3da955070e6f..e3491cb26f76 100644 --- a/sw/source/uibase/app/docsh.cxx +++ b/sw/source/uibase/app/docsh.cxx @@ -1084,7 +1084,6 @@ SfxStyleSheetBasePool* SwDocShell::GetStyleSheetPool() void SwDocShell::SetView(SwView* pVw) { - SetViewShell_Impl(pVw); if ( 0 != (mpView = pVw) ) mpWrtShell = &mpView->GetWrtShell(); else diff --git a/sw/source/uibase/inc/view.hxx b/sw/source/uibase/inc/view.hxx index 6e7db31b182f..fd09bf43ac0e 100644 --- a/sw/source/uibase/inc/view.hxx +++ b/sw/source/uibase/inc/view.hxx @@ -588,8 +588,8 @@ public: SfxShell *GetCurShell() { return m_pShell; } SwDocShell *GetDocShell(); inline const SwDocShell *GetDocShell() const; - inline virtual FmFormShell *GetFormShell() SAL_OVERRIDE { return m_pFormShell; } - inline virtual const FmFormShell *GetFormShell() const SAL_OVERRIDE { return m_pFormShell; } + inline FmFormShell *GetFormShell() { return m_pFormShell; } + inline const FmFormShell *GetFormShell() const { return m_pFormShell; } // so that in the SubShells' DTors m_pShell can be reset if applicable void ResetSubShell() { m_pShell = 0; } |