loplugin:referencecasting look through more clang Types

Note that because of where the fix resides, loplugin:redundantcast
also notices a few more things.

Change-Id: I0b66047fadfff2c5ceafcbd3eab085de00d861a6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120865
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

8 files changed, 14 insertions, 21 deletions

diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index 387c6d9aeeac..46e485f89062 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -165,8 +165,7 @@ void LayoutManagerListener::setFrame( const css::uno::Reference< css::frame::XFr
 
         if ( xLayoutManager.is() )
             xLayoutManager->addLayoutManagerEventListener(
-                css::uno::Reference< css::frame::XLayoutManagerListener >(
-                    static_cast< OWeakObject* >( this ), css::uno::UNO_QUERY ));
+                css::uno::Reference< css::frame::XLayoutManagerListener >(this) );
 
         xPropSet.set( xLayoutManager, UNO_QUERY );
         if ( xPropSet.is() )
@@ -229,8 +228,7 @@ void SAL_CALL LayoutManagerListener::dispose()
         // remove as listener from layout manager
         if ( xLayoutManager.is() )
             xLayoutManager->removeLayoutManagerEventListener(
-                css::uno::Reference< css::frame::XLayoutManagerListener >(
-                    static_cast< OWeakObject* >( this ), css::uno::UNO_QUERY ));
+                css::uno::Reference< css::frame::XLayoutManagerListener >(this) );
     }
     catch ( css::lang::DisposedException& )
     {
diff --git a/sfx2/source/control/sfxstatuslistener.cxx b/sfx2/source/control/sfxstatuslistener.cxx
index ff436cbd52a0..38e26b055059 100644
--- a/sfx2/source/control/sfxstatuslistener.cxx
+++ b/sfx2/source/control/sfxstatuslistener.cxx
@@ -71,7 +71,7 @@ void SfxStatusListener::UnBind()
 {
     if ( m_xDispatch.is() )
     {
-        Reference< XStatusListener > aStatusListener( static_cast< OWeakObject* >( this ), UNO_QUERY );
+        Reference< XStatusListener > aStatusListener(this);
         m_xDispatch->removeStatusListener( aStatusListener, m_aCommand );
         m_xDispatch.clear();
     }
@@ -79,7 +79,7 @@ void SfxStatusListener::UnBind()
 
 void SfxStatusListener::ReBind()
 {
-    Reference< XStatusListener > aStatusListener( static_cast< OWeakObject* >( this ), UNO_QUERY );
+    Reference< XStatusListener > aStatusListener(this);
     if ( m_xDispatch.is() )
         m_xDispatch->removeStatusListener( aStatusListener, m_aCommand );
     if ( m_xDispatchProvider.is() )
@@ -103,7 +103,7 @@ void SAL_CALL SfxStatusListener::dispose()
     {
         try
         {
-            Reference< XStatusListener > aStatusListener( static_cast< OWeakObject* >( this ), UNO_QUERY );
+            Reference< XStatusListener > aStatusListener(this);
             m_xDispatch->removeStatusListener( aStatusListener, m_aCommand );
         }
         catch ( Exception& )
diff --git a/sfx2/source/control/statcach.cxx b/sfx2/source/control/statcach.cxx
index 9ba91ff0ade0..5bf5a27f3d88 100644
--- a/sfx2/source/control/statcach.cxx
+++ b/sfx2/source/control/statcach.cxx
@@ -72,7 +72,7 @@ void SAL_CALL  BindDispatch_Impl::statusChanged( const css::frame::FeatureStateE
     if ( !pCache )
         return;
 
-    css::uno::Reference< css::frame::XStatusListener >  xKeepAlive( static_cast<cppu::OWeakObject*>(this), css::uno::UNO_QUERY );
+    css::uno::Reference< css::frame::XStatusListener >  xKeepAlive(this);
     if ( aStatus.Requery )
         pCache->Invalidate( true );
     else
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 6d501fb4107b..8f4eab0b2b17 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -3879,7 +3879,7 @@ void SfxBaseModel::impl_getPrintHelper()
         return;
     m_pData->m_xPrintable = new SfxPrintHelper();
     Reference < lang::XInitialization > xInit( m_pData->m_xPrintable, UNO_QUERY );
-    xInit->initialize( { Any(Reference < frame::XModel > (static_cast< frame::XModel* >(this), UNO_QUERY )) } );
+    xInit->initialize( { Any(Reference < frame::XModel > (this)) } );
     Reference < view::XPrintJobBroadcaster > xBrd( m_pData->m_xPrintable, UNO_QUERY );
     xBrd->addPrintJobListener( new SfxPrintHelperListener_Impl( m_pData.get() ) );
 }
diff --git a/sfx2/source/sidebar/ControllerFactory.cxx b/sfx2/source/sidebar/ControllerFactory.cxx
index 5aefd0668681..1a4fcd51a9b5 100644
--- a/sfx2/source/sidebar/ControllerFactory.cxx
+++ b/sfx2/source/sidebar/ControllerFactory.cxx
@@ -67,14 +67,12 @@ Reference<frame::XToolbarController> ControllerFactory::CreateToolBoxController(
     }
     if ( ! xController.is())
     {
-        xController.set(
-            static_cast<XWeak*>(new framework::GenericToolbarController(
+        xController = new framework::GenericToolbarController(
                     ::comphelper::getProcessComponentContext(),
                     rxFrame,
                     pToolBox,
                     nItemId,
-                    rsCommandName)),
-            UNO_QUERY);
+                    rsCommandName);
     }
 
     // Initialize the controller with eg a service factory.
@@ -155,13 +153,11 @@ Reference<frame::XToolbarController> ControllerFactory::CreateToolBoxController(
 
     if (!xController.is())
     {
-        xController.set(
-            static_cast<XWeak*>(new framework::GenericToolbarController(
+        xController = new framework::GenericToolbarController(
                     ::comphelper::getProcessComponentContext(),
                     rxFrame,
                     rToolbar,
-                    rsCommandName)),
-            UNO_QUERY);
+                    rsCommandName);
     }
 
     if (xController.is())
diff --git a/sfx2/source/sidebar/SidebarDockingWindow.cxx b/sfx2/source/sidebar/SidebarDockingWindow.cxx
index 48ef151b9d61..b9fcdc43b62b 100644
--- a/sfx2/source/sidebar/SidebarDockingWindow.cxx
+++ b/sfx2/source/sidebar/SidebarDockingWindow.cxx
@@ -67,7 +67,7 @@ SidebarDockingWindow::~SidebarDockingWindow()
 
 void SidebarDockingWindow::dispose()
 {
-    Reference<lang::XComponent> xComponent (static_cast<XWeak*>(mpSidebarController.get()), UNO_QUERY);
+    Reference<lang::XComponent> xComponent(mpSidebarController);
     mpSidebarController.clear();
     if (xComponent.is())
         xComponent->dispose();
diff --git a/sfx2/source/sidebar/Theme.cxx b/sfx2/source/sidebar/Theme.cxx
index 6d6fe7bc517f..e918a992376c 100644
--- a/sfx2/source/sidebar/Theme.cxx
+++ b/sfx2/source/sidebar/Theme.cxx
@@ -179,7 +179,7 @@ void SAL_CALL Theme::disposing()
 Reference<beans::XPropertySet> Theme::GetPropertySet()
 {
     if (SfxGetpApp())
-        return Reference<beans::XPropertySet>(static_cast<XWeak*>(&GetCurrentTheme()), UNO_QUERY);
+        return Reference<beans::XPropertySet>(&GetCurrentTheme());
     else
         return Reference<beans::XPropertySet>();
 }
diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx
index 60252a3b71cb..49653b4546cf 100644
--- a/sfx2/source/view/sfxbasecontroller.cxx
+++ b/sfx2/source/view/sfxbasecontroller.cxx
@@ -178,8 +178,7 @@ public:
                                 , _nStartTime(0)
                             {
                                 osl_atomic_increment(&m_refCount);
-                                Reference< lang::XComponent > xComponent(
-                                    static_cast< ::cppu::OWeakObject* >(pController), uno::UNO_QUERY );
+                                Reference< lang::XComponent > xComponent = pController;
                                 if (xComponent.is())
                                     xComponent->addEventListener(this);
                                 osl_atomic_decrement(&m_refCount);