diff options
| author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2017-08-12 15:00:52 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-10-05 09:01:19 +0200 |
| commit | b71fdc67ed1efd421b9b1c747708958e8e09f73c (patch) | |
| tree | 2fc9fbf2d80a80e1c41921458adceccf2562d1f0 /unotools | |
| parent | 9051ceb9f2048a85772306573cb662ee14efd718 (diff) | |
remove handing of deprecated Storage path option
The only user of StoragePath was
TemplateFolderCacheImpl::openCacheStream which uses TempPath for
the cache file now.
Change-Id: Ia21b5aa804222f28a3af3779a0ecc4789c1860b3
Reviewed-on: https://gerrit.libreoffice.org/41087
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'unotools')
| -rw-r--r-- | unotools/source/config/pathoptions.cxx | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/unotools/source/config/pathoptions.cxx b/unotools/source/config/pathoptions.cxx index 998ff53d0072..d68d4da44c5b 100644 --- a/unotools/source/config/pathoptions.cxx +++ b/unotools/source/config/pathoptions.cxx @@ -112,7 +112,6 @@ class SvtPathOptions_Impl const OUString& GetModulePath() { return GetPath( SvtPathOptions::PATH_MODULE ); } const OUString& GetPalettePath() { return GetPath( SvtPathOptions::PATH_PALETTE ); } const OUString& GetPluginPath() { return GetPath( SvtPathOptions::PATH_PLUGIN ); } - const OUString& GetStoragePath() { return GetPath( SvtPathOptions::PATH_STORAGE ); } const OUString& GetTempPath() { return GetPath( SvtPathOptions::PATH_TEMP ); } const OUString& GetTemplatePath() { return GetPath( SvtPathOptions::PATH_TEMPLATE ); } const OUString& GetUserConfigPath() { return GetPath( SvtPathOptions::PATH_USERCONFIG ); } @@ -140,7 +139,6 @@ class SvtPathOptions_Impl void SetModulePath( const OUString& rPath ) { SetPath( SvtPathOptions::PATH_MODULE, rPath ); } void SetPalettePath( const OUString& rPath ) { SetPath( SvtPathOptions::PATH_PALETTE, rPath ); } void SetPluginPath( const OUString& rPath ) { SetPath( SvtPathOptions::PATH_PLUGIN, rPath ); } - void SetStoragePath( const OUString& rPath ) { SetPath( SvtPathOptions::PATH_STORAGE, rPath ); } void SetTempPath( const OUString& rPath ) { SetPath( SvtPathOptions::PATH_TEMP, rPath ); } void SetTemplatePath( const OUString& rPath ) { SetPath( SvtPathOptions::PATH_TEMPLATE, rPath ); } void SetUserConfigPath( const OUString& rPath ) { SetPath( SvtPathOptions::PATH_USERCONFIG, rPath ); } @@ -186,7 +184,6 @@ static const PropertyStruct aPropNames[] = { "Module", SvtPathOptions::PATH_MODULE }, { "Palette", SvtPathOptions::PATH_PALETTE }, { "Plugin", SvtPathOptions::PATH_PLUGIN }, - { "Storage", SvtPathOptions::PATH_STORAGE }, { "Temp", SvtPathOptions::PATH_TEMP }, { "Template", SvtPathOptions::PATH_TEMPLATE }, { "UserConfig", SvtPathOptions::PATH_USERCONFIG }, @@ -226,8 +223,7 @@ const OUString& SvtPathOptions_Impl::GetPath( SvtPathOptions::Paths ePath ) ePath == SvtPathOptions::PATH_FILTER || ePath == SvtPathOptions::PATH_HELP || ePath == SvtPathOptions::PATH_MODULE || - ePath == SvtPathOptions::PATH_PLUGIN || - ePath == SvtPathOptions::PATH_STORAGE + ePath == SvtPathOptions::PATH_PLUGIN ) { // These office paths have to be converted to system pates @@ -278,7 +274,6 @@ void SvtPathOptions_Impl::SetPath( SvtPathOptions::Paths ePath, const OUString& case SvtPathOptions::PATH_HELP: case SvtPathOptions::PATH_MODULE: case SvtPathOptions::PATH_PLUGIN: - case SvtPathOptions::PATH_STORAGE: { // These office paths have to be convert back to UCB-URL's osl::FileBase::getFileURLFromSystemPath( rNewPath, aResult ); @@ -550,11 +545,6 @@ const OUString& SvtPathOptions::GetPluginPath() const return pImpl->GetPluginPath(); } -const OUString& SvtPathOptions::GetStoragePath() const -{ - return pImpl->GetStoragePath(); -} - const OUString& SvtPathOptions::GetTempPath() const { return pImpl->GetTempPath(); @@ -665,11 +655,6 @@ void SvtPathOptions::SetPluginPath( const OUString& rPath ) pImpl->SetPluginPath( rPath ); } -void SvtPathOptions::SetStoragePath( const OUString& rPath ) -{ - pImpl->SetStoragePath( rPath ); -} - void SvtPathOptions::SetTempPath( const OUString& rPath ) { pImpl->SetTempPath( rPath ); @@ -768,7 +753,6 @@ bool SvtPathOptions::SearchFile( OUString& rIniFile, Paths ePath ) case PATH_MODULE: aPath = GetModulePath(); break; case PATH_PALETTE: aPath = GetPalettePath(); break; case PATH_PLUGIN: aPath = GetPluginPath(); break; - case PATH_STORAGE: aPath = GetStoragePath(); break; case PATH_TEMP: aPath = GetTempPath(); break; case PATH_TEMPLATE: aPath = GetTemplatePath(); break; case PATH_WORK: aPath = GetWorkPath(); break; |