Kaydet (Commit) d5020f35 authored tarafından Eike Rathke's avatar Eike Rathke

Attempt to blind fix tdf#108612 explicitly checking for clipboard document

It seems that for some yet unknown reason in an (un)certain constellation
ScDocument::IsClipboardSource() returns true because ScModule::GetClipDoc()
does not return the clipboard document but the actual document instead, so
destroying the clipboard document executes ScDocument::ClosingClipboardSource()
and (or in earlier versions) ScDocument::ForgetNoteCaptions() on the actual
document instead.

Check also that ScDocument::bIsClip is set, hopefully curing the symptom, the
real cause is something else.

Change-Id: I5ffd0706592d2737808e7004630a56c53115295b
üst a9efcef2
......@@ -2543,7 +2543,7 @@ void ScDocument::SetClipParam(const ScClipParam& rParam)
bool ScDocument::IsClipboardSource() const
{
ScDocument* pClipDoc = ScModule::GetClipDoc();
return xPoolHelper.is() && pClipDoc && pClipDoc->xPoolHelper.is() &&
return pClipDoc && pClipDoc->bIsClip && pClipDoc->xPoolHelper.is() && xPoolHelper.is() &&
xPoolHelper->GetDocPool() == pClipDoc->xPoolHelper->GetDocPool();
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment