summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2017-01-18 16:18:38 +0100
committerEike Rathke <erack@redhat.com>2017-01-18 16:19:09 +0100
commitcb566c056b0e8f9f73dac3cbaf497e102a247cb9 (patch)
tree93ba07dd11cab7ef22778971959de3bc7694ee1d
parent2fb220093f7178f75ebd582bbcd956c1ee7e03db (diff)
tdf#104967 prevent crash when pasting notes originating from a closed document
This is only a workaround to prevent a crash, the actual note content is lost when pasting, only a standard empty note caption will be pasted. Change-Id: Ifaef5d30cc2024f3d03d6b2b4f56c5ccfbb67142
-rw-r--r--sc/source/core/data/documen2.cxx15
1 files changed, 15 insertions, 0 deletions
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index b5d60abd7136..cd3f2d715362 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -373,6 +373,21 @@ ScDocument::~ScDocument()
pRefreshTimerControl = nullptr;
}
+ if (IsClipboardSource())
+ {
+ // Notes copied to the clipboard have a raw SdrCaptionObj pointer
+ // copied from this document, forget it as it references this
+ // document's drawing layer pages and what not, which otherwise when
+ // pasting to another document after this document was destructed would
+ // attempt to access non-existing data.
+ /* XXX this is only a workaround to prevent a crash, the actual note
+ * content is lost, only a standard empty note caption will be pasted.
+ * TODO: come up with a solution. */
+ ScDocument* pClipDoc = ScModule::GetClipDoc();
+ if (pClipDoc)
+ pClipDoc->ForgetNoteCaptions( ScRangeList( ScRange( 0,0,0, MAXCOL, MAXROW, pClipDoc->GetTableCount()-1)));
+ }
+
mxFormulaParserPool.reset();
// Destroy the external ref mgr instance here because it has a timer
// which needs to be stopped before the app closes.