rtl::Reference fits just fine here

Change-Id: I80fd6b112134ab2b0e4a592f60a21c7c177b4b01

6 files changed, 6 insertions, 13 deletions

diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx
index 378d6f069aa9..4d72dd32d82b 100644
--- a/sd/source/ui/inc/ViewShell.hxx
+++ b/sd/source/ui/inc/ViewShell.hxx
@@ -26,7 +26,6 @@
 #include <sfx2/viewsh.hxx>
 #include <vcl/prntypes.hxx>
 #include <svtools/transfer.hxx>
-#include <comphelper/implementationreference.hxx>
 #include "glob.hxx"
 #include "pres.hxx"
 #include "cfgids.hxx"
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index e3668648a1f6..1341953d74e1 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -80,7 +80,6 @@
 #include <boost/bind.hpp>
 
 using ::cppu::OInterfaceContainerHelper;
-using ::comphelper::ImplementationReference;
 using ::com::sun::star::animations::XAnimationNode;
 using ::com::sun::star::animations::XAnimationListener;
 using ::com::sun::star::awt::XWindow;
@@ -630,7 +629,7 @@ void SAL_CALL SlideshowImpl::disposing()
     try
     {
         if( mxView.is() )
-            mxShow->removeView( mxView.getRef() );
+            mxShow->removeView( mxView.get() );
 
         Reference< XComponent > xComponent( mxShow, UNO_QUERY );
         if( xComponent.is() )
@@ -651,7 +650,7 @@ void SAL_CALL SlideshowImpl::disposing()
     }
 
     mxShow.clear();
-    mxView.reset();
+    mxView.clear();
     mxListenerProxy.clear();
     mpSlideController.reset();
 
@@ -1119,12 +1118,12 @@ bool SlideshowImpl::startShowImpl( const Sequence< beans::PropertyValue >& aProp
     try
     {
         mxShow = Reference< XSlideShow >( createSlideShow(), UNO_QUERY_THROW );
-        mxView = comphelper::ImplementationReference<sd::SlideShowView, css::presentation::XSlideShowView>::createFromQuery( new SlideShowView(
+        mxView = new SlideShowView(
                                              *mpShowWindow,
                                              mpDoc,
                                              meAnimationMode,
                                              this,
-                                             maPresSettings.mbFullScreen) );
+                                             maPresSettings.mbFullScreen);
 
         // try add wait symbol to properties:
         const Reference<rendering::XSpriteCanvas> xSpriteCanvas(
@@ -1163,7 +1162,7 @@ bool SlideshowImpl::startShowImpl( const Sequence< beans::PropertyValue >& aProp
         for( nIndex = 0; nIndex < nCount; nIndex++ )
             mxShow->setProperty( aProperties[nIndex] );
 
-        mxShow->addView( mxView.getRef() );
+        mxShow->addView( mxView.get() );
 
         mxListenerProxy.set( new SlideShowListenerProxy( this, mxShow ) );
         mxListenerProxy->addAsSlideShowListener();
diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx
index 074b667235f7..8d54e5dec4b5 100644
--- a/sd/source/ui/slideshow/slideshowimpl.hxx
+++ b/sd/source/ui/slideshow/slideshowimpl.hxx
@@ -332,7 +332,7 @@ private:
     sal_Int32 updateSlideShow (void);
 
     css::uno::Reference< css::presentation::XSlideShow > mxShow;
-    comphelper::ImplementationReference< ::sd::SlideShowView, css::presentation::XSlideShowView > mxView;
+    rtl::Reference<sd::SlideShowView> mxView;
     css::uno::Reference< css::frame::XModel > mxModel;
 
     Timer maUpdateTimer;
diff --git a/sd/source/ui/slideshow/slideshowviewimpl.cxx b/sd/source/ui/slideshow/slideshowviewimpl.cxx
index 853a30f9c274..30096f43d90c 100644
--- a/sd/source/ui/slideshow/slideshowviewimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowviewimpl.cxx
@@ -43,7 +43,6 @@ using ::com::sun::star::presentation::XSlideShow;
 using ::com::sun::star::presentation::XSlideShowView;
 using ::com::sun::star::presentation::XShapeEventListener;
 using ::com::sun::star::presentation::XSlideShowListener;
-using ::comphelper::ImplementationReference;
 
 using namespace ::com::sun::star;
 
diff --git a/sd/source/ui/slideshow/slideshowviewimpl.hxx b/sd/source/ui/slideshow/slideshowviewimpl.hxx
index 3f87abf5c154..fb01e7e19135 100644
--- a/sd/source/ui/slideshow/slideshowviewimpl.hxx
+++ b/sd/source/ui/slideshow/slideshowviewimpl.hxx
@@ -39,7 +39,6 @@
 #include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
 #include <com/sun/star/animations/XAnimationNodeSupplier.hpp>
 #include <com/sun/star/rendering/XSpriteCanvas.hpp>
-#include <comphelper/implementationreference.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/tools/canvastools.hxx>
 #include <cppcanvas/spritecanvas.hxx>
diff --git a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
index 12ebbe2fd188..d056b5a8b00c 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
@@ -29,7 +29,6 @@
 #include <sfx2/viewfac.hxx>
 #include <tools/link.hxx>
 #include <tools/gen.hxx>
-#include <comphelper/implementationreference.hxx>
 
 namespace sd { namespace slidesorter {
 class SlideSorter;
@@ -241,8 +240,6 @@ private:
     ::boost::scoped_ptr<VisibleAreaManager> mpVisibleAreaManager;
 
     // The listener listens to UNO events and thus is a UNO object.
-    // For proper life time management and at the same time free access to
-    // the implementation object we use the ImplementationReference class.
     ::rtl::Reference<controller::Listener> mpListener;
 
     int mnModelChangeLockCount;