summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2017-02-24 23:10:57 +0100
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2017-02-25 11:41:16 +0000
commit96b7d1d5d6e97078508f9366b340c65ab0a0cc75 (patch)
treeeb41e66b4cdb9869918d1d794a827fedf28a4b95
parentfddffda26287dec1f42a04bd40b8b2782982a7e0 (diff)
xPoolHelper is empty in a clipboard doc
Found by the crashreporter: http://crashreport.libreoffice.org/stats/signature/ScDocument::IsClipboardSource() Change-Id: I3fb030921b653396deb46a9e98d30d5df9c9ce15 (cherry picked from commit c63ff2a769f4601f67ffd13cb36df63c70fdd601) Reviewed-on: https://gerrit.libreoffice.org/34641 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins <ci@libreoffice.org>
-rw-r--r--sc/source/core/data/document.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 27456da3e612..80fb075988b8 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -2516,7 +2516,7 @@ void ScDocument::SetClipParam(const ScClipParam& rParam)
bool ScDocument::IsClipboardSource() const
{
ScDocument* pClipDoc = ScModule::GetClipDoc();
- return pClipDoc && pClipDoc->xPoolHelper.is() &&
+ return xPoolHelper.is() && pClipDoc && pClipDoc->xPoolHelper.is() &&
xPoolHelper->GetDocPool() == pClipDoc->xPoolHelper->GetDocPool();
}