[Libreoffice-commits] core.git: 2 commits - sc/source

[Markus Mohrhard]

 sc/source/filter/orcus/xmlcontext.cxx |    7 ++++++-
 sc/source/ui/view/cellsh2.cxx         |    6 +++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

New commits:
commit 0375de72a5d53463cb9ce12ca7a12adf1037cd07
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sat Aug 12 11:38:56 2017 +0200

    better error reporting for xml source feature
    
    Change-Id: I1ad9329904fe6d705a1a05b9cd65123b5e010014
    Reviewed-on: https://gerrit.libreoffice.org/41084
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/sc/source/filter/orcus/xmlcontext.cxx b/sc/source/filter/orcus/xmlcontext.cxx
index cdbde68f81ee..a84b9b2c0c4d 100644
--- a/sc/source/filter/orcus/xmlcontext.cxx
+++ b/sc/source/filter/orcus/xmlcontext.cxx
@@ -22,6 +22,7 @@
 #include <orcus/xml_namespace.hpp>
 #include <orcus/orcus_xml.hpp>
 #include <orcus/global.hpp>
+#include <orcus/sax_parser_base.hpp>
 
 #include <com/sun/star/ucb/XCommandEnvironment.hpp>
 
@@ -206,9 +207,13 @@ void ScOrcusXMLContextImpl::loadXMLStructure(SvTreeListBox& rTreeCtrl, ScOrcusXM
         orcus::xml_structure_tree::element aElem = aWalker.root();
         populateTree(rTreeCtrl, aWalker, aElem.name, aElem.repeat, nullptr, rParam);
     }
+    catch (const orcus::sax::malformed_xml_error& e)
+    {
+        SAL_WARN("sc.orcus", "Malformed XML error: " << e.what());
+    }
     catch (const std::exception&)
     {
-        // Parsing of this XML file failed.
+        SAL_WARN("sc.orcus", "parsing failed with an unknown error");
     }
 }
 
commit 65722772f00a40b8ca8adf21e31c22295ef7d215
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sat Aug 12 11:41:11 2017 +0200

    enable the xml source feature when the experimental features are enabled
    
    Change-Id: I066b2927c5e22664b7a4e96549da3a02ec4c99d3
    Reviewed-on: https://gerrit.libreoffice.org/41085
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx
index 7a2848251b1a..4908f4179136 100644
--- a/sc/source/ui/view/cellsh2.cxx
+++ b/sc/source/ui/view/cellsh2.cxx
@@ -1215,7 +1215,11 @@ void ScCellShell::GetDBState( SfxItemSet& rSet )
                 }
                 break;
             case SID_MANAGE_XML_SOURCE:
-                rSet.DisableItem(nWhich);
+                {
+                    SvtMiscOptions aMiscOptions;
+                    if ( !aMiscOptions.IsExperimentalMode() )
+                        rSet.DisableItem( nWhich );
+                }
             break;
         }
         nWhich = aIter.NextWhich();