1 files changed, 21 insertions, 40 deletions

diff --git a/tools/inc/tools/wldcrd.hxx b/tools/inc/tools/wldcrd.hxx
index c1c6a33fcaa0..bf741741579c 100644
--- a/tools/inc/tools/wldcrd.hxx
+++ b/tools/inc/tools/wldcrd.hxx
@@ -29,7 +29,6 @@
 #define _WLDCRD_HXX
 
 #include "tools/toolsdllapi.h"
-#include <tools/solar.h>
 #include <tools/string.hxx>
 #include <osl/thread.h>
 
@@ -40,55 +39,37 @@
 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)
+    {
+    }
 
-    sal_Bool            Matches( const String& rStr ) const;
+    const rtl::OUString getGlob() const
+    {
+        return rtl::OStringToOUString(aWildString, osl_getThreadTextEncoding());
+    }
 
-    sal_Bool            operator ==( const String& rString ) const
-                        { return Matches( rString ); }
-    sal_Bool            operator !=( const String& rString ) const
-                        { return !( Matches( rString ) ); }
+    void setGlob(const rtl::OUString& rString)
+    {
+        aWildString = rtl::OUStringToOString(rString, osl_getThreadTextEncoding());
+    }
 
-    WildCard&       operator =( const String& rString );
-    WildCard&       operator =( const WildCard& rWildCard );
+    sal_Bool            Matches( const String& rStr ) const;
 };
 
-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());
-    return *this;
-}
-
-inline WildCard& WildCard::operator=( const WildCard& rWildCard )
-{
-    aWildString = rWildCard.aWildString;
-    cSepSymbol = rWildCard.cSepSymbol;
-    return *this;
-}
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */