diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-08-18 15:23:03 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-08-18 15:32:15 +0200 |
| commit | 1ce99678e5647076da3c152f0b7350e5ddd410e4 (patch) | |
| tree | ab4f4b4b8af659899c83bec99f46496477e5aa8a /unotools | |
| parent | 428586623cbcc4cee9f930db5980a63e6f9ec6e8 (diff) | |
Simplify from ucbhelper::getSystemPathFromFileURL to osl::FileBase
(vnd.sun.star.wfs is long gone)
Change-Id: Ica7d972c04cc065ffbd5debf72e1ec3eeb5c6c64
Diffstat (limited to 'unotools')
| -rw-r--r-- | unotools/source/ucbhelper/tempfile.cxx | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/unotools/source/ucbhelper/tempfile.cxx b/unotools/source/ucbhelper/tempfile.cxx index 4f6628d3ba16..83c3b856fb53 100644 --- a/unotools/source/ucbhelper/tempfile.cxx +++ b/unotools/source/ucbhelper/tempfile.cxx @@ -26,7 +26,6 @@ #include <unotools/tempfile.hxx> #include <unotools/localfilehelper.hxx> #include <unotools/ucbstreamhelper.hxx> -#include <ucbhelper/fileidentifierconverter.hxx> #include <rtl/ustring.hxx> #include <rtl/instance.hxx> #include <osl/detail/file.h> @@ -120,15 +119,12 @@ OUString ConstructTempDir_Impl( const OUString* pParent ) com::sun::star::ucb::UniversalContentBroker::create( comphelper::getProcessComponentContext() ) ); - // if parent given try to use it - OUString aTmp( *pParent ); - // test for valid filename OUString aRet; - ::osl::FileBase::getFileURLFromSystemPath( - ::ucbhelper::getSystemPathFromFileURL( pBroker, aTmp ), - aRet ); - if ( !aRet.isEmpty() ) + if ((osl::FileBase::getSystemPathFromFileURL(*pParent, aRet) + == osl::FileBase::E_None) + && (osl::FileBase::getFileURLFromSystemPath(aRet, aRet) + == osl::FileBase::E_None)) { ::osl::DirectoryItem aItem; sal_Int32 i = aRet.getLength(); |