loplugin:staticcall

Change-Id: I3c43c34e66772ce7e42b42be04e0591f2e78ec01

11 files changed, 21 insertions, 21 deletions

diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx
index 4314755ea52d..84270f17eb25 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -2496,7 +2496,7 @@ void SAL_CALL ODatabaseForm::setGroup( const Sequence<Reference<XControlModel> >
 
     for( sal_Int32 i=0; i<_rGroup.getLength(); ++i, ++pControls )
     {
-        xSet = xSet.query( *pControls );
+        xSet.set(*pControls, css::uno::UNO_QUERY);
         if ( !xSet.is() )
         {
             // can't throw an exception other than a RuntimeException (which would not be appropriate),
diff --git a/forms/source/component/Filter.cxx b/forms/source/component/Filter.cxx
index 8419142b1864..11d0b7388d9b 100644
--- a/forms/source/component/Filter.cxx
+++ b/forms/source/component/Filter.cxx
@@ -880,7 +880,7 @@ namespace frm
         Reference< XChild > xModel( xControlModel, UNO_QUERY );
         Reference< XRowSet > xForm;
         if ( xModel.is() )
-            xForm = xForm.query( xModel->getParent() );
+            xForm.set(xModel->getParent(), css::uno::UNO_QUERY);
         m_xConnection = ::dbtools::getConnection( xForm );
         OSL_ENSURE( m_xConnection.is(), "OFilterControl::initialize: unable to determine the form's connection!" );
 #endif
diff --git a/forms/source/component/FormComponent.cxx b/forms/source/component/FormComponent.cxx
index f5143564c30b..6cbe180593be 100644
--- a/forms/source/component/FormComponent.cxx
+++ b/forms/source/component/FormComponent.cxx
@@ -123,8 +123,8 @@ OControl::OControl( const Reference< XComponentContext >& _rxContext, const OUSt
     // das Aggregat selbst den Refcount erhoeht
     increment( m_refCount );
     {
-        m_xAggregate = m_xAggregate.query( _rxContext->getServiceManager()->createInstanceWithContext(_rAggregateService, _rxContext) );
-        m_xControl = m_xControl.query( m_xAggregate );
+        m_xAggregate.set(_rxContext->getServiceManager()->createInstanceWithContext(_rAggregateService, _rxContext), css::uno::UNO_QUERY);
+        m_xControl.set(m_xAggregate, css::uno::UNO_QUERY);
     }
     decrement( m_refCount );
 
@@ -632,7 +632,7 @@ void SAL_CALL OControlModel::setParent(const Reference< XInterface >& _rxParent)
         xComp->removeEventListener(static_cast<XPropertiesChangeListener*>(this));
 
     m_xParent = _rxParent;
-    xComp = xComp.query( m_xParent );
+    xComp.set(m_xParent, css::uno::UNO_QUERY);
 
     if ( xComp.is() )
         xComp->addEventListener(static_cast<XPropertiesChangeListener*>(this));
@@ -1562,7 +1562,7 @@ void OBoundControlModel::readCommonProperties(const Reference<stario::XObjectInp
     nUsedFlag = _rxInStream->readLong();
     if (nUsedFlag)
         xPersist = _rxInStream->readObject();
-    m_xLabelControl = m_xLabelControl.query( xPersist );
+    m_xLabelControl.set(xPersist, css::uno::UNO_QUERY);
     Reference< XComponent > xComp( m_xLabelControl, UNO_QUERY );
     if (xComp.is())
         xComp->addEventListener(static_cast<com::sun::star::lang::XEventListener*>(static_cast<XPropertyChangeListener*>(this)));
diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx
index 04795df0fff6..db3221cd703f 100644
--- a/forms/source/component/FormattedField.cxx
+++ b/forms/source/component/FormattedField.cxx
@@ -517,8 +517,8 @@ Reference<XNumberFormatsSupplier>  OFormattedModel::calcFormFormatsSupplier() co
     Reference<XForm>  xNextParentForm(xParent, UNO_QUERY);
     while (!xNextParentForm.is() && xParent.is())
     {
-        xParent         = xParent.query( xParent->getParent() );
-        xNextParentForm = xNextParentForm.query( xParent );
+        xParent.set(xParent->getParent(), css::uno::UNO_QUERY);
+        xNextParentForm.set(xParent, css::uno::UNO_QUERY);
     }
     if (!xNextParentForm.is())
     {
diff --git a/forms/source/component/Grid.cxx b/forms/source/component/Grid.cxx
index e9a306dd7e4b..b158c35d1897 100644
--- a/forms/source/component/Grid.cxx
+++ b/forms/source/component/Grid.cxx
@@ -145,7 +145,7 @@ void OGridControlModel::cloneColumns( const OGridControlModel* _pOriginalContain
         for ( OInterfaceArray::const_iterator pColumn = pColumnStart; pColumn != pColumnEnd; ++pColumn )
         {
             // ask the col for a factory for the clone
-            xColCloneable = xColCloneable.query( *pColumn );
+            xColCloneable.set(*pColumn, css::uno::UNO_QUERY);
             DBG_ASSERT( xColCloneable.is(), "OGridControlModel::cloneColumns: column is not cloneable!" );
             if ( xColCloneable.is() )
             {
diff --git a/forms/source/component/clickableimage.cxx b/forms/source/component/clickableimage.cxx
index cb482d543478..6e3aa8fb7d3e 100644
--- a/forms/source/component/clickableimage.cxx
+++ b/forms/source/component/clickableimage.cxx
@@ -215,7 +215,7 @@ namespace frm
                 return;
 
             // which button type?
-            xSet = xSet.query( xComp );
+            xSet.set(xComp, css::uno::UNO_QUERY);
             if ( !xSet.is() )
                 return;
             xSet->getPropertyValue(PROPERTY_BUTTONTYPE) >>= eButtonType;
@@ -407,7 +407,7 @@ namespace frm
                 Reference< XChild > xChild( getModel(), UNO_QUERY );
                 Reference< XSubmit > xParentSubmission;
                 if ( xChild.is() )
-                    xParentSubmission = xParentSubmission.query( xChild->getParent() );
+                    xParentSubmission.set(xChild->getParent(), css::uno::UNO_QUERY);
                 if ( xParentSubmission.is() )
                     xParentSubmission->submit( this, _rEvent );
             }
diff --git a/forms/source/component/cloneable.cxx b/forms/source/component/cloneable.cxx
index b701b58fb17d..1b32b77dd05e 100644
--- a/forms/source/component/cloneable.cxx
+++ b/forms/source/component/cloneable.cxx
@@ -42,7 +42,7 @@ namespace frm
 
         if ( query_aggregation( _pOriginal->m_xAggregate, xAggregateCloneable ) )
         {
-            xAggregateClone = xAggregateClone.query( xAggregateCloneable->createClone() );
+            xAggregateClone.set(xAggregateCloneable->createClone(), css::uno::UNO_QUERY);
             DBG_ASSERT( xAggregateClone.is(), "OCloneableAggregation::createAggregateClone: invalid clone returned by the aggregate!" );
         }
         else {
diff --git a/forms/source/helper/controlfeatureinterception.cxx b/forms/source/helper/controlfeatureinterception.cxx
index 1d30b97771cb..18904ea007bc 100644
--- a/forms/source/helper/controlfeatureinterception.cxx
+++ b/forms/source/helper/controlfeatureinterception.cxx
@@ -122,7 +122,7 @@ namespace frm
             xInterceptor->setSlaveDispatchProvider( NULL );
 
             // start over with the next chain element
-            xInterceptor = xInterceptor.query( xSlave );
+            xInterceptor.set(xSlave, css::uno::UNO_QUERY);
         }
     }
 
diff --git a/forms/source/misc/InterfaceContainer.cxx b/forms/source/misc/InterfaceContainer.cxx
index d57087b3b11c..2cac0ffcc09b 100644
--- a/forms/source/misc/InterfaceContainer.cxx
+++ b/forms/source/misc/InterfaceContainer.cxx
@@ -586,7 +586,7 @@ void SAL_CALL OInterfaceContainer::read( const Reference< XObjectInputStream >&
                 {
                     SAL_WARN("forms.misc", "OInterfaceContainerHelper::read: reading succeeded, but not inserting!" );
                     // create a placeholder
-                    xElement = xElement.query( lcl_createPlaceHolder( m_xContext ) );
+                    xElement.set(lcl_createPlaceHolder( m_xContext ), css::uno::UNO_QUERY);
                     if ( !xElement.is() )
                         // couldn't handle it
                         throw;
diff --git a/forms/source/runtime/formoperations.cxx b/forms/source/runtime/formoperations.cxx
index 7efc18dea1e7..c6a16aac899b 100644
--- a/forms/source/runtime/formoperations.cxx
+++ b/forms/source/runtime/formoperations.cxx
@@ -949,7 +949,7 @@ namespace frm
                 // both the control and its model can be committable, so try both
                 Reference< XBoundComponent > xBound( xCurrentControl, UNO_QUERY );
                 if ( !xBound.is() )
-                    xBound = xBound.query( xCurrentControl->getModel() );
+                    xBound.set(xCurrentControl->getModel(), css::uno::UNO_QUERY);
                 // and now really commit
                 if ( xBound.is() )
                     bSuccess = xBound->commit();
@@ -1136,7 +1136,7 @@ namespace frm
     void FormOperations::impl_initFromController_throw()
     {
         OSL_PRECOND( m_xController.is(), "FormOperations::impl_initFromController_throw: invalid controller!" );
-        m_xCursor = m_xCursor.query( m_xController->getModel() );
+        m_xCursor.set(m_xController->getModel(), css::uno::UNO_QUERY);
         if ( !m_xCursor.is() )
             throw IllegalArgumentException( OUString(), *this, 0 );
 
@@ -1151,9 +1151,9 @@ namespace frm
     void FormOperations::impl_initFromForm_throw()
     {
         OSL_PRECOND( m_xCursor.is(), "FormOperations::impl_initFromForm_throw: invalid form!" );
-        m_xCursorProperties = m_xCursorProperties.query ( m_xCursor );
-        m_xUpdateCursor     = m_xUpdateCursor.query     ( m_xCursor );
-        m_xLoadableForm     = m_xLoadableForm.query     ( m_xCursor );
+        m_xCursorProperties.set(m_xCursor, css::uno::UNO_QUERY);
+        m_xUpdateCursor.set(m_xCursor, css::uno::UNO_QUERY);
+        m_xLoadableForm.set(m_xCursor, css::uno::UNO_QUERY);
 
         if ( !m_xCursor.is() || !m_xCursorProperties.is() || !m_xLoadableForm.is() )
             throw IllegalArgumentException( OUString(), *this, 0 );
@@ -1178,7 +1178,7 @@ namespace frm
 
     void FormOperations::createWithForm( const Reference< XForm >& _rxForm )
     {
-        m_xCursor = m_xCursor.query( _rxForm );
+        m_xCursor.set(_rxForm, css::uno::UNO_QUERY);
         if ( !m_xCursor.is() )
             throw IllegalArgumentException( OUString(), *this, 0 );
 
diff --git a/forms/source/xforms/model.cxx b/forms/source/xforms/model.cxx
index d4aafddddbbc..b111d817f8f2 100644
--- a/forms/source/xforms/model.cxx
+++ b/forms/source/xforms/model.cxx
@@ -631,7 +631,7 @@ Model::XSubmission_t Model::getSubmission( const OUString& sId )
     DBG_INVARIANT();
     XSubmission_t xSubmission;
     if ( mpSubmissions->hasItem( sId ) )
-        xSubmission = xSubmission.query( mpSubmissions->getItem( sId ) );
+        xSubmission.set(mpSubmissions->getItem( sId ), css::uno::UNO_QUERY);
     return xSubmission;
 }