include/xmloff/xmltoken.hxx | 1 + sc/source/filter/xml/XMLExportDataPilot.cxx | 2 +- sc/source/filter/xml/XMLExportDatabaseRanges.cxx | 2 +- sc/source/filter/xml/xmlimprt.cxx | 1 + xmloff/source/core/xmltoken.cxx | 1 + 5 files changed, 5 insertions(+), 2 deletions(-)
New commits: commit 6864e3fc586f31376ffa11ac79dd159c72150cf1 Author: Markus Mohrhard <markus.mohrh...@googlemail.com> Date: Mon Apr 6 22:39:44 2015 +0200 the attribute name is actually table:database-table-name Change-Id: I9522529d918e143aafa6ea368fdb3fa55416d58b Reviewed-on: https://gerrit.libreoffice.org/15176 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrh...@googlemail.com> diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx index 2527a8f..64a0826 100644 --- a/include/xmloff/xmltoken.hxx +++ b/include/xmloff/xmltoken.hxx @@ -566,6 +566,7 @@ namespace xmloff { namespace token { XML_DATABASE_SOURCE_QUERY, XML_DATABASE_SOURCE_SQL, XML_DATABASE_SOURCE_TABLE, + XML_DATABASE_TABLE_NAME, XML_DATE, XML_DATE_IS, XML_DATE_ADJUST, diff --git a/sc/source/filter/xml/XMLExportDataPilot.cxx b/sc/source/filter/xml/XMLExportDataPilot.cxx index ff2da63..09a3390 100644 --- a/sc/source/filter/xml/XMLExportDataPilot.cxx +++ b/sc/source/filter/xml/XMLExportDataPilot.cxx @@ -861,7 +861,7 @@ void ScXMLExportDataPilot::WriteDataPilots(const uno::Reference <sheet::XSpreads case sheet::DataImportMode_TABLE : { rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DATABASE_NAME, pImpSource->aDBName); - rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_TABLE_NAME, pImpSource->aObject); + rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DATABASE_TABLE_NAME, pImpSource->aObject); SvXMLElementExport aElemID(rExport, XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_TABLE, true, true); rExport.CheckAttrList(); } diff --git a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx index 12ce267..179f278 100644 --- a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx +++ b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx @@ -262,7 +262,7 @@ private: { if (!sDatabaseName.isEmpty()) mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DATABASE_NAME, sDatabaseName); - mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_TABLE_NAME, aParam.aStatement); + mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DATABASE_TABLE_NAME, aParam.aStatement); SvXMLElementExport aElemID(mrExport, XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_TABLE, true, true); if (!sConRes.isEmpty()) { diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx index 19c7a87..c630040 100644 --- a/sc/source/filter/xml/xmlimprt.cxx +++ b/sc/source/filter/xml/xmlimprt.cxx @@ -1257,6 +1257,7 @@ const SvXMLTokenMap& ScXMLImport::GetDatabaseRangeSourceTableAttrTokenMap() { XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_SOURCE_TABLE_ATTR_HREF }, { XML_NAMESPACE_TABLE, XML_CONNECTION_RESOURCE, XML_TOK_SOURCE_TABLE_ATTR_CONNECTION_RESOURCE }, { XML_NAMESPACE_TABLE, XML_TABLE_NAME, XML_TOK_SOURCE_TABLE_ATTR_TABLE_NAME }, + { XML_NAMESPACE_TABLE, XML_DATABASE_TABLE_NAME, XML_TOK_SOURCE_TABLE_ATTR_TABLE_NAME }, XML_TOKEN_MAP_END }; diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx index faefa0e..eb88687 100644 --- a/xmloff/source/core/xmltoken.cxx +++ b/xmloff/source/core/xmltoken.cxx @@ -570,6 +570,7 @@ namespace xmloff { namespace token { TOKEN( "database-source-query", XML_DATABASE_SOURCE_QUERY ), TOKEN( "database-source-sql", XML_DATABASE_SOURCE_SQL ), TOKEN( "database-source-table", XML_DATABASE_SOURCE_TABLE ), + TOKEN( "database-table-name", XML_DATABASE_TABLE_NAME ), TOKEN( "date", XML_DATE ), TOKEN( "date-is", XML_DATE_IS ), TOKEN( "date-adjust", XML_DATE_ADJUST ), _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits