summaryrefslogtreecommitdiff
path: root/connectivity
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-09-06 10:30:58 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-09-06 14:38:52 +0200
commitc289c25523496f58b81e061cea82757c99e99957 (patch)
treef85f43251ddfce0ea6aa23f46729139c04497b2c /connectivity
parent07e87211c2b2e98fd176fef2018723b50c8dbb1a (diff)
loplugin:simplifyconstruct in canvas..cui
Change-Id: I02eba1df117a9d0df42bcac13c3251cb4fa6da14 Reviewed-on: https://gerrit.libreoffice.org/60074 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'connectivity')
-rw-r--r--connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx2
-rw-r--r--connectivity/source/commontools/TKeys.cxx2
-rw-r--r--connectivity/source/commontools/parameters.cxx1
-rw-r--r--connectivity/source/drivers/dbase/DIndex.cxx2
-rw-r--r--connectivity/source/drivers/dbase/DTable.cxx2
-rw-r--r--connectivity/source/drivers/dbase/dindexnode.cxx1
-rw-r--r--connectivity/source/drivers/evoab2/NColumns.cxx2
-rw-r--r--connectivity/source/drivers/evoab2/NConnection.cxx1
-rw-r--r--connectivity/source/drivers/evoab2/NTables.cxx2
-rw-r--r--connectivity/source/drivers/file/FColumns.cxx2
-rw-r--r--connectivity/source/drivers/file/FDriver.cxx2
-rw-r--r--connectivity/source/drivers/file/FResultSet.cxx4
-rw-r--r--connectivity/source/drivers/file/FStatement.cxx1
-rw-r--r--connectivity/source/drivers/file/FTable.cxx2
-rw-r--r--connectivity/source/drivers/firebird/Connection.cxx1
-rw-r--r--connectivity/source/drivers/firebird/ResultSet.cxx1
-rw-r--r--connectivity/source/drivers/hsqldb/HTables.cxx2
-rw-r--r--connectivity/source/drivers/mork/MColumns.cxx2
-rw-r--r--connectivity/source/drivers/mork/MResultSet.cxx2
-rw-r--r--connectivity/source/drivers/mork/MTables.cxx2
-rw-r--r--connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx1
-rw-r--r--connectivity/source/drivers/mysqlc/mysqlc_resultset.cxx1
-rw-r--r--connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx2
-rw-r--r--connectivity/source/drivers/odbc/OPreparedStatement.cxx2
-rw-r--r--connectivity/source/drivers/odbc/OResultSet.cxx3
-rw-r--r--connectivity/source/drivers/odbc/OStatement.cxx2
-rw-r--r--connectivity/source/sdbcx/VCatalog.cxx4
-rw-r--r--connectivity/source/sdbcx/VGroup.cxx2
-rw-r--r--connectivity/source/sdbcx/VIndex.cxx2
-rw-r--r--connectivity/source/sdbcx/VKey.cxx2
-rw-r--r--connectivity/source/sdbcx/VUser.cxx2
31 files changed, 10 insertions, 49 deletions
diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
index cfc283d7e86f..bef6e6c5584f 100644
--- a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
@@ -55,7 +55,6 @@ ODatabaseMetaDataResultSet::ODatabaseMetaDataResultSet()
:ODatabaseMetaDataResultSet_BASE(m_aMutex)
,::comphelper::OPropertyContainer(ODatabaseMetaDataResultSet_BASE::rBHelper)
,m_aStatement(nullptr)
- ,m_xMetaData(nullptr)
,m_nColPos(0)
,m_bBOF(true)
,m_bEOF(true)
@@ -68,7 +67,6 @@ ODatabaseMetaDataResultSet::ODatabaseMetaDataResultSet( MetaDataResultSetType _e
:ODatabaseMetaDataResultSet_BASE(m_aMutex)
,::comphelper::OPropertyContainer(ODatabaseMetaDataResultSet_BASE::rBHelper)
,m_aStatement(nullptr)
- ,m_xMetaData(nullptr)
,m_nColPos(0)
,m_bBOF(true)
,m_bEOF(true)
diff --git a/connectivity/source/commontools/TKeys.cxx b/connectivity/source/commontools/TKeys.cxx
index 34259d93e334..81479b491d92 100644
--- a/connectivity/source/commontools/TKeys.cxx
+++ b/connectivity/source/commontools/TKeys.cxx
@@ -50,7 +50,7 @@ OKeysHelper::OKeysHelper( OTableHelper* _pTable,
sdbcx::ObjectType OKeysHelper::createObject(const OUString& _rName)
{
- sdbcx::ObjectType xRet = nullptr;
+ sdbcx::ObjectType xRet;
if(!_rName.isEmpty())
{
diff --git a/connectivity/source/commontools/parameters.cxx b/connectivity/source/commontools/parameters.cxx
index 52b07c3ab6f9..e1184f3d69ee 100644
--- a/connectivity/source/commontools/parameters.cxx
+++ b/connectivity/source/commontools/parameters.cxx
@@ -57,7 +57,6 @@ namespace dbtools
:m_rMutex ( _rMutex )
,m_aParameterListeners( _rMutex )
,m_xContext ( _rxContext )
- ,m_pOuterParameters ( nullptr )
,m_nInnerCount ( 0 )
,m_bUpToDate ( false )
{
diff --git a/connectivity/source/drivers/dbase/DIndex.cxx b/connectivity/source/drivers/dbase/DIndex.cxx
index e43223460457..70e9eed51335 100644
--- a/connectivity/source/drivers/dbase/DIndex.cxx
+++ b/connectivity/source/drivers/dbase/DIndex.cxx
@@ -56,7 +56,6 @@ IMPLEMENT_SERVICE_INFO(ODbaseIndex,"com.sun.star.sdbcx.driver.dbase.Index","com.
ODbaseIndex::ODbaseIndex(ODbaseTable* _pTable)
: OIndex(true/*_pTable->getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers()*/)
- , m_pFileStream(nullptr)
, m_nCurNode(NODE_NOTFOUND)
, m_nPageCount(0)
, m_nRootPage(0)
@@ -71,7 +70,6 @@ ODbaseIndex::ODbaseIndex( ODbaseTable* _pTable,
const NDXHeader& _rHeader,
const OUString& _rName)
: OIndex(_rName, OUString(), _rHeader.db_unique, false, false, true)
- , m_pFileStream(nullptr)
, m_aHeader(_rHeader)
, m_nCurNode(NODE_NOTFOUND)
, m_nPageCount(0)
diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx
index 469a773378f2..a21ac9a5ebef 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -431,7 +431,6 @@ void ODbaseTable::fillColumns()
ODbaseTable::ODbaseTable(sdbcx::OCollection* _pTables, ODbaseConnection* _pConnection)
: ODbaseTable_BASE(_pTables,_pConnection)
- , m_pMemoStream(nullptr)
{
// initialize the header
memset(&m_aHeader, 0, sizeof(m_aHeader));
@@ -450,7 +449,6 @@ ODbaseTable::ODbaseTable(sdbcx::OCollection* _pTables, ODbaseConnection* _pConne
Description,
SchemaName,
CatalogName)
- , m_pMemoStream(nullptr)
{
memset(&m_aHeader, 0, sizeof(m_aHeader));
m_eEncoding = getConnection()->getTextEncoding();
diff --git a/connectivity/source/drivers/dbase/dindexnode.cxx b/connectivity/source/drivers/dbase/dindexnode.cxx
index 0db31184a876..e7f71d493988 100644
--- a/connectivity/source/drivers/dbase/dindexnode.cxx
+++ b/connectivity/source/drivers/dbase/dindexnode.cxx
@@ -73,7 +73,6 @@ ONDXPage::ONDXPage(ODbaseIndex& rInd, sal_uInt32 nPos, ONDXPage* pParent)
, nCount(0)
, aParent(pParent)
, rIndex(rInd)
- , ppNodes(nullptr)
{
sal_uInt16 nT = rIndex.getHeader().db_maxkeys;
ppNodes.reset( new ONDXNode[nT] );
diff --git a/connectivity/source/drivers/evoab2/NColumns.cxx b/connectivity/source/drivers/evoab2/NColumns.cxx
index 46c42c69b137..aae512bb2b5d 100644
--- a/connectivity/source/drivers/evoab2/NColumns.cxx
+++ b/connectivity/source/drivers/evoab2/NColumns.cxx
@@ -47,7 +47,7 @@ sdbcx::ObjectType OEvoabColumns::createObject(const OUString& _rName)
sTableName,
_rName);
- sdbcx::ObjectType xRet = nullptr;
+ sdbcx::ObjectType xRet;
if (xResult.is())
{
Reference< XRow > xRow(xResult,UNO_QUERY);
diff --git a/connectivity/source/drivers/evoab2/NConnection.cxx b/connectivity/source/drivers/evoab2/NConnection.cxx
index 4697d572360a..6b12d72fa8b1 100644
--- a/connectivity/source/drivers/evoab2/NConnection.cxx
+++ b/connectivity/source/drivers/evoab2/NConnection.cxx
@@ -41,7 +41,6 @@ using namespace ::com::sun::star::lang;
OEvoabConnection::OEvoabConnection(OEvoabDriver const & _rDriver)
: m_rDriver(_rDriver)
, m_eSDBCAddressType(SDBCAddress::EVO_LOCAL)
- , m_xCatalog(nullptr)
{
}
diff --git a/connectivity/source/drivers/evoab2/NTables.cxx b/connectivity/source/drivers/evoab2/NTables.cxx
index b5b5e3f4fc1e..8acf5507033b 100644
--- a/connectivity/source/drivers/evoab2/NTables.cxx
+++ b/connectivity/source/drivers/evoab2/NTables.cxx
@@ -50,7 +50,7 @@ ObjectType OEvoabTables::createObject(const OUString& aName)
Reference< XResultSet > xResult = m_xMetaData->getTables(Any(),"%",aName,aTypes);
- ObjectType xRet = nullptr;
+ ObjectType xRet;
if(xResult.is())
{
Reference< XRow > xRow(xResult,UNO_QUERY);
diff --git a/connectivity/source/drivers/file/FColumns.cxx b/connectivity/source/drivers/file/FColumns.cxx
index f964e1f7d355..4fe835fc921b 100644
--- a/connectivity/source/drivers/file/FColumns.cxx
+++ b/connectivity/source/drivers/file/FColumns.cxx
@@ -42,7 +42,7 @@ sdbcx::ObjectType OColumns::createObject(const OUString& _rName)
Reference< XResultSet > xResult = m_pTable->getConnection()->getMetaData()->getColumns(Any(),
sSchemaName, sTableName, _rName);
- sdbcx::ObjectType xRet = nullptr;
+ sdbcx::ObjectType xRet;
if(xResult.is())
{
Reference< XRow > xRow(xResult,UNO_QUERY);
diff --git a/connectivity/source/drivers/file/FDriver.cxx b/connectivity/source/drivers/file/FDriver.cxx
index 29a295757373..fd55eb5bb62a 100644
--- a/connectivity/source/drivers/file/FDriver.cxx
+++ b/connectivity/source/drivers/file/FDriver.cxx
@@ -188,7 +188,7 @@ Reference< XTablesSupplier > SAL_CALL OFileDriver::getDataDefinitionByConnection
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(ODriver_BASE::rBHelper.bDisposed);
- Reference< XTablesSupplier > xTab = nullptr;
+ Reference< XTablesSupplier > xTab;
Reference< css::lang::XUnoTunnel> xTunnel(connection,UNO_QUERY);
if(xTunnel.is())
{
diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx
index 7c17c55c1e41..ecf1d34b2ee1 100644
--- a/connectivity/source/drivers/file/FResultSet.cxx
+++ b/connectivity/source/drivers/file/FResultSet.cxx
@@ -75,10 +75,7 @@ IMPLEMENT_SERVICE_INFO(OResultSet,"com.sun.star.sdbcx.drivers.file.ResultSet","c
OResultSet::OResultSet(OStatement_Base* pStmt,OSQLParseTreeIterator& _aSQLIterator) : OResultSet_BASE(m_aMutex)
,::comphelper::OPropertyContainer(OResultSet_BASE::rBHelper)
- ,m_aAssignValues(nullptr)
,m_aSkipDeletedSet(this)
- ,m_pFileSet(nullptr)
- ,m_pSortIndex(nullptr)
,m_pParseTree(pStmt->getParseTree())
,m_pSQLAnalyzer(nullptr)
,m_aSQLIterator(_aSQLIterator)
@@ -87,7 +84,6 @@ OResultSet::OResultSet(OStatement_Base* pStmt,OSQLParseTreeIterator& _aSQLIte
,m_nFetchDirection(FetchDirection::FORWARD)
,m_nResultSetConcurrency(ResultSetConcurrency::UPDATABLE)
,m_xStatement(*pStmt)
- ,m_xMetaData(nullptr)
,m_nRowPos(-1)
,m_nFilePos(0)
,m_nLastVisitedPos(-1)
diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx
index eeed72c50bbe..2457d52be051 100644
--- a/connectivity/source/drivers/file/FStatement.cxx
+++ b/connectivity/source/drivers/file/FStatement.cxx
@@ -58,7 +58,6 @@ OStatement_Base::OStatement_Base(OConnection* _pConnection )
,m_aSQLIterator( _pConnection, _pConnection->createCatalog()->getTables(), m_aParser )
,m_pConnection(_pConnection)
,m_pParseTree(nullptr)
- ,m_pSQLAnalyzer(nullptr)
,m_nMaxFieldSize(0)
,m_nMaxRows(0)
,m_nQueryTimeOut(0)
diff --git a/connectivity/source/drivers/file/FTable.cxx b/connectivity/source/drivers/file/FTable.cxx
index 0c805dbae645..f85a33e5e5f9 100644
--- a/connectivity/source/drivers/file/FTable.cxx
+++ b/connectivity/source/drivers/file/FTable.cxx
@@ -38,7 +38,6 @@ using namespace ::com::sun::star::container;
OFileTable::OFileTable(sdbcx::OCollection* _pTables,OConnection* _pConnection)
: OTable_TYPEDEF(_pTables,_pConnection->getMetaData()->supportsMixedCaseQuotedIdentifiers())
,m_pConnection(_pConnection)
- ,m_pFileStream(nullptr)
,m_nFilePos(0)
,m_nBufferSize(0)
,m_bWriteable(false)
@@ -60,7 +59,6 @@ OFileTable::OFileTable( sdbcx::OCollection* _pTables,OConnection* _pConnection,
SchemaName,
CatalogName)
, m_pConnection(_pConnection)
- , m_pFileStream(nullptr)
, m_nFilePos(0)
, m_nBufferSize(0)
, m_bWriteable(false)
diff --git a/connectivity/source/drivers/firebird/Connection.cxx b/connectivity/source/drivers/firebird/Connection.cxx
index 1c3da2b91647..04c4cb821daa 100644
--- a/connectivity/source/drivers/firebird/Connection.cxx
+++ b/connectivity/source/drivers/firebird/Connection.cxx
@@ -86,7 +86,6 @@ Connection::Connection()
, m_sConnectionURL()
, m_sFirebirdURL()
, m_bIsEmbedded(false)
- , m_xEmbeddedStorage(nullptr)
, m_bIsFile(false)
, m_bIsAutoCommit(false)
, m_bIsReadOnly(false)
diff --git a/connectivity/source/drivers/firebird/ResultSet.cxx b/connectivity/source/drivers/firebird/ResultSet.cxx
index 555741a12171..f08be6983771 100644
--- a/connectivity/source/drivers/firebird/ResultSet.cxx
+++ b/connectivity/source/drivers/firebird/ResultSet.cxx
@@ -69,7 +69,6 @@ OResultSet::OResultSet(Connection* pConnection,
, m_pConnection(pConnection)
, m_rMutex(rMutex)
, m_xStatement(xStatement)
- , m_xMetaData(nullptr)
, m_pSqlda(pSqlda)
, m_statementHandle(aStatementHandle)
, m_bWasNull(false)
diff --git a/connectivity/source/drivers/hsqldb/HTables.cxx b/connectivity/source/drivers/hsqldb/HTables.cxx
index 2f6047e7703f..4f5b266b8201 100644
--- a/connectivity/source/drivers/hsqldb/HTables.cxx
+++ b/connectivity/source/drivers/hsqldb/HTables.cxx
@@ -60,7 +60,7 @@ sdbcx::ObjectType OTables::createObject(const OUString& _rName)
aCatalog <<= sCatalog;
Reference< XResultSet > xResult = m_xMetaData->getTables(aCatalog,sSchema,sTable,sTableTypes);
- sdbcx::ObjectType xRet = nullptr;
+ sdbcx::ObjectType xRet;
if ( xResult.is() )
{
Reference< XRow > xRow(xResult,UNO_QUERY);
diff --git a/connectivity/source/drivers/mork/MColumns.cxx b/connectivity/source/drivers/mork/MColumns.cxx
index b5f791f2bbb4..f1b41deae6f9 100644
--- a/connectivity/source/drivers/mork/MColumns.cxx
+++ b/connectivity/source/drivers/mork/MColumns.cxx
@@ -37,7 +37,7 @@ sdbcx::ObjectType OColumns::createObject(const OUString& _rName)
Reference< XResultSet > xResult = m_pTable->getConnection()->getMetaData()->getColumns(
aCatalog, sSchemaName, sTableName, _rName);
- sdbcx::ObjectType xRet = nullptr;
+ sdbcx::ObjectType xRet;
if(xResult.is())
{
Reference< XRow > xRow(xResult,UNO_QUERY);
diff --git a/connectivity/source/drivers/mork/MResultSet.cxx b/connectivity/source/drivers/mork/MResultSet.cxx
index fcaff0496c7b..d169e8259b0d 100644
--- a/connectivity/source/drivers/mork/MResultSet.cxx
+++ b/connectivity/source/drivers/mork/MResultSet.cxx
@@ -69,7 +69,6 @@ OResultSet::OResultSet(OCommonStatement* pStmt, const std::shared_ptr< connectiv
,OPropertySetHelper(OResultSet_BASE::rBHelper)
,m_pStatement(pStmt)
,m_xStatement(*pStmt)
- ,m_xMetaData(nullptr)
,m_nRowPos(0)
,m_bWasNull(false)
,m_nResultSetType(ResultSetType::SCROLL_INSENSITIVE)
@@ -80,7 +79,6 @@ OResultSet::OResultSet(OCommonStatement* pStmt, const std::shared_ptr< connectiv
,m_CurrentRowCount(0)
,m_nParamIndex(0)
,m_bIsAlwaysFalseQuery(false)
- ,m_pKeySet(nullptr)
,m_bIsReadOnly(TRISTATE_INDET)
{
//m_aQuery.setMaxNrOfReturns(pStmt->getOwnConnection()->getMaxResultRecords());
diff --git a/connectivity/source/drivers/mork/MTables.cxx b/connectivity/source/drivers/mork/MTables.cxx
index 1bc3ad5f3d39..37a8771b0809 100644
--- a/connectivity/source/drivers/mork/MTables.cxx
+++ b/connectivity/source/drivers/mork/MTables.cxx
@@ -37,7 +37,7 @@ sdbcx::ObjectType OTables::createObject(const OUString& _rName)
Reference< XResultSet > xResult = m_xMetaData->getTables(Any(),aSchema,aName,aTypes);
- sdbcx::ObjectType xRet = nullptr;
+ sdbcx::ObjectType xRet;
if(xResult.is())
{
Reference< XRow > xRow(xResult,UNO_QUERY);
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx b/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx
index a194b77b9f46..7348abbed855 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx
@@ -75,7 +75,6 @@ OPreparedResultSet::OPreparedResultSet(OConnection& rConn, OPreparedStatement* p
, OPropertySetHelper(OPreparedResultSet_BASE::rBHelper)
, m_rConnection(rConn)
, m_aStatement(static_cast<OWeakObject*>(pPrepared))
- , m_xMetaData(nullptr)
, m_pStmt(pStmt)
, m_encoding(rConn.getConnectionEncoding())
{
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_resultset.cxx b/connectivity/source/drivers/mysqlc/mysqlc_resultset.cxx
index 9234ad532ea5..cc3b3fff1258 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_resultset.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_resultset.cxx
@@ -101,7 +101,6 @@ OResultSet::OResultSet(OConnection& rConn, OCommonStatement* pStmt, MYSQL_RES* p
, m_aRow(nullptr)
, m_pMysql(rConn.getMysqlConnection())
, m_aStatement(static_cast<OWeakObject*>(pStmt))
- , m_xMetaData(nullptr)
, m_pResult(pResult)
, fieldCount(0)
, m_encoding(_encoding)
diff --git a/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx
index ef6fb720402d..215b75577c25 100644
--- a/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx
@@ -53,8 +53,6 @@ ODatabaseMetaDataResultSet::ODatabaseMetaDataResultSet(OConnection* _pConnection
,m_aStatementHandle(_pConnection->createStatementHandle())
,m_aStatement(nullptr)
- ,m_xMetaData(nullptr)
- ,m_pRowStatusArray(nullptr)
,m_pConnection(_pConnection)
,m_nTextEncoding(_pConnection->getTextEncoding())
,m_nRowPos(-1)
diff --git a/connectivity/source/drivers/odbc/OPreparedStatement.cxx b/connectivity/source/drivers/odbc/OPreparedStatement.cxx
index 9f0da27ae997..94fb54f670a9 100644
--- a/connectivity/source/drivers/odbc/OPreparedStatement.cxx
+++ b/connectivity/source/drivers/odbc/OPreparedStatement.cxx
@@ -240,7 +240,7 @@ Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery( )
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OStatement_BASE::rBHelper.bDisposed);
- Reference< XResultSet > rs = nullptr;
+ Reference< XResultSet > rs;
prepareStatement();
diff --git a/connectivity/source/drivers/odbc/OResultSet.cxx b/connectivity/source/drivers/odbc/OResultSet.cxx
index 1da3a883a457..a35a52182760 100644
--- a/connectivity/source/drivers/odbc/OResultSet.cxx
+++ b/connectivity/source/drivers/odbc/OResultSet.cxx
@@ -88,10 +88,7 @@ OResultSet::OResultSet(SQLHANDLE _pStatementHandle ,OStatement_Base* pStmt) :
,m_aStatementHandle(_pStatementHandle)
,m_aConnectionHandle(pStmt->getConnectionHandle())
,m_pStatement(pStmt)
- ,m_pSkipDeletedSet(nullptr)
,m_xStatement(*pStmt)
- ,m_xMetaData(nullptr)
- ,m_pRowStatusArray( nullptr )
,m_nTextEncoding(pStmt->getOwnConnection()->getTextEncoding())
,m_nRowPos(0)
,m_nUseBookmarks(ODBC_SQL_NOT_DEFINED)
diff --git a/connectivity/source/drivers/odbc/OStatement.cxx b/connectivity/source/drivers/odbc/OStatement.cxx
index 0ebc71e7dbde..eea0d2d147c2 100644
--- a/connectivity/source/drivers/odbc/OStatement.cxx
+++ b/connectivity/source/drivers/odbc/OStatement.cxx
@@ -426,7 +426,7 @@ Reference< XResultSet > SAL_CALL OStatement_Base::executeQuery( const OUString&
checkDisposed(OStatement_BASE::rBHelper.bDisposed);
- Reference< XResultSet > xRS = nullptr;
+ Reference< XResultSet > xRS;
// Execute the statement. If execute returns true, a result
// set exists.
diff --git a/connectivity/source/sdbcx/VCatalog.cxx b/connectivity/source/sdbcx/VCatalog.cxx
index b10fd7882917..85d9ce2b6cd7 100644
--- a/connectivity/source/sdbcx/VCatalog.cxx
+++ b/connectivity/source/sdbcx/VCatalog.cxx
@@ -37,10 +37,6 @@ using namespace ::com::sun::star::lang;
IMPLEMENT_SERVICE_INFO(OCatalog,"com.sun.star.comp.connectivity.OCatalog","com.sun.star.sdbcx.DatabaseDefinition")
OCatalog::OCatalog(const Reference< XConnection> &_xConnection) : OCatalog_BASE(m_aMutex)
- ,m_pTables(nullptr)
- ,m_pViews(nullptr)
- ,m_pGroups(nullptr)
- ,m_pUsers(nullptr)
{
try
{
diff --git a/connectivity/source/sdbcx/VGroup.cxx b/connectivity/source/sdbcx/VGroup.cxx
index 01059f70f023..8ca532323067 100644
--- a/connectivity/source/sdbcx/VGroup.cxx
+++ b/connectivity/source/sdbcx/VGroup.cxx
@@ -39,13 +39,11 @@ IMPLEMENT_SERVICE_INFO(OGroup,"com.sun.star.sdbcx.VGroup","com.sun.star.sdbcx.Gr
OGroup::OGroup(bool _bCase) : OGroup_BASE(m_aMutex)
, ODescriptor(OGroup_BASE::rBHelper,_bCase)
- , m_pUsers(nullptr)
{
}
OGroup::OGroup(const OUString& Name, bool _bCase) : OGroup_BASE(m_aMutex)
,ODescriptor(OGroup_BASE::rBHelper,_bCase)
- ,m_pUsers(nullptr)
{
m_Name = Name;
}
diff --git a/connectivity/source/sdbcx/VIndex.cxx b/connectivity/source/sdbcx/VIndex.cxx
index af272e62758e..85f87ee23ae8 100644
--- a/connectivity/source/sdbcx/VIndex.cxx
+++ b/connectivity/source/sdbcx/VIndex.cxx
@@ -66,7 +66,6 @@ OIndex::OIndex(bool _bCase) : ODescriptor_BASE(m_aMutex)
,m_IsUnique(false)
,m_IsPrimaryKeyIndex(false)
,m_IsClustered(false)
- ,m_pColumns(nullptr)
{
}
@@ -81,7 +80,6 @@ OIndex::OIndex( const OUString& Name,
,m_IsUnique(_isUnique)
,m_IsPrimaryKeyIndex(_isPrimaryKeyIndex)
,m_IsClustered(_isClustered)
- ,m_pColumns(nullptr)
{
m_Name = Name;
}
diff --git a/connectivity/source/sdbcx/VKey.cxx b/connectivity/source/sdbcx/VKey.cxx
index aea6d6adaca3..5e61d46f93dc 100644
--- a/connectivity/source/sdbcx/VKey.cxx
+++ b/connectivity/source/sdbcx/VKey.cxx
@@ -62,7 +62,6 @@ sal_Bool SAL_CALL OKey::supportsService( const OUString& _rServiceName )
OKey::OKey(bool _bCase) : ODescriptor_BASE(m_aMutex)
, ODescriptor(ODescriptor_BASE::rBHelper, _bCase, true)
, m_aProps(new KeyProperties())
- , m_pColumns(nullptr)
{
}
@@ -70,7 +69,6 @@ OKey::OKey(const OUString& Name,const std::shared_ptr<KeyProperties>& _rProps, b
: ODescriptor_BASE(m_aMutex)
,ODescriptor(ODescriptor_BASE::rBHelper, _bCase)
,m_aProps(_rProps)
- ,m_pColumns(nullptr)
{
m_Name = Name;
}
diff --git a/connectivity/source/sdbcx/VUser.cxx b/connectivity/source/sdbcx/VUser.cxx
index ad3f32064191..396c3f65801e 100644
--- a/connectivity/source/sdbcx/VUser.cxx
+++ b/connectivity/source/sdbcx/VUser.cxx
@@ -40,13 +40,11 @@ IMPLEMENT_SERVICE_INFO(OUser,"com.sun.star.sdbcx.VUser","com.sun.star.sdbcx.User
OUser::OUser(bool _bCase) : OUser_BASE(m_aMutex)
, ODescriptor(OUser_BASE::rBHelper,_bCase,true)
- , m_pGroups(nullptr)
{
}
OUser::OUser(const OUString& Name, bool _bCase) : OUser_BASE(m_aMutex)
,ODescriptor(OUser_BASE::rBHelper,_bCase)
- ,m_pGroups(nullptr)
{
m_Name = Name;
}