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 /svl | |
| 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 'svl')
| -rw-r--r-- | svl/qa/unit/lockfiles/test_lockfiles.cxx | 2 | ||||
| -rw-r--r-- | svl/source/misc/lockfilecommon.cxx | 2 | ||||
| -rw-r--r-- | svl/source/misc/msodocumentlockfile.cxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/svl/qa/unit/lockfiles/test_lockfiles.cxx b/svl/qa/unit/lockfiles/test_lockfiles.cxx index 076d699484bb..5d2661ca00be 100644 --- a/svl/qa/unit/lockfiles/test_lockfiles.cxx +++ b/svl/qa/unit/lockfiles/test_lockfiles.cxx @@ -90,7 +90,7 @@ OUString readLockFile(const OUString& aSource) OUString GetLockFileName(const svt::GenDocumentLockFile& rLockFile) { INetURLObject aDocURL = svt::LockFileCommon::ResolveLinks(INetURLObject(rLockFile.GetURL())); - return aDocURL.GetName(); + return aDocURL.GetLastName(); } OUString LockfileTest::generateTestURL(const OUString& sFileName) const diff --git a/svl/source/misc/lockfilecommon.cxx b/svl/source/misc/lockfilecommon.cxx index fbcd27215c32..9a3cb0c7abe0 100644 --- a/svl/source/misc/lockfilecommon.cxx +++ b/svl/source/misc/lockfilecommon.cxx @@ -72,7 +72,7 @@ void LockFileCommon::SetURL(const OUString& aURL) OUString LockFileCommon::GenerateOwnLockFileURL(const OUString& aOrigURL, const OUString& aPrefix) { INetURLObject aURL = ResolveLinks(INetURLObject(aOrigURL)); - aURL.SetName(aPrefix + aURL.GetName() + "%23" /*'#'*/); + aURL.SetName(aPrefix + aURL.GetLastName() + "%23" /*'#'*/); return aURL.GetMainURL(INetURLObject::DecodeMechanism::NONE); } diff --git a/svl/source/misc/msodocumentlockfile.cxx b/svl/source/misc/msodocumentlockfile.cxx index 3b57402b7166..cdb4ddd2264f 100644 --- a/svl/source/misc/msodocumentlockfile.cxx +++ b/svl/source/misc/msodocumentlockfile.cxx @@ -45,7 +45,7 @@ OUString GenerateMSOLockFileURL(const OUString& aOrigURL) INetURLObject aURL = LockFileCommon::ResolveLinks(INetURLObject(aOrigURL)); // For text documents MSO Word cuts some of the first characters of the file name - OUString sFileName = aURL.GetName(); + OUString sFileName = aURL.GetLastName(); const OUString sExt = aURL.GetFileExtension(); if (isWordFormat(sExt)) |