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

[Caolán McNamara]

 include/sfx2/app.hxx          |    1 -
 sfx2/source/appl/app.cxx      |   15 ---------------
 sw/source/ui/index/cnttab.cxx |    5 +----
 3 files changed, 1 insertion(+), 20 deletions(-)

New commits:
commit a247f6f8febbc24a3298b7c5404cade8a432fecf
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Mar 7 10:48:56 2017 +0000

    only one use of GetLastSaveDirectory
    
    which is to get its value and do a const_cast dance to save and
    restore its value which is a strange thing to do just for one
    obscure dialog when no other use of the save/load dialogs does this
    
    Change-Id: I7700d7ed738d578869284d415197de06167001b5

diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx
index 6bed28c..5735044 100644
--- a/include/sfx2/app.hxx
+++ b/include/sfx2/app.hxx
@@ -160,7 +160,6 @@ public:
     // members
     SfxFilterMatcher&           GetFilterMatcher();
     SfxProgress*                GetProgress() const;
-    const OUString&               GetLastSaveDirectory() const;
     sal_uInt16                  GetFreeIndex();
     void                        ReleaseIndex(sal_uInt16 i);
 
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index a573fcc..0b14446 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -260,21 +260,6 @@ const OUString& SfxApplication::GetLastDir_Impl() const
     return pImpl->aLastDir;
 }
 
-const OUString& SfxApplication::GetLastSaveDirectory() const
-
-/*  [Description]
-
-    As <SfxApplication::GetLastDir_Impl()>, only external
-
-    [Cross-reference]
-    <SfxApplication::GetLastDir_Impl()>
-*/
-
-{
-    return GetLastDir_Impl();
-}
-
-
 void SfxApplication::SetLastDir_Impl
 (
     const OUString&   rNewDir     /* Complete directory path as a string */
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 100e759..9eb671a 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -106,9 +106,6 @@ static OUString lcl_CreateAutoMarkFileDlg( const OUString& rURL,
     xFltMgr->appendFilter( rFileString, "*.sdi" );
     xFltMgr->setCurrentFilter( rFileString ) ;
 
-    OUString& rLastSaveDir = (OUString&)SfxGetpApp()->GetLastSaveDirectory();
-    OUString sSaveDir = rLastSaveDir;
-
     if( !rURL.isEmpty() )
         xFP->setDisplayDirectory( rURL );
     else
@@ -121,7 +118,7 @@ static OUString lcl_CreateAutoMarkFileDlg( const OUString& rURL,
     {
         sRet = xFP->getSelectedFiles().getConstArray()[0];
     }
-    rLastSaveDir = sSaveDir;
+
     return sRet;
 }