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

2 files changed, 6 insertions, 6 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 );
 
diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx
index 45938fb10fc5..455e2bccaef5 100644
--- a/filter/source/pdf/pdfexport.cxx
+++ b/filter/source/pdf/pdfexport.cxx
@@ -22,6 +22,7 @@
 #include "impdialog.hxx"
 
 #include "pdf.hrc"
+#include <osl/file.hxx>
 #include "tools/urlobj.hxx"
 #include "tools/fract.hxx"
 #include "tools/poly.hxx"
@@ -33,7 +34,6 @@
 #include "vcl/bmpacc.hxx"
 #include "vcl/svapp.hxx"
 #include "toolkit/awt/vclxdevice.hxx"
-#include "unotools/localfilehelper.hxx"
 #include <vcl/FilterConfigItem.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <vcl/settings.hxx>
@@ -384,7 +384,7 @@ bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue >&
     {
         OUString aTmp;
 
-        if( ::utl::LocalFileHelper::ConvertPhysicalNameToURL( rFile, aTmp ) )
+        if( osl::FileBase::getFileURLFromSystemPath( rFile, aTmp ) == osl::FileBase::E_None )
             aURL = INetURLObject(aTmp);
     }