sc/source/core/data/document.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 96b7d1d5d6e97078508f9366b340c65ab0a0cc75
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date: Fri Feb 24 23:10:57 2017 +0100
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 <er...@redhat.com>
Tested-by: Jenkins <c...@libreoffice.org>
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 27456da..80fb075 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();
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
