From 728f98303193bfc9319b4e82a4078d27d1844139 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 23 Oct 2015 10:51:14 +0200 Subject: com::sun::star->css in lingucomponent Change-Id: Iceef10c51db88b3e85f118a366de45f0f70bbf21 --- .../source/hyphenator/hyphen/hyphenimp.cxx | 18 ++++++------- .../source/hyphenator/hyphen/hyphenimp.hxx | 6 ++--- .../source/languageguessing/guesslang.cxx | 30 +++++++++++----------- lingucomponent/source/lingutil/lingutil.hxx | 2 +- .../source/thesaurus/libnth/nthesdta.hxx | 13 ++++------ .../source/thesaurus/libnth/nthesimp.cxx | 2 +- .../source/thesaurus/libnth/nthesimp.hxx | 4 +-- 7 files changed, 36 insertions(+), 39 deletions(-) (limited to 'lingucomponent/source') diff --git a/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx b/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx index 5328c70845d9..b540778c085d 100644 --- a/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx +++ b/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx @@ -250,10 +250,10 @@ sal_Bool SAL_CALL Hyphenator::hasLocale(const Locale& rLocale) } Reference< XHyphenatedWord > SAL_CALL Hyphenator::hyphenate( const OUString& aWord, - const ::com::sun::star::lang::Locale& aLocale, + const css::lang::Locale& aLocale, sal_Int16 nMaxLeading, - const ::com::sun::star::beans::PropertyValues& aProperties ) - throw (com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException, std::exception) + const css::beans::PropertyValues& aProperties ) + throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) { int k = 0; @@ -496,10 +496,10 @@ Reference< XHyphenatedWord > SAL_CALL Hyphenator::hyphenate( const OUString& aWo Reference < XHyphenatedWord > SAL_CALL Hyphenator::queryAlternativeSpelling( const OUString& aWord, - const ::com::sun::star::lang::Locale& aLocale, + const css::lang::Locale& aLocale, sal_Int16 nIndex, - const ::com::sun::star::beans::PropertyValues& aProperties ) - throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) + const css::beans::PropertyValues& aProperties ) + throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { // Firstly we allow only one plus character before the hyphen to avoid to miss the right break point: for (int extrachar = 1; extrachar <= 2; extrachar++) @@ -535,9 +535,9 @@ static OString Win_GetShortPathName( const OUString &rLongPathName ) #endif //defined(WNT) 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, std::exception) + const css::lang::Locale& aLocale, + const css::beans::PropertyValues& aProperties ) + throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { PropertyHelper_Hyphenation& rHelper = GetPropHelper(); rHelper.SetTmpPropVals(aProperties); diff --git a/lingucomponent/source/hyphenator/hyphen/hyphenimp.hxx b/lingucomponent/source/hyphenator/hyphen/hyphenimp.hxx index 6fbd9d89bfd3..73fc6280edf6 100644 --- a/lingucomponent/source/hyphenator/hyphen/hyphenimp.hxx +++ b/lingucomponent/source/hyphenator/hyphen/hyphenimp.hxx @@ -93,9 +93,9 @@ public: virtual sal_Bool SAL_CALL hasLocale( const Locale& rLocale ) throw(RuntimeException, std::exception) override; // XHyphenator - 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, std::exception) override; - 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, std::exception) override; - 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, std::exception) override; + virtual css::uno::Reference< css::linguistic2::XHyphenatedWord > SAL_CALL hyphenate( const OUString& aWord, const css::lang::Locale& aLocale, sal_Int16 nMaxLeading, const css::beans::PropertyValues& aProperties ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::linguistic2::XHyphenatedWord > SAL_CALL queryAlternativeSpelling( const OUString& aWord, const css::lang::Locale& aLocale, sal_Int16 nIndex, const css::beans::PropertyValues& aProperties ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::linguistic2::XPossibleHyphens > SAL_CALL createPossibleHyphens( const OUString& aWord, const css::lang::Locale& aLocale, const css::beans::PropertyValues& aProperties ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; // XLinguServiceEventBroadcaster virtual sal_Bool SAL_CALL addLinguServiceEventListener( const Reference< XLinguServiceEventListener >& rxLstnr ) throw(RuntimeException, std::exception) override; diff --git a/lingucomponent/source/languageguessing/guesslang.cxx b/lingucomponent/source/languageguessing/guesslang.cxx index 113234124ee7..678277fbae62 100644 --- a/lingucomponent/source/languageguessing/guesslang.cxx +++ b/lingucomponent/source/languageguessing/guesslang.cxx @@ -96,12 +96,12 @@ public: static Sequence< OUString > SAL_CALL getSupportedServiceNames_Static( ); // XLanguageGuessing implementation - 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, std::exception) override; - 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, std::exception) override; - 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, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::lang::Locale > SAL_CALL getAvailableLanguages( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::lang::Locale > SAL_CALL getEnabledLanguages( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::lang::Locale > SAL_CALL getDisabledLanguages( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::lang::Locale SAL_CALL guessPrimaryLanguage( const OUString& aText, ::sal_Int32 nStartPos, ::sal_Int32 nLen ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disableLanguages( const css::uno::Sequence< css::lang::Locale >& aLanguages ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL enableLanguages( const css::uno::Sequence< css::lang::Locale >& aLanguages ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::lang::Locale > SAL_CALL getAvailableLanguages( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::lang::Locale > SAL_CALL getEnabledLanguages( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::lang::Locale > SAL_CALL getDisabledLanguages( ) throw (css::uno::RuntimeException, std::exception) override; // implementation specific void SetFingerPrintsDB( const OUString &fileName ) throw (RuntimeException); @@ -211,14 +211,14 @@ uno::Sequence< Locale > SAL_CALL LangGuess_Impl::getAvailableLanguages( ) EnsureInitialized(); - Sequence< com::sun::star::lang::Locale > aRes; + Sequence< css::lang::Locale > aRes; vector gs = m_aGuesser.GetAllManagedLanguages(); aRes.realloc(gs.size()); - com::sun::star::lang::Locale *pRes = aRes.getArray(); + css::lang::Locale *pRes = aRes.getArray(); for(size_t i = 0; i < gs.size() ; i++ ){ - com::sun::star::lang::Locale current_aRes; + css::lang::Locale current_aRes; current_aRes.Language = OUString::createFromAscii( gs[i].GetLanguage().c_str() ); current_aRes.Country = OUString::createFromAscii( gs[i].GetCountry().c_str() ); pRes[i] = current_aRes; @@ -234,14 +234,14 @@ uno::Sequence< Locale > SAL_CALL LangGuess_Impl::getEnabledLanguages( ) EnsureInitialized(); - Sequence< com::sun::star::lang::Locale > aRes; + Sequence< css::lang::Locale > aRes; vector gs = m_aGuesser.GetAvailableLanguages(); aRes.realloc(gs.size()); - com::sun::star::lang::Locale *pRes = aRes.getArray(); + css::lang::Locale *pRes = aRes.getArray(); for(size_t i = 0; i < gs.size() ; i++ ){ - com::sun::star::lang::Locale current_aRes; + css::lang::Locale current_aRes; current_aRes.Language = OUString::createFromAscii( gs[i].GetLanguage().c_str() ); current_aRes.Country = OUString::createFromAscii( gs[i].GetCountry().c_str() ); pRes[i] = current_aRes; @@ -257,14 +257,14 @@ uno::Sequence< Locale > SAL_CALL LangGuess_Impl::getDisabledLanguages( ) EnsureInitialized(); - Sequence< com::sun::star::lang::Locale > aRes; + Sequence< css::lang::Locale > aRes; vector gs = m_aGuesser.GetUnavailableLanguages(); aRes.realloc(gs.size()); - com::sun::star::lang::Locale *pRes = aRes.getArray(); + css::lang::Locale *pRes = aRes.getArray(); for(size_t i = 0; i < gs.size() ; i++ ){ - com::sun::star::lang::Locale current_aRes; + css::lang::Locale current_aRes; current_aRes.Language = OUString::createFromAscii( gs[i].GetLanguage().c_str() ); current_aRes.Country = OUString::createFromAscii( gs[i].GetCountry().c_str() ); pRes[i] = current_aRes; diff --git a/lingucomponent/source/lingutil/lingutil.hxx b/lingucomponent/source/lingutil/lingutil.hxx index a54832c4e482..e0efb95d2526 100644 --- a/lingucomponent/source/lingutil/lingutil.hxx +++ b/lingucomponent/source/lingutil/lingutil.hxx @@ -41,7 +41,7 @@ struct lt_rtl_OUString } }; -inline bool operator == ( const ::com::sun::star::lang::Locale &rL1, const ::com::sun::star::lang::Locale &rL2 ) +inline bool operator == ( const css::lang::Locale &rL1, const css::lang::Locale &rL2 ) { return rL1.Language == rL2.Language && rL1.Country == rL2.Country && diff --git a/lingucomponent/source/thesaurus/libnth/nthesdta.hxx b/lingucomponent/source/thesaurus/libnth/nthesdta.hxx index cd931f20d7a3..8e551f21d2e1 100644 --- a/lingucomponent/source/thesaurus/libnth/nthesdta.hxx +++ b/lingucomponent/source/thesaurus/libnth/nthesdta.hxx @@ -27,12 +27,9 @@ namespace linguistic { class Meaning : - public cppu::WeakImplHelper - < - ::com::sun::star::linguistic2::XMeaning - > + public cppu::WeakImplHelper< css::linguistic2::XMeaning > { - ::com::sun::star::uno::Sequence< OUString > aSyn; // list of synonyms, may be empty. + css::uno::Sequence< OUString > aSyn; // list of synonyms, may be empty. OUString aTerm; #if 0 @@ -48,11 +45,11 @@ public: virtual ~Meaning(); // XMeaning - virtual OUString SAL_CALL getMeaning() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL querySynonyms() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getMeaning() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL querySynonyms() throw(css::uno::RuntimeException, std::exception) override; // non-interface specific functions - void SetSynonyms( const ::com::sun::star::uno::Sequence< OUString > &rSyn ); + void SetSynonyms( const css::uno::Sequence< OUString > &rSyn ); void SetMeaning( const OUString &rTerm ); }; diff --git a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx index 484e4c2a1b32..29adef111091 100644 --- a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx +++ b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx @@ -271,7 +271,7 @@ sal_Bool SAL_CALL Thesaurus::hasLocale(const Locale& rLocale) return bRes; } -Sequence < Reference < ::com::sun::star::linguistic2::XMeaning > > SAL_CALL Thesaurus::queryMeanings( +Sequence < Reference < css::linguistic2::XMeaning > > SAL_CALL Thesaurus::queryMeanings( const OUString& qTerm, const Locale& rLocale, const PropertyValues& rProperties) throw(IllegalArgumentException, RuntimeException, std::exception) diff --git a/lingucomponent/source/thesaurus/libnth/nthesimp.hxx b/lingucomponent/source/thesaurus/libnth/nthesimp.hxx index cb007b9df63e..f7063996cd05 100644 --- a/lingucomponent/source/thesaurus/libnth/nthesimp.hxx +++ b/lingucomponent/source/thesaurus/libnth/nthesimp.hxx @@ -77,7 +77,7 @@ class Thesaurus : sal_Int32 numthes; // cache for the Thesaurus dialog - Sequence < Reference < ::com::sun::star::linguistic2::XMeaning > > prevMeanings; + Sequence < Reference < css::linguistic2::XMeaning > > prevMeanings; OUString prevTerm; sal_Int16 prevLocale; @@ -99,7 +99,7 @@ public: virtual sal_Bool SAL_CALL hasLocale( const Locale& rLocale ) throw(RuntimeException, std::exception) override; // XThesaurus - virtual Sequence< Reference < ::com::sun::star::linguistic2::XMeaning > > SAL_CALL queryMeanings( const OUString& rTerm, const Locale& rLocale, const PropertyValues& rProperties ) throw(IllegalArgumentException, RuntimeException, std::exception) override; + virtual Sequence< Reference < css::linguistic2::XMeaning > > SAL_CALL queryMeanings( const OUString& rTerm, const Locale& rLocale, const PropertyValues& rProperties ) throw(IllegalArgumentException, RuntimeException, std::exception) override; // XServiceDisplayName virtual OUString SAL_CALL getServiceDisplayName( const Locale& rLocale ) throw(RuntimeException, std::exception) override; -- cgit