[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - dbaccess/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Fri Sep 7 11:19:44 UTC 2018
dbaccess/source/filter/xml/xmlfilter.cxx | 1 +
1 file changed, 1 insertion(+)
New commits:
commit 6e0e3872f30c177559446b2c050b2a6582f257ec
Author: Julien Nabet <serval2412 at yahoo.fr>
AuthorDate: Thu Sep 6 22:02:56 2018 +0200
Commit: Michael Stahl <Michael.Stahl at cib.de>
CommitDate: Fri Sep 7 13:19:19 2018 +0200
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 at cib.de>
Tested-by: Michael Stahl <Michael.Stahl at cib.de>
(cherry picked from commit 4b5194bd1d0dd893720ec0b311ee215a3168219f)
Reviewed-on: https://gerrit.libreoffice.org/60131
Tested-by: Jenkins
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 ));
More information about the Libreoffice-commits
mailing list