summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-12-12 15:01:06 +0000
committerEike Rathke <erack@redhat.com>2014-12-16 19:39:32 +0000
commite7f03c29a4c915674247be1946af2101b5a3d7d5 (patch)
tree8fc264248ed5b281117ff966c64a4cfbff590ebb
parent810a4c1d53a23188fb200b558263a165fc97f4be (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 (cherry picked from commit 7a85674c93150d6f5a59e998158909365b47d761) Reviewed-on: https://gerrit.libreoffice.org/13451 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
-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();