diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-08-19 10:43:19 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-08-19 10:48:42 +0200 |
| commit | 236714e86c1c517d84d38395efabaf6e3793d196 (patch) | |
| tree | 32c17d639ef464fba371d7d3a02afac18af8bfdb /desktop/source | |
| parent | e87c08babed9e3ac34908771fc95cab5386f01a2 (diff) | |
Clean up remaining utl::LocalFileHelper::Convert...
together with 58d68a1bc9146334376206ae7ba8b1a6594a1040
"ConvertURLToSystemPath->getSystemPathFromFileURL" and
28f3464a571a23a2c16bd0980e9021b95d011511
"ConvertSystemPathToURL->getFileURLFromSystemPath," this replaces all those
Convert... functionality with direct calls to the corresponding osl::FileBase
functions.
Change-Id: I2876171cd337a5eb939d25d8cf1e0c1253ff73a7
Diffstat (limited to 'desktop/source')
| -rw-r--r-- | desktop/source/app/appinit.cxx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx index d51057868269..794071953dcd 100644 --- a/desktop/source/app/appinit.cxx +++ b/desktop/source/app/appinit.cxx @@ -49,7 +49,6 @@ #include <rtl/instance.hxx> #include <comphelper/processfactory.hxx> -#include <unotools/localfilehelper.hxx> #include <unotools/ucbhelper.hxx> #include <unotools/tempfile.hxx> #include <vcl/svapp.hxx> @@ -283,7 +282,7 @@ void Desktop::CreateTemporaryDirectory() OUString aTempPath( aTempBaseURL ); // create new current temporary directory - ::utl::LocalFileHelper::ConvertURLToPhysicalName( aTempBaseURL, aRet ); + osl::FileBase::getSystemPathFromFileURL( aTempBaseURL, aRet ); ::osl::FileBase::getFileURLFromSystemPath( aRet, aTempPath ); aTempPath = ::utl::TempFile::SetTempNameBaseDirectory( aTempPath ); if ( aTempPath.isEmpty() ) @@ -299,7 +298,11 @@ void Desktop::CreateTemporaryDirectory() } // set new current temporary directory - ::utl::LocalFileHelper::ConvertPhysicalNameToURL( aTempPath, aRet ); + if (osl::FileBase::getFileURLFromSystemPath( aTempPath, aRet ) + != osl::FileBase::E_None) + { + aRet.clear(); + } CurrentTempURL::get() = aRet; } |