[Libreoffice-commits] core.git: include/sfx2 sfx2/source

[Stephan Bergmann (via logerrit)]

 include/sfx2/frmdescr.hxx    |    2 +-
 sfx2/source/doc/frmdescr.cxx |    4 ++--
 sfx2/source/view/frame.cxx   |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 32625c819b60318934f27df628fe35f10d5eb25a
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Tue Nov 17 16:16:31 2020 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Tue Nov 17 19:34:49 2020 +0100

    Remove unused SfxFrameDescriptor::SetActualURL parameter
    
    It got technically unused when e79e8117dcc7475d8d90afeaaac9eb7050ff244e
    "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 at redhat.com>

diff --git a/include/sfx2/frmdescr.hxx b/include/sfx2/frmdescr.hxx
index 50df431b4c24..3901961fb639 100644
--- a/include/sfx2/frmdescr.hxx
+++ b/include/sfx2/frmdescr.hxx
@@ -66,7 +66,7 @@ public:
     const INetURLObject&    GetURL() const
                             { return aURL; }
     void                    SetURL( const OUString& rURL );
-    void                    SetActualURL( std::u16string_view rURL );
+    void                    SetActualURL();
 
                             // FrameName
     const OUString&         GetName() const
diff --git a/sfx2/source/doc/frmdescr.cxx b/sfx2/source/doc/frmdescr.cxx
index a9acefa8ad44..b97d3b6bbdcc 100644
--- a/sfx2/source/doc/frmdescr.cxx
+++ b/sfx2/source/doc/frmdescr.cxx
@@ -45,10 +45,10 @@ SfxItemSet* SfxFrameDescriptor::GetArgs()
 void SfxFrameDescriptor::SetURL( const OUString& rURL )
 {
     aURL = INetURLObject(rURL);
-    SetActualURL(aURL.GetMainURL( INetURLObject::DecodeMechanism::ToIUri ));
+    SetActualURL();
 }
 
-void SfxFrameDescriptor::SetActualURL( std::u16string_view )
+void SfxFrameDescriptor::SetActualURL()
 {
     if ( m_pArgs )
         m_pArgs->ClearItem();
diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx
index 385b20ef967f..efd6a4e67a96 100644
--- a/sfx2/source/view/frame.cxx
+++ b/sfx2/source/view/frame.cxx
@@ -308,7 +308,7 @@ void SfxFrame::UpdateDescriptor( SfxObjectShell const *pDoc )
     assert(pDoc && "NULL-Document inserted ?!");
 
     const SfxMedium *pMed = pDoc->GetMedium();
-    GetDescriptor()->SetActualURL( pMed->GetOrigURL() );
+    GetDescriptor()->SetActualURL();
 
     // Mark FileOpen parameter
     SfxItemSet* pItemSet = pMed->GetItemSet();