loplugin:staticcall

Change-Id: I9e643bd43e6e0f027a7e17b2d5d867c0cb452052

9 files changed, 37 insertions, 37 deletions

diff --git a/toolkit/source/awt/vclxaccessiblecomponent.cxx b/toolkit/source/awt/vclxaccessiblecomponent.cxx
index 826492452f71..907f7b4d773c 100644
--- a/toolkit/source/awt/vclxaccessiblecomponent.cxx
+++ b/toolkit/source/awt/vclxaccessiblecomponent.cxx
@@ -733,7 +733,7 @@ awt::Rectangle VCLXAccessibleComponent::implGetBounds() throw (uno::RuntimeExcep
         // the screen location of the VCL parent
         xParent = getVclParent();
         if ( xParent.is() )
-            xParentComponent = xParentComponent.query( xParent->getAccessibleContext() );
+            xParentComponent.set(xParent->getAccessibleContext(), css::uno::UNO_QUERY);
 
         awt::Point aScreenLocVCL( 0, 0 );
         if ( xParentComponent.is() )
diff --git a/toolkit/source/awt/vclxmenu.cxx b/toolkit/source/awt/vclxmenu.cxx
index 7a691e3b4434..8bcc7d3a65d6 100644
--- a/toolkit/source/awt/vclxmenu.cxx
+++ b/toolkit/source/awt/vclxmenu.cxx
@@ -721,7 +721,7 @@ throw (css::uno::RuntimeException, std::exception)
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
     if ( mpMenu && IsPopupMenu() )
-        return ( (PopupMenu*) mpMenu )->IsInExecute();
+        return PopupMenu::IsInExecute();
     else
         return sal_False;
 }
diff --git a/toolkit/source/controls/accessiblecontrolcontext.cxx b/toolkit/source/controls/accessiblecontrolcontext.cxx
index 1861b54eae0f..64862a109b74 100644
--- a/toolkit/source/controls/accessiblecontrolcontext.cxx
+++ b/toolkit/source/controls/accessiblecontrolcontext.cxx
@@ -71,7 +71,7 @@ namespace toolkit
 
         Reference< awt::XControl > xControl( _rxCreator, UNO_QUERY );
         if ( xControl.is() )
-            m_xControlModel = m_xControlModel.query( xControl->getModel() );
+            m_xControlModel.set(xControl->getModel(), css::uno::UNO_QUERY);
         OSL_ENSURE( m_xControlModel.is(), "OAccessibleControlContext::Init: invalid creator (no control, or control without model!" );
         if ( !m_xControlModel.is() )
             throw DisposedException();  // caught by the caller (the create method)
@@ -230,7 +230,7 @@ namespace toolkit
         Reference< awt::XControl > xControl( getAccessibleCreator(), UNO_QUERY );
         Reference< awt::XWindow > xWindow;
         if ( xControl.is() )
-            xWindow = xWindow.query( xControl->getPeer() );
+            xWindow.set(xControl->getPeer(), css::uno::UNO_QUERY);
 
         Window* pWindow = xWindow.is() ? VCLUnoHelper::GetWindow( xWindow ) : NULL;
 
@@ -283,7 +283,7 @@ namespace toolkit
             Reference< XAccessible > xParentAcc( implGetForeignControlledParent() );
             Reference< XAccessibleComponent > xParentAccComponent;
             if ( xParentAcc.is() )
-                xParentAccComponent = xParentAccComponent.query( xParentAcc->getAccessibleContext() );
+                xParentAccComponent.set(xParentAcc->getAccessibleContext(), css::uno::UNO_QUERY);
             awt::Point aAccParentScreenPos( 0, 0 );
             if ( xParentAccComponent.is() )
                 aAccParentScreenPos = xParentAccComponent->getLocationOnScreen();
diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx b/toolkit/source/controls/controlmodelcontainerbase.cxx
index d197fb14a9a9..327dc7fd88cb 100644
--- a/toolkit/source/controls/controlmodelcontainerbase.cxx
+++ b/toolkit/source/controls/controlmodelcontainerbase.cxx
@@ -968,7 +968,7 @@ void ControlModelContainerBase::implUpdateGroupStructure()
     for ( ; pControlModels != pControlModelsEnd; ++pControlModels )
     {
         // we'll need this in every state
-        xModelSI = xModelSI.query( *pControlModels );
+        xModelSI.set(*pControlModels, css::uno::UNO_QUERY);
         bIsRadioButton = xModelSI.is() && xModelSI->supportsService( OUString::createFromAscii( szServiceName2_UnoControlRadioButtonModel ) );
 
         switch ( eState )
diff --git a/toolkit/source/controls/roadmapcontrol.cxx b/toolkit/source/controls/roadmapcontrol.cxx
index ab0c4467d139..b5eb6a7a8aa9 100644
--- a/toolkit/source/controls/roadmapcontrol.cxx
+++ b/toolkit/source/controls/roadmapcontrol.cxx
@@ -377,7 +377,7 @@ sal_Bool SAL_CALL UnoRoadmapControl::setModel(const Reference< XControlModel >&
 
         bool bReturn = UnoControlBase::setModel( _rModel );
 
-        xC = xC.query( getModel());
+        xC.set(getModel(), css::uno::UNO_QUERY);
         if ( xC.is() )
             xC->addContainerListener( this );
 
diff --git a/toolkit/source/controls/stdtabcontroller.cxx b/toolkit/source/controls/stdtabcontroller.cxx
index 812ffef5ae15..104d0b80e8ec 100644
--- a/toolkit/source/controls/stdtabcontroller.cxx
+++ b/toolkit/source/controls/stdtabcontroller.cxx
@@ -301,7 +301,7 @@ void StdTabController::activateTabOrder(  ) throw(RuntimeException, std::excepti
     Reference< XControl >  xC( mxControlContainer, UNO_QUERY );
     Reference< XVclContainerPeer >  xVclContainerPeer;
     if ( xC.is() )
-        xVclContainerPeer = xVclContainerPeer.query( xC->getPeer() );
+        xVclContainerPeer.set(xC->getPeer(), css::uno::UNO_QUERY);
      if ( !xC.is() || !xVclContainerPeer.is() )
         return;
 
diff --git a/toolkit/source/controls/unocontrol.cxx b/toolkit/source/controls/unocontrol.cxx
index 9437258714b5..16a3e8d662a5 100644
--- a/toolkit/source/controls/unocontrol.cxx
+++ b/toolkit/source/controls/unocontrol.cxx
@@ -687,7 +687,7 @@ void SAL_CALL UnoControl::setOutputSize( const awt::Size& aSize ) throw (Runtime
     Reference< XWindow2 > xPeerWindow;
     {
         ::osl::MutexGuard aGuard( GetMutex() );
-        xPeerWindow = xPeerWindow.query( getPeer() );
+        xPeerWindow.set(getPeer(), css::uno::UNO_QUERY);
     }
 
     if ( xPeerWindow.is() )
@@ -751,7 +751,7 @@ void UnoControl::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int3
             maComponentInfos.nHeight = Height;
         maComponentInfos.nFlags |= Flags;
 
-        xWindow = xWindow.query( getPeer() );
+        xWindow.set(getPeer(), css::uno::UNO_QUERY);
     }
 
     if( xWindow.is() )
@@ -765,7 +765,7 @@ awt::Rectangle UnoControl::getPosSize(  ) throw(RuntimeException, std::exception
 
     {
         ::osl::MutexGuard aGuard( GetMutex() );
-        xWindow = xWindow.query( getPeer() );
+        xWindow.set(getPeer(), css::uno::UNO_QUERY);
     }
 
     if( xWindow.is() )
@@ -781,7 +781,7 @@ void UnoControl::setVisible( sal_Bool bVisible ) throw(RuntimeException, std::ex
 
         // Visible status is handled by View
         maComponentInfos.bVisible = bVisible;
-        xWindow = xWindow.query( getPeer() );
+        xWindow.set(getPeer(), css::uno::UNO_QUERY);
     }
     if ( xWindow.is() )
         xWindow->setVisible( bVisible );
@@ -795,7 +795,7 @@ void UnoControl::setEnable( sal_Bool bEnable ) throw(RuntimeException, std::exce
 
         // Enable status is handled by View
         maComponentInfos.bEnable = bEnable;
-        xWindow = xWindow.query( getPeer() );
+        xWindow.set(getPeer(), css::uno::UNO_QUERY);
     }
     if ( xWindow.is() )
         xWindow->setEnable( bEnable );
@@ -806,7 +806,7 @@ void UnoControl::setFocus(  ) throw(RuntimeException, std::exception)
     Reference< XWindow > xWindow;
     {
         ::osl::MutexGuard aGuard( GetMutex() );
-        xWindow = xWindow.query( getPeer() );
+        xWindow.set(getPeer(), css::uno::UNO_QUERY);
     }
     if ( xWindow.is() )
         xWindow->setFocus();
@@ -819,7 +819,7 @@ void UnoControl::addWindowListener( const Reference< XWindowListener >& rxListen
         ::osl::MutexGuard aGuard( GetMutex() );
         maWindowListeners.addInterface( rxListener );
         if ( maWindowListeners.getLength() == 1 )
-            xPeerWindow = xPeerWindow.query( getPeer() );
+            xPeerWindow.set(getPeer(), css::uno::UNO_QUERY);
     }
     if ( xPeerWindow.is() )
         xPeerWindow->addWindowListener( &maWindowListeners );
@@ -831,7 +831,7 @@ void UnoControl::removeWindowListener( const Reference< XWindowListener >& rxLis
     {
         ::osl::MutexGuard aGuard( GetMutex() );
         if ( maWindowListeners.getLength() == 1 )
-            xPeerWindow = xPeerWindow.query( getPeer() );
+            xPeerWindow.set(getPeer(), css::uno::UNO_QUERY);
         maWindowListeners.removeInterface( rxListener );
     }
     if ( xPeerWindow.is() )
@@ -845,7 +845,7 @@ void UnoControl::addFocusListener( const Reference< XFocusListener >& rxListener
         ::osl::MutexGuard aGuard( GetMutex() );
         maFocusListeners.addInterface( rxListener );
         if ( maFocusListeners.getLength() == 1 )
-            xPeerWindow = xPeerWindow.query( getPeer() );
+            xPeerWindow.set(getPeer(), css::uno::UNO_QUERY);
     }
     if ( xPeerWindow.is() )
         xPeerWindow->addFocusListener( &maFocusListeners );
@@ -857,7 +857,7 @@ void UnoControl::removeFocusListener( const Reference< XFocusListener >& rxListe
     {
         ::osl::MutexGuard aGuard( GetMutex() );
         if ( maFocusListeners.getLength() == 1 )
-            xPeerWindow = xPeerWindow.query( getPeer() );
+            xPeerWindow.set(getPeer(), css::uno::UNO_QUERY);
         maFocusListeners.removeInterface( rxListener );
     }
     if ( xPeerWindow.is() )
@@ -871,7 +871,7 @@ void UnoControl::addKeyListener( const Reference< XKeyListener >& rxListener ) t
         ::osl::MutexGuard aGuard( GetMutex() );
         maKeyListeners.addInterface( rxListener );
         if ( maKeyListeners.getLength() == 1 )
-            xPeerWindow = xPeerWindow.query( getPeer() );
+            xPeerWindow.set(getPeer(), css::uno::UNO_QUERY);
     }
     if ( xPeerWindow.is() )
         xPeerWindow->addKeyListener( &maKeyListeners);
@@ -883,7 +883,7 @@ void UnoControl::removeKeyListener( const Reference< XKeyListener >& rxListener
     {
         ::osl::MutexGuard aGuard( GetMutex() );
         if ( maKeyListeners.getLength() == 1 )
-            xPeerWindow = xPeerWindow.query( getPeer() );
+            xPeerWindow.set(getPeer(), css::uno::UNO_QUERY);
         maKeyListeners.removeInterface( rxListener );
     }
     if ( xPeerWindow.is() )
@@ -897,7 +897,7 @@ void UnoControl::addMouseListener( const Reference< XMouseListener >& rxListener
         ::osl::MutexGuard aGuard( GetMutex() );
         maMouseListeners.addInterface( rxListener );
         if ( maMouseListeners.getLength() == 1 )
-            xPeerWindow = xPeerWindow.query( getPeer() );
+            xPeerWindow.set(getPeer(), css::uno::UNO_QUERY);
     }
     if ( xPeerWindow.is() )
         xPeerWindow->addMouseListener( &maMouseListeners);
@@ -909,7 +909,7 @@ void UnoControl::removeMouseListener( const Reference< XMouseListener >& rxListe
     {
         ::osl::MutexGuard aGuard( GetMutex() );
         if ( maMouseListeners.getLength() == 1 )
-            xPeerWindow = xPeerWindow.query( getPeer() );
+            xPeerWindow.set(getPeer(), css::uno::UNO_QUERY);
         maMouseListeners.removeInterface( rxListener );
     }
     if ( xPeerWindow.is() )
@@ -923,7 +923,7 @@ void UnoControl::addMouseMotionListener( const Reference< XMouseMotionListener >
         ::osl::MutexGuard aGuard( GetMutex() );
         maMouseMotionListeners.addInterface( rxListener );
         if ( maMouseMotionListeners.getLength() == 1 )
-            xPeerWindow = xPeerWindow.query( getPeer() );
+            xPeerWindow.set(getPeer(), css::uno::UNO_QUERY);
     }
     if ( xPeerWindow.is() )
         xPeerWindow->addMouseMotionListener( &maMouseMotionListeners);
@@ -935,7 +935,7 @@ void UnoControl::removeMouseMotionListener( const Reference< XMouseMotionListene
     {
         ::osl::MutexGuard aGuard( GetMutex() );
         if ( maMouseMotionListeners.getLength() == 1 )
-            xPeerWindow = xPeerWindow.query( getPeer() );
+            xPeerWindow.set(getPeer(), css::uno::UNO_QUERY);
         maMouseMotionListeners.removeInterface( rxListener );
     }
     if ( xPeerWindow.is() )
@@ -949,7 +949,7 @@ void UnoControl::addPaintListener( const Reference< XPaintListener >& rxListener
         ::osl::MutexGuard aGuard( GetMutex() );
         maPaintListeners.addInterface( rxListener );
         if ( maPaintListeners.getLength() == 1 )
-            xPeerWindow = xPeerWindow.query( getPeer() );
+            xPeerWindow.set(getPeer(), css::uno::UNO_QUERY);
     }
     if ( xPeerWindow.is() )
         xPeerWindow->addPaintListener( &maPaintListeners);
@@ -961,7 +961,7 @@ void UnoControl::removePaintListener( const Reference< XPaintListener >& rxListe
     {
         ::osl::MutexGuard aGuard( GetMutex() );
         if ( maPaintListeners.getLength() == 1 )
-            xPeerWindow = xPeerWindow.query( getPeer() );
+            xPeerWindow.set(getPeer(), css::uno::UNO_QUERY);
         maPaintListeners.removeInterface( rxListener );
     }
     if ( xPeerWindow.is() )
@@ -976,7 +976,7 @@ sal_Bool UnoControl::setGraphics( const Reference< XGraphics >& rDevice ) throw(
         ::osl::MutexGuard aGuard( GetMutex() );
 
         mxGraphics = rDevice;
-        xView = xView.query( getPeer() );
+        xView.set(getPeer(), css::uno::UNO_QUERY);
     }
     return xView.is() ? xView->setGraphics( rDevice ) : sal_True;
 }
@@ -1030,7 +1030,7 @@ void UnoControl::setZoom( float fZoomX, float fZoomY ) throw(RuntimeException, s
         maComponentInfos.nZoomX = fZoomX;
         maComponentInfos.nZoomY = fZoomY;
 
-        xView = xView.query( getPeer() );
+        xView.set(getPeer(), css::uno::UNO_QUERY);
     }
     if ( xView.is() )
         xView->setZoom( fZoomX, fZoomY );
@@ -1385,7 +1385,7 @@ void UnoControl::setDesignMode( sal_Bool bOn ) throw(RuntimeException, std::exce
 
         // remember this
         mbDesignMode = bOn;
-        xWindow = xWindow.query( getPeer() );
+        xWindow.set(getPeer(), css::uno::UNO_QUERY);
 
         xAccessibleComp.set(maAccessibleContext, UNO_QUERY);
         maAccessibleContext.clear();
@@ -1499,7 +1499,7 @@ awt::Point SAL_CALL UnoControl::convertPointToLogic( const awt::Point& i_Point,
     Reference< XUnitConversion > xPeerConversion;
     {
         ::osl::MutexGuard aGuard( GetMutex() );
-        xPeerConversion = xPeerConversion.query( getPeer() );
+        xPeerConversion.set(getPeer(), css::uno::UNO_QUERY);
     }
     if ( xPeerConversion.is() )
         return xPeerConversion->convertPointToLogic( i_Point, i_TargetUnit );
@@ -1512,7 +1512,7 @@ awt::Point SAL_CALL UnoControl::convertPointToPixel( const awt::Point& i_Point,
     Reference< XUnitConversion > xPeerConversion;
     {
         ::osl::MutexGuard aGuard( GetMutex() );
-        xPeerConversion = xPeerConversion.query( getPeer() );
+        xPeerConversion.set(getPeer(), css::uno::UNO_QUERY);
     }
     if ( xPeerConversion.is() )
         return xPeerConversion->convertPointToPixel( i_Point, i_SourceUnit );
@@ -1525,7 +1525,7 @@ awt::Size SAL_CALL UnoControl::convertSizeToLogic( const awt::Size& i_Size, ::sa
     Reference< XUnitConversion > xPeerConversion;
     {
         ::osl::MutexGuard aGuard( GetMutex() );
-        xPeerConversion = xPeerConversion.query( getPeer() );
+        xPeerConversion.set(getPeer(), css::uno::UNO_QUERY);
     }
     if ( xPeerConversion.is() )
         return xPeerConversion->convertSizeToLogic( i_Size, i_TargetUnit );
@@ -1538,7 +1538,7 @@ awt::Size SAL_CALL UnoControl::convertSizeToPixel( const awt::Size& i_Size, ::sa
     Reference< XUnitConversion > xPeerConversion;
     {
         ::osl::MutexGuard aGuard( GetMutex() );
-        xPeerConversion = xPeerConversion.query( getPeer() );
+        xPeerConversion.set(getPeer(), css::uno::UNO_QUERY);
     }
     if ( xPeerConversion.is() )
         return xPeerConversion->convertSizeToPixel( i_Size, i_SourceUnit );
@@ -1551,7 +1551,7 @@ uno::Reference< awt::XStyleSettings > SAL_CALL UnoControl::getStyleSettings() th
     Reference< awt::XStyleSettingsSupplier > xPeerSupplier;
     {
         ::osl::MutexGuard aGuard( GetMutex() );
-        xPeerSupplier = xPeerSupplier.query( getPeer() );
+        xPeerSupplier.set(getPeer(), css::uno::UNO_QUERY);
     }
     if ( xPeerSupplier.is() )
         return xPeerSupplier->getStyleSettings();
diff --git a/toolkit/source/helper/formpdfexport.cxx b/toolkit/source/helper/formpdfexport.cxx
index 097eaa05a9b3..bb7c97fdf570 100644
--- a/toolkit/source/helper/formpdfexport.cxx
+++ b/toolkit/source/helper/formpdfexport.cxx
@@ -142,7 +142,7 @@ namespace toolkitform
             while ( xParentForm.is() )
             {
                 xChild = xParentForm.get();
-                xParentForm = xParentForm.query( xChild->getParent() );
+                xParentForm.set(xChild->getParent(), css::uno::UNO_QUERY);
             }
             Reference< XIndexAccess > xRoot( xChild->getParent(), UNO_QUERY );
             OSL_ENSURE( xRoot.is(), "determineRadioGroupId: unable to determine the root of the form component hierarchy!" );
@@ -466,7 +466,7 @@ namespace toolkitform
                     Reference< XChild > xChild( xModelProps, UNO_QUERY );
                     Reference < XPropertySet > xParentProps;
                     if ( xChild.is() )
-                        xParentProps = xParentProps.query( xChild->getParent() );
+                        xParentProps.set(xChild->getParent(), css::uno::UNO_QUERY);
                     if ( xParentProps.is() )
                     {
                         Reference< XServiceInfo > xParentSI( xParentProps, UNO_QUERY );
diff --git a/toolkit/source/helper/vclunohelper.cxx b/toolkit/source/helper/vclunohelper.cxx
index ee6e2e328470..e7285bd07e96 100644
--- a/toolkit/source/helper/vclunohelper.cxx
+++ b/toolkit/source/helper/vclunohelper.cxx
@@ -148,7 +148,7 @@ Region VCLUnoHelper::GetRegion( const ::com::sun::star::uno::Reference< ::com::s
     if ( pWindow )
     {
         ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer> xPeer = pWindow->GetComponentInterface();
-        xWin = xWin.query( xPeer );
+        xWin.set(xPeer, css::uno::UNO_QUERY);
     }
     return xWin;
 }