sc/source/core/data/documen9.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit fbcd55ea26b4536e7611a44fc63b79733b82b81e
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Jun 3 16:51:41 2015 +0100
Resolves: tdf#90435 secondary pool set to that of temp docs drawing layers
overwriting the original one, and when the temp doc goes away then its
drawing
layer goes away autoamtically settings the secondary pools of the other
pools
it is a secondary of back to 0
(see also tdf#87245)
Change-Id: Ie6dd8d615f81cf4d4776eaeac1cc2507b2abaa37
(cherry picked from commit 8ae25bbc092254f680e2976873f15bdbc26615ef)
diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx
index f780169..3b5bd93 100644
--- a/sc/source/core/data/documen9.cxx
+++ b/sc/source/core/data/documen9.cxx
@@ -139,11 +139,11 @@ void ScDocument::InitDrawLayer( SfxObjectShell* pDocShell
)
// in SfxItemSets using the Calc SfxItemPool. This is e.g. needed when
// the PageStyle using SvxBrushItem is visualized and will be
potentially
// used more intense in the future
- if(xPoolHelper.is())
+ if (xPoolHelper.is() && !IsClipOrUndo()) //Using IsClipOrUndo as a
proxy for SharePooledResources called
{
ScDocumentPool* pLocalPool = xPoolHelper->GetDocPool();
- if(pLocalPool)
+ if (pLocalPool)
{
OSL_ENSURE(!pLocalPool->GetSecondaryPool(), "OOps, already a
secondary pool set where the DrawingLayer ItemPool is to be placed (!)");
pLocalPool->SetSecondaryPool(&pDrawLayer->GetItemPool());
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
