writerfilter: DOCX import: better error handling than "catch (...) {}"

If there is a SAXParseException, OOXMLDocumentImpl::resolve() should not
ignore it, because if it occurs in a substream some end tag handlers may
not have been run and the DomainMapper may be in an inconsistent state,
so continuing to parse the outer document is probably not a good idea.

Also add some exception mangling so sfx2 can present a useful error
dialog.

Change-Id: I169ba6db25f2ae264af08a64edf76a6bf6757f85

3 files changed, 40 insertions, 5 deletions

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx
index 6d7a87a68896..6a76477c06de 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx
@@ -266,11 +266,6 @@ DECLARE_OOXMLEXPORT_TEST(testMathLim, "math-lim.docx")
     CHECK_FORMULA( "lim from {x \xe2\x86\x92 1} {x}", getFormula( getRun( getParagraph( 1 ), 1 )));
 }
 
-DECLARE_OOXMLEXPORT_TEST(testMathMalformedXml, "math-malformed_xml.docx")
-{
-    CPPUNIT_ASSERT_EQUAL( 0, getLength());
-}
-
 DECLARE_OOXMLEXPORT_TEST(testMathMatrix, "math-matrix.docx")
 {
     CHECK_FORMULA( "left [matrix {1 # 2 ## 3 # 4} right ]", getFormula( getRun( getParagraph( 1 ), 1 )));
diff --git a/sw/qa/extras/ooxmlexport/data/math-malformed_xml.docx b/sw/qa/extras/ooxmlimport/data/math-malformed_xml.docx
index 53d64b039142..53d64b039142 100644
--- a/sw/qa/extras/ooxmlexport/data/math-malformed_xml.docx
+++ b/sw/qa/extras/ooxmlimport/data/math-malformed_xml.docx
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 52028993f9b3..a6fb079bdb88 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -89,6 +89,46 @@ public:
     }
 };
 
+class FailTest : public Test
+{
+public:
+    // UGLY: hacky manual override of MacrosTest::loadFromDesktop
+    void executeImportTest(const char* filename)
+    {
+        header();
+        preTest(filename);
+        {
+            if (mxComponent.is())
+                mxComponent->dispose();
+            std::cout << filename << ",";
+            mnStartTime = osl_getGlobalTimer();
+            {
+                OUString aURL(getURLFromSrc(mpTestDocumentPath) + OUString::createFromAscii(filename));
+                CPPUNIT_ASSERT_MESSAGE("no desktop", mxDesktop.is());
+                uno::Reference<frame::XComponentLoader> xLoader = uno::Reference<frame::XComponentLoader>(mxDesktop, uno::UNO_QUERY);
+                CPPUNIT_ASSERT_MESSAGE("no loader", xLoader.is());
+                uno::Sequence<beans::PropertyValue> args(1);
+                args[0].Name = "DocumentService";
+                args[0].Handle = -1;
+                args[0].Value <<= OUString("com.sun.star.text.TextDocument");
+                args[0].State = beans::PropertyState_DIRECT_VALUE;
+
+                uno::Reference<lang::XComponent> xComponent = xLoader->loadComponentFromURL(aURL, OUString("_default"), 0, args);
+                OUString sMessage = "loading succeeded: " + aURL;
+                CPPUNIT_ASSERT_MESSAGE(OUStringToOString(sMessage, RTL_TEXTENCODING_UTF8).getStr(), !xComponent.is());
+            }
+        }
+        postTest(filename);
+        verify();
+        finish();
+    }
+};
+
+DECLARE_SW_IMPORT_TEST(testMathMalformedXml, "math-malformed_xml.docx", FailTest)
+{
+    CPPUNIT_ASSERT(!mxComponent.is());
+}
+
 DECLARE_OOXMLIMPORT_TEST(testN751054, "n751054.docx")
 {
     text::TextContentAnchorType eValue = getProperty<text::TextContentAnchorType>(getShape(1), "AnchorType");