diff options
| author | Henry Castro <hcastro@collabora.com> | 2018-05-06 22:40:05 -0400 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2018-05-23 13:19:20 +0200 |
| commit | a2e6f31c6f90e446d1462e7c80f6b1317f7825bc (patch) | |
| tree | 3e009520526d97336d29ba6a45fb1ff22e7b14f5 /sc/source/ui/view/cliputil.cxx | |
| parent | 40cf5a9b3dd619a650a94d8b65bf6987125b75fb (diff) | |
tdf#117228: crash in SfxItemSet::GetItemState...
(unsigned short, bool, SfxPoolItem const**) when pasting comment of closed document
Re-work commit 1b7a8277aa3e9f73ccdf15e933a1ee3b42849a44.
In the tiled rendering case, each view has its own clipboard,
but not in desktop version which it has a shared clipboard each view.
Change-Id: I57b1ab81e4c141829dbad899330e5c22204c384a
Reviewed-on: https://gerrit.libreoffice.org/53922
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'sc/source/ui/view/cliputil.cxx')
| -rw-r--r-- | sc/source/ui/view/cliputil.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sc/source/ui/view/cliputil.cxx b/sc/source/ui/view/cliputil.cxx index f3cd331e94e3..254352de014f 100644 --- a/sc/source/ui/view/cliputil.cxx +++ b/sc/source/ui/view/cliputil.cxx @@ -46,8 +46,7 @@ bool lcl_checkClassification(ScDocument* pSourceDoc, const ScDocument* pDestinat void ScClipUtil::PasteFromClipboard( ScViewData* pViewData, ScTabViewShell* pTabViewShell, bool bShowDialog ) { - vcl::Window* pWin = pViewData->GetActiveWin(); - ScTransferObj* pOwnClip = ScTransferObj::GetOwnClipboard( pWin ); + const ScTransferObj* pOwnClip = ScTransferObj::GetOwnClipboard(pTabViewShell->GetClipData()); ScDocument* pThisDoc = pViewData->GetDocument(); ScDPObject* pDPObj = pThisDoc->GetDPAtCursor( pViewData->GetCurX(), pViewData->GetCurY(), pViewData->GetTabNo() ); |