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

3 files changed, 6 insertions, 6 deletions

diff --git a/avmedia/source/framework/modeltools.cxx b/avmedia/source/framework/modeltools.cxx
index c42e4c130082..40d48a2c97ac 100644
--- a/avmedia/source/framework/modeltools.cxx
+++ b/avmedia/source/framework/modeltools.cxx
@@ -20,7 +20,6 @@
 #include <comphelper/processfactory.hxx>
 #include <tools/urlobj.hxx>
 #include <ucbhelper/content.hxx>
-#include <unotools/localfilehelper.hxx>
 #include <unotools/tempfile.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 
@@ -80,7 +79,7 @@ bool KmzDae2Gltf(const OUString& rSourceURL, OUString& o_rOutput)
 
     // Create a temporary folder for conversion
     OUString sOutput;
-    ::utl::LocalFileHelper::ConvertPhysicalNameToURL(::utl::TempFile::CreateTempName(), sOutput);
+    osl::FileBase::getFileURLFromSystemPath(::utl::TempFile::CreateTempName(), sOutput);
     // remove .tmp extension
     sOutput = sOutput.copy(0, sOutput.getLength()-4);
 
diff --git a/avmedia/source/vlc/vlcframegrabber.cxx b/avmedia/source/vlc/vlcframegrabber.cxx
index bb100c290af9..e2634f933f32 100644
--- a/avmedia/source/vlc/vlcframegrabber.cxx
+++ b/avmedia/source/vlc/vlcframegrabber.cxx
@@ -21,11 +21,11 @@
 #include <chrono>
 #include <iostream>
 #include <osl/conditn.hxx>
+#include <osl/file.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/bmpacc.hxx>
 #include <vcl/pngread.hxx>
 #include <avmedia/mediawindow.hxx>
-#include <unotools/localfilehelper.hxx>
 #include <unotools/tempfile.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <tools/stream.hxx>
@@ -102,7 +102,7 @@ VLCFrameGrabber::VLCFrameGrabber( wrapper::EventHandler& eh, const rtl::OUString
     }
 
     rtl::OUString url;
-    utl::LocalFileHelper::ConvertPhysicalNameToURL( fileName, url );
+    osl::FileBase::getFileURLFromSystemPath( fileName, url );
     boost::shared_ptr<SvStream> stream( utl::UcbStreamHelper::CreateStream( url,
                                                                             STREAM_STD_READ ) );
 
diff --git a/avmedia/source/win/framegrabber.cxx b/avmedia/source/win/framegrabber.cxx
index 63303827d76b..9ef404778213 100644
--- a/avmedia/source/win/framegrabber.cxx
+++ b/avmedia/source/win/framegrabber.cxx
@@ -36,9 +36,9 @@
 #include "player.hxx"
 
 #include <cppuhelper/supportsservice.hxx>
+#include <osl/file.hxx>
 #include <tools/stream.hxx>
 #include <vcl/graph.hxx>
-#include <unotools/localfilehelper.hxx>
 #include <vcl/dibtools.hxx>
 
 #define AVMEDIA_WIN_FRAMEGRABBER_IMPLEMENTATIONNAME "com.sun.star.comp.avmedia.FrameGrabber_DirectX"
@@ -71,7 +71,8 @@ IMediaDet* FrameGrabber::implCreateMediaDet( const OUString& rURL ) const
     {
         OUString aLocalStr;
 
-        if( ::utl::LocalFileHelper::ConvertURLToPhysicalName( rURL, aLocalStr ) && !aLocalStr.isEmpty() )
+        if( osl::FileBase::getSystemPathFromFileURL( rURL, aLocalStr )
+            == osl::FileBase::E_None )
         {
             if( !SUCCEEDED( pDet->put_Filename( ::SysAllocString( reinterpret_cast<LPCOLESTR>(aLocalStr.getStr()) ) ) ) )
             {