diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-09-12 11:56:02 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-09-13 08:15:38 +0200 |
| commit | 1cabcedcff279b95635e457ef36bb4a07f7947aa (patch) | |
| tree | 54b79d2fdbccee9bde33494a00f181bf75c1fbe3 /sw/source/uibase | |
| parent | 439255b00359060708e4ef969370a67fc94cea89 (diff) | |
sw: implement SdrMarkView::GetSfxViewShell() API
With this, the graphic selection is no longer lost when creating a new
view. That happened as the SwView ctor calls
SdrMarkView::SetMarkHandles() while the new view is not yet current,
which resulted clearing the graphic selection in the old view, not in
the new one.
A side-effect of introducing SwDrawView::GetSfxViewShell() is that now
SwView::getPart() is called from the SwView dtor, guard against doing
any real work there in that situation to avoid potentially reading
already deleted data.
Change-Id: I4fab39a907d2cbe228c0fc8d44bedc64893387d1
Reviewed-on: https://gerrit.libreoffice.org/28832
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit 65828fa693507d699369f0dbc3c0bfc31638d945)
Diffstat (limited to 'sw/source/uibase')
| -rw-r--r-- | sw/source/uibase/uiview/viewprt.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
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; |