mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix tests

Browse Source 
Change-Id: Ia7099e87baa553ce6f5537908e1fb65c268d3940
This commit is contained in:
Caolán McNamara
2014-06-20 16:03:03 +01:00
committed by Miklos Vajna
parent 5f0d957ac6
commit d1465c64c6
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sc/source/core/data/documen9.cxx
View File

@@ -133,7 +133,7 @@ void ScDocument::InitDrawLayer( SfxObjectShell* pDocShell )
sfx2::LinkManager* pMgr = GetDocLinkManager().getLinkManager(bAutoCalc); sfx2::LinkManager* pMgr = GetDocLinkManager().getLinkManager(bAutoCalc);
if (pMgr) if (pMgr)
pDrawLayer->SetLinkManager(pMgr); pDrawLayer->SetLinkManager(pMgr);
#if 1
//UUUU set DrawingLayer's SfxItemPool at Calc's SfxItemPool as //UUUU set DrawingLayer's SfxItemPool at Calc's SfxItemPool as
// secondary pool to support DrawingLayer FillStyle ranges (and similar) // secondary pool to support DrawingLayer FillStyle ranges (and similar)
// in SfxItemSets using the Calc SfxItemPool. This is e.g. needed when // in SfxItemSets using the Calc SfxItemPool. This is e.g. needed when
@@ -146,9 +146,14 @@ void ScDocument::InitDrawLayer( SfxObjectShell* pDocShell )
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 (!)");
fprintf(stderr, "ANS is %p\n", pLocalPool->GetSecondaryPool());
#if 0
pLocalPool->SetSecondaryPool(&pDrawLayer->GetItemPool()); 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 // Drawing pages are accessed by table number, so they must also be present
// for preceding table numbers, even if the tables aren't allocated // for preceding table numbers, even if the tables aren't allocated
@@ -248,10 +253,12 @@ void ScDocument::DeleteDrawLayer()
if(pLocalPool && pLocalPool->GetSecondaryPool()) if(pLocalPool && pLocalPool->GetSecondaryPool())
{ {
fprintf(stderr, "RET is %p\n", pLocalPool->GetSecondaryPool());
#if 0
pLocalPool->SetSecondaryPool(0); pLocalPool->SetSecondaryPool(0);
#endif
} }
} }
delete pDrawLayer; delete pDrawLayer;
pDrawLayer = 0; pDrawLayer = 0;
} }