ConvertURLToSystemPath->getSystemPathFromFileURL

Change-Id: I7dc0e1b596f80b8f0870aed1722f711bb287ec0a

4 files changed, 11 insertions, 7 deletions

diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx
index d67771ac2e72..2cace41ede29 100644
--- a/cui/source/dialogs/hldocntp.cxx
+++ b/cui/source/dialogs/hldocntp.cxx
@@ -18,6 +18,7 @@
  */
 
 #include "hldocntp.hxx"
+#include <osl/file.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/docfac.hxx>
 #include <com/sun/star/uno/Reference.h>
@@ -454,7 +455,7 @@ IMPL_LINK_NOARG(SvxHyperlinkNewDocTp, ClickNewHdl_Impl)
 
         if( aNewURL.GetProtocol() == INetProtocol::File )
         {
-            utl::LocalFileHelper::ConvertURLToSystemPath( aNewURL.GetMainURL( INetURLObject::NO_DECODE ), aStrTmp );
+            osl::FileBase::getSystemPathFromFileURL(aNewURL.GetMainURL( INetURLObject::NO_DECODE ), aStrTmp);
         }
         else
         {
diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx
index 4e710cce634e..a7087f3efa75 100644
--- a/cui/source/dialogs/hldoctp.cxx
+++ b/cui/source/dialogs/hldoctp.cxx
@@ -18,6 +18,7 @@
  */
 
 #include "cuihyperdlg.hxx"
+#include <osl/file.hxx>
 #include <unotools/localfilehelper.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
@@ -210,7 +211,7 @@ IMPL_LINK_NOARG(SvxHyperlinkDocTp, ClickFileopenHdl_Impl)
         OUString aURL( aDlg.GetPath() );
         OUString aPath;
 
-        utl::LocalFileHelper::ConvertURLToSystemPath( aURL, aPath );
+        osl::FileBase::getSystemPathFromFileURL(aURL, aPath);
 
         m_pCbbPath->SetBaseURL( aURL );
         m_pCbbPath->SetText( aPath );
diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx
index d7ed1a3eea01..9764400f5f2e 100644
--- a/cui/source/dialogs/hltpbase.cxx
+++ b/cui/source/dialogs/hltpbase.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <osl/file.hxx>
 #include <sfx2/frame.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sot/formats.hxx>
@@ -483,7 +484,7 @@ OUString SvxHyperlinkTabPageBase::CreateUiNameFromURL( const OUString& aStrURL )
     switch(aURLObj.GetProtocol())
     {
         case INetProtocol::File:
-            utl::LocalFileHelper::ConvertURLToSystemPath( aURLObj.GetMainURL(INetURLObject::NO_DECODE), aStrUiURL );
+            osl::FileBase::getSystemPathFromFileURL(aURLObj.GetMainURL(INetURLObject::NO_DECODE), aStrUiURL);
             break;
         case INetProtocol::Ftp :
             {
diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx
index ba91c93353ce..15e9a0b1afd7 100644
--- a/cui/source/dialogs/multipat.cxx
+++ b/cui/source/dialogs/multipat.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <osl/file.hxx>
 #include <tools/urlobj.hxx>
 #include <vcl/msgbox.hxx>
 #include <sfx2/filedlghelper.hxx>
@@ -77,7 +78,7 @@ IMPL_LINK_NOARG(SvxMultiPathDialog, AddHdl_Impl)
         aPath.removeFinalSlash();
         OUString aURL = aPath.GetMainURL( INetURLObject::NO_DECODE );
         OUString sInsPath;
-        ::utl::LocalFileHelper::ConvertURLToSystemPath( aURL, sInsPath );
+        osl::FileBase::getSystemPathFromFileURL(aURL, sInsPath);
 
         sal_uLong nPos = m_pRadioLB->GetEntryPos( sInsPath, 1 );
         if ( 0xffffffff == nPos ) //See svtools/source/contnr/svtabbx.cxx SvTabListBox::GetEntryPos
@@ -111,7 +112,7 @@ IMPL_LINK_NOARG(SvxPathSelectDialog, AddHdl_Impl)
         aPath.removeFinalSlash();
         OUString aURL = aPath.GetMainURL( INetURLObject::NO_DECODE );
         OUString sInsPath;
-        ::utl::LocalFileHelper::ConvertURLToSystemPath( aURL, sInsPath );
+        osl::FileBase::getSystemPathFromFileURL(aURL, sInsPath);
 
         if ( LISTBOX_ENTRY_NOTFOUND != m_pPathLB->GetEntryPos( sInsPath ) )
         {
@@ -314,7 +315,7 @@ void SvxMultiPathDialog::SetPath( const OUString& rPath )
         OUString sPath = rPath.getToken( i, cDelim );
         OUString sSystemPath;
         bool bIsSystemPath =
-            ::utl::LocalFileHelper::ConvertURLToSystemPath( sPath, sSystemPath );
+            osl::FileBase::getSystemPathFromFileURL(sPath, sSystemPath) == osl::FileBase::E_None;
 
         OUString sEntry( '\t' );
         sEntry += (bIsSystemPath ? sSystemPath : OUString(sPath));
@@ -346,7 +347,7 @@ void SvxPathSelectDialog::SetPath(const OUString& rPath)
         OUString sPath = rPath.getToken( i, cDelim );
         OUString sSystemPath;
         bool bIsSystemPath =
-            ::utl::LocalFileHelper::ConvertURLToSystemPath( sPath, sSystemPath );
+            osl::FileBase::getSystemPathFromFileURL(sPath, sSystemPath) == osl::FileBase::E_None;
 
         if ( bIsSystemPath )
             nPos = m_pPathLB->InsertEntry( sSystemPath );