summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-09-01 09:39:58 +0100
committerCaolán McNamara <caolanm@redhat.com>2015-09-01 09:40:21 +0100
commitc874bf3f7bd6bbe31416506d9b4213bcbbbac4fa (patch)
treedff5d3eb7486917866558a94b1fcee6b8b862bc7
parent79f060d45122ac108de8482d44af17a82ee1c48d (diff)
Resolves: tdf#91060 don't crash on loading certain pptx
Change-Id: Ibf32ef644222a59c5fe6a9736ff64739ab24b74f
-rw-r--r--oox/source/ppt/slidefragmenthandler.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/oox/source/ppt/slidefragmenthandler.cxx b/oox/source/ppt/slidefragmenthandler.cxx
index 95ea8393b22f..5a27ea34a114 100644
--- a/oox/source/ppt/slidefragmenthandler.cxx
+++ b/oox/source/ppt/slidefragmenthandler.cxx
@@ -194,7 +194,7 @@ SlideFragmentHandler::~SlideFragmentHandler()
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() );