diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2013-04-02 23:20:15 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2013-04-05 08:24:46 +0000 |
| commit | 31fedbe9f782976b6aa4615b6fd171ed52137c94 (patch) | |
| tree | aeb72168616981ca20b67aec1c9a75ca64161c2e /desktop | |
| parent | cc8ca7fad08e7268e7409ce5d0103d6a3c3aef4d (diff) | |
Remove SvtInternalOptions
* only Get/SetCurrentTempURL were used, but only for compatibility reasons,
to remove old temporary directories (before 2001). Those should be gone
today.
* MailUIEnabled was false in the xcu file.
* SID_MAIL_SENDDOC* are handled some lines further.
Change-Id: I482719b0de9df0a77c2fef0bf25ae1fb68926375
Reviewed-on: https://gerrit.libreoffice.org/3180
Reviewed-by: Miklos Vajna <vmiklos@suse.cz>
Tested-by: Miklos Vajna <vmiklos@suse.cz>
Notes
API CHANGE.
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/app/app.cxx | 1 | ||||
| -rw-r--r-- | desktop/source/app/appinit.cxx | 15 |
2 files changed, 1 insertions, 15 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 96809e70caaa..32ec153709ad 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -83,7 +83,6 @@ #include <osl/process.h> #include <rtl/uri.hxx> #include <unotools/pathoptions.hxx> -#include <unotools/internaloptions.hxx> #include <svtools/miscopt.hxx> #include <svtools/menuoptions.hxx> #include <svl/folderrestriction.hxx> diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx index d16cdcc82cd2..c8d78cbf66ab 100644 --- a/desktop/source/app/appinit.cxx +++ b/desktop/source/app/appinit.cxx @@ -54,7 +54,6 @@ #include <unotools/tempfile.hxx> #include <vcl/svapp.hxx> #include <unotools/pathoptions.hxx> -#include <unotools/internaloptions.hxx> using namespace desktop; @@ -277,21 +276,11 @@ void Desktop::CreateTemporaryDirectory() throw; } - // remove possible old directory and base directory - SvtInternalOptions aInternalOpt; - // set temp base directory sal_Int32 nLength = aTempBaseURL.getLength(); if ( aTempBaseURL.matchAsciiL( "/", 1, nLength-1 ) ) aTempBaseURL = aTempBaseURL.copy( 0, nLength - 1 ); - String aOldTempURL = aInternalOpt.GetCurrentTempURL(); - if ( aOldTempURL.Len() > 0 ) - { - // remove old temporary directory - ::utl::UCBContentHelper::Kill( aOldTempURL ); - } - ::rtl::OUString aRet; ::rtl::OUString aTempPath( aTempBaseURL ); @@ -314,7 +303,6 @@ void Desktop::CreateTemporaryDirectory() // set new current temporary directory ::utl::LocalFileHelper::ConvertPhysicalNameToURL( aTempPath, aRet ); - aInternalOpt.SetCurrentTempURL( aRet ); CurrentTempURL::get() = aRet; } @@ -326,8 +314,7 @@ void Desktop::RemoveTemporaryDirectory() String &rCurrentTempURL = CurrentTempURL::get(); if ( rCurrentTempURL.Len() > 0 ) { - if ( ::utl::UCBContentHelper::Kill( rCurrentTempURL ) ) - SvtInternalOptions().SetCurrentTempURL( String() ); + ::utl::UCBContentHelper::Kill( rCurrentTempURL ); } } |