diff options
| author | Michael Stahl <michael.stahl@allotropia.de> | 2021-01-08 20:22:05 +0100 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@allotropia.de> | 2021-01-12 11:03:36 +0100 |
| commit | f0949fb60de9c54ac95bbce7e57e36cb02759583 (patch) | |
| tree | 195dedca77d100011273d51cef6ecad2d3268707 /dbaccess | |
| parent | set fill color when filling alphavdev area for gradients (tdf#138959) (diff) | |
| download | core-f0949fb60de9c54ac95bbce7e57e36cb02759583.tar.gz core-f0949fb60de9c54ac95bbce7e57e36cb02759583.zip | |
xmloff: "form:datasource" vs. "db:data-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 3de38e95561ab7ca114d9f3307702ba89c4e3e9a)
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>
(cherry picked from commit db283d2e3f5cd8be412c5204f358cd06af761b13)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109000
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Tested-by: Michael Stahl <michael.stahl@allotropia.de>
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/source/filter/xml/xmlDatabase.cxx | 2 | ||||
| -rw-r--r-- | dbaccess/source/filter/xml/xmlExport.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/dbaccess/source/filter/xml/xmlDatabase.cxx b/dbaccess/source/filter/xml/xmlDatabase.cxx index 9de9bf349810..2f629caff37e 100644 --- a/dbaccess/source/filter/xml/xmlDatabase.cxx +++ b/dbaccess/source/filter/xml/xmlDatabase.cxx @@ -57,7 +57,7 @@ css::uno::Reference< css::xml::sax::XFastContextHandler > OXMLDatabase::createFa switch( nElement & TOKEN_MASK ) { - case XML_DATASOURCE: + case XML_DATA_SOURCE: GetOwnImport().GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP ); pContext = new OXMLDataSource( GetOwnImport(), xAttrList, OXMLDataSource::eDataSource ); break; diff --git a/dbaccess/source/filter/xml/xmlExport.cxx b/dbaccess/source/filter/xml/xmlExport.cxx index 985b6daf0249..61800a5ab194 100644 --- a/dbaccess/source/filter/xml/xmlExport.cxx +++ b/dbaccess/source/filter/xml/xmlExport.cxx @@ -420,7 +420,7 @@ void ODBExport::exportDataSource() if ( aDelimiter.bUsed ) 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(); exportDriverSettings(aSettingsMap); |