loplugin:constantparam in connectivity

Change-Id: Idfc7d9709a917ce2ebbc06119a906daf4cee8d48

17 files changed, 50 insertions, 85 deletions

diff --git a/connectivity/source/drivers/calc/CTable.cxx b/connectivity/source/drivers/calc/CTable.cxx
index 1c871adad62d..5fa70b311001 100644
--- a/connectivity/source/drivers/calc/CTable.cxx
+++ b/connectivity/source/drivers/calc/CTable.cxx
@@ -783,7 +783,7 @@ End:
 }
 
 bool OCalcTable::fetchRow( OValueRefRow& _rRow, const OSQLColumns & _rCols,
-                           bool _bUseTableDefs, bool bRetrieveData )
+                           bool bRetrieveData )
 {
     // read the bookmark
 
@@ -804,12 +804,7 @@ bool OCalcTable::fetchRow( OValueRefRow& _rRow, const OSQLColumns & _rCols,
     {
         if ( (_rRow->get())[i]->isBound() )
         {
-            sal_Int32 nType = 0;
-            if ( _bUseTableDefs )
-                nType = m_aTypes[i-1];
-            else
-                (*aIter)->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE)) >>= nType;
-
+            sal_Int32 nType = m_aTypes[i-1];
 
             lcl_SetValue( (_rRow->get())[i]->get(), m_xSheet, m_nStartCol, m_nStartRow, m_bHasHeaders,
                                 m_aNullDate, m_nFilePos, i, nType );
diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx
index 2aab28139ea3..928e47175711 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -778,7 +778,7 @@ sal_Int64 ODbaseTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (R
                 : ODbaseTable_BASE::getSomething(rId);
 }
 
-bool ODbaseTable::fetchRow(OValueRefRow& _rRow, const OSQLColumns & _rCols, bool _bUseTableDefs, bool bRetrieveData)
+bool ODbaseTable::fetchRow(OValueRefRow& _rRow, const OSQLColumns & _rCols, bool bRetrieveData)
 {
     if (!m_pBuffer)
         return false;
@@ -805,16 +805,8 @@ bool ODbaseTable::fetchRow(OValueRefRow& _rRow, const OSQLColumns & _rCols, bool
         // Lengths depending on data type:
         sal_Int32 nLen = 0;
         sal_Int32 nType = 0;
-        if(_bUseTableDefs)
-        {
-            nLen    = m_aPrecisions[i-1];
-            nType   = m_aTypes[i-1];
-        }
-        else
-        {
-            (*aIter)->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION)) >>= nLen;
-            (*aIter)->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE))      >>= nType;
-        }
+        nLen    = m_aPrecisions[i-1];
+        nType   = m_aTypes[i-1];
 
         switch(nType)
         {
@@ -828,10 +820,7 @@ bool ODbaseTable::fetchRow(OValueRefRow& _rRow, const OSQLColumns & _rCols, bool
                 nLen = m_aRealFieldLengths[i-1];
                 break;
             case DataType::DECIMAL:
-                if(_bUseTableDefs)
-                    nLen = SvDbaseConverter::ConvertPrecisionToDbase(nLen,m_aScales[i-1]);
-                else
-                    nLen = SvDbaseConverter::ConvertPrecisionToDbase(nLen,getINT32((*aIter)->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE))));
+                nLen = SvDbaseConverter::ConvertPrecisionToDbase(nLen,m_aScales[i-1]);
                 break;  // the sign and the comma
 
             case DataType::BINARY:
@@ -1500,7 +1489,7 @@ bool ODbaseTable::DropImpl()
 }
 
 
-bool ODbaseTable::InsertRow(OValueRefVector& rRow, bool bFlush, const Reference<XIndexAccess>& _xCols)
+bool ODbaseTable::InsertRow(OValueRefVector& rRow, const Reference<XIndexAccess>& _xCols)
 {
     // fill buffer with blanks
     if (!AllocBuffer())
@@ -1542,9 +1531,7 @@ bool ODbaseTable::InsertRow(OValueRefVector& rRow, bool bFlush, const Reference<
             m_pFileStream->Seek( 4L );
             (*m_pFileStream).WriteUInt32( m_aHeader.db_anz + 1 );
 
-            // if AppendOnly no flush!
-            if (bFlush)
-                m_pFileStream->Flush();
+            m_pFileStream->Flush();
 
             // raise number if successfully
             m_aHeader.db_anz++;
@@ -1598,7 +1585,7 @@ bool ODbaseTable::DeleteRow(const OSQLColumns& _rCols)
 
     OValueRefRow aRow = new OValueRefVector(_rCols.get().size());
 
-    if (!fetchRow(aRow,_rCols,true,true))
+    if (!fetchRow(aRow,_rCols,true))
         return false;
 
     Reference<XPropertySet> xCol;
@@ -2542,7 +2529,7 @@ void ODbaseTable::copyData(ODbaseTable* _pNewTable,sal_Int32 _nPos)
         bool bOk = seekRow( IResultSetHelper::BOOKMARK, nRowPos+1, nCurPos );
         if ( bOk )
         {
-            bOk = fetchRow( aRow, *m_aColumns, true, true);
+            bOk = fetchRow( aRow, *m_aColumns, true);
             if ( bOk && !aRow->isDeleted() ) // copy only not deleted rows
             {
                 // special handling when pos == 0 then we don't have to distinguish between the two rows
@@ -2559,7 +2546,7 @@ void ODbaseTable::copyData(ODbaseTable* _pNewTable,sal_Int32 _nPos)
                         }
                     }
                 }
-                bOk = _pNewTable->InsertRow(*aInsertRow,true,_pNewTable->m_pColumns);
+                bOk = _pNewTable->InsertRow(*aInsertRow,_pNewTable->m_pColumns);
                 SAL_WARN_IF(!bOk, "connectivity.drivers", "Row could not be inserted!"); (void)bOk;
             }
             else
diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx
index fd2798217968..49ee0d31147b 100644
--- a/connectivity/source/drivers/file/FResultSet.cxx
+++ b/connectivity/source/drivers/file/FResultSet.cxx
@@ -536,7 +536,7 @@ void SAL_CALL OResultSet::insertRow(  ) throw(SQLException, RuntimeException, st
     // we know that we append new rows at the end
     // so we have to know where the end is
     (void)m_aSkipDeletedSet.skipDeleted(IResultSetHelper::LAST,1,false);
-    m_bRowInserted = m_pTable->InsertRow(*m_aInsertRow, true, m_xColsIdx);
+    m_bRowInserted = m_pTable->InsertRow(*m_aInsertRow, m_xColsIdx);
     if(m_bRowInserted && m_pFileSet.is())
     {
         sal_Int32 nPos = (m_aInsertRow->get())[0]->getValue();
@@ -798,11 +798,11 @@ again:
 
     if (!bEvaluate) // If no evaluation runs, then just fill the results-row
     {
-        m_pTable->fetchRow(m_aRow,rTableCols, true,bRetrieveData);
+        m_pTable->fetchRow(m_aRow,rTableCols, bRetrieveData);
     }
     else
     {
-        m_pTable->fetchRow(m_aEvaluateRow, rTableCols, true,bRetrieveData || bHasRestriction);
+        m_pTable->fetchRow(m_aEvaluateRow, rTableCols, bRetrieveData || bHasRestriction);
 
         if  (   (   !m_bShowDeleted
                 &&  m_aEvaluateRow->isDeleted()
@@ -869,7 +869,7 @@ again:
         if (bEvaluate)
         {
             // read the actual result-row
-            bOK = m_pTable->fetchRow(m_aEvaluateRow, *(m_pTable->getTableColumns()), true,true);
+            bOK = m_pTable->fetchRow(m_aEvaluateRow, *(m_pTable->getTableColumns()), true);
         }
 
         if (bOK)
@@ -884,7 +884,7 @@ again:
         bool bOK = true;
         if (bEvaluate)
         {
-            bOK = m_pTable->fetchRow(m_aEvaluateRow, *(m_pTable->getTableColumns()), true,true);
+            bOK = m_pTable->fetchRow(m_aEvaluateRow, *(m_pTable->getTableColumns()), true);
         }
         if (bOK)
         {
@@ -985,7 +985,7 @@ bool OResultSet::Move(IResultSetHelper::Movement eCursorPosition, sal_Int32 nOff
                     if (bOK)
                     {
                         // read the results again
-                        m_pTable->fetchRow(m_aRow, *(m_pTable->getTableColumns()), true,bRetrieveData);
+                        m_pTable->fetchRow(m_aRow, *(m_pTable->getTableColumns()), bRetrieveData);
 
                         // now set the bookmark for outside
                         *(*m_aRow->get().begin()) = sal_Int32(m_nRowPos + 1);
@@ -1390,7 +1390,7 @@ bool OResultSet::OpenImpl()
             m_nRowCountResult = 0;
 
             OSL_ENSURE(m_aAssignValues.is(),"No assign values set!");
-            if(!m_pTable->InsertRow(*m_aAssignValues, true,m_xColsIdx))
+            if(!m_pTable->InsertRow(*m_aAssignValues, m_xColsIdx))
             {
                 m_nFilePos  = 0;
                 return false;
diff --git a/connectivity/source/drivers/file/FTable.cxx b/connectivity/source/drivers/file/FTable.cxx
index dbaa9355d48a..6f5ce7d22e4d 100644
--- a/connectivity/source/drivers/file/FTable.cxx
+++ b/connectivity/source/drivers/file/FTable.cxx
@@ -175,7 +175,7 @@ void SAL_CALL OFileTable::release() throw()
     OTable_TYPEDEF::release();
 }
 
-bool OFileTable::InsertRow(OValueRefVector& /*rRow*/, bool /*bFlush*/, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& /*_xCols*/)
+bool OFileTable::InsertRow(OValueRefVector& /*rRow*/, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& /*_xCols*/)
 {
     return false;
 }
diff --git a/connectivity/source/drivers/flat/ETable.cxx b/connectivity/source/drivers/flat/ETable.cxx
index 6600515984d3..2db10071fe29 100644
--- a/connectivity/source/drivers/flat/ETable.cxx
+++ b/connectivity/source/drivers/flat/ETable.cxx
@@ -577,7 +577,7 @@ sal_Int64 OFlatTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (Ru
                 : OFlatTable_BASE::getSomething(rId);
 }
 
-bool OFlatTable::fetchRow(OValueRefRow& _rRow, const OSQLColumns & _rCols, bool bIsTable, bool bRetrieveData)
+bool OFlatTable::fetchRow(OValueRefRow& _rRow, const OSQLColumns & _rCols, bool bRetrieveData)
 {
     *(_rRow->get())[0] = m_nFilePos;
 
@@ -618,16 +618,7 @@ bool OFlatTable::fetchRow(OValueRefRow& _rRow, const OSQLColumns & _rCols, bool
         }
         else
         {
-            sal_Int32 nType = 0;
-            if(bIsTable)
-            {
-                nType   = m_aTypes[i-1];
-            }
-            else
-            {
-                Reference< XPropertySet> xColumn = *aIter;
-                xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE))       >>= nType;
-            }
+            sal_Int32 nType   = m_aTypes[i-1];
             switch(nType)
             {
                 case DataType::TIMESTAMP:
diff --git a/connectivity/source/drivers/hsqldb/HColumns.cxx b/connectivity/source/drivers/hsqldb/HColumns.cxx
index 42bd2a735de3..a63d829c9f9d 100644
--- a/connectivity/source/drivers/hsqldb/HColumns.cxx
+++ b/connectivity/source/drivers/hsqldb/HColumns.cxx
@@ -33,22 +33,20 @@ using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
 
 OHSQLColumns::OHSQLColumns( ::cppu::OWeakObject& _rParent
-                                ,bool _bCase
                                 ,::osl::Mutex& _rMutex
                                 ,const TStringVector &_rVector
-                                ,bool _bUseHardRef
-            ) : OColumnsHelper(_rParent,_bCase,_rMutex,_rVector,_bUseHardRef)
+            ) : OColumnsHelper(_rParent,true/*_bCase*/,_rMutex,_rVector,true/*_bUseHardRef*/)
 {
 }
 
 Reference< XPropertySet > OHSQLColumns::createDescriptor()
 {
-    return new OHSQLColumn(true);
+    return new OHSQLColumn;
 }
 
 
-OHSQLColumn::OHSQLColumn(   bool    _bCase)
-    : connectivity::sdbcx::OColumn( _bCase )
+OHSQLColumn::OHSQLColumn()
+    : connectivity::sdbcx::OColumn( true/*_bCase*/ )
 {
     construct();
 }
diff --git a/connectivity/source/drivers/hsqldb/HTable.cxx b/connectivity/source/drivers/hsqldb/HTable.cxx
index 8727c155e323..ef8d6748d024 100644
--- a/connectivity/source/drivers/hsqldb/HTable.cxx
+++ b/connectivity/source/drivers/hsqldb/HTable.cxx
@@ -111,7 +111,7 @@ void OHSQLTable::construct()
 
 sdbcx::OCollection* OHSQLTable::createColumns(const TStringVector& _rNames)
 {
-    OHSQLColumns* pColumns = new OHSQLColumns(*this,true,m_aMutex,_rNames);
+    OHSQLColumns* pColumns = new OHSQLColumns(*this,m_aMutex,_rNames);
     pColumns->setParent(this);
     return pColumns;
 }
@@ -280,7 +280,7 @@ void OHSQLTable::alterColumnType(sal_Int32 nNewType,const OUString& _rColName, c
     (void)_rColName;
 #endif
 
-    OHSQLColumn* pColumn = new OHSQLColumn(true);
+    OHSQLColumn* pColumn = new OHSQLColumn;
     Reference<XPropertySet> xProp = pColumn;
     ::comphelper::copyProperties(_xDescriptor,xProp);
     xProp->setPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE),makeAny(nNewType));
diff --git a/connectivity/source/drivers/mysql/YColumns.cxx b/connectivity/source/drivers/mysql/YColumns.cxx
index 2f380e50605e..2864f5b92231 100644
--- a/connectivity/source/drivers/mysql/YColumns.cxx
+++ b/connectivity/source/drivers/mysql/YColumns.cxx
@@ -33,22 +33,20 @@ using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
 
 OMySQLColumns::OMySQLColumns(   ::cppu::OWeakObject& _rParent
-                                ,bool _bCase
                                 ,::osl::Mutex& _rMutex
                                 ,const TStringVector &_rVector
-                                ,bool _bUseHardRef
-            ) : OColumnsHelper(_rParent,_bCase,_rMutex,_rVector,_bUseHardRef)
+            ) : OColumnsHelper(_rParent,true/*_bCase*/,_rMutex,_rVector,true/*_bUseHardRef*/)
 {
 }
 
 Reference< XPropertySet > OMySQLColumns::createDescriptor()
 {
-    return new OMySQLColumn(true);
+    return new OMySQLColumn;
 }
 
 
-OMySQLColumn::OMySQLColumn( bool    _bCase)
-    : connectivity::sdbcx::OColumn( _bCase )
+OMySQLColumn::OMySQLColumn()
+    : connectivity::sdbcx::OColumn( true )
 {
     construct();
 }
diff --git a/connectivity/source/drivers/mysql/YTable.cxx b/connectivity/source/drivers/mysql/YTable.cxx
index 8e154d476889..bdece3d48431 100644
--- a/connectivity/source/drivers/mysql/YTable.cxx
+++ b/connectivity/source/drivers/mysql/YTable.cxx
@@ -130,7 +130,7 @@ void OMySQLTable::construct()
 
 sdbcx::OCollection* OMySQLTable::createColumns(const TStringVector& _rNames)
 {
-    OMySQLColumns* pColumns = new OMySQLColumns(*this,true,m_aMutex,_rNames);
+    OMySQLColumns* pColumns = new OMySQLColumns(*this,m_aMutex,_rNames);
     pColumns->setParent(this);
     return pColumns;
 }
diff --git a/connectivity/source/drivers/odbc/OResultSet.cxx b/connectivity/source/drivers/odbc/OResultSet.cxx
index 5a2b12236334..7c089cfa3257 100644
--- a/connectivity/source/drivers/odbc/OResultSet.cxx
+++ b/connectivity/source/drivers/odbc/OResultSet.cxx
@@ -726,28 +726,28 @@ void SAL_CALL OResultSet::close(  ) throw(SQLException, RuntimeException, std::e
 
 sal_Bool SAL_CALL OResultSet::first(  ) throw(SQLException, RuntimeException, std::exception)
 {
-    return moveImpl(IResultSetHelper::FIRST,0,true);
+    return moveImpl(IResultSetHelper::FIRST,0);
 }
 
 
 sal_Bool SAL_CALL OResultSet::last(  ) throw(SQLException, RuntimeException, std::exception)
 {
-    return moveImpl(IResultSetHelper::LAST,0,true);
+    return moveImpl(IResultSetHelper::LAST,0);
 }
 
 sal_Bool SAL_CALL OResultSet::absolute( sal_Int32 row ) throw(SQLException, RuntimeException, std::exception)
 {
-    return moveImpl(IResultSetHelper::ABSOLUTE1,row,true);
+    return moveImpl(IResultSetHelper::ABSOLUTE1,row);
 }
 
 sal_Bool SAL_CALL OResultSet::relative( sal_Int32 row ) throw(SQLException, RuntimeException, std::exception)
 {
-    return moveImpl(IResultSetHelper::RELATIVE1,row,true);
+    return moveImpl(IResultSetHelper::RELATIVE1,row);
 }
 
 sal_Bool SAL_CALL OResultSet::previous(  ) throw(SQLException, RuntimeException, std::exception)
 {
-    return moveImpl(IResultSetHelper::PRIOR,0,true);
+    return moveImpl(IResultSetHelper::PRIOR,0);
 }
 
 Reference< XInterface > SAL_CALL OResultSet::getStatement(  ) throw(SQLException, RuntimeException, std::exception)
@@ -792,7 +792,7 @@ sal_Bool SAL_CALL OResultSet::rowUpdated(  ) throw(SQLException, RuntimeExceptio
 
 sal_Bool SAL_CALL OResultSet::next(  ) throw(SQLException, RuntimeException, std::exception)
 {
-    return moveImpl(IResultSetHelper::NEXT,1,true);
+    return moveImpl(IResultSetHelper::NEXT,1);
 }
 
 
@@ -1763,13 +1763,13 @@ bool OResultSet::isRowDeleted() const
     return m_pRowStatusArray[0] == SQL_ROW_DELETED;
 }
 
-bool OResultSet::moveImpl(IResultSetHelper::Movement _eCursorPosition, sal_Int32 _nOffset, bool _bRetrieveData)
+bool OResultSet::moveImpl(IResultSetHelper::Movement _eCursorPosition, sal_Int32 _nOffset)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
     return (m_pSkipDeletedSet != nullptr)
-                ?   m_pSkipDeletedSet->skipDeleted(_eCursorPosition,_nOffset,_bRetrieveData)
-                :   move(_eCursorPosition,_nOffset,_bRetrieveData);
+                ?   m_pSkipDeletedSet->skipDeleted(_eCursorPosition,_nOffset,true/*_bRetrieveData*/)
+                :   move(_eCursorPosition,_nOffset,true/*_bRetrieveData*/);
 }
 
 void OResultSet::fillNeededData(SQLRETURN _nRet)
diff --git a/connectivity/source/inc/calc/CTable.hxx b/connectivity/source/inc/calc/CTable.hxx
index afbbc6a456ce..26683cd95f3c 100644
--- a/connectivity/source/inc/calc/CTable.hxx
+++ b/connectivity/source/inc/calc/CTable.hxx
@@ -74,7 +74,7 @@ namespace connectivity
 
             virtual sal_Int32 getCurrentLastPos() const override;
             virtual bool seekRow(IResultSetHelper::Movement eCursorPosition, sal_Int32 nOffset, sal_Int32& nCurPos) override;
-            virtual bool fetchRow(OValueRefRow& _rRow, const OSQLColumns& _rCols, bool _bUseTableDefs, bool bRetrieveData) override;
+            virtual bool fetchRow(OValueRefRow& _rRow, const OSQLColumns& _rCols, bool bRetrieveData) override;
 
             virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
             //XTypeProvider
diff --git a/connectivity/source/inc/dbase/DTable.hxx b/connectivity/source/inc/dbase/DTable.hxx
index 0fdea0c0a386..79a61d877704 100644
--- a/connectivity/source/inc/dbase/DTable.hxx
+++ b/connectivity/source/inc/dbase/DTable.hxx
@@ -140,7 +140,7 @@ namespace connectivity
 
             virtual sal_Int32 getCurrentLastPos() const override;
             virtual bool seekRow(IResultSetHelper::Movement eCursorPosition, sal_Int32 nOffset, sal_Int32& nCurPos) override;
-            virtual bool fetchRow(OValueRefRow& _rRow,const OSQLColumns& _rCols, bool _bUseTableDefs, bool bRetrieveData) override;
+            virtual bool fetchRow(OValueRefRow& _rRow,const OSQLColumns& _rCols, bool bRetrieveData) override;
 
             virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
             //XTypeProvider
@@ -160,7 +160,7 @@ namespace connectivity
             bool    CreateImpl();
 
 
-            virtual bool InsertRow(OValueRefVector& rRow, bool bFlush, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xCols) override;
+            virtual bool InsertRow(OValueRefVector& rRow, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xCols) override;
             virtual bool DeleteRow(const OSQLColumns& _rCols) override;
             virtual bool UpdateRow(OValueRefVector& rRow, OValueRefRow& pOrgRow,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xCols) override;
 
diff --git a/connectivity/source/inc/file/FTable.hxx b/connectivity/source/inc/file/FTable.hxx
index 71803005bd0c..5e3229bd615b 100644
--- a/connectivity/source/inc/file/FTable.hxx
+++ b/connectivity/source/inc/file/FTable.hxx
@@ -74,10 +74,10 @@ namespace connectivity
             virtual sal_Int32 getCurrentLastPos() const {return -1;}
 
             virtual bool seekRow(IResultSetHelper::Movement eCursorPosition, sal_Int32 nOffset, sal_Int32& nCurPos) = 0;
-            virtual bool fetchRow(OValueRefRow& _rRow, const OSQLColumns& _rCols, bool _bUseTableDefs, bool bRetrieveData) = 0;
+            virtual bool fetchRow(OValueRefRow& _rRow, const OSQLColumns& _rCols, bool bRetrieveData) = 0;
 
             ::rtl::Reference<OSQLColumns> getTableColumns() const {return m_aColumns;}
-            virtual bool InsertRow(OValueRefVector& rRow, bool bFlush, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xCols);
+            virtual bool InsertRow(OValueRefVector& rRow, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xCols);
             virtual bool DeleteRow(const OSQLColumns& _rCols);
             virtual bool UpdateRow(OValueRefVector& rRow, OValueRefRow& pOrgRow,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xCols);
             virtual void addColumn(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& descriptor);
diff --git a/connectivity/source/inc/flat/ETable.hxx b/connectivity/source/inc/flat/ETable.hxx
index 7769a2b9c68f..4e0e9a283473 100644
--- a/connectivity/source/inc/flat/ETable.hxx
+++ b/connectivity/source/inc/flat/ETable.hxx
@@ -88,7 +88,7 @@ namespace connectivity
             void construct() override; // can throw any exception
 
             virtual bool seekRow(IResultSetHelper::Movement eCursorPosition, sal_Int32 nOffset, sal_Int32& nCurPos) override;
-            virtual bool fetchRow(OValueRefRow& _rRow, const OSQLColumns& _rCols, bool bIsTable, bool bRetrieveData) override;
+            virtual bool fetchRow(OValueRefRow& _rRow, const OSQLColumns& _rCols, bool bRetrieveData) override;
             virtual void refreshHeader() override;
 
             virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
diff --git a/connectivity/source/inc/hsqldb/HColumns.hxx b/connectivity/source/inc/hsqldb/HColumns.hxx
index c25c3e3c0021..4ccedf95f0e1 100644
--- a/connectivity/source/inc/hsqldb/HColumns.hxx
+++ b/connectivity/source/inc/hsqldb/HColumns.hxx
@@ -31,10 +31,8 @@ namespace connectivity
             virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor() override;
         public:
             OHSQLColumns(   ::cppu::OWeakObject& _rParent
-                            ,bool _bCase
                             ,::osl::Mutex& _rMutex
                             ,const TStringVector &_rVector
-                            ,bool _bUseHardRef = true
                         );
         };
 
@@ -51,7 +49,7 @@ namespace connectivity
             virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override;
 
         public:
-            OHSQLColumn(bool _bCase);
+            OHSQLColumn();
             virtual void construct() override;
 
             virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
diff --git a/connectivity/source/inc/mysql/YColumns.hxx b/connectivity/source/inc/mysql/YColumns.hxx
index 876701d924d7..db5f1059d2df 100644
--- a/connectivity/source/inc/mysql/YColumns.hxx
+++ b/connectivity/source/inc/mysql/YColumns.hxx
@@ -31,10 +31,8 @@ namespace connectivity
             virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor() override;
         public:
             OMySQLColumns(  ::cppu::OWeakObject& _rParent
-                            ,bool _bCase
                             ,::osl::Mutex& _rMutex
                             ,const TStringVector &_rVector
-                            ,bool _bUseHardRef = true
                         );
         };
 
@@ -51,7 +49,7 @@ namespace connectivity
             virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override;
 
         public:
-            OMySQLColumn(bool _bCase);
+            OMySQLColumn();
             virtual void construct() override;
 
             virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
diff --git a/connectivity/source/inc/odbc/OResultSet.hxx b/connectivity/source/inc/odbc/OResultSet.hxx
index 448e16f82b96..7cb58dbfdcff 100644
--- a/connectivity/source/inc/odbc/OResultSet.hxx
+++ b/connectivity/source/inc/odbc/OResultSet.hxx
@@ -170,7 +170,7 @@ namespace connectivity
             void releaseBuffer();
             void updateValue(sal_Int32 columnIndex,SQLSMALLINT _nType,void* _pValue) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             void fillNeededData(SQLRETURN _nRet);
-            bool moveImpl(IResultSetHelper::Movement _eCursorPosition, sal_Int32 _nOffset, bool _bRetrieveData);
+            bool moveImpl(IResultSetHelper::Movement _eCursorPosition, sal_Int32 _nOffset);
             TVoidPtr allocBindColumn(sal_Int32 _nType,sal_Int32 _nColumnIndex);
             SQLRETURN unbind(bool _bUnbindHandle = true);
             SWORD impl_getColumnType_nothrow(sal_Int32 columnIndex);