sw/source/filter/xml/xmltbli.cxx | 4 +++- xmloff/source/text/txtimp.cxx | 1 + 2 files changed, 4 insertions(+), 1 deletion(-)
New commits: commit a4f907edbc1f6ce375bbf71c44733bb85f67a74f Author: Miklos Vajna <[email protected]> Date: Sat Dec 27 12:11:36 2014 +0100 fdo#84714 ODT import: read <loext:table> inside <draw:custom-shape> A later version of ODF will hopefully allow <table:table> here as well, but read <loext:table> in the meantime. Change-Id: I42a461e0a6e9eff9387379acbab9660a155ecefe (cherry picked from commit 62391c28fae5099dd1f67c322867933fcb05bc9f) Reviewed-on: https://gerrit.libreoffice.org/13857 Tested-by: Michael Stahl <[email protected]> Reviewed-by: Michael Stahl <[email protected]> diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx index a9a9a50..34adb0b 100644 --- a/sw/source/filter/xml/xmltbli.cxx +++ b/sw/source/filter/xml/xmltbli.cxx @@ -105,10 +105,12 @@ static SvXMLTokenMapEntry aTableElemTokenMap[] = XML_TOK_TABLE_HEADER_COLS }, { XML_NAMESPACE_TABLE, XML_TABLE_COLUMNS, XML_TOK_TABLE_COLS }, { XML_NAMESPACE_TABLE, XML_TABLE_COLUMN, XML_TOK_TABLE_COL }, + { XML_NAMESPACE_LO_EXT, XML_TABLE_COLUMN, XML_TOK_TABLE_COL }, { XML_NAMESPACE_TABLE, XML_TABLE_HEADER_ROWS, XML_TOK_TABLE_HEADER_ROWS }, { XML_NAMESPACE_TABLE, XML_TABLE_ROWS, XML_TOK_TABLE_ROWS }, { XML_NAMESPACE_TABLE, XML_TABLE_ROW, XML_TOK_TABLE_ROW }, + { XML_NAMESPACE_LO_EXT, XML_TABLE_ROW, XML_TOK_TABLE_ROW }, { XML_NAMESPACE_OFFICE, XML_DDE_SOURCE, XML_TOK_OFFICE_DDE_SOURCE }, @@ -968,7 +970,7 @@ SvXMLImportContext *SwXMLTableRowContext_Impl::CreateChildContext( { SvXMLImportContext *pContext = 0; - if( XML_NAMESPACE_TABLE == nPrefix ) + if( XML_NAMESPACE_TABLE == nPrefix || XML_NAMESPACE_LO_EXT == nPrefix ) { if( IsXMLToken( rLocalName, XML_TABLE_CELL ) ) { diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx index f985cda..6c74084 100644 --- a/xmloff/source/text/txtimp.cxx +++ b/xmloff/source/text/txtimp.cxx @@ -87,6 +87,7 @@ static const SvXMLTokenMapEntry aTextElemTokenMap[] = { XML_NAMESPACE_DRAW, XML_FRAME, XML_TOK_TEXT_FRAME_PAGE }, { XML_NAMESPACE_DRAW, XML_A, XML_TOK_DRAW_A_PAGE }, { XML_NAMESPACE_TABLE,XML_TABLE, XML_TOK_TABLE_TABLE }, + { XML_NAMESPACE_LO_EXT,XML_TABLE, XML_TOK_TABLE_TABLE }, { XML_NAMESPACE_TEXT, XML_VARIABLE_DECLS, XML_TOK_TEXT_VARFIELD_DECLS }, { XML_NAMESPACE_TEXT, XML_USER_FIELD_DECLS, XML_TOK_TEXT_USERFIELD_DECLS }, { XML_NAMESPACE_TEXT, XML_SEQUENCE_DECLS, XML_TOK_TEXT_SEQUENCE_DECLS }, _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
