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 /cui | |
| 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 'cui')
| -rw-r--r-- | cui/source/dialogs/cuigaldlg.cxx | 2 | ||||
| -rw-r--r-- | cui/source/dialogs/linkdlg.cxx | 2 | ||||
| -rw-r--r-- | cui/source/tabpages/tpbitmap.cxx | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx index 799440789bb2..24b03ef54348 100644 --- a/cui/source/dialogs/cuigaldlg.cxx +++ b/cui/source/dialogs/cuigaldlg.cxx @@ -162,7 +162,7 @@ void SearchThread::ImplSearch( const INetURLObject& rStartURL, != rFormats.end() ) || std::find( rFormats.begin(), rFormats.end(), - aFoundURL.GetExtension().toAsciiLowerCase() ) + aFoundURL.GetFileExtension().toAsciiLowerCase()) != rFormats.end() ) { SolarMutexGuard aGuard; diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx index 238156007a7e..ca8c1280ac60 100644 --- a/cui/source/dialogs/linkdlg.cxx +++ b/cui/source/dialogs/linkdlg.cxx @@ -303,7 +303,7 @@ IMPL_LINK_NOARG(SvBaseLinksDlg, ChangeSourceClickHdl, weld::Button&, void) if(aUrl.GetProtocol() == INetProtocol::File) { OUString sOldPath(aUrl.PathToFileName()); - sal_Int32 nLen = aUrl.GetName().getLength(); + sal_Int32 nLen = aUrl.GetLastName().getLength(); sOldPath = sOldPath.copy(0, sOldPath.getLength() - nLen); xFolderPicker->setDisplayDirectory(sOldPath); } diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx index f291b1bdf48a..a116b587c8c7 100644 --- a/cui/source/tabpages/tpbitmap.cxx +++ b/cui/source/tabpages/tpbitmap.cxx @@ -745,7 +745,8 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickImportHdl, weld::Button&, void) OUString aName; INetURLObject aURL( aDlg.GetPath() ); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - ScopedVclPtr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog(GetDialogFrameWeld(), aURL.GetName().getToken(0, '.'), aDesc)); + ScopedVclPtr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog( + GetDialogFrameWeld(), aURL.GetLastName().getToken(0, '.'), aDesc)); nError = ErrCode(1); while( pDlg->Execute() == RET_OK ) |