[Libreoffice-commits] .: tools/inc tools/source

[Caolán McNamara]

 tools/inc/tools/fsys.hxx     |    4 +++-
 tools/source/fsys/dirent.cxx |   12 +++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

New commits:
commit 85020e0ab4497cabb880f9bcc013af82194b5c34
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Jul 13 14:06:19 2011 +0100

    bah, hidden windows-only uses of these

diff --git a/tools/inc/tools/fsys.hxx b/tools/inc/tools/fsys.hxx
index e3d6554..c379c05 100644
--- a/tools/inc/tools/fsys.hxx
+++ b/tools/inc/tools/fsys.hxx
@@ -342,7 +342,9 @@ public:
 #ifdef UNX
                             return rWith.aName.CompareTo( aName );
 #else
-                            return rWith.aName.CompareIgnoreCaseToAscii( aName );
+                            rtl::OString aThis(rtl::OString(aName).toAsciiLowerCase());
+                            rtl::OString aWith(rtl::OString(rWith.aName).toAsciiLowerCase());
+                            return static_cast<StringCompare>(aWith.compareTo(aThis));
 #endif
                         }
 
diff --git a/tools/source/fsys/dirent.cxx b/tools/source/fsys/dirent.cxx
index 5f1d743..0e8f37e 100644
--- a/tools/source/fsys/dirent.cxx
+++ b/tools/source/fsys/dirent.cxx
@@ -403,9 +403,15 @@ FSysError DirEntry::ImpParseOs2Name( const ByteString& rPfad, FSysPathStyle eSty
                 else
                 {
                     // liegt ein anderes Drive auf dem Stack?
-                    if ( aStack.Count() &&
-                         COMPARE_EQUAL != aStack.Bottom()->aName.CompareIgnoreCaseToAscii(aName) )
-                        aStack.Clear();
+                    if ( aStack.Count() )
+                    {
+                        rtl::OString aThis(aStack.Bottom()->aName);
+                        aThis = aThis.toAsciiLowerCase();
+                        rtl::OString aOther(aName);
+                        aOther = aOther.toAsciiLowerCase();
+                        if (aThis.compareTo(aOther) != 0)
+                            aStack.Clear();
+                    }
 
                     // liegt jetzt nichts mehr auf dem Stack?
                     if ( !aStack.Count() )