mass removal of rtl:: prefixes for O(U)String*

Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk
have kept them, in order not to break external API (the automatic using declaration
is LO-internal).

Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09

10 files changed, 50 insertions, 61 deletions

diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
index 449d0e19268b..f4caedd0ae69 100644
--- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
+++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
@@ -56,7 +56,6 @@ using namespace com::sun::star::uno;
 using namespace com::sun::star::linguistic2;
 using namespace linguistic;
 
-using ::rtl::OUString;
 
 // min, max
 #define Max(a,b) (a > b ? a : b)
@@ -122,7 +121,7 @@ Sequence< Locale > SAL_CALL Hyphenator::getLocales()
         // (or better speaking: the list of dictionaries using the
         // new configuration entries).
         std::list< SvtLinguConfigDictionaryEntry > aDics;
-        uno::Sequence< rtl::OUString > aFormatList;
+        uno::Sequence< OUString > aFormatList;
         aLinguCfg.GetSupportedDictionaryFormatsFor( "Hyphenators",
                 "org.openoffice.lingu.LibHnjHyphenator", aFormatList );
         sal_Int32 nLen = aFormatList.getLength();
@@ -149,11 +148,11 @@ Sequence< Locale > SAL_CALL Hyphenator::getLocales()
         {
             // get supported locales from the dictionaries-to-use...
             sal_Int32 k = 0;
-            std::set< rtl::OUString, lt_rtl_OUString > aLocaleNamesSet;
+            std::set< OUString, lt_rtl_OUString > aLocaleNamesSet;
             std::list< SvtLinguConfigDictionaryEntry >::const_iterator aDictIt;
             for (aDictIt = aDics.begin();  aDictIt != aDics.end();  ++aDictIt)
             {
-                uno::Sequence< rtl::OUString > aLocaleNames( aDictIt->aLocaleNames );
+                uno::Sequence< OUString > aLocaleNames( aDictIt->aLocaleNames );
                 sal_Int32 nLen2 = aLocaleNames.getLength();
                 for (k = 0;  k < nLen2;  ++k)
                 {
@@ -162,7 +161,7 @@ Sequence< Locale > SAL_CALL Hyphenator::getLocales()
             }
             // ... and add them to the resulting sequence
             aSuppLocales.realloc( aLocaleNamesSet.size() );
-            std::set< rtl::OUString, lt_rtl_OUString >::const_iterator aItB;
+            std::set< OUString, lt_rtl_OUString >::const_iterator aItB;
             k = 0;
             for (aItB = aLocaleNamesSet.begin();  aItB != aLocaleNamesSet.end();  ++aItB)
             {
@@ -188,7 +187,7 @@ Sequence< Locale > SAL_CALL Hyphenator::getLocales()
                 if (aDictIt->aLocaleNames.getLength() > 0 &&
                     aDictIt->aLocations.getLength() > 0)
                 {
-                    uno::Sequence< rtl::OUString > aLocaleNames( aDictIt->aLocaleNames );
+                    uno::Sequence< OUString > aLocaleNames( aDictIt->aLocaleNames );
                     sal_Int32 nLocales = aLocaleNames.getLength();
 
                     // currently only one language per dictionary is supported in the actual implementation...
@@ -204,7 +203,7 @@ Sequence< Locale > SAL_CALL Hyphenator::getLocales()
                         // also both files have to be in the same directory and the
                         // file names must only differ in the extension (.aff/.dic).
                         // Thus we use the first location only and strip the extension part.
-                        rtl::OUString aLocation = aDictIt->aLocations[0];
+                        OUString aLocation = aDictIt->aLocations[0];
                         sal_Int32 nPos = aLocation.lastIndexOf( '.' );
                         aLocation = aLocation.copy( 0, nPos );
                         aDicts[k].aName = aLocation;
@@ -252,7 +251,7 @@ sal_Bool SAL_CALL Hyphenator::hasLocale(const Locale& rLocale)
 }
 
 
-Reference< XHyphenatedWord > SAL_CALL Hyphenator::hyphenate( const ::rtl::OUString& aWord,
+Reference< XHyphenatedWord > SAL_CALL Hyphenator::hyphenate( const OUString& aWord,
        const ::com::sun::star::lang::Locale& aLocale,
        sal_Int16 nMaxLeading,
        const ::com::sun::star::beans::PropertyValues& aProperties )
@@ -508,7 +507,7 @@ Reference< XHyphenatedWord > SAL_CALL Hyphenator::hyphenate( const ::rtl::OUStri
 
 
 Reference < XHyphenatedWord > SAL_CALL Hyphenator::queryAlternativeSpelling(
-        const ::rtl::OUString& /*aWord*/,
+        const OUString& /*aWord*/,
         const ::com::sun::star::lang::Locale& /*aLocale*/,
         sal_Int16 /*nIndex*/,
         const ::com::sun::star::beans::PropertyValues& /*aProperties*/ )
@@ -520,7 +519,7 @@ Reference < XHyphenatedWord > SAL_CALL Hyphenator::queryAlternativeSpelling(
   return NULL;
 }
 
-Reference< XPossibleHyphens > SAL_CALL Hyphenator::createPossibleHyphens( const ::rtl::OUString& aWord,
+Reference< XPossibleHyphens > SAL_CALL Hyphenator::createPossibleHyphens( const OUString& aWord,
         const ::com::sun::star::lang::Locale& aLocale,
         const ::com::sun::star::beans::PropertyValues& aProperties )
         throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.hxx b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.hxx
index 373d79a6248b..3de41f0b79c2 100644
--- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.hxx
+++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.hxx
@@ -102,9 +102,9 @@ public:
     virtual sal_Bool SAL_CALL hasLocale( const Locale& rLocale ) throw(RuntimeException);
 
     // XHyphenator
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenatedWord > SAL_CALL hyphenate( const ::rtl::OUString& aWord, const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nMaxLeading, const ::com::sun::star::beans::PropertyValues& aProperties ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenatedWord > SAL_CALL queryAlternativeSpelling( const ::rtl::OUString& aWord, const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nIndex, const ::com::sun::star::beans::PropertyValues& aProperties ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XPossibleHyphens > SAL_CALL createPossibleHyphens( const ::rtl::OUString& aWord, const ::com::sun::star::lang::Locale& aLocale, const ::com::sun::star::beans::PropertyValues& aProperties ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenatedWord > SAL_CALL hyphenate( const OUString& aWord, const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nMaxLeading, const ::com::sun::star::beans::PropertyValues& aProperties ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenatedWord > SAL_CALL queryAlternativeSpelling( const OUString& aWord, const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nIndex, const ::com::sun::star::beans::PropertyValues& aProperties ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XPossibleHyphens > SAL_CALL createPossibleHyphens( const OUString& aWord, const ::com::sun::star::lang::Locale& aLocale, const ::com::sun::star::beans::PropertyValues& aProperties ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
 
     // XLinguServiceEventBroadcaster
     virtual sal_Bool SAL_CALL addLinguServiceEventListener( const Reference< XLinguServiceEventListener >& rxLstnr ) throw(RuntimeException);
diff --git a/lingucomponent/source/languageguessing/guesslang.cxx b/lingucomponent/source/languageguessing/guesslang.cxx
index c675b1c8bcf5..d8777c6464aa 100644
--- a/lingucomponent/source/languageguessing/guesslang.cxx
+++ b/lingucomponent/source/languageguessing/guesslang.cxx
@@ -103,7 +103,7 @@ public:
     static Sequence< OUString > SAL_CALL getSupportedServiceNames_Static(  );
 
     // XLanguageGuessing implementation
-    virtual ::com::sun::star::lang::Locale SAL_CALL guessPrimaryLanguage( const ::rtl::OUString& aText, ::sal_Int32 nStartPos, ::sal_Int32 nLen ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::lang::Locale SAL_CALL guessPrimaryLanguage( const OUString& aText, ::sal_Int32 nStartPos, ::sal_Int32 nLen ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL disableLanguages( const ::com::sun::star::uno::Sequence< ::com::sun::star::lang::Locale >& aLanguages ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL enableLanguages( const ::com::sun::star::uno::Sequence< ::com::sun::star::lang::Locale >& aLanguages ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
     virtual ::com::sun::star::uno::Sequence< ::com::sun::star::lang::Locale > SAL_CALL getAvailableLanguages(  ) throw (::com::sun::star::uno::RuntimeException);
@@ -111,7 +111,7 @@ public:
     virtual ::com::sun::star::uno::Sequence< ::com::sun::star::lang::Locale > SAL_CALL getDisabledLanguages(  ) throw (::com::sun::star::uno::RuntimeException);
 
     // implementation specific
-    void SetFingerPrintsDB( const rtl::OUString &fileName ) throw (RuntimeException);
+    void SetFingerPrintsDB( const OUString &fileName ) throw (RuntimeException);
 
     static const OUString & SAL_CALL getImplementationName_Static() throw();
 
@@ -136,13 +136,13 @@ void LangGuess_Impl::EnsureInitialized()
         m_bInitialized = true;
 
         // set default fingerprint path to where those get installed
-        rtl::OUString aPhysPath;
-        rtl::OUString aURL( SvtPathOptions().GetFingerprintPath() );
+        OUString aPhysPath;
+        OUString aURL( SvtPathOptions().GetFingerprintPath() );
         utl::LocalFileHelper::ConvertURLToPhysicalName( aURL, aPhysPath );
 #ifdef WNT
-        aPhysPath = aPhysPath + rtl::OUString(static_cast<sal_Unicode>('\\'));
+        aPhysPath = aPhysPath + OUString(static_cast<sal_Unicode>('\\'));
 #else
-        aPhysPath = aPhysPath + rtl::OUString(static_cast<sal_Unicode>('/'));
+        aPhysPath = aPhysPath + OUString(static_cast<sal_Unicode>('/'));
 #endif
 
         SetFingerPrintsDB( aPhysPath );
@@ -184,7 +184,7 @@ void LangGuess_Impl::EnsureInitialized()
 //*************************************************************************
 
 Locale SAL_CALL LangGuess_Impl::guessPrimaryLanguage(
-        const ::rtl::OUString& rText,
+        const OUString& rText,
         ::sal_Int32 nStartPos,
         ::sal_Int32 nLen )
     throw (lang::IllegalArgumentException, uno::RuntimeException)
@@ -211,7 +211,7 @@ Locale SAL_CALL LangGuess_Impl::guessPrimaryLanguage(
 #define DEFAULT_CONF_FILE_NAME "fpdb.conf"
 
 void LangGuess_Impl::SetFingerPrintsDB(
-        const rtl::OUString &filePath )
+        const OUString &filePath )
     throw (RuntimeException)
 {
     //! text encoding for file name / path needs to be in the same encoding the OS uses
diff --git a/lingucomponent/source/lingutil/lingutil.cxx b/lingucomponent/source/lingutil/lingutil.cxx
index 52421ce095dc..bd107fae82a5 100644
--- a/lingucomponent/source/lingutil/lingutil.cxx
+++ b/lingucomponent/source/lingutil/lingutil.cxx
@@ -48,9 +48,9 @@ using ::com::sun::star::lang::Locale;
 using namespace ::com::sun::star;
 
 #if defined(WNT)
-rtl::OString Win_GetShortPathName( const rtl::OUString &rLongPathName )
+OString Win_GetShortPathName( const OUString &rLongPathName )
 {
-    rtl::OString aRes;
+    OString aRes;
 
     sal_Unicode aShortBuffer[1024] = {0};
     sal_Int32   nShortBufSize = SAL_N_ELEMENTS( aShortBuffer );
@@ -62,7 +62,7 @@ rtl::OString Win_GetShortPathName( const rtl::OUString &rLongPathName )
             nShortBufSize );
 
     if (nShortLen < nShortBufSize) // conversion successful?
-        aRes = rtl::OString( OU2ENC( rtl::OUString( aShortBuffer, nShortLen ), osl_getThreadTextEncoding()) );
+        aRes = OString( OU2ENC( OUString( aShortBuffer, nShortLen ), osl_getThreadTextEncoding()) );
     else
         OSL_FAIL( "Win_GetShortPathName: buffer to short" );
 
@@ -82,12 +82,12 @@ std::vector< SvtLinguConfigDictionaryEntry > GetOldStyleDics( const char *pDicTy
     if (!pDicType)
         return aRes;
 
-    rtl::OUString aFormatName;
+    OUString aFormatName;
     String aDicExtension;
 #ifdef SYSTEM_DICTS
-    rtl::OUString aSystemDir;
-    rtl::OUString aSystemPrefix;
-    rtl::OUString aSystemSuffix;
+    OUString aSystemDir;
+    OUString aSystemPrefix;
+    OUString aSystemSuffix;
 #endif
     if (strcmp( pDicType, "DICT" ) == 0)
     {
@@ -194,7 +194,7 @@ void MergeNewStyleDicsAndOldStyleDics(
     std::list< SvtLinguConfigDictionaryEntry >::const_iterator aIt;
     for (aIt = rNewStyleDics.begin() ;  aIt != rNewStyleDics.end();  ++aIt)
     {
-        const uno::Sequence< rtl::OUString > aLocaleNames( aIt->aLocaleNames );
+        const uno::Sequence< OUString > aLocaleNames( aIt->aLocaleNames );
         sal_Int32 nLocaleNames = aLocaleNames.getLength();
         for (sal_Int32 k = 0;  k < nLocaleNames; ++k)
         {
diff --git a/lingucomponent/source/lingutil/lingutil.hxx b/lingucomponent/source/lingutil/lingutil.hxx
index 1e6a3de79f7b..f4e7d08d2959 100644
--- a/lingucomponent/source/lingutil/lingutil.hxx
+++ b/lingucomponent/source/lingutil/lingutil.hxx
@@ -31,7 +31,7 @@
 
 
 #define OU2ENC(rtlOUString, rtlEncoding) \
-    ::rtl::OString((rtlOUString).getStr(), (rtlOUString).getLength(), \
+    OString((rtlOUString).getStr(), (rtlOUString).getLength(), \
     rtlEncoding, RTL_UNICODETOTEXT_FLAGS_UNDEFINED_QUESTIONMARK).getStr()
 
 
@@ -41,7 +41,7 @@ struct SvtLinguConfigDictionaryEntry;
 
 struct lt_rtl_OUString
 {
-    bool operator() (const rtl::OUString &r1, const rtl::OUString &r2) const
+    bool operator() (const OUString &r1, const OUString &r2) const
     {
         return r1 < r2;
     }
@@ -61,7 +61,7 @@ inline sal_Bool operator == ( const ::com::sun::star::lang::Locale &rL1, const :
 // a restriction of only about 110-130 characters length to a path name in order
 // for it to work with 'fopen'. And that length is usually easily exceeded
 // when using extensions...
-rtl::OString Win_GetShortPathName( const rtl::OUString &rLongPathName );
+OString Win_GetShortPathName( const OUString &rLongPathName );
 #endif
 
 ///////////////////////////////////////////////////////////////////////////
diff --git a/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx b/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx
index 135b1b278ac6..92502ad043ae 100644
--- a/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx
+++ b/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx
@@ -50,9 +50,6 @@ using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::linguistic2;
 
-using ::rtl::OUString;
-
-
 ///////////////////////////////////////////////////////////////////////////
 
 
diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.cxx b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
index 54db8552b99c..8f85482cebd8 100644
--- a/lingucomponent/source/spellcheck/spell/sspellimp.cxx
+++ b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
@@ -55,9 +55,6 @@ using namespace com::sun::star::uno;
 using namespace com::sun::star::linguistic2;
 using namespace linguistic;
 
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
-using ::rtl::OString;
 
 // XML-header of SPELLML queries
 #define SPELLML_HEADER "<?xml?>"
@@ -125,7 +122,7 @@ Sequence< Locale > SAL_CALL SpellChecker::getLocales()
         // (or better speaking: the list of dictionaries using the
         // new configuration entries).
         std::list< SvtLinguConfigDictionaryEntry > aDics;
-        uno::Sequence< rtl::OUString > aFormatList;
+        uno::Sequence< OUString > aFormatList;
         aLinguCfg.GetSupportedDictionaryFormatsFor( "SpellCheckers",
                 "org.openoffice.lingu.MySpellSpellChecker", aFormatList );
         sal_Int32 nLen = aFormatList.getLength();
@@ -151,11 +148,11 @@ Sequence< Locale > SAL_CALL SpellChecker::getLocales()
         {
             // get supported locales from the dictionaries-to-use...
             sal_Int32 k = 0;
-            std::set< rtl::OUString, lt_rtl_OUString > aLocaleNamesSet;
+            std::set< OUString, lt_rtl_OUString > aLocaleNamesSet;
             std::list< SvtLinguConfigDictionaryEntry >::const_iterator aDictIt;
             for (aDictIt = aDics.begin();  aDictIt != aDics.end();  ++aDictIt)
             {
-                uno::Sequence< rtl::OUString > aLocaleNames( aDictIt->aLocaleNames );
+                uno::Sequence< OUString > aLocaleNames( aDictIt->aLocaleNames );
                 sal_Int32 nLen2 = aLocaleNames.getLength();
                 for (k = 0;  k < nLen2;  ++k)
                 {
@@ -164,7 +161,7 @@ Sequence< Locale > SAL_CALL SpellChecker::getLocales()
             }
             // ... and add them to the resulting sequence
             aSuppLocales.realloc( aLocaleNamesSet.size() );
-            std::set< rtl::OUString, lt_rtl_OUString >::const_iterator aItB;
+            std::set< OUString, lt_rtl_OUString >::const_iterator aItB;
             k = 0;
             for (aItB = aLocaleNamesSet.begin();  aItB != aLocaleNamesSet.end();  ++aItB)
             {
@@ -192,7 +189,7 @@ Sequence< Locale > SAL_CALL SpellChecker::getLocales()
                 if (aDictIt->aLocaleNames.getLength() > 0 &&
                     aDictIt->aLocations.getLength() > 0)
                 {
-                    uno::Sequence< rtl::OUString > aLocaleNames( aDictIt->aLocaleNames );
+                    uno::Sequence< OUString > aLocaleNames( aDictIt->aLocaleNames );
                     sal_Int32 nLocales = aLocaleNames.getLength();
 
                     // currently only one language per dictionary is supported in the actual implementation...
@@ -206,7 +203,7 @@ Sequence< Locale > SAL_CALL SpellChecker::getLocales()
                         // also both files have to be in the same directory and the
                         // file names must only differ in the extension (.aff/.dic).
                         // Thus we use the first location only and strip the extension part.
-                        rtl::OUString aLocation = aDictIt->aLocations[0];
+                        OUString aLocation = aDictIt->aLocations[0];
                         sal_Int32 nPos = aLocation.lastIndexOf( '.' );
                         aLocation = aLocation.copy( 0, nPos );
                         aDNames[k] = aLocation;
diff --git a/lingucomponent/source/thesaurus/libnth/nthesdta.cxx b/lingucomponent/source/thesaurus/libnth/nthesdta.cxx
index 4468f2e12282..c928958d7071 100644
--- a/lingucomponent/source/thesaurus/libnth/nthesdta.cxx
+++ b/lingucomponent/source/thesaurus/libnth/nthesdta.cxx
@@ -31,7 +31,6 @@ using namespace com::sun::star::lang;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::linguistic2;
 
-using ::rtl::OUString;
 
 namespace linguistic
 {
diff --git a/lingucomponent/source/thesaurus/libnth/nthesdta.hxx b/lingucomponent/source/thesaurus/libnth/nthesdta.hxx
index 7e5eb00b7002..6956be3eacb9 100644
--- a/lingucomponent/source/thesaurus/libnth/nthesdta.hxx
+++ b/lingucomponent/source/thesaurus/libnth/nthesdta.hxx
@@ -38,8 +38,8 @@ class Meaning :
         ::com::sun::star::linguistic2::XMeaning
     >
 {
-    ::com::sun::star::uno::Sequence< ::rtl::OUString >  aSyn;   // list of synonyms, may be empty.
-    ::rtl::OUString         aTerm;
+    ::com::sun::star::uno::Sequence< OUString >  aSyn;   // list of synonyms, may be empty.
+    OUString         aTerm;
     sal_Int16                   nLanguage;
 
 #if 0
@@ -52,16 +52,16 @@ class Meaning :
     Meaning & operator = (const Meaning &);
 
 public:
-    Meaning(const ::rtl::OUString &rTerm, sal_Int16 nLang);
+    Meaning(const OUString &rTerm, sal_Int16 nLang);
     virtual ~Meaning();
 
     // XMeaning
-    virtual ::rtl::OUString SAL_CALL getMeaning() throw(::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL querySynonyms() throw(::com::sun::star::uno::RuntimeException);
+    virtual OUString SAL_CALL getMeaning() throw(::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL querySynonyms() throw(::com::sun::star::uno::RuntimeException);
 
     // non-interface specific functions
-    void    SetSynonyms( const ::com::sun::star::uno::Sequence< ::rtl::OUString > &rSyn );
-    void    SetMeaning( const ::rtl::OUString  &rTerm );
+    void    SetSynonyms( const ::com::sun::star::uno::Sequence< OUString > &rSyn );
+    void    SetMeaning( const OUString  &rTerm );
 };
 
 }   // namespace linguistic
diff --git a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
index 6a302d7e1397..12b4b89ed2d5 100644
--- a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
+++ b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
@@ -54,9 +54,6 @@ using namespace com::sun::star::uno;
 using namespace com::sun::star::linguistic2;
 using namespace linguistic;
 
-using ::rtl::OUString;
-using ::rtl::OString;
-using ::rtl::OUStringToOString;
 
 ///////////////////////////////////////////////////////////////////////////
 
@@ -146,7 +143,7 @@ Sequence< Locale > SAL_CALL Thesaurus::getLocales()
 
         // get list of dictionaries-to-use
         std::list< SvtLinguConfigDictionaryEntry > aDics;
-        uno::Sequence< rtl::OUString > aFormatList;
+        uno::Sequence< OUString > aFormatList;
         aLinguCfg.GetSupportedDictionaryFormatsFor( "Thesauri",
                 "org.openoffice.lingu.new.Thesaurus", aFormatList );
         sal_Int32 nLen = aFormatList.getLength();
@@ -173,11 +170,11 @@ Sequence< Locale > SAL_CALL Thesaurus::getLocales()
         {
             // get supported locales from the dictionaries-to-use...
             sal_Int32 k = 0;
-            std::set< rtl::OUString, lt_rtl_OUString > aLocaleNamesSet;
+            std::set< OUString, lt_rtl_OUString > aLocaleNamesSet;
             std::list< SvtLinguConfigDictionaryEntry >::const_iterator aDictIt;
             for (aDictIt = aDics.begin();  aDictIt != aDics.end();  ++aDictIt)
             {
-                uno::Sequence< rtl::OUString > aLocaleNames( aDictIt->aLocaleNames );
+                uno::Sequence< OUString > aLocaleNames( aDictIt->aLocaleNames );
                 sal_Int32 nLen2 = aLocaleNames.getLength();
                 for (k = 0;  k < nLen2;  ++k)
                 {
@@ -186,7 +183,7 @@ Sequence< Locale > SAL_CALL Thesaurus::getLocales()
             }
             // ... and add them to the resulting sequence
             aSuppLocales.realloc( aLocaleNamesSet.size() );
-            std::set< rtl::OUString, lt_rtl_OUString >::const_iterator aItB;
+            std::set< OUString, lt_rtl_OUString >::const_iterator aItB;
             k = 0;
             for (aItB = aLocaleNamesSet.begin();  aItB != aLocaleNamesSet.end();  ++aItB)
             {
@@ -216,7 +213,7 @@ Sequence< Locale > SAL_CALL Thesaurus::getLocales()
                 if (aDictIt->aLocaleNames.getLength() > 0 &&
                     aDictIt->aLocations.getLength() > 0)
                 {
-                    uno::Sequence< rtl::OUString > aLocaleNames( aDictIt->aLocaleNames );
+                    uno::Sequence< OUString > aLocaleNames( aDictIt->aLocaleNames );
                     sal_Int32 nLocales = aLocaleNames.getLength();
 
                     // currently only one language per dictionary is supported in the actual implementation...
@@ -232,7 +229,7 @@ Sequence< Locale > SAL_CALL Thesaurus::getLocales()
                         // also both files have to be in the same directory and the
                         // file names must only differ in the extension (.aff/.dic).
                         // Thus we use the first location only and strip the extension part.
-                        rtl::OUString aLocation = aDictIt->aLocations[0];
+                        OUString aLocation = aDictIt->aLocations[0];
                         sal_Int32 nPos = aLocation.lastIndexOf( '.' );
                         aLocation = aLocation.copy( 0, nPos );
                         aTNames[k] = aLocation;