From 4e6c9caf4a131baf8c1fe15267b43f22ff7c1660 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 19 Jun 2014 10:13:36 +0100 Subject: coverity#988426 Explicit null dereferenced Change-Id: I76d1764c6bdce565705e87ae88e3eccc1c3a617e --- sc/source/filter/xml/xmlfonte.cxx | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'sc') diff --git a/sc/source/filter/xml/xmlfonte.cxx b/sc/source/filter/xml/xmlfonte.cxx index 3ae2821b3c61..82f1ca409751 100644 --- a/sc/source/filter/xml/xmlfonte.cxx +++ b/sc/source/filter/xml/xmlfonte.cxx @@ -81,17 +81,12 @@ ScXMLFontAutoStylePool_Impl::ScXMLFontAutoStylePool_Impl(ScXMLExport& rExportP, sal_uInt16 aPageWhichIds[4] = { ATTR_PAGE_HEADERLEFT, ATTR_PAGE_FOOTERLEFT, ATTR_PAGE_HEADERRIGHT, ATTR_PAGE_FOOTERRIGHT }; - const SfxItemPool* pItemPool(rExportP.GetDocument() ? rExportP.GetDocument()->GetPool() : NULL); + const SfxItemPool* pItemPool(rExportP.GetDocument()->GetPool()); AddFontItems(aWhichIds, 3, pItemPool, true); const SfxItemPool* pEditPool(rExportP.GetDocument()->GetEditPool()); AddFontItems(aEditWhichIds, 3, pEditPool, false); - SfxStyleSheetIteratorPtr pItr; - - if(rExportP.GetDocument()) - { - pItr = rExportP.GetDocument()->GetStyleSheetPool()->CreateIterator(SFX_STYLE_FAMILY_PAGE, 0xFFFF); - } + SfxStyleSheetIteratorPtr pItr = rExportP.GetDocument()->GetStyleSheetPool()->CreateIterator(SFX_STYLE_FAMILY_PAGE, 0xFFFF); if(pItr) { -- cgit