Kaydet (Commit) 8ae25bbc authored tarafından Caolán McNamara's avatar Caolán McNamara

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
üst 816941f1
...@@ -138,11 +138,11 @@ void ScDocument::InitDrawLayer( SfxObjectShell* pDocShell ) ...@@ -138,11 +138,11 @@ void ScDocument::InitDrawLayer( SfxObjectShell* pDocShell )
// in SfxItemSets using the Calc SfxItemPool. This is e.g. needed when // in SfxItemSets using the Calc SfxItemPool. This is e.g. needed when
// the PageStyle using SvxBrushItem is visualized and will be potentially // the PageStyle using SvxBrushItem is visualized and will be potentially
// used more intense in the future // 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(); 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 (!)"); OSL_ENSURE(!pLocalPool->GetSecondaryPool(), "OOps, already a secondary pool set where the DrawingLayer ItemPool is to be placed (!)");
pLocalPool->SetSecondaryPool(&pDrawLayer->GetItemPool()); pLocalPool->SetSecondaryPool(&pDrawLayer->GetItemPool());
......
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