loplugin:constparams in connectivity

Change-Id: I9b81c6227fb3c89a832640058a11444f72019694
Reviewed-on: https://gerrit.libreoffice.org/40155
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

45 files changed, 113 insertions, 110 deletions

diff --git a/compilerplugins/clang/constparams.cxx b/compilerplugins/clang/constparams.cxx
index 4873b7828547..0bee8fbc134c 100644
--- a/compilerplugins/clang/constparams.cxx
+++ b/compilerplugins/clang/constparams.cxx
@@ -111,6 +111,8 @@ bool ConstParams::VisitFunctionDecl(FunctionDecl * functionDecl)
             || name.endswith("component_getFactory")
                 // in Scheduler::, wants to loop until a reference to a bool becomes true
             || name == "ProcessEventsToSignal"
+                // external API
+            || name == "Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeOutputStream_flush"
             )
                 return true;
     }
diff --git a/connectivity/source/cpool/ZConnectionPool.cxx b/connectivity/source/cpool/ZConnectionPool.cxx
index ce485b45cd75..346f102e8401 100644
--- a/connectivity/source/cpool/ZConnectionPool.cxx
+++ b/connectivity/source/cpool/ZConnectionPool.cxx
@@ -261,7 +261,7 @@ void OConnectionPool::invalidatePooledConnections()
         m_xInvalidator->start();
 }
 
-Reference< XConnection> OConnectionPool::getPooledConnection(TConnectionMap::iterator& _rIter)
+Reference< XConnection> OConnectionPool::getPooledConnection(TConnectionMap::iterator const & _rIter)
 {
     Reference<XConnection> xConnection;
 
diff --git a/connectivity/source/cpool/ZConnectionPool.hxx b/connectivity/source/cpool/ZConnectionPool.hxx
index 04119d92d7a1..b23db6005fa4 100644
--- a/connectivity/source/cpool/ZConnectionPool.hxx
+++ b/connectivity/source/cpool/ZConnectionPool.hxx
@@ -123,7 +123,7 @@ namespace connectivity
     private:
         css::uno::Reference< css::sdbc::XConnection> createNewConnection(const OUString& _rURL,
                                 const css::uno::Sequence< css::beans::PropertyValue >& _rInfo);
-        css::uno::Reference< css::sdbc::XConnection> getPooledConnection(TConnectionMap::iterator& _rIter);
+        css::uno::Reference< css::sdbc::XConnection> getPooledConnection(TConnectionMap::iterator const & _rIter);
         // calculate the timeout and the corresponding ALiveCount
         void calculateTimeOuts();
 
diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx
index 7673fadad24a..9d452e66b85b 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -593,7 +593,7 @@ bool ODbaseTable::ReadMemoHeader()
     return true;
 }
 
-OUString ODbaseTable::getEntry(OConnection* _pConnection,const OUString& _sName )
+OUString ODbaseTable::getEntry(OConnection const * _pConnection,const OUString& _sName )
 {
     OUString sURL;
     try
@@ -2279,7 +2279,7 @@ void SAL_CALL ODbaseTable::rename( const OUString& newName )
 }
 namespace
 {
-    void renameFile(OConnection* _pConenction,const OUString& oldName,
+    void renameFile(OConnection const * _pConenction,const OUString& oldName,
                     const OUString& newName,const OUString& _sExtension)
     {
         OUString aName = ODbaseTable::getEntry(_pConenction,oldName);
diff --git a/connectivity/source/drivers/dbase/dindexnode.cxx b/connectivity/source/drivers/dbase/dindexnode.cxx
index 7ad42f34f5dd..4e718419e38a 100644
--- a/connectivity/source/drivers/dbase/dindexnode.cxx
+++ b/connectivity/source/drivers/dbase/dindexnode.cxx
@@ -126,7 +126,7 @@ void ONDXPage::QueryDelete()
     }
 }
 
-ONDXPagePtr& ONDXPage::GetChild(ODbaseIndex* pIndex)
+ONDXPagePtr& ONDXPage::GetChild(ODbaseIndex const * pIndex)
 {
     if (!aChild.Is() && pIndex)
     {
@@ -660,7 +660,7 @@ void ONDXPage::Merge(sal_uInt16 nParentNodePos, const ONDXPagePtr& xPage)
 // ONDXNode
 
 
-void ONDXNode::Read(SvStream &rStream, ODbaseIndex& rIndex)
+void ONDXNode::Read(SvStream &rStream, ODbaseIndex const & rIndex)
 {
     rStream.ReadUInt32( aKey.nRecord ); // key
 
@@ -1006,7 +1006,7 @@ sal_uInt16 ONDXPage::Search(const ONDXPage* pPage)
 
 // runs recursively
 void ONDXPage::SearchAndReplace(const ONDXKey& rSearch,
-                                  ONDXKey& rReplace)
+                                  ONDXKey const & rReplace)
 {
     OSL_ENSURE(rSearch != rReplace,"Invalid here:rSearch == rReplace");
     if (rSearch != rReplace)
diff --git a/connectivity/source/drivers/file/FNoException.cxx b/connectivity/source/drivers/file/FNoException.cxx
index 299c37a27181..f692fac5016e 100644
--- a/connectivity/source/drivers/file/FNoException.cxx
+++ b/connectivity/source/drivers/file/FNoException.cxx
@@ -56,7 +56,7 @@ void OPredicateCompiler::Clean()
     m_aCodeList.clear();
 }
 
-void OSQLAnalyzer::bindParameterRow(OValueRefRow& _pRow)
+void OSQLAnalyzer::bindParameterRow(OValueRefRow const & _pRow)
 {
     OCodeList& rCodeList    = m_aCompiler->m_aCodeList;
     for(OCodeList::iterator aIter = rCodeList.begin(); aIter != rCodeList.end();++aIter)
@@ -87,7 +87,7 @@ void OPreparedStatement::scanParameter(OSQLParseNode* pParseNode,std::vector< OS
         scanParameter(pParseNode->getChild(i),_rParaNodes);
 }
 
-OKeyValue* OResultSet::GetOrderbyKeyValue(OValueRefRow& _rRow)
+OKeyValue* OResultSet::GetOrderbyKeyValue(OValueRefRow const & _rRow)
 {
     sal_uInt32 nBookmarkValue = std::abs((sal_Int32)(_rRow->get())[0]->getValue());
 
diff --git a/connectivity/source/drivers/file/FPreparedStatement.cxx b/connectivity/source/drivers/file/FPreparedStatement.cxx
index ea93c940da4e..c5382afe218d 100644
--- a/connectivity/source/drivers/file/FPreparedStatement.cxx
+++ b/connectivity/source/drivers/file/FPreparedStatement.cxx
@@ -419,7 +419,7 @@ void OPreparedStatement::setParameter(sal_Int32 parameterIndex, const ORowSetVal
         *((m_aParameterRow->get())[parameterIndex]) = x;
 }
 
-sal_uInt32 OPreparedStatement::AddParameter(OSQLParseNode * pParameter, const Reference<XPropertySet>& _xCol)
+sal_uInt32 OPreparedStatement::AddParameter(OSQLParseNode const * pParameter, const Reference<XPropertySet>& _xCol)
 {
     OSL_ENSURE(SQL_ISRULE(pParameter,parameter),"OResultSet::AddParameter: Argument is not a parameter");
     OSL_ENSURE(pParameter->count() > 0,"OResultSet: Error in Parse Tree");
@@ -461,7 +461,7 @@ sal_uInt32 OPreparedStatement::AddParameter(OSQLParseNode * pParameter, const Re
     return m_xParamColumns->get().size();
 }
 
-void OPreparedStatement::describeColumn(OSQLParseNode* _pParameter,OSQLParseNode* _pNode,const OSQLTable& _xTable)
+void OPreparedStatement::describeColumn(OSQLParseNode const * _pParameter, OSQLParseNode const * _pNode,const OSQLTable& _xTable)
 {
     Reference<XPropertySet> xProp;
     if(SQL_ISRULE(_pNode,column_ref))
diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx
index 756a370f57b3..8be612d01b1e 100644
--- a/connectivity/source/drivers/file/FStatement.cxx
+++ b/connectivity/source/drivers/file/FStatement.cxx
@@ -337,8 +337,8 @@ void OStatement_Base::anylizeSQL()
     }
 }
 
-void OStatement_Base::setOrderbyColumn( OSQLParseNode* pColumnRef,
-                                        OSQLParseNode* pAscendingDescending)
+void OStatement_Base::setOrderbyColumn( OSQLParseNode const * pColumnRef,
+                                        OSQLParseNode const * pAscendingDescending)
 {
     OUString aColumnName;
     if (pColumnRef->count() == 1)
diff --git a/connectivity/source/drivers/file/fanalyzer.cxx b/connectivity/source/drivers/file/fanalyzer.cxx
index 1ed686ab645d..6aadc6319381 100644
--- a/connectivity/source/drivers/file/fanalyzer.cxx
+++ b/connectivity/source/drivers/file/fanalyzer.cxx
@@ -53,7 +53,7 @@ void OSQLAnalyzer::setIndexes(const Reference< XNameAccess>& _xIndexes)
     m_aCompiler->m_xIndexes = _xIndexes;
 }
 
-void OSQLAnalyzer::start(OSQLParseNode* pSQLParseNode)
+void OSQLAnalyzer::start(OSQLParseNode const * pSQLParseNode)
 {
     if (SQL_ISRULE(pSQLParseNode,select_statement))
     {
@@ -138,7 +138,7 @@ void OSQLAnalyzer::bindSelectRow(const OValueRefRow& _pRow)
     }
 }
 
-void OSQLAnalyzer::bindEvaluationRow(OValueRefRow& _pRow)
+void OSQLAnalyzer::bindEvaluationRow(OValueRefRow const & _pRow)
 {
     bindRow(m_aCompiler->m_aCodeList,_pRow);
 }
@@ -169,7 +169,7 @@ bool OSQLAnalyzer::hasFunctions() const
     return m_bHasSelectionCode;
 }
 
-void OSQLAnalyzer::setSelectionEvaluationResult(OValueRefRow& _pRow,const std::vector<sal_Int32>& _rColumnMapping)
+void OSQLAnalyzer::setSelectionEvaluationResult(OValueRefRow const & _pRow,const std::vector<sal_Int32>& _rColumnMapping)
 {
     sal_Int32 nPos = 1;
     for ( std::vector< TPredicates >::iterator aIter = m_aSelectionEvaluations.begin(); aIter != m_aSelectionEvaluations.end();++aIter,++nPos)
diff --git a/connectivity/source/drivers/file/fcomp.cxx b/connectivity/source/drivers/file/fcomp.cxx
index be93f506805e..65d6e400e1ca 100644
--- a/connectivity/source/drivers/file/fcomp.cxx
+++ b/connectivity/source/drivers/file/fcomp.cxx
@@ -63,7 +63,7 @@ void OPredicateCompiler::dispose()
     m_xIndexes.clear();
 }
 
-void OPredicateCompiler::start(OSQLParseNode* pSQLParseNode)
+void OPredicateCompiler::start(OSQLParseNode const * pSQLParseNode)
 {
     if (!pSQLParseNode)
         return;
@@ -219,7 +219,7 @@ OOperand* OPredicateCompiler::execute(OSQLParseNode* pPredicateNode)
 }
 
 
-void OPredicateCompiler::execute_COMPARE(OSQLParseNode* pPredicateNode)
+void OPredicateCompiler::execute_COMPARE(OSQLParseNode const * pPredicateNode)
 {
     DBG_ASSERT(pPredicateNode->count() == 3,"OFILECursor: Error in Parse Tree");
 
@@ -265,7 +265,7 @@ void OPredicateCompiler::execute_COMPARE(OSQLParseNode* pPredicateNode)
 }
 
 
-void OPredicateCompiler::execute_LIKE(OSQLParseNode* pPredicateNode)
+void OPredicateCompiler::execute_LIKE(OSQLParseNode const * pPredicateNode)
 {
     DBG_ASSERT(pPredicateNode->count() == 2,"OFILECursor: Error in Parse Tree");
     const OSQLParseNode* pPart2 = pPredicateNode->getChild(1);
@@ -313,7 +313,7 @@ void OPredicateCompiler::execute_LIKE(OSQLParseNode* pPredicateNode)
     m_aCodeList.push_back(pOperator);
 }
 
-void OPredicateCompiler::execute_BETWEEN(OSQLParseNode* pPredicateNode)
+void OPredicateCompiler::execute_BETWEEN(OSQLParseNode const * pPredicateNode)
 {
     DBG_ASSERT(pPredicateNode->count() == 2,"OFILECursor: Error in Parse Tree");
 
@@ -390,7 +390,7 @@ void OPredicateCompiler::execute_BETWEEN(OSQLParseNode* pPredicateNode)
     m_aCodeList.push_back(pBoolOp);
 }
 
-void OPredicateCompiler::execute_ISNULL(OSQLParseNode* pPredicateNode)
+void OPredicateCompiler::execute_ISNULL(OSQLParseNode const * pPredicateNode)
 {
     DBG_ASSERT(pPredicateNode->count() == 2,"OFILECursor: Error in Parse Tree");
     const OSQLParseNode* pPart2 = pPredicateNode->getChild(1);
@@ -561,7 +561,7 @@ bool OPredicateInterpreter::evaluate(OCodeList& rCodeList)
     return bResult;
 }
 
-void OPredicateInterpreter::evaluateSelection(OCodeList& rCodeList,ORowSetValueDecoratorRef& _rVal)
+void OPredicateInterpreter::evaluateSelection(OCodeList& rCodeList, ORowSetValueDecoratorRef const & _rVal)
 {
     OCodeList::iterator aIter = rCodeList.begin();
     if (!(*aIter))
@@ -587,7 +587,7 @@ void OPredicateInterpreter::evaluateSelection(OCodeList& rCodeList,ORowSetValueD
         delete pOperand;
 }
 
-void OPredicateCompiler::execute_Fold(OSQLParseNode* pPredicateNode)
+void OPredicateCompiler::execute_Fold(OSQLParseNode const * pPredicateNode)
 {
     DBG_ASSERT(pPredicateNode->count() >= 4,"OFILECursor: Error in Parse Tree");
 
@@ -603,7 +603,7 @@ void OPredicateCompiler::execute_Fold(OSQLParseNode* pPredicateNode)
     m_aCodeList.push_back(pOperator);
 }
 
-void OPredicateCompiler::executeFunction(OSQLParseNode* pPredicateNode)
+void OPredicateCompiler::executeFunction(OSQLParseNode const * pPredicateNode)
 {
     OOperator* pOperator = nullptr;
 
diff --git a/connectivity/source/drivers/flat/ETable.cxx b/connectivity/source/drivers/flat/ETable.cxx
index 1f0c565c9119..b261ad3b9164 100644
--- a/connectivity/source/drivers/flat/ETable.cxx
+++ b/connectivity/source/drivers/flat/ETable.cxx
@@ -195,7 +195,7 @@ void OFlatTable::fillColumns(const css::lang::Locale& _aLocale)
     m_pFileStream->Seek(m_aRowPosToFilePos[0].second);
 }
 
-void OFlatTable::impl_fillColumnInfo_nothrow(QuotedTokenizedString& aFirstLine, sal_Int32& nStartPosFirstLine, sal_Int32& nStartPosFirstLine2,
+void OFlatTable::impl_fillColumnInfo_nothrow(QuotedTokenizedString const & aFirstLine, sal_Int32& nStartPosFirstLine, sal_Int32& nStartPosFirstLine2,
                                              sal_Int32& io_nType, sal_Int32& io_nPrecisions, sal_Int32& io_nScales, OUString& o_sTypeName,
                                              const sal_Unicode cDecimalDelimiter, const sal_Unicode cThousandDelimiter, const CharClass&  aCharClass)
 {
diff --git a/connectivity/source/drivers/mork/MPreparedStatement.cxx b/connectivity/source/drivers/mork/MPreparedStatement.cxx
index 03132a9d1728..f607077f9605 100644
--- a/connectivity/source/drivers/mork/MPreparedStatement.cxx
+++ b/connectivity/source/drivers/mork/MPreparedStatement.cxx
@@ -362,7 +362,7 @@ ORowSetValue& x)
 }
 
 
-void OPreparedStatement::AddParameter(OSQLParseNode * pParameter, const Reference<XPropertySet>& _xCol)
+void OPreparedStatement::AddParameter(OSQLParseNode const * pParameter, const Reference<XPropertySet>& _xCol)
 {
     OSL_ENSURE(SQL_ISRULE(pParameter,parameter),"OResultSet::AddParameter: Argument is not a Parameter");
     OSL_ENSURE(pParameter->count() > 0,"OResultSet: error in parse tree");
@@ -405,8 +405,9 @@ void OPreparedStatement::AddParameter(OSQLParseNode * pParameter, const Referenc
     m_xParamColumns->get().push_back(xParaColumn);
 }
 
-void OPreparedStatement::describeColumn(OSQLParseNode*
-_pParameter,OSQLParseNode* _pNode,const OSQLTable& _xTable)
+void OPreparedStatement::describeColumn(OSQLParseNode const * _pParameter,
+                                        OSQLParseNode const * _pNode,
+                                        const OSQLTable& _xTable)
 {
     Reference<XPropertySet> xProp;
     if(SQL_ISRULE(_pNode,column_ref))
diff --git a/connectivity/source/drivers/mork/MPreparedStatement.hxx b/connectivity/source/drivers/mork/MPreparedStatement.hxx
index 8a0f65232cd7..c70592432bd6 100644
--- a/connectivity/source/drivers/mork/MPreparedStatement.hxx
+++ b/connectivity/source/drivers/mork/MPreparedStatement.hxx
@@ -66,10 +66,10 @@ namespace connectivity
             void checkAndResizeParameters(sal_Int32 parameterIndex);
             void setParameter(sal_Int32 parameterIndex, const ORowSetValue& x);
 
-            void AddParameter(connectivity::OSQLParseNode * pParameter,
+            void AddParameter(connectivity::OSQLParseNode const * pParameter,
                                 const css::uno::Reference< css::beans::XPropertySet>& _xCol);
             void scanParameter(OSQLParseNode* pParseNode,std::vector< OSQLParseNode*>& _rParaNodes);
-            void describeColumn(OSQLParseNode* _pParameter,OSQLParseNode* _pNode,const OSQLTable& _xTable);
+            void describeColumn(OSQLParseNode const * _pParameter, OSQLParseNode const * _pNode, const OSQLTable& _xTable);
             void describeParameter();
 
         public:
diff --git a/connectivity/source/drivers/mork/MQueryHelper.cxx b/connectivity/source/drivers/mork/MQueryHelper.cxx
index 51a20c5e65e2..0d363249b63d 100644
--- a/connectivity/source/drivers/mork/MQueryHelper.cxx
+++ b/connectivity/source/drivers/mork/MQueryHelper.cxx
@@ -41,7 +41,7 @@ using namespace ::com::sun::star::sdbc;
 
 
 extern
-std::vector<bool> entryMatchedByExpression(MQueryHelper* _aQuery, MQueryExpression* _aExpr, MQueryHelperResultEntry* entry);
+std::vector<bool> entryMatchedByExpression(MQueryHelper* _aQuery, MQueryExpression const * _aExpr, MQueryHelperResultEntry* entry);
 
 MQueryHelperResultEntry::MQueryHelperResultEntry()
 {
@@ -82,7 +82,7 @@ MQueryHelper::~MQueryHelper()
 }
 
 
-void MQueryHelper::setAddressbook(OUString &ab)
+void MQueryHelper::setAddressbook(OUString const &ab)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     m_aAddressbook = ab;
@@ -259,7 +259,7 @@ sal_Int32 MQueryHelper::executeQuery(OConnection* xConnection, MQueryExpression
     return 0;
 }
 
-std::vector<bool> entryMatchedByExpression(MQueryHelper* _aQuery, MQueryExpression* _aExpr, MQueryHelperResultEntry* entry)
+std::vector<bool> entryMatchedByExpression(MQueryHelper* _aQuery, MQueryExpression const * _aExpr, MQueryHelperResultEntry* entry)
 {
     std::vector<bool> resultVector;
     MQueryExpression::ExprVector::const_iterator evIter;
diff --git a/connectivity/source/drivers/mork/MQueryHelper.hxx b/connectivity/source/drivers/mork/MQueryHelper.hxx
index f9795c075cc3..7e469d0d7a51 100644
--- a/connectivity/source/drivers/mork/MQueryHelper.hxx
+++ b/connectivity/source/drivers/mork/MQueryHelper.hxx
@@ -186,7 +186,7 @@ namespace connectivity
             bool                       hadError() const { return m_aError.is(); }
             ErrorDescriptor&    getError() { return m_aError; }
 
-            void                       setAddressbook( OUString&);
+            void                       setAddressbook( OUString const &);
         };
     }
 }
diff --git a/connectivity/source/drivers/mork/MResultSet.cxx b/connectivity/source/drivers/mork/MResultSet.cxx
index 0be8b575804b..d6edffaac63a 100644
--- a/connectivity/source/drivers/mork/MResultSet.cxx
+++ b/connectivity/source/drivers/mork/MResultSet.cxx
@@ -998,7 +998,7 @@ void OResultSet::fillRowData()
 }
 
 
-static bool matchRow( OValueRow& row1, OValueRow& row2 )
+static bool matchRow( OValueRow const & row1, OValueRow const & row2 )
 {
     OValueVector::Vector::const_iterator row1Iter = row1->get().begin();
     OValueVector::Vector::const_iterator row2Iter = row2->get().begin();
diff --git a/connectivity/source/drivers/mork/MStatement.cxx b/connectivity/source/drivers/mork/MStatement.cxx
index d9aea80da5dc..2a43e7b1323f 100644
--- a/connectivity/source/drivers/mork/MStatement.cxx
+++ b/connectivity/source/drivers/mork/MStatement.cxx
@@ -444,8 +444,8 @@ void OCommonStatement::analyseSQL()
     }
 }
 
-void OCommonStatement::setOrderbyColumn(    OSQLParseNode* pColumnRef,
-                                        OSQLParseNode* pAscendingDescending)
+void OCommonStatement::setOrderbyColumn(OSQLParseNode const * pColumnRef,
+                                        OSQLParseNode const * pAscendingDescending)
 {
     OUString aColumnName;
     if (pColumnRef->count() == 1)
diff --git a/connectivity/source/drivers/mork/MStatement.hxx b/connectivity/source/drivers/mork/MStatement.hxx
index a7e3c3f39ce6..bd707a954e08 100644
--- a/connectivity/source/drivers/mork/MStatement.hxx
+++ b/connectivity/source/drivers/mork/MStatement.hxx
@@ -127,8 +127,8 @@ namespace connectivity
 
             void         createColumnMapping();
             void         analyseSQL();
-            void         setOrderbyColumn( connectivity::OSQLParseNode* pColumnRef,
-                                           connectivity::OSQLParseNode* pAscendingDescending);
+            void         setOrderbyColumn( connectivity::OSQLParseNode const * pColumnRef,
+                                           connectivity::OSQLParseNode const * pAscendingDescending);
 
         public:
             // other methods
diff --git a/connectivity/source/drivers/mork/MorkParser.cxx b/connectivity/source/drivers/mork/MorkParser.cxx
index b188e8518d7c..78f1f417e4c4 100644
--- a/connectivity/source/drivers/mork/MorkParser.cxx
+++ b/connectivity/source/drivers/mork/MorkParser.cxx
@@ -637,7 +637,7 @@ void MorkParser::retrieveLists(std::set<std::string>& lists)
     }
 }
 
-void MorkParser::getRecordKeysForListTable(std::string& listName, std::set<int>& records)
+void MorkParser::getRecordKeysForListTable(std::string const & listName, std::set<int>& records)
 {
 #ifdef VERBOSE
     boost::io::ios_all_saver ias(std::cout);
diff --git a/connectivity/source/drivers/mork/MorkParser.hxx b/connectivity/source/drivers/mork/MorkParser.hxx
index 63cf97240cec..aafabb0ad865 100644
--- a/connectivity/source/drivers/mork/MorkParser.hxx
+++ b/connectivity/source/drivers/mork/MorkParser.hxx
@@ -92,7 +92,7 @@ public:
     std::string const &getColumn( int oid );
 
     void retrieveLists(std::set<std::string>& lists);
-    void getRecordKeysForListTable(std::string& listName, std::set<int>& records);
+    void getRecordKeysForListTable(std::string const & listName, std::set<int>& records);
 
     void dump();
 
diff --git a/connectivity/source/drivers/odbc/OResultSet.cxx b/connectivity/source/drivers/odbc/OResultSet.cxx
index 203402eb5b35..2a27652aa9a6 100644
--- a/connectivity/source/drivers/odbc/OResultSet.cxx
+++ b/connectivity/source/drivers/odbc/OResultSet.cxx
@@ -992,7 +992,7 @@ void SAL_CALL OResultSet::moveToCurrentRow(  )
     invalidateCache();
 }
 
-void OResultSet::updateValue(sal_Int32 columnIndex,SQLSMALLINT _nType,void* _pValue)
+void OResultSet::updateValue(sal_Int32 columnIndex, SQLSMALLINT _nType, void const * _pValue)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -1068,7 +1068,7 @@ void SAL_CALL OResultSet::updateString( sal_Int32 columnIndex, const OUString& x
     m_aRow[columnIndex] = x;
     m_aRow[columnIndex].setTypeKind(nType); // OJ: otherwise longvarchar will be recognized by fillNeededData
     m_aRow[columnIndex].setBound(true);
-    updateValue(columnIndex,nOdbcType,const_cast<OUString *>(&x));
+    updateValue(columnIndex,nOdbcType, &x);
 }
 
 void SAL_CALL OResultSet::updateBytes( sal_Int32 columnIndex, const Sequence< sal_Int8 >& x )
@@ -1078,7 +1078,7 @@ void SAL_CALL OResultSet::updateBytes( sal_Int32 columnIndex, const Sequence< sa
     m_aRow[columnIndex] = x;
     m_aRow[columnIndex].setTypeKind(nType); // OJ: otherwise longvarbinary will be recognized by fillNeededData
     m_aRow[columnIndex].setBound(true);
-    updateValue(columnIndex,nOdbcType,const_cast<css::uno::Sequence<sal_Int8> *>(&x));
+    updateValue(columnIndex,nOdbcType, &x);
 }
 
 void SAL_CALL OResultSet::updateDate( sal_Int32 columnIndex, const Date& x )
diff --git a/connectivity/source/drivers/odbc/OResultSetMetaData.cxx b/connectivity/source/drivers/odbc/OResultSetMetaData.cxx
index aff770cbced5..709bfdb98f7b 100644
--- a/connectivity/source/drivers/odbc/OResultSetMetaData.cxx
+++ b/connectivity/source/drivers/odbc/OResultSetMetaData.cxx
@@ -76,7 +76,7 @@ OUString OResultSetMetaData::getCharColAttrib(sal_Int32 _column,sal_Int32 ident)
     return  sValue;
 }
 
-SQLLEN OResultSetMetaData::getNumColAttrib(OConnection* _pConnection
+SQLLEN OResultSetMetaData::getNumColAttrib(OConnection const * _pConnection
                                               ,SQLHANDLE _aStatementHandle
                                               ,const css::uno::Reference< css::uno::XInterface >& _xInterface
                                               ,sal_Int32 _column
@@ -107,7 +107,7 @@ sal_Int32 SAL_CALL OResultSetMetaData::getColumnDisplaySize( sal_Int32 column )
     return getNumColAttrib(column,SQL_DESC_DISPLAY_SIZE);
 }
 
-SQLSMALLINT OResultSetMetaData::getColumnODBCType(OConnection* _pConnection
+SQLSMALLINT OResultSetMetaData::getColumnODBCType(OConnection const * _pConnection
                                               ,SQLHANDLE _aStatementHandle
                                               ,const css::uno::Reference< css::uno::XInterface >& _xInterface
                                               ,sal_Int32 column)
diff --git a/connectivity/source/drivers/odbc/OTools.cxx b/connectivity/source/drivers/odbc/OTools.cxx
index 1327d3892fe0..cf4d64d994d0 100644
--- a/connectivity/source/drivers/odbc/OTools.cxx
+++ b/connectivity/source/drivers/odbc/OTools.cxx
@@ -123,7 +123,7 @@ void appendSQLWCHARs(OUStringBuffer & s, SQLWCHAR const * d, sal_Int32 n)
 }
 
 
-void OTools::getValue(  OConnection* _pConnection,
+void OTools::getValue(  OConnection const * _pConnection,
                         SQLHANDLE _aStatementHandle,
                         sal_Int32 columnIndex,
                         SQLSMALLINT _nType,
@@ -161,7 +161,7 @@ void OTools::getValue(  OConnection* _pConnection,
     _bWasNull = pcbValue == SQL_NULL_DATA;
 }
 
-void OTools::bindValue( OConnection* _pConnection,
+void OTools::bindValue( OConnection const * _pConnection,
                         SQLHANDLE _aStatementHandle,
                         sal_Int32 columnIndex,
                         SQLSMALLINT _nType,
@@ -412,7 +412,7 @@ Sequence<sal_Int8> OTools::getBytesValue(const OConnection* _pConnection,
     return aData;
 }
 
-OUString OTools::getStringValue(OConnection* _pConnection,
+OUString OTools::getStringValue(OConnection const * _pConnection,
                                        SQLHANDLE _aStatementHandle,
                                        sal_Int32 columnIndex,
                                        SQLSMALLINT _fSqlType,
@@ -522,7 +522,7 @@ OUString OTools::getStringValue(OConnection* _pConnection,
     return aData.makeStringAndClear();
 }
 
-void OTools::GetInfo(OConnection* _pConnection,
+void OTools::GetInfo(OConnection const * _pConnection,
                      SQLHANDLE _aConnectionHandle,
                      SQLUSMALLINT _nInfo,
                      OUString &_rValue,
@@ -538,7 +538,7 @@ void OTools::GetInfo(OConnection* _pConnection,
     _rValue = OUString(aValue,nValueLen,_nTextEncoding);
 }
 
-void OTools::GetInfo(OConnection* _pConnection,
+void OTools::GetInfo(OConnection const * _pConnection,
                      SQLHANDLE _aConnectionHandle,
                      SQLUSMALLINT _nInfo,
                      sal_Int32 &_rValue,
@@ -551,7 +551,7 @@ void OTools::GetInfo(OConnection* _pConnection,
         _aConnectionHandle,SQL_HANDLE_DBC,_xInterface);
 }
 
-void OTools::GetInfo(OConnection* _pConnection,
+void OTools::GetInfo(OConnection const * _pConnection,
                      SQLHANDLE _aConnectionHandle,
                      SQLUSMALLINT _nInfo,
                      SQLUINTEGER &_rValue,
@@ -564,7 +564,7 @@ void OTools::GetInfo(OConnection* _pConnection,
         _aConnectionHandle,SQL_HANDLE_DBC,_xInterface);
 }
 
-void OTools::GetInfo(OConnection* _pConnection,
+void OTools::GetInfo(OConnection const * _pConnection,
                      SQLHANDLE _aConnectionHandle,
                      SQLUSMALLINT _nInfo,
                      SQLUSMALLINT &_rValue,
diff --git a/connectivity/source/drivers/postgresql/pq_connection.cxx b/connectivity/source/drivers/postgresql/pq_connection.cxx
index f996fa6034fb..bd2b7e236524 100644
--- a/connectivity/source/drivers/postgresql/pq_connection.cxx
+++ b/connectivity/source/drivers/postgresql/pq_connection.cxx
@@ -650,7 +650,7 @@ Reference< XInterface >  ConnectionCreateInstance(
 }
 
 
-bool isLog(ConnectionSettings *settings, LogLevel nLevel)
+bool isLog(ConnectionSettings const *settings, LogLevel nLevel)
 {
     return static_cast<int>(settings->m_nLogLevel) >= static_cast<int>(nLevel)
            && settings->logFile;
diff --git a/connectivity/source/drivers/postgresql/pq_connection.hxx b/connectivity/source/drivers/postgresql/pq_connection.hxx
index f3b33009d050..bebabb04be82 100644
--- a/connectivity/source/drivers/postgresql/pq_connection.hxx
+++ b/connectivity/source/drivers/postgresql/pq_connection.hxx
@@ -82,7 +82,7 @@ enum class LogLevel
     Info,
     LAST = Info
 };
-bool isLog(ConnectionSettings *settings, LogLevel nLevel);
+bool isLog(ConnectionSettings const *settings, LogLevel nLevel);
 void log(ConnectionSettings *settings, LogLevel nLevel, const OUString &logString);
 void log(ConnectionSettings *settings, LogLevel nLevel, const char *str);
 
diff --git a/connectivity/source/drivers/postgresql/pq_statics.cxx b/connectivity/source/drivers/postgresql/pq_statics.cxx
index 61688bd61e4f..622a06ef7fac 100644
--- a/connectivity/source/drivers/postgresql/pq_statics.cxx
+++ b/connectivity/source/drivers/postgresql/pq_statics.cxx
@@ -85,7 +85,7 @@ struct PropertyDefEx : public PropertyDef
 };
 
 static cppu::IPropertyArrayHelper * createPropertyArrayHelper(
-    PropertyDef *props, int count , sal_Int16 attr )
+    PropertyDef const *props, int count , sal_Int16 attr )
 {
     Sequence< Property > seq( count );
     for( int i = 0 ; i < count ; i ++ )
@@ -96,7 +96,7 @@ static cppu::IPropertyArrayHelper * createPropertyArrayHelper(
 }
 
 static cppu::IPropertyArrayHelper * createPropertyArrayHelper(
-    PropertyDefEx *props, int count )
+    PropertyDefEx const *props, int count )
 {
     Sequence< Property > seq( count );
     for( int i = 0 ; i < count ; i ++ )
diff --git a/connectivity/source/drivers/postgresql/pq_tools.cxx b/connectivity/source/drivers/postgresql/pq_tools.cxx
index 02e2e58a59e3..eafda8369cfe 100644
--- a/connectivity/source/drivers/postgresql/pq_tools.cxx
+++ b/connectivity/source/drivers/postgresql/pq_tools.cxx
@@ -94,12 +94,12 @@ OUString concatQualified( const OUString & a, const OUString &b)
     return buf.makeStringAndClear();
 }
 
-static inline OString iOUStringToOString( const OUString& str, ConnectionSettings *settings) {
+static inline OString iOUStringToOString( const OUString& str, ConnectionSettings const *settings) {
     OSL_ENSURE(settings, "pgsql-sdbc: OUStringToOString got NULL settings");
     return OUStringToOString( str, ConnectionSettings::encoding );
 }
 
-OString OUStringToOString( const OUString& str, ConnectionSettings *settings) {
+OString OUStringToOString( const OUString& str, ConnectionSettings const *settings) {
     return iOUStringToOString( str, settings );
 }
 
diff --git a/connectivity/source/drivers/postgresql/pq_tools.hxx b/connectivity/source/drivers/postgresql/pq_tools.hxx
index ad642f724f8c..3ae5de20b3f3 100644
--- a/connectivity/source/drivers/postgresql/pq_tools.hxx
+++ b/connectivity/source/drivers/postgresql/pq_tools.hxx
@@ -55,7 +55,7 @@ bool isWhitespace( sal_Unicode c );
 
 OUString concatQualified( const OUString & a, const OUString &b);
 
-OString OUStringToOString( const OUString& str, ConnectionSettings *settings);
+OString OUStringToOString( const OUString& str, ConnectionSettings const *settings);
 
 void bufferQuoteConstant( OUStringBuffer & buf, const OUString & str, ConnectionSettings *settings );
 void bufferQuoteAnyConstant( OUStringBuffer & buf, const css::uno::Any &val, ConnectionSettings *settings );
diff --git a/connectivity/source/inc/dbase/DTable.hxx b/connectivity/source/inc/dbase/DTable.hxx
index 3402c563b6b0..1166b691af1e 100644
--- a/connectivity/source/inc/dbase/DTable.hxx
+++ b/connectivity/source/inc/dbase/DTable.hxx
@@ -185,7 +185,7 @@ namespace connectivity
             virtual void addColumn(const css::uno::Reference< css::beans::XPropertySet>& descriptor) override;
             virtual void dropColumn(sal_Int32 _nPos) override;
 
-            static OUString   getEntry(file::OConnection* _pConnection,const OUString& _sURL );
+            static OUString   getEntry(file::OConnection const * _pConnection,const OUString& _sURL );
             static bool     Drop_Static(const OUString& _sUrl, bool _bHasMemoFields, sdbcx::OCollection* _pIndexes );
 
             virtual void refreshHeader() override;
diff --git a/connectivity/source/inc/dbase/dindexnode.hxx b/connectivity/source/inc/dbase/dindexnode.hxx
index 8b75f5579311..4ff5b05a3aa5 100644
--- a/connectivity/source/inc/dbase/dindexnode.hxx
+++ b/connectivity/source/inc/dbase/dindexnode.hxx
@@ -161,7 +161,7 @@ namespace connectivity
             bool IsFull() const;
 
             sal_uInt32 GetPagePos() const {return nPagePos;}
-            ONDXPagePtr& GetChild(ODbaseIndex* pIndex = nullptr);
+            ONDXPagePtr& GetChild(ODbaseIndex const * pIndex = nullptr);
 
             // Parent does not need to be reloaded
             const ONDXPagePtr& GetParent();
@@ -174,7 +174,7 @@ namespace connectivity
 
             sal_uInt16 Search(const ONDXKey& rSearch);
             sal_uInt16 Search(const ONDXPage* pPage);
-            void   SearchAndReplace(const ONDXKey& rSearch, ONDXKey& rReplace);
+            void   SearchAndReplace(const ONDXKey& rSearch, ONDXKey const & rReplace);
 
         protected:
             ONDXPage(ODbaseIndex& rIndex, sal_uInt32 nPos, ONDXPage* = nullptr);
@@ -259,7 +259,7 @@ namespace connectivity
             void            SetChild(ONDXPagePtr aCh = ONDXPagePtr(), ONDXPage* = nullptr);
 
             void Write(SvStream &rStream, const ONDXPage& rPage) const;
-            void Read(SvStream &rStream, ODbaseIndex&);
+            void Read(SvStream &rStream, ODbaseIndex const &);
         };
 
         inline ONDXKey::ONDXKey(const ONDXKey& rKey)
diff --git a/connectivity/source/inc/file/FPreparedStatement.hxx b/connectivity/source/inc/file/FPreparedStatement.hxx
index 6441202ded24..aef9e8fa2f18 100644
--- a/connectivity/source/inc/file/FPreparedStatement.hxx
+++ b/connectivity/source/inc/file/FPreparedStatement.hxx
@@ -58,10 +58,10 @@ namespace connectivity
             void checkAndResizeParameters(sal_Int32 parameterIndex);
             void setParameter(sal_Int32 parameterIndex, const ORowSetValue& x);
 
-            sal_uInt32 AddParameter(connectivity::OSQLParseNode * pParameter,
+            sal_uInt32 AddParameter(connectivity::OSQLParseNode const * pParameter,
                                 const css::uno::Reference< css::beans::XPropertySet>& _xCol);
             void scanParameter(OSQLParseNode* pParseNode,std::vector< OSQLParseNode*>& _rParaNodes);
-            void describeColumn(OSQLParseNode* _pParameter,OSQLParseNode* _pNode,const OSQLTable& _xTable);
+            void describeColumn(OSQLParseNode const * _pParameter, OSQLParseNode const * _pNode, const OSQLTable& _xTable);
             void describeParameter();
 
             virtual void parseParamterElem(const OUString& _sColumnName,OSQLParseNode* pRow_Value_Constructor_Elem) override;
diff --git a/connectivity/source/inc/file/FResultSet.hxx b/connectivity/source/inc/file/FResultSet.hxx
index c1554100c626..e60ee6f465e6 100644
--- a/connectivity/source/inc/file/FResultSet.hxx
+++ b/connectivity/source/inc/file/FResultSet.hxx
@@ -130,7 +130,7 @@ namespace connectivity
                                 bool bEvaluate = true,
                                 bool bRetrieveData = true);
 
-            OKeyValue* GetOrderbyKeyValue(OValueRefRow& _rRow);
+            OKeyValue* GetOrderbyKeyValue(OValueRefRow const & _rRow);
             bool IsSorted() const { return !m_aOrderbyColumnNumber.empty() && m_aOrderbyColumnNumber[0] >= 0;}
 
             // return true when the select statement is "select count(*) from table"
diff --git a/connectivity/source/inc/file/FStatement.hxx b/connectivity/source/inc/file/FStatement.hxx
index baa9cf74f437..bb4c37926684 100644
--- a/connectivity/source/inc/file/FStatement.hxx
+++ b/connectivity/source/inc/file/FStatement.hxx
@@ -102,8 +102,8 @@ namespace connectivity
             void createColumnMapping();
             // searches the statement for sort criteria
             void anylizeSQL();
-            void setOrderbyColumn( connectivity::OSQLParseNode* pColumnRef,
-                                     connectivity::OSQLParseNode* pAscendingDescending);
+            void setOrderbyColumn( connectivity::OSQLParseNode const * pColumnRef,
+                                   connectivity::OSQLParseNode const * pAscendingDescending);
 
             virtual void initializeResultSet(OResultSet* _pResult);
 
diff --git a/connectivity/source/inc/file/fanalyzer.hxx b/connectivity/source/inc/file/fanalyzer.hxx
index d92b3cf8991a..b5a7af7bafb6 100644
--- a/connectivity/source/inc/file/fanalyzer.hxx
+++ b/connectivity/source/inc/file/fanalyzer.hxx
@@ -55,7 +55,7 @@ namespace connectivity
                 {  }
 
             OConnection* getConnection() const { return m_pConnection; }
-            void bindEvaluationRow(OValueRefRow& _pRow); // Bind an evaluation row to the restriction
+            void bindEvaluationRow(OValueRefRow const & _pRow); // Bind an evaluation row to the restriction
             /** bind the select columns if they contain a function which needs a row value
                 @param  _pRow   the result row
             */
@@ -64,16 +64,16 @@ namespace connectivity
             /** binds the row to parameter for the restrictions
                 @param  _pRow   the parameter row
             */
-            void bindParameterRow(OValueRefRow& _pRow);
+            void bindParameterRow(OValueRefRow const & _pRow);
 
             void setIndexes(const css::uno::Reference< css::container::XNameAccess>& _xIndexes);
 
             void dispose();
-            void start(OSQLParseNode* pSQLParseNode);
+            void start(OSQLParseNode const * pSQLParseNode);
             bool hasRestriction() const;
             bool hasFunctions() const;
             bool evaluateRestriction()   { return m_aInterpreter->start(); }
-            void setSelectionEvaluationResult(OValueRefRow& _pRow,const std::vector<sal_Int32>& _rColumnMapping);
+            void setSelectionEvaluationResult(OValueRefRow const & _pRow,const std::vector<sal_Int32>& _rColumnMapping);
             void setOrigColumns(const css::uno::Reference< css::container::XNameAccess>& rCols);
             static OOperandAttr* createOperandAttr(sal_Int32 _nPos,
                                                     const css::uno::Reference< css::beans::XPropertySet>& _xCol,
diff --git a/connectivity/source/inc/file/fcomp.hxx b/connectivity/source/inc/file/fcomp.hxx
index 153e59d32806..0e8606002e6c 100644
--- a/connectivity/source/inc/file/fcomp.hxx
+++ b/connectivity/source/inc/file/fcomp.hxx
@@ -58,7 +58,7 @@ namespace connectivity
                 {  }
             void dispose();
 
-            void start(connectivity::OSQLParseNode* pSQLParseNode);
+            void start(connectivity::OSQLParseNode const * pSQLParseNode);
             OOperand* execute(connectivity::OSQLParseNode* pPredicateNode);
 
             void Clean();
@@ -69,25 +69,25 @@ namespace connectivity
         protected:
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            void execute_COMPARE(connectivity::OSQLParseNode* pPredicateNode);
+            void execute_COMPARE(connectivity::OSQLParseNode const * pPredicateNode);
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            void execute_LIKE(connectivity::OSQLParseNode* pPredicateNode);
+            void execute_LIKE(connectivity::OSQLParseNode const * pPredicateNode);
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            void execute_BETWEEN(connectivity::OSQLParseNode* pPredicateNode);
+            void execute_BETWEEN(connectivity::OSQLParseNode const * pPredicateNode);
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            void execute_ISNULL(connectivity::OSQLParseNode* pPredicateNode);
+            void execute_ISNULL(connectivity::OSQLParseNode const * pPredicateNode);
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
             OOperand* execute_Operand(connectivity::OSQLParseNode* pPredicateNode);
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            void execute_Fold(OSQLParseNode* pPredicateNode);
+            void execute_Fold(OSQLParseNode const * pPredicateNode);
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            void executeFunction(OSQLParseNode* pPredicateNode);
+            void executeFunction(OSQLParseNode const * pPredicateNode);
         };
 
 
@@ -102,14 +102,14 @@ namespace connectivity
             virtual ~OPredicateInterpreter() override;
 
             bool        evaluate(OCodeList& rCodeList);
-            void        evaluateSelection(OCodeList& rCodeList,ORowSetValueDecoratorRef& _rVal);
+            void        evaluateSelection(OCodeList& rCodeList, ORowSetValueDecoratorRef const & _rVal);
 
             bool start()
             {
                 return evaluate(m_rCompiler->m_aCodeList);
             }
 
-            void startSelection(ORowSetValueDecoratorRef& _rVal)
+            void startSelection(ORowSetValueDecoratorRef const & _rVal)
             {
                 evaluateSelection(m_rCompiler->m_aCodeList,_rVal);
             }
diff --git a/connectivity/source/inc/flat/ETable.hxx b/connectivity/source/inc/flat/ETable.hxx
index fbeff5c3ccd0..674f3d0b8b8b 100644
--- a/connectivity/source/inc/flat/ETable.hxx
+++ b/connectivity/source/inc/flat/ETable.hxx
@@ -59,7 +59,7 @@ namespace connectivity
             void fillColumns(const css::lang::Locale& _aLocale);
             bool readLine(sal_Int32 *pEndPos, sal_Int32 *pStartPos, bool nonEmpty = false);
             void setRowPos(std::vector<TRowPositionInFile>::size_type rowNum, const TRowPositionInFile &rowPos);
-            void impl_fillColumnInfo_nothrow(QuotedTokenizedString& aFirstLine, sal_Int32& nStartPosFirstLine, sal_Int32& nStartPosFirstLine2,
+            void impl_fillColumnInfo_nothrow(QuotedTokenizedString const & aFirstLine, sal_Int32& nStartPosFirstLine, sal_Int32& nStartPosFirstLine2,
                                              sal_Int32& io_nType, sal_Int32& io_nPrecisions, sal_Int32& io_nScales, OUString& o_sTypeName,
                                              const sal_Unicode cDecimalDelimiter, const sal_Unicode cThousandDelimiter, const CharClass& aCharClass);
             OFlatConnection* getFlatConnection()
diff --git a/connectivity/source/inc/odbc/OResultSet.hxx b/connectivity/source/inc/odbc/OResultSet.hxx
index 8b8218b9164d..b6db7ba28b99 100644
--- a/connectivity/source/inc/odbc/OResultSet.hxx
+++ b/connectivity/source/inc/odbc/OResultSet.hxx
@@ -169,7 +169,7 @@ namespace connectivity
             void releaseBuffer();
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            void updateValue(sal_Int32 columnIndex,SQLSMALLINT _nType,void* _pValue);
+            void updateValue(sal_Int32 columnIndex, SQLSMALLINT _nType, void const * _pValue);
             void fillNeededData(SQLRETURN _nRet);
             bool moveImpl(IResultSetHelper::Movement _eCursorPosition, sal_Int32 _nOffset);
             TVoidPtr allocBindColumn(sal_Int32 _nType,sal_Int32 _nColumnIndex);
diff --git a/connectivity/source/inc/odbc/OResultSetMetaData.hxx b/connectivity/source/inc/odbc/OResultSetMetaData.hxx
index 864b1be57058..99fba9562816 100644
--- a/connectivity/source/inc/odbc/OResultSetMetaData.hxx
+++ b/connectivity/source/inc/odbc/OResultSetMetaData.hxx
@@ -74,7 +74,7 @@ namespace connectivity
 
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            static SQLLEN getNumColAttrib(OConnection* _pConnection
+            static SQLLEN getNumColAttrib(OConnection const * _pConnection
                                               ,SQLHANDLE _aStatementHandle
                                               ,const css::uno::Reference< css::uno::XInterface >& _xInterface
                                               ,sal_Int32 _column
@@ -82,7 +82,7 @@ namespace connectivity
 
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            static SQLSMALLINT getColumnODBCType(OConnection* _pConnection
+            static SQLSMALLINT getColumnODBCType(OConnection const * _pConnection
                                               ,SQLHANDLE _aStatementHandle
                                               ,const css::uno::Reference< css::uno::XInterface >& _xInterface
                                               ,sal_Int32 column);
diff --git a/connectivity/source/inc/odbc/OTools.hxx b/connectivity/source/inc/odbc/OTools.hxx
index 8b0f473cf6a4..f55fc0d31039 100644
--- a/connectivity/source/inc/odbc/OTools.hxx
+++ b/connectivity/source/inc/odbc/OTools.hxx
@@ -110,7 +110,7 @@ namespace connectivity
 
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            static void GetInfo(OConnection* _pConnection,
+            static void GetInfo(OConnection const * _pConnection,
                                 SQLHANDLE _aConnectionHandle,
                                 SQLUSMALLINT _nInfo,
                                 OUString &_rValue,
@@ -119,7 +119,7 @@ namespace connectivity
 
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            static void GetInfo(OConnection* _pConnection,
+            static void GetInfo(OConnection const * _pConnection,
                                 SQLHANDLE _aConnectionHandle,
                                 SQLUSMALLINT _nInfo,
                                 sal_Int32 &_rValue,
@@ -127,7 +127,7 @@ namespace connectivity
 
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            static void GetInfo(OConnection* _pConnection,
+            static void GetInfo(OConnection const * _pConnection,
                                 SQLHANDLE _aConnectionHandle,
                                 SQLUSMALLINT _nInfo,
                                 SQLUSMALLINT &_rValue,
@@ -135,7 +135,7 @@ namespace connectivity
 
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            static void GetInfo(OConnection* _pConnection,
+            static void GetInfo(OConnection const * _pConnection,
                                 SQLHANDLE _aConnectionHandle,
                                 SQLUSMALLINT _nInfo,
                                 SQLUINTEGER &_rValue,
@@ -188,7 +188,7 @@ namespace connectivity
 
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            static OUString getStringValue(  OConnection* _pConnection,
+            static OUString getStringValue(  OConnection const * _pConnection,
                                                     SQLHANDLE _aStatementHandle,
                                                     sal_Int32 columnIndex,
                                                     SQLSMALLINT _fSqlType,
@@ -206,7 +206,7 @@ namespace connectivity
                                                                             const css::uno::Reference< css::uno::XInterface >& _xInterface);
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            static void getValue(   OConnection* _pConnection,
+            static void getValue(   OConnection const * _pConnection,
                                     SQLHANDLE _aStatementHandle,
                                     sal_Int32 columnIndex,
                                     SQLSMALLINT _nType,
@@ -217,7 +217,7 @@ namespace connectivity
 
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            static void bindValue(  OConnection* _pConnection,
+            static void bindValue(  OConnection const * _pConnection,
                                     SQLHANDLE _aStatementHandle,
                                     sal_Int32 columnIndex,
                                     SQLSMALLINT _nType,
diff --git a/connectivity/source/parse/sqliterator.cxx b/connectivity/source/parse/sqliterator.cxx
index ba9d7f329759..33c8af13b2a0 100644
--- a/connectivity/source/parse/sqliterator.cxx
+++ b/connectivity/source/parse/sqliterator.cxx
@@ -1235,7 +1235,7 @@ bool OSQLParseTreeIterator::traverseSelectionCriteria(const OSQLParseNode* pSele
 }
 
 
-void OSQLParseTreeIterator::traverseSearchCondition(OSQLParseNode * pSearchCondition)
+void OSQLParseTreeIterator::traverseSearchCondition(OSQLParseNode const * pSearchCondition)
 {
     if (
             SQL_ISRULE(pSearchCondition,boolean_primary) &&
@@ -1501,9 +1501,9 @@ void OSQLParseTreeIterator::traverseParameter(const OSQLParseNode* _pParseNode
 }
 
 void OSQLParseTreeIterator::traverseOnePredicate(
-                                OSQLParseNode * pColumnRef,
+                                OSQLParseNode const * pColumnRef,
                                 OUString& rValue,
-                                OSQLParseNode * pParseNode)
+                                OSQLParseNode const * pParseNode)
 {
     if ( !pParseNode )
         return;
@@ -1594,7 +1594,7 @@ OSQLTable OSQLParseTreeIterator::impl_createTableObject( const OUString& rTableN
     return aReturnTable;
 }
 
-void OSQLParseTreeIterator::appendColumns(::rtl::Reference<OSQLColumns>& _rColumns,const OUString& _rTableAlias,const OSQLTable& _rTable)
+void OSQLParseTreeIterator::appendColumns(::rtl::Reference<OSQLColumns> const & _rColumns,const OUString& _rTableAlias,const OSQLTable& _rTable)
 {
     if (!_rTable.is())
         return;
@@ -1639,7 +1639,7 @@ void OSQLParseTreeIterator::appendColumns(::rtl::Reference<OSQLColumns>& _rColum
     }
 }
 
-void OSQLParseTreeIterator::setSelectColumnName(::rtl::Reference<OSQLColumns>& _rColumns,const OUString & rColumnName,const OUString & rColumnAlias, const OUString & rTableRange, bool bFkt, sal_Int32 _nType, bool bAggFkt)
+void OSQLParseTreeIterator::setSelectColumnName(::rtl::Reference<OSQLColumns> const & _rColumns,const OUString & rColumnName,const OUString & rColumnAlias, const OUString & rTableRange, bool bFkt, sal_Int32 _nType, bool bAggFkt)
 {
     if(rColumnName.toChar() == '*' && rTableRange.isEmpty())
     {   // SELECT * ...
diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx
index db2a94e32178..36274ffbe02d 100644
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@ -1484,7 +1484,7 @@ OSQLParser::~OSQLParser()
     }
 }
 
-void OSQLParseNode::substituteParameterNames(OSQLParseNode* _pNode)
+void OSQLParseNode::substituteParameterNames(OSQLParseNode const * _pNode)
 {
     sal_Int32 nCount = _pNode->count();
     for(sal_Int32 i=0;i < nCount;++i)
@@ -1504,7 +1504,7 @@ void OSQLParseNode::substituteParameterNames(OSQLParseNode* _pNode)
     }
 }
 
-bool OSQLParser::extractDate(OSQLParseNode* pLiteral,double& _rfValue)
+bool OSQLParser::extractDate(OSQLParseNode const * pLiteral,double& _rfValue)
 {
     Reference< XNumberFormatsSupplier > xFormatSup = m_xFormatter->getNumberFormatsSupplier();
     Reference< XNumberFormatTypes > xFormatTypes;
@@ -1651,7 +1651,7 @@ OSQLParseNode& OSQLParseNode::operator=(const OSQLParseNode& rParseNode)
 }
 
 
-bool OSQLParseNode::operator==(OSQLParseNode& rParseNode) const
+bool OSQLParseNode::operator==(OSQLParseNode const & rParseNode) const
 {
     // The members must be equal
     bool bResult = (m_nNodeID  == rParseNode.m_nNodeID) &&
diff --git a/include/connectivity/FValue.hxx b/include/connectivity/FValue.hxx
index 2c3645ea2ae8..d2fbfd47e9ba 100644
--- a/include/connectivity/FValue.hxx
+++ b/include/connectivity/FValue.hxx
@@ -486,7 +486,7 @@ namespace connectivity
     {
         bool m_bBound;
         TSetRefBound(bool _bBound) : m_bBound(_bBound){}
-        void operator()(ORowSetValueDecoratorRef& _rValue) const { _rValue->setBound(m_bBound); }
+        void operator()(ORowSetValueDecoratorRef const & _rValue) const { _rValue->setBound(m_bBound); }
 
     };
 
diff --git a/include/connectivity/sqliterator.hxx b/include/connectivity/sqliterator.hxx
index 4db670eafd49..e70e19129037 100644
--- a/include/connectivity/sqliterator.hxx
+++ b/include/connectivity/sqliterator.hxx
@@ -95,11 +95,11 @@ namespace connectivity
         void                traverseParameter(const OSQLParseNode* _pParseNode,const OSQLParseNode* _pColumnRef,const OUString& _aColumnName, OUString& _aTableRange, const OUString& _rColumnAlias);
         // inserts a table into the map
         void                traverseOneTableName( OSQLTables& _rTables,const OSQLParseNode * pTableName, const OUString & rTableRange );
-        void                traverseSearchCondition(OSQLParseNode * pSearchCondition);
+        void                traverseSearchCondition(OSQLParseNode const * pSearchCondition);
         void                traverseOnePredicate(
-                                                OSQLParseNode * pColumnRef,
+                                                OSQLParseNode const * pColumnRef,
                                                 OUString& aValue,
-                                                OSQLParseNode * pParameter);
+                                                OSQLParseNode const * pParameter);
         void traverseByColumnNames(const OSQLParseNode* pSelectNode, bool _bOrder);
         void                traverseParameters(const OSQLParseNode* pSelectNode);
 
@@ -143,8 +143,8 @@ namespace connectivity
             const OUString & rColumnName );
 
       protected:
-        void setSelectColumnName(::rtl::Reference<OSQLColumns>& _rColumns,const OUString & rColumnName,const OUString & rColumnAlias, const OUString & rTableRange, bool bFkt=false, sal_Int32 _nType = css::sdbc::DataType::VARCHAR, bool bAggFkt=false);
-        void appendColumns(::rtl::Reference<OSQLColumns>& _rColumns,const OUString& _rTableAlias,const OSQLTable& _rTable);
+        void setSelectColumnName(::rtl::Reference<OSQLColumns> const & _rColumns,const OUString & rColumnName,const OUString & rColumnAlias, const OUString & rTableRange, bool bFkt=false, sal_Int32 _nType = css::sdbc::DataType::VARCHAR, bool bAggFkt=false);
+        void appendColumns(::rtl::Reference<OSQLColumns> const & _rColumns,const OUString& _rTableAlias,const OSQLTable& _rTable);
         // Other member variables that should be available in the "set" functions
         // can be defined in the derived class. They can be initialized
         // in its constructor and, after the "traverse" routines have been used,
diff --git a/include/connectivity/sqlnode.hxx b/include/connectivity/sqlnode.hxx
index b7550e530109..20c821957eab 100644
--- a/include/connectivity/sqlnode.hxx
+++ b/include/connectivity/sqlnode.hxx
@@ -252,7 +252,7 @@ namespace connectivity
         OSQLParseNode(const OSQLParseNode& rParseNode);
         OSQLParseNode& operator=(const OSQLParseNode& rParseNode);
 
-        bool operator==(OSQLParseNode& rParseNode) const;
+        bool operator==(OSQLParseNode const & rParseNode) const;
 
         // destructor destructs the tree recursively
         virtual ~OSQLParseNode();
@@ -400,7 +400,7 @@ namespace connectivity
 
         // substitute all occurrences of :var or [name] into the dynamic parameter ?
         // _pNode will be modified if parameters exists
-        static void substituteParameterNames(OSQLParseNode* _pNode);
+        static void substituteParameterNames(OSQLParseNode const * _pNode);
 
         /** return a table range when it exists.
         */
diff --git a/include/connectivity/sqlparse.hxx b/include/connectivity/sqlparse.hxx
index 18bc0a3c0228..eb1f7e075df5 100644
--- a/include/connectivity/sqlparse.hxx
+++ b/include/connectivity/sqlparse.hxx
@@ -160,7 +160,7 @@ namespace connectivity
         // convert a string into double trim it to scale of _nscale and than transform it back to string
         OUString stringToDouble(const OUString& _rValue,sal_Int16 _nScale);
         OSQLParseNode*  buildDate(sal_Int32 _nType,OSQLParseNode*& pLiteral);
-        bool            extractDate(OSQLParseNode* pLiteral,double& _rfValue);
+        bool            extractDate(OSQLParseNode const * pLiteral,double& _rfValue);
         void            killThousandSeparator(OSQLParseNode* pLiteral);
         OSQLParseNode*  convertNode(sal_Int32 nType, OSQLParseNode* pLiteral);
         // makes a string out of a number, pLiteral will be deleted