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 /svl | |
| parent | 4aaa4ceee75de7a0fbb552039d39567ab10c6d4b (diff) | |
Resolves: fdo#81496 crash in calc format page
Change-Id: Ic70f6f605e13a5c95b504f1bf0322e11313a21e7
Diffstat (limited to 'svl')
| -rw-r--r-- | svl/source/items/itempool.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
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)); |