diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-09-01 09:39:58 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-09-02 15:54:30 +0000 |
| commit | 32982a45089e0eaacb2442806bbee658b8e2daac (patch) | |
| tree | 4bba334d5cc9c5067aff5e414baa9a6fb869ce92 | |
| parent | 2284ada74ac0dd66b4f5e3e811a85fc6c458d13a (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>
| -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 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() ); |