summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-01-16 15:04:38 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-01-17 11:00:06 +0200
commite4d362017ecd6076ab9fd13d9c6b2c5137580500 (patch)
tree604c5196baf8f3db8a00e415fb3804c63e0c8872
parent034cb09f56fba58ccc53acb88681e1f0b812156a (diff)
use rtl::Reference in SpellCache
instead of storing both a raw pointer and a uno::Reference Change-Id: I8764bf6b7d7745dd14f6c7548e771131354b1f23
-rw-r--r--linguistic/inc/iprcache.hxx9
-rw-r--r--linguistic/source/iprcache.cxx11
2 files changed, 9 insertions, 11 deletions
diff --git a/linguistic/inc/iprcache.hxx b/linguistic/inc/iprcache.hxx
index f37f3afd0527..b311511f8f11 100644
--- a/linguistic/inc/iprcache.hxx
+++ b/linguistic/inc/iprcache.hxx
@@ -30,6 +30,7 @@
#include <com/sun/star/linguistic2/XSearchableDictionaryList.hpp>
#include <com/sun/star/linguistic2/XLinguProperties.hpp>
+#include <rtl/ref.hxx>
#include <rtl/string.hxx>
#include <i18nlangtag/lang.h>
@@ -75,12 +76,10 @@ public:
class SpellCache final
{
- css::uno::Reference< css::linguistic2::XDictionaryListEventListener >
- xFlushLstnr;
- FlushListener *pFlushLstnr;
+ rtl::Reference<FlushListener> mxFlushLstnr;
- typedef std::set< OUString > WordList_t;
- typedef std::map< LanguageType, WordList_t > LangWordList_t;
+ typedef std::set< OUString > WordList_t;
+ typedef std::map< LanguageType, WordList_t > LangWordList_t;
LangWordList_t aWordLists;
SpellCache(const SpellCache &) = delete;
diff --git a/linguistic/source/iprcache.cxx b/linguistic/source/iprcache.cxx
index fbcbb446b25d..e7989b2b8af6 100644
--- a/linguistic/source/iprcache.cxx
+++ b/linguistic/source/iprcache.cxx
@@ -189,20 +189,19 @@ void SAL_CALL FlushListener::propertyChange(
SpellCache::SpellCache()
{
- pFlushLstnr = new FlushListener( *this );
- xFlushLstnr = pFlushLstnr;
+ mxFlushLstnr = new FlushListener( *this );
Reference<XSearchableDictionaryList> aDictionaryList(GetDictionaryList());
- pFlushLstnr->SetDicList( aDictionaryList ); //! after reference is established
+ mxFlushLstnr->SetDicList( aDictionaryList ); //! after reference is established
Reference<XLinguProperties> aPropertySet(GetLinguProperties());
- pFlushLstnr->SetPropSet( aPropertySet ); //! after reference is established
+ mxFlushLstnr->SetPropSet( aPropertySet ); //! after reference is established
}
SpellCache::~SpellCache()
{
Reference<XSearchableDictionaryList> aEmptyList;
Reference<XLinguProperties> aEmptySet;
- pFlushLstnr->SetDicList( aEmptyList );
- pFlushLstnr->SetPropSet( aEmptySet );
+ mxFlushLstnr->SetDicList( aEmptyList );
+ mxFlushLstnr->SetPropSet( aEmptySet );
}
void SpellCache::Flush()