rtl::Reference fits just fine here

Change-Id: Id0a13af0c0d1aa0b6a21edde0ec7f97730a1c912

3 files changed, 7 insertions, 12 deletions

diff --git a/svx/inc/pch/precompiled_svxcore.hxx b/svx/inc/pch/precompiled_svxcore.hxx
index 7d33de68e864..fbe49452a145 100644
--- a/svx/inc/pch/precompiled_svxcore.hxx
+++ b/svx/inc/pch/precompiled_svxcore.hxx
@@ -425,7 +425,6 @@
 #include <comphelper/extract.hxx>
 #include <comphelper/flagguard.hxx>
 #include <comphelper/genericpropertyset.hxx>
-#include <comphelper/implementationreference.hxx>
 #include <comphelper/interaction.hxx>
 #include <comphelper/namedvaluecollection.hxx>
 #include <comphelper/numbers.hxx>
diff --git a/svx/source/form/fmscriptingenv.cxx b/svx/source/form/fmscriptingenv.cxx
index 8a70907cf6bd..58dc19de9fb6 100644
--- a/svx/source/form/fmscriptingenv.cxx
+++ b/svx/source/form/fmscriptingenv.cxx
@@ -30,7 +30,6 @@
 
 #include <tools/diagnose_ex.h>
 #include <cppuhelper/implbase1.hxx>
-#include <comphelper/implementationreference.hxx>
 #include <comphelper/processfactory.hxx>
 #include <vcl/svapp.hxx>
 #include <osl/mutex.hxx>
@@ -145,7 +144,7 @@ namespace svxform
         public IFormScriptingEnvironment, private boost::noncopyable
     {
     private:
-        typedef ::comphelper::ImplementationReference< FormScriptListener, XScriptListener >    ListenerImplementation;
+        typedef rtl::Reference<FormScriptListener> ListenerImplementation;
 
     private:
         ::osl::Mutex            m_aMutex;
@@ -833,9 +832,9 @@ namespace svxform
         try
         {
             if ( _bRegister )
-                _rxManager->addScriptListener( m_pScriptListener.getRef() );
+                _rxManager->addScriptListener( m_pScriptListener.get() );
             else
-                _rxManager->removeScriptListener( m_pScriptListener.getRef() );
+                _rxManager->removeScriptListener( m_pScriptListener.get() );
         }
         catch( const RuntimeException& ) { throw; }
         catch( const Exception& )
diff --git a/svx/source/inc/fmtextcontrolshell.hxx b/svx/source/inc/fmtextcontrolshell.hxx
index 91681359a5c9..a5ed1577f2cd 100644
--- a/svx/source/inc/fmtextcontrolshell.hxx
+++ b/svx/source/inc/fmtextcontrolshell.hxx
@@ -27,7 +27,7 @@
 #include <com/sun/star/form/runtime/XFormController.hpp>
 #include <com/sun/star/awt/XControl.hpp>
 #include <com/sun/star/util/XURLTransformer.hpp>
-#include <comphelper/implementationreference.hxx>
+#include <rtl/ref.hxx>
 #include <tools/link.hxx>
 #include <vcl/timer.hxx>
 #include "fmslotinvalidator.hxx"
@@ -99,18 +99,15 @@ namespace svx
         bool                                                                        m_bActiveControlIsRichText;
 
         // listening at all controls of the active controller for focus changes
-        typedef ::comphelper::ImplementationReference< FmFocusListenerAdapter, ::com::sun::star::awt::XFocusListener >
-                                                                                    FocusListenerAdapter;
+        typedef rtl::Reference<FmFocusListenerAdapter> FocusListenerAdapter;
         typedef ::std::vector< FocusListenerAdapter >                               FocusListenerAdapters;
         FocusListenerAdapters                                                       m_aControlObservers;
 
-        typedef ::comphelper::ImplementationReference< FmMouseListenerAdapter, ::com::sun::star::awt::XMouseListener >
-                                                                                    MouseListenerAdapter;
+        typedef rtl::Reference<FmMouseListenerAdapter> MouseListenerAdapter;
         MouseListenerAdapter                                                        m_aContextMenuObserver;
 
         // translating between "slots" of the framework and "features" of the active control
-        typedef ::comphelper::ImplementationReference< FmTextControlFeature, ::com::sun::star::frame::XStatusListener >
-                                                                                    ControlFeature;
+        typedef rtl::Reference<FmTextControlFeature> ControlFeature;
         typedef ::std::map< SfxSlotId, ControlFeature, ::std::less< SfxSlotId > >   ControlFeatures;
         ControlFeatures                                                             m_aControlFeatures;