[Libreoffice-commits] .: 2 commits - svl/source unotools/inc

[Caolán McNamara]

 svl/source/misc/restrictedpaths.cxx       |    4 +-
 unotools/inc/unotools/localfilehelper.hxx |   50 ++++++++++++++----------------
 2 files changed, 26 insertions(+), 28 deletions(-)

New commits:
commit 58ef08f5e1336acbcfcb9f6f7a6449a0eae518a7
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Jan 9 20:21:26 2012 +0000

    toLower->lowercase

diff --git a/svl/source/misc/restrictedpaths.cxx b/svl/source/misc/restrictedpaths.cxx
index d743247..ffdcdc6 100644
--- a/svl/source/misc/restrictedpaths.cxx
+++ b/svl/source/misc/restrictedpaths.cxx
@@ -105,7 +105,7 @@ namespace svt
     #ifdef WNT
             // on windows, assume that the relevant file systems are case insensitive,
             // thus normalize the URL
-            m_sCheckURL = m_aSysLocale.GetCharClass().toLower( m_sCheckURL, 0, m_sCheckURL.Len() );
+            m_sCheckURL = m_aSysLocale.GetCharClass().lowercase( m_sCheckURL, 0, m_sCheckURL.Len() );
     #endif
         }
 
@@ -114,7 +114,7 @@ namespace svt
     #ifdef WNT
             // on windows, assume that the relevant file systems are case insensitive,
             // thus normalize the URL
-            String sApprovedURL( m_aSysLocale.GetCharClass().toLower( _rApprovedURL, 0, _rApprovedURL.Len() ) );
+            String sApprovedURL( m_aSysLocale.GetCharClass().lowercase( _rApprovedURL, 0, _rApprovedURL.Len() ) );
     #else
             String sApprovedURL( _rApprovedURL );
     #endif
commit 4e83af0dc7d41c458f9d971342c62103fad51d0f
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Jan 9 15:31:21 2012 +0000

    make indent sane

diff --git a/unotools/inc/unotools/localfilehelper.hxx b/unotools/inc/unotools/localfilehelper.hxx
index 634c7de..ebccc43 100644
--- a/unotools/inc/unotools/localfilehelper.hxx
+++ b/unotools/inc/unotools/localfilehelper.hxx
@@ -36,35 +36,33 @@
 
 namespace utl
 {
+    class UNOTOOLS_DLLPUBLIC LocalFileHelper
+    {
+    public:
+        /**
+        Converts a "physical" file name into a "UCB compatible" URL ( if possible ).
+        If no UCP is available for the local file system, sal_False and an empty URL is returned.
+        Returning sal_True and an empty URL means that the URL doesn't point to a local file.
+        */
+        static sal_Bool ConvertPhysicalNameToURL( const String& rName, String& rReturn );
+        static sal_Bool ConvertSystemPathToURL( const String& rName, const String& rBaseURL, String& rReturn );
 
-class UNOTOOLS_DLLPUBLIC LocalFileHelper
-{
-public:
-                    /**
-                    Converts a "physical" file name into a "UCB compatible" URL ( if possible ).
-                    If no UCP is available for the local file system, sal_False and an empty URL is returned.
-                    Returning sal_True and an empty URL means that the URL doesn't point to a local file.
-                    */
-    static sal_Bool ConvertPhysicalNameToURL( const String& rName, String& rReturn );
-    static sal_Bool ConvertSystemPathToURL( const String& rName, const String& rBaseURL, String& rReturn );
-
-                    /**
-                    Converts a "UCB compatible" URL into a "physical" file name.
-                    If no UCP is available for the local file system, sal_False and an empty file name is returned,
-                    otherwise sal_True and a valid URL, because a file name can always be converted if a UCP for the local
-                    file system is present ( watch: this doesn't mean that this file really exists! )
-                    */
-    static sal_Bool ConvertURLToPhysicalName( const String& rName, String& rReturn );
-    static bool     ConvertURLToPhysicalName( const rtl::OUString& rName, rtl::OUString& rReturn );
-    static sal_Bool ConvertURLToSystemPath( const String& rName, String& rReturn );
-
-    static sal_Bool IsLocalFile( const String& rName );
-    static sal_Bool IsFileContent( const String& rName );
+        /**
+        Converts a "UCB compatible" URL into a "physical" file name.
+        If no UCP is available for the local file system, sal_False and an empty file name is returned,
+        otherwise sal_True and a valid URL, because a file name can always be converted if a UCP for the local
+        file system is present ( watch: this doesn't mean that this file really exists! )
+        */
+        static sal_Bool ConvertURLToPhysicalName( const String& rName, String& rReturn );
+        static bool     ConvertURLToPhysicalName( const rtl::OUString& rName, rtl::OUString& rReturn );
+        static sal_Bool ConvertURLToSystemPath( const String& rName, String& rReturn );
 
-    static          ::com::sun::star::uno::Sequence< ::rtl::OUString >
-                            GetFolderContents( const ::rtl::OUString& rFolder, sal_Bool bFolder );
-};
+        static sal_Bool IsLocalFile( const String& rName );
+        static sal_Bool IsFileContent( const String& rName );
 
+        static          ::com::sun::star::uno::Sequence< ::rtl::OUString >
+                                GetFolderContents( const ::rtl::OUString& rFolder, sal_Bool bFolder );
+    };
 }
 
 #endif