[Libreoffice-commits] core.git: include/ucbhelper ucbhelper/source unotools/source

[Stephan Bergmann]

 include/ucbhelper/fileidentifierconverter.hxx       |   14 --------------
 ucbhelper/source/client/fileidentifierconverter.cxx |   18 ------------------
 unotools/source/ucbhelper/localfilehelper.cxx       |    6 ++----
 3 files changed, 2 insertions(+), 36 deletions(-)

New commits:
commit 1242a3a55ffb8c5716d0a6f2e17dadc1f2c02818
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Aug 18 14:19:30 2015 +0200

    Remove obsolete getLocalFileURL
    
    ...vnd.sun.star.wfs is long gone
    
    Change-Id: I64da15a6c16e429aeda57c435e353891fb28f04d

diff --git a/include/ucbhelper/fileidentifierconverter.hxx b/include/ucbhelper/fileidentifierconverter.hxx
index d2ace14..27e7c8e 100644
--- a/include/ucbhelper/fileidentifierconverter.hxx
+++ b/include/ucbhelper/fileidentifierconverter.hxx
@@ -31,20 +31,6 @@ namespace com { namespace sun { namespace star { namespace ucb {
 
 namespace ucbhelper {
 
-
-/** Get a 'root' URL for the most 'local' file content provider.
-
-    @descr
-    The result can be used as the rBaseURL parameter of
-    ucb::getFileURLFromSystemPath().
-
-    @returns
-    either a 'root' URL for the most 'local' file content provider, or an
-    empty string, if no such URL can meaningfully be constructed.
- */
-UCBHELPER_DLLPUBLIC OUString getLocalFileURL();
-
-
 /** Using a specific content provider manager, convert a file path in system
     dependent notation to a (file) URL.
 
diff --git a/ucbhelper/source/client/fileidentifierconverter.cxx b/ucbhelper/source/client/fileidentifierconverter.cxx
index e3f3ec9..4916975 100644
--- a/ucbhelper/source/client/fileidentifierconverter.cxx
+++ b/ucbhelper/source/client/fileidentifierconverter.cxx
@@ -31,24 +31,6 @@ using namespace com::sun::star;
 
 namespace ucbhelper {
 
-
-
-//  getLocalFileURL
-
-
-
-OUString
-getLocalFileURL()
-{
-    // If there were more file systems than just "file:///" (e.g., the obsolete
-    // "vnd.sun.star.wfs:///"), this code should query all relevant UCPs for
-    // their com.sun.star.ucb.XFileIdentifierConverter.getFileProviderLocality
-    // and return the most local one:
-    return OUString("file:///");
-}
-
-
-
 //  getFileURLFromSystemPath
 
 
diff --git a/unotools/source/ucbhelper/localfilehelper.cxx b/unotools/source/ucbhelper/localfilehelper.cxx
index b459769..d5ff1e4 100644
--- a/unotools/source/ucbhelper/localfilehelper.cxx
+++ b/unotools/source/ucbhelper/localfilehelper.cxx
@@ -82,8 +82,7 @@ bool LocalFileHelper::ConvertPhysicalNameToURL(const OUString& rName, OUString&
             comphelper::getProcessComponentContext() ) );
     try
     {
-        OUString aBase( ::ucbhelper::getLocalFileURL() );
-        rReturn = ::ucbhelper::getFileURLFromSystemPath( pBroker, aBase, rName );
+        rReturn = ::ucbhelper::getFileURLFromSystemPath( pBroker, "file:///", rName );
     }
     catch (const ::com::sun::star::uno::RuntimeException&)
     {
@@ -101,8 +100,7 @@ bool LocalFileHelper::ConvertURLToPhysicalName(const OUString& rName, OUString&
     try
     {
         INetURLObject aObj( rName );
-        INetURLObject aLocal( ::ucbhelper::getLocalFileURL() );
-        if ( aObj.GetProtocol() == aLocal.GetProtocol() )
+        if ( aObj.GetProtocol() == INetProtocol::File )
             rReturn = ::ucbhelper::getSystemPathFromFileURL( pBroker, rName );
     }
     catch (const ::com::sun::star::uno::RuntimeException&)