loplugin:staticcall

Change-Id: I7f22aa5576ca3c62fa363971f4fa5992b7711563

7 files changed, 15 insertions, 15 deletions

diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx
index f0c74a549535..e1c2d5fff040 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -670,7 +670,7 @@ Reference< XNameAccess > getFieldsByCommandDescriptor( const Reference< XConnect
                     // now execute
                     Reference< XPreparedStatement > xStatement = _rxConnection->prepareStatement( sStatementToExecute );
                     // transfer ownership of this temporary object to the caller
-                    _rxKeepFieldsAlive = _rxKeepFieldsAlive.query( xStatement );
+                    _rxKeepFieldsAlive.set(xStatement, css::uno::UNO_QUERY);
 
                     // set the "MaxRows" to 0. This is just in case our attempt to append a 0=1 filter
                     // failed - in this case, the MaxRows restriction should at least ensure that there
@@ -691,7 +691,7 @@ Reference< XNameAccess > getFieldsByCommandDescriptor( const Reference< XConnect
                         // full blown result set
                     }
 
-                    xSupplyColumns = xSupplyColumns.query( xStatement->executeQuery() );
+                    xSupplyColumns.set(xStatement->executeQuery(), css::uno::UNO_QUERY);
                     // this should have given us a result set which does not contain any data, but
                     // the structural information we need
 
diff --git a/connectivity/source/commontools/parameters.cxx b/connectivity/source/commontools/parameters.cxx
index 129ecb0add26..d7809d558e52 100644
--- a/connectivity/source/commontools/parameters.cxx
+++ b/connectivity/source/commontools/parameters.cxx
@@ -786,7 +786,7 @@ namespace dbtools
 
         Reference< XColumnsSupplier > xColumnSupp;
         if ( _bFromComposer )
-            xColumnSupp = xColumnSupp.query( m_xComposer );
+            xColumnSupp.set(m_xComposer, css::uno::UNO_QUERY);
         else
             xColumnSupp.set( m_xComponent.get(),UNO_QUERY);
         if ( xColumnSupp.is() )
@@ -820,10 +820,10 @@ namespace dbtools
                     getCurrentSettingsComposer( xParent, m_xContext ),
                     SharedQueryComposer::TakeOwnership
                 );
-                xParentColSupp = xParentColSupp.query( m_xParentComposer );
+                xParentColSupp.set(m_xParentComposer, css::uno::UNO_QUERY);
             }
             else
-                xParentColSupp = xParentColSupp.query( xParent );
+                xParentColSupp.set(xParent, css::uno::UNO_QUERY);
 
             // get the columns of the parent
             if ( xParentColSupp.is() )
diff --git a/connectivity/source/drivers/dbase/dindexnode.cxx b/connectivity/source/drivers/dbase/dindexnode.cxx
index 2d2d84b00a4e..0c8d3019fbce 100644
--- a/connectivity/source/drivers/dbase/dindexnode.cxx
+++ b/connectivity/source/drivers/dbase/dindexnode.cxx
@@ -743,7 +743,7 @@ int ONDXKey::Compare(const ONDXKey& rKey) const
 
     if (getValue().isNull())
     {
-        if (rKey.getValue().isNull() || (rKey.IsText(getDBType()) && rKey.getValue().getString().isEmpty()))
+        if (rKey.getValue().isNull() || (IsText(getDBType()) && rKey.getValue().getString().isEmpty()))
             nRes = 0;
         else
             nRes = -1;
diff --git a/connectivity/source/drivers/jdbc/JConnection.cxx b/connectivity/source/drivers/jdbc/JConnection.cxx
index 813486602fe5..8886d7abfbaf 100644
--- a/connectivity/source/drivers/jdbc/JConnection.cxx
+++ b/connectivity/source/drivers/jdbc/JConnection.cxx
@@ -288,7 +288,7 @@ java_sql_Connection::~java_sql_Connection()
                 t.pEnv->DeleteGlobalRef( m_Driver_theClass );
             m_Driver_theClass = NULL;
         }
-        t.releaseRef();
+        SDBThreadAttach::releaseRef();
     }
 }
 
@@ -779,7 +779,7 @@ bool java_sql_Connection::construct(const OUString& url,
             throwGenericSQLException(STR_NO_JAVA,*this);
     }
     SDBThreadAttach t;
-    t.addRef();      // will be released in dtor
+    SDBThreadAttach::addRef();      // will be released in dtor
     if ( !t.pEnv )
         throwGenericSQLException(STR_NO_JAVA,*this);
 
diff --git a/connectivity/source/drivers/kab/KConnection.cxx b/connectivity/source/drivers/kab/KConnection.cxx
index 8bc140ba0c5d..b23f11dd730a 100644
--- a/connectivity/source/drivers/kab/KConnection.cxx
+++ b/connectivity/source/drivers/kab/KConnection.cxx
@@ -67,7 +67,7 @@ void KabConnection::construct(const OUString&, const Sequence< PropertyValue >&)
 
     // create a KDE address book object
     m_pAddressBook = KABC::StdAddressBook::self();
-    m_pAddressBook->setAutomaticSave(false);
+    KABC::StdAddressBook::setAutomaticSave(false);
 // perharps we should analyze the URL to know whether the addressbook is local, over LDAP, etc...
 // perharps we should get some user and password information from "info" properties
 
@@ -280,7 +280,7 @@ void KabConnection::disposing()
 
     if (m_pAddressBook != NULL)
     {
-        m_pAddressBook->close();
+        KABC::StdAddressBook::close();
         m_pAddressBook = NULL;
     }
 
diff --git a/connectivity/source/manager/mdrivermanager.cxx b/connectivity/source/manager/mdrivermanager.cxx
index 202a83500b65..494a3043ddc9 100644
--- a/connectivity/source/manager/mdrivermanager.cxx
+++ b/connectivity/source/manager/mdrivermanager.cxx
@@ -123,8 +123,8 @@ Any SAL_CALL ODriverEnumeration::nextElement(  ) throw(NoSuchElementException, W
                 // we did not load this driver, yet
                 if ( _rDescriptor.xComponentFactory.is() )
                     // we have a factory for it
-                    const_cast< DriverAccess& >( _rDescriptor ).xDriver = _rDescriptor.xDriver.query(
-                        _rDescriptor.xComponentFactory->createInstanceWithContext( mxContext ) );
+                    const_cast< DriverAccess& >( _rDescriptor ).xDriver.set(
+                        _rDescriptor.xComponentFactory->createInstanceWithContext( mxContext ), css::uno::UNO_QUERY);
             return _rDescriptor;
         }
 
@@ -289,7 +289,7 @@ void OSDBCDriverManager::bootstrapDrivers()
                 bool bValidDescriptor = false;
 
                 // can it tell us something about the implementation name?
-                xSI = xSI.query( xFactory );
+                xSI.set(xFactory, css::uno::UNO_QUERY);
                 if ( xSI.is() )
                 {   // yes -> no need to load the driver immediately (load it later when needed)
                     aDriverDescriptor.sImplementationName = xSI->getImplementationName();
@@ -311,7 +311,7 @@ void OSDBCDriverManager::bootstrapDrivers()
                     {
                         aDriverDescriptor.xDriver = xDriver;
                         // and obtain it's implementation name
-                        xSI = xSI.query( xDriver );
+                        xSI.set(xDriver, css::uno::UNO_QUERY);
                         OSL_ENSURE( xSI.is(), "OSDBCDriverManager::bootstrapDrivers: a driver without service info?" );
                         if ( xSI.is() )
                         {
diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx
index af2150911791..1b83a24ff810 100644
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@ -1524,7 +1524,7 @@ bool OSQLParser::extractDate(OSQLParseNode* pLiteral,double& _rfValue)
     Reference< XNumberFormatsSupplier > xFormatSup = m_xFormatter->getNumberFormatsSupplier();
     Reference< XNumberFormatTypes > xFormatTypes;
     if ( xFormatSup.is() )
-        xFormatTypes = xFormatTypes.query( xFormatSup->getNumberFormats() );
+        xFormatTypes.set(xFormatSup->getNumberFormats(), css::uno::UNO_QUERY);
 
     // if there is no format key, yet, make sure we have a feasible one for our locale
     try