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>

5 files changed, 7 insertions, 7 deletions

diff --git a/svx/source/core/graphichelper.cxx b/svx/source/core/graphichelper.cxx
index e3e2ed241e8a..3898057d36d9 100644
--- a/svx/source/core/graphichelper.cxx
+++ b/svx/source/core/graphichelper.cxx
@@ -199,12 +199,12 @@ OUString GraphicHelper::ExportGraphic(weld::Window* pParent, const Graphic& rGra
     aDialogHelper.SetDisplayDirectory( aPath.GetMainURL(INetURLObject::DecodeMechanism::ToIUri) );
     INetURLObject aURL;
     aURL.SetSmartURL( rGraphicName );
-    aDialogHelper.SetFileName( aURL.GetName() );
+    aDialogHelper.SetFileName(aURL.GetLastName());
 
     GraphicFilter& rGraphicFilter = GraphicFilter::GetGraphicFilter();
     const sal_uInt16 nCount = rGraphicFilter.GetExportFormatCount();
 
-    OUString aExtension( aURL.GetExtension() );
+    OUString aExtension(aURL.GetFileExtension());
     if( aExtension.isEmpty() )
     {
         GetPreferredExtension( aExtension, rGraphic );
diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx
index e3f80b010d25..02e1fa525e4f 100644
--- a/svx/source/gallery2/galbrws2.cxx
+++ b/svx/source/gallery2/galbrws2.cxx
@@ -1224,7 +1224,7 @@ OUString GalleryBrowser2::GetFilterName() const
             GraphicFilter& rFilter = GraphicFilter::GetGraphicFilter();
             INetURLObject       aURL;
             mpCurTheme->GetURL( mnCurActionPos, aURL );
-            sal_uInt16          nFilter = rFilter.GetImportFormatNumberForShortName( aURL.GetExtension() );
+            sal_uInt16 nFilter = rFilter.GetImportFormatNumberForShortName(aURL.GetFileExtension());
 
             if( GRFILTER_FORMAT_DONTKNOW != nFilter )
                 aFilterName = rFilter.GetImportFormatName( nFilter );
diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx
index 0356394449a6..79fd2a487d5f 100644
--- a/svx/source/gallery2/gallery1.cxx
+++ b/svx/source/gallery2/gallery1.cxx
@@ -376,7 +376,7 @@ void Gallery::ImplLoadSubDirs( const INetURLObject& rBaseURL, bool& rbDirIsReadO
                 {
                     INetURLObject aThmURL( xContentAccess->queryContentIdentifierString() );
 
-                    if(aThmURL.GetExtension().equalsIgnoreAsciiCase("thm"))
+                    if (aThmURL.GetFileExtension().equalsIgnoreAsciiCase("thm"))
                     {
                         INetURLObject   aSdgURL( aThmURL); aSdgURL.SetExtension( "sdg" );
                         INetURLObject   aSdvURL( aThmURL ); aSdvURL.SetExtension( "sdv" );
diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx
index 372961573e08..ed20a28de227 100644
--- a/svx/source/gallery2/galmisc.cxx
+++ b/svx/source/gallery2/galmisc.cxx
@@ -258,7 +258,7 @@ bool CreateDir( const INetURLObject& rURL )
             uno::Sequence< uno::Any >               aValues( 1 );
 
             aProps[0] = "Title";
-            aValues[0] <<= rURL.GetName();
+            aValues[0] <<= rURL.GetLastName();
 
             ::ucbhelper::Content aContent( rURL.GetMainURL( INetURLObject::DecodeMechanism::NONE ), aCmdEnv, comphelper::getProcessComponentContext() );
             bRet = aParent.insertNewContent( "application/vnd.sun.staroffice.fsys-folder", aProps, aValues, aContent );
@@ -287,7 +287,7 @@ bool CopyFile(  const INetURLObject& rSrcURL, const INetURLObject& rDstURL )
 
         aDestPath.executeCommand( "transfer",
                                   uno::makeAny( ucb::TransferInfo( false, rSrcURL.GetMainURL( INetURLObject::DecodeMechanism::NONE ),
-                                                rDstURL.GetName(), ucb::NameClash::OVERWRITE ) ) );
+                                                rDstURL.GetLastName(), ucb::NameClash::OVERWRITE ) ) );
         bRet = true;
     }
     catch( const ucb::ContentCreationException& )
diff --git a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
index ecb49437617d..93d2881820a8 100644
--- a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
+++ b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
@@ -207,7 +207,7 @@ IMPL_LINK_NOARG(AreaPropertyPanelBase, ClickImportBitmapHdl, Button*, void)
         {
             XBitmapListRef pList = SfxObjectShell::Current()->GetItem(SID_BITMAP_LIST)->GetBitmapList();
             INetURLObject   aURL( aDlg.GetPath() );
-            OUString aFileName =  aURL.GetName().getToken( 0, '.' );
+            OUString aFileName = aURL.GetLastName().getToken(0, '.');
             OUString aName = aFileName;
             long j = 1;
             bool bValidBitmapName = false;