[Libreoffice-commits] core.git: sw/qa xmloff/source

[Caolán McNamara]

 sw/qa/core/data/odt/pass/tdf112122.odt |binary
 xmloff/source/text/txtparai.cxx        |    2 +-
 xmloff/source/text/txtparai.hxx        |    2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 70b9aa7bc1b6c1af358a14843c777c9d150f745d
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Aug 31 13:43:53 2017 +0100

    Resolves: tdf#112122 Use EndElement instead of dtor to call throwing methods
    
    Change-Id: I1cc3b9af4089f1e657c5c63e0911aac8bdce04f3
    Reviewed-on: https://gerrit.libreoffice.org/41756
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/sw/qa/core/data/odt/pass/tdf112122.odt b/sw/qa/core/data/odt/pass/tdf112122.odt
new file mode 100644
index 000000000000..83f602a807b1
Binary files /dev/null and b/sw/qa/core/data/odt/pass/tdf112122.odt differ
diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx
index d5142d917243..f7b947c3899d 100644
--- a/xmloff/source/text/txtparai.cxx
+++ b/xmloff/source/text/txtparai.cxx
@@ -1876,7 +1876,7 @@ XMLParaContext::XMLParaContext(
     }
 }
 
-XMLParaContext::~XMLParaContext()
+void XMLParaContext::EndElement()
 {
     rtl::Reference < XMLTextImportHelper > xTxtImport(
         GetImport().GetTextImport());
diff --git a/xmloff/source/text/txtparai.hxx b/xmloff/source/text/txtparai.hxx
index 18dc3e78523a..1f101cdda74a 100644
--- a/xmloff/source/text/txtparai.hxx
+++ b/xmloff/source/text/txtparai.hxx
@@ -63,7 +63,7 @@ public:
             const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList,
             bool bHeading );
 
-    virtual ~XMLParaContext() override;
+    virtual void EndElement() override;
 
     virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
             const OUString& rLocalName,