diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-10-15 17:00:57 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-10-16 09:09:46 +0100 |
| commit | f9aa686432c0ba62c6f440302d5a35856496a786 (patch) | |
| tree | 1584125e0805c54a0803351c6ea116bb37d76b3c | |
| parent | 4aaa4ceee75de7a0fbb552039d39567ab10c6d4b (diff) | |
Resolves: fdo#81496 crash in calc format page
Change-Id: Ic70f6f605e13a5c95b504f1bf0322e11313a21e7
| -rw-r--r-- | sc/source/core/data/documen9.cxx | 9 | ||||
| -rw-r--r-- | svl/source/items/itempool.cxx | 5 |
2 files changed, 5 insertions, 9 deletions
diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx index c296cfd9a2e5..629313d6992d 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,13 +146,9 @@ 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 (!)"); -#if 0 - // FIXME apparently this is disabled because it breaks tests pLocalPool->SetSecondaryPool(&pDrawLayer->GetItemPool()); -#endif } } -#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 @@ -252,10 +248,7 @@ void ScDocument::DeleteDrawLayer() if(pLocalPool && pLocalPool->GetSecondaryPool()) { -#if 0 - // FIXME apparently this is disabled because it breaks tests pLocalPool->SetSecondaryPool(0); -#endif } } delete pDrawLayer; diff --git a/svl/source/items/itempool.cxx b/svl/source/items/itempool.cxx index 32a20b31eea5..129622be7d26 100644 --- a/svl/source/items/itempool.cxx +++ b/svl/source/items/itempool.cxx @@ -46,7 +46,10 @@ lcl_CheckSlots2(std::map<sal_uInt16, sal_uInt16> & rSlotMap, sal_uInt16 const nSlotId(pInfos[n]._nSID); if (nSlotId != 0 && nSlotId != 10883 // preexisting duplicate SID_ATTR_GRAF_CROP - && nSlotId != 10024) // preexisting duplicate SID_ATTR_BORDER_OUTER + && nSlotId != 10023 // preexisting duplicate SID_ATTR_BORDER_INNER + && nSlotId != 10024 // preexisting duplicate SID_ATTR_BORDER_OUTER + && nSlotId != 11013 // preexisting duplicate SID_ATTR_BORDER_DIAG_TLBR + && nSlotId != 11014) // preexisting duplicate SID_ATTR_BORDER_DIAG_BLTR { // check for duplicate slot-id mapping std::map<sal_uInt16, sal_uInt16>::const_iterator const iter( rSlotMap.find(nSlotId)); |