From 708cab47c4457637f87815750a026168b3f10c84 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 14 May 2013 13:10:53 +0200 Subject: fdo#46808, propogate XLinguProperties through some more code Change-Id: I89258875094e9731921fcafdc903278ca8f95aa8 --- linguistic/source/lngprophelp.cxx | 14 +++++++------- linguistic/source/spelldsp.hxx | 6 +++--- linguistic/source/thesdsp.hxx | 6 +++--- linguistic/workben/sspellimp.cxx | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) (limited to 'linguistic') diff --git a/linguistic/source/lngprophelp.cxx b/linguistic/source/lngprophelp.cxx index c36f55abc4c9..79db0f0affa3 100644 --- a/linguistic/source/lngprophelp.cxx +++ b/linguistic/source/lngprophelp.cxx @@ -56,7 +56,7 @@ static int nCHCount = sizeof(aCH) / sizeof(aCH[0]); PropertyChgHelper::PropertyChgHelper( const Reference< XInterface > &rxSource, - Reference< XPropertySet > &rxPropSet, + Reference< XLinguProperties > &rxPropSet, int nAllowedEvents ) : PropertyChgHelperBase(), aPropNames (nCHCount), @@ -335,7 +335,7 @@ sal_Bool SAL_CALL PropertyHelper_Thes::PropertyHelper_Thes( const Reference< XInterface > &rxSource, - Reference< XPropertySet > &rxPropSet ) : + Reference< XLinguProperties > &rxPropSet ) : PropertyChgHelper ( rxSource, rxPropSet, 0 ) { SetDefaultValues(); @@ -370,7 +370,7 @@ static const char *aSP[] = PropertyHelper_Spell::PropertyHelper_Spell( const Reference< XInterface > & rxSource, - Reference< XPropertySet > &rxPropSet ) : + Reference< XLinguProperties > &rxPropSet ) : PropertyChgHelper ( rxSource, rxPropSet, AE_SPELLCHECKER ) { AddPropNames( aSP, sizeof(aSP) / sizeof(aSP[0]) ); @@ -558,7 +558,7 @@ static const char *aHP[] = PropertyHelper_Hyphen::PropertyHelper_Hyphen( const Reference< XInterface > & rxSource, - Reference< XPropertySet > &rxPropSet ) : + Reference< XLinguProperties > &rxPropSet ) : PropertyChgHelper ( rxSource, rxPropSet, AE_HYPHENATOR ) { AddPropNames( aHP, sizeof(aHP) / sizeof(aHP[0]) ); @@ -703,7 +703,7 @@ PropertyHelper_Thesaurus::PropertyHelper_Thesaurus( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > &rxSource, ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > &rxPropSet ) + ::com::sun::star::linguistic2::XLinguProperties > &rxPropSet ) { pInst = new PropertyHelper_Thes( rxSource, rxPropSet ); xPropHelper = pInst; @@ -732,7 +732,7 @@ PropertyHelper_Hyphenation::PropertyHelper_Hyphenation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > &rxSource, ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > &rxPropSet) + ::com::sun::star::linguistic2::XLinguProperties > &rxPropSet) { pInst = new PropertyHelper_Hyphen( rxSource, rxPropSet ); xPropHelper = pInst; @@ -792,7 +792,7 @@ PropertyHelper_Spelling::PropertyHelper_Spelling( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > &rxSource, ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > &rxPropSet ) + ::com::sun::star::linguistic2::XLinguProperties > &rxPropSet ) { pInst = new PropertyHelper_Spell( rxSource, rxPropSet ); xPropHelper = pInst; diff --git a/linguistic/source/spelldsp.hxx b/linguistic/source/spelldsp.hxx index 401c6713aa70..c2e591afd54f 100644 --- a/linguistic/source/spelldsp.hxx +++ b/linguistic/source/spelldsp.hxx @@ -60,7 +60,7 @@ class SpellCheckerDispatcher : LinguOptions aOpt; ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > xPropSet; + ::com::sun::star::linguistic2::XLinguProperties > xPropSet; ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSearchableDictionaryList > xDicList; @@ -75,7 +75,7 @@ class SpellCheckerDispatcher : inline linguistic::SpellCache & GetCache() const; inline ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > + ::com::sun::star::linguistic2::XLinguProperties > GetPropSet(); inline ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSearchableDictionaryList > @@ -137,7 +137,7 @@ inline linguistic::SpellCache & SpellCheckerDispatcher::GetCache() const inline ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > + ::com::sun::star::linguistic2::XLinguProperties > SpellCheckerDispatcher::GetPropSet() { return xPropSet.is() ? diff --git a/linguistic/source/thesdsp.hxx b/linguistic/source/thesdsp.hxx index bdf088877840..83832b40111e 100644 --- a/linguistic/source/thesdsp.hxx +++ b/linguistic/source/thesdsp.hxx @@ -58,14 +58,14 @@ class ThesaurusDispatcher : ThesSvcByLangMap_t aSvcMap; ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > xPropSet; + ::com::sun::star::linguistic2::XLinguProperties > xPropSet; // disallow copy-constructor and assignment-operator for now ThesaurusDispatcher(const ThesaurusDispatcher &); ThesaurusDispatcher & operator = (const ThesaurusDispatcher &); inline ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > + ::com::sun::star::linguistic2::XLinguProperties > GetPropSet(); void ClearSvcList(); @@ -106,7 +106,7 @@ public: inline ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > + ::com::sun::star::linguistic2::XLinguProperties > ThesaurusDispatcher::GetPropSet() { return xPropSet.is() ? diff --git a/linguistic/workben/sspellimp.cxx b/linguistic/workben/sspellimp.cxx index 4bbf3f3d0a6f..91a18a3e0478 100644 --- a/linguistic/workben/sspellimp.cxx +++ b/linguistic/workben/sspellimp.cxx @@ -70,7 +70,7 @@ PropertyHelper_Spell & SpellChecker::GetPropHelper_Impl() { if (!pPropHelper) { - Reference< XPropertySet > xPropSet( GetLinguProperties(), UNO_QUERY ); + Reference< XLinguProperties > xPropSet = GetLinguProperties(); pPropHelper = new PropertyHelper_Spell( (XSpellChecker *) this, xPropSet ); xPropHelper = pPropHelper; -- cgit