[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sc/source

[Eike Rathke]

 sc/source/filter/xml/xmlexprt.cxx |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 3082b7aa748dfdea2126a0de7ca393c8bd658256
Author: Eike Rathke <erack at redhat.com>
Date:   Mon Jul 20 11:46:17 2015 +0200

    check annotation caption pointers, blind fix for rhbz#1242099
    
    Apparently there may have been situations when the caption or its shape
    could not be obtained for whatever reason.
    
    (cherry picked from commit 47d90af52a548429224c38b5c58a70116e0f7907)
    
    Conflicts:
    	sc/source/filter/xml/xmlexprt.cxx
    
    Change-Id: Ie9b97d4b3999cb4645bb6b8b688b3666cfd71ccc
    Reviewed-on: https://gerrit.libreoffice.org/17222
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index f82e0b4..bfd7e00 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -3714,9 +3714,12 @@ void ScXMLExport::WriteAnnotation(ScMyCell& rMyCell)
         pCurrentCell = &rMyCell;
 
         SdrCaptionObj* pNoteCaption = pNote->GetOrCreateCaption(rMyCell.maCellAddress);
-        Reference<drawing::XShape> xShape( pNoteCaption->getUnoShape(), uno::UNO_QUERY );
-
-        GetShapeExport()->exportShape(xShape, SEF_DEFAULT|SEF_EXPORT_ANNOTATION, NULL);
+        if (pNoteCaption)
+        {
+            Reference<drawing::XShape> xShape( pNoteCaption->getUnoShape(), uno::UNO_QUERY );
+            if (xShape.is())
+                GetShapeExport()->exportShape(xShape, SEF_DEFAULT|SEF_EXPORT_ANNOTATION, NULL);
+        }
 
         pCurrentCell = NULL;