From d1465c64c6f64ad8dd25e40cdc69649b24b305ea Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Fri, 20 Jun 2014 16:03:03 +0100 Subject: fix tests Change-Id: Ia7099e87baa553ce6f5537908e1fb65c268d3940 --- sc/source/core/data/documen9.cxx | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'sc/source') diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx index 3b1e6572305e..af269c7812a9 100644 --- a/sc/source/core/data/documen9.cxx +++ b/sc/source/core/data/documen9.cxx @@ -133,7 +133,7 @@ void ScDocument::InitDrawLayer( SfxObjectShell* pDocShell ) sfx2::LinkManager* pMgr = GetDocLinkManager().getLinkManager(bAutoCalc); if (pMgr) pDrawLayer->SetLinkManager(pMgr); - +#if 1 //UUUU set DrawingLayer's SfxItemPool at Calc's SfxItemPool as // secondary pool to support DrawingLayer FillStyle ranges (and similar) // in SfxItemSets using the Calc SfxItemPool. This is e.g. needed when @@ -146,9 +146,14 @@ void ScDocument::InitDrawLayer( SfxObjectShell* pDocShell ) if(pLocalPool) { OSL_ENSURE(!pLocalPool->GetSecondaryPool(), "OOps, already a secondary pool set where the DrawingLayer ItemPool is to be placed (!)"); + fprintf(stderr, "ANS is %p\n", pLocalPool->GetSecondaryPool()); +#if 0 pLocalPool->SetSecondaryPool(&pDrawLayer->GetItemPool()); +#endif + fprintf(stderr, "was set to %p\n", pLocalPool->GetSecondaryPool()); } } +#endif // Drawing pages are accessed by table number, so they must also be present // for preceding table numbers, even if the tables aren't allocated @@ -248,10 +253,12 @@ void ScDocument::DeleteDrawLayer() if(pLocalPool && pLocalPool->GetSecondaryPool()) { + fprintf(stderr, "RET is %p\n", pLocalPool->GetSecondaryPool()); +#if 0 pLocalPool->SetSecondaryPool(0); +#endif } } - delete pDrawLayer; pDrawLayer = 0; } -- cgit