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 /sc | |
| 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 'sc')
| -rw-r--r-- | sc/source/filter/html/htmlexp.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/view/prevwsh.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/view/printfun.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/view/tabvwsh4.cxx | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx index 8b9a5ade838b..3e5acc29a43d 100644 --- a/sc/source/filter/html/htmlexp.cxx +++ b/sc/source/filter/html/htmlexp.cxx @@ -1276,7 +1276,7 @@ void ScHTMLExport::CopyLocalFileToINet( OUString& rFileNm, OUString aSrc = rFileNm; OUString aDest = aTargetUrl.GetPartBeforeLastName(); - aDest += aFileUrl.GetName(); + aDest += aFileUrl.GetLastName(); SfxMedium aMedium( aDest, StreamMode::WRITE | StreamMode::SHARE_DENYNONE ); diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx index 3a548f589d2c..a1a079b805f1 100644 --- a/sc/source/ui/view/prevwsh.cxx +++ b/sc/source/ui/view/prevwsh.cxx @@ -888,7 +888,7 @@ void ScPreviewShell::FillFieldData( ScHeaderFieldData& rData ) const INetURLObject& rURLObj = pDocShell->GetMedium()->GetURLObject(); rData.aLongDocName = rURLObj.GetMainURL( INetURLObject::DecodeMechanism::Unambiguous ); if ( !rData.aLongDocName.isEmpty() ) - rData.aShortDocName = rURLObj.GetName( INetURLObject::DecodeMechanism::Unambiguous ); + rData.aShortDocName = rURLObj.GetLastName(INetURLObject::DecodeMechanism::Unambiguous); else rData.aShortDocName = rData.aLongDocName = rData.aTitle; rData.nPageNo = pPreview->GetPageNo() + 1; diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx index 86a823fa78d8..15664211f0ff 100644 --- a/sc/source/ui/view/printfun.cxx +++ b/sc/source/ui/view/printfun.cxx @@ -1088,7 +1088,7 @@ void ScPrintFunc::InitParam( const ScPrintOptions* pOptions ) const INetURLObject& rURLObj = pDocShell->GetMedium()->GetURLObject(); aFieldData.aLongDocName = rURLObj.GetMainURL( INetURLObject::DecodeMechanism::Unambiguous ); if ( !aFieldData.aLongDocName.isEmpty() ) - aFieldData.aShortDocName = rURLObj.GetName( INetURLObject::DecodeMechanism::Unambiguous ); + aFieldData.aShortDocName = rURLObj.GetLastName(INetURLObject::DecodeMechanism::Unambiguous); else aFieldData.aShortDocName = aFieldData.aLongDocName = aFieldData.aTitle; diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx index fce0a758df33..bb12bbd3dc19 100644 --- a/sc/source/ui/view/tabvwsh4.cxx +++ b/sc/source/ui/view/tabvwsh4.cxx @@ -1806,7 +1806,7 @@ void ScTabViewShell::FillFieldData( ScHeaderFieldData& rData ) const INetURLObject& rURLObj = pDocShell->GetMedium()->GetURLObject(); rData.aLongDocName = rURLObj.GetMainURL( INetURLObject::DecodeMechanism::Unambiguous ); if ( !rData.aLongDocName.isEmpty() ) - rData.aShortDocName = rURLObj.GetName( INetURLObject::DecodeMechanism::Unambiguous ); + rData.aShortDocName = rURLObj.GetLastName(INetURLObject::DecodeMechanism::Unambiguous); else rData.aShortDocName = rData.aLongDocName = rData.aTitle; rData.nPageNo = 1; |