Skip to content

C
core
Kaydet (Commit) 728f9830 authored tarafından Noel Grandin's avatar Noel Grandin
Dosyalara gözat
Seçenekler

com::sun::star->css in lingucomponent 

Change-Id: Iceef10c51db88b3e85f118a366de45f0f70bbf21
üst 364eaba8
Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 41 deletions
javaunohelper/source/vm.hxx
Dosyayı görüntüle @ 728f9830
...@@ -36,9 +36,9 @@ namespace javaunohelper { ...@@ -36,9 +36,9 @@ namespace javaunohelper {
::rtl::Reference< ::jvmaccess::UnoVirtualMachine > create_vm_access( ::rtl::Reference< ::jvmaccess::UnoVirtualMachine > create_vm_access(
JNIEnv * jni_env, jobject loader ); JNIEnv * jni_env, jobject loader );
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > css::uno::Reference< css::uno::XComponentContext >
install_vm_singleton( install_vm_singleton(
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > css::uno::Reference< css::uno::XComponentContext >
const & xContext, const & xContext,
::rtl::Reference< ::jvmaccess::UnoVirtualMachine > const & vm_access ); ::rtl::Reference< ::jvmaccess::UnoVirtualMachine > const & vm_access );
......
lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx
Dosyayı görüntüle @ 728f9830
...@@ -250,10 +250,10 @@ sal_Bool SAL_CALL Hyphenator::hasLocale(const Locale& rLocale) ...@@ -250,10 +250,10 @@ sal_Bool SAL_CALL Hyphenator::hasLocale(const Locale& rLocale)
} }
Reference< XHyphenatedWord > SAL_CALL Hyphenator::hyphenate( const OUString& aWord, Reference< XHyphenatedWord > SAL_CALL Hyphenator::hyphenate( const OUString& aWord,
const ::com::sun::star::lang::Locale& aLocale, const css::lang::Locale& aLocale,
sal_Int16 nMaxLeading, sal_Int16 nMaxLeading,
const ::com::sun::star::beans::PropertyValues& aProperties ) const css::beans::PropertyValues& aProperties )
throw (com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException, std::exception) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception)
{ {
int k = 0; int k = 0;
...@@ -496,10 +496,10 @@ Reference< XHyphenatedWord > SAL_CALL Hyphenator::hyphenate( const OUString& aWo ...@@ -496,10 +496,10 @@ Reference< XHyphenatedWord > SAL_CALL Hyphenator::hyphenate( const OUString& aWo
Reference < XHyphenatedWord > SAL_CALL Hyphenator::queryAlternativeSpelling( Reference < XHyphenatedWord > SAL_CALL Hyphenator::queryAlternativeSpelling(
const OUString& aWord, const OUString& aWord,
const ::com::sun::star::lang::Locale& aLocale, const css::lang::Locale& aLocale,
sal_Int16 nIndex, sal_Int16 nIndex,
const ::com::sun::star::beans::PropertyValues& aProperties ) const css::beans::PropertyValues& aProperties )
throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) 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: // 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++) for (int extrachar = 1; extrachar <= 2; extrachar++)
...@@ -535,9 +535,9 @@ static OString Win_GetShortPathName( const OUString &rLongPathName ) ...@@ -535,9 +535,9 @@ static OString Win_GetShortPathName( const OUString &rLongPathName )
#endif //defined(WNT) #endif //defined(WNT)
Reference< XPossibleHyphens > SAL_CALL Hyphenator::createPossibleHyphens( const OUString& aWord, Reference< XPossibleHyphens > SAL_CALL Hyphenator::createPossibleHyphens( const OUString& aWord,
const ::com::sun::star::lang::Locale& aLocale, const css::lang::Locale& aLocale,
const ::com::sun::star::beans::PropertyValues& aProperties ) const css::beans::PropertyValues& aProperties )
throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
{ {
PropertyHelper_Hyphenation& rHelper = GetPropHelper(); PropertyHelper_Hyphenation& rHelper = GetPropHelper();
rHelper.SetTmpPropVals(aProperties); rHelper.SetTmpPropVals(aProperties);
......
lingucomponent/source/hyphenator/hyphen/hyphenimp.hxx
Dosyayı görüntüle @ 728f9830
...@@ -93,9 +93,9 @@ public: ...@@ -93,9 +93,9 @@ public:
virtual sal_Bool SAL_CALL hasLocale( const Locale& rLocale ) throw(RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasLocale( const Locale& rLocale ) throw(RuntimeException, std::exception) override;
// XHyphenator // 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 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 ::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 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 ::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::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 // XLinguServiceEventBroadcaster
virtual sal_Bool SAL_CALL addLinguServiceEventListener( const Reference< XLinguServiceEventListener >& rxLstnr ) throw(RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL addLinguServiceEventListener( const Reference< XLinguServiceEventListener >& rxLstnr ) throw(RuntimeException, std::exception) override;
......
lingucomponent/source/languageguessing/guesslang.cxx
Dosyayı görüntüle @ 728f9830
...@@ -96,12 +96,12 @@ public: ...@@ -96,12 +96,12 @@ public:
static Sequence< OUString > SAL_CALL getSupportedServiceNames_Static( ); static Sequence< OUString > SAL_CALL getSupportedServiceNames_Static( );
// XLanguageGuessing implementation // 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 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 ::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 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 ::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 css::uno::Sequence< css::lang::Locale >& aLanguages ) throw (css::lang::IllegalArgumentException, css::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 css::uno::Sequence< css::lang::Locale > SAL_CALL getAvailableLanguages( ) throw (css::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 css::uno::Sequence< css::lang::Locale > SAL_CALL getEnabledLanguages( ) throw (css::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::uno::Sequence< css::lang::Locale > SAL_CALL getDisabledLanguages( ) throw (css::uno::RuntimeException, std::exception) override;
// implementation specific // implementation specific
void SetFingerPrintsDB( const OUString &fileName ) throw (RuntimeException); void SetFingerPrintsDB( const OUString &fileName ) throw (RuntimeException);
...@@ -211,14 +211,14 @@ uno::Sequence< Locale > SAL_CALL LangGuess_Impl::getAvailableLanguages( ) ...@@ -211,14 +211,14 @@ uno::Sequence< Locale > SAL_CALL LangGuess_Impl::getAvailableLanguages( )
EnsureInitialized(); EnsureInitialized();
Sequence< com::sun::star::lang::Locale > aRes; Sequence< css::lang::Locale > aRes;
vector<Guess> gs = m_aGuesser.GetAllManagedLanguages(); vector<Guess> gs = m_aGuesser.GetAllManagedLanguages();
aRes.realloc(gs.size()); 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++ ){ 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.Language = OUString::createFromAscii( gs[i].GetLanguage().c_str() );
current_aRes.Country = OUString::createFromAscii( gs[i].GetCountry().c_str() ); current_aRes.Country = OUString::createFromAscii( gs[i].GetCountry().c_str() );
pRes[i] = current_aRes; pRes[i] = current_aRes;
...@@ -234,14 +234,14 @@ uno::Sequence< Locale > SAL_CALL LangGuess_Impl::getEnabledLanguages( ) ...@@ -234,14 +234,14 @@ uno::Sequence< Locale > SAL_CALL LangGuess_Impl::getEnabledLanguages( )
EnsureInitialized(); EnsureInitialized();
Sequence< com::sun::star::lang::Locale > aRes; Sequence< css::lang::Locale > aRes;
vector<Guess> gs = m_aGuesser.GetAvailableLanguages(); vector<Guess> gs = m_aGuesser.GetAvailableLanguages();
aRes.realloc(gs.size()); 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++ ){ 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.Language = OUString::createFromAscii( gs[i].GetLanguage().c_str() );
current_aRes.Country = OUString::createFromAscii( gs[i].GetCountry().c_str() ); current_aRes.Country = OUString::createFromAscii( gs[i].GetCountry().c_str() );
pRes[i] = current_aRes; pRes[i] = current_aRes;
...@@ -257,14 +257,14 @@ uno::Sequence< Locale > SAL_CALL LangGuess_Impl::getDisabledLanguages( ) ...@@ -257,14 +257,14 @@ uno::Sequence< Locale > SAL_CALL LangGuess_Impl::getDisabledLanguages( )
EnsureInitialized(); EnsureInitialized();
Sequence< com::sun::star::lang::Locale > aRes; Sequence< css::lang::Locale > aRes;
vector<Guess> gs = m_aGuesser.GetUnavailableLanguages(); vector<Guess> gs = m_aGuesser.GetUnavailableLanguages();
aRes.realloc(gs.size()); 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++ ){ 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.Language = OUString::createFromAscii( gs[i].GetLanguage().c_str() );
current_aRes.Country = OUString::createFromAscii( gs[i].GetCountry().c_str() ); current_aRes.Country = OUString::createFromAscii( gs[i].GetCountry().c_str() );
pRes[i] = current_aRes; pRes[i] = current_aRes;
......
lingucomponent/source/lingutil/lingutil.hxx
Dosyayı görüntüle @ 728f9830
...@@ -41,7 +41,7 @@ struct lt_rtl_OUString ...@@ -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 && return rL1.Language == rL2.Language &&
rL1.Country == rL2.Country && rL1.Country == rL2.Country &&
......
lingucomponent/source/thesaurus/libnth/nthesdta.hxx
Dosyayı görüntüle @ 728f9830
...@@ -27,12 +27,9 @@ namespace linguistic ...@@ -27,12 +27,9 @@ namespace linguistic
{ {
class Meaning : class Meaning :
public cppu::WeakImplHelper public cppu::WeakImplHelper< css::linguistic2::XMeaning >
<
::com::sun::star::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; OUString aTerm;
#if 0 #if 0
...@@ -48,11 +45,11 @@ public: ...@@ -48,11 +45,11 @@ public:
virtual ~Meaning(); virtual ~Meaning();
// XMeaning // XMeaning
virtual OUString SAL_CALL getMeaning() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getMeaning() throw(css::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 css::uno::Sequence< OUString > SAL_CALL querySynonyms() throw(css::uno::RuntimeException, std::exception) override;
// non-interface specific functions // 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 ); void SetMeaning( const OUString &rTerm );
}; };
......
lingucomponent/source/thesaurus/libnth/nthesimp.cxx
Dosyayı görüntüle @ 728f9830
...@@ -271,7 +271,7 @@ sal_Bool SAL_CALL Thesaurus::hasLocale(const Locale& rLocale) ...@@ -271,7 +271,7 @@ sal_Bool SAL_CALL Thesaurus::hasLocale(const Locale& rLocale)
return bRes; 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 OUString& qTerm, const Locale& rLocale,
const PropertyValues& rProperties) const PropertyValues& rProperties)
throw(IllegalArgumentException, RuntimeException, std::exception) throw(IllegalArgumentException, RuntimeException, std::exception)
......
lingucomponent/source/thesaurus/libnth/nthesimp.hxx
Dosyayı görüntüle @ 728f9830
...@@ -77,7 +77,7 @@ class Thesaurus : ...@@ -77,7 +77,7 @@ class Thesaurus :
sal_Int32 numthes; sal_Int32 numthes;
// cache for the Thesaurus dialog // cache for the Thesaurus dialog
Sequence < Reference < ::com::sun::star::linguistic2::XMeaning > > prevMeanings; Sequence < Reference < css::linguistic2::XMeaning > > prevMeanings;
OUString prevTerm; OUString prevTerm;
sal_Int16 prevLocale; sal_Int16 prevLocale;
...@@ -99,7 +99,7 @@ public: ...@@ -99,7 +99,7 @@ public:
virtual sal_Bool SAL_CALL hasLocale( const Locale& rLocale ) throw(RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasLocale( const Locale& rLocale ) throw(RuntimeException, std::exception) override;
// XThesaurus // 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 // XServiceDisplayName
virtual OUString SAL_CALL getServiceDisplayName( const Locale& rLocale ) throw(RuntimeException, std::exception) override; virtual OUString SAL_CALL getServiceDisplayName( const Locale& rLocale ) throw(RuntimeException, std::exception) override;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment