summaryrefslogtreecommitdiff
path: root/svtools
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-10-06 12:04:39 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-10-06 13:07:31 +0200
commitaacf28c8ab48ca969308a2fb1bdff32e159228db (patch)
tree363d36e2eb454626a6da478b434563353b4ac50f /svtools
parent05400958b0a06812fb38cf7644f30eebe2ab3768 (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 'svtools')
-rw-r--r--svtools/source/misc/templatefoldercache.cxx14
1 files changed, 7 insertions, 7 deletions
diff --git a/svtools/source/misc/templatefoldercache.cxx b/svtools/source/misc/templatefoldercache.cxx
index ab3db5afa563..f83e11dcdf0a 100644
--- a/svtools/source/misc/templatefoldercache.cxx
+++ b/svtools/source/misc/templatefoldercache.cxx
@@ -691,20 +691,20 @@ namespace svt
// close any old stream instance
closeCacheStream( );
- // get the temp directory
- OUString sTempURL = implParseSmart( SvtPathOptions().GetTempPath() );
- INetURLObject aTempURL( sTempURL );
- if ( INetProtocol::NotValid == aTempURL.GetProtocol() )
+ // get the storage directory
+ OUString sStorageURL = implParseSmart( SvtPathOptions().GetStoragePath() );
+ INetURLObject aStorageURL( sStorageURL );
+ if ( INetProtocol::NotValid == aStorageURL.GetProtocol() )
{
- OSL_FAIL( "TemplateFolderCacheImpl::openCacheStream: invalid temp path!" );
+ OSL_FAIL( "TemplateFolderCacheImpl::openCacheStream: invalid storage path!" );
return false;
}
// append our name
- aTempURL.Append( ".templdir.cache" );
+ aStorageURL.Append( ".templdir.cache" );
// open the stream
- m_pCacheStream = UcbStreamHelper::CreateStream( aTempURL.GetMainURL( INetURLObject::DecodeMechanism::ToIUri ),
+ m_pCacheStream = UcbStreamHelper::CreateStream( aStorageURL.GetMainURL( INetURLObject::DecodeMechanism::ToIUri ),
_bForRead ? StreamMode::READ | StreamMode::NOCREATE : StreamMode::WRITE | StreamMode::TRUNC );
DBG_ASSERT( m_pCacheStream, "TemplateFolderCacheImpl::openCacheStream: could not open/create the cache stream!" );
if ( m_pCacheStream && m_pCacheStream->GetErrorCode() )