diff options
author | Mike Kaganski <mike.kaganski@collabora.com> | 2019-06-20 23:07:30 +1000 |
---|---|---|
committer | Mike Kaganski <mike.kaganski@collabora.com> | 2019-06-21 00:47:22 +0200 |
commit | cb28e48bfd7e8727797435dc05bdfe1652fb34f0 (patch) | |
tree | 544789048956324c6192d6f53e10392dcef12c42 /extensions | |
parent | 6153bedd8948cc05a9d8d338bac1d5858635c5ba (diff) |
Drop INetURLObject::GetName and INetURLObject::GetExtension
They are just synonyms for GetLastName and GetFileExtension resp.
Change-Id: Ic498c7025cc421b830394ed94d64529fd74fe7dd
Reviewed-on: https://gerrit.libreoffice.org/74448
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'extensions')
-rw-r--r-- | extensions/source/abpilot/abpfinalpage.cxx | 2 | ||||
-rw-r--r-- | extensions/source/dbpilots/controlwizard.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/extensions/source/abpilot/abpfinalpage.cxx b/extensions/source/abpilot/abpfinalpage.cxx index 92a7e804f6e4..cf2598ef042b 100644 --- a/extensions/source/abpilot/abpfinalpage.cxx +++ b/extensions/source/abpilot/abpfinalpage.cxx @@ -124,7 +124,7 @@ namespace abp rSettings.sDataSourceName = aURL.GetMainURL( INetURLObject::DecodeMechanism::NONE ); m_pLocationController->setURL( rSettings.sDataSourceName ); OUString sName = aURL.getName( ); - sal_Int32 nPos = sName.indexOf(aURL.GetExtension()); + sal_Int32 nPos = sName.indexOf(aURL.GetFileExtension()); if ( nPos != -1 ) { sName = sName.replaceAt(nPos-1, 4, ""); diff --git a/extensions/source/dbpilots/controlwizard.cxx b/extensions/source/dbpilots/controlwizard.cxx index 4453b72f95f0..1e8494f73f13 100644 --- a/extensions/source/dbpilots/controlwizard.cxx +++ b/extensions/source/dbpilots/controlwizard.cxx @@ -213,7 +213,7 @@ namespace dbp INetURLObject aURL( sDataSource ); if( aURL.GetProtocol() != INetProtocol::NotValid ) - sDataSource = aURL.GetName(INetURLObject::DecodeMechanism::WithCharset); + sDataSource = aURL.GetLastName(INetURLObject::DecodeMechanism::WithCharset); m_pFormDatasource->SetText(sDataSource); m_pFormTable->SetText(sCommand); |