[Libreoffice-commits] core.git: sw/source
Ashod Nakashian (via logerrit)
logerrit at kemper.freedesktop.org
Sun Dec 22 15:22:58 UTC 2019
sw/source/uibase/uno/unotxdoc.cxx | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 0a2dae2b4d23425e5c2b499d4981bb501a99ca77
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
AuthorDate: Sun Nov 10 16:45:10 2019 -0500
Commit: Ashod Nakashian <ashnakash at gmail.com>
CommitDate: Sun Dec 22 16:22:15 2019 +0100
sw: SwView can be null when setting clipboard
Change-Id: I8a0e59f6ceec4bf89e5eed0813157297efb56af1
Reviewed-on: https://gerrit.libreoffice.org/82405
Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
Tested-by: Ashod Nakashian <ashnakash at gmail.com>
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
(cherry picked from commit cea0eb9cac478f247fb156563e0a99b07d5a34dc)
Reviewed-on: https://gerrit.libreoffice.org/85675
Tested-by: Jenkins
diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx
index 91bc50b079a8..cc53e58ae758 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -3189,7 +3189,9 @@ void SwXTextDocument::setClipboard(const uno::Reference<datatransfer::clipboard:
{
SolarMutexGuard aGuard;
- pDocShell->GetView()->GetEditWin().SetClipboard(xClipboard);
+ SwView* pView = pDocShell->GetView();
+ if (pView)
+ pView->GetEditWin().SetClipboard(xClipboard);
}
bool SwXTextDocument::isMimeTypeSupported()
More information about the Libreoffice-commits
mailing list