[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - xmloff/source

[Markus Mohrhard]

 xmloff/source/chart/PropertyMaps.cxx |   11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

New commits:
commit cf5d6ccea23549aea708c6e399a982598b2b58aa
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Mon Oct 10 00:58:42 2016 +0200

    catch the exception to prevent broken charts, tdf#98690
    
    Change-Id: I5958c87ca793c19d5c78dc829eb0ff0a1e04dffa
    (cherry picked from commit 0ab45be62bc1ffcbdd13aca7375fdcd1bbccb79a)
    Reviewed-on: https://gerrit.libreoffice.org/29682
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>

diff --git a/xmloff/source/chart/PropertyMaps.cxx b/xmloff/source/chart/PropertyMaps.cxx
index 72dcf2c..30ff2a6 100644
--- a/xmloff/source/chart/PropertyMaps.cxx
+++ b/xmloff/source/chart/PropertyMaps.cxx
@@ -360,8 +360,15 @@ OUString convertRange( const OUString & rRange, const uno::Reference< chart2::XC
         return aResult;
     uno::Reference< chart2::data::XRangeXMLConversion > xConversion(
         xDoc->getDataProvider(), uno::UNO_QUERY );
-    if( xConversion.is())
-        aResult = xConversion->convertRangeToXML( rRange );
+    try
+    {
+        if( xConversion.is())
+            aResult = xConversion->convertRangeToXML( rRange );
+    }
+    catch (css::lang::IllegalArgumentException&)
+    {
+    }
+
     return aResult;
 }