Change in core[libreoffice-4-0]: Hyperlink is an optional property, fdo#58858

[Markus Mohrhard (via Code Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/1941

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/41/1941/1

Hyperlink is an optional property, fdo#58858

Change-Id: I30f2b0cdb72951a47cfd8d0091b5418fd59efe83
Reviewed-on: https://gerrit.libreoffice.org/1930
Reviewed-by: Noel Power <noel.po...@suse.com>
Tested-by: Noel Power <noel.po...@suse.com>
---
M sc/source/filter/xml/xmlexprt.cxx
1 file changed, 10 insertions(+), 3 deletions(-)



diff --git a/sc/source/filter/xml/xmlexprt.cxx 
b/sc/source/filter/xml/xmlexprt.cxx
index 7ac0351..b599e6e 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -3092,9 +3092,16 @@
     {
         // #i66550 HLINK_FOR_SHAPES
         rtl::OUString sHlink;
-        uno::Reference< beans::XPropertySet > xProps( xShape, uno::UNO_QUERY );
-        if ( xProps.is() )
-            xProps->getPropertyValue( rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_HYPERLINK ) ) ) >>= sHlink;
+        try
+        {
+            uno::Reference< beans::XPropertySet > xProps( xShape, 
uno::UNO_QUERY );
+            if ( xProps.is() )
+                xProps->getPropertyValue( rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_HYPERLINK ) ) ) >>= sHlink;
+        }
+        catch ( const beans::UnknownPropertyException& )
+        {
+            // no hyperlink property
+        }
 
         std::auto_ptr< SvXMLElementExport > pDrawA;
         // enlose shapes with <draw:a> element only if sHlink contains 
something

-- 
To view, visit https://gerrit.libreoffice.org/1941
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I30f2b0cdb72951a47cfd8d0091b5418fd59efe83
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Markus Mohrhard <markus.mohrh...@googlemail.com>
Gerrit-Reviewer: Noel Power <noel.po...@suse.com>
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice