diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-10-06 12:04:39 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-10-06 13:07:31 +0200 |
| commit | aacf28c8ab48ca969308a2fb1bdff32e159228db (patch) | |
| tree | 363d36e2eb454626a6da478b434563353b4ac50f /sfx2 | |
| parent | 05400958b0a06812fb38cf7644f30eebe2ab3768 (diff) | |
Revert "remove handing of deprecated Storage path option"
This reverts commit b71fdc67ed1efd421b9b1c747708958e8e09f73c.
since Jochen indicates that there is a bug in it
Change-Id: I786a7885a308cb43b99d9930ed385a75bbcd9495
Reviewed-on: https://gerrit.libreoffice.org/43192
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/appcfg.cxx | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx index 27ec3ad2f1df..7153cf17b4d1 100644 --- a/sfx2/source/appl/appcfg.cxx +++ b/sfx2/source/appl/appcfg.cxx @@ -433,6 +433,7 @@ void SfxApplication::GetOptions( SfxItemSet& rSet ) case SvtPathOptions::PATH_MODULE: osl::FileBase::getFileURLFromSystemPath( aPathCfg.GetModulePath(), aValue ); break; case SvtPathOptions::PATH_PALETTE: aValue = aPathCfg.GetPalettePath(); break; case SvtPathOptions::PATH_PLUGIN: osl::FileBase::getFileURLFromSystemPath( aPathCfg.GetPluginPath(), aValue ); break; + case SvtPathOptions::PATH_STORAGE: osl::FileBase::getFileURLFromSystemPath( aPathCfg.GetStoragePath(), aValue ); break; case SvtPathOptions::PATH_TEMP: aValue = aPathCfg.GetTempPath(); break; case SvtPathOptions::PATH_TEMPLATE: aValue = aPathCfg.GetTemplatePath(); break; case SvtPathOptions::PATH_USERCONFIG: aValue = aPathCfg.GetUserConfigPath(); break; @@ -790,6 +791,14 @@ void SfxApplication::SetOptions(const SfxItemSet &rSet) break; } + case SvtPathOptions::PATH_STORAGE: + { + OUString aTmp; + if( osl::FileBase::getSystemPathFromFileURL( sValue, aTmp ) == osl::FileBase::E_None ) + aPathOptions.SetStoragePath( aTmp ); + break; + } + case SvtPathOptions::PATH_TEMP: aPathOptions.SetTempPath( sValue );break; case SvtPathOptions::PATH_TEMPLATE: aPathOptions.SetTemplatePath( sValue );break; case SvtPathOptions::PATH_USERCONFIG: aPathOptions.SetUserConfigPath( sValue );break; |