diff options
| author | Eike Rathke <erack@redhat.com> | 2015-07-20 11:46:17 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2015-07-20 12:22:29 +0200 |
| commit | 47d90af52a548429224c38b5c58a70116e0f7907 (patch) | |
| tree | 0ff8209a66b72ba35b81b5c395416aeea5416a22 /sc | |
| parent | 09491390e6662516339f8aa920bb8ae9493e34c0 (diff) | |
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.
Change-Id: Ie9b97d4b3999cb4645bb6b8b688b3666cfd71ccc
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/filter/xml/xmlexprt.cxx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index 969df4af1780..6abf4be812cf 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -3581,9 +3581,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|XMLShapeExportFlags::ANNOTATION, NULL); + if (pNoteCaption) + { + Reference<drawing::XShape> xShape( pNoteCaption->getUnoShape(), uno::UNO_QUERY ); + if (xShape.is()) + GetShapeExport()->exportShape(xShape, SEF_DEFAULT|XMLShapeExportFlags::ANNOTATION, NULL); + } pCurrentCell = NULL; |