tdf#123936 Formatting files in module connectivity with clang-format

Change-Id: I2c2f170c19663002637c702e9168c19c067ebbc2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105656
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>

24 files changed, 274 insertions, 379 deletions

diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx
index 9a4365abfcce..94dbfddb34f9 100644
--- a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx
+++ b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx
@@ -21,7 +21,6 @@
 #include <ado/Awrapado.hxx>
 #include <connectivity/dbexception.hxx>
 
-
 using namespace connectivity;
 using namespace connectivity::ado;
 using namespace com::sun::star::uno;
@@ -29,194 +28,184 @@ using namespace com::sun::star::lang;
 using namespace com::sun::star::beans;
 using namespace com::sun::star::sdbc;
 
-
 ODatabaseMetaDataResultSetMetaData::~ODatabaseMetaDataResultSetMetaData()
 {
-    if(m_pRecordSet)
+    if (m_pRecordSet)
         m_pRecordSet->Release();
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnDisplaySize( sal_Int32 column )
+sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnDisplaySize(sal_Int32 column)
 {
     sal_Int32 nSize = 0;
-    if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
+    if (m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
         nSize = (*m_mColumnsIter).second.getColumnDisplaySize();
-    else if(m_pRecordSet)
+    else if (m_pRecordSet)
     {
-        WpADOField aField = ADOS::getField(m_pRecordSet,m_vMapping[column]);
-        if(aField.IsValid())
+        WpADOField aField = ADOS::getField(m_pRecordSet, m_vMapping[column]);
+        if (aField.IsValid())
             nSize = aField.GetActualSize();
     }
     return nSize;
 }
 
-
-sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnType( sal_Int32 column )
+sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnType(sal_Int32 column)
 {
-    sal_Int32  nType = 0;
-    if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
+    sal_Int32 nType = 0;
+    if (m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
         nType = (*m_mColumnsIter).second.getColumnType();
-    else if(m_pRecordSet)
+    else if (m_pRecordSet)
     {
-        WpADOField aField = ADOS::getField(m_pRecordSet,m_vMapping[column]);
+        WpADOField aField = ADOS::getField(m_pRecordSet, m_vMapping[column]);
         nType = ADOS::MapADOType2Jdbc(aField.GetADOType());
     }
     return nType;
 }
 
-
-sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnCount(  )
+sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnCount()
 {
-    if(!m_pRecordSet)
+    if (!m_pRecordSet)
         return 0;
-    if(m_nColCount != -1)
+    if (m_nColCount != -1)
         return m_nColCount;
 
-    if(m_vMapping.size())
+    if (m_vMapping.size())
         return m_mColumns.size();
 
-    ADOFields* pFields  = nullptr;
+    ADOFields* pFields = nullptr;
     m_pRecordSet->get_Fields(&pFields);
-    WpOLEAppendCollection<ADOFields, ADOField, WpADOField>  aFields(pFields);
+    WpOLEAppendCollection<ADOFields, ADOField, WpADOField> aFields(pFields);
     m_nColCount = aFields.GetItemCount();
     return m_nColCount;
 }
 
-
-OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnName( sal_Int32 column )
+OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnName(sal_Int32 column)
 {
-    if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
+    if (m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
         return (*m_mColumnsIter).second.getColumnName();
-    if(!m_pRecordSet)
+    if (!m_pRecordSet)
         return OUString();
-    WpADOField aField = ADOS::getField(m_pRecordSet,m_vMapping[column]);
-    if(aField.IsValid())
+    WpADOField aField = ADOS::getField(m_pRecordSet, m_vMapping[column]);
+    if (aField.IsValid())
         return aField.GetName();
 
     return OUString();
 }
 
-OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnLabel( sal_Int32 column )
+OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnLabel(sal_Int32 column)
 {
-    if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
+    if (m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
         return (*m_mColumnsIter).second.getColumnLabel();
     return getColumnName(column);
 }
 
-
-sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isCurrency( sal_Int32 column )
+sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isCurrency(sal_Int32 column)
 {
-    if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
+    if (m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
         return (*m_mColumnsIter).second.isCurrency();
-    if(!m_pRecordSet)
+    if (!m_pRecordSet)
         return false;
-    WpADOField aField = ADOS::getField(m_pRecordSet,m_vMapping[column]);
-    if(aField.IsValid())
+    WpADOField aField = ADOS::getField(m_pRecordSet, m_vMapping[column]);
+    if (aField.IsValid())
     {
         return (aField.GetAttributes() & adFldFixed) == adFldFixed;
     }
     return false;
 }
 
-
-sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isSigned( sal_Int32 column )
+sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isSigned(sal_Int32 column)
 {
-    if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
+    if (m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
         return (*m_mColumnsIter).second.isSigned();
-    if(!m_pRecordSet)
+    if (!m_pRecordSet)
         return false;
-    WpADOField aField = ADOS::getField(m_pRecordSet,m_vMapping[column]);
-    if(aField.IsValid())
+    WpADOField aField = ADOS::getField(m_pRecordSet, m_vMapping[column]);
+    if (aField.IsValid())
     {
         return (aField.GetAttributes() & adFldNegativeScale) == adFldNegativeScale;
     }
     return false;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getPrecision( sal_Int32 column )
+sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getPrecision(sal_Int32 column)
 {
-    if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
+    if (m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
         return (*m_mColumnsIter).second.getPrecision();
-    if(!m_pRecordSet)
+    if (!m_pRecordSet)
         return 0;
-    WpADOField aField = ADOS::getField(m_pRecordSet,m_vMapping[column]);
-    if(aField.IsValid())
+    WpADOField aField = ADOS::getField(m_pRecordSet, m_vMapping[column]);
+    if (aField.IsValid())
         return aField.GetPrecision();
     return 0;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getScale( sal_Int32 column )
+sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getScale(sal_Int32 column)
 {
-    if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
+    if (m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
         return (*m_mColumnsIter).second.getScale();
 
-    if(!m_pRecordSet)
+    if (!m_pRecordSet)
         return 0;
 
-    WpADOField aField = ADOS::getField(m_pRecordSet,m_vMapping[column]);
-    if(aField.IsValid())
+    WpADOField aField = ADOS::getField(m_pRecordSet, m_vMapping[column]);
+    if (aField.IsValid())
         return aField.GetNumericScale();
     return 0;
 }
 
-
-sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::isNullable( sal_Int32 column )
+sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::isNullable(sal_Int32 column)
 {
-    if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
+    if (m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
         return (*m_mColumnsIter).second.isNullable();
 
-    if(!m_pRecordSet)
+    if (!m_pRecordSet)
         return sal_Int32(false);
 
-    WpADOField aField = ADOS::getField(m_pRecordSet,m_vMapping[column]);
-    if(aField.IsValid())
+    WpADOField aField = ADOS::getField(m_pRecordSet, m_vMapping[column]);
+    if (aField.IsValid())
     {
         return sal_Int32((aField.GetAttributes() & adFldIsNullable) == adFldIsNullable);
     }
     return sal_Int32(false);
 }
 
-
-sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isReadOnly( sal_Int32 column )
+sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isReadOnly(sal_Int32 column)
 {
-    if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
+    if (m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
         return (*m_mColumnsIter).second.isReadOnly();
 
-    if(!m_pRecordSet)
+    if (!m_pRecordSet)
         return false;
 
-    WpADOField aField = ADOS::getField(m_pRecordSet,m_vMapping[column]);
-    if(aField.IsValid())
+    WpADOField aField = ADOS::getField(m_pRecordSet, m_vMapping[column]);
+    if (aField.IsValid())
     {
         //  return (aField.GetStatus() & adFieldReadOnly) == adFieldReadOnly;
     }
     return false;
 }
 
-
-sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isDefinitelyWritable( sal_Int32 column )
+sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isDefinitelyWritable(sal_Int32 column)
 {
-    if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
+    if (m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
         return (*m_mColumnsIter).second.isDefinitelyWritable();
 
-    if(!m_pRecordSet)
+    if (!m_pRecordSet)
         return false;
 
-    WpADOField aField = ADOS::getField(m_pRecordSet,m_vMapping[column]);
-    if(aField.IsValid())
+    WpADOField aField = ADOS::getField(m_pRecordSet, m_vMapping[column]);
+    if (aField.IsValid())
     {
         return (aField.GetAttributes() & adFldUpdatable) == adFldUpdatable;
     }
     return false;
-;
+    ;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isWritable( sal_Int32 column )
+sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isWritable(sal_Int32 column)
 {
-    if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
+    if (m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
         return (*m_mColumnsIter).second.isWritable();
     return isDefinitelyWritable(column);
 }
 
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/calc/CCatalog.cxx b/connectivity/source/drivers/calc/CCatalog.cxx
index 6853a5f9dbc3..03c4358b9b65 100644
--- a/connectivity/source/drivers/calc/CCatalog.cxx
+++ b/connectivity/source/drivers/calc/CCatalog.cxx
@@ -29,36 +29,34 @@ using namespace ::com::sun::star::sdbcx;
 using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::container;
 
-
 using namespace connectivity::calc;
 
-OCalcCatalog::OCalcCatalog(OCalcConnection* _pCon) : file::OFileCatalog(_pCon)
+OCalcCatalog::OCalcCatalog(OCalcConnection* _pCon)
+    : file::OFileCatalog(_pCon)
 {
 }
 
 void OCalcCatalog::refreshTables()
 {
-    ::std::vector< OUString> aVector;
-    Sequence< OUString > aTypes;
+    ::std::vector<OUString> aVector;
+    Sequence<OUString> aTypes;
     OCalcConnection::ODocHolder aDocHolder(static_cast<OCalcConnection*>(m_pConnection));
-    Reference< XResultSet > xResult = m_xMetaData->getTables(Any(),
-        "%", "%", aTypes);
+    Reference<XResultSet> xResult = m_xMetaData->getTables(Any(), "%", "%", aTypes);
 
-    if(xResult.is())
+    if (xResult.is())
     {
-        Reference< XRow > xRow(xResult,UNO_QUERY);
-        while(xResult->next())
+        Reference<XRow> xRow(xResult, UNO_QUERY);
+        while (xResult->next())
             aVector.push_back(xRow->getString(3));
     }
-    if(m_pTables)
+    if (m_pTables)
         m_pTables->reFill(aVector);
     else
-        m_pTables.reset( new OCalcTables(m_xMetaData,*this,m_aMutex,aVector) );
+        m_pTables.reset(new OCalcTables(m_xMetaData, *this, m_aMutex, aVector));
 
     // this avoids that the document will be loaded a 2nd time when one table will be accessed.
     //if ( m_pTables && m_pTables->hasElements() )
     //    m_pTables->getByIndex(0);
 }
 
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/component/CStatement.cxx b/connectivity/source/drivers/component/CStatement.cxx
index 8adfefae83f4..8a1a2fa92287 100644
--- a/connectivity/source/drivers/component/CStatement.cxx
+++ b/connectivity/source/drivers/component/CStatement.cxx
@@ -26,9 +26,10 @@ using namespace com::sun::star::uno;
 
 OResultSet* OComponentStatement::createResultSet()
 {
-    return new connectivity::component::OComponentResultSet(this,m_aSQLIterator);
+    return new connectivity::component::OComponentResultSet(this, m_aSQLIterator);
 }
 
-IMPLEMENT_SERVICE_INFO(OComponentStatement,"com.sun.star.sdbc.driver.component.Statement","com.sun.star.sdbc.Statement");
+IMPLEMENT_SERVICE_INFO(OComponentStatement, "com.sun.star.sdbc.driver.component.Statement",
+                       "com.sun.star.sdbc.Statement");
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/dbase/DCatalog.cxx b/connectivity/source/drivers/dbase/DCatalog.cxx
index c35af1f28e62..a8aaf89c529a 100644
--- a/connectivity/source/drivers/dbase/DCatalog.cxx
+++ b/connectivity/source/drivers/dbase/DCatalog.cxx
@@ -29,31 +29,29 @@ using namespace ::com::sun::star::sdbcx;
 using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::container;
 
-
 using namespace connectivity::dbase;
 
-ODbaseCatalog::ODbaseCatalog(ODbaseConnection* _pCon) : file::OFileCatalog(_pCon)
+ODbaseCatalog::ODbaseCatalog(ODbaseConnection* _pCon)
+    : file::OFileCatalog(_pCon)
 {
 }
 
 void ODbaseCatalog::refreshTables()
 {
-    ::std::vector< OUString> aVector;
-    Sequence< OUString > aTypes;
-    Reference< XResultSet > xResult = m_xMetaData->getTables(Any(),
-        "%", "%", aTypes);
+    ::std::vector<OUString> aVector;
+    Sequence<OUString> aTypes;
+    Reference<XResultSet> xResult = m_xMetaData->getTables(Any(), "%", "%", aTypes);
 
-    if(xResult.is())
+    if (xResult.is())
     {
-        Reference< XRow > xRow(xResult,UNO_QUERY);
-        while(xResult->next())
+        Reference<XRow> xRow(xResult, UNO_QUERY);
+        while (xResult->next())
             aVector.push_back(xRow->getString(3));
     }
-    if(m_pTables)
+    if (m_pTables)
         m_pTables->reFill(aVector);
     else
-        m_pTables.reset( new ODbaseTables(m_xMetaData,*this,m_aMutex,aVector) );
+        m_pTables.reset(new ODbaseTables(m_xMetaData, *this, m_aMutex, aVector));
 }
 
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/dbase/DIndexIter.cxx b/connectivity/source/drivers/dbase/DIndexIter.cxx
index 62cc6601a54f..37e28a073f4c 100644
--- a/connectivity/source/drivers/dbase/DIndexIter.cxx
+++ b/connectivity/source/drivers/dbase/DIndexIter.cxx
@@ -27,22 +27,11 @@ using namespace connectivity::file;
 
 // OIndexIterator
 
+OIndexIterator::~OIndexIterator() {}
 
-OIndexIterator::~OIndexIterator()
-{
-}
-
+sal_uInt32 OIndexIterator::First() { return Find(true); }
 
-sal_uInt32 OIndexIterator::First()
-{
-    return Find(true);
-}
-
-
-sal_uInt32 OIndexIterator::Next()
-{
-    return Find(false);
-}
+sal_uInt32 OIndexIterator::Next() { return Find(false); }
 
 sal_uInt32 OIndexIterator::Find(bool bFirst)
 {
@@ -69,19 +58,18 @@ sal_uInt32 OIndexIterator::Find(bool bFirst)
         ONDXKey* pKey = GetNextKey();
         nRes = pKey ? pKey->GetRecord() : NODE_NOTFOUND;
     }
-    else if (dynamic_cast<const OOp_ISNOTNULL *>(m_pOperator) != nullptr)
+    else if (dynamic_cast<const OOp_ISNOTNULL*>(m_pOperator) != nullptr)
         nRes = GetNotNull(bFirst);
-    else if (dynamic_cast<const OOp_ISNULL *>(m_pOperator) != nullptr)
+    else if (dynamic_cast<const OOp_ISNULL*>(m_pOperator) != nullptr)
         nRes = GetNull(bFirst);
-    else if (dynamic_cast<const OOp_LIKE *>(m_pOperator) != nullptr)
+    else if (dynamic_cast<const OOp_LIKE*>(m_pOperator) != nullptr)
         nRes = GetLike(bFirst);
-    else if (dynamic_cast<const OOp_COMPARE *>(m_pOperator) != nullptr)
+    else if (dynamic_cast<const OOp_COMPARE*>(m_pOperator) != nullptr)
         nRes = GetCompare(bFirst);
 
     return nRes;
 }
 
-
 ONDXKey* OIndexIterator::GetFirstKey(ONDXPage* pPage, const OOperand& rKey)
 {
     // searches a given key
@@ -95,20 +83,19 @@ ONDXKey* OIndexIterator::GetFirstKey(ONDXPage* pPage, const OOperand& rKey)
     if (pPage->IsLeaf())
     {
         // in the leaf the actual operation is run, otherwise temp. (>)
-        while (i < pPage->Count() && !m_pOperator->operate(&((*pPage)[i]).GetKey(),&rKey))
-               i++;
+        while (i < pPage->Count() && !m_pOperator->operate(&((*pPage)[i]).GetKey(), &rKey))
+            i++;
     }
     else
-        while (i < pPage->Count() && !aTempOp.operate(&((*pPage)[i]).GetKey(),&rKey))
-               i++;
-
+        while (i < pPage->Count() && !aTempOp.operate(&((*pPage)[i]).GetKey(), &rKey))
+            i++;
 
     ONDXKey* pFoundKey = nullptr;
     if (!pPage->IsLeaf())
     {
         // descend further
-        ONDXPagePtr aPage = (i==0) ? pPage->GetChild(m_xIndex.get())
-                                     : ((*pPage)[i-1]).GetChild(m_xIndex.get(), pPage);
+        ONDXPagePtr aPage = (i == 0) ? pPage->GetChild(m_xIndex.get())
+                                     : ((*pPage)[i - 1]).GetChild(m_xIndex.get(), pPage);
         pFoundKey = aPage.Is() ? GetFirstKey(aPage, rKey) : nullptr;
     }
     else if (i == pPage->Count())
@@ -118,7 +105,7 @@ ONDXKey* OIndexIterator::GetFirstKey(ONDXPage* pPage, const OOperand& rKey)
     else
     {
         pFoundKey = &(*pPage)[i].GetKey();
-        if (!m_pOperator->operate(pFoundKey,&rKey))
+        if (!m_pOperator->operate(pFoundKey, &rKey))
             pFoundKey = nullptr;
 
         m_aCurLeaf = pPage;
@@ -127,7 +114,6 @@ ONDXKey* OIndexIterator::GetFirstKey(ONDXPage* pPage, const OOperand& rKey)
     return pFoundKey;
 }
 
-
 sal_uInt32 OIndexIterator::GetCompare(bool bFirst)
 {
     ONDXKey* pKey = nullptr;
@@ -149,31 +135,31 @@ sal_uInt32 OIndexIterator::GetCompare(bool bFirst)
                 m_nCurNode = NODE_NOTFOUND;
         }
 
-
         switch (ePredicateType)
         {
             case SQLFilterOperator::NOT_EQUAL:
-                while ( ( pKey = GetNextKey() ) != nullptr )
-                    if (m_pOperator->operate(pKey,m_pOperand))
+                while ((pKey = GetNextKey()) != nullptr)
+                    if (m_pOperator->operate(pKey, m_pOperand))
                         break;
                 break;
             case SQLFilterOperator::LESS:
-                while ( ( pKey = GetNextKey() ) != nullptr )
+                while ((pKey = GetNextKey()) != nullptr)
                     if (!pKey->getValue().isNull())
                         break;
                 break;
             case SQLFilterOperator::LESS_EQUAL:
-                while ( ( pKey = GetNextKey() ) != nullptr ) ;
+                while ((pKey = GetNextKey()) != nullptr)
+                    ;
                 break;
             case SQLFilterOperator::GREATER_EQUAL:
             case SQLFilterOperator::EQUAL:
-                pKey = GetFirstKey(m_aRoot,*m_pOperand);
+                pKey = GetFirstKey(m_aRoot, *m_pOperand);
                 break;
             case SQLFilterOperator::GREATER:
-                pKey = GetFirstKey(m_aRoot,*m_pOperand);
-                if ( !pKey )
-                    while ( ( pKey = GetNextKey() ) != nullptr )
-                        if (m_pOperator->operate(pKey,m_pOperand))
+                pKey = GetFirstKey(m_aRoot, *m_pOperand);
+                if (!pKey)
+                    while ((pKey = GetNextKey()) != nullptr)
+                        if (m_pOperator->operate(pKey, m_pOperand))
                             break;
         }
     }
@@ -182,15 +168,15 @@ sal_uInt32 OIndexIterator::GetCompare(bool bFirst)
         switch (ePredicateType)
         {
             case SQLFilterOperator::NOT_EQUAL:
-                while ( ( pKey = GetNextKey() ) != nullptr )
-                    if (m_pOperator->operate(pKey,m_pOperand))
+                while ((pKey = GetNextKey()) != nullptr)
+                    if (m_pOperator->operate(pKey, m_pOperand))
                         break;
                 break;
             case SQLFilterOperator::LESS:
             case SQLFilterOperator::LESS_EQUAL:
             case SQLFilterOperator::EQUAL:
                 pKey = GetNextKey();
-                if ( pKey == nullptr  || !m_pOperator->operate(pKey,m_pOperand))
+                if (pKey == nullptr || !m_pOperator->operate(pKey, m_pOperand))
                 {
                     pKey = nullptr;
                     m_aCurLeaf.Clear();
@@ -205,7 +191,6 @@ sal_uInt32 OIndexIterator::GetCompare(bool bFirst)
     return pKey ? pKey->GetRecord() : NODE_NOTFOUND;
 }
 
-
 sal_uInt32 OIndexIterator::GetLike(bool bFirst)
 {
     if (bFirst)
@@ -220,13 +205,12 @@ sal_uInt32 OIndexIterator::GetLike(bool bFirst)
     }
 
     ONDXKey* pKey;
-    while ( ( pKey = GetNextKey() ) != nullptr )
-        if (m_pOperator->operate(pKey,m_pOperand))
+    while ((pKey = GetNextKey()) != nullptr)
+        if (m_pOperator->operate(pKey, m_pOperand))
             break;
     return pKey ? pKey->GetRecord() : NODE_NOTFOUND;
 }
 
-
 sal_uInt32 OIndexIterator::GetNull(bool bFirst)
 {
     if (bFirst)
@@ -240,7 +224,7 @@ sal_uInt32 OIndexIterator::GetNull(bool bFirst)
     }
 
     ONDXKey* pKey = GetNextKey();
-    if ( pKey == nullptr || !pKey->getValue().isNull())
+    if (pKey == nullptr || !pKey->getValue().isNull())
     {
         pKey = nullptr;
         m_aCurLeaf.Clear();
@@ -248,17 +232,14 @@ sal_uInt32 OIndexIterator::GetNull(bool bFirst)
     return pKey ? pKey->GetRecord() : NODE_NOTFOUND;
 }
 
-
 sal_uInt32 OIndexIterator::GetNotNull(bool bFirst)
 {
     ONDXKey* pKey;
     if (bFirst)
     {
         // go through all NULL values first
-        for (sal_uInt32 nRec = GetNull(bFirst);
-             nRec != NODE_NOTFOUND;
-             nRec = GetNull(false))
-                 ;
+        for (sal_uInt32 nRec = GetNull(bFirst); nRec != NODE_NOTFOUND; nRec = GetNull(false))
+            ;
         pKey = m_aCurLeaf.Is() ? &(*m_aCurLeaf)[m_nCurNode].GetKey() : nullptr;
     }
     else
@@ -267,7 +248,6 @@ sal_uInt32 OIndexIterator::GetNotNull(bool bFirst)
     return pKey ? pKey->GetRecord() : NODE_NOTFOUND;
 }
 
-
 ONDXKey* OIndexIterator::GetNextKey()
 {
     if (m_aCurLeaf.Is() && ((++m_nCurNode) >= m_aCurLeaf->Count()))
@@ -281,8 +261,8 @@ ONDXKey* OIndexIterator::GetNextKey()
             {
                 sal_uInt16 nPos = pParentPage->Search(pPage);
                 if (nPos != pParentPage->Count() - 1)
-                {   // page found
-                    pPage = (*pParentPage)[nPos+1].GetChild(m_xIndex.get(),pParentPage);
+                { // page found
+                    pPage = (*pParentPage)[nPos + 1].GetChild(m_xIndex.get(), pParentPage);
                     break;
                 }
             }
diff --git a/connectivity/source/drivers/dbase/DPreparedStatement.cxx b/connectivity/source/drivers/dbase/DPreparedStatement.cxx
index 60e7a6a7f3ef..852c98acf509 100644
--- a/connectivity/source/drivers/dbase/DPreparedStatement.cxx
+++ b/connectivity/source/drivers/dbase/DPreparedStatement.cxx
@@ -26,9 +26,10 @@ using namespace com::sun::star::uno;
 
 OResultSet* ODbasePreparedStatement::createResultSet()
 {
-    return new ODbaseResultSet(this,m_aSQLIterator);
+    return new ODbaseResultSet(this, m_aSQLIterator);
 }
 
-IMPLEMENT_SERVICE_INFO(ODbasePreparedStatement,"com.sun.star.sdbc.driver.dbase.PreparedStatement","com.sun.star.sdbc.PreparedStatement");
+IMPLEMENT_SERVICE_INFO(ODbasePreparedStatement, "com.sun.star.sdbc.driver.dbase.PreparedStatement",
+                       "com.sun.star.sdbc.PreparedStatement");
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/file/FDateFunctions.cxx b/connectivity/source/drivers/file/FDateFunctions.cxx
index 5f9d1441859f..d5b7c48c0dcc 100644
--- a/connectivity/source/drivers/file/FDateFunctions.cxx
+++ b/connectivity/source/drivers/file/FDateFunctions.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
 #include <file/FDateFunctions.hxx>
 #include <tools/date.hxx>
 #include <tools/time.hxx>
@@ -29,14 +28,14 @@ using namespace connectivity::file;
 
 ORowSetValue OOp_DayOfWeek::operate(const ORowSetValue& lhs) const
 {
-    if ( lhs.isNull() )
+    if (lhs.isNull())
         return lhs;
 
     sal_Int32 nRet = 0;
     css::util::Date aD = lhs;
-    Date aDate(aD.Day,aD.Month,aD.Year);
+    Date aDate(aD.Day, aD.Month, aD.Year);
     DayOfWeek eDayOfWeek = aDate.GetDayOfWeek();
-    switch(eDayOfWeek)
+    switch (eDayOfWeek)
     {
         case MONDAY:
             nRet = 2;
@@ -67,7 +66,7 @@ ORowSetValue OOp_DayOfWeek::operate(const ORowSetValue& lhs) const
 
 ORowSetValue OOp_DayOfMonth::operate(const ORowSetValue& lhs) const
 {
-    if ( lhs.isNull() )
+    if (lhs.isNull())
         return lhs;
 
     css::util::Date aD = lhs;
@@ -76,17 +75,17 @@ ORowSetValue OOp_DayOfMonth::operate(const ORowSetValue& lhs) const
 
 ORowSetValue OOp_DayOfYear::operate(const ORowSetValue& lhs) const
 {
-    if ( lhs.isNull() )
+    if (lhs.isNull())
         return lhs;
 
     css::util::Date aD = lhs;
-    Date aDate(aD.Day,aD.Month,aD.Year);
+    Date aDate(aD.Day, aD.Month, aD.Year);
     return static_cast<sal_Int16>(aDate.GetDayOfYear());
 }
 
 ORowSetValue OOp_Month::operate(const ORowSetValue& lhs) const
 {
-    if ( lhs.isNull() )
+    if (lhs.isNull())
         return lhs;
 
     css::util::Date aD = lhs;
@@ -95,14 +94,14 @@ ORowSetValue OOp_Month::operate(const ORowSetValue& lhs) const
 
 ORowSetValue OOp_DayName::operate(const ORowSetValue& lhs) const
 {
-    if ( lhs.isNull() )
+    if (lhs.isNull())
         return lhs;
 
     OUString sRet;
     css::util::Date aD = lhs;
-    Date aDate(aD.Day,aD.Month,aD.Year);
+    Date aDate(aD.Day, aD.Month, aD.Year);
     DayOfWeek eDayOfWeek = aDate.GetDayOfWeek();
-    switch(eDayOfWeek)
+    switch (eDayOfWeek)
     {
         case MONDAY:
             sRet = "Monday";
@@ -133,12 +132,12 @@ ORowSetValue OOp_DayName::operate(const ORowSetValue& lhs) const
 
 ORowSetValue OOp_MonthName::operate(const ORowSetValue& lhs) const
 {
-    if ( lhs.isNull() )
+    if (lhs.isNull())
         return lhs;
 
     OUString sRet;
     css::util::Date aD = lhs;
-    switch(aD.Month)
+    switch (aD.Month)
     {
         case 1:
             sRet = "January";
@@ -182,32 +181,32 @@ ORowSetValue OOp_MonthName::operate(const ORowSetValue& lhs) const
 
 ORowSetValue OOp_Quarter::operate(const ORowSetValue& lhs) const
 {
-    if ( lhs.isNull() )
+    if (lhs.isNull())
         return lhs;
 
     sal_Int32 nRet = 1;
     css::util::Date aD = lhs;
-    if ( aD.Month >= 4 && aD.Month < 7 )
+    if (aD.Month >= 4 && aD.Month < 7)
         nRet = 2;
-    else if ( aD.Month >= 7 && aD.Month < 10 )
+    else if (aD.Month >= 7 && aD.Month < 10)
         nRet = 3;
-    else if ( aD.Month >= 10 && aD.Month <= 12 )
+    else if (aD.Month >= 10 && aD.Month <= 12)
         nRet = 4;
     return nRet;
 }
 
 ORowSetValue OOp_Week::operate(const std::vector<ORowSetValue>& lhs) const
 {
-    if ( lhs.empty() || lhs.size() > 2 )
+    if (lhs.empty() || lhs.size() > 2)
         return ORowSetValue();
 
     size_t nSize = lhs.size();
 
-    css::util::Date aD = lhs[nSize-1];
-    Date aDate(aD.Day,aD.Month,aD.Year);
+    css::util::Date aD = lhs[nSize - 1];
+    Date aDate(aD.Day, aD.Month, aD.Year);
 
     sal_Int16 nStartDay = SUNDAY;
-    if ( nSize == 2 && !lhs[0].isNull() )
+    if (nSize == 2 && !lhs[0].isNull())
         nStartDay = lhs[0];
 
     return static_cast<sal_Int16>(aDate.GetWeekOfYear(static_cast<DayOfWeek>(nStartDay)));
@@ -215,7 +214,7 @@ ORowSetValue OOp_Week::operate(const std::vector<ORowSetValue>& lhs) const
 
 ORowSetValue OOp_Year::operate(const ORowSetValue& lhs) const
 {
-    if ( lhs.isNull() )
+    if (lhs.isNull())
         return lhs;
 
     css::util::Date aD = lhs;
@@ -224,7 +223,7 @@ ORowSetValue OOp_Year::operate(const ORowSetValue& lhs) const
 
 ORowSetValue OOp_Hour::operate(const ORowSetValue& lhs) const
 {
-    if ( lhs.isNull() )
+    if (lhs.isNull())
         return lhs;
 
     css::util::Time aT = lhs;
@@ -233,7 +232,7 @@ ORowSetValue OOp_Hour::operate(const ORowSetValue& lhs) const
 
 ORowSetValue OOp_Minute::operate(const ORowSetValue& lhs) const
 {
-    if ( lhs.isNull() )
+    if (lhs.isNull())
         return lhs;
 
     css::util::Time aT = lhs;
@@ -242,7 +241,7 @@ ORowSetValue OOp_Minute::operate(const ORowSetValue& lhs) const
 
 ORowSetValue OOp_Second::operate(const ORowSetValue& lhs) const
 {
-    if ( lhs.isNull() )
+    if (lhs.isNull())
         return lhs;
 
     css::util::Time aT = lhs;
@@ -251,30 +250,29 @@ ORowSetValue OOp_Second::operate(const ORowSetValue& lhs) const
 
 ORowSetValue OOp_CurDate::operate(const std::vector<ORowSetValue>& lhs) const
 {
-    if ( !lhs.empty() )
+    if (!lhs.empty())
         return ORowSetValue();
 
-    Date aCurDate( Date::SYSTEM );
+    Date aCurDate(Date::SYSTEM);
     return aCurDate.GetUNODate();
 }
 
 ORowSetValue OOp_CurTime::operate(const std::vector<ORowSetValue>& lhs) const
 {
-    if ( !lhs.empty() )
+    if (!lhs.empty())
         return ORowSetValue();
 
-    tools::Time aCurTime( tools::Time::SYSTEM );
+    tools::Time aCurTime(tools::Time::SYSTEM);
     return aCurTime.GetUNOTime();
 }
 
 ORowSetValue OOp_Now::operate(const std::vector<ORowSetValue>& lhs) const
 {
-    if ( !lhs.empty() )
+    if (!lhs.empty())
         return ORowSetValue();
 
-    DateTime aCurTime( DateTime::SYSTEM );
+    DateTime aCurTime(DateTime::SYSTEM);
     return aCurTime.GetUNODateTime();
 }
 
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/file/FStringFunctions.cxx b/connectivity/source/drivers/file/FStringFunctions.cxx
index 32f590e310f7..1df5e723c4ee 100644
--- a/connectivity/source/drivers/file/FStringFunctions.cxx
+++ b/connectivity/source/drivers/file/FStringFunctions.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
 #include <file/FStringFunctions.hxx>
 #include <rtl/ustrbuf.hxx>
 
@@ -26,7 +25,7 @@ using namespace connectivity::file;
 
 ORowSetValue OOp_Upper::operate(const ORowSetValue& lhs) const
 {
-    if ( lhs.isNull() )
+    if (lhs.isNull())
         return lhs;
 
     return lhs.getString().toAsciiUpperCase();
@@ -34,7 +33,7 @@ ORowSetValue OOp_Upper::operate(const ORowSetValue& lhs) const
 
 ORowSetValue OOp_Lower::operate(const ORowSetValue& lhs) const
 {
-    if ( lhs.isNull() )
+    if (lhs.isNull())
         return lhs;
 
     return lhs.getString().toAsciiLowerCase();
@@ -42,16 +41,16 @@ ORowSetValue OOp_Lower::operate(const ORowSetValue& lhs) const
 
 ORowSetValue OOp_Ascii::operate(const ORowSetValue& lhs) const
 {
-    if ( lhs.isNull() )
+    if (lhs.isNull())
         return lhs;
-    OString sStr(OUStringToOString(lhs,RTL_TEXTENCODING_ASCII_US));
+    OString sStr(OUStringToOString(lhs, RTL_TEXTENCODING_ASCII_US));
     sal_Int32 nAscii = sStr.toChar();
     return nAscii;
 }
 
 ORowSetValue OOp_CharLength::operate(const ORowSetValue& lhs) const
 {
-    if ( lhs.isNull() )
+    if (lhs.isNull())
         return lhs;
 
     return lhs.getString().getLength();
@@ -59,7 +58,7 @@ ORowSetValue OOp_CharLength::operate(const ORowSetValue& lhs) const
 
 ORowSetValue OOp_Char::operate(const std::vector<ORowSetValue>& lhs) const
 {
-    if ( lhs.empty() )
+    if (lhs.empty())
         return ORowSetValue();
 
     OUStringBuffer sRet;
@@ -67,7 +66,7 @@ ORowSetValue OOp_Char::operate(const std::vector<ORowSetValue>& lhs) const
     std::vector<ORowSetValue>::const_reverse_iterator aEnd = lhs.rend();
     for (; aIter != aEnd; ++aIter)
     {
-        if ( !aIter->isNull() )
+        if (!aIter->isNull())
         {
             char c = static_cast<char>(static_cast<sal_Int32>(*aIter));
 
@@ -80,7 +79,7 @@ ORowSetValue OOp_Char::operate(const std::vector<ORowSetValue>& lhs) const
 
 ORowSetValue OOp_Concat::operate(const std::vector<ORowSetValue>& lhs) const
 {
-    if ( lhs.empty() )
+    if (lhs.empty())
         return ORowSetValue();
 
     OUStringBuffer sRet;
@@ -88,7 +87,7 @@ ORowSetValue OOp_Concat::operate(const std::vector<ORowSetValue>& lhs) const
     std::vector<ORowSetValue>::const_reverse_iterator aEnd = lhs.rend();
     for (; aIter != aEnd; ++aIter)
     {
-        if ( aIter->isNull() )
+        if (aIter->isNull())
             return ORowSetValue();
 
         sRet.append(aIter->operator OUString());
@@ -99,35 +98,37 @@ ORowSetValue OOp_Concat::operate(const std::vector<ORowSetValue>& lhs) const
 
 ORowSetValue OOp_Locate::operate(const std::vector<ORowSetValue>& lhs) const
 {
-    if (std::any_of(lhs.begin(), lhs.end(), [](const ORowSetValue& rValue) { return rValue.isNull(); }))
+    if (std::any_of(lhs.begin(), lhs.end(),
+                    [](const ORowSetValue& rValue) { return rValue.isNull(); }))
         return ORowSetValue();
 
-    if ( lhs.size() == 2 )
-        return OUString(OUString::number(lhs[0].getString().indexOf(lhs[1].getString())+1));
+    if (lhs.size() == 2)
+        return OUString(OUString::number(lhs[0].getString().indexOf(lhs[1].getString()) + 1));
 
-    else if ( lhs.size() != 3 )
+    else if (lhs.size() != 3)
         return ORowSetValue();
 
-    return lhs[1].getString().indexOf(lhs[2].getString(),lhs[0]) + 1;
+    return lhs[1].getString().indexOf(lhs[2].getString(), lhs[0]) + 1;
 }
 
 ORowSetValue OOp_SubString::operate(const std::vector<ORowSetValue>& lhs) const
 {
-    if (std::any_of(lhs.begin(), lhs.end(), [](const ORowSetValue& rValue) { return rValue.isNull(); }))
+    if (std::any_of(lhs.begin(), lhs.end(),
+                    [](const ORowSetValue& rValue) { return rValue.isNull(); }))
         return ORowSetValue();
 
-    if ( lhs.size() == 2 && static_cast<sal_Int32>(lhs[0]) >= sal_Int32(0) )
-        return lhs[1].getString().copy(static_cast<sal_Int32>(lhs[0])-1);
+    if (lhs.size() == 2 && static_cast<sal_Int32>(lhs[0]) >= sal_Int32(0))
+        return lhs[1].getString().copy(static_cast<sal_Int32>(lhs[0]) - 1);
 
-    else if ( lhs.size() != 3 || static_cast<sal_Int32>(lhs[1]) < sal_Int32(0))
+    else if (lhs.size() != 3 || static_cast<sal_Int32>(lhs[1]) < sal_Int32(0))
         return ORowSetValue();
 
-    return lhs[2].getString().copy(static_cast<sal_Int32>(lhs[1])-1,lhs[0]);
+    return lhs[2].getString().copy(static_cast<sal_Int32>(lhs[1]) - 1, lhs[0]);
 }
 
 ORowSetValue OOp_LTrim::operate(const ORowSetValue& lhs) const
 {
-    if ( lhs.isNull() )
+    if (lhs.isNull())
         return lhs;
 
     OUString sRet = lhs;
@@ -137,55 +138,55 @@ ORowSetValue OOp_LTrim::operate(const ORowSetValue& lhs) const
 
 ORowSetValue OOp_RTrim::operate(const ORowSetValue& lhs) const
 {
-    if ( lhs.isNull() )
+    if (lhs.isNull())
         return lhs;
 
     OUString sRet = lhs;
     OUString sNew = sRet.trim();
-    return sRet.copy(0,sRet.lastIndexOf(sNew[sNew.getLength()-1])+1);
+    return sRet.copy(0, sRet.lastIndexOf(sNew[sNew.getLength() - 1]) + 1);
 }
 
 ORowSetValue OOp_Space::operate(const ORowSetValue& lhs) const
 {
-    if ( lhs.isNull() )
+    if (lhs.isNull())
         return lhs;
 
     const char c = ' ';
     OUStringBuffer sRet;
     sal_Int32 nCount = lhs;
-    for (sal_Int32 i=0; i < nCount; ++i)
+    for (sal_Int32 i = 0; i < nCount; ++i)
     {
-        sRet.appendAscii(&c,1);
+        sRet.appendAscii(&c, 1);
     }
     return sRet.makeStringAndClear();
 }
 
 ORowSetValue OOp_Replace::operate(const std::vector<ORowSetValue>& lhs) const
 {
-    if ( lhs.size() != 3 )
+    if (lhs.size() != 3)
         return ORowSetValue();
 
-    OUString sStr  = lhs[2];
+    OUString sStr = lhs[2];
     OUString sFrom = lhs[1];
-    OUString sTo   = lhs[0];
+    OUString sTo = lhs[0];
     sal_Int32 nIndexOf = sStr.indexOf(sFrom);
-    while( nIndexOf != -1 )
+    while (nIndexOf != -1)
     {
-        sStr = sStr.replaceAt(nIndexOf,sFrom.getLength(),sTo);
-        nIndexOf = sStr.indexOf(sFrom,nIndexOf + sTo.getLength());
+        sStr = sStr.replaceAt(nIndexOf, sFrom.getLength(), sTo);
+        nIndexOf = sStr.indexOf(sFrom, nIndexOf + sTo.getLength());
     }
 
     return sStr;
 }
 
-ORowSetValue OOp_Repeat::operate(const ORowSetValue& lhs,const ORowSetValue& rhs) const
+ORowSetValue OOp_Repeat::operate(const ORowSetValue& lhs, const ORowSetValue& rhs) const
 {
-    if ( lhs.isNull() || rhs.isNull() )
+    if (lhs.isNull() || rhs.isNull())
         return lhs;
 
     OUStringBuffer sRet;
     sal_Int32 nCount = rhs;
-    for (sal_Int32 i=0; i < nCount; ++i)
+    for (sal_Int32 i = 0; i < nCount; ++i)
     {
         sRet.append(lhs.operator OUString());
     }
@@ -194,40 +195,40 @@ ORowSetValue OOp_Repeat::operate(const ORowSetValue& lhs,const ORowSetValue& rhs
 
 ORowSetValue OOp_Insert::operate(const std::vector<ORowSetValue>& lhs) const
 {
-    if ( lhs.size() != 4 )
+    if (lhs.size() != 4)
         return ORowSetValue();
 
     OUString sStr = lhs[3];
 
     sal_Int32 nStart = static_cast<sal_Int32>(lhs[2]);
-    if ( nStart < 1 )
+    if (nStart < 1)
         nStart = 1;
-    return sStr.replaceAt(nStart-1,static_cast<sal_Int32>(lhs[1]),lhs[0]);
+    return sStr.replaceAt(nStart - 1, static_cast<sal_Int32>(lhs[1]), lhs[0]);
 }
 
-ORowSetValue OOp_Left::operate(const ORowSetValue& lhs,const ORowSetValue& rhs) const
+ORowSetValue OOp_Left::operate(const ORowSetValue& lhs, const ORowSetValue& rhs) const
 {
-    if ( lhs.isNull() || rhs.isNull() )
+    if (lhs.isNull() || rhs.isNull())
         return lhs;
 
     OUString sRet = lhs;
     sal_Int32 nCount = rhs;
-    if ( nCount < 0 )
+    if (nCount < 0)
         return ORowSetValue();
-    return sRet.copy(0,nCount);
+    return sRet.copy(0, nCount);
 }
 
-ORowSetValue OOp_Right::operate(const ORowSetValue& lhs,const ORowSetValue& rhs) const
+ORowSetValue OOp_Right::operate(const ORowSetValue& lhs, const ORowSetValue& rhs) const
 {
-    if ( lhs.isNull() || rhs.isNull() )
+    if (lhs.isNull() || rhs.isNull())
         return lhs;
 
     sal_Int32 nCount = rhs;
     OUString sRet = lhs;
-    if ( nCount < 0 || nCount >= sRet.getLength() )
+    if (nCount < 0 || nCount >= sRet.getLength())
         return ORowSetValue();
 
-    return sRet.copy(sRet.getLength()-nCount,nCount);
+    return sRet.copy(sRet.getLength() - nCount, nCount);
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/firebird/Indexes.cxx b/connectivity/source/drivers/firebird/Indexes.cxx
index 86f4f9f6f66c..6cdb8eb4ab5f 100644
--- a/connectivity/source/drivers/firebird/Indexes.cxx
+++ b/connectivity/source/drivers/firebird/Indexes.cxx
@@ -18,7 +18,7 @@ using namespace ::std;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::sdbc;
 
-Indexes::Indexes(Table* pTable, Mutex& rMutex, const vector< OUString>& rVector)
+Indexes::Indexes(Table* pTable, Mutex& rMutex, const vector<OUString>& rVector)
     : OIndexesHelper(pTable, rMutex, rVector)
     , m_pTable(pTable)
 {
@@ -27,6 +27,6 @@ Indexes::Indexes(Table* pTable, Mutex& rMutex, const vector< OUString>& rVector)
 // XDrop
 void Indexes::dropObject(sal_Int32 /*nPosition*/, const OUString& sIndexName)
 {
-    OUString sSql("DROP INDEX \"" + sIndexName +"\"");
+    OUString sSql("DROP INDEX \"" + sIndexName + "\"");
     m_pTable->getConnection()->createStatement()->execute(sSql);
 }
diff --git a/connectivity/source/drivers/flat/ECatalog.cxx b/connectivity/source/drivers/flat/ECatalog.cxx
index b656b29c21b8..aed042fdd578 100644
--- a/connectivity/source/drivers/flat/ECatalog.cxx
+++ b/connectivity/source/drivers/flat/ECatalog.cxx
@@ -30,31 +30,29 @@ using namespace ::com::sun::star::sdbcx;
 using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::container;
 
-
 using namespace connectivity::flat;
 
-OFlatCatalog::OFlatCatalog(OFlatConnection* _pCon) : file::OFileCatalog(_pCon)
+OFlatCatalog::OFlatCatalog(OFlatConnection* _pCon)
+    : file::OFileCatalog(_pCon)
 {
 }
 
 void OFlatCatalog::refreshTables()
 {
-    ::std::vector< OUString> aVector;
-    Sequence< OUString > aTypes;
-    Reference< XResultSet > xResult = m_xMetaData->getTables(Any(),
-        "%", "%", aTypes);
+    ::std::vector<OUString> aVector;
+    Sequence<OUString> aTypes;
+    Reference<XResultSet> xResult = m_xMetaData->getTables(Any(), "%", "%", aTypes);
 
-    if(xResult.is())
+    if (xResult.is())
     {
-        Reference< XRow > xRow(xResult,UNO_QUERY);
-        while(xResult->next())
+        Reference<XRow> xRow(xResult, UNO_QUERY);
+        while (xResult->next())
             aVector.push_back(xRow->getString(3));
     }
-    if(m_pTables)
+    if (m_pTables)
         m_pTables->reFill(aVector);
     else
-        m_pTables.reset( new OFlatTables(m_xMetaData,*this,m_aMutex,aVector) );
+        m_pTables.reset(new OFlatTables(m_xMetaData, *this, m_aMutex, aVector));
 }
 
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/flat/EPreparedStatement.cxx b/connectivity/source/drivers/flat/EPreparedStatement.cxx
index 64a0b3a1c3bb..bcd6bc6ecc11 100644
--- a/connectivity/source/drivers/flat/EPreparedStatement.cxx
+++ b/connectivity/source/drivers/flat/EPreparedStatement.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
 #include <flat/EPreparedStatement.hxx>
 #include <flat/EResultSet.hxx>
 
@@ -27,9 +26,10 @@ using namespace ::com::sun::star::uno;
 
 OResultSet* OFlatPreparedStatement::createResultSet()
 {
-    return new OFlatResultSet(this,m_aSQLIterator);
+    return new OFlatResultSet(this, m_aSQLIterator);
 }
 
-IMPLEMENT_SERVICE_INFO(OFlatPreparedStatement,"com.sun.star.sdbc.driver.flat.PreparedStatement","com.sun.star.sdbc.PreparedStatement");
+IMPLEMENT_SERVICE_INFO(OFlatPreparedStatement, "com.sun.star.sdbc.driver.flat.PreparedStatement",
+                       "com.sun.star.sdbc.PreparedStatement");
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/hsqldb/HTerminateListener.cxx b/connectivity/source/drivers/hsqldb/HTerminateListener.cxx
index df325efb75e8..a9df5ccc9b9a 100644
--- a/connectivity/source/drivers/hsqldb/HTerminateListener.cxx
+++ b/connectivity/source/drivers/hsqldb/HTerminateListener.cxx
@@ -17,36 +17,29 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
 #include "HTerminateListener.hxx"
 #include <hsqldb/HDriver.hxx>
 
-
 namespace connectivity
 {
-
-    using namespace hsqldb;
-    using namespace ::com::sun::star::uno;
-    using namespace ::com::sun::star::lang;
+using namespace hsqldb;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::lang;
 
 // XEventListener
-void SAL_CALL OConnectionController::disposing( const EventObject& /*Source*/ )
-{
-}
+void SAL_CALL OConnectionController::disposing(const EventObject& /*Source*/) {}
 
 // XTerminateListener
-void SAL_CALL OConnectionController::queryTermination( const EventObject& /*aEvent*/ )
+void SAL_CALL OConnectionController::queryTermination(const EventObject& /*aEvent*/)
 {
     m_pDriver->flushConnections();
 }
 
-void SAL_CALL OConnectionController::notifyTermination( const EventObject& /*aEvent*/ )
+void SAL_CALL OConnectionController::notifyTermination(const EventObject& /*aEvent*/)
 {
     m_pDriver->shutdownConnections();
 }
 
-
-}   // namespace connectivity
-
+} // namespace connectivity
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/jdbc/Boolean.cxx b/connectivity/source/drivers/jdbc/Boolean.cxx
index acd1e81ef821..5709674f35b6 100644
--- a/connectivity/source/drivers/jdbc/Boolean.cxx
+++ b/connectivity/source/drivers/jdbc/Boolean.cxx
@@ -22,22 +22,17 @@ using namespace connectivity;
 
 //************ Class: java.lang.Boolean
 
-
 jclass java_lang_Boolean::theClass = nullptr;
 
-java_lang_Boolean::~java_lang_Boolean()
-{}
+java_lang_Boolean::~java_lang_Boolean() {}
 jclass java_lang_Boolean::st_getMyClass()
 {
     // the class must be fetched only once, therefore static
-    if( !theClass )
+    if (!theClass)
         theClass = findMyClass("java/lang/Boolean");
     return theClass;
 }
 
-jclass java_lang_Boolean::getMyClass() const
-{
-    return st_getMyClass();
-}
+jclass java_lang_Boolean::getMyClass() const { return st_getMyClass(); }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/jdbc/Class.cxx b/connectivity/source/drivers/jdbc/Class.cxx
index 98d37fbcc99f..a99dd1fb051d 100644
--- a/connectivity/source/drivers/jdbc/Class.cxx
+++ b/connectivity/source/drivers/jdbc/Class.cxx
@@ -24,44 +24,44 @@ using namespace connectivity;
 
 //************ Class: java.lang.Class
 
-
 jclass java_lang_Class::theClass = nullptr;
 
-java_lang_Class::~java_lang_Class()
-{}
+java_lang_Class::~java_lang_Class() {}
 
 jclass java_lang_Class::getMyClass() const
 {
     // the class must be fetched only once, therefore static
-    if( !theClass )
+    if (!theClass)
         theClass = findMyClass("java/lang/Class");
     return theClass;
 }
 
-java_lang_Class * java_lang_Class::forName( const OUString& _par0 )
+java_lang_Class* java_lang_Class::forName(const OUString& _par0)
 {
     jobject out(nullptr);
     SDBThreadAttach t;
 
     {
         OString sClassName = OUStringToOString(_par0, RTL_TEXTENCODING_JAVA_UTF8);
-        sClassName = sClassName.replace('.','/');
+        sClassName = sClassName.replace('.', '/');
         out = t.pEnv->FindClass(sClassName.getStr());
-        ThrowSQLException(t.pEnv,nullptr);
+        ThrowSQLException(t.pEnv, nullptr);
     } //t.pEnv
     // WARNING: the caller becomes the owner of the returned pointer
-    return out==nullptr ? nullptr : new java_lang_Class( t.pEnv, out );
+    return out == nullptr ? nullptr : new java_lang_Class(t.pEnv, out);
 }
 
 jobject java_lang_Class::newInstanceObject()
 {
     SDBThreadAttach t;
     auto const id = t.pEnv->GetMethodID(static_cast<jclass>(object), "<init>", "()V");
-    if (id == nullptr) {
+    if (id == nullptr)
+    {
         ThrowSQLException(t.pEnv, nullptr);
     }
     auto const obj = t.pEnv->NewObject(static_cast<jclass>(object), id);
-    if (obj == nullptr) {
+    if (obj == nullptr)
+    {
         ThrowSQLException(t.pEnv, nullptr);
     }
     return obj;
diff --git a/connectivity/source/drivers/jdbc/Date.cxx b/connectivity/source/drivers/jdbc/Date.cxx
index 8adaf455aeb0..6086e8190659 100644
--- a/connectivity/source/drivers/jdbc/Date.cxx
+++ b/connectivity/source/drivers/jdbc/Date.cxx
@@ -23,19 +23,16 @@ using namespace connectivity;
 
 //************ Class: java.util.Date
 
-
 jclass java_util_Date::theClass = nullptr;
 
-java_util_Date::~java_util_Date()
-{}
+java_util_Date::~java_util_Date() {}
 
 jclass java_util_Date::getMyClass() const
 {
     // the class must be fetched only once, therefore static
-    if( !theClass )
+    if (!theClass)
         theClass = findMyClass("java/util/Date");
     return theClass;
 }
 
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx b/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx
index 9c33eeb605d0..3fb157fb2446 100644
--- a/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx
+++ b/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx
@@ -23,22 +23,18 @@ using namespace connectivity;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
 
-
 //************ Class: java.sql.Driver
 
-
 jclass java_sql_DriverPropertyInfo::theClass = nullptr;
 
-java_sql_DriverPropertyInfo::~java_sql_DriverPropertyInfo()
-{}
+java_sql_DriverPropertyInfo::~java_sql_DriverPropertyInfo() {}
 
 jclass java_sql_DriverPropertyInfo::getMyClass() const
 {
     // the class must be fetched only once, therefore static
-    if( !theClass )
+    if (!theClass)
         theClass = findMyClass("java/sql/DriverPropertyInfo");
     return theClass;
 }
 
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/jdbc/Exception.cxx b/connectivity/source/drivers/jdbc/Exception.cxx
index 2fdef4ee8028..9fa2d5c18c47 100644
--- a/connectivity/source/drivers/jdbc/Exception.cxx
+++ b/connectivity/source/drivers/jdbc/Exception.cxx
@@ -22,16 +22,14 @@ using namespace connectivity;
 
 //************ Class: java.lang.Exception
 
-
 jclass java_lang_Exception::theClass = nullptr;
 
-java_lang_Exception::~java_lang_Exception()
-{}
+java_lang_Exception::~java_lang_Exception() {}
 
 jclass java_lang_Exception::getMyClass() const
 {
     // the class must be fetched only once, therefore static
-    if( !theClass )
+    if (!theClass)
         theClass = findMyClass("java/lang/Exception");
     return theClass;
 }
diff --git a/connectivity/source/drivers/jdbc/Ref.cxx b/connectivity/source/drivers/jdbc/Ref.cxx
index ca8e2e112815..12ce9fda8aa3 100644
--- a/connectivity/source/drivers/jdbc/Ref.cxx
+++ b/connectivity/source/drivers/jdbc/Ref.cxx
@@ -23,30 +23,26 @@ using namespace connectivity;
 
 //************ Class: java.sql.Ref
 
-
 jclass java_sql_Ref::theClass = nullptr;
-java_sql_Ref::java_sql_Ref( JNIEnv * pEnv, jobject myObj )
-: java_lang_Object( pEnv, myObj )
+java_sql_Ref::java_sql_Ref(JNIEnv* pEnv, jobject myObj)
+    : java_lang_Object(pEnv, myObj)
 {
     SDBThreadAttach::addRef();
 }
-java_sql_Ref::~java_sql_Ref()
-{
-    SDBThreadAttach::releaseRef();
-}
+java_sql_Ref::~java_sql_Ref() { SDBThreadAttach::releaseRef(); }
 
 jclass java_sql_Ref::getMyClass() const
 {
     // the class must be fetched only once, therefore static
-    if( !theClass )
+    if (!theClass)
         theClass = findMyClass("java/sql/Ref");
     return theClass;
 }
 
-OUString SAL_CALL java_sql_Ref::getBaseTypeName(  )
+OUString SAL_CALL java_sql_Ref::getBaseTypeName()
 {
     static jmethodID mID(nullptr);
-    return callStringMethod("getBaseTypeName",mID);
+    return callStringMethod("getBaseTypeName", mID);
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/jdbc/SQLWarning.cxx b/connectivity/source/drivers/jdbc/SQLWarning.cxx
index 16616d18bb9e..487665d7d09b 100644
--- a/connectivity/source/drivers/jdbc/SQLWarning.cxx
+++ b/connectivity/source/drivers/jdbc/SQLWarning.cxx
@@ -22,16 +22,14 @@ using namespace connectivity;
 
 //************ Class: java.sql.SQLWarning
 
-
 jclass java_sql_SQLWarning_BASE::theClass = nullptr;
 
-java_sql_SQLWarning_BASE::~java_sql_SQLWarning_BASE()
-{}
+java_sql_SQLWarning_BASE::~java_sql_SQLWarning_BASE() {}
 
 jclass java_sql_SQLWarning_BASE::getMyClass() const
 {
     // the class needs to be fetched only once, that is why it is static
-    if( !theClass )
+    if (!theClass)
         theClass = findMyClass("java/sql/SQLWarning");
     return theClass;
 }
diff --git a/connectivity/source/drivers/jdbc/String.cxx b/connectivity/source/drivers/jdbc/String.cxx
index f7e682c0281c..e229ef54a39a 100644
--- a/connectivity/source/drivers/jdbc/String.cxx
+++ b/connectivity/source/drivers/jdbc/String.cxx
@@ -23,29 +23,23 @@ using namespace connectivity;
 
 //************ Class: java.lang.String
 
-
 jclass java_lang_String::theClass = nullptr;
 
-java_lang_String::~java_lang_String()
-{}
+java_lang_String::~java_lang_String() {}
 
-jclass java_lang_String::getMyClass() const
-{
-    return st_getMyClass();
-}
+jclass java_lang_String::getMyClass() const { return st_getMyClass(); }
 jclass java_lang_String::st_getMyClass()
 {
     // the class needs to be fetched only once, that is why it is static
-    if( !theClass )
+    if (!theClass)
         theClass = findMyClass("java/lang/String");
     return theClass;
 }
 
-
 java_lang_String::operator OUString()
 {
     SDBThreadAttach t;
-    if(!t.pEnv)
+    if (!t.pEnv)
         return OUString();
     return JavaString2String(t.pEnv, static_cast<jstring>(object));
 }
diff --git a/connectivity/source/drivers/jdbc/Throwable.cxx b/connectivity/source/drivers/jdbc/Throwable.cxx
index c96f5532f38d..db4bb89208ce 100644
--- a/connectivity/source/drivers/jdbc/Throwable.cxx
+++ b/connectivity/source/drivers/jdbc/Throwable.cxx
@@ -23,43 +23,36 @@ using namespace connectivity;
 
 //************ Class: java.lang.Throwable
 
-
 jclass java_lang_Throwable::theClass = nullptr;
 
-java_lang_Throwable::~java_lang_Throwable()
-{}
+java_lang_Throwable::~java_lang_Throwable() {}
 
-jclass java_lang_Throwable::getMyClass() const
-{
-    return st_getMyClass();
-}
+jclass java_lang_Throwable::getMyClass() const { return st_getMyClass(); }
 jclass java_lang_Throwable::st_getMyClass()
 {
     // the class needs to be fetched only once, that is why it is static
-    if( !theClass )
+    if (!theClass)
         theClass = findMyClass("java/lang/Throwable");
     return theClass;
 }
 
-
 OUString java_lang_Throwable::getMessage() const
 {
     static jmethodID mID(nullptr);
-    return callStringMethod("getMessage",mID);
+    return callStringMethod("getMessage", mID);
 }
 
-
 OUString java_lang_Throwable::getLocalizedMessage() const
 {
     static jmethodID mID(nullptr);
-    return callStringMethod("getLocalizedMessage",mID);
+    return callStringMethod("getLocalizedMessage", mID);
 }
 
 #if OSL_DEBUG_LEVEL > 0
 void java_lang_Throwable::printStackTrace() const
 {
     static jmethodID mID(nullptr);
-    return callVoidMethod_ThrowSQL("printStackTrace",mID);
+    return callVoidMethod_ThrowSQL("printStackTrace", mID);
 }
 #endif
 
diff --git a/connectivity/source/drivers/mork/MTables.cxx b/connectivity/source/drivers/mork/MTables.cxx
index f1f169e2a727..f211eff06bbb 100644
--- a/connectivity/source/drivers/mork/MTables.cxx
+++ b/connectivity/source/drivers/mork/MTables.cxx
@@ -31,22 +31,22 @@ using namespace ::com::sun::star::sdbc;
 
 sdbcx::ObjectType OTables::createObject(const OUString& _rName)
 {
-    OUString aName,aSchema;
+    OUString aName, aSchema;
     aSchema = "%";
     aName = _rName;
 
-    Sequence< OUString > aTypes { "%" };
+    Sequence<OUString> aTypes{ "%" };
 
-    Reference< XResultSet > xResult = m_xMetaData->getTables(Any(),aSchema,aName,aTypes);
+    Reference<XResultSet> xResult = m_xMetaData->getTables(Any(), aSchema, aName, aTypes);
 
     sdbcx::ObjectType xRet;
-    if(xResult.is())
+    if (xResult.is())
     {
-        Reference< XRow > xRow(xResult,UNO_QUERY);
-        if(xResult->next()) // there can be only one table with this name
+        Reference<XRow> xRow(xResult, UNO_QUERY);
+        if (xResult->next()) // there can be only one table with this name
         {
-            OTable* pRet = new OTable(  this, static_cast<OCatalog&>(m_rParent).getConnection(),
-                                        aName,xRow->getString(4),xRow->getString(5));
+            OTable* pRet = new OTable(this, static_cast<OCatalog&>(m_rParent).getConnection(),
+                                      aName, xRow->getString(4), xRow->getString(5));
             xRet = pRet;
         }
     }
@@ -55,10 +55,7 @@ sdbcx::ObjectType OTables::createObject(const OUString& _rName)
     return xRet;
 }
 
-void OTables::impl_refresh(  )
-{
-    static_cast<OCatalog&>(m_rParent).refreshTables();
-}
+void OTables::impl_refresh() { static_cast<OCatalog&>(m_rParent).refreshTables(); }
 
 void OTables::disposing()
 {
@@ -66,5 +63,4 @@ void OTables::disposing()
     OCollection::disposing();
 }
 
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/RowFunctionParser.hxx b/connectivity/source/inc/RowFunctionParser.hxx
index 5bb508bc12ff..28ed97689410 100644
--- a/connectivity/source/inc/RowFunctionParser.hxx
+++ b/connectivity/source/inc/RowFunctionParser.hxx
@@ -27,7 +27,6 @@
 
 namespace connectivity
 {
-
 enum class ExpressionFunct
 {
     Equation,
@@ -40,15 +39,16 @@ enum class ExpressionFunct
 class OOO_DLLPUBLIC_DBTOOLS SAL_NO_VTABLE ExpressionNode
 {
 public:
-    virtual ~ExpressionNode(){}
+    virtual ~ExpressionNode() {}
 
     /** Operator to calculate function value.
 
         This method calculates the function value.
     */
-    virtual ORowSetValueDecoratorRef evaluate(const ODatabaseMetaDataResultSet::ORow& _aRow ) const = 0;
+    virtual ORowSetValueDecoratorRef
+    evaluate(const ODatabaseMetaDataResultSet::ORow& _aRow) const = 0;
 
-    virtual void fill(const ODatabaseMetaDataResultSet::ORow& _aRow ) const = 0;
+    virtual void fill(const ODatabaseMetaDataResultSet::ORow& _aRow) const = 0;
 };
 
 /** This exception is thrown, when the arithmetic expression
@@ -56,13 +56,12 @@ public:
     */
 struct OOO_DLLPUBLIC_DBTOOLS ParseError
 {
-    ParseError( const char* ) {}
+    ParseError(const char*) {}
 };
 
 class FunctionParser
 {
 public:
-
     /** Parse a string
 
         The following grammar is accepted by this method:
@@ -96,17 +95,16 @@ public:
         @return the generated function object.
        */
 
-    static std::shared_ptr<ExpressionNode> const & parseFunction( const OUString& _sFunction);
+    static std::shared_ptr<ExpressionNode> const& parseFunction(const OUString& _sFunction);
 
 private:
     // disabled constructor/destructor, since this is
     // supposed to be a singleton
     FunctionParser() = delete;
     FunctionParser(const FunctionParser&) = delete;
-    FunctionParser& operator=( const FunctionParser& ) = delete;
+    FunctionParser& operator=(const FunctionParser&) = delete;
 };
 
-
 } // namespace connectivity
 
 #endif // INCLUDED_CONNECTIVITY_SOURCE_INC_ROWFUNCTIONPARSER_HXX
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index 01e90e8b7c1f..923fceb155e7 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -1873,7 +1873,6 @@ connectivity/source/drivers/ado/AConnection.cxx
 connectivity/source/drivers/ado/ADatabaseMetaData.cxx
 connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx
 connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
-connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx
 connectivity/source/drivers/ado/ADriver.cxx
 connectivity/source/drivers/ado/AGroup.cxx
 connectivity/source/drivers/ado/AGroups.cxx
@@ -1894,7 +1893,6 @@ connectivity/source/drivers/ado/AViews.cxx
 connectivity/source/drivers/ado/Aolevariant.cxx
 connectivity/source/drivers/ado/Awrapado.cxx
 connectivity/source/drivers/ado/adoimp.cxx
-connectivity/source/drivers/calc/CCatalog.cxx
 connectivity/source/drivers/calc/CConnection.cxx
 connectivity/source/drivers/calc/CDatabaseMetaData.cxx
 connectivity/source/drivers/calc/CDriver.cxx
@@ -1904,18 +1902,14 @@ connectivity/source/drivers/component/CColumns.cxx
 connectivity/source/drivers/component/CDatabaseMetaData.cxx
 connectivity/source/drivers/component/CPreparedStatement.cxx
 connectivity/source/drivers/component/CResultSet.cxx
-connectivity/source/drivers/component/CStatement.cxx
 connectivity/source/drivers/component/CTable.cxx
-connectivity/source/drivers/dbase/DCatalog.cxx
 connectivity/source/drivers/dbase/DColumns.cxx
 connectivity/source/drivers/dbase/DConnection.cxx
 connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
 connectivity/source/drivers/dbase/DDriver.cxx
 connectivity/source/drivers/dbase/DIndex.cxx
 connectivity/source/drivers/dbase/DIndexColumns.cxx
-connectivity/source/drivers/dbase/DIndexIter.cxx
 connectivity/source/drivers/dbase/DIndexes.cxx
-connectivity/source/drivers/dbase/DPreparedStatement.cxx
 connectivity/source/drivers/dbase/DResultSet.cxx
 connectivity/source/drivers/dbase/DStatement.cxx
 connectivity/source/drivers/dbase/DTable.cxx
@@ -1949,7 +1943,6 @@ connectivity/source/drivers/file/FCatalog.cxx
 connectivity/source/drivers/file/FColumns.cxx
 connectivity/source/drivers/file/FConnection.cxx
 connectivity/source/drivers/file/FDatabaseMetaData.cxx
-connectivity/source/drivers/file/FDateFunctions.cxx
 connectivity/source/drivers/file/FDriver.cxx
 connectivity/source/drivers/file/FNoException.cxx
 connectivity/source/drivers/file/FNumericFunctions.cxx
@@ -1957,7 +1950,6 @@ connectivity/source/drivers/file/FPreparedStatement.cxx
 connectivity/source/drivers/file/FResultSet.cxx
 connectivity/source/drivers/file/FResultSetMetaData.cxx
 connectivity/source/drivers/file/FStatement.cxx
-connectivity/source/drivers/file/FStringFunctions.cxx
 connectivity/source/drivers/file/FTable.cxx
 connectivity/source/drivers/file/FTables.cxx
 connectivity/source/drivers/file/fanalyzer.cxx
@@ -1980,7 +1972,6 @@ connectivity/source/drivers/firebird/DatabaseMetaData.cxx
 connectivity/source/drivers/firebird/DatabaseMetaData.hxx
 connectivity/source/drivers/firebird/Driver.cxx
 connectivity/source/drivers/firebird/Driver.hxx
-connectivity/source/drivers/firebird/Indexes.cxx
 connectivity/source/drivers/firebird/Indexes.hxx
 connectivity/source/drivers/firebird/Keys.cxx
 connectivity/source/drivers/firebird/Keys.hxx
@@ -2005,12 +1996,10 @@ connectivity/source/drivers/firebird/Users.cxx
 connectivity/source/drivers/firebird/Users.hxx
 connectivity/source/drivers/firebird/Util.cxx
 connectivity/source/drivers/firebird/Util.hxx
-connectivity/source/drivers/flat/ECatalog.cxx
 connectivity/source/drivers/flat/EColumns.cxx
 connectivity/source/drivers/flat/EConnection.cxx
 connectivity/source/drivers/flat/EDatabaseMetaData.cxx
 connectivity/source/drivers/flat/EDriver.cxx
-connectivity/source/drivers/flat/EPreparedStatement.cxx
 connectivity/source/drivers/flat/EResultSet.cxx
 connectivity/source/drivers/flat/EStatement.cxx
 connectivity/source/drivers/flat/ETable.cxx
@@ -2023,7 +2012,6 @@ connectivity/source/drivers/hsqldb/HStorageAccess.cxx
 connectivity/source/drivers/hsqldb/HStorageMap.cxx
 connectivity/source/drivers/hsqldb/HTable.cxx
 connectivity/source/drivers/hsqldb/HTables.cxx
-connectivity/source/drivers/hsqldb/HTerminateListener.cxx
 connectivity/source/drivers/hsqldb/HTerminateListener.hxx
 connectivity/source/drivers/hsqldb/HTools.cxx
 connectivity/source/drivers/hsqldb/HUser.cxx
@@ -2037,16 +2025,11 @@ connectivity/source/drivers/hsqldb/accesslog.cxx
 connectivity/source/drivers/hsqldb/accesslog.hxx
 connectivity/source/drivers/jdbc/Array.cxx
 connectivity/source/drivers/jdbc/Blob.cxx
-connectivity/source/drivers/jdbc/Boolean.cxx
 connectivity/source/drivers/jdbc/CallableStatement.cxx
-connectivity/source/drivers/jdbc/Class.cxx
 connectivity/source/drivers/jdbc/Clob.cxx
 connectivity/source/drivers/jdbc/ConnectionLog.cxx
 connectivity/source/drivers/jdbc/ContextClassLoader.cxx
 connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
-connectivity/source/drivers/jdbc/Date.cxx
-connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx
-connectivity/source/drivers/jdbc/Exception.cxx
 connectivity/source/drivers/jdbc/InputStream.cxx
 connectivity/source/drivers/jdbc/JBigDecimal.cxx
 connectivity/source/drivers/jdbc/JConnection.cxx
@@ -2055,13 +2038,9 @@ connectivity/source/drivers/jdbc/JStatement.cxx
 connectivity/source/drivers/jdbc/Object.cxx
 connectivity/source/drivers/jdbc/PreparedStatement.cxx
 connectivity/source/drivers/jdbc/Reader.cxx
-connectivity/source/drivers/jdbc/Ref.cxx
 connectivity/source/drivers/jdbc/ResultSet.cxx
 connectivity/source/drivers/jdbc/ResultSetMetaData.cxx
 connectivity/source/drivers/jdbc/SQLException.cxx
-connectivity/source/drivers/jdbc/SQLWarning.cxx
-connectivity/source/drivers/jdbc/String.cxx
-connectivity/source/drivers/jdbc/Throwable.cxx
 connectivity/source/drivers/jdbc/Timestamp.cxx
 connectivity/source/drivers/jdbc/tools.cxx
 connectivity/source/drivers/macab/MacabAddressBook.cxx
@@ -2128,7 +2107,6 @@ connectivity/source/drivers/mork/MStatement.cxx
 connectivity/source/drivers/mork/MStatement.hxx
 connectivity/source/drivers/mork/MTable.cxx
 connectivity/source/drivers/mork/MTable.hxx
-connectivity/source/drivers/mork/MTables.cxx
 connectivity/source/drivers/mork/MTables.hxx
 connectivity/source/drivers/mork/MorkParser.cxx
 connectivity/source/drivers/mork/MorkParser.hxx
@@ -2223,7 +2201,6 @@ connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx
 connectivity/source/inc/OColumn.hxx
 connectivity/source/inc/OTypeInfo.hxx
 connectivity/source/inc/ParameterSubstitution.hxx
-connectivity/source/inc/RowFunctionParser.hxx
 connectivity/source/inc/TConnection.hxx
 connectivity/source/inc/TDatabaseMetaDataBase.hxx
 connectivity/source/inc/TKeyValue.hxx