From f9aa686432c0ba62c6f440302d5a35856496a786 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 15 Oct 2014 17:00:57 +0100 Subject: Resolves: fdo#81496 crash in calc format page Change-Id: Ic70f6f605e13a5c95b504f1bf0322e11313a21e7 --- svl/source/items/itempool.cxx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'svl') 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 & 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::const_iterator const iter( rSlotMap.find(nSlotId)); -- cgit