From 76f81d58ab0cd701182f2d55281546ecd8b08c2c Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Mon, 16 Jan 2017 15:14:20 +0200
Subject: use rtl::Reference in LngSvcMgr

instead of storing both raw pointers and uno::Reference

Change-Id: Ie403e1e7a081bc3f91fd25be89c54ddc1d1cadd2
---
 linguistic/source/lngsvcmgr.hxx | 25 +++++++------------------
 1 file changed, 7 insertions(+), 18 deletions(-)

(limited to 'linguistic/source/lngsvcmgr.hxx')

diff --git a/linguistic/source/lngsvcmgr.hxx b/linguistic/source/lngsvcmgr.hxx
index 493e6dd0fd72..348ca0905a0e 100644
--- a/linguistic/source/lngsvcmgr.hxx
+++ b/linguistic/source/lngsvcmgr.hxx
@@ -30,6 +30,7 @@
 #include <com/sun/star/util/XModifyBroadcaster.hpp>
 #include <com/sun/star/util/XModifyListener.hpp>
 #include <unotools/configitem.hxx>
+#include <rtl/ref.hxx>
 #include <vcl/timer.hxx>
 #include <vcl/idle.hxx>
 #include <vector>
@@ -65,19 +66,7 @@ class LngSvcMgr :
 {
     friend class LngSvcMgrListenerHelper;
 
-    ::comphelper::OInterfaceContainerHelper2                   aEvtListeners;
-
-    css::uno::Reference<
-        css::linguistic2::XSpellChecker >              xSpellDsp;
-    css::uno::Reference<
-        css::linguistic2::XProofreadingIterator >      xGrammarDsp;
-    css::uno::Reference<
-        css::linguistic2::XHyphenator >                xHyphDsp;
-    css::uno::Reference<
-        css::linguistic2::XThesaurus >                 xThesDsp;
-
-    css::uno::Reference<
-        css::lang::XEventListener >                    xListenerHelper;
+    ::comphelper::OInterfaceContainerHelper2            aEvtListeners;
 
     css::uno::Reference<
         css::util::XModifyBroadcaster>                  xMB;
@@ -94,12 +83,12 @@ class LngSvcMgr :
     css::uno::Sequence<
         css::lang::Locale >                             aAvailThesLocales;
 
-    SpellCheckerDispatcher *                            pSpellDsp;
-    GrammarCheckingIterator *                           pGrammarDsp;
-    HyphenatorDispatcher *                              pHyphDsp;
-    ThesaurusDispatcher *                               pThesDsp;
+    rtl::Reference<SpellCheckerDispatcher>              mxSpellDsp;
+    rtl::Reference<GrammarCheckingIterator>             mxGrammarDsp;
+    rtl::Reference<HyphenatorDispatcher>                mxHyphDsp;
+    rtl::Reference<ThesaurusDispatcher>                 mxThesDsp;
 
-    LngSvcMgrListenerHelper *                           pListenerHelper;
+    rtl::Reference<LngSvcMgrListenerHelper>             mxListenerHelper;
 
     typedef std::vector< std::unique_ptr<SvcInfo> >    SvcInfoArray;
     SvcInfoArray *                                      pAvailSpellSvcs;
-- 
cgit