ByteString->rtl::OString and destupid-api a bit

2 files changed, 21 insertions, 23 deletions

diff --git a/tools/inc/tools/wldcrd.hxx b/tools/inc/tools/wldcrd.hxx
index c1c6a33fcaa0..3be67481c623 100644
--- a/tools/inc/tools/wldcrd.hxx
+++ b/tools/inc/tools/wldcrd.hxx
@@ -40,18 +40,28 @@
 class TOOLS_DLLPUBLIC WildCard
 {
 private:
-    ByteString      aWildString;
-    char            cSepSymbol;
+    rtl::OString aWildString;
+    char cSepSymbol;
 
     sal_uInt16          ImpMatch( const char *pWild, const char *pStr ) const;
 
 public:
-                    WildCard();
-                    WildCard( const String& rWildCards,
-                              const char cSeparator = '\0' );
+    WildCard()
+        : aWildString('*')
+        , cSepSymbol('\0')
+    {
+    }
 
-    const String    GetWildCard() const     { return UniString( aWildString, osl_getThreadTextEncoding()); }
-    const String    operator ()() const     { return UniString( aWildString, osl_getThreadTextEncoding()); }
+    WildCard(const rtl::OUString& rWildCard, const char cSeparator = '\0')
+        : aWildString(rtl::OUStringToOString(rWildCard, osl_getThreadTextEncoding()))
+        , cSepSymbol(cSeparator)
+    {
+    }
+
+    const rtl::OUString getGlob() const
+    {
+        return rtl::OStringToOUString(aWildString, osl_getThreadTextEncoding());
+    }
 
     sal_Bool            Matches( const String& rStr ) const;
 
@@ -64,21 +74,9 @@ public:
     WildCard&       operator =( const WildCard& rWildCard );
 };
 
-inline WildCard::WildCard() :
-                    aWildString( '*' )
-{
-    cSepSymbol  = '\0';
-}
-
-inline WildCard::WildCard( const String& rWildCard, const char cSeparator ) :
-                    aWildString( rWildCard, osl_getThreadTextEncoding())
-{
-    cSepSymbol  = cSeparator;
-}
-
 inline WildCard& WildCard::operator=( const String& rString )
 {
-    aWildString = ByteString(rString, osl_getThreadTextEncoding());
+    aWildString = rtl::OUStringToOString(rString, osl_getThreadTextEncoding());
     return *this;
 }
 
diff --git a/tools/source/fsys/wldcrd.cxx b/tools/source/fsys/wldcrd.cxx
index acc1ce9a2071..9071924d1316 100644
--- a/tools/source/fsys/wldcrd.cxx
+++ b/tools/source/fsys/wldcrd.cxx
@@ -113,7 +113,7 @@ sal_uInt16 WildCard::ImpMatch( const char *pWild, const char *pStr ) const
 sal_Bool WildCard::Matches( const String& rString ) const
 {
     ByteString aTmpWild = aWildString;
-    ByteString aString(rString, osl_getThreadTextEncoding());
+    rtl::OString aString(rtl::OUStringToOString(rString, osl_getThreadTextEncoding()));
 
     sal_uInt16  nSepPos;
 
@@ -122,14 +122,14 @@ sal_Bool WildCard::Matches( const String& rString ) const
         while ( (nSepPos = aTmpWild.Search( cSepSymbol )) != STRING_NOTFOUND )
         {
             // alle getrennten WildCard's pruefen
-            if ( ImpMatch( aTmpWild.Copy( 0, nSepPos ).GetBuffer(), aString.GetBuffer() ) )
+            if ( ImpMatch( aTmpWild.Copy( 0, nSepPos ).GetBuffer(), aString.getStr() ) )
                 return sal_True;
             aTmpWild.Erase( 0, nSepPos + 1 ); // Trennsymbol entfernen
         }
         // und noch den hinter dem letzen Trennsymbol bzw. den einzigen
     }
 
-    if ( ImpMatch( aTmpWild.GetBuffer(), aString.GetBuffer() ) )
+    if ( ImpMatch( aTmpWild.GetBuffer(), aString.getStr() ) )
         return sal_True;
     else
         return sal_False;