diff options
Diffstat (limited to 'sw/source')
-rw-r--r-- | sw/source/core/draw/dview.cxx | 5 | ||||
-rw-r--r-- | sw/source/core/inc/dview.hxx | 3 | ||||
-rw-r--r-- | sw/source/uibase/uiview/viewprt.cxx | 2 |
3 files changed, 9 insertions, 1 deletions
diff --git a/sw/source/core/draw/dview.cxx b/sw/source/core/draw/dview.cxx index ad6f7df0764e..ab5df7cad783 100644 --- a/sw/source/core/draw/dview.cxx +++ b/sw/source/core/draw/dview.cxx @@ -919,6 +919,11 @@ void SwDrawView::ReplaceMarkedDrawVirtObjs( SdrMarkView& _rMarkView ) } } +SfxViewShell* SwDrawView::GetSfxViewShell() const +{ + return rImp.GetShell()->GetSfxViewShell(); +} + void SwDrawView::DeleteMarked() { SwDoc* pDoc = Imp().GetShell()->GetDoc(); diff --git a/sw/source/core/inc/dview.hxx b/sw/source/core/inc/dview.hxx index 9bf76c1ede5e..4145c51f59a2 100644 --- a/sw/source/core/inc/dview.hxx +++ b/sw/source/core/inc/dview.hxx @@ -112,6 +112,9 @@ public: // method to replace marked/selected <SwDrawVirtObj> // by its reference object for delete of selection and group selection static void ReplaceMarkedDrawVirtObjs( SdrMarkView& _rMarkView ); + + /// See SdrMarkView::GetSfxViewShell(). + SfxViewShell* GetSfxViewShell() const override; }; #endif diff --git a/sw/source/uibase/uiview/viewprt.cxx b/sw/source/uibase/uiview/viewprt.cxx index 072478439803..3317aca5ecd1 100644 --- a/sw/source/uibase/uiview/viewprt.cxx +++ b/sw/source/uibase/uiview/viewprt.cxx @@ -250,7 +250,7 @@ void SwView::ExecutePrint(SfxRequest& rReq) int SwView::getPart() const { - if (!m_pWrtShell) + if (m_bInDtor || !m_pWrtShell) return 0; sal_uInt16 nPage, nLogPage; |