oox/source/ppt/presentationfragmenthandler.cxx | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
New commits:
commit e6157763e9fff300b86f3c17398216f306ba3f32
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Nov 7 17:06:54 2016 +0000
google docs can generate a pptx with an empty cmLst
Change-Id: I2a3dcae5361929c6880b2da1b3107cb2c8141f32
diff --git a/oox/source/ppt/presentationfragmenthandler.cxx
b/oox/source/ppt/presentationfragmenthandler.cxx
index 944f134..b67eb8b 100644
--- a/oox/source/ppt/presentationfragmenthandler.cxx
+++ b/oox/source/ppt/presentationfragmenthandler.cxx
@@ -325,15 +325,18 @@ void PresentationFragmentHandler::importSlide(sal_uInt32
nSlide, bool bFirstPage
pCommentsPersistPtr->getCommentsList().cmLst.clear();
importSlide( xCommentsFragmentHandler, pCommentsPersistPtr );
- //set comment chars for last comment on slide
- SlideFragmentHandler* comment_handler =
-
dynamic_cast<SlideFragmentHandler*>(xCommentsFragmentHandler.get());
- // some comments have no text -> set empty string as text to
avoid
- // crash (back() on empty vector is undefined) and losing other
- // comment data that might be there (author, position,
timestamp etc.)
- pCommentsPersistPtr->getCommentsList().cmLst.back().setText(
- comment_handler->getCharVector().empty() ? "" :
- comment_handler->getCharVector().back() );
+ if (!pCommentsPersistPtr->getCommentsList().cmLst.empty())
+ {
+ //set comment chars for last comment on slide
+ SlideFragmentHandler* comment_handler =
+
dynamic_cast<SlideFragmentHandler*>(xCommentsFragmentHandler.get());
+ // some comments have no text -> set empty string as text
to avoid
+ // crash (back() on empty vector is undefined) and losing
other
+ // comment data that might be there (author, position,
timestamp etc.)
+
pCommentsPersistPtr->getCommentsList().cmLst.back().setText(
+ comment_handler->getCharVector().empty() ? "" :
+ comment_handler->getCharVector().back() );
+ }
pCommentsPersistPtr->getCommentAuthors().setValues(maAuthorList);
//insert all comments from commentsList
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
