summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2013-05-14 13:10:53 +0200
committerNoel Grandin <noel@peralex.com>2013-05-14 13:39:30 +0200
commit708cab47c4457637f87815750a026168b3f10c84 (patch)
tree7257fac35af4810a01ef14781ca250e44bc2f513
parentc75a46fbd0ba4daf857fcd7d70badeed5aae8e28 (diff)
fdo#46808, propogate XLinguProperties through some more code
Change-Id: I89258875094e9731921fcafdc903278ca8f95aa8
-rw-r--r--include/linguistic/lngprophelp.hxx14
-rw-r--r--lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx4
-rw-r--r--lingucomponent/source/spellcheck/macosxspell/macspellimp.mm2
-rw-r--r--lingucomponent/source/spellcheck/spell/sspellimp.cxx4
-rw-r--r--lingucomponent/source/thesaurus/libnth/nthesimp.cxx4
-rw-r--r--linguistic/source/lngprophelp.cxx14
-rw-r--r--linguistic/source/spelldsp.hxx6
-rw-r--r--linguistic/source/thesdsp.hxx6
-rw-r--r--linguistic/workben/sspellimp.cxx2
9 files changed, 28 insertions, 28 deletions
diff --git a/include/linguistic/lngprophelp.hxx b/include/linguistic/lngprophelp.hxx
index 3995d87cc1e4..4befc9280cfe 100644
--- a/include/linguistic/lngprophelp.hxx
+++ b/include/linguistic/lngprophelp.hxx
@@ -101,7 +101,7 @@ public:
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,
int nAllowedEvents );
virtual ~PropertyChgHelper();
@@ -161,7 +161,7 @@ public:
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 );
virtual ~PropertyHelper_Thes();
// XPropertyChangeListener
@@ -184,7 +184,7 @@ public:
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 );
~PropertyHelper_Thesaurus();
void AddAsPropListener();
void RemoveAsPropListener();
@@ -223,7 +223,7 @@ public:
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 );
virtual ~PropertyHelper_Spell();
virtual void SetTmpPropVals( const com::sun::star::beans::PropertyValues &rPropVals );
@@ -256,7 +256,7 @@ public:
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 );
~PropertyHelper_Spelling();
void AddAsPropListener();
@@ -305,7 +305,7 @@ public:
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);
virtual ~PropertyHelper_Hyphen();
virtual void SetTmpPropVals( const com::sun::star::beans::PropertyValues &rPropVals );
@@ -334,7 +334,7 @@ public:
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);
~PropertyHelper_Hyphenation();
void AddAsPropListener();
diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
index f4caedd0ae69..e567d64b755f 100644
--- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
+++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
@@ -96,7 +96,7 @@ PropertyHelper_Hyphenation& Hyphenator::GetPropHelper_Impl()
{
if (!pPropHelper)
{
- Reference< XPropertySet > xPropSet( GetLinguProperties(), UNO_QUERY );
+ Reference< XLinguProperties > xPropSet( GetLinguProperties(), UNO_QUERY );
pPropHelper = new PropertyHelper_Hyphenation ((XHyphenator *) this, xPropSet );
pPropHelper->AddAsPropListener(); //! after a reference is established
@@ -790,7 +790,7 @@ void SAL_CALL Hyphenator::initialize( const Sequence< Any >& rArguments )
sal_Int32 nLen = rArguments.getLength();
if (2 == nLen)
{
- Reference< XPropertySet > xPropSet;
+ Reference< XLinguProperties > xPropSet;
rArguments.getConstArray()[0] >>= xPropSet;
//rArguments.getConstArray()[1] >>= xDicList;
diff --git a/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm b/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm
index 64cc1c1421a6..0936661a742c 100644
--- a/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm
+++ b/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm
@@ -83,7 +83,7 @@ PropertyHelper_Spell & MacSpellChecker::GetPropHelper_Impl()
{
if (!pPropHelper)
{
- Reference< XPropertySet > xPropSet( GetLinguProperties(), UNO_QUERY );
+ Reference< XLinguProperties > xPropSet( GetLinguProperties(), UNO_QUERY );
pPropHelper = new PropertyHelper_Spell( (XSpellChecker *) this, xPropSet );
xPropHelper = pPropHelper;
diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.cxx b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
index 8f85482cebd8..b1a799f5fd57 100644
--- a/lingucomponent/source/spellcheck/spell/sspellimp.cxx
+++ b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
@@ -97,7 +97,7 @@ PropertyHelper_Spelling & SpellChecker::GetPropHelper_Impl()
{
if (!pPropHelper)
{
- Reference< XPropertySet > xPropSet( GetLinguProperties(), UNO_QUERY );
+ Reference< XLinguProperties > xPropSet( GetLinguProperties(), UNO_QUERY );
pPropHelper = new PropertyHelper_Spelling( (XSpellChecker *) this, xPropSet );
pPropHelper->AddAsPropListener(); //! after a reference is established
@@ -571,7 +571,7 @@ void SAL_CALL SpellChecker::initialize( const Sequence< Any >& rArguments )
sal_Int32 nLen = rArguments.getLength();
if (2 == nLen)
{
- Reference< XPropertySet > xPropSet;
+ Reference< XLinguProperties > xPropSet;
rArguments.getConstArray()[0] >>= xPropSet;
//rArguments.getConstArray()[1] >>= xDicList;
diff --git a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
index 12b4b89ed2d5..b09b950e6e56 100644
--- a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
+++ b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
@@ -120,7 +120,7 @@ PropertyHelper_Thesaurus& Thesaurus::GetPropHelper_Impl()
{
if (!pPropHelper)
{
- Reference< XPropertySet > xPropSet( GetLinguProperties(), UNO_QUERY );
+ Reference< XLinguProperties > xPropSet( GetLinguProperties(), UNO_QUERY );
pPropHelper = new PropertyHelper_Thesaurus( (XThesaurus *) this, xPropSet );
pPropHelper->AddAsPropListener(); //! after a reference is established
@@ -554,7 +554,7 @@ void SAL_CALL Thesaurus::initialize( const Sequence< Any >& rArguments )
sal_Int32 nLen = rArguments.getLength();
if (1 == nLen)
{
- Reference< XPropertySet > xPropSet;
+ Reference< XLinguProperties > xPropSet;
rArguments.getConstArray()[0] >>= xPropSet;
//! Pointer allows for access of the non-UNO functions.
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;