From 049f8b238328e0688d7915a26f48b945ed171f0a Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Tue, 1 Sep 2015 09:39:58 +0100 Subject: Resolves: tdf#91060 don't crash on loading certain pptx Change-Id: Ibf32ef644222a59c5fe6a9736ff64739ab24b74f (cherry picked from commit c874bf3f7bd6bbe31416506d9b4213bcbbbac4fa) Reviewed-on: https://gerrit.libreoffice.org/18227 Reviewed-by: Miklos Vajna Tested-by: Miklos Vajna (cherry picked from commit 5d210fba65ec1cc145366117da5fecd349d4fada) --- oox/source/ppt/slidefragmenthandler.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oox/source/ppt/slidefragmenthandler.cxx b/oox/source/ppt/slidefragmenthandler.cxx index 62e64da4bb13..1d7e3f8711dd 100644 --- a/oox/source/ppt/slidefragmenthandler.cxx +++ b/oox/source/ppt/slidefragmenthandler.cxx @@ -193,7 +193,7 @@ SlideFragmentHandler::~SlideFragmentHandler() throw () case PPT_TOKEN( cmLst ): break; case PPT_TOKEN( cm ): - if(!mpSlidePersistPtr->getCommentsList().cmLst.empty()) + if (!mpSlidePersistPtr->getCommentsList().cmLst.empty() && !getCharVector().empty()) { // set comment text for earlier comment mpSlidePersistPtr->getCommentsList().cmLst.back().setText( getCharVector().back() ); -- cgit v1.2.3