oox/source/ppt/slidefragmenthandler.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
New commits: commit 32982a45089e0eaacb2442806bbee658b8e2daac Author: Caolán McNamara <[email protected]> Date: Tue Sep 1 09:39:58 2015 +0100 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 <[email protected]> Tested-by: Miklos Vajna <[email protected]> diff --git a/oox/source/ppt/slidefragmenthandler.cxx b/oox/source/ppt/slidefragmenthandler.cxx index 95ea839..5a27ea3 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() );
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
