From 9c248f9265747351f32bf52d608a91393bfdf1e2 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 5 Nov 2012 11:36:27 +0200 Subject: bnc#785727: Add more safety checks, exact bug mechanism unclear Change-Id: Ieef2ce470613f6adfbb134d2bd59f2a6fd4a848d --- oox/source/ppt/slidefragmenthandler.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'oox') diff --git a/oox/source/ppt/slidefragmenthandler.cxx b/oox/source/ppt/slidefragmenthandler.cxx index bb1e3e201e50..789821b4bcc0 100644 --- a/oox/source/ppt/slidefragmenthandler.cxx +++ b/oox/source/ppt/slidefragmenthandler.cxx @@ -178,7 +178,7 @@ SlideFragmentHandler::~SlideFragmentHandler() throw() case A_TOKEN( overrideClrMapping ): case PPT_TOKEN( clrMap ): // CT_ColorMapping { - oox::drawingml::ClrMapPtr pClrMapPtr( ( aElementToken == PPT_TOKEN( clrMap ) || !mpSlidePersistPtr.get() ) ? new oox::drawingml::ClrMap() : new oox::drawingml::ClrMap( *mpSlidePersistPtr->getClrMap() ) ); + oox::drawingml::ClrMapPtr pClrMapPtr( ( aElementToken == PPT_TOKEN( clrMap ) || !mpSlidePersistPtr.get() || !mpSlidePersistPtr->getClrMap().get() ) ? new oox::drawingml::ClrMap() : new oox::drawingml::ClrMap( *mpSlidePersistPtr->getClrMap() ) ); ContextHandlerRef ret = new oox::drawingml::clrMapContext( *this, rAttribs.getFastAttributeList(), *pClrMapPtr ); mpSlidePersistPtr->setClrMap( pClrMapPtr ); return ret; -- cgit lue='distro/cib/libreoffice-5-4'>distro/cib/libreoffice-5-4 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
path: root/icon-themes/hicontrast/avmedia/res
AgeCommit message (Expand)Author
2014-05-09Icon redux 01: Tidy hicontrast iconsAndrew