sc/source/core/data/document.cxx | 3 +++
1 file changed, 3 insertions(+)
New commits:
commit 52e09f2c03f7cc024b2973c4806283c324fc23df
Author: Eike Rathke <er...@redhat.com>
Date: Thu Jul 20 10:18:50 2017 +0200
Another attempt to blind fix tdf#108612
Oddly in that scenario on Windows there are two clipboard documents alive
when
destroying one, so the destroyed one erroneously is said to be a clipboard
source and then detachs the comments' caption information.
There's no legit case where a clipboard document could actually be the real
original source of another clipboard document, so bail out if the caller
already is one.
Change-Id: I0f8d240d8ec13bf91b77176dc6439a541cf14eaa
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 5aa7298a2f75..967a182a70da 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -2539,6 +2539,9 @@ void ScDocument::SetClipParam(const ScClipParam& rParam)
bool ScDocument::IsClipboardSource() const
{
+ if (bIsClip)
+ return false;
+
ScDocument* pClipDoc = ScModule::GetClipDoc();
return pClipDoc && pClipDoc->bIsClip && pClipDoc->xPoolHelper.is() &&
xPoolHelper.is() &&
xPoolHelper->GetDocPool() == pClipDoc->xPoolHelper->GetDocPool();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
