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 /filter/source/msfilter/msdffimp.cxx | |
| 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 'filter/source/msfilter/msdffimp.cxx')
| -rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index aebe275c41a0..cd329f4d0a24 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -23,6 +23,7 @@ #include <limits.h> #include <vector> #include <osl/endian.h> +#include <osl/file.hxx> #include <tools/solar.h> #include <rtl/math.hxx> @@ -48,7 +49,6 @@ #include <tools/debug.hxx> #include <tools/zcodec.hxx> #include <unotools/ucbstreamhelper.hxx> -#include <unotools/localfilehelper.hxx> #include <filter/msfilter/escherex.hxx> #include <basegfx/range/b2drange.hxx> #include <com/sun/star/container/XIdentifierContainer.hpp> @@ -266,7 +266,7 @@ void DffPropertyReader::ReadPropSet( SvStream& rIn, void* pClientData ) const OUString aURLStr; - if( ::utl::LocalFileHelper::ConvertPhysicalNameToURL( OUString("d:\\ashape.dbg"), aURLStr ) ) + if( osl::FileBase::getFileURLFromSystemPath( OUString("d:\\ashape.dbg"), aURLStr ) == osl::FileBase::E_None ) { std::unique_ptr<SvStream> xOut(::utl::UcbStreamHelper::CreateStream( aURLStr, StreamMode::WRITE )); @@ -3951,7 +3951,7 @@ SdrObject* SvxMSDffManager::ImportGraphic( SvStream& rSt, SfxItemSet& rSet, cons if ( !INetURLObject( maBaseURL ).GetNewAbsURL( aFileName, &aAbsURL ) ) { OUString aValidURL; - if( ::utl::LocalFileHelper::ConvertPhysicalNameToURL( aFileName, aValidURL ) ) + if( osl::FileBase::getFileURLFromSystemPath( aFileName, aValidURL ) == osl::FileBase::E_None ) aAbsURL = INetURLObject( aValidURL ); } if( aAbsURL.GetProtocol() != INetProtocol::NotValid ) @@ -6374,7 +6374,7 @@ bool SvxMSDffManager::GetBLIPDirect( SvStream& rBLIPStream, Graphic& rData, Rect } OUString aURLStr; - if( ::utl::LocalFileHelper::ConvertPhysicalNameToURL( Application::GetAppFileName(), aURLStr ) ) + if( osl::FileBase::getFileURLFromSystemPath( Application::GetAppFileName(), aURLStr ) == osl::FileBase::E_None ) { INetURLObject aURL( aURLStr ); |