summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2018-09-06 22:02:56 +0200
committerCaolán McNamara <caolanm@redhat.com>2018-09-07 21:32:01 +0200
commit7d1612ca3e29dce226700551040ceac1de99299b (patch)
tree4d34a6be794a592a18571243518ffb8527764f26
parentb3ec27dd47f56ecdc1455147f058687986cd4072 (diff)
tdf#119694: read embedded hsqldb file generated before 6.1
Regression from: https://cgit.freedesktop.org/libreoffice/core/commit/?id=ebb34571c19c5ac939fbf5aed2ab66ee18e298dc Thank you Drew Jensen for the bibisect! Change-Id: I9550f61709e8582a52554f578ef043c6551f09f0 Reviewed-on: https://gerrit.libreoffice.org/60117 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Tested-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 4b5194bd1d0dd893720ec0b311ee215a3168219f) Reviewed-on: https://gerrit.libreoffice.org/60131 Tested-by: Jenkins (cherry picked from commit 6e0e3872f30c177559446b2c050b2a6582f257ec) Reviewed-on: https://gerrit.libreoffice.org/60143 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--dbaccess/source/filter/xml/xmlfilter.cxx1
1 files changed, 1 insertions, 0 deletions
diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx
index a77db0ecec0f..02fd2fda823e 100644
--- a/dbaccess/source/filter/xml/xmlfilter.cxx
+++ b/dbaccess/source/filter/xml/xmlfilter.cxx
@@ -655,6 +655,7 @@ const SvXMLTokenMap& ODBFilter::GetDocContentElemTokenMap() const
{ XML_NAMESPACE_OOO, XML_AUTOMATIC_STYLES, XML_TOK_CONTENT_AUTOSTYLES },
{ XML_NAMESPACE_OFFICE, XML_SCRIPTS, XML_TOK_CONTENT_SCRIPTS },
{ XML_NAMESPACE_OFFICE, XML_BODY, XML_TOK_CONTENT_BODY },
+ { XML_NAMESPACE_OOO, XML_BODY, XML_TOK_CONTENT_BODY },
XML_TOKEN_MAP_END
};
m_pDocContentElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap ));