summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-03-07 10:48:56 +0000
committerCaolán McNamara <caolanm@redhat.com>2017-03-07 10:48:56 +0000
commita247f6f8febbc24a3298b7c5404cade8a432fecf (patch)
treef260b2eab1ed5d02f85663220c923ab4f1d79c6f
parent22e3da098ce19fe3463af67b44a4529fe555a181 (diff)
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
-rw-r--r--include/sfx2/app.hxx1
-rw-r--r--sfx2/source/appl/app.cxx15
-rw-r--r--sw/source/ui/index/cnttab.cxx5
3 files changed, 1 insertions, 20 deletions
diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx
index 6bed28c3845a..573504413c17 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 a573fcc084a6..0b14446a7098 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 100e75914084..9eb671adafcb 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;
}