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

[Stephan Bergmann]

 cui/source/options/optpath.cxx                |    2 --
 include/unotools/localfilehelper.hxx          |    1 -
 unotools/source/ucbhelper/localfilehelper.cxx |    6 ------
 3 files changed, 9 deletions(-)

New commits:
commit 954943308dd7229593280c23b0c3c7efd875c10a
Author: Stephan Bergmann <sberg...@redhat.com>
Date:   Tue Aug 18 17:12:24 2015 +0200

    Get rid of obsolete LocalFileHelper::IsFileContent
    
    vnd.sun.star.wfs is long gone---or what else could this have been used for?
    
    Change-Id: If39c9bdcb983f94206e0f58b7e1e8410fdcef089

diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index 7468c75..6b985e7 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -154,8 +154,6 @@ OUString Convert_Impl( const OUString& rValue )
         INetURLObject aObj( aValue );
         if ( aObj.GetProtocol() == INetProtocol::File )
             aReturn += aObj.PathToFileName();
-        else if ( ::utl::LocalFileHelper::IsFileContent( aValue ) )
-            aReturn += aObj.GetURLPath( INetURLObject::DECODE_WITH_CHARSET );
         if ( i+1 < nCount)
             aReturn += OUStringLiteral1<MULTIPATH_DELIMITER>();
     }
diff --git a/include/unotools/localfilehelper.hxx 
b/include/unotools/localfilehelper.hxx
index 84d5a88..3530dc4 100644
--- a/include/unotools/localfilehelper.hxx
+++ b/include/unotools/localfilehelper.hxx
@@ -47,7 +47,6 @@ namespace utl
         static bool ConvertURLToSystemPath( const OUString& rName, OUString& 
rReturn );
 
         static bool IsLocalFile(const OUString& rName);
-        static bool IsFileContent(const OUString& rName);
 
         static          ::com::sun::star::uno::Sequence< OUString >
                                 GetFolderContents( const OUString& rFolder, 
bool bFolder );
diff --git a/unotools/source/ucbhelper/localfilehelper.cxx 
b/unotools/source/ucbhelper/localfilehelper.cxx
index 3efc99b..d1897a3 100644
--- a/unotools/source/ucbhelper/localfilehelper.cxx
+++ b/unotools/source/ucbhelper/localfilehelper.cxx
@@ -82,12 +82,6 @@ bool LocalFileHelper::IsLocalFile(const OUString& rName)
     return ConvertURLToPhysicalName(rName, aTmp);
 }
 
-bool LocalFileHelper::IsFileContent(const OUString& rName)
-{
-    OUString aTmp;
-    return ConvertURLToSystemPath(rName, aTmp);
-}
-
 typedef ::std::vector< OUString* > StringList_Impl;
 
 ::com::sun::star::uno::Sequence < OUString > 
LocalFileHelper::GetFolderContents( const OUString& rFolder, bool bFolder )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits