summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-12-12 15:01:06 +0000
committerCaolán McNamara <caolanm@redhat.com>2014-12-12 15:02:38 +0000
commit7a85674c93150d6f5a59e998158909365b47d761 (patch)
tree42199b6813b8d3d41e97aa5d81e5b40ca5355f34
parentb500e60b32b5cf8fd61beb7476c2c29e65aee3e4 (diff)
Resolves: fdo#87245 crash because clip doc doesn't own DocumentPool
multiple documents sharing the same doc pool so can't unset its secondary here. Here the assumption is that SharePooledResources has always been called on Clip or Undo docs (otherwise persumably need a flag which SharePooledResources toggles on) Change-Id: Ibcdbe5f698102dc683c290d3bd581c31e214765f
-rw-r--r--sc/source/core/data/documen9.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx
index 8a23df160cf5..4fe1a115f7fb 100644
--- a/sc/source/core/data/documen9.cxx
+++ b/sc/source/core/data/documen9.cxx
@@ -242,7 +242,7 @@ void ScDocument::DeleteDrawLayer()
{
//UUUU remove DrawingLayer's SfxItemPool from Calc's SfxItemPool where
// it is registered as secondary pool
- if(xPoolHelper.is())
+ if (xPoolHelper.is() && !IsClipOrUndo()) //Using IsClipOrUndo as a proxy for SharePooledResources called
{
ScDocumentPool* pLocalPool = xPoolHelper->GetDocPool();