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

[Markus Mohrhard]

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

New commits:
commit e483ea0d8abda0eb5a0e8cef55229f3e8ac06a21
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date:   Thu Jan 31 00:19:00 2013 +0100

    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>
    Reviewed-on: https://gerrit.libreoffice.org/1941

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 @@ void ScXMLExport::ExportShape(const uno::Reference < 
drawing::XShape >& xShape,
     {
         // #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
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits