mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unused SfxFrameDescriptor::SetActualURL parameter

Browse Source 
It got technically unused when e79e8117dc
"loplugin:unusedfields in sfx2" removed SfxFrameDescriptor::aActualURL, which in
turn had apparently become unused over a series of commits cleaning up unused
code.  The function looks like a misnomer now, and it is not clear to me whether
what it does is still useful (and whether or not all the clean-up that brought
us here was actually good), but lets leave the remains as they are for now.

Change-Id: I0479068176cc72193b2b44fc49d8fd3d71eadcb5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106013
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Stephan Bergmann
2020-11-17 16:16:31 +01:00
parent 5110cca39c
commit 32625c819b
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/sfx2/frmdescr.hxx
View File

@@ -66,7 +66,7 @@ public:
const INetURLObject& GetURL() const const INetURLObject& GetURL() const
{ return aURL; } { return aURL; }
void SetURL( const OUString& rURL ); void SetURL( const OUString& rURL );
void SetActualURL( std::u16string_view rURL ); void SetActualURL();
// FrameName // FrameName
const OUString& GetName() const const OUString& GetName() const

4
sfx2/source/doc/frmdescr.cxx
View File

@@ -45,10 +45,10 @@ SfxItemSet* SfxFrameDescriptor::GetArgs()
void SfxFrameDescriptor::SetURL( const OUString& rURL ) void SfxFrameDescriptor::SetURL( const OUString& rURL )
{ {
aURL = INetURLObject(rURL); aURL = INetURLObject(rURL);
SetActualURL(aURL.GetMainURL( INetURLObject::DecodeMechanism::ToIUri )); SetActualURL();
} }
void SfxFrameDescriptor::SetActualURL( std::u16string_view ) void SfxFrameDescriptor::SetActualURL()
{ {
if ( m_pArgs ) if ( m_pArgs )
m_pArgs->ClearItem(); m_pArgs->ClearItem();

2
sfx2/source/view/frame.cxx
View File

@@ -308,7 +308,7 @@ void SfxFrame::UpdateDescriptor( SfxObjectShell const *pDoc )
assert(pDoc && "NULL-Document inserted ?!"); assert(pDoc && "NULL-Document inserted ?!");
const SfxMedium *pMed = pDoc->GetMedium(); const SfxMedium *pMed = pDoc->GetMedium();
GetDescriptor()->SetActualURL( pMed->GetOrigURL() ); GetDescriptor()->SetActualURL();
// Mark FileOpen parameter // Mark FileOpen parameter
SfxItemSet* pItemSet = pMed->GetItemSet(); SfxItemSet* pItemSet = pMed->GetItemSet();