summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2012-08-14 22:50:05 +0200
committerJan Holesovsky <kendy@suse.cz>2012-08-17 08:25:33 +0200
commit49e036414fb9ff98f2c25bbe5c61ee7b9341d92c (patch)
tree8a296dbe7525a36ed1326e528881dacc240d4b27
parente1b71741b7a1d7c1f120226e8f6c7a93e149f9a2 (diff)
check for non existing style entries, fdo#53339
Change-Id: I95bbb3ad89eedebbcd45b4eefd26b46d5d8cd05f Signed-off-by: Michael Meeks <michael.meeks@suse.com> Signed-off-by: Kohei Yoshida <kohei.yoshida@gmail.com> Signed-off-by: Jan Holesovsky <kendy@suse.cz>
-rw-r--r--sc/source/filter/excel/xestyle.cxx6
1 files changed, 5 insertions, 1 deletions
diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx
index 5e2e0117c00c..0a5de2273eea 100644
--- a/sc/source/filter/excel/xestyle.cxx
+++ b/sc/source/filter/excel/xestyle.cxx
@@ -2875,7 +2875,11 @@ XclExpDxfs::XclExpDxfs( const XclExpRoot& rRoot )
{
maStyleNameToDxfId.insert(std::pair<rtl::OUString, sal_Int32>(aStyleName, nIndex));
- SfxItemSet& rSet = rRoot.GetDoc().GetStyleSheetPool()->Find(aStyleName)->GetItemSet();
+ SfxStyleSheetBase* pStyle = rRoot.GetDoc().GetStyleSheetPool()->Find(aStyleName);
+ if(!pStyle)
+ continue;
+
+ SfxItemSet& rSet = pStyle->GetItemSet();
XclExpCellBorder* pBorder = new XclExpCellBorder;
if (!pBorder->FillFromItemSet( rSet, GetPalette(), GetBiff()) )