[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - xmloff/source

[Miklos Vajna]

 xmloff/source/forms/officeforms.cxx |   10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 2d52443bf2a9c639e253f7658cca2c2c72460eca
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Wed Jan 28 12:16:40 2015 +0100

    OFormsRootImport::CreateChildContext: survive a missing css.form.Forms
    
    At least moz406390-1.odt has an unreferenced (so uninteresting in
    practice) <form:form> block. Till there is a real benefit of it, better
    not add form/database components to the Android component list but teach
    the user of such code to fail gracefully.
    
    Change-Id: I165a09fefa887da7b78a917c43ecc17d8f0ba3e2

diff --git a/xmloff/source/forms/officeforms.cxx b/xmloff/source/forms/officeforms.cxx
index 014d792..e289e78 100644
--- a/xmloff/source/forms/officeforms.cxx
+++ b/xmloff/source/forms/officeforms.cxx
@@ -53,7 +53,15 @@ namespace xmloff
     SvXMLImportContext* OFormsRootImport::CreateChildContext( sal_uInt16 _nPrefix, const OUString& _rLocalName,
             const Reference< XAttributeList>& xAttrList )
     {
-        return GetImport().GetFormImport()->createContext( _nPrefix, _rLocalName, xAttrList );
+        SvXMLImportContext* pRet = 0;
+        try
+        {
+            pRet = GetImport().GetFormImport()->createContext( _nPrefix, _rLocalName, xAttrList );
+        } catch (const Exception& rException)
+        {
+            SAL_WARN("xmloff.forms", "OFormsRootImport::CreateChildContext: " << rException.Message);
+        }
+        return pRet;
     }
 
     void OFormsRootImport::implImportBool(const Reference< XAttributeList >& _rxAttributes, OfficeFormsAttributes _eAttribute,