diff options
author | Caolán McNamara <caolanm@redhat.com> | 2015-09-01 09:39:58 +0100 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2015-09-28 10:18:42 +0200 |
commit | 049f8b238328e0688d7915a26f48b945ed171f0a (patch) | |
tree | 218d9a38369ccf12b0527e2d9d0d880859a273b2 | |
parent | abe62e4d15862b5c7fa55051d562600e4d7429ca (diff) |
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 <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit 5d210fba65ec1cc145366117da5fecd349d4fada)
-rw-r--r-- | oox/source/ppt/slidefragmenthandler.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
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() ); |