[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - oox/source

[Caolán McNamara]

 oox/source/ppt/slidefragmenthandler.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 414230d695780e5813a87ca21b17ece081950530
Author: Caolán McNamara <caol...@redhat.com>
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/18225
    Reviewed-by: Jan Holesovsky <ke...@collabora.com>
    Tested-by: Jan Holesovsky <ke...@collabora.com>

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
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits