diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 12:06:47 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 14:23:11 +0200 |
| commit | 1946794ae09ba732022fe6a74ea45e304ab70b84 (patch) | |
| tree | e32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /linguistic/source | |
| parent | 5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (diff) | |
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
Diffstat (limited to 'linguistic/source')
31 files changed, 241 insertions, 259 deletions
diff --git a/linguistic/source/convdic.cxx b/linguistic/source/convdic.cxx index 6f4dde2756a7..502a1b630ae3 100644 --- a/linguistic/source/convdic.cxx +++ b/linguistic/source/convdic.cxx @@ -65,7 +65,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::linguistic2; using namespace linguistic; -using ::rtl::OUString; #define SN_CONV_DICTIONARY "com.sun.star.linguistic2.ConversionDictionary" @@ -279,7 +278,7 @@ void ConvDic::Save() } -ConvMap::iterator ConvDic::GetEntry( ConvMap &rMap, const rtl::OUString &rFirstText, const rtl::OUString &rSecondText ) +ConvMap::iterator ConvDic::GetEntry( ConvMap &rMap, const OUString &rFirstText, const OUString &rSecondText ) { pair< ConvMap::iterator, ConvMap::iterator > aRange = rMap.equal_range( rFirstText ); diff --git a/linguistic/source/convdic.hxx b/linguistic/source/convdic.hxx index 5beb83f859b7..375acbbca2fa 100644 --- a/linguistic/source/convdic.hxx +++ b/linguistic/source/convdic.hxx @@ -44,7 +44,7 @@ sal_Bool IsConvDic( const String &rFileURL, sal_Int16 &nLang, sal_Int16 &nCon struct StrLT { - bool operator()( const rtl::OUString &rTxt1, const rtl::OUString &rTxt2 ) const + bool operator()( const OUString &rTxt1, const OUString &rTxt2 ) const { return rTxt1 < rTxt2; } @@ -52,19 +52,19 @@ struct StrLT struct StrEQ { - bool operator()( const rtl::OUString &rTxt1, const rtl::OUString &rTxt2 ) const + bool operator()( const OUString &rTxt1, const OUString &rTxt2 ) const { return rTxt1 == rTxt2; } }; -typedef boost::unordered_multimap< const rtl::OUString, rtl::OUString, - const rtl::OUStringHash, StrEQ > ConvMap; +typedef boost::unordered_multimap< const OUString, OUString, + const OUStringHash, StrEQ > ConvMap; -typedef std::set< rtl::OUString, StrLT > ConvMapKeySet; +typedef std::set< OUString, StrLT > ConvMapKeySet; -typedef boost::unordered_multimap< const rtl::OUString, sal_Int16, - rtl::OUStringHash, StrEQ > PropTypeMap; +typedef boost::unordered_multimap< const OUString, sal_Int16, + OUStringHash, StrEQ > PropTypeMap; class ConvDic : @@ -88,7 +88,7 @@ protected: std::auto_ptr< PropTypeMap > pConvPropType; String aMainURL; // URL to file - rtl::OUString aName; + OUString aName; sal_Int16 nLanguage; sal_Int16 nConversionType; sal_Int16 nMaxLeftCharCount; @@ -103,7 +103,7 @@ protected: ConvDic(const ConvDic &); ConvDic & operator = (const ConvDic &); - ConvMap::iterator GetEntry( ConvMap &rMap, const rtl::OUString &rFirstText, const rtl::OUString &rSecondText ); + ConvMap::iterator GetEntry( ConvMap &rMap, const OUString &rFirstText, const OUString &rSecondText ); void Load(); void Save(); @@ -116,21 +116,21 @@ public: virtual ~ConvDic(); // XConversionDictionary - virtual ::rtl::OUString SAL_CALL getName( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getName( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getConversionType( ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setActive( sal_Bool bActivate ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isActive( ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL clear( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getConversions( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, ::com::sun::star::linguistic2::ConversionDirection eDirection, sal_Int32 nTextConversionOptions ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getConversionEntries( ::com::sun::star::linguistic2::ConversionDirection eDirection ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addEntry( const ::rtl::OUString& aLeftText, const ::rtl::OUString& aRightText ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeEntry( const ::rtl::OUString& aLeftText, const ::rtl::OUString& aRightText ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getConversions( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, ::com::sun::star::linguistic2::ConversionDirection eDirection, sal_Int32 nTextConversionOptions ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getConversionEntries( ::com::sun::star::linguistic2::ConversionDirection eDirection ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addEntry( const OUString& aLeftText, const OUString& aRightText ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeEntry( const OUString& aLeftText, const OUString& aRightText ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getMaxCharCount( ::com::sun::star::linguistic2::ConversionDirection eDirection ) throw (::com::sun::star::uno::RuntimeException); // XConversionPropertyType - virtual void SAL_CALL setPropertyType( const ::rtl::OUString& aLeftText, const ::rtl::OUString& aRightText, ::sal_Int16 nPropertyType ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::sal_Int16 SAL_CALL getPropertyType( const ::rtl::OUString& aLeftText, const ::rtl::OUString& aRightText ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyType( const OUString& aLeftText, const OUString& aRightText, ::sal_Int16 nPropertyType ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + virtual ::sal_Int16 SAL_CALL getPropertyType( const OUString& aLeftText, const OUString& aRightText ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); // XFlushable virtual void SAL_CALL flush( ) throw (::com::sun::star::uno::RuntimeException); @@ -138,22 +138,22 @@ public: virtual void SAL_CALL removeFlushListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XFlushListener >& l ) throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); - static inline ::rtl::OUString + static inline OUString getImplementationName_Static() throw(); - static com::sun::star::uno::Sequence< ::rtl::OUString > + static com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw(); - sal_Bool HasEntry( const rtl::OUString &rLeftText, const rtl::OUString &rRightText ); - void AddEntry( const rtl::OUString &rLeftText, const rtl::OUString &rRightText ); - void RemoveEntry( const rtl::OUString &rLeftText, const rtl::OUString &rRightText ); + sal_Bool HasEntry( const OUString &rLeftText, const OUString &rRightText ); + void AddEntry( const OUString &rLeftText, const OUString &rRightText ); + void RemoveEntry( const OUString &rLeftText, const OUString &rRightText ); }; -inline ::rtl::OUString ConvDic::getImplementationName_Static() throw() +inline OUString ConvDic::getImplementationName_Static() throw() { return OUString( "com.sun.star.lingu2.ConvDic" ); } diff --git a/linguistic/source/convdiclist.cxx b/linguistic/source/convdiclist.cxx index a71ce6ede58c..7183d82cc493 100644 --- a/linguistic/source/convdiclist.cxx +++ b/linguistic/source/convdiclist.cxx @@ -51,7 +51,6 @@ using namespace com::sun::star::container; using namespace com::sun::star::linguistic2; using namespace linguistic; -using ::rtl::OUString; #define SN_CONV_DICTIONARY_LIST "com.sun.star.linguistic2.ConversionDictionaryList" @@ -108,16 +107,16 @@ public: virtual sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException); // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException); // XNameReplace - virtual void SAL_CALL replaceByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XNameContainer - virtual void SAL_CALL insertByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeByName( const ::rtl::OUString& Name ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL insertByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeByName( const OUString& Name ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // looks for conversion dictionaries with the specified extension @@ -433,7 +432,7 @@ ConvDicNameContainer & ConvDicList::GetNameContainer() if (!pNameContainer) { pNameContainer = new ConvDicNameContainer( *this ); - pNameContainer->AddConvDics( GetDictionaryWriteablePath(), ::rtl::OUString(CONV_DIC_EXT) ); + pNameContainer->AddConvDics( GetDictionaryWriteablePath(), OUString(CONV_DIC_EXT) ); xNameContainer = pNameContainer; // access list of text conversion dictionaries to activate diff --git a/linguistic/source/convdiclist.hxx b/linguistic/source/convdiclist.hxx index 437c0a153078..d33f10abf8ac 100644 --- a/linguistic/source/convdiclist.hxx +++ b/linguistic/source/convdiclist.hxx @@ -76,8 +76,8 @@ public: // XConversionDictionaryList virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > SAL_CALL getDictionaryContainer( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XConversionDictionary > SAL_CALL addNewDictionary( const ::rtl::OUString& aName, const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nConversionDictionaryType ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL queryConversions( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nConversionDictionaryType, ::com::sun::star::linguistic2::ConversionDirection eDirection, sal_Int32 nTextConversionOptions ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XConversionDictionary > SAL_CALL addNewDictionary( const OUString& aName, const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nConversionDictionaryType ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL queryConversions( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nConversionDictionaryType, ::com::sun::star::linguistic2::ConversionDirection eDirection, sal_Int32 nTextConversionOptions ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL queryMaxCharCount( const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nConversionDictionaryType, ::com::sun::star::linguistic2::ConversionDirection eDirection ) throw (::com::sun::star::uno::RuntimeException); // XComponent @@ -86,21 +86,21 @@ public: virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); - static inline ::rtl::OUString + static inline OUString getImplementationName_Static() throw(); - static com::sun::star::uno::Sequence< ::rtl::OUString > + static com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw(); // non UNO-specific void FlushDics(); }; -inline ::rtl::OUString ConvDicList::getImplementationName_Static() throw() +inline OUString ConvDicList::getImplementationName_Static() throw() { return OUString( "com.sun.star.lingu2.ConvDicList" ); } diff --git a/linguistic/source/convdicxml.cxx b/linguistic/source/convdicxml.cxx index 37bdc8a333c1..efb73c810460 100644 --- a/linguistic/source/convdicxml.cxx +++ b/linguistic/source/convdicxml.cxx @@ -55,7 +55,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::linguistic2; using namespace linguistic; -using ::rtl::OUString; #define XML_NAMESPACE_TCD_STRING "http://openoffice.org/2003/text-conversion-dictionary" #define CONV_TYPE_HANGUL_HANJA "Hangul / Hanja" @@ -385,7 +384,7 @@ void ConvDicXMLExport::_ExportContent() } } -::rtl::OUString SAL_CALL ConvDicXMLExport::getImplementationName() +OUString SAL_CALL ConvDicXMLExport::getImplementationName() throw( uno::RuntimeException ) { return OUString( "com.sun.star.lingu2.ConvDicXMLExport" ); @@ -409,7 +408,7 @@ void SAL_CALL ConvDicXMLImport::endDocument(void) SvXMLImportContext * ConvDicXMLImport::CreateContext( sal_uInt16 nPrefix, - const rtl::OUString &rLocalName, + const OUString &rLocalName, const uno::Reference < xml::sax::XAttributeList > & /*rxAttrList*/ ) { SvXMLImportContext *pContext = 0; diff --git a/linguistic/source/convdicxml.hxx b/linguistic/source/convdicxml.hxx index b21c6cfb820e..512be697ea1f 100644 --- a/linguistic/source/convdicxml.hxx +++ b/linguistic/source/convdicxml.hxx @@ -45,7 +45,7 @@ class ConvDicXMLExport : public SvXMLExport public: ConvDicXMLExport( ConvDic &rConvDic, - const rtl::OUString &rFileName, + const OUString &rFileName, com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler > &rHandler) : SvXMLExport ( comphelper::getProcessComponentContext(), rFileName, ::com::sun::star::util::MeasureUnit::CM, rHandler ), @@ -58,7 +58,7 @@ public: } // XServiceInfo (override parent method) - ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); + OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); // SvXMLExport void _ExportAutoStyles() {} @@ -86,7 +86,7 @@ class ConvDicXMLImport : public SvXMLImport public: //!! see comment for pDic member - ConvDicXMLImport( ConvDic *pConvDic, const rtl::OUString /*&rFileName*/ ) : + ConvDicXMLImport( ConvDic *pConvDic, const OUString /*&rFileName*/ ) : SvXMLImport ( comphelper::getProcessComponentContext(), IMPORT_ALL ), pDic ( pConvDic ) { @@ -100,13 +100,13 @@ public: } // XServiceInfo (override parent method) - ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); + OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL startDocument(void) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL endDocument(void) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); virtual SvXMLImportContext * CreateContext( - sal_uInt16 nPrefix, const rtl::OUString &rLocalName, + sal_uInt16 nPrefix, const OUString &rLocalName, const com::sun::star::uno::Reference < com::sun::star::xml::sax::XAttributeList > &rxAttrList ); ConvDic * GetDic() { return pDic; } diff --git a/linguistic/source/defs.hxx b/linguistic/source/defs.hxx index 47878f281154..ea2c4aff8b7c 100644 --- a/linguistic/source/defs.hxx +++ b/linguistic/source/defs.hxx @@ -35,7 +35,7 @@ typedef boost::shared_ptr< SvStream > SvStreamPtr; struct LangSvcEntries { - css::uno::Sequence< ::rtl::OUString > aSvcImplNames; + css::uno::Sequence< OUString > aSvcImplNames; sal_Int16 nLastTriedSvcIndex; bool bAlreadyWarned; @@ -43,13 +43,13 @@ struct LangSvcEntries LangSvcEntries() : nLastTriedSvcIndex(-1), bAlreadyWarned(false), bDoWarnAgain(false) {} - inline LangSvcEntries( const css::uno::Sequence< ::rtl::OUString > &rSvcImplNames ) : + inline LangSvcEntries( const css::uno::Sequence< OUString > &rSvcImplNames ) : aSvcImplNames(rSvcImplNames), nLastTriedSvcIndex(-1), bAlreadyWarned(false), bDoWarnAgain(false) { } - inline LangSvcEntries( const ::rtl::OUString &rSvcImplName ) : + inline LangSvcEntries( const OUString &rSvcImplName ) : nLastTriedSvcIndex(-1), bAlreadyWarned(false), bDoWarnAgain(false) { aSvcImplNames.realloc(1); @@ -75,7 +75,7 @@ struct LangSvcEntries_Spell : public LangSvcEntries css::uno::Sequence< css::uno::Reference< css::linguistic2::XSpellChecker > > aSvcRefs; LangSvcEntries_Spell() : LangSvcEntries() {} - LangSvcEntries_Spell( const css::uno::Sequence< ::rtl::OUString > &rSvcImplNames ) : LangSvcEntries( rSvcImplNames ) {} + LangSvcEntries_Spell( const css::uno::Sequence< OUString > &rSvcImplNames ) : LangSvcEntries( rSvcImplNames ) {} }; struct LangSvcEntries_Grammar : public LangSvcEntries @@ -83,7 +83,7 @@ struct LangSvcEntries_Grammar : public LangSvcEntries css::uno::Sequence< css::uno::Reference< css::linguistic2::XProofreader > > aSvcRefs; LangSvcEntries_Grammar() : LangSvcEntries() {} - LangSvcEntries_Grammar( const ::rtl::OUString &rSvcImplName ) : LangSvcEntries( rSvcImplName ) {} + LangSvcEntries_Grammar( const OUString &rSvcImplName ) : LangSvcEntries( rSvcImplName ) {} }; struct LangSvcEntries_Hyph : public LangSvcEntries @@ -91,7 +91,7 @@ struct LangSvcEntries_Hyph : public LangSvcEntries css::uno::Sequence< css::uno::Reference< css::linguistic2::XHyphenator > > aSvcRefs; LangSvcEntries_Hyph() : LangSvcEntries() {} - LangSvcEntries_Hyph( const ::rtl::OUString &rSvcImplName ) : LangSvcEntries( rSvcImplName ) {} + LangSvcEntries_Hyph( const OUString &rSvcImplName ) : LangSvcEntries( rSvcImplName ) {} }; struct LangSvcEntries_Thes : public LangSvcEntries @@ -99,7 +99,7 @@ struct LangSvcEntries_Thes : public LangSvcEntries css::uno::Sequence< css::uno::Reference< css::linguistic2::XThesaurus > > aSvcRefs; LangSvcEntries_Thes() : LangSvcEntries() {} - LangSvcEntries_Thes( const css::uno::Sequence< ::rtl::OUString > &rSvcImplNames ) : LangSvcEntries( rSvcImplNames ) {} + LangSvcEntries_Thes( const css::uno::Sequence< OUString > &rSvcImplNames ) : LangSvcEntries( rSvcImplNames ) {} }; @@ -109,8 +109,8 @@ class LinguDispatcher public: enum DspType { DSP_SPELL, DSP_HYPH, DSP_THES, DSP_GRAMMAR }; - virtual void SetServiceList( const css::lang::Locale &rLocale, const css::uno::Sequence< rtl::OUString > &rSvcImplNames ) = 0; - virtual css::uno::Sequence< rtl::OUString > GetServiceList( const css::lang::Locale &rLocale ) const = 0; + virtual void SetServiceList( const css::lang::Locale &rLocale, const css::uno::Sequence< OUString > &rSvcImplNames ) = 0; + virtual css::uno::Sequence< OUString > GetServiceList( const css::lang::Locale &rLocale ) const = 0; virtual DspType GetDspType() const = 0; protected: diff --git a/linguistic/source/dicimp.cxx b/linguistic/source/dicimp.cxx index 470500a0247b..96cb9e08348f 100644 --- a/linguistic/source/dicimp.cxx +++ b/linguistic/source/dicimp.cxx @@ -50,7 +50,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::linguistic2; using namespace linguistic; -using ::rtl::OUString; #define BUFSIZE 4096 @@ -69,8 +68,8 @@ static const sal_Int16 DIC_VERSION_5 = 5; static const sal_Int16 DIC_VERSION_6 = 6; static const sal_Int16 DIC_VERSION_7 = 7; -static bool getTag(const rtl::OString &rLine, const sal_Char *pTagName, - rtl::OString &rTagValue) +static bool getTag(const OString &rLine, const sal_Char *pTagName, + OString &rTagValue) { sal_Int32 nPos = rLine.indexOf(pTagName); if (nPos == -1) @@ -101,7 +100,7 @@ sal_Int16 ReadDicVersion( SvStreamPtr &rpStream, sal_uInt16 &nLng, sal_Bool &bNe !strcmp(pMagicHeader, pVerOOo7)) { sal_Bool bSuccess; - rtl::OString aLine; + OString aLine; nDicVersion = DIC_VERSION_7; @@ -111,7 +110,7 @@ sal_Int16 ReadDicVersion( SvStreamPtr &rpStream, sal_uInt16 &nLng, sal_Bool &bNe // 2nd line: language all | en-US | pt-BR ... while (sal_True == (bSuccess = rpStream->ReadLine(aLine))) { - rtl::OString aTagValue; + OString aTagValue; if (aLine[0] == '#') // skip comments continue; @@ -122,7 +121,7 @@ sal_Int16 ReadDicVersion( SvStreamPtr &rpStream, sal_uInt16 &nLng, sal_Bool &bNe if (aTagValue.equalsL(RTL_CONSTASCII_STRINGPARAM("<none>"))) nLng = LANGUAGE_NONE; else - nLng = LanguageTag(rtl::OStringToOUString( + nLng = LanguageTag(OStringToOUString( aTagValue, RTL_TEXTENCODING_ASCII_US)).getLanguageType(); } @@ -322,7 +321,7 @@ sal_uLong DictionaryNeo::loadEntries(const OUString &rMainURL) // Paste in dictionary without converting if(*aWordBuf) { - rtl::OUString aText(aWordBuf, rtl_str_getLength(aWordBuf), eEnc); + OUString aText(aWordBuf, rtl_str_getLength(aWordBuf), eEnc); uno::Reference< XDictionaryEntry > xEntry = new DicEntry( aText, bNegativ ); addEntry_Impl( xEntry , sal_True ); //! don't launch events here @@ -348,14 +347,14 @@ sal_uLong DictionaryNeo::loadEntries(const OUString &rMainURL) else if (DIC_VERSION_7 == nDicVersion) { sal_Bool bSuccess; - rtl::OString aLine; + OString aLine; // remaining lines - stock strings (a [==] b) while (sal_True == (bSuccess = pStream->ReadLine(aLine))) { if (aLine[0] == '#') // skip comments continue; - rtl::OUString aText = rtl::OStringToOUString(aLine, RTL_TEXTENCODING_UTF8); + OUString aText = OStringToOUString(aLine, RTL_TEXTENCODING_UTF8); uno::Reference< XDictionaryEntry > xEntry = new DicEntry( aText, eDicType == DictionaryType_NEGATIVE ); addEntry_Impl( xEntry , sal_True ); //! don't launch events here @@ -372,15 +371,15 @@ sal_uLong DictionaryNeo::loadEntries(const OUString &rMainURL) return pStream->GetError(); } -static rtl::OString formatForSave(const uno::Reference< XDictionaryEntry > &xEntry, +static OString formatForSave(const uno::Reference< XDictionaryEntry > &xEntry, rtl_TextEncoding eEnc ) { - rtl::OStringBuffer aStr(rtl::OUStringToOString(xEntry->getDictionaryWord(), eEnc)); + OStringBuffer aStr(OUStringToOString(xEntry->getDictionaryWord(), eEnc)); if (xEntry->isNegative()) { aStr.append(RTL_CONSTASCII_STRINGPARAM("==")); - aStr.append(rtl::OUStringToOString(xEntry->getReplacementText(), eEnc)); + aStr.append(OUStringToOString(xEntry->getReplacementText(), eEnc)); } return aStr.makeStringAndClear(); } @@ -459,35 +458,35 @@ sal_uLong DictionaryNeo::saveEntries(const OUString &rURL) // Always write as the latest version, i.e. DIC_VERSION_7 // rtl_TextEncoding eEnc = RTL_TEXTENCODING_UTF8; - pStream->WriteLine(rtl::OString(pVerOOo7)); + pStream->WriteLine(OString(pVerOOo7)); if (0 != (nErr = pStream->GetError())) return nErr; /* XXX: the <none> case could be differentiated, is it absence or * undetermined or multiple? Earlier versions did not know about 'und' and * 'mul' and 'zxx' codes. Sync with ReadDicVersion() */ if (LinguIsUnspecified(nLanguage)) - pStream->WriteLine(rtl::OString(RTL_CONSTASCII_STRINGPARAM("lang: <none>"))); + pStream->WriteLine(OString(RTL_CONSTASCII_STRINGPARAM("lang: <none>"))); else { - rtl::OStringBuffer aLine(RTL_CONSTASCII_STRINGPARAM("lang: ")); - aLine.append(rtl::OUStringToOString(LanguageTag(nLanguage).getBcp47(), eEnc)); + OStringBuffer aLine(RTL_CONSTASCII_STRINGPARAM("lang: ")); + aLine.append(OUStringToOString(LanguageTag(nLanguage).getBcp47(), eEnc)); pStream->WriteLine(aLine.makeStringAndClear()); } if (0 != (nErr = pStream->GetError())) return nErr; if (eDicType == DictionaryType_POSITIVE) - pStream->WriteLine(rtl::OString(RTL_CONSTASCII_STRINGPARAM("type: positive"))); + pStream->WriteLine(OString(RTL_CONSTASCII_STRINGPARAM("type: positive"))); else - pStream->WriteLine(rtl::OString(RTL_CONSTASCII_STRINGPARAM("type: negative"))); + pStream->WriteLine(OString(RTL_CONSTASCII_STRINGPARAM("type: negative"))); if (0 != (nErr = pStream->GetError())) return nErr; - pStream->WriteLine(rtl::OString(RTL_CONSTASCII_STRINGPARAM("---"))); + pStream->WriteLine(OString(RTL_CONSTASCII_STRINGPARAM("---"))); if (0 != (nErr = pStream->GetError())) return nErr; const uno::Reference< XDictionaryEntry > *pEntry = aEntries.getConstArray(); for (sal_Int32 i = 0; i < nCount; i++) { - rtl::OString aOutStr = formatForSave(pEntry[i], eEnc); + OString aOutStr = formatForSave(pEntry[i], eEnc); pStream->WriteLine (aOutStr); if (0 != (nErr = pStream->GetError())) break; diff --git a/linguistic/source/dicimp.hxx b/linguistic/source/dicimp.hxx index 8ad6a69d0ff3..c8ea57877feb 100644 --- a/linguistic/source/dicimp.hxx +++ b/linguistic/source/dicimp.hxx @@ -50,8 +50,8 @@ class DictionaryNeo : ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionaryEntry > > aEntries; - ::rtl::OUString aDicName; - ::rtl::OUString aMainURL; + OUString aDicName; + OUString aMainURL; ::com::sun::star::linguistic2::DictionaryType eDicType; sal_Int16 nCount; sal_Int16 nLanguage; @@ -69,12 +69,12 @@ class DictionaryNeo : ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionaryEntry > xEntry); - sal_uLong loadEntries(const ::rtl::OUString &rMainURL); - sal_uLong saveEntries(const ::rtl::OUString &rMainURL); - int cmpDicEntry(const ::rtl::OUString &rWord1, - const ::rtl::OUString &rWord2, + sal_uLong loadEntries(const OUString &rMainURL); + sal_uLong saveEntries(const OUString &rMainURL); + int cmpDicEntry(const OUString &rWord1, + const OUString &rWord2, sal_Bool bSimilarOnly = sal_False); - sal_Bool seekEntry(const ::rtl::OUString &rWord, sal_Int32 *pPos, + sal_Bool seekEntry(const OUString &rWord, sal_Int32 *pPos, sal_Bool bSimilarOnly = sal_False); bool isSorted(); @@ -84,18 +84,18 @@ class DictionaryNeo : public: DictionaryNeo(); - DictionaryNeo(const ::rtl::OUString &rName, sal_Int16 nLang, + DictionaryNeo(const OUString &rName, sal_Int16 nLang, ::com::sun::star::linguistic2::DictionaryType eType, - const ::rtl::OUString &rMainURL, + const OUString &rMainURL, sal_Bool bWriteable ); virtual ~DictionaryNeo(); // XNamed - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL - setName( const ::rtl::OUString& aName ) + setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XDictionary @@ -119,18 +119,18 @@ public: throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionaryEntry > SAL_CALL - getEntry( const ::rtl::OUString& aWord ) + getEntry( const OUString& aWord ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL addEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionaryEntry >& xDicEntry ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL - add( const ::rtl::OUString& aWord, sal_Bool bIsNegative, - const ::rtl::OUString& aRplcText ) + add( const OUString& aWord, sal_Bool bIsNegative, + const OUString& aRplcText ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL - remove( const ::rtl::OUString& aWord ) + remove( const OUString& aWord ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isFull() @@ -156,7 +156,7 @@ public: virtual sal_Bool SAL_CALL hasLocation() throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getLocation() throw(::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL @@ -167,13 +167,13 @@ public: throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL - storeAsURL( const ::rtl::OUString& aURL, + storeAsURL( const OUString& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs ) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL - storeToURL( const ::rtl::OUString& aURL, + storeToURL( const OUString& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs ) throw(::com::sun::star::io::IOException, @@ -188,7 +188,7 @@ class DicEntry : ::com::sun::star::linguistic2::XDictionaryEntry > { - ::rtl::OUString aDicWord, // including hyphen positions represented by "=" + OUString aDicWord, // including hyphen positions represented by "=" aReplacement; // including hyphen positions represented by "=" sal_Bool bIsNegativ; @@ -196,22 +196,22 @@ class DicEntry : DicEntry(const DicEntry &); DicEntry & operator = (const DicEntry &); - void splitDicFileWord(const ::rtl::OUString &rDicFileWord, - ::rtl::OUString &rDicWord, - ::rtl::OUString &rReplacement); + void splitDicFileWord(const OUString &rDicFileWord, + OUString &rDicWord, + OUString &rReplacement); public: - DicEntry(const ::rtl::OUString &rDicFileWord, sal_Bool bIsNegativ); - DicEntry(const ::rtl::OUString &rDicWord, sal_Bool bIsNegativ, - const ::rtl::OUString &rRplcText); + DicEntry(const OUString &rDicFileWord, sal_Bool bIsNegativ); + DicEntry(const OUString &rDicWord, sal_Bool bIsNegativ, + const OUString &rRplcText); virtual ~DicEntry(); // XDictionaryEntry - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getDictionaryWord() throw(::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isNegative() throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getReplacementText() throw(::com::sun::star::uno::RuntimeException); }; diff --git a/linguistic/source/dlistimp.cxx b/linguistic/source/dlistimp.cxx index dbff7b795022..90cd01837608 100644 --- a/linguistic/source/dlistimp.cxx +++ b/linguistic/source/dlistimp.cxx @@ -49,13 +49,12 @@ using namespace com::sun::star::uno; using namespace com::sun::star::linguistic2; using namespace linguistic; -using ::rtl::OUString; static sal_Bool IsVers2OrNewer( const String& rFileURL, sal_uInt16& nLng, sal_Bool& bNeg ); static void AddInternal( const uno::Reference< XDictionary > &rDic, - const rtl::OUString& rNew ); + const OUString& rNew ); static void AddUserData( const uno::Reference< XDictionary > &rDic ); @@ -308,13 +307,13 @@ void DicList::SearchForDictionaries( { osl::MutexGuard aGuard( GetLinguMutex() ); - const uno::Sequence< rtl::OUString > aDirCnt( utl::LocalFileHelper:: + const uno::Sequence< OUString > aDirCnt( utl::LocalFileHelper:: GetFolderContents( rDicDirURL, sal_False ) ); - const rtl::OUString *pDirCnt = aDirCnt.getConstArray(); + const OUString *pDirCnt = aDirCnt.getConstArray(); sal_Int32 nEntries = aDirCnt.getLength(); - rtl::OUString aDCN("dcn"); - rtl::OUString aDCP("dcp"); + OUString aDCN("dcn"); + OUString aDCP("dcp"); for (sal_Int32 i = 0; i < nEntries; ++i) { String aURL( pDirCnt[i] ); @@ -421,7 +420,7 @@ uno::Sequence< uno::Reference< XDictionary > > SAL_CALL } uno::Reference< XDictionary > SAL_CALL - DicList::getDictionaryByName( const rtl::OUString& aDictionaryName ) + DicList::getDictionaryByName( const OUString& aDictionaryName ) throw(RuntimeException) { osl::MutexGuard aGuard( GetLinguMutex() ); @@ -553,8 +552,8 @@ sal_Int16 SAL_CALL DicList::flushEvents() throw(RuntimeException) } uno::Reference< XDictionary > SAL_CALL - DicList::createDictionary( const rtl::OUString& rName, const Locale& rLocale, - DictionaryType eDicType, const rtl::OUString& rURL ) + DicList::createDictionary( const OUString& rName, const Locale& rLocale, + DictionaryType eDicType, const OUString& rURL ) throw(RuntimeException) { osl::MutexGuard aGuard( GetLinguMutex() ); @@ -566,7 +565,7 @@ uno::Reference< XDictionary > SAL_CALL uno::Reference< XDictionaryEntry > SAL_CALL - DicList::queryDictionaryEntry( const rtl::OUString& rWord, const Locale& rLocale, + DicList::queryDictionaryEntry( const OUString& rWord, const Locale& rLocale, sal_Bool bSearchPosDics, sal_Bool bSearchSpellEntry ) throw(RuntimeException) { @@ -649,9 +648,9 @@ void DicList::_CreateDicList() bInCreation = sal_True; // look for dictionaries - const rtl::OUString aWriteablePath( GetDictionaryWriteablePath() ); - uno::Sequence< rtl::OUString > aPaths( GetDictionaryPaths() ); - const rtl::OUString *pPaths = aPaths.getConstArray(); + const OUString aWriteablePath( GetDictionaryWriteablePath() ); + uno::Sequence< OUString > aPaths( GetDictionaryPaths() ); + const OUString *pPaths = aPaths.getConstArray(); for (sal_Int32 i = 0; i < aPaths.getLength(); ++i) { const sal_Bool bIsWriteablePath = (pPaths[i] == aWriteablePath); @@ -660,10 +659,10 @@ void DicList::_CreateDicList() // create IgnoreAllList dictionary with empty URL (non persistent) // and add it to list - rtl::OUString aDicName( "IgnoreAllList" ); + OUString aDicName( "IgnoreAllList" ); uno::Reference< XDictionary > xIgnAll( createDictionary( aDicName, LinguLanguageToLocale( LANGUAGE_NONE ), - DictionaryType_POSITIVE, rtl::OUString() ) ); + DictionaryType_POSITIVE, OUString() ) ); if (xIgnAll.is()) { AddUserData( xIgnAll ); @@ -677,8 +676,8 @@ void DicList::_CreateDicList() //! configuration with incorrect arguments during the following //! activation of the dictionaries pDicEvtLstnrHelper->BeginCollectEvents(); - const uno::Sequence< rtl::OUString > aActiveDics( aOpt.GetActiveDics() ); - const rtl::OUString *pActiveDic = aActiveDics.getConstArray(); + const uno::Sequence< OUString > aActiveDics( aOpt.GetActiveDics() ); + const OUString *pActiveDic = aActiveDics.getConstArray(); sal_Int32 nLen = aActiveDics.getLength(); for (sal_Int32 i = 0; i < nLen; ++i) { @@ -731,20 +730,20 @@ void DicList::SaveDics() // Service specific part -rtl::OUString SAL_CALL DicList::getImplementationName( ) throw(RuntimeException) +OUString SAL_CALL DicList::getImplementationName( ) throw(RuntimeException) { osl::MutexGuard aGuard( GetLinguMutex() ); return getImplementationName_Static(); } -sal_Bool SAL_CALL DicList::supportsService( const rtl::OUString& ServiceName ) +sal_Bool SAL_CALL DicList::supportsService( const OUString& ServiceName ) throw(RuntimeException) { osl::MutexGuard aGuard( GetLinguMutex() ); - uno::Sequence< rtl::OUString > aSNL = getSupportedServiceNames(); - const rtl::OUString * pArray = aSNL.getConstArray(); + uno::Sequence< OUString > aSNL = getSupportedServiceNames(); + const OUString * pArray = aSNL.getConstArray(); for( sal_Int32 i = 0; i < aSNL.getLength(); i++ ) if( pArray[i] == ServiceName ) return sal_True; @@ -752,7 +751,7 @@ sal_Bool SAL_CALL DicList::supportsService( const rtl::OUString& ServiceName ) } -uno::Sequence< rtl::OUString > SAL_CALL DicList::getSupportedServiceNames( ) +uno::Sequence< OUString > SAL_CALL DicList::getSupportedServiceNames( ) throw(RuntimeException) { osl::MutexGuard aGuard( GetLinguMutex() ); @@ -760,11 +759,11 @@ uno::Sequence< rtl::OUString > SAL_CALL DicList::getSupportedServiceNames( ) } -uno::Sequence< rtl::OUString > DicList::getSupportedServiceNames_Static() throw() +uno::Sequence< OUString > DicList::getSupportedServiceNames_Static() throw() { osl::MutexGuard aGuard( GetLinguMutex() ); - uno::Sequence< rtl::OUString > aSNS( 1 ); // more than 1 service possible + uno::Sequence< OUString > aSNS( 1 ); // more than 1 service possible aSNS.getArray()[0] = "com.sun.star.linguistic2.DictionaryList"; return aSNS; } @@ -824,14 +823,14 @@ xub_StrLen lcl_GetToken( String &rToken, static void AddInternal( const uno::Reference<XDictionary> &rDic, - const rtl::OUString& rNew ) + const OUString& rNew ) { if (rDic.is()) { //! TL TODO: word iterator should be used to break up the text static const char aDefWordDelim[] = "!\"#$%&'()*+,-/:;<=>?[]\\_^`{|}~\t \n"; - rtl::OUString aDelim(RTL_CONSTASCII_USTRINGPARAM(aDefWordDelim)); + OUString aDelim(RTL_CONSTASCII_USTRINGPARAM(aDefWordDelim)); OSL_ENSURE(aDelim.indexOf(static_cast<sal_Unicode>('.')) == -1, "ensure no '.'"); @@ -842,7 +841,7 @@ static void AddInternal( { if( aToken.Len() && !IsNumeric( aToken ) ) { - rDic->add( aToken, sal_False, rtl::OUString() ); + rDic->add( aToken, sal_False, OUString() ); } } } @@ -867,7 +866,7 @@ static sal_Bool IsVers2OrNewer( const String& rFileURL, sal_uInt16& nLng, sal_Bo { if (rFileURL.Len() == 0) return sal_False; - rtl::OUString aDIC("dic"); + OUString aDIC("dic"); String aExt; xub_StrLen nPos = rFileURL.SearchBackward( '.' ); if (STRING_NOTFOUND != nPos) diff --git a/linguistic/source/dlistimp.hxx b/linguistic/source/dlistimp.hxx index f00c20337043..5a824f78c295 100644 --- a/linguistic/source/dlistimp.hxx +++ b/linguistic/source/dlistimp.hxx @@ -99,7 +99,7 @@ public: // XDictionaryList virtual ::sal_Int16 SAL_CALL getCount( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionary > > SAL_CALL getDictionaries( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionary > SAL_CALL getDictionaryByName( const ::rtl::OUString& aDictionaryName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionary > SAL_CALL getDictionaryByName( const OUString& aDictionaryName ) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL addDictionary( const ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionary >& xDictionary ) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL removeDictionary( const ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionary >& xDictionary ) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL addDictionaryListEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionaryListEventListener >& xListener, ::sal_Bool bReceiveVerbose ) throw (::com::sun::star::uno::RuntimeException); @@ -107,10 +107,10 @@ public: virtual ::sal_Int16 SAL_CALL beginCollectEvents( ) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Int16 SAL_CALL endCollectEvents( ) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Int16 SAL_CALL flushEvents( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionary > SAL_CALL createDictionary( const ::rtl::OUString& aName, const ::com::sun::star::lang::Locale& aLocale, ::com::sun::star::linguistic2::DictionaryType eDicType, const ::rtl::OUString& aURL ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionary > SAL_CALL createDictionary( const OUString& aName, const ::com::sun::star::lang::Locale& aLocale, ::com::sun::star::linguistic2::DictionaryType eDicType, const OUString& aURL ) throw (::com::sun::star::uno::RuntimeException); // XSearchableDictionaryList - virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionaryEntry > SAL_CALL queryDictionaryEntry( const ::rtl::OUString& aWord, const ::com::sun::star::lang::Locale& aLocale, sal_Bool bSearchPosDics, sal_Bool bSpellEntry ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionaryEntry > SAL_CALL queryDictionaryEntry( const OUString& aWord, const ::com::sun::star::lang::Locale& aLocale, sal_Bool bSearchPosDics, sal_Bool bSpellEntry ) throw(::com::sun::star::uno::RuntimeException); // XComponent virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException); @@ -118,19 +118,19 @@ public: virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); - static inline ::rtl::OUString getImplementationName_Static() throw(); - static com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static() throw(); + static inline OUString getImplementationName_Static() throw(); + static com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw(); // non UNO-specific void SaveDics(); }; -inline ::rtl::OUString DicList::getImplementationName_Static() throw() +inline OUString DicList::getImplementationName_Static() throw() { return OUString( "com.sun.star.lingu2.DicList" ); } diff --git a/linguistic/source/gciterator.cxx b/linguistic/source/gciterator.cxx index 1a3508c2a0b1..84c03347a188 100644 --- a/linguistic/source/gciterator.cxx +++ b/linguistic/source/gciterator.cxx @@ -66,12 +66,11 @@ #include "gciterator.hxx" -using ::rtl::OUString; using namespace linguistic; using namespace ::com::sun::star; // forward declarations -static ::rtl::OUString GrammarCheckingIterator_getImplementationName() throw(); +static OUString GrammarCheckingIterator_getImplementationName() throw(); static uno::Sequence< OUString > GrammarCheckingIterator_getSupportedServiceNames() throw(); @@ -975,7 +974,7 @@ uno::Reference< util::XChangesBatch > GrammarCheckingIterator::GetUpdateAccess() // get configuration update access beans::PropertyValue aValue; aValue.Name = "nodepath"; - aValue.Value = uno::makeAny( ::rtl::OUString("org.openoffice.Office.Linguistic/ServiceManager") ); + aValue.Value = uno::makeAny( OUString("org.openoffice.Office.Linguistic/ServiceManager") ); uno::Sequence< uno::Any > aProps(1); aProps[0] <<= aValue; m_xUpdateAccess = uno::Reference< util::XChangesBatch >( @@ -1119,7 +1118,7 @@ LinguDispatcher::DspType GrammarCheckingIterator::GetDspType() const static OUString GrammarCheckingIterator_getImplementationName() throw() { - return ::rtl::OUString( "com.sun.star.lingu2.ProofreadingIterator" ); + return OUString( "com.sun.star.lingu2.ProofreadingIterator" ); } diff --git a/linguistic/source/gciterator.hxx b/linguistic/source/gciterator.hxx index 669003511dcd..59680bbb62fa 100644 --- a/linguistic/source/gciterator.hxx +++ b/linguistic/source/gciterator.hxx @@ -53,7 +53,7 @@ struct FPEntry ::com::sun::star::uno::WeakReference< ::com::sun::star::text::XFlatParagraph > m_xPara; // document ID to identify different documents - ::rtl::OUString m_aDocId; + OUString m_aDocId; // the starting position to be checked sal_Int32 m_nStartIndex; @@ -97,19 +97,19 @@ class GrammarCheckingIterator: sal_Bool m_bEnd; // Note that it must be the pointer and not the uno-reference to check if it is the same implementation object - typedef std::map< XComponent *, ::rtl::OUString > DocMap_t; + typedef std::map< XComponent *, OUString > DocMap_t; DocMap_t m_aDocIdMap; // language -> implname mapping - typedef std::map< LanguageType, ::rtl::OUString > GCImplNames_t; + typedef std::map< LanguageType, OUString > GCImplNames_t; GCImplNames_t m_aGCImplNamesByLang; // implname -> UNO reference mapping - typedef std::map< ::rtl::OUString, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XProofreader > > GCReferences_t; + typedef std::map< OUString, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XProofreader > > GCReferences_t; GCReferences_t m_aGCReferencesByService; - ::rtl::OUString m_aCurCheckedDocId; + OUString m_aCurCheckedDocId; sal_Bool m_bGCServicesChecked; sal_Int32 m_nDocIdCounter; sal_Int32 m_nLastEndOfSentencePos; @@ -127,18 +127,18 @@ class GrammarCheckingIterator: void TerminateThread(); sal_Int32 NextDocId(); - ::rtl::OUString GetOrCreateDocId( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > &xComp ); + OUString GetOrCreateDocId( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > &xComp ); void AddEntry( ::com::sun::star::uno::WeakReference< ::com::sun::star::text::XFlatParagraphIterator > xFlatParaIterator, ::com::sun::star::uno::WeakReference< ::com::sun::star::text::XFlatParagraph > xFlatPara, - const ::rtl::OUString &rDocId, sal_Int32 nStartIndex, sal_Bool bAutomatic ); + const OUString &rDocId, sal_Int32 nStartIndex, sal_Bool bAutomatic ); void ProcessResult( const ::com::sun::star::linguistic2::ProofreadingResult &rRes, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XFlatParagraphIterator > &rxFlatParagraphIterator, bool bIsAutomaticChecking ); - sal_Int32 GetSuggestedEndOfSentence( const ::rtl::OUString &rText, sal_Int32 nSentenceStartPos, const ::com::sun::star::lang::Locale &rLocale ); + sal_Int32 GetSuggestedEndOfSentence( const OUString &rText, sal_Int32 nSentenceStartPos, const ::com::sun::star::lang::Locale &rLocale ); void GetConfiguredGCSvcs_Impl(); ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XProofreader > GetGrammarChecker( const ::com::sun::star::lang::Locale & rLocale ); @@ -158,7 +158,7 @@ public: // XProofreadingIterator virtual void SAL_CALL startProofreading( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xDocument, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XFlatParagraphIteratorProvider >& xIteratorProvider ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::linguistic2::ProofreadingResult SAL_CALL checkSentenceAtPosition( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xDocument, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XFlatParagraph >& xFlatParagraph, const ::rtl::OUString& aText, const ::com::sun::star::lang::Locale& aLocale, ::sal_Int32 nStartOfSentencePosition, ::sal_Int32 nSuggestedBehindEndOfSentencePosition, ::sal_Int32 nErrorPositionInParagraph ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::linguistic2::ProofreadingResult SAL_CALL checkSentenceAtPosition( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xDocument, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XFlatParagraph >& xFlatParagraph, const OUString& aText, const ::com::sun::star::lang::Locale& aLocale, ::sal_Int32 nStartOfSentencePosition, ::sal_Int32 nSuggestedBehindEndOfSentencePosition, ::sal_Int32 nErrorPositionInParagraph ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL resetIgnoreRules( ) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL isProofreading( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xDocument ) throw (::com::sun::star::uno::RuntimeException); @@ -178,13 +178,13 @@ public: virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); // LinguDispatcher - virtual void SetServiceList( const ::com::sun::star::lang::Locale &rLocale, const ::com::sun::star::uno::Sequence< rtl::OUString > &rSvcImplNames ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > GetServiceList( const ::com::sun::star::lang::Locale &rLocale ) const; + virtual void SetServiceList( const ::com::sun::star::lang::Locale &rLocale, const ::com::sun::star::uno::Sequence< OUString > &rSvcImplNames ); + virtual ::com::sun::star::uno::Sequence< OUString > GetServiceList( const ::com::sun::star::lang::Locale &rLocale ) const; virtual DspType GetDspType() const; }; diff --git a/linguistic/source/hhconvdic.cxx b/linguistic/source/hhconvdic.cxx index 468a8dc34e46..829930e59b77 100644 --- a/linguistic/source/hhconvdic.cxx +++ b/linguistic/source/hhconvdic.cxx @@ -43,7 +43,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::linguistic2; using namespace linguistic; -using ::rtl::OUString; #define SN_HH_CONV_DICTIONARY "com.sun.star.linguistic2.HangulHanjaConversionDictionary" diff --git a/linguistic/source/hhconvdic.hxx b/linguistic/source/hhconvdic.hxx index 0a1257b4e302..a63a4ea1147d 100644 --- a/linguistic/source/hhconvdic.hxx +++ b/linguistic/source/hhconvdic.hxx @@ -44,21 +44,21 @@ public: virtual ~HHConvDic(); // XConversionDictionary - virtual void SAL_CALL addEntry( const ::rtl::OUString& aLeftText, const ::rtl::OUString& aRightText ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addEntry( const OUString& aLeftText, const OUString& aRightText ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); - static inline ::rtl::OUString + static inline OUString getImplementationName_Static() throw(); - static com::sun::star::uno::Sequence< ::rtl::OUString > + static com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw(); }; -inline ::rtl::OUString HHConvDic::getImplementationName_Static() throw() +inline OUString HHConvDic::getImplementationName_Static() throw() { return OUString( "com.sun.star.lingu2.HHConvDic" ); } diff --git a/linguistic/source/hyphdsp.cxx b/linguistic/source/hyphdsp.cxx index ba57aa6ab6b3..75cd9456955f 100644 --- a/linguistic/source/hyphdsp.cxx +++ b/linguistic/source/hyphdsp.cxx @@ -42,8 +42,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::linguistic2; using namespace linguistic; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; HyphenatorDispatcher::HyphenatorDispatcher( LngSvcMgr &rLngSvcMgr ) : diff --git a/linguistic/source/hyphdsp.hxx b/linguistic/source/hyphdsp.hxx index a770f5fe9262..6bcc72b23b1d 100644 --- a/linguistic/source/hyphdsp.hxx +++ b/linguistic/source/hyphdsp.hxx @@ -76,7 +76,7 @@ class HyphenatorDispatcher : com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenatedWord> - buildHyphWord( const rtl::OUString rOrigWord, + buildHyphWord( const OUString rOrigWord, const ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionaryEntry> &xEntry, sal_Int16 nLang, sal_Int16 nMaxLeading ); @@ -103,7 +103,7 @@ public: // XHyphenator virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenatedWord > SAL_CALL - hyphenate( const ::rtl::OUString& aWord, + hyphenate( const OUString& aWord, const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nMaxLeading, const ::com::sun::star::beans::PropertyValues& aProperties ) @@ -111,7 +111,7 @@ public: ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenatedWord > SAL_CALL - queryAlternativeSpelling( const ::rtl::OUString& aWord, + queryAlternativeSpelling( const OUString& aWord, const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nIndex, const ::com::sun::star::beans::PropertyValues& aProperties ) @@ -120,7 +120,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XPossibleHyphens > SAL_CALL createPossibleHyphens( - const ::rtl::OUString& aWord, + const OUString& aWord, const ::com::sun::star::lang::Locale& aLocale, const ::com::sun::star::beans::PropertyValues& aProperties ) throw(::com::sun::star::lang::IllegalArgumentException, @@ -130,8 +130,8 @@ public: virtual void SetServiceList( const ::com::sun::star::lang::Locale &rLocale, const ::com::sun::star::uno::Sequence< - rtl::OUString > &rSvcImplNames ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > + OUString > &rSvcImplNames ); + virtual ::com::sun::star::uno::Sequence< OUString > GetServiceList( const ::com::sun::star::lang::Locale &rLocale ) const; virtual DspType GetDspType() const; diff --git a/linguistic/source/hyphdta.cxx b/linguistic/source/hyphdta.cxx index b43e6bc63ea6..76d91ef5a2b1 100644 --- a/linguistic/source/hyphdta.cxx +++ b/linguistic/source/hyphdta.cxx @@ -35,7 +35,6 @@ using namespace com::sun::star::lang; using namespace com::sun::star::uno; using namespace com::sun::star::linguistic2; -using ::rtl::OUString; namespace linguistic { @@ -170,15 +169,15 @@ Sequence< sal_Int16 > SAL_CALL PossibleHyphens::getHyphenationPositions() } com::sun::star::uno::Reference <com::sun::star::linguistic2::XHyphenatedWord> HyphenatedWord::CreateHyphenatedWord( - const ::rtl::OUString &rWord, sal_Int16 nLang, sal_Int16 nHyphenationPos, - const ::rtl::OUString &rHyphenatedWord, sal_Int16 nHyphenPos ) + const OUString &rWord, sal_Int16 nLang, sal_Int16 nHyphenationPos, + const OUString &rHyphenatedWord, sal_Int16 nHyphenPos ) { return new HyphenatedWord( rWord, nLang, nHyphenationPos, rHyphenatedWord, nHyphenPos ); } com::sun::star::uno::Reference < com::sun::star::linguistic2::XPossibleHyphens > PossibleHyphens::CreatePossibleHyphens - (const ::rtl::OUString &rWord, sal_Int16 nLang, - const ::rtl::OUString &rHyphWord, + (const OUString &rWord, sal_Int16 nLang, + const OUString &rHyphWord, const ::com::sun::star::uno::Sequence< sal_Int16 > &rPositions) { return new PossibleHyphens( rWord, nLang, rHyphWord, rPositions ); diff --git a/linguistic/source/iprcache.cxx b/linguistic/source/iprcache.cxx index 513c419f3b4c..327203473ff3 100644 --- a/linguistic/source/iprcache.cxx +++ b/linguistic/source/iprcache.cxx @@ -36,7 +36,6 @@ using namespace com::sun::star::lang; using namespace com::sun::star::uno; using namespace com::sun::star::linguistic2; -using ::rtl::OUString; namespace linguistic { @@ -67,7 +66,7 @@ static void lcl_AddAsPropertyChangeListener( for (int i = 0; i < NUM_FLUSH_PROPS; ++i) { rPropSet->addPropertyChangeListener( - ::rtl::OUString::createFromAscii(aFlushProperties[i].pPropName), xListener ); + OUString::createFromAscii(aFlushProperties[i].pPropName), xListener ); } } } @@ -82,7 +81,7 @@ static void lcl_RemoveAsPropertyChangeListener( for (int i = 0; i < NUM_FLUSH_PROPS; ++i) { rPropSet->removePropertyChangeListener( - ::rtl::OUString::createFromAscii(aFlushProperties[i].pPropName), xListener ); + OUString::createFromAscii(aFlushProperties[i].pPropName), xListener ); } } } diff --git a/linguistic/source/lngopt.cxx b/linguistic/source/lngopt.cxx index 594f7b9335e7..fc69367d75be 100644 --- a/linguistic/source/lngopt.cxx +++ b/linguistic/source/lngopt.cxx @@ -48,7 +48,6 @@ using namespace linguistic; using namespace com::sun::star::registry; -using ::rtl::OUString; diff --git a/linguistic/source/lngopt.hxx b/linguistic/source/lngopt.hxx index 79df931269d5..bc46e0c59ac2 100644 --- a/linguistic/source/lngopt.hxx +++ b/linguistic/source/lngopt.hxx @@ -60,12 +60,12 @@ public: LinguOptions(const LinguOptions &rOpt); ~LinguOptions(); - static ::rtl::OUString GetName( sal_Int32 nWID ); + static OUString GetName( sal_Int32 nWID ); - const ::com::sun::star::uno::Sequence< rtl::OUString > + const ::com::sun::star::uno::Sequence< OUString > GetActiveDics() const { return pData->aActiveDics; } - const ::com::sun::star::uno::Sequence< rtl::OUString > + const ::com::sun::star::uno::Sequence< OUString > GetActiveConvDics() const { return pData->aActiveConvDics; } }; @@ -118,12 +118,12 @@ public: // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XFastPropertySet virtual void SAL_CALL setFastPropertyValue( sal_Int32 nHandle, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); @@ -139,16 +139,16 @@ public: virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); - static inline ::rtl::OUString getImplementationName_Static() throw(); - static com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static() throw(); + static inline OUString getImplementationName_Static() throw(); + static com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw(); }; -inline ::rtl::OUString LinguProps::getImplementationName_Static() throw() +inline OUString LinguProps::getImplementationName_Static() throw() { return OUString( "com.sun.star.lingu2.LinguProps" ); } diff --git a/linguistic/source/lngprophelp.cxx b/linguistic/source/lngprophelp.cxx index a53499821f76..c36f55abc4c9 100644 --- a/linguistic/source/lngprophelp.cxx +++ b/linguistic/source/lngprophelp.cxx @@ -40,7 +40,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::linguistic2; using namespace linguistic; -using ::rtl::OUString; namespace linguistic { @@ -69,7 +68,7 @@ PropertyChgHelper::PropertyChgHelper( OUString *pName = aPropNames.getArray(); for (sal_Int32 i = 0; i < nCHCount; ++i) { - pName[i] = ::rtl::OUString::createFromAscii( aCH[i] ); + pName[i] = OUString::createFromAscii( aCH[i] ); } SetDefaultValues(); @@ -106,7 +105,7 @@ void PropertyChgHelper::AddPropNames( const char *pNewNames[], sal_Int32 nCount OUString *pName = GetPropNames().getArray(); for (sal_Int32 i = 0; i < nCount; ++i) { - pName[ nLen + i ] = ::rtl::OUString::createFromAscii( pNewNames[ i ] ); + pName[ nLen + i ] = OUString::createFromAscii( pNewNames[ i ] ); } } diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx index 2950ba0402d4..04ee168a2841 100644 --- a/linguistic/source/lngsvcmgr.cxx +++ b/linguistic/source/lngsvcmgr.cxx @@ -50,7 +50,6 @@ using namespace com::sun::star; using namespace linguistic; -using ::rtl::OUString; // forward declarations uno::Sequence< OUString > static GetLangSvcList( const uno::Any &rVal ); @@ -732,9 +731,9 @@ void LngSvcMgr::UpdateAll() for (int k = 0; k < nNumServices; ++k) { - OUString aService( ::rtl::OUString::createFromAscii( apServices[k] ) ); - OUString aActiveList( ::rtl::OUString::createFromAscii( apCurLists[k] ) ); - OUString aLastFoundList( ::rtl::OUString::createFromAscii( apLastFoundLists[k] ) ); + OUString aService( OUString::createFromAscii( apServices[k] ) ); + OUString aActiveList( OUString::createFromAscii( apCurLists[k] ) ); + OUString aLastFoundList( OUString::createFromAscii( apLastFoundLists[k] ) ); sal_Int32 i; // @@ -792,7 +791,7 @@ void LngSvcMgr::UpdateAll() for (int i = 0; i < 2; ++i) { const sal_Char *pSubNodeName = (i == 0) ? apCurLists[k] : apLastFoundLists[k]; - OUString aSubNodeName( ::rtl::OUString::createFromAscii(pSubNodeName) ); + OUString aSubNodeName( OUString::createFromAscii(pSubNodeName) ); list_entry_map_t &rCurMap = (i == 0) ? aCurSvcs[k] : aLastFoundSvcs[k]; list_entry_map_t::const_iterator aIt( rCurMap.begin() ); @@ -1307,7 +1306,7 @@ void LngSvcMgr::SetCfgServiceLists( SpellCheckerDispatcher &rSpellDsp ) { RTL_LOGFILE_CONTEXT( aLog, "linguistic: LngSvcMgr::SetCfgServiceLists - Spell" ); - rtl::OUString aNode("ServiceManager/SpellCheckerList"); + OUString aNode("ServiceManager/SpellCheckerList"); uno::Sequence< OUString > aNames( /*aCfg.*/GetNodeNames( aNode ) ); OUString *pNames = aNames.getArray(); sal_Int32 nLen = aNames.getLength(); @@ -1345,7 +1344,7 @@ void LngSvcMgr::SetCfgServiceLists( GrammarCheckingIterator &rGrammarDsp ) { RTL_LOGFILE_CONTEXT( aLog, "linguistic: LngSvcMgr::SetCfgServiceLists - Grammar" ); - rtl::OUString aNode("ServiceManager/GrammarCheckerList"); + OUString aNode("ServiceManager/GrammarCheckerList"); uno::Sequence< OUString > aNames( /*aCfg.*/GetNodeNames( aNode ) ); OUString *pNames = aNames.getArray(); sal_Int32 nLen = aNames.getLength(); @@ -1387,7 +1386,7 @@ void LngSvcMgr::SetCfgServiceLists( HyphenatorDispatcher &rHyphDsp ) { RTL_LOGFILE_CONTEXT( aLog, "linguistic: LngSvcMgr::SetCfgServiceLists - Hyph" ); - rtl::OUString aNode("ServiceManager/HyphenatorList"); + OUString aNode("ServiceManager/HyphenatorList"); uno::Sequence< OUString > aNames( /*aCfg.*/GetNodeNames( aNode ) ); OUString *pNames = aNames.getArray(); sal_Int32 nLen = aNames.getLength(); @@ -1429,7 +1428,7 @@ void LngSvcMgr::SetCfgServiceLists( ThesaurusDispatcher &rThesDsp ) { RTL_LOGFILE_CONTEXT( aLog, "linguistic: LngSvcMgr::SetCfgServiceLists - Thes" ); - rtl::OUString aNode("ServiceManager/ThesaurusList"); + OUString aNode("ServiceManager/ThesaurusList"); uno::Sequence< OUString > aNames( /*aCfg.*/GetNodeNames( aNode ) ); OUString *pNames = aNames.getArray(); sal_Int32 nLen = aNames.getLength(); @@ -1699,7 +1698,7 @@ void SAL_CALL if (bChanged) { pSpellDsp->SetServiceList( rLocale, rServiceImplNames ); - SaveCfgSvcs( rtl::OUString(SN_SPELLCHECKER) ); + SaveCfgSvcs( OUString(SN_SPELLCHECKER) ); if (pListenerHelper && bChanged) pListenerHelper->AddLngSvcEvt( @@ -1716,7 +1715,7 @@ void SAL_CALL if (bChanged) { pGrammarDsp->SetServiceList( rLocale, rServiceImplNames ); - SaveCfgSvcs( rtl::OUString(SN_GRAMMARCHECKER) ); + SaveCfgSvcs( OUString(SN_GRAMMARCHECKER) ); if (pListenerHelper && bChanged) pListenerHelper->AddLngSvcEvt( @@ -1732,7 +1731,7 @@ void SAL_CALL if (bChanged) { pHyphDsp->SetServiceList( rLocale, rServiceImplNames ); - SaveCfgSvcs( rtl::OUString(SN_HYPHENATOR) ); + SaveCfgSvcs( OUString(SN_HYPHENATOR) ); if (pListenerHelper && bChanged) pListenerHelper->AddLngSvcEvt( @@ -1748,7 +1747,7 @@ void SAL_CALL if (bChanged) { pThesDsp->SetServiceList( rLocale, rServiceImplNames ); - SaveCfgSvcs( rtl::OUString(SN_THESAURUS) ); + SaveCfgSvcs( OUString(SN_THESAURUS) ); } } } @@ -1816,7 +1815,7 @@ sal_Bool LngSvcMgr::SaveCfgSvcs( const String &rServiceName ) { DBG_ASSERT( 0, "node name missing" ); } - OUString aNodeName( ::rtl::OUString::createFromAscii(pNodeName) ); + OUString aNodeName( OUString::createFromAscii(pNodeName) ); for (sal_Int32 i = 0; i < nLen; ++i) { diff --git a/linguistic/source/lngsvcmgr.hxx b/linguistic/source/lngsvcmgr.hxx index 192b98ef6ad8..0afdf5d5fbf3 100644 --- a/linguistic/source/lngsvcmgr.hxx +++ b/linguistic/source/lngsvcmgr.hxx @@ -134,7 +134,7 @@ class LngSvcMgr : static void clearSvcInfoArray(SvcInfoArray *&rpInfo); // utl::ConfigItem (to allow for listening of changes of relevant properties) - virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString > &rPropertyNames ); + virtual void Notify( const com::sun::star::uno::Sequence< OUString > &rPropertyNames ); virtual void Commit(); void UpdateAll(); @@ -151,12 +151,12 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XThesaurus > SAL_CALL getThesaurus( ) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL addLinguServiceManagerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL removeLinguServiceManagerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableServices( const ::rtl::OUString& aServiceName, const ::com::sun::star::lang::Locale& aLocale ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setConfiguredServices( const ::rtl::OUString& aServiceName, const ::com::sun::star::lang::Locale& aLocale, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aServiceImplNames ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getConfiguredServices( const ::rtl::OUString& aServiceName, const ::com::sun::star::lang::Locale& aLocale ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServices( const OUString& aServiceName, const ::com::sun::star::lang::Locale& aLocale ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setConfiguredServices( const OUString& aServiceName, const ::com::sun::star::lang::Locale& aLocale, const ::com::sun::star::uno::Sequence< OUString >& aServiceImplNames ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getConfiguredServices( const OUString& aServiceName, const ::com::sun::star::lang::Locale& aLocale ) throw (::com::sun::star::uno::RuntimeException); // XAvailableLocales - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::lang::Locale > SAL_CALL getAvailableLocales( const ::rtl::OUString& aServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::lang::Locale > SAL_CALL getAvailableLocales( const OUString& aServiceName ) throw (::com::sun::star::uno::RuntimeException); // XComponent virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException); @@ -164,9 +164,9 @@ public: virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); // XEventListener virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& rSource ) throw(::com::sun::star::uno::RuntimeException); @@ -174,8 +174,8 @@ public: // XModifyListener virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& rEvent ) throw(::com::sun::star::uno::RuntimeException); - static inline ::rtl::OUString getImplementationName_Static(); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static() throw(); + static inline OUString getImplementationName_Static(); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw(); sal_Bool AddLngSvcEvtBroadcaster( const ::com::sun::star::uno::Reference< @@ -183,7 +183,7 @@ public: }; -inline ::rtl::OUString LngSvcMgr::getImplementationName_Static() +inline OUString LngSvcMgr::getImplementationName_Static() { return OUString( "com.sun.star.lingu2.LngSvcMgr" ); } diff --git a/linguistic/source/misc.cxx b/linguistic/source/misc.cxx index f71938ef82ad..10e343f756e6 100644 --- a/linguistic/source/misc.cxx +++ b/linguistic/source/misc.cxx @@ -56,7 +56,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::i18n; using namespace com::sun::star::linguistic2; -using ::rtl::OUString; namespace linguistic { @@ -750,7 +749,7 @@ uno::Reference< XInterface > GetOneInstanceService( const char *pServiceName ) comphelper::getProcessServiceFactory() ); try { - xRef = xMgr->createInstance( ::rtl::OUString::createFromAscii( pServiceName ) ); + xRef = xMgr->createInstance( OUString::createFromAscii( pServiceName ) ); } catch (const uno::Exception &) { diff --git a/linguistic/source/misc2.cxx b/linguistic/source/misc2.cxx index 15b33ace29b9..de5ac2442b34 100644 --- a/linguistic/source/misc2.cxx +++ b/linguistic/source/misc2.cxx @@ -60,14 +60,14 @@ sal_Bool FileExists( const String &rMainURL ) return bExists; } -static uno::Sequence< rtl::OUString > GetMultiPaths_Impl( - const rtl::OUString &rPathPrefix, +static uno::Sequence< OUString > GetMultiPaths_Impl( + const OUString &rPathPrefix, sal_Int16 nPathFlags ) { - uno::Sequence< rtl::OUString > aRes; - uno::Sequence< rtl::OUString > aInternalPaths; - uno::Sequence< rtl::OUString > aUserPaths; - rtl::OUString aWritablePath; + uno::Sequence< OUString > aRes; + uno::Sequence< OUString > aInternalPaths; + uno::Sequence< OUString > aUserPaths; + OUString aWritablePath; bool bSuccess = true; uno::Reference< lang::XMultiServiceFactory > xMgr( comphelper::getProcessServiceFactory() ); @@ -103,14 +103,14 @@ static uno::Sequence< rtl::OUString > GetMultiPaths_Impl( if (!aWritablePath.isEmpty()) ++nMaxEntries; aRes.realloc( nMaxEntries ); - rtl::OUString *pRes = aRes.getArray(); + OUString *pRes = aRes.getArray(); sal_Int32 nCount = 0; // number of actually added entries if ((nPathFlags & PATH_FLAG_WRITABLE) && !aWritablePath.isEmpty()) pRes[ nCount++ ] = aWritablePath; for (int i = 0; i < 2; ++i) { - const uno::Sequence< rtl::OUString > &rPathSeq = i == 0 ? aUserPaths : aInternalPaths; - const rtl::OUString *pPathSeq = rPathSeq.getConstArray(); + const uno::Sequence< OUString > &rPathSeq = i == 0 ? aUserPaths : aInternalPaths; + const OUString *pPathSeq = rPathSeq.getConstArray(); for (sal_Int32 k = 0; k < rPathSeq.getLength(); ++k) { const bool bAddUser = &rPathSeq == &aUserPaths && (nPathFlags & PATH_FLAG_USER); @@ -125,9 +125,9 @@ static uno::Sequence< rtl::OUString > GetMultiPaths_Impl( return aRes; } -rtl::OUString GetDictionaryWriteablePath() +OUString GetDictionaryWriteablePath() { - uno::Sequence< rtl::OUString > aPaths( GetMultiPaths_Impl( "Dictionary", PATH_FLAG_WRITABLE ) ); + uno::Sequence< OUString > aPaths( GetMultiPaths_Impl( "Dictionary", PATH_FLAG_WRITABLE ) ); DBG_ASSERT( aPaths.getLength() == 1, "Dictionary_writable path corrupted?" ); String aRes; if (aPaths.getLength() > 0) @@ -135,7 +135,7 @@ rtl::OUString GetDictionaryWriteablePath() return aRes; } -uno::Sequence< rtl::OUString > GetDictionaryPaths( sal_Int16 nPathFlags ) +uno::Sequence< OUString > GetDictionaryPaths( sal_Int16 nPathFlags ) { return GetMultiPaths_Impl( "Dictionary", nPathFlags ); } diff --git a/linguistic/source/spelldsp.cxx b/linguistic/source/spelldsp.cxx index d44cbdfeee20..eb41f25243d1 100644 --- a/linguistic/source/spelldsp.cxx +++ b/linguistic/source/spelldsp.cxx @@ -45,7 +45,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::linguistic2; using namespace linguistic; -using ::rtl::OUString; // ProposalList: list of proposals for misspelled words // The order of strings in the array should be left unchanged because the diff --git a/linguistic/source/spelldsp.hxx b/linguistic/source/spelldsp.hxx index 4fef68d97351..401c6713aa70 100644 --- a/linguistic/source/spelldsp.hxx +++ b/linguistic/source/spelldsp.hxx @@ -83,14 +83,14 @@ class SpellCheckerDispatcher : void ClearSvcList(); - sal_Bool isValid_Impl(const ::rtl::OUString& aWord, LanguageType nLanguage, + sal_Bool isValid_Impl(const OUString& aWord, LanguageType nLanguage, const ::com::sun::star::beans::PropertyValues& aProperties, sal_Bool bCheckDics) throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException ); ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellAlternatives > - spell_Impl(const ::rtl::OUString& aWord, LanguageType nLanguage, + spell_Impl(const OUString& aWord, LanguageType nLanguage, const ::com::sun::star::beans::PropertyValues& aProperties, sal_Bool bCheckDics) throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException ); @@ -104,20 +104,20 @@ public: virtual sal_Bool SAL_CALL hasLocale( const ::com::sun::star::lang::Locale& aLocale ) throw(::com::sun::star::uno::RuntimeException); // XSpellChecker - virtual sal_Bool SAL_CALL isValid( 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::XSpellAlternatives > SAL_CALL spell( 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 sal_Bool SAL_CALL isValid( 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); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellAlternatives > SAL_CALL spell( 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); // XSupportedLanguages virtual ::com::sun::star::uno::Sequence< ::sal_Int16 > SAL_CALL getLanguages( ) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL hasLanguage( ::sal_Int16 nLanguage ) throw (::com::sun::star::uno::RuntimeException); // XSpellChecker1 - virtual ::sal_Bool SAL_CALL isValid( const ::rtl::OUString& aWord, ::sal_Int16 nLanguage, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aProperties ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellAlternatives > SAL_CALL spell( const ::rtl::OUString& aWord, ::sal_Int16 nLanguage, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aProperties ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL isValid( const OUString& aWord, ::sal_Int16 nLanguage, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aProperties ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellAlternatives > SAL_CALL spell( const OUString& aWord, ::sal_Int16 nLanguage, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aProperties ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); // LinguDispatcher - virtual void SetServiceList( const ::com::sun::star::lang::Locale &rLocale, const ::com::sun::star::uno::Sequence< rtl::OUString > &rSvcImplNames ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > GetServiceList( const ::com::sun::star::lang::Locale &rLocale ) const; + virtual void SetServiceList( const ::com::sun::star::lang::Locale &rLocale, const ::com::sun::star::uno::Sequence< OUString > &rSvcImplNames ); + virtual ::com::sun::star::uno::Sequence< OUString > GetServiceList( const ::com::sun::star::lang::Locale &rLocale ) const; virtual DspType GetDspType() const; void FlushSpellCache(); diff --git a/linguistic/source/spelldta.cxx b/linguistic/source/spelldta.cxx index 37089bff5d64..293bf774392f 100644 --- a/linguistic/source/spelldta.cxx +++ b/linguistic/source/spelldta.cxx @@ -38,7 +38,6 @@ using namespace com::sun::star::lang; using namespace com::sun::star::uno; using namespace com::sun::star::linguistic2; -using ::rtl::OUString; namespace linguistic { @@ -280,7 +279,7 @@ void SpellAlternatives::SetAlternatives( const Sequence< OUString > &rAlt ) com::sun::star::uno::Reference < com::sun::star::linguistic2::XSpellAlternatives > SpellAlternatives::CreateSpellAlternatives( - const ::rtl::OUString &rWord, sal_Int16 nLang, sal_Int16 nTypeP, const ::com::sun::star::uno::Sequence< ::rtl::OUString > &rAlt ) + const OUString &rWord, sal_Int16 nLang, sal_Int16 nTypeP, const ::com::sun::star::uno::Sequence< OUString > &rAlt ) { SpellAlternatives* pAlt = new SpellAlternatives; pAlt->SetWordLanguage( rWord, nLang ); diff --git a/linguistic/source/thesdsp.cxx b/linguistic/source/thesdsp.cxx index fd476177cb2d..a734d89271cd 100644 --- a/linguistic/source/thesdsp.cxx +++ b/linguistic/source/thesdsp.cxx @@ -38,7 +38,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::linguistic2; using namespace linguistic; -using ::rtl::OUString; static sal_Bool SvcListHasLanguage( diff --git a/linguistic/source/thesdsp.hxx b/linguistic/source/thesdsp.hxx index 981dcbc50ad3..bdf088877840 100644 --- a/linguistic/source/thesdsp.hxx +++ b/linguistic/source/thesdsp.hxx @@ -87,7 +87,7 @@ public: virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XMeaning > > SAL_CALL - queryMeanings( const ::rtl::OUString& aTerm, + queryMeanings( const OUString& aTerm, const ::com::sun::star::lang::Locale& aLocale, const ::com::sun::star::beans::PropertyValues& aProperties ) throw(::com::sun::star::lang::IllegalArgumentException, @@ -97,8 +97,8 @@ public: virtual void SetServiceList( const ::com::sun::star::lang::Locale &rLocale, const ::com::sun::star::uno::Sequence< - rtl::OUString > &rSvcImplNames ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > + OUString > &rSvcImplNames ); + virtual ::com::sun::star::uno::Sequence< OUString > GetServiceList( const ::com::sun::star::lang::Locale &rLocale ) const; virtual DspType GetDspType() const; |