[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sc/source

[Michael Meeks]

 sc/source/filter/excel/xestyle.cxx |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 3fefa69d6d316b9e38f12e3d3eb1fdd5896513cd
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Tue Aug 14 22:50:05 2012 +0200

    check for non existing style entries, fdo#53339
    
    Change-Id: I95bbb3ad89eedebbcd45b4eefd26b46d5d8cd05f
    Signed-off-by: Michael Meeks <michael.meeks at suse.com>

diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx
index 5e2e011..0a5de22 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()) )