mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xmloff: "form:datasource" vs. "db:data-source"

Browse Source 
Recently xmloff started to use XML_DATASOURCE for "form:datasource"
but it actually means "data-source".

Add XML_DATA_SOURCE and use it for "db:data-source".

(regression from 3de38e9556)

Change-Id: I893efd3fb0fb7c19ae998442459bf36cb1da0b20
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109019
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
This commit is contained in:
Michael Stahl
2021-01-08 20:22:05 +01:00
parent df8d5a15fb
commit db283d2e3f
5 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dbaccess/source/filter/xml/xmlDatabase.cxx
View File

@@ -57,7 +57,7 @@ css::uno::Reference< css::xml::sax::XFastContextHandler > OXMLDatabase::createFa
switch( nElement & TOKEN_MASK ) switch( nElement & TOKEN_MASK )
{ {
case XML_DATASOURCE: case XML_DATA_SOURCE:
GetOwnImport().GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP ); GetOwnImport().GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP );
pContext = new OXMLDataSource( GetOwnImport(), xAttrList, OXMLDataSource::eDataSource ); pContext = new OXMLDataSource( GetOwnImport(), xAttrList, OXMLDataSource::eDataSource );
break; break;

2
dbaccess/source/filter/xml/xmlExport.cxx
View File

@@ -420,7 +420,7 @@ void ODBExport::exportDataSource()
if ( aDelimiter.bUsed ) if ( aDelimiter.bUsed )
m_aDelimiter.reset( new TDelimiter( aDelimiter ) ); m_aDelimiter.reset( new TDelimiter( aDelimiter ) );
SvXMLElementExport aElem(*this,XML_NAMESPACE_DB, XML_DATASOURCE, true, true); SvXMLElementExport aElem(*this, XML_NAMESPACE_DB, XML_DATA_SOURCE, true, true);
exportConnectionData(); exportConnectionData();
exportDriverSettings(aSettingsMap); exportDriverSettings(aSettingsMap);

3
include/xmloff/xmltoken.hxx
View File

@@ -2304,7 +2304,8 @@ namespace xmloff::token {
XML_SORTED_ASCENDING, XML_SORTED_ASCENDING,
XML_DATABASE, XML_DATABASE,
XML_DATASOURCE, XML_DATASOURCE, // forms "datasource"
XML_DATA_SOURCE, // db "data-source"
XML_QUERIES, XML_QUERIES,
XML_REPORTS, XML_REPORTS,
XML_REPORT, XML_REPORT,

3
xmloff/source/core/xmltoken.cxx
View File

@@ -2316,7 +2316,8 @@ namespace xmloff::token {
TOKEN( "sorted-ascending", XML_SORTED_ASCENDING ), TOKEN( "sorted-ascending", XML_SORTED_ASCENDING ),
TOKEN( "database", XML_DATABASE ), TOKEN( "database", XML_DATABASE ),
TOKEN( "data-source", XML_DATASOURCE ), TOKEN( "datasource", XML_DATASOURCE ),
TOKEN( "data-source", XML_DATA_SOURCE ),
TOKEN( "queries", XML_QUERIES ), TOKEN( "queries", XML_QUERIES ),
TOKEN( "reports", XML_REPORTS ), TOKEN( "reports", XML_REPORTS ),
TOKEN( "report", XML_REPORT ), TOKEN( "report", XML_REPORT ),

1
xmloff/source/token/tokens.txt
View File

@@ -2183,6 +2183,7 @@ unsorted
font-independent-line-spacing font-independent-line-spacing
sorted-ascending sorted-ascending
database database
datasource
data-source data-source
queries queries
reports reports