diff options
| author | Gabor Kelemen <kelemen.gabor2@nisz.hu> | 2020-04-02 01:28:21 +0200 |
|---|---|---|
| committer | László Németh <nemeth@numbertext.org> | 2020-04-02 18:53:52 +0200 |
| commit | f16214fc22aa6665bc9667033496f8e4bed80e05 (patch) | |
| tree | 0d1578b838621329c5a2d96af5ef1abee36e72e9 /extensions | |
| parent | c93b2a24d42b31043e2456b222bcb433175d6ce9 (diff) | |
tdf#117101 Make Spreadsheet the default new data source type
instead of DBase. It's more likely that people are having those as
data source for Mail Merge
Also change method name to mirror the "Other" option that was selected
in the firs step of the wizard
Change-Id: I12b7fa98ada3af4fd39614a77b47cb587743b614
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91541
Tested-by: Jenkins
Tested-by: László Németh <nemeth@numbertext.org>
Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/source/abpilot/abspilot.cxx | 2 | ||||
| -rw-r--r-- | extensions/source/abpilot/datasourcehandling.cxx | 5 | ||||
| -rw-r--r-- | extensions/source/abpilot/datasourcehandling.hxx | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/extensions/source/abpilot/abspilot.cxx b/extensions/source/abpilot/abspilot.cxx index be1f98daf0eb..11376effb3a9 100644 --- a/extensions/source/abpilot/abspilot.cxx +++ b/extensions/source/abpilot/abspilot.cxx @@ -343,7 +343,7 @@ namespace abp break; case AST_OTHER: - m_aNewDataSource = aContext.createNewDBase( m_aSettings.sDataSourceName ); + m_aNewDataSource = aContext.createNewOther( m_aSettings.sDataSourceName ); break; case AST_INVALID: diff --git a/extensions/source/abpilot/datasourcehandling.cxx b/extensions/source/abpilot/datasourcehandling.cxx index 00ab85a2486a..46b71839d8e2 100644 --- a/extensions/source/abpilot/datasourcehandling.cxx +++ b/extensions/source/abpilot/datasourcehandling.cxx @@ -280,9 +280,10 @@ namespace abp } - ODataSource ODataSourceContext::createNewDBase( const OUString& _rName) + // tdf117101: Spreadsheet by default + ODataSource ODataSourceContext::createNewOther( const OUString& _rName) { - return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:dbase:" ); + return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:calc:" ); } struct ODataSourceImpl diff --git a/extensions/source/abpilot/datasourcehandling.hxx b/extensions/source/abpilot/datasourcehandling.hxx index 00da09f7941d..98e62e90ef3b 100644 --- a/extensions/source/abpilot/datasourcehandling.hxx +++ b/extensions/source/abpilot/datasourcehandling.hxx @@ -80,8 +80,8 @@ namespace abp /// creates a new macOS address book data source ODataSource createNewMacab( const OUString& _rName ); - /// creates a new dBase data source - ODataSource createNewDBase( const OUString& _rName ); + /// creates a new Other data source; tdf117101: Spreadsheet by default + ODataSource createNewOther( const OUString& _rName ); }; struct ODataSourceImpl; |