Kaydet (Commit) 6864e3fc authored tarafından Markus Mohrhard's avatar Markus Mohrhard

the attribute name is actually table:database-table-name

Change-Id: I9522529d918e143aafa6ea368fdb3fa55416d58b
Reviewed-on: https://gerrit.libreoffice.org/15176Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarMarkus Mohrhard <markus.mohrhard@googlemail.com>
üst 15e758d1
...@@ -566,6 +566,7 @@ namespace xmloff { namespace token { ...@@ -566,6 +566,7 @@ namespace xmloff { namespace token {
XML_DATABASE_SOURCE_QUERY, XML_DATABASE_SOURCE_QUERY,
XML_DATABASE_SOURCE_SQL, XML_DATABASE_SOURCE_SQL,
XML_DATABASE_SOURCE_TABLE, XML_DATABASE_SOURCE_TABLE,
XML_DATABASE_TABLE_NAME,
XML_DATE, XML_DATE,
XML_DATE_IS, XML_DATE_IS,
XML_DATE_ADJUST, XML_DATE_ADJUST,
......
...@@ -861,7 +861,7 @@ void ScXMLExportDataPilot::WriteDataPilots(const uno::Reference <sheet::XSpreads ...@@ -861,7 +861,7 @@ void ScXMLExportDataPilot::WriteDataPilots(const uno::Reference <sheet::XSpreads
case sheet::DataImportMode_TABLE : case sheet::DataImportMode_TABLE :
{ {
rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DATABASE_NAME, pImpSource->aDBName); 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); SvXMLElementExport aElemID(rExport, XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_TABLE, true, true);
rExport.CheckAttrList(); rExport.CheckAttrList();
} }
......
...@@ -262,7 +262,7 @@ private: ...@@ -262,7 +262,7 @@ private:
{ {
if (!sDatabaseName.isEmpty()) if (!sDatabaseName.isEmpty())
mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DATABASE_NAME, sDatabaseName); 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); SvXMLElementExport aElemID(mrExport, XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_TABLE, true, true);
if (!sConRes.isEmpty()) if (!sConRes.isEmpty())
{ {
......
...@@ -1257,6 +1257,7 @@ const SvXMLTokenMap& ScXMLImport::GetDatabaseRangeSourceTableAttrTokenMap() ...@@ -1257,6 +1257,7 @@ const SvXMLTokenMap& ScXMLImport::GetDatabaseRangeSourceTableAttrTokenMap()
{ XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_SOURCE_TABLE_ATTR_HREF }, { 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_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_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 XML_TOKEN_MAP_END
}; };
......
...@@ -570,6 +570,7 @@ namespace xmloff { namespace token { ...@@ -570,6 +570,7 @@ namespace xmloff { namespace token {
TOKEN( "database-source-query", XML_DATABASE_SOURCE_QUERY ), TOKEN( "database-source-query", XML_DATABASE_SOURCE_QUERY ),
TOKEN( "database-source-sql", XML_DATABASE_SOURCE_SQL ), TOKEN( "database-source-sql", XML_DATABASE_SOURCE_SQL ),
TOKEN( "database-source-table", XML_DATABASE_SOURCE_TABLE ), TOKEN( "database-source-table", XML_DATABASE_SOURCE_TABLE ),
TOKEN( "database-table-name", XML_DATABASE_TABLE_NAME ),
TOKEN( "date", XML_DATE ), TOKEN( "date", XML_DATE ),
TOKEN( "date-is", XML_DATE_IS ), TOKEN( "date-is", XML_DATE_IS ),
TOKEN( "date-adjust", XML_DATE_ADJUST ), TOKEN( "date-adjust", XML_DATE_ADJUST ),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment