diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:13:39 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:31:22 +0100 |
| commit | 89c4edc13f203db1641c63e22774262bbe61f36f (patch) | |
| tree | 0aa28439045c19140ff51cd6cf1593d8cf515d89 /dbaccess | |
| parent | b58d56c5109f4cf6cacfc8e9c424b179a65bf1f1 (diff) | |
loplugin:nullptr (automatic rewrite)
Change-Id: I2bba104b1bff30910864e45b5b032533099742ff
Diffstat (limited to 'dbaccess')
220 files changed, 1031 insertions, 1031 deletions
diff --git a/dbaccess/source/core/api/BookmarkSet.hxx b/dbaccess/source/core/api/BookmarkSet.hxx index 1c85aa7bbed2..a4b11c253a4a 100644 --- a/dbaccess/source/core/api/BookmarkSet.hxx +++ b/dbaccess/source/core/api/BookmarkSet.hxx @@ -36,7 +36,7 @@ namespace dbaccess {} virtual ~OBookmarkSet() { - m_xRowLocate = NULL; + m_xRowLocate = nullptr; } virtual void construct(const css::uno::Reference< css::sdbc::XResultSet>& _xDriverSet,const OUString& i_sRowSetFilter) override; diff --git a/dbaccess/source/core/api/CRowSetColumn.cxx b/dbaccess/source/core/api/CRowSetColumn.cxx index 2a8492fa291b..72d435dd8e6b 100644 --- a/dbaccess/source/core/api/CRowSetColumn.cxx +++ b/dbaccess/source/core/api/CRowSetColumn.cxx @@ -42,7 +42,7 @@ ORowSetColumn::ORowSetColumn( const Reference < XResultSetMetaData >& _xMetaData const OUString& _rDescription, const OUString& i_sLabel, const std::function<const ::connectivity::ORowSetValue& (sal_Int32)> &_getValue ) - :ORowSetDataColumn( _xMetaData, _xRow, NULL, _nPos, _rxDBMeta, _rDescription, i_sLabel, _getValue ) + :ORowSetDataColumn( _xMetaData, _xRow, nullptr, _nPos, _rxDBMeta, _rDescription, i_sLabel, _getValue ) { } diff --git a/dbaccess/source/core/api/CRowSetDataColumn.cxx b/dbaccess/source/core/api/CRowSetDataColumn.cxx index ee94dbfa3017..78f2dd72183b 100644 --- a/dbaccess/source/core/api/CRowSetDataColumn.cxx +++ b/dbaccess/source/core/api/CRowSetDataColumn.cxx @@ -222,7 +222,7 @@ sdbcx::ObjectType ORowSetDataColumns::createObject(const OUString& _rName) void SAL_CALL ORowSetDataColumns::disposing() { ORowSetDataColumns_BASE::disposing(); - m_aColumns = NULL; + m_aColumns = nullptr; } void ORowSetDataColumns::assign(const ::rtl::Reference< ::connectivity::OSQLColumns>& _rColumns,const ::std::vector< OUString> &_rVector) diff --git a/dbaccess/source/core/api/CacheSet.cxx b/dbaccess/source/core/api/CacheSet.cxx index 124f2fd75f67..29be97062752 100644 --- a/dbaccess/source/core/api/CacheSet.cxx +++ b/dbaccess/source/core/api/CacheSet.cxx @@ -117,10 +117,10 @@ OCacheSet::~OCacheSet() { try { - m_xDriverSet = NULL; - m_xDriverRow = NULL; - m_xSetMetaData = NULL; - m_xConnection = NULL; + m_xDriverSet = nullptr; + m_xDriverRow = nullptr; + m_xSetMetaData = nullptr; + m_xConnection = nullptr; } catch(Exception&) { diff --git a/dbaccess/source/core/api/FilteredContainer.cxx b/dbaccess/source/core/api/FilteredContainer.cxx index 7740bdd4e4fb..4dad392d6ee4 100644 --- a/dbaccess/source/core/api/FilteredContainer.cxx +++ b/dbaccess/source/core/api/FilteredContainer.cxx @@ -362,7 +362,7 @@ sal_Int32 createWildCardVector(Sequence< OUString >& _rTableFilter, ::std::vecto } reFill( lcl_filter( aUnfilteredTables, - _rTableFilter, aTableTypeFilter, m_xMetaData, NULL ) ); + _rTableFilter, aTableTypeFilter, m_xMetaData, nullptr ) ); disposeComponent( xTables ); } @@ -383,10 +383,10 @@ sal_Int32 createWildCardVector(Sequence< OUString >& _rTableFilter, ::std::vecto if ( m_xMasterContainer.is() ) removeMasterContainerListener(); - m_xMasterContainer = NULL; - m_xMetaData = NULL; - m_pWarningsContainer = NULL; - m_pRefreshListener = NULL; + m_xMasterContainer = nullptr; + m_xMetaData = nullptr; + m_pWarningsContainer = nullptr; + m_pRefreshListener = nullptr; m_bConstructed = false; } diff --git a/dbaccess/source/core/api/HelperCollections.cxx b/dbaccess/source/core/api/HelperCollections.cxx index 78c99cfff0b7..ce1662eebd36 100644 --- a/dbaccess/source/core/api/HelperCollections.cxx +++ b/dbaccess/source/core/api/HelperCollections.cxx @@ -68,7 +68,7 @@ namespace dbaccess void SAL_CALL OPrivateColumns::disposing() { - m_aColumns = NULL; + m_aColumns = nullptr; clear_NoDispose(); // we're not owner of the objects we're holding, instead the object we got in our ctor is // So we're not allowed to dispose our elements. @@ -88,7 +88,7 @@ namespace dbaccess OSL_FAIL("Column not found in collection!"); } - return NULL; + return nullptr; } connectivity::sdbcx::ObjectType OPrivateTables::createObject(const OUString& _rName) @@ -101,7 +101,7 @@ namespace dbaccess (void)aIter; return connectivity::sdbcx::ObjectType(m_aTables.find(_rName)->second,UNO_QUERY); } - return NULL; + return nullptr; } } diff --git a/dbaccess/source/core/api/HelperCollections.hxx b/dbaccess/source/core/api/HelperCollections.hxx index 0a355716e399..482d84c6ec0a 100644 --- a/dbaccess/source/core/api/HelperCollections.hxx +++ b/dbaccess/source/core/api/HelperCollections.hxx @@ -50,7 +50,7 @@ namespace dbaccess virtual void impl_refresh() throw(RuntimeException) override {} virtual Reference< XPropertySet > createDescriptor() override { - return NULL; + return nullptr; } public: OPrivateColumns(const ::rtl::Reference< ::connectivity::OSQLColumns>& _rColumns, @@ -83,7 +83,7 @@ namespace dbaccess virtual void impl_refresh() throw(RuntimeException) override {} virtual Reference< XPropertySet > createDescriptor() override { - return NULL; + return nullptr; } public: OPrivateTables( const OSQLTables& _rTables, diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx index 2cd0f9b92722..5b108c823ce3 100644 --- a/dbaccess/source/core/api/KeySet.cxx +++ b/dbaccess/source/core/api/KeySet.cxx @@ -133,7 +133,7 @@ OKeySet::~OKeySet() tryDispose(i->second); } - m_xComposer = NULL; + m_xComposer = nullptr; } @@ -410,7 +410,7 @@ void OKeySet::executeStatement(OUStringBuffer& io_aFilter, Reference<XSingleSele void OKeySet::invalidateRow() { - m_xRow = NULL; + m_xRow = nullptr; ::comphelper::disposeComponent(m_xSet); } diff --git a/dbaccess/source/core/api/OptimisticSet.cxx b/dbaccess/source/core/api/OptimisticSet.cxx index 73fa377ec7ae..7774fe563b1b 100644 --- a/dbaccess/source/core/api/OptimisticSet.cxx +++ b/dbaccess/source/core/api/OptimisticSet.cxx @@ -89,9 +89,9 @@ OptimisticSet::OptimisticSet(const Reference<XComponentContext>& _rContext, const ORowSetValueVector& _aParameterValueForCache, sal_Int32 i_nMaxRows, sal_Int32& o_nRowCount) - :OKeySet(NULL,NULL,OUString(),_xComposer,_aParameterValueForCache,i_nMaxRows,o_nRowCount) + :OKeySet(nullptr,nullptr,OUString(),_xComposer,_aParameterValueForCache,i_nMaxRows,o_nRowCount) ,m_aSqlParser( _rContext ) - ,m_aSqlIterator( i_xConnection, Reference<XTablesSupplier>(_xComposer,UNO_QUERY)->getTables(), m_aSqlParser, NULL ) + ,m_aSqlIterator( i_xConnection, Reference<XTablesSupplier>(_xComposer,UNO_QUERY)->getTables(), m_aSqlParser, nullptr ) ,m_bResultSetChanged(false) { } diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx index a1688117ed6d..a5503d4342ca 100644 --- a/dbaccess/source/core/api/RowSet.cxx +++ b/dbaccess/source/core/api/RowSet.cxx @@ -133,13 +133,13 @@ namespace dbaccess ORowSet::ORowSet( const Reference< css::uno::XComponentContext >& _rxContext ) :ORowSet_BASE1(m_aMutex) ,ORowSetBase( _rxContext, ORowSet_BASE1::rBHelper, &m_aMutex ) - ,m_pParameters( NULL ) + ,m_pParameters( nullptr ) ,m_aPrematureParamValues(new ORowSetValueVector) ,m_aParameterValueForCache(new ORowSetValueVector) ,m_aRowsetListeners(*m_pMutex) ,m_aApproveListeners(*m_pMutex) ,m_aRowsChangeListener(*m_pMutex) - ,m_pTables(NULL) + ,m_pTables(nullptr) ,m_nFetchDirection(FetchDirection::FORWARD) ,m_nFetchSize(50) ,m_nMaxFieldSize(0) @@ -461,7 +461,7 @@ sal_Int64 SAL_CALL ORowSet::getSomething( const Sequence< sal_Int8 >& rId ) thro Sequence< sal_Int8 > ORowSet::getUnoTunnelImplementationId() { - static ::cppu::OImplementationId * pId = 0; + static ::cppu::OImplementationId * pId = nullptr; if (! pId) { ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); @@ -541,7 +541,7 @@ void SAL_CALL ORowSet::disposing() m_aActiveConnection = Any(); // the any conatains a reference too if(m_bOwnConnection) ::comphelper::disposeComponent(m_xActiveConnection); - m_xActiveConnection = NULL; + m_xActiveConnection = nullptr; ORowSetBase::disposing(); @@ -579,7 +579,7 @@ void ORowSet::freeResources( bool _bComplete ) TDataColumns().swap(m_aDataColumns);// clear and resize capacity ::std::vector<bool>().swap(m_aReadOnlyDataColumns); - m_xColumns = NULL; + m_xColumns = nullptr; if ( m_pColumns ) m_pColumns->disposing(); // dispose the composer to avoid that everbody knows that the querycomposer is eol @@ -587,18 +587,18 @@ void ORowSet::freeResources( bool _bComplete ) catch(Exception&) { DBG_UNHANDLED_EXCEPTION(); - m_xComposer = NULL; + m_xComposer = nullptr; } // let our warnings container forget the reference to the (possibly disposed) old result set - m_aWarnings.setExternalWarnings( NULL ); + m_aWarnings.setExternalWarnings( nullptr ); DELETEZ(m_pCache); impl_resetTables_nothrow(); - m_xStatement = NULL; - m_xTypeMap = NULL; + m_xStatement = nullptr; + m_xTypeMap = nullptr; if ( m_aOldRow.is() ) m_aOldRow->clearRow(); @@ -1566,7 +1566,7 @@ void SAL_CALL ORowSet::execute( ) throw(SQLException, RuntimeException, std::ex setActiveConnection( xXConnection ); } - calcConnection(NULL); + calcConnection(nullptr); m_bRebuildConnOnExecute = false; // do the real execute @@ -1808,18 +1808,18 @@ void ORowSet::execute_NoApprove_NoNewConn(ResettableMutexGuard& _rClearForNotifi { // now we can dispose our old connection ::comphelper::disposeComponent(m_xOldConnection); - m_xOldConnection = NULL; + m_xOldConnection = nullptr; // do we need a new statement if ( m_bCommandFacetsDirty ) { - m_xStatement = NULL; - m_xComposer = NULL; + m_xStatement = nullptr; + m_xComposer = nullptr; Reference< XResultSet > xResultSet( impl_prepareAndExecute_throw() ); // let our warnings container forget the reference to the (possibly disposed) old result set - m_aWarnings.setExternalWarnings( NULL ); + m_aWarnings.setExternalWarnings( nullptr ); // clear all current warnings m_aWarnings.clearWarnings(); // let the warnings container know about the new "external warnings" @@ -1934,7 +1934,7 @@ void ORowSet::execute_NoApprove_NoNewConn(ResettableMutexGuard& _rClearForNotifi // check if column already in the list we need another if ( aAllColumns.find( xColumn ) != aAllColumns.end() ) { - xColumn = NULL; + xColumn = nullptr; bReFetchName = true; sColumnLabel.clear(); } @@ -2022,7 +2022,7 @@ void ORowSet::execute_NoApprove_NoNewConn(ResettableMutexGuard& _rClearForNotifi m_pCache->reset(xResultSet); } // let our warnings container forget the reference to the (possibly disposed) old result set - m_aWarnings.setExternalWarnings( NULL ); + m_aWarnings.setExternalWarnings( nullptr ); // clear all current warnings m_aWarnings.clearWarnings(); // let the warnings container know about the new "external warnings" @@ -2254,7 +2254,7 @@ Reference< XNameAccess > ORowSet::impl_getTables_throw() DBG_UNHANDLED_EXCEPTION(); } - m_pTables = new OTableContainer(*this,m_aMutex,m_xActiveConnection,bCase,NULL,NULL,NULL,m_nInAppend); + m_pTables = new OTableContainer(*this,m_aMutex,m_xActiveConnection,bCase,nullptr,nullptr,nullptr,m_nInAppend); xTables = m_pTables; Sequence< OUString> aTableFilter(1); aTableFilter[0] = "%"; @@ -2289,7 +2289,7 @@ bool ORowSet::impl_initComposer_throw( OUString& _out_rCommandToExecute ) return bUseEscapeProcessing; if (m_bCommandFacetsDirty) - m_xComposer = NULL; + m_xComposer = nullptr; Reference< XMultiServiceFactory > xFactory( m_xActiveConnection, UNO_QUERY ); if ( !m_xComposer.is() && xFactory.is() ) @@ -2298,7 +2298,7 @@ bool ORowSet::impl_initComposer_throw( OUString& _out_rCommandToExecute ) { m_xComposer.set( xFactory->createInstance( SERVICE_NAME_SINGLESELECTQUERYCOMPOSER ), UNO_QUERY_THROW ); } - catch (const Exception& ) { m_xComposer = NULL; } + catch (const Exception& ) { m_xComposer = nullptr; } } if ( !m_xComposer.is() ) m_xComposer = new OSingleSelectQueryComposer( impl_getTables_throw(), m_xActiveConnection, m_aContext ); @@ -2455,7 +2455,7 @@ void ORowSet::impl_disposeParametersContainer_nothrow() } m_pParameters->dispose(); - m_pParameters = NULL; + m_pParameters = nullptr; } ORowSetValue& ORowSet::getParameterStorage(sal_Int32 parameterIndex) @@ -2900,7 +2900,7 @@ void ORowSetClone::disposing() MutexGuard aGuard( m_aMutex ); ORowSetBase::disposing(); - m_pParent = NULL; + m_pParent = nullptr; m_pMutex = &m_aMutex; // this must be done here because someone could hold a ref to us and try to do something OSubComponent::disposing(); } @@ -2933,7 +2933,7 @@ void ORowSetClone::close() throw( SQLException, RuntimeException, std::exception Sequence< sal_Int8 > ORowSetClone::getUnoTunnelImplementationId() { - static ::cppu::OImplementationId * pId = 0; + static ::cppu::OImplementationId * pId = nullptr; if (! pId) { ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); diff --git a/dbaccess/source/core/api/RowSetBase.cxx b/dbaccess/source/core/api/RowSetBase.cxx index 1defea797566..7b9d5284f2cf 100644 --- a/dbaccess/source/core/api/RowSetBase.cxx +++ b/dbaccess/source/core/api/RowSetBase.cxx @@ -77,11 +77,11 @@ connectivity::sdbcx::ObjectType OEmptyCollection::createObject(const OUString& / ORowSetBase::ORowSetBase( const Reference<XComponentContext>& _rContext, ::cppu::OBroadcastHelper& _rBHelper, ::osl::Mutex* _pMutex ) :OPropertyStateContainer(_rBHelper) ,m_pMutex(_pMutex) - ,m_pMySelf(NULL) - ,m_pCache(NULL) - ,m_pColumns(NULL) + ,m_pMySelf(nullptr) + ,m_pCache(nullptr) + ,m_pColumns(nullptr) ,m_rBHelper(_rBHelper) - ,m_pEmptyCollection( NULL ) + ,m_pEmptyCollection( nullptr ) ,m_aContext( _rContext ) ,m_aErrors( _rContext ) ,m_nLastColumnIndex(-1) @@ -110,7 +110,7 @@ ORowSetBase::~ORowSetBase() m_pColumns->acquire(); m_pColumns->disposing(); delete m_pColumns; - m_pColumns = NULL; + m_pColumns = nullptr; } delete m_pEmptyCollection; @@ -166,7 +166,7 @@ void SAL_CALL ORowSetBase::disposing() m_pCache->deregisterOldRow(m_aOldRow); m_pCache->deleteIterator(this); } - m_pCache = NULL; + m_pCache = nullptr; } // comphelper::OPropertyArrayUsageHelper @@ -338,7 +338,7 @@ Reference< css::io::XInputStream > SAL_CALL ORowSetBase::getBinaryStream( sal_In if ( impl_rowDeleted() ) { - return NULL; + return nullptr; } bool bValidCurrentRow = ( !m_aCurrentRow.isNull() && m_aCurrentRow != m_pCache->getEnd() && m_aCurrentRow->is() ); @@ -375,7 +375,7 @@ Any SAL_CALL ORowSetBase::getObject( sal_Int32 columnIndex, const Reference< XNa Reference< XRef > SAL_CALL ORowSetBase::getRef( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getRef", *m_pMySelf ); - return NULL; + return nullptr; } Reference< XBlob > SAL_CALL ORowSetBase::getBlob( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) @@ -391,7 +391,7 @@ Reference< XClob > SAL_CALL ORowSetBase::getClob( sal_Int32 columnIndex ) throw( Reference< XArray > SAL_CALL ORowSetBase::getArray( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getArray", *m_pMySelf ); - return NULL; + return nullptr; } // css::sdbcx::XRowLocate @@ -1085,7 +1085,7 @@ void ORowSetBase::checkPositioningAllowed() throw( SQLException, RuntimeExceptio Reference< XInterface > ORowSetBase::getStatement() throw( SQLException, RuntimeException, std::exception ) { - return NULL; + return nullptr; } void SAL_CALL ORowSetBase::refreshRow( ) throw(SQLException, RuntimeException, std::exception) diff --git a/dbaccess/source/core/api/RowSetCache.cxx b/dbaccess/source/core/api/RowSetCache.cxx index 0a713d830ceb..9423345c6fbd 100644 --- a/dbaccess/source/core/api/RowSetCache.cxx +++ b/dbaccess/source/core/api/RowSetCache.cxx @@ -91,9 +91,9 @@ ORowSetCache::ORowSetCache(const Reference< XResultSet >& _xRs, :m_xSet(_xRs) ,m_xMetaData(Reference< XResultSetMetaDataSupplier >(_xRs,UNO_QUERY)->getMetaData()) ,m_aContext( _rContext ) - ,m_pCacheSet(NULL) - ,m_pMatrix(NULL) - ,m_pInsertMatrix(NULL) + ,m_pCacheSet(nullptr) + ,m_pMatrix(nullptr) + ,m_pInsertMatrix(nullptr) ,m_nLastColumnIndex(0) ,m_nFetchSize(0) ,m_nRowCount(0) @@ -191,7 +191,7 @@ ORowSetCache::ORowSetCache(const Reference< XResultSet >& _xRs, { SAL_WARN("dbaccess.core", "ORowSetCache: exception: " << e.Message); } - m_pCacheSet = NULL; + m_pCacheSet = nullptr; m_xCacheSet.clear(); } else @@ -344,8 +344,8 @@ ORowSetCache::ORowSetCache(const Reference< XResultSet >& _xRs, SAL_WARN("dbaccess.core", "ORowSetCache: exception: " << e.Message); // we couldn't create a keyset here so we have to create a static cache if ( m_pCacheSet ) - m_pCacheSet = NULL; - m_xCacheSet = NULL; + m_pCacheSet = nullptr; + m_xCacheSet = nullptr; m_pCacheSet = new OStaticSet(i_nMaxRows); m_xCacheSet = m_pCacheSet; m_pCacheSet->construct(_xRs,i_sRowSetFilter); @@ -362,8 +362,8 @@ ORowSetCache::ORowSetCache(const Reference< XResultSet >& _xRs, ORowSetCache::~ORowSetCache() { - m_pCacheSet = NULL; - m_xCacheSet = NULL; + m_pCacheSet = nullptr; + m_xCacheSet = nullptr; if(m_pMatrix) { m_pMatrix->clear(); @@ -376,8 +376,8 @@ ORowSetCache::~ORowSetCache() delete m_pInsertMatrix; } m_xSet = WeakReference< XResultSet>(); - m_xMetaData = NULL; - m_aUpdateTable = NULL; + m_xMetaData = nullptr; + m_aUpdateTable = nullptr; } @@ -1157,7 +1157,7 @@ sal_Int32 ORowSetCache::getRow( ) bool ORowSetCache::absolute( sal_Int32 row ) { if(!row ) - throw SQLException(DBACORE_RESSTRING(RID_STR_NO_ABS_ZERO),NULL,SQLSTATE_GENERAL,1000,Any() ); + throw SQLException(DBACORE_RESSTRING(RID_STR_NO_ABS_ZERO),nullptr,SQLSTATE_GENERAL,1000,Any() ); if(row < 0) { @@ -1220,7 +1220,7 @@ bool ORowSetCache::relative( sal_Int32 rows ) nNewPosition = m_nRowCount + 1 + rows; else if ( m_bBeforeFirst || ( m_bRowCountFinal && m_bAfterLast ) ) - throw SQLException( DBACORE_RESSTRING( RID_STR_NO_RELATIVE ), NULL, SQLSTATE_GENERAL, 1000, Any() ); + throw SQLException( DBACORE_RESSTRING( RID_STR_NO_RELATIVE ), nullptr, SQLSTATE_GENERAL, 1000, Any() ); if ( nNewPosition ) { bErg = absolute( nNewPosition ); @@ -1269,7 +1269,7 @@ bool ORowSetCache::previous( ) void ORowSetCache::refreshRow( ) { if(isAfterLast()) - throw SQLException(DBACORE_RESSTRING(RID_STR_NO_REFESH_AFTERLAST),NULL,SQLSTATE_GENERAL,1000,Any() ); + throw SQLException(DBACORE_RESSTRING(RID_STR_NO_REFESH_AFTERLAST),nullptr,SQLSTATE_GENERAL,1000,Any() ); OSL_ENSURE(m_aMatrixIter != m_pMatrix->end(),"refreshRow() called for invalid row!"); m_pCacheSet->refreshRow(); m_pCacheSet->fillValueRow(*m_aMatrixIter,m_nPosition); @@ -1293,7 +1293,7 @@ bool ORowSetCache::rowInserted( ) bool ORowSetCache::insertRow(::std::vector< Any >& o_aBookmarks) { if ( !m_bNew || !m_aInsertRow->is() ) - throw SQLException(DBACORE_RESSTRING(RID_STR_NO_MOVETOINSERTROW_CALLED),NULL,SQLSTATE_GENERAL,1000,Any() ); + throw SQLException(DBACORE_RESSTRING(RID_STR_NO_MOVETOINSERTROW_CALLED),nullptr,SQLSTATE_GENERAL,1000,Any() ); m_pCacheSet->insertRow(*m_aInsertRow,m_aUpdateTable); @@ -1349,7 +1349,7 @@ void ORowSetCache::cancelRowModification() void ORowSetCache::updateRow( ORowSetMatrix::iterator& _rUpdateRow,::std::vector< Any >& o_aBookmarks ) { if(isAfterLast() || isBeforeFirst()) - throw SQLException(DBACORE_RESSTRING(RID_STR_NO_UPDATEROW),NULL,SQLSTATE_GENERAL,1000,Any() ); + throw SQLException(DBACORE_RESSTRING(RID_STR_NO_UPDATEROW),nullptr,SQLSTATE_GENERAL,1000,Any() ); Any aBookmark = ((*_rUpdateRow)->get())[0].makeAny(); OSL_ENSURE(aBookmark.hasValue(),"Bookmark must have a value!"); @@ -1358,7 +1358,7 @@ void ORowSetCache::updateRow( ORowSetMatrix::iterator& _rUpdateRow,::std::vector moveToBookmark(aBookmark); m_pCacheSet->updateRow(*_rUpdateRow,*m_aMatrixIter,m_aUpdateTable); // refetch the whole row - (*m_aMatrixIter) = NULL; + (*m_aMatrixIter) = nullptr; if ( moveToBookmark(aBookmark) ) { @@ -1380,7 +1380,7 @@ void ORowSetCache::updateRow( ORowSetMatrix::iterator& _rUpdateRow,::std::vector bool ORowSetCache::deleteRow( ) { if(isAfterLast() || isBeforeFirst()) - throw SQLException(DBACORE_RESSTRING(RID_STR_NO_DELETEROW),NULL,SQLSTATE_GENERAL,1000,Any() ); + throw SQLException(DBACORE_RESSTRING(RID_STR_NO_DELETEROW),nullptr,SQLSTATE_GENERAL,1000,Any() ); m_pCacheSet->deleteRow(*m_aMatrixIter,m_aUpdateTable); if ( !m_pCacheSet->rowDeleted() ) @@ -1389,13 +1389,13 @@ bool ORowSetCache::deleteRow( ) --m_nRowCount; OSL_ENSURE(((m_nPosition - m_nStartPos) - 1) < (sal_Int32)m_pMatrix->size(),"Position is behind end()!"); ORowSetMatrix::iterator aPos = calcPosition(); - (*aPos) = NULL; + (*aPos) = nullptr; ORowSetMatrix::iterator aEnd = m_pMatrix->end(); for(++aPos;aPos != aEnd && aPos->is();++aPos) { *(aPos-1) = *aPos; - (*aPos) = NULL; + (*aPos) = nullptr; } m_aMatrixIter = m_pMatrix->end(); @@ -1409,7 +1409,7 @@ void ORowSetCache::cancelRowUpdates( ) if(!m_nPosition) { OSL_FAIL("cancelRowUpdates:Invalid positions pos == 0"); - ::dbtools::throwFunctionSequenceException(NULL); + ::dbtools::throwFunctionSequenceException(nullptr); } if(m_pCacheSet->absolute(m_nPosition)) @@ -1417,7 +1417,7 @@ void ORowSetCache::cancelRowUpdates( ) else { OSL_FAIL("cancelRowUpdates couldn't position right with absolute"); - ::dbtools::throwFunctionSequenceException(NULL); + ::dbtools::throwFunctionSequenceException(nullptr); } } @@ -1586,7 +1586,7 @@ bool ORowSetCache::checkJoin(const Reference< XConnection>& _xConnection, if(pJoin) { // we are only interested in qualified joins like RIGHT or LEFT OSQLParseNode* pJoinType = pJoin->getChild(1); - OSQLParseNode* pOuterType = NULL; + OSQLParseNode* pOuterType = nullptr; if(SQL_ISRULE(pJoinType,join_type) && pJoinType->count() == 2) pOuterType = pJoinType->getChild(0); else if(SQL_ISRULE(pJoinType,outer_join_type)) @@ -1611,7 +1611,7 @@ bool ORowSetCache::checkJoin(const Reference< XConnection>& _xConnection, OUString sTableRange = OSQLParseNode::getTableRange(pTableRef); if(sTableRange.isEmpty()) - pTableRef->getChild(0)->parseNodeToStr( sTableRange, _xConnection, NULL, false, false ); + pTableRef->getChild(0)->parseNodeToStr( sTableRange, _xConnection, nullptr, false, false ); bOk = sTableRange == _sUpdateTableName; } } diff --git a/dbaccess/source/core/api/RowSetCacheIterator.hxx b/dbaccess/source/core/api/RowSetCacheIterator.hxx index 262e97f27ec2..2f386cdfd4f0 100644 --- a/dbaccess/source/core/api/RowSetCacheIterator.hxx +++ b/dbaccess/source/core/api/RowSetCacheIterator.hxx @@ -52,7 +52,7 @@ namespace dbaccess { } public: - ORowSetCacheIterator() :m_aIter(),m_pCache(NULL),m_pRowSet(NULL){} + ORowSetCacheIterator() :m_aIter(),m_pCache(nullptr),m_pRowSet(nullptr){} ORowSetCacheIterator(const ORowSetCacheIterator& _rRH); ORowSetCacheIterator& operator =(const ORowSetCacheIterator&); diff --git a/dbaccess/source/core/api/RowSetRow.hxx b/dbaccess/source/core/api/RowSetRow.hxx index 5d3d9c13f373..2f23b03f91ad 100644 --- a/dbaccess/source/core/api/RowSetRow.hxx +++ b/dbaccess/source/core/api/RowSetRow.hxx @@ -44,7 +44,7 @@ namespace dbaccess {} inline ORowSetRow getRow() const { return m_aRow; } - inline void clearRow() { m_aRow = NULL; } + inline void clearRow() { m_aRow = nullptr; } inline void setRow(const ORowSetRow& _rRow) { m_aRow = _rRow; } }; diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx index fe064d70a9c3..2846c25b4eca 100644 --- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx +++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx @@ -169,7 +169,7 @@ namespace void resetIterator( OSQLParseTreeIterator& _rIterator, bool _bDispose ) { const OSQLParseNode* pSqlParseNode = _rIterator.getParseTree(); - _rIterator.setParseTree(NULL); + _rIterator.setParseTree(nullptr); delete pSqlParseNode; if ( _bDispose ) _rIterator.dispose(); @@ -222,14 +222,14 @@ OSingleSelectQueryComposer::OSingleSelectQueryComposer(const Reference< XNameAcc :OSubComponent(m_aMutex,_xConnection) ,OPropertyContainer(m_aBHelper) ,m_aSqlParser( _rContext, &m_aParseContext ) - ,m_aSqlIterator( _xConnection, _rxTables, m_aSqlParser, NULL ) - ,m_aAdditiveIterator( _xConnection, _rxTables, m_aSqlParser, NULL ) + ,m_aSqlIterator( _xConnection, _rxTables, m_aSqlParser, nullptr ) + ,m_aAdditiveIterator( _xConnection, _rxTables, m_aSqlParser, nullptr ) ,m_aElementaryParts( (size_t)SQLPartCount ) ,m_xConnection(_xConnection) ,m_xMetaData(_xConnection->getMetaData()) ,m_xConnectionTables( _rxTables ) ,m_aContext( _rContext ) - ,m_pTables(NULL) + ,m_pTables(nullptr) ,m_nBoolCompareMode( BooleanComparisonMode::EQUAL_INTEGER ) ,m_nCommandType(CommandType::COMMAND) { @@ -286,8 +286,8 @@ void SAL_CALL OSingleSelectQueryComposer::disposing() resetIterator( m_aSqlIterator, true ); resetIterator( m_aAdditiveIterator, true ); - m_xConnectionTables = NULL; - m_xConnection = NULL; + m_xConnectionTables = nullptr; + m_xConnection = nullptr; clearCurrentCollections(); } @@ -792,7 +792,7 @@ Reference< XNameAccess > SAL_CALL OSingleSelectQueryComposer::getColumns( ) thr const std::unique_ptr< OSQLParseNode > pStatementTree( m_aSqlParser.parseTree( sError, sSQL ) ); OSL_ENSURE( pStatementTree.get(), "OSingleSelectQueryComposer::getColumns: could not parse the column retrieval statement!" ); if ( pStatementTree.get() ) - if ( !pStatementTree->parseNodeToExecutableStatement( sSQL, m_xConnection, m_aSqlParser, NULL ) ) + if ( !pStatementTree->parseNodeToExecutableStatement( sSQL, m_xConnection, m_aSqlParser, nullptr ) ) break; Reference< XResultSetMetaData > xResultSetMeta; @@ -1363,11 +1363,11 @@ Reference< XIndexAccess > SAL_CALL OSingleSelectQueryComposer::getParameters( ) void OSingleSelectQueryComposer::clearColumns( const EColumnType _eType ) { OPrivateColumns* pColumns = m_aCurrentColumns[ _eType ]; - if ( pColumns != NULL ) + if ( pColumns != nullptr ) { pColumns->disposing(); m_aColumnsCollection.push_back( pColumns ); - m_aCurrentColumns[ _eType ] = NULL; + m_aCurrentColumns[ _eType ] = nullptr; } } @@ -1381,7 +1381,7 @@ void OSingleSelectQueryComposer::clearCurrentCollections() { (*aIter)->disposing(); m_aColumnsCollection.push_back(*aIter); - *aIter = NULL; + *aIter = nullptr; } } @@ -1389,7 +1389,7 @@ void OSingleSelectQueryComposer::clearCurrentCollections() { m_pTables->disposing(); m_aTablesCollection.push_back(m_pTables); - m_pTables = NULL; + m_pTables = nullptr; } } diff --git a/dbaccess/source/core/api/StaticSet.cxx b/dbaccess/source/core/api/StaticSet.cxx index ab55539da3d2..4efd16eba814 100644 --- a/dbaccess/source/core/api/StaticSet.cxx +++ b/dbaccess/source/core/api/StaticSet.cxx @@ -284,7 +284,7 @@ void OStaticSet::reset(const Reference< XResultSet> &_xDriverSet) } m_aSetIter = m_aSet.end(); m_bEnd = false; - m_aSet.push_back(NULL); // this is the beforefirst record + m_aSet.push_back(nullptr); // this is the beforefirst record } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/StaticSet.hxx b/dbaccess/source/core/api/StaticSet.hxx index 864f8661118b..9d76cdda6031 100644 --- a/dbaccess/source/core/api/StaticSet.hxx +++ b/dbaccess/source/core/api/StaticSet.hxx @@ -38,7 +38,7 @@ namespace dbaccess , m_aSetIter(m_aSet.end()) , m_bEnd(false) { - m_aSet.push_back(NULL); // this is the beforefirst record + m_aSet.push_back(nullptr); // this is the beforefirst record } virtual void reset(const css::uno::Reference< css::sdbc::XResultSet>& _xDriverSet) override; diff --git a/dbaccess/source/core/api/TableDeco.cxx b/dbaccess/source/core/api/TableDeco.cxx index d6e491d01afb..4bcf8c99a734 100644 --- a/dbaccess/source/core/api/TableDeco.cxx +++ b/dbaccess/source/core/api/TableDeco.cxx @@ -68,7 +68,7 @@ ODBTableDecorator::ODBTableDecorator( const Reference< XConnection >& _rxConnect ,m_xMetaData( _rxConnection.is() ? _rxConnection->getMetaData() : Reference< XDatabaseMetaData >() ) ,m_xNumberFormats( _rxNumberFormats ) ,m_nPrivileges(-1) - ,m_pColumns(NULL) + ,m_pColumns(nullptr) { ODataSettings::registerPropertiesFor(this); } @@ -90,13 +90,13 @@ void SAL_CALL ODBTableDecorator::disposing() OTableDescriptor_BASE::disposing(); MutexGuard aGuard(m_aMutex); - m_xTable = NULL; - m_xMetaData = NULL; - m_xColumnDefinitions = NULL; - m_xNumberFormats = NULL; + m_xTable = nullptr; + m_xMetaData = nullptr; + m_xColumnDefinitions = nullptr; + m_xNumberFormats = nullptr; if ( m_pColumns ) m_pColumns->disposing(); - m_xColumnMediator = NULL; + m_xColumnMediator = nullptr; } sal_Bool SAL_CALL ODBTableDecorator::convertFastPropertyValue( @@ -479,7 +479,7 @@ sal_Int64 SAL_CALL ODBTableDecorator::getSomething( const Sequence< sal_Int8 >& Sequence< sal_Int8 > ODBTableDecorator::getUnoTunnelImplementationId() { - static ::cppu::OImplementationId * pId = 0; + static ::cppu::OImplementationId * pId = nullptr; if (! pId) { ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); @@ -537,7 +537,7 @@ Reference< XPropertySet > SAL_CALL ODBTableDecorator::createDataDescriptor( ) t m_xConnection, xColsSupp, m_xNumberFormats, - NULL + nullptr ); } @@ -585,7 +585,7 @@ void ODBTableDecorator::refreshColumns() OColumn* ODBTableDecorator::createColumn(const OUString& _rName) const { - OColumn* pReturn = NULL; + OColumn* pReturn = nullptr; Reference<XNameAccess> xNames; if ( m_xTable.is() ) diff --git a/dbaccess/source/core/api/WrappedResultSet.hxx b/dbaccess/source/core/api/WrappedResultSet.hxx index fc9aadc9ed1b..8e458e40cd9e 100644 --- a/dbaccess/source/core/api/WrappedResultSet.hxx +++ b/dbaccess/source/core/api/WrappedResultSet.hxx @@ -39,7 +39,7 @@ namespace dbaccess {} virtual ~WrappedResultSet() { - m_xRowLocate = NULL; + m_xRowLocate = nullptr; } virtual void construct(const css::uno::Reference< css::sdbc::XResultSet>& _xDriverSet,const OUString& i_sRowSetFilter) override; diff --git a/dbaccess/source/core/api/column.cxx b/dbaccess/source/core/api/column.cxx index 7ed40143e6a4..a28361ffe34e 100644 --- a/dbaccess/source/core/api/column.cxx +++ b/dbaccess/source/core/api/column.cxx @@ -153,8 +153,8 @@ OColumns::OColumns(::cppu::OWeakObject& _rParent, bool _bDropColumn, bool _bUseHardRef) : OColumns_BASE(_rParent,_bCaseSensitive,_rMutex,_rVector,_bUseHardRef) - ,m_pMediator(NULL) - ,m_xDrvColumns(NULL) + ,m_pMediator(nullptr) + ,m_xDrvColumns(nullptr) ,m_pColFactoryImpl(_pColFactory) ,m_pRefreshColumns(_pRefresh) ,m_bInitialized(false) @@ -172,7 +172,7 @@ OColumns::OColumns(::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, bool _bDropColumn, bool _bUseHardRef) : OColumns_BASE(_rParent,_bCaseSensitive,_rMutex,_rVector,_bUseHardRef) - ,m_pMediator(NULL) + ,m_pMediator(nullptr) ,m_xDrvColumns(_rxDrvColumns) ,m_pColFactoryImpl(_pColFactory) ,m_pRefreshColumns(_pRefresh) @@ -226,9 +226,9 @@ void OColumns::clearColumns() void SAL_CALL OColumns::disposing() { MutexGuard aGuard(m_rMutex); - m_xDrvColumns = NULL; - m_pMediator = NULL; - m_pColFactoryImpl = NULL; + m_xDrvColumns = nullptr; + m_pMediator = nullptr; + m_pColFactoryImpl = nullptr; OColumns_BASE::disposing(); } diff --git a/dbaccess/source/core/api/datacolumn.cxx b/dbaccess/source/core/api/datacolumn.cxx index b02aed5e017f..d83ea5c46791 100644 --- a/dbaccess/source/core/api/datacolumn.cxx +++ b/dbaccess/source/core/api/datacolumn.cxx @@ -101,8 +101,8 @@ void ODataColumn::disposing() { OResultColumn::disposing(); - m_xRow = NULL; - m_xRowUpdate = NULL; + m_xRow = nullptr; + m_xRowUpdate = nullptr; } // css::sdb::XColumn diff --git a/dbaccess/source/core/api/definitioncolumn.cxx b/dbaccess/source/core/api/definitioncolumn.cxx index 557c845379aa..d6505031ee94 100644 --- a/dbaccess/source/core/api/definitioncolumn.cxx +++ b/dbaccess/source/core/api/definitioncolumn.cxx @@ -222,7 +222,7 @@ Reference< XPropertySet > OQueryColumn::impl_determineOriginalTableColumn( const { OSL_PRECOND( _rxConnection.is(), "OQueryColumn::impl_determineOriginalTableColumn: illegal connection!" ); if ( !_rxConnection.is() ) - return NULL; + return nullptr; Reference< XPropertySet > xOriginalTableColumn; try @@ -234,7 +234,7 @@ Reference< XPropertySet > OQueryColumn::impl_determineOriginalTableColumn( const OSL_VERIFY( getPropertyValue( PROPERTY_SCHEMANAME ) >>= sSchema ); OSL_VERIFY( getPropertyValue( PROPERTY_TABLENAME ) >>= sTable ); if ( sCatalog.isEmpty() && sSchema.isEmpty() && sTable.isEmpty() ) - return NULL; + return nullptr; OUString sComposedTableName = ::dbtools::composeTableName( _rxConnection->getMetaData(), sCatalog, sSchema, sTable, false, ::dbtools::eComplete ); @@ -243,7 +243,7 @@ Reference< XPropertySet > OQueryColumn::impl_determineOriginalTableColumn( const Reference< XTablesSupplier > xSuppTables( _rxConnection, UNO_QUERY_THROW ); Reference< XNameAccess > xTables( xSuppTables->getTables(), UNO_QUERY_THROW ); if ( !xTables->hasByName( sComposedTableName ) ) - return NULL; + return nullptr; Reference< XColumnsSupplier > xSuppCols( xTables->getByName( sComposedTableName ), UNO_QUERY_THROW ); Reference< XNameAccess > xColumns( xSuppCols->getColumns(), UNO_QUERY_THROW ); @@ -251,7 +251,7 @@ Reference< XPropertySet > OQueryColumn::impl_determineOriginalTableColumn( const OUString sColumn; OSL_VERIFY( getPropertyValue( PROPERTY_REALNAME ) >>= sColumn ); if ( !xColumns->hasByName( sColumn ) ) - return NULL; + return nullptr; xOriginalTableColumn.set( xColumns->getByName( sColumn ), UNO_QUERY ); } diff --git a/dbaccess/source/core/api/preparedstatement.cxx b/dbaccess/source/core/api/preparedstatement.cxx index 83dd22fb5eab..bf8ec3472f35 100644 --- a/dbaccess/source/core/api/preparedstatement.cxx +++ b/dbaccess/source/core/api/preparedstatement.cxx @@ -52,7 +52,7 @@ OPreparedStatement::OPreparedStatement(const Reference< XConnection > & _xConn, m_xAggregateAsParameters.set( m_xAggregateAsSet, UNO_QUERY_THROW ); Reference<XDatabaseMetaData> xMeta = _xConn->getMetaData(); - m_pColumns = new OColumns(*this, m_aMutex, xMeta.is() && xMeta->supportsMixedCaseQuotedIdentifiers(),::std::vector< OUString>(), NULL,NULL); + m_pColumns = new OColumns(*this, m_aMutex, xMeta.is() && xMeta->supportsMixedCaseQuotedIdentifiers(),::std::vector< OUString>(), nullptr,nullptr); } OPreparedStatement::~OPreparedStatement() @@ -133,7 +133,7 @@ void OPreparedStatement::disposing() { MutexGuard aGuard(m_aMutex); m_pColumns->disposing(); - m_xAggregateAsParameters = NULL; + m_xAggregateAsParameters = nullptr; } OStatementBase::disposing(); } diff --git a/dbaccess/source/core/api/query.cxx b/dbaccess/source/core/api/query.cxx index 269ac3815ddc..943b0c8556a8 100644 --- a/dbaccess/source/core/api/query.cxx +++ b/dbaccess/source/core/api/query.cxx @@ -70,13 +70,13 @@ namespace dbaccess OQuery::OQuery( const Reference< XPropertySet >& _rxCommandDefinition ,const Reference< XConnection >& _rxConn ,const Reference< XComponentContext >& _xORB) - :OContentHelper(_xORB,NULL,TContentPtr(new OContentHelper_Impl)) + :OContentHelper(_xORB,nullptr,TContentPtr(new OContentHelper_Impl)) ,OQueryDescriptor_Base(m_aMutex,*this) ,ODataSettings(OContentHelper::rBHelper,true) ,m_xCommandDefinition(_rxCommandDefinition) ,m_xConnection(_rxConn) - ,m_pColumnMediator( NULL ) - ,m_pWarnings( NULL ) + ,m_pColumnMediator( nullptr ) + ,m_pWarnings( nullptr ) ,m_bCaseSensitiv(true) ,m_eDoingCurrently(NONE) { @@ -124,7 +124,7 @@ void OQuery::rebuildColumns() try { - m_pColumnMediator = NULL; + m_pColumnMediator = nullptr; Reference<XColumnsSupplier> xColSup(m_xCommandDefinition,UNO_QUERY); Reference< XNameAccess > xColumnDefinitions; @@ -260,7 +260,7 @@ void SAL_CALL OQuery::disposing( const EventObject& _rSource ) throw (RuntimeExc "OQuery::disposing : where did this call come from ?"); m_xCommandDefinition->removePropertyChangeListener(OUString(), this); - m_xCommandDefinition = NULL; + m_xCommandDefinition = nullptr; } // XDataDescriptorFactory @@ -276,11 +276,11 @@ void SAL_CALL OQuery::disposing() if (m_xCommandDefinition.is()) { m_xCommandDefinition->removePropertyChangeListener(OUString(), this); - m_xCommandDefinition = NULL; + m_xCommandDefinition = nullptr; } disposeColumns(); - m_pWarnings = NULL; + m_pWarnings = nullptr; } void OQuery::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue ) throw (Exception, std::exception) @@ -323,7 +323,7 @@ Reference< XPropertySetInfo > SAL_CALL OQuery::getPropertySetInfo( ) throw(Runt OColumn* OQuery::createColumn(const OUString& /*_rName*/) const { - return NULL; + return nullptr; } void SAL_CALL OQuery::rename( const OUString& newName ) throw (SQLException, ElementExistException, RuntimeException, std::exception) diff --git a/dbaccess/source/core/api/querycontainer.cxx b/dbaccess/source/core/api/querycontainer.cxx index 6c9edffb8443..91a74a4d6724 100644 --- a/dbaccess/source/core/api/querycontainer.cxx +++ b/dbaccess/source/core/api/querycontainer.cxx @@ -65,7 +65,7 @@ OQueryContainer::OQueryContainer( , const Reference< XConnection >& _rxConn , const Reference< XComponentContext >& _rxORB, ::dbtools::WarningsContainer* _pWarnings) - :ODefinitionContainer(_rxORB,NULL,TContentPtr(new ODefinitionContainer_Impl)) + :ODefinitionContainer(_rxORB,nullptr,TContentPtr(new ODefinitionContainer_Impl)) ,m_pWarnings( _pWarnings ) ,m_xCommandDefinitions(_rxCommandDefinitions) ,m_xConnection(_rxConn) @@ -131,8 +131,8 @@ void OQueryContainer::disposing() Reference< XContainerApproveBroadcaster > xContainerApprove( m_xCommandDefinitions, UNO_QUERY ); xContainerApprove->removeContainerApproveListener( this ); - m_xCommandDefinitions = NULL; - m_xConnection = NULL; + m_xCommandDefinitions = nullptr; + m_xConnection = nullptr; } // XServiceInfo @@ -165,7 +165,7 @@ void SAL_CALL OQueryContainer::appendByDescriptor( const Reference< XPropertySet try { - notifyByName( aGuard, sNewObjectName, xNewObject, NULL, E_INSERTED, ApproveListeners ); + notifyByName( aGuard, sNewObjectName, xNewObject, nullptr, E_INSERTED, ApproveListeners ); } catch (const WrappedTargetException& e) { @@ -190,7 +190,7 @@ void SAL_CALL OQueryContainer::appendByDescriptor( const Reference< XPropertySet implAppend( sNewObjectName, xNewObject ); try { - notifyByName( aGuard, sNewObjectName, xNewObject, NULL, E_INSERTED, ContainerListemers ); + notifyByName( aGuard, sNewObjectName, xNewObject, nullptr, E_INSERTED, ContainerListemers ); } catch (const WrappedTargetException& e) { @@ -305,12 +305,12 @@ Reference< XVeto > SAL_CALL OQueryContainer::approveInsertElement( const Contain Reference< XVeto > SAL_CALL OQueryContainer::approveReplaceElement( const ContainerEvent& /*Event*/ ) throw (WrappedTargetException, RuntimeException, std::exception) { - return NULL; + return nullptr; } Reference< XVeto > SAL_CALL OQueryContainer::approveRemoveElement( const ContainerEvent& /*Event*/ ) throw (WrappedTargetException, RuntimeException, std::exception) { - return NULL; + return nullptr; } void SAL_CALL OQueryContainer::disposing( const css::lang::EventObject& _rSource ) throw(css::uno::RuntimeException, std::exception) @@ -391,7 +391,7 @@ bool OQueryContainer::checkExistence(const OUString& _rName) } else if ( bRet && aFind == m_aDocumentMap.end() ) { - implAppend(_rName,NULL); + implAppend(_rName,nullptr); } } return bRet; diff --git a/dbaccess/source/core/api/querydescriptor.cxx b/dbaccess/source/core/api/querydescriptor.cxx index ea1cb5d08285..1ceea68758ae 100644 --- a/dbaccess/source/core/api/querydescriptor.cxx +++ b/dbaccess/source/core/api/querydescriptor.cxx @@ -245,7 +245,7 @@ void OQueryDescriptor_Base::columnDropped(const OUString& /*_sName*/) Reference< XPropertySet > OQueryDescriptor_Base::createColumnDescriptor() { OSL_FAIL( "OQueryDescriptor_Base::createColumnDescriptor: called why?" ); - return NULL; + return nullptr; } void OQueryDescriptor_Base::rebuildColumns( ) @@ -264,7 +264,7 @@ void OQueryDescriptor_Base::refreshColumns() OColumn* OQueryDescriptor_Base::createColumn( const OUString& /*_rName*/ ) const { // creating a column/descriptor for a query/descriptor does not make sense at all - return NULL; + return nullptr; } } diff --git a/dbaccess/source/core/api/resultcolumn.cxx b/dbaccess/source/core/api/resultcolumn.cxx index 0894618aee5c..9681ddc7a711 100644 --- a/dbaccess/source/core/api/resultcolumn.cxx +++ b/dbaccess/source/core/api/resultcolumn.cxx @@ -126,7 +126,7 @@ void OResultColumn::disposing() OColumn::disposing(); MutexGuard aGuard(m_aMutex); - m_xMetaData = NULL; + m_xMetaData = nullptr; } // comphelper::OPropertyArrayUsageHelper diff --git a/dbaccess/source/core/api/resultset.cxx b/dbaccess/source/core/api/resultset.cxx index 893d48124504..14b9540f94ac 100644 --- a/dbaccess/source/core/api/resultset.cxx +++ b/dbaccess/source/core/api/resultset.cxx @@ -61,7 +61,7 @@ OResultSet::OResultSet(const css::uno::Reference< css::sdbc::XResultSet >& _xRes ,m_nResultSetConcurrency(0) ,m_bIsBookmarkable(false) { - m_pColumns = new OColumns(*this, m_aMutex, _bCaseSensitive, ::std::vector< OUString>(), NULL,NULL); + m_pColumns = new OColumns(*this, m_aMutex, _bCaseSensitive, ::std::vector< OUString>(), nullptr,nullptr); try { @@ -150,9 +150,9 @@ void OResultSet::disposing() // close the pending result set Reference< XCloseable > (m_xDelegatorResultSet, UNO_QUERY)->close(); - m_xDelegatorResultSet = NULL; - m_xDelegatorRow = NULL; - m_xDelegatorRowUpdate = NULL; + m_xDelegatorResultSet = nullptr; + m_xDelegatorRow = nullptr; + m_xDelegatorRowUpdate = nullptr; m_aStatement.clear(); } diff --git a/dbaccess/source/core/api/statement.cxx b/dbaccess/source/core/api/statement.cxx index dd251b7ae5c1..24f5929d68da 100644 --- a/dbaccess/source/core/api/statement.cxx +++ b/dbaccess/source/core/api/statement.cxx @@ -124,7 +124,7 @@ void OStatementBase::disposeResultSet() Reference< XComponent > xComp(m_aResultSet.get(), UNO_QUERY); if (xComp.is()) xComp->dispose(); - m_aResultSet = NULL; + m_aResultSet = nullptr; } // OComponentHelper @@ -140,7 +140,7 @@ void OStatementBase::disposing() // free the original statement { MutexGuard aCancelGuard(m_aCancelMutex); - m_xAggregateAsCancellable = NULL; + m_xAggregateAsCancellable = nullptr; } if ( m_xAggregateAsSet.is() ) @@ -153,7 +153,7 @@ void OStatementBase::disposing() {// don't care for anymore } } - m_xAggregateAsSet = NULL; + m_xAggregateAsSet = nullptr; // free the parent at last OSubComponent::disposing(); @@ -216,7 +216,7 @@ sal_Bool OStatementBase::convertFastPropertyValue( Any & rConvertedValue, Any & { // get the property name OUString sPropName; - getInfoHelper().fillPropertyMembersByHandle( &sPropName, NULL, nHandle ); + getInfoHelper().fillPropertyMembersByHandle( &sPropName, nullptr, nHandle ); // now set the value Any aCurrentValue = m_xAggregateAsSet->getPropertyValue( sPropName ); @@ -254,7 +254,7 @@ void OStatementBase::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const if ( m_xAggregateAsSet.is() ) { OUString sPropName; - getInfoHelper().fillPropertyMembersByHandle( &sPropName, NULL, nHandle ); + getInfoHelper().fillPropertyMembersByHandle( &sPropName, nullptr, nHandle ); m_xAggregateAsSet->setPropertyValue( sPropName, rValue ); } break; @@ -279,7 +279,7 @@ void OStatementBase::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) cons if ( m_xAggregateAsSet.is() ) { OUString sPropName; - const_cast< OStatementBase* >( this )->getInfoHelper().fillPropertyMembersByHandle( &sPropName, NULL, nHandle ); + const_cast< OStatementBase* >( this )->getInfoHelper().fillPropertyMembersByHandle( &sPropName, nullptr, nHandle ); rValue = m_xAggregateAsSet->getPropertyValue( sPropName ); } break; diff --git a/dbaccess/source/core/api/table.cxx b/dbaccess/source/core/api/table.cxx index b8ea9f12aa78..0f0d60ce148b 100644 --- a/dbaccess/source/core/api/table.cxx +++ b/dbaccess/source/core/api/table.cxx @@ -98,7 +98,7 @@ IMPLEMENT_FORWARD_REFCOUNT(ODBTable,OTable_Base) OColumn* ODBTable::createColumn(const OUString& _rName) const { - OColumn* pReturn = NULL; + OColumn* pReturn = nullptr; Reference<XPropertySet> xProp; if ( m_xDriverColumns.is() && m_xDriverColumns->hasByName(_rName) ) @@ -143,9 +143,9 @@ void SAL_CALL ODBTable::disposing() { OPropertySetHelper::disposing(); OTable_Base::disposing(); - m_xColumnDefinitions = NULL; - m_xDriverColumns = NULL; - m_pColumnMediator = NULL; + m_xColumnDefinitions = nullptr; + m_xDriverColumns = nullptr; + m_pColumnMediator = nullptr; } void ODBTable::getFastPropertyValue(Any& _rValue, sal_Int32 _nHandle) const @@ -321,7 +321,7 @@ sal_Int64 SAL_CALL ODBTable::getSomething( const Sequence< sal_Int8 >& rId ) thr Sequence< sal_Int8 > ODBTable::getUnoTunnelImplementationId() { - static ::cppu::OImplementationId * pId = 0; + static ::cppu::OImplementationId * pId = nullptr; if (! pId) { ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); @@ -342,7 +342,7 @@ Reference< XPropertySet > ODBTable::createColumnDescriptor() sdbcx::OCollection* ODBTable::createColumns(const TStringVector& _rNames) { Reference<XDatabaseMetaData> xMeta = getMetaData(); - OColumns* pCol = new OColumns(*this, m_aMutex, NULL, isCaseSensitive(), _rNames, this,this, + OColumns* pCol = new OColumns(*this, m_aMutex, nullptr, isCaseSensitive(), _rNames, this,this, getAlterService().is() || (xMeta.is() && xMeta->supportsAlterTableWithAddColumn()), getAlterService().is() || (xMeta.is() && xMeta->supportsAlterTableWithDropColumn())); static_cast<OColumnsHelper*>(pCol)->setParent(this); @@ -359,7 +359,7 @@ sdbcx::OCollection* ODBTable::createKeys(const TStringVector& _rNames) sdbcx::OCollection* ODBTable::createIndexes(const TStringVector& _rNames) { - return new OIndexes(this,m_aMutex,_rNames,NULL); + return new OIndexes(this,m_aMutex,_rNames,nullptr); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/tablecontainer.cxx b/dbaccess/source/core/api/tablecontainer.cxx index cf45d53176dc..ae2d93634bf9 100644 --- a/dbaccess/source/core/api/tablecontainer.cxx +++ b/dbaccess/source/core/api/tablecontainer.cxx @@ -105,7 +105,7 @@ OTableContainer::OTableContainer(::cppu::OWeakObject& _rParent, ,oslInterlockedCount& _nInAppend) :OFilteredContainer(_rParent,_rMutex,_xCon,_bCase,_pRefreshListener,_pWarningsContainer,_nInAppend) ,m_xTableDefinitions(_xTableDefinitions) - ,m_pTableMediator( NULL ) + ,m_pTableMediator( nullptr ) ,m_bInDrop(false) { } @@ -245,7 +245,7 @@ Reference< XPropertySet > OTableContainer::createDescriptor() if ( xDataFactory.is() && m_xMetaData.is() ) { xMasterColumnsSup.set( xDataFactory->createDataDescriptor(), UNO_QUERY ); - ODBTableDecorator* pTable = new ODBTableDecorator( m_xConnection, xMasterColumnsSup, ::dbtools::getNumberFormats( m_xConnection ) ,NULL); + ODBTableDecorator* pTable = new ODBTableDecorator( m_xConnection, xMasterColumnsSup, ::dbtools::getNumberFormats( m_xConnection ) ,nullptr); xRet = pTable; pTable->construct(); } @@ -446,8 +446,8 @@ void SAL_CALL OTableContainer::disposing() { OFilteredContainer::disposing(); // say goodbye to our listeners - m_xTableDefinitions = NULL; - m_pTableMediator = NULL; + m_xTableDefinitions = nullptr; + m_pTableMediator = nullptr; } void SAL_CALL OTableContainer::disposing( const css::lang::EventObject& /*Source*/ ) throw (css::uno::RuntimeException, std::exception) diff --git a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx index 539d3d043aa1..2b1913df6fe8 100644 --- a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx +++ b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx @@ -71,7 +71,7 @@ public: virtual void SAL_CALL disposing( const EventObject& /*_rSource*/ ) throw (RuntimeException, std::exception) override { } - void clear() { m_pComponent = NULL; } + void clear() { m_pComponent = nullptr; } }; OComponentDefinition_Impl::OComponentDefinition_Impl() @@ -185,7 +185,7 @@ Sequence< OUString > SAL_CALL OComponentDefinition::getSupportedServiceNames( ) Reference< XInterface > OComponentDefinition::Create( const Reference< XComponentContext >& _rxContext ) { - return *(new OComponentDefinition( _rxContext, NULL, TContentPtr( new OComponentDefinition_Impl ) ) ); + return *(new OComponentDefinition( _rxContext, nullptr, TContentPtr( new OComponentDefinition_Impl ) ) ); } void SAL_CALL OComponentDefinition::disposing() @@ -240,7 +240,7 @@ Reference< XNameAccess> OComponentDefinition::getColumns() throw (RuntimeExcepti for ( ; aIter != aEnd; ++aIter ) aNames.push_back( aIter->first ); - m_xColumns = new OColumns( *this, m_aMutex, true, aNames, this, NULL, true, false, false ); + m_xColumns = new OColumns( *this, m_aMutex, true, aNames, this, nullptr, true, false, false ); m_xColumns->setParent( *this ); } return m_xColumns.get(); diff --git a/dbaccess/source/core/dataaccess/ContentHelper.cxx b/dbaccess/source/core/dataaccess/ContentHelper.cxx index add375f1dc2a..ea3f458dd6ad 100644 --- a/dbaccess/source/core/dataaccess/ContentHelper.cxx +++ b/dbaccess/source/core/dataaccess/ContentHelper.cxx @@ -51,7 +51,7 @@ using namespace ::comphelper; using namespace ::cppu; OContentHelper_Impl::OContentHelper_Impl() - : m_pDataSource(0) + : m_pDataSource(nullptr) { } @@ -81,7 +81,7 @@ void SAL_CALL OContentHelper::disposing() EventObject aEvt(*this); m_aContentListeners.disposeAndClear(aEvt); - m_xParentContainer = NULL; + m_xParentContainer = nullptr; } IMPLEMENT_SERVICE_INFO1(OContentHelper,"com.sun.star.comp.sdb.Content","com.sun.star.ucb.Content"); @@ -514,7 +514,7 @@ void OContentHelper::notifyPropertiesChange( const Sequence< PropertyChangeEvent OInterfaceIteratorHelper aIter( *pPropsContainer ); while ( aIter.hasMoreElements() ) { - PropertyEventSequence* propertyEvents = NULL; + PropertyEventSequence* propertyEvents = nullptr; XPropertiesChangeListener* pListener = static_cast< XPropertiesChangeListener * >( aIter.next() ); PropertiesEventListenerMap::iterator it = aListeners.find( pListener ); @@ -563,7 +563,7 @@ sal_Int64 OContentHelper::getSomething( const Sequence< sal_Int8 > & rId ) throw OContentHelper* OContentHelper::getImplementation( const Reference< XInterface >& _rxComponent ) { - OContentHelper* pContent( NULL ); + OContentHelper* pContent( nullptr ); Reference< XUnoTunnel > xUnoTunnel( _rxComponent, UNO_QUERY ); if ( xUnoTunnel.is() ) diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx b/dbaccess/source/core/dataaccess/ModelImpl.cxx index 3a2da2aa5c77..cd335378e557 100644 --- a/dbaccess/source/core/dataaccess/ModelImpl.cxx +++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx @@ -200,7 +200,7 @@ void DocumentStorageAccess::dispose() m_aExposedStorages.clear(); - m_pModelImplementation = NULL; + m_pModelImplementation = nullptr; } Reference< XStorage > DocumentStorageAccess::impl_openSubStorage_nothrow( const OUString& _rStorageName, sal_Int32 _nDesiredMode ) @@ -395,7 +395,7 @@ void SAL_CALL DocumentStorageAccess::disposing( const css::lang::EventObject& So ODatabaseModelImpl::ODatabaseModelImpl( const Reference< XComponentContext >& _rxContext, ODatabaseContext& _rDBContext ) :m_xModel() ,m_xDataSource() - ,m_pStorageAccess( NULL ) + ,m_pStorageAccess( nullptr ) ,m_aMutex() ,m_aMutexFacade( m_aMutex ) ,m_aContainer(4) @@ -413,7 +413,7 @@ ODatabaseModelImpl::ODatabaseModelImpl( const Reference< XComponentContext >& _r ,m_bSuppressVersionColumns(true) ,m_bModified(false) ,m_bDocumentReadOnly(false) - ,m_pSharedConnectionManager(NULL) + ,m_pSharedConnectionManager(nullptr) ,m_nControllerLockCount(0) { // some kind of default @@ -430,7 +430,7 @@ ODatabaseModelImpl::ODatabaseModelImpl( ) :m_xModel() ,m_xDataSource() - ,m_pStorageAccess( NULL ) + ,m_pStorageAccess( nullptr ) ,m_aMutex() ,m_aMutexFacade( m_aMutex ) ,m_aContainer(4) @@ -449,7 +449,7 @@ ODatabaseModelImpl::ODatabaseModelImpl( ,m_bSuppressVersionColumns(true) ,m_bModified(false) ,m_bDocumentReadOnly(false) - ,m_pSharedConnectionManager(NULL) + ,m_pSharedConnectionManager(nullptr) ,m_nControllerLockCount(0) { impl_construct_nothrow(); @@ -513,7 +513,7 @@ namespace { OUString lcl_getContainerStorageName_throw( ODatabaseModelImpl::ObjectType _eType ) { - const sal_Char* pAsciiName( NULL ); + const sal_Char* pAsciiName( nullptr ); switch ( _eType ) { case ODatabaseModelImpl::E_FORM: pAsciiName = "forms"; break; @@ -619,7 +619,7 @@ void ODatabaseModelImpl::reset() { m_pStorageAccess->dispose(); m_pStorageAccess->release(); - m_pStorageAccess = NULL; + m_pStorageAccess = nullptr; } } @@ -672,8 +672,8 @@ void ODatabaseModelImpl::clearConnections() } } - m_pSharedConnectionManager = NULL; - m_xSharedConnectionManager = NULL; + m_pSharedConnectionManager = nullptr; + m_xSharedConnectionManager = nullptr; } void ODatabaseModelImpl::dispose() @@ -699,13 +699,13 @@ void ODatabaseModelImpl::dispose() for (;aIter != aEnd ; ++aIter) { if ( aIter->get() ) - (*aIter)->m_pDataSource = NULL; + (*aIter)->m_pDataSource = nullptr; } m_aContainer.clear(); clearConnections(); - m_xNumberFormatsSupplier = NULL; + m_xNumberFormatsSupplier = nullptr; try { @@ -716,7 +716,7 @@ void ODatabaseModelImpl::dispose() if ( bCouldStore ) commitRootStorage(); - impl_switchToStorage_throw( NULL ); + impl_switchToStorage_throw( nullptr ); } catch( const Exception& ) { @@ -727,7 +727,7 @@ void ODatabaseModelImpl::dispose() { m_pStorageAccess->dispose(); m_pStorageAccess->release(); - m_pStorageAccess = NULL; + m_pStorageAccess = nullptr; } } @@ -1109,7 +1109,7 @@ void ODatabaseModelImpl::revokeDataSource() const bool ODatabaseModelImpl::adjustMacroMode_AutoReject() { - return m_aMacroMode.adjustMacroMode( NULL ); + return m_aMacroMode.adjustMacroMode( nullptr ); } bool ODatabaseModelImpl::checkMacrosOnLoading() @@ -1193,7 +1193,7 @@ namespace if ( _inout_rListener.is() ) { _inout_rListener->dispose(); - _inout_rListener = NULL; + _inout_rListener = nullptr; } if ( xModify.is() && _bListen ) diff --git a/dbaccess/source/core/dataaccess/ModelImpl.hxx b/dbaccess/source/core/dataaccess/ModelImpl.hxx index 79de473dfaa3..2a02358f3eb0 100644 --- a/dbaccess/source/core/dataaccess/ModelImpl.hxx +++ b/dbaccess/source/core/dataaccess/ModelImpl.hxx @@ -92,7 +92,7 @@ struct AsciiPropertyValue AsciiPropertyValue() :DefaultValue( ) - ,AsciiName( NULL ) + ,AsciiName( nullptr ) ,ValueType( ::cppu::UnoType<void>::get() ) { } @@ -330,7 +330,7 @@ public: css::uno::Reference< css::embed::XStorage > getOrCreateRootStorage(); inline css::uno::Reference< css::embed::XStorage > getRootStorage() const { return m_xDocumentStorage.getTyped(); } - inline void resetRootStorage() { impl_switchToStorage_throw( NULL ); } + inline void resetRootStorage() { impl_switchToStorage_throw( nullptr ); } /** returns the data source. If it doesn't exist it will be created */ diff --git a/dbaccess/source/core/dataaccess/commanddefinition.cxx b/dbaccess/source/core/dataaccess/commanddefinition.cxx index bf0584e23fbc..6fd3dc08118e 100644 --- a/dbaccess/source/core/dataaccess/commanddefinition.cxx +++ b/dbaccess/source/core/dataaccess/commanddefinition.cxx @@ -125,7 +125,7 @@ Sequence< OUString > SAL_CALL OCommandDefinition::getSupportedServiceNames( ) t Reference< XInterface > OCommandDefinition::Create(const Reference< XComponentContext >& _rxContext) { - return *(new OCommandDefinition( _rxContext, NULL, TContentPtr( new OCommandDefinition_Impl ) ) ); + return *(new OCommandDefinition( _rxContext, nullptr, TContentPtr( new OCommandDefinition_Impl ) ) ); } void SAL_CALL OCommandDefinition::rename( const OUString& newName ) throw (SQLException, ElementExistException, RuntimeException, std::exception) diff --git a/dbaccess/source/core/dataaccess/connection.cxx b/dbaccess/source/core/dataaccess/connection.cxx index 706fd5693495..a86507ffa779 100644 --- a/dbaccess/source/core/dataaccess/connection.cxx +++ b/dbaccess/source/core/dataaccess/connection.cxx @@ -271,8 +271,8 @@ OConnection::OConnection(ODatabaseSource& _rDB ,m_aTableTypeFilter(_rDB.m_pImpl->m_aTableTypeFilter) ,m_aContext( _rxORB ) ,m_xMasterConnection(_rxMaster) - ,m_pTables(NULL) - ,m_pViews(NULL) + ,m_pTables(nullptr) + ,m_pViews(nullptr) ,m_aWarnings( Reference< XWarningsSupplier >( _rxMaster, UNO_QUERY ) ) ,m_nInAppend(0) ,m_bSupportsViews(false) @@ -468,7 +468,7 @@ void OConnection::disposing() ::comphelper::disposeComponent(xComp); } m_aStatements.clear(); - m_xMasterTables = NULL; + m_xMasterTables = nullptr; if(m_pTables) m_pTables->dispose(); @@ -494,7 +494,7 @@ void OConnection::disposing() catch(const Exception&) { } - m_xMasterConnection = NULL; + m_xMasterConnection = nullptr; } // XChild diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx b/dbaccess/source/core/dataaccess/databasecontext.cxx index e35263c7311f..91aabfd8d611 100644 --- a/dbaccess/source/core/dataaccess/databasecontext.cxx +++ b/dbaccess/source/core/dataaccess/databasecontext.cxx @@ -194,7 +194,7 @@ ODatabaseContext::~ODatabaseContext() if ( m_pDatabaseDocumentLoader ) m_pDatabaseDocumentLoader->release(); - m_xDBRegistrationAggregate->setDelegator( NULL ); + m_xDBRegistrationAggregate->setDelegator( nullptr ); m_xDBRegistrationAggregate.clear(); m_xDatabaseRegistrations.clear(); } @@ -319,7 +319,7 @@ Reference< XInterface > ODatabaseContext::loadObjectFromURL(const OUString& _rNa { if (!bEmbeddedDataSource) { - ::ucbhelper::Content aContent( _sURL, NULL, comphelper::getProcessComponentContext() ); + ::ucbhelper::Content aContent( _sURL, nullptr, comphelper::getProcessComponentContext() ); if ( !aContent.isDocument() ) throw InteractiveIOException( _sURL, *this, InteractionClassification_ERROR, IOErrorCode_NO_FILE @@ -362,7 +362,7 @@ Reference< XInterface > ODatabaseContext::loadObjectFromURL(const OUString& _rNa ::comphelper::NamedValueCollection aArgs; aArgs.put( "URL", _sURL ); aArgs.put( "MacroExecutionMode", MacroExecMode::USE_CONFIG ); - aArgs.put( "InteractionHandler", task::InteractionHandler::createWithParent(m_aContext, 0) ); + aArgs.put( "InteractionHandler", task::InteractionHandler::createWithParent(m_aContext, nullptr) ); if (bEmbeddedDataSource) { // In this case the host contains the real path, and the path is the embedded stream name. @@ -734,7 +734,7 @@ sal_Int64 SAL_CALL ODatabaseContext::getSomething( const Sequence< sal_Int8 >& r Sequence< sal_Int8 > ODatabaseContext::getUnoTunnelImplementationId() { - static ::cppu::OImplementationId * pId = 0; + static ::cppu::OImplementationId * pId = nullptr; if (! pId) { ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx index e3a76cdc5f54..559505d7e2b4 100644 --- a/dbaccess/source/core/dataaccess/databasedocument.cxx +++ b/dbaccess/source/core/dataaccess/databasedocument.cxx @@ -166,7 +166,7 @@ ODatabaseDocument::ODatabaseDocument(const ::rtl::Reference<ODatabaseModelImpl>& ,m_aCloseListener( getMutex() ) ,m_aStorageListeners( getMutex() ) ,m_pEventContainer( new DocumentEvents( *this, getMutex(), _pImpl->getDocumentEvents() ) ) - ,m_pEventExecutor( NULL ) // initialized below, ref-count-protected + ,m_pEventExecutor( nullptr ) // initialized below, ref-count-protected ,m_aEventNotifier( *this, getMutex() ) ,m_aViewMonitor( m_aEventNotifier ) ,m_eInitState( NotInitialized ) @@ -217,7 +217,7 @@ ODatabaseDocument::~ODatabaseDocument() dispose(); } - delete m_pEventContainer, m_pEventContainer = NULL; + delete m_pEventContainer, m_pEventContainer = nullptr; } Any SAL_CALL ODatabaseDocument::queryInterface( const Type& _rType ) throw (RuntimeException, std::exception) @@ -887,7 +887,7 @@ void SAL_CALL ODatabaseDocument::disconnectController( const Reference< XControl } if ( m_xCurrentController == _xController ) - m_xCurrentController = NULL; + m_xCurrentController = nullptr; bLastControllerGone = m_aControllers.empty(); bIsClosing = m_bClosing; @@ -1063,7 +1063,7 @@ void ODatabaseDocument::impl_storeAs_throw( const OUString& _rURL, const ::comph if ( !bIsInitializationProcess ) { _rGuard.clear(); - m_aEventNotifier.notifyDocumentEvent( _eType == SAVE ? "OnSave" : "OnSaveAs", NULL, makeAny( _rURL ) ); + m_aEventNotifier.notifyDocumentEvent( _eType == SAVE ? "OnSave" : "OnSaveAs", nullptr, makeAny( _rURL ) ); _rGuard.reset(); } @@ -1130,13 +1130,13 @@ void ODatabaseDocument::impl_storeAs_throw( const OUString& _rURL, const ::comph catch( const IOException& ) { if ( !bIsInitializationProcess ) - m_aEventNotifier.notifyDocumentEventAsync( _eType == SAVE ? "OnSaveFailed" : "OnSaveAsFailed", NULL, makeAny( _rURL ) ); + m_aEventNotifier.notifyDocumentEventAsync( _eType == SAVE ? "OnSaveFailed" : "OnSaveAsFailed", nullptr, makeAny( _rURL ) ); throw; } catch( const RuntimeException& ) { if ( !bIsInitializationProcess ) - m_aEventNotifier.notifyDocumentEventAsync( _eType == SAVE ? "OnSaveFailed" : "OnSaveAsFailed", NULL, makeAny( _rURL ) ); + m_aEventNotifier.notifyDocumentEventAsync( _eType == SAVE ? "OnSaveFailed" : "OnSaveAsFailed", nullptr, makeAny( _rURL ) ); throw; } catch( const Exception& ) @@ -1145,14 +1145,14 @@ void ODatabaseDocument::impl_storeAs_throw( const OUString& _rURL, const ::comph // notify the failure if ( !bIsInitializationProcess ) - m_aEventNotifier.notifyDocumentEventAsync( _eType == SAVE ? "OnSaveFailed" : "OnSaveAsFailed", NULL, makeAny( _rURL ) ); + m_aEventNotifier.notifyDocumentEventAsync( _eType == SAVE ? "OnSaveFailed" : "OnSaveAsFailed", nullptr, makeAny( _rURL ) ); impl_throwIOExceptionCausedBySave_throw( aError, _rURL ); } // notify the document event if ( !bIsInitializationProcess ) - m_aEventNotifier.notifyDocumentEventAsync( _eType == SAVE ? "OnSaveDone" : "OnSaveAsDone", NULL, makeAny( _rURL ) ); + m_aEventNotifier.notifyDocumentEventAsync( _eType == SAVE ? "OnSaveDone" : "OnSaveAsDone", nullptr, makeAny( _rURL ) ); // reset our "modified" flag, and clear the guard impl_setModified_nothrow( false, _rGuard ); @@ -1276,7 +1276,7 @@ void SAL_CALL ODatabaseDocument::storeToURL( const OUString& _rURL, const Sequen { aGuard.clear(); - m_aEventNotifier.notifyDocumentEvent( "OnSaveTo", NULL, makeAny( _rURL ) ); + m_aEventNotifier.notifyDocumentEvent( "OnSaveTo", nullptr, makeAny( _rURL ) ); aGuard.reset(); } @@ -1294,7 +1294,7 @@ void SAL_CALL ODatabaseDocument::storeToURL( const OUString& _rURL, const Sequen catch( const Exception& ) { Any aError = ::cppu::getCaughtException(); - m_aEventNotifier.notifyDocumentEventAsync( "OnSaveToFailed", NULL, aError ); + m_aEventNotifier.notifyDocumentEventAsync( "OnSaveToFailed", nullptr, aError ); if ( aError.isExtractableTo( ::cppu::UnoType< IOException >::get() ) || aError.isExtractableTo( ::cppu::UnoType< RuntimeException >::get() ) @@ -1307,7 +1307,7 @@ void SAL_CALL ODatabaseDocument::storeToURL( const OUString& _rURL, const Sequen impl_throwIOExceptionCausedBySave_throw( aError, _rURL ); } - m_aEventNotifier.notifyDocumentEventAsync( "OnSaveToDone", NULL, makeAny( _rURL ) ); + m_aEventNotifier.notifyDocumentEventAsync( "OnSaveToDone", nullptr, makeAny( _rURL ) ); } // XModifyBroadcaster @@ -1431,7 +1431,7 @@ void ODatabaseDocument::clearObjectContainer( WeakReference< XNameAccess >& _rxC Reference< XChild > xChild( _rxContainer.get(),UNO_QUERY ); if ( xChild.is() ) - xChild->setParent( NULL ); + xChild->setParent( nullptr ); _rxContainer.clear(); } @@ -1618,7 +1618,7 @@ void ODatabaseDocument::WriteThroughComponent( const Reference< XOutputStream >& { OSL_ENSURE( xOutputStream.is(), "I really need an output stream!" ); OSL_ENSURE( xComponent.is(), "Need component!" ); - OSL_ENSURE( NULL != pServiceName, "Need component name!" ); + OSL_ENSURE( nullptr != pServiceName, "Need component name!" ); // get component Reference< XWriter > xSaxWriter = xml::sax::Writer::create( m_pImpl->m_aContext ); @@ -1842,7 +1842,7 @@ void ODatabaseDocument::disposing() uno::Reference<uno::XInterface> xUIInterface( m_xUIConfigurationManager ); aKeepAlive.push_back( xUIInterface ); } - m_xUIConfigurationManager = NULL; + m_xUIConfigurationManager = nullptr; clearObjectContainer( m_xForms ); clearObjectContainer( m_xReports ); diff --git a/dbaccess/source/core/dataaccess/definitioncontainer.cxx b/dbaccess/source/core/dataaccess/definitioncontainer.cxx index f6a5f490523f..fc601b4fccf8 100644 --- a/dbaccess/source/core/dataaccess/definitioncontainer.cxx +++ b/dbaccess/source/core/dataaccess/definitioncontainer.cxx @@ -175,9 +175,9 @@ void SAL_CALL ODefinitionContainer::insertByName( const OUString& _rName, const Reference< XContent > xNewElement(aElement,UNO_QUERY); approveNewObject( _rName, xNewElement ); // will throw if necessary - notifyByName( aGuard, _rName, xNewElement, NULL, E_INSERTED, ApproveListeners ); + notifyByName( aGuard, _rName, xNewElement, nullptr, E_INSERTED, ApproveListeners ); implAppend( _rName, xNewElement ); - notifyByName( aGuard, _rName, xNewElement, NULL, E_INSERTED, ContainerListemers ); + notifyByName( aGuard, _rName, xNewElement, nullptr, E_INSERTED, ContainerListemers ); } void SAL_CALL ODefinitionContainer::removeByName( const OUString& _rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) @@ -195,9 +195,9 @@ void SAL_CALL ODefinitionContainer::removeByName( const OUString& _rName ) throw Reference< XContent > xOldElement = implGetByName( _rName, impl_haveAnyListeners_nothrow() ); // do the removal - notifyByName( aGuard, _rName, NULL, xOldElement, E_REMOVED, ApproveListeners ); + notifyByName( aGuard, _rName, nullptr, xOldElement, E_REMOVED, ApproveListeners ); implRemove( _rName ); - notifyByName( aGuard, _rName, NULL, xOldElement, E_REMOVED, ContainerListemers ); + notifyByName( aGuard, _rName, nullptr, xOldElement, E_REMOVED, ContainerListemers ); removeObjectListener( xOldElement ); disposeComponent(xOldElement); diff --git a/dbaccess/source/core/dataaccess/documentcontainer.cxx b/dbaccess/source/core/dataaccess/documentcontainer.cxx index d9cfdece1bb8..ae5a17410883 100644 --- a/dbaccess/source/core/dataaccess/documentcontainer.cxx +++ b/dbaccess/source/core/dataaccess/documentcontainer.cxx @@ -81,7 +81,7 @@ void SAL_CALL LocalNameApproval::approveElement( const OUString& _rName, const R if ( _rName.indexOf( '/' ) != -1 ) throw IllegalArgumentException( m_aErrors.getErrorMessage( ErrorCondition::DB_OBJECT_NAME_WITH_SLASHES ), - NULL, + nullptr, 0 ); } @@ -653,7 +653,7 @@ OUString SAL_CALL ODocumentContainer::composeHierarchicalName( const OUString& i ::rtl::Reference<OContentHelper> ODocumentContainer::getContent(const OUString& _sName) const { - ::rtl::Reference<OContentHelper> pContent = NULL; + ::rtl::Reference<OContentHelper> pContent = nullptr; try { Reference<XUnoTunnel> xUnoTunnel(const_cast<ODocumentContainer*>(this)->implGetByName( _sName, true ), UNO_QUERY ); @@ -733,7 +733,7 @@ void SAL_CALL ODocumentContainer::removeByName( const OUString& _rName ) throw(N // do the removal implRemove(_rName); - notifyByName( aGuard, _rName, NULL, NULL, E_REMOVED, ContainerListemers ); + notifyByName( aGuard, _rName, nullptr, nullptr, E_REMOVED, ContainerListemers ); } void SAL_CALL ODocumentContainer::rename( const OUString& newName ) throw (SQLException, ElementExistException, RuntimeException, std::exception) diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx b/dbaccess/source/core/dataaccess/documentdefinition.cxx index 516858ee1ac6..514755981350 100644 --- a/dbaccess/source/core/dataaccess/documentdefinition.cxx +++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx @@ -191,8 +191,8 @@ namespace dbaccess { if ( m_xBroadCaster.is() ) m_xBroadCaster->removeStateChangeListener(this); - m_xBroadCaster = NULL; - m_pDefinition = NULL; + m_xBroadCaster = nullptr; + m_pDefinition = nullptr; } void SAL_CALL OEmbedObjectHolder::changingState( const lang::EventObject& /*aEvent*/, ::sal_Int32 /*nOldState*/, ::sal_Int32 /*nNewState*/ ) throw (embed::WrongStateException, uno::RuntimeException, std::exception) @@ -216,7 +216,7 @@ namespace dbaccess void SAL_CALL OEmbedObjectHolder::disposing( const lang::EventObject& /*Source*/ ) throw (uno::RuntimeException, std::exception) { - m_xBroadCaster = NULL; + m_xBroadCaster = nullptr; } // OEmbeddedClientHelper @@ -407,12 +407,12 @@ ODocumentDefinition::ODocumentDefinition( const Reference< XInterface >& _rxCont const TContentPtr& _pImpl, bool _bForm ) :OContentHelper(_xORB,_rxContainer,_pImpl) ,OPropertyStateContainer(OContentHelper::rBHelper) - ,m_pInterceptor(NULL) + ,m_pInterceptor(nullptr) ,m_bForm(_bForm) ,m_bOpenInDesign(false) ,m_bInExecute(false) ,m_bRemoveListener(false) - ,m_pClientHelper(NULL) + ,m_pClientHelper(nullptr) { registerProperties(); } @@ -439,7 +439,7 @@ ODocumentDefinition::~ODocumentDefinition() { m_pInterceptor->dispose(); m_pInterceptor->release(); - m_pInterceptor = NULL; + m_pInterceptor = nullptr; } } @@ -457,12 +457,12 @@ void ODocumentDefinition::closeObject() catch(const Exception&) { } - m_xEmbeddedObject = NULL; + m_xEmbeddedObject = nullptr; if ( m_pClientHelper ) { - m_pClientHelper->resetClient(NULL); + m_pClientHelper->resetClient(nullptr); m_pClientHelper->release(); - m_pClientHelper = NULL; + m_pClientHelper = nullptr; } } } @@ -937,7 +937,7 @@ Any ODocumentDefinition::onCommandOpenSomething( const Any& _rOpenArgument, cons xReportEngine->setActiveConnection(m_xLastKnownConnection); if ( bOpenHidden ) return makeAny( xReportEngine->createDocumentModel() ); - return makeAny( xReportEngine->createDocumentAlive( NULL ) ); + return makeAny( xReportEngine->createDocumentAlive( nullptr ) ); } if ( _bActivate && !bOpenHidden ) @@ -1207,7 +1207,7 @@ void ODocumentDefinition::onCommandInsert( const OUString& _sURL, const Referenc catch(const Exception&) { } - m_xEmbeddedObject = NULL; + m_xEmbeddedObject = nullptr; } } @@ -1243,7 +1243,7 @@ bool ODocumentDefinition::save(bool _bApprove) Reference< XInteractionRequest > xRequest(pRequest); // some knittings // two continuations allowed: OK and Cancel - ODocumentSaveContinuation* pDocuSave = NULL; + ODocumentSaveContinuation* pDocuSave = nullptr; if ( m_pImpl->m_aProps.aTitle.isEmpty() ) { @@ -1263,7 +1263,7 @@ bool ODocumentDefinition::save(bool _bApprove) pRequest->addContinuation(pAbort); // create the handler, let it handle the request - Reference< XInteractionHandler2 > xHandler( InteractionHandler::createWithParent(m_aContext, 0) ); + Reference< XInteractionHandler2 > xHandler( InteractionHandler::createWithParent(m_aContext, nullptr) ); xHandler->handle(xRequest); if ( pAbort->wasSelected() ) @@ -1337,7 +1337,7 @@ bool ODocumentDefinition::saveAs() pRequest->addContinuation(pAbort); // create the handler, let it handle the request - Reference< XInteractionHandler2 > xHandler( InteractionHandler::createWithParent(m_aContext, 0) ); + Reference< XInteractionHandler2 > xHandler( InteractionHandler::createWithParent(m_aContext, nullptr) ); xHandler->handle(xRequest); if ( pAbort->wasSelected() ) @@ -1497,7 +1497,7 @@ Sequence< PropertyValue > ODocumentDefinition::fillLoadArgs( const Reference< XC { m_pInterceptor->dispose(); m_pInterceptor->release(); - m_pInterceptor = NULL; + m_pInterceptor = nullptr; } m_pInterceptor = new OInterceptor( this ); @@ -1832,7 +1832,7 @@ Reference< XComponent > ODocumentDefinition::impl_openUI_nolck_throw( bool _bFor { // no XDatabaseDocumentUI -> just execute the respective command m_bOpenInDesign = _bForEditing; - xComponent = Reference<XComponent>(onCommandOpenSomething(Any(), true, NULL), UNO_QUERY); + xComponent = Reference<XComponent>(onCommandOpenSomething(Any(), true, nullptr), UNO_QUERY); OSL_ENSURE( xComponent.is(), "ODocumentDefinition::impl_openUI_nolck_throw: opening the thingie failed." ); return xComponent; } diff --git a/dbaccess/source/core/dataaccess/documentdefinition.hxx b/dbaccess/source/core/dataaccess/documentdefinition.hxx index 213a0a262463..33a8fd973760 100644 --- a/dbaccess/source/core/dataaccess/documentdefinition.hxx +++ b/dbaccess/source/core/dataaccess/documentdefinition.hxx @@ -295,7 +295,7 @@ private: void loadEmbeddedObjectForPreview() { loadEmbeddedObject( - NULL, + nullptr, css::uno::Sequence< sal_Int8 >(), css::uno::Sequence< css::beans::PropertyValue >(), true, diff --git a/dbaccess/source/core/dataaccess/documenteventnotifier.hxx b/dbaccess/source/core/dataaccess/documenteventnotifier.hxx index 4983f423d268..85dbfddf62ef 100644 --- a/dbaccess/source/core/dataaccess/documenteventnotifier.hxx +++ b/dbaccess/source/core/dataaccess/documenteventnotifier.hxx @@ -71,7 +71,7 @@ namespace dbaccess */ void notifyDocumentEvent( const OUString& _EventName, - const css::uno::Reference< css::frame::XController2 >& _rxViewController = NULL, + const css::uno::Reference< css::frame::XController2 >& _rxViewController = nullptr, const css::uno::Any& _Supplement = css::uno::Any() ); @@ -84,7 +84,7 @@ namespace dbaccess */ void notifyDocumentEventAsync( const OUString& _EventName, - const css::uno::Reference< css::frame::XController2 >& _ViewController = NULL, + const css::uno::Reference< css::frame::XController2 >& _ViewController = nullptr, const css::uno::Any& _Supplement = css::uno::Any() ); @@ -97,7 +97,7 @@ namespace dbaccess */ void notifyDocumentEvent( const sal_Char* _pAsciiEventName, - const css::uno::Reference< css::frame::XController2 >& _rxViewController = NULL, + const css::uno::Reference< css::frame::XController2 >& _rxViewController = nullptr, const css::uno::Any& _rSupplement = css::uno::Any() ) { @@ -113,7 +113,7 @@ namespace dbaccess */ void notifyDocumentEventAsync( const sal_Char* _pAsciiEventName, - const css::uno::Reference< css::frame::XController2 >& _rxViewController = NULL, + const css::uno::Reference< css::frame::XController2 >& _rxViewController = nullptr, const css::uno::Any& _rSupplement = css::uno::Any() ) { diff --git a/dbaccess/source/core/dataaccess/documentevents.cxx b/dbaccess/source/core/dataaccess/documentevents.cxx index dc14fc2d2918..5b77496bd043 100644 --- a/dbaccess/source/core/dataaccess/documentevents.cxx +++ b/dbaccess/source/core/dataaccess/documentevents.cxx @@ -99,7 +99,7 @@ namespace dbaccess { "OnTitleChanged", false }, { "OnSubComponentOpened", false }, { "OnSubComponentClosed", false }, - { NULL, false } + { nullptr, false } }; return s_aData; } diff --git a/dbaccess/source/core/dataaccess/intercept.cxx b/dbaccess/source/core/dataaccess/intercept.cxx index 45133916f836..09f7ab59fdcd 100644 --- a/dbaccess/source/core/dataaccess/intercept.cxx +++ b/dbaccess/source/core/dataaccess/intercept.cxx @@ -71,7 +71,7 @@ void SAL_CALL OInterceptor::dispose() m_xSlaveDispatchProvider.clear(); m_xMasterDispatchProvider.clear(); - m_pContentHolder = NULL; + m_pContentHolder = nullptr; } @@ -79,8 +79,8 @@ void SAL_CALL OInterceptor::dispose() OInterceptor::OInterceptor( ODocumentDefinition* _pContentHolder ) :m_pContentHolder( _pContentHolder ) ,m_aInterceptedURL(7) - ,m_pDisposeEventListeners(0) - ,m_pStatCL(0) + ,m_pDisposeEventListeners(nullptr) + ,m_pStatCL(nullptr) { OSL_ENSURE(DISPATCH_RELOAD < m_aInterceptedURL.getLength(),"Illegal size."); @@ -240,7 +240,7 @@ void SAL_CALL OInterceptor::addStatusListener( FeatureStateEvent aStateEvent; aStateEvent.FeatureURL.Complete = m_aInterceptedURL[DISPATCH_SAVE]; aStateEvent.FeatureDescriptor = "Update"; - aStateEvent.IsEnabled = m_pContentHolder != NULL && m_pContentHolder->isModified(); + aStateEvent.IsEnabled = m_pContentHolder != nullptr && m_pContentHolder->isModified(); aStateEvent.Requery = sal_False; Control->statusChanged(aStateEvent); diff --git a/dbaccess/source/core/misc/PropertyForward.cxx b/dbaccess/source/core/misc/PropertyForward.cxx index 6d43cd7ea41b..94585ee04a6f 100644 --- a/dbaccess/source/core/misc/PropertyForward.cxx +++ b/dbaccess/source/core/misc/PropertyForward.cxx @@ -120,10 +120,10 @@ namespace dbaccess throw DisposedException( OUString(), *this ); m_xSource->removePropertyChangeListener( OUString(), this ); - m_xSource = NULL; - m_xDestContainer = NULL; - m_xDestInfo = NULL; - m_xDest = NULL; + m_xSource = nullptr; + m_xDestContainer = nullptr; + m_xDestInfo = nullptr; + m_xDest = nullptr; } void OPropertyForward::setDefinition( const css::uno::Reference< css::beans::XPropertySet>& _xDest ) diff --git a/dbaccess/source/core/misc/apitools.cxx b/dbaccess/source/core/misc/apitools.cxx index 0e9d9f9dc3b5..f460adc9fbea 100644 --- a/dbaccess/source/core/misc/apitools.cxx +++ b/dbaccess/source/core/misc/apitools.cxx @@ -40,7 +40,7 @@ OSubComponent::OSubComponent(Mutex& _rMutex, const Reference< XInterface > & xPa OSubComponent::~OSubComponent() { - m_xParent = NULL; + m_xParent = nullptr; } @@ -79,7 +79,7 @@ void OSubComponent::release() throw ( ) { MutexGuard aGuard( rBHelper.rMutex ); xParent = m_xParent; - m_xParent = NULL; + m_xParent = nullptr; } OSL_ENSURE( m_refCount == 1, "OSubComponent::release: invalid ref count (before dispose)!" ); diff --git a/dbaccess/source/core/misc/services.cxx b/dbaccess/source/core/misc/services.cxx index 81612146978d..a3b814307325 100644 --- a/dbaccess/source/core/misc/services.cxx +++ b/dbaccess/source/core/misc/services.cxx @@ -37,17 +37,17 @@ namespace dba{ &::dbaccess::DatabaseDataProvider::Create, &::dbaccess::DatabaseDataProvider::getImplementationName_Static, &::dbaccess::DatabaseDataProvider::getSupportedServiceNames_Static, - &cppu::createSingleComponentFactory, 0, 0 + &cppu::createSingleComponentFactory, nullptr, 0 }, { &dbaccess::ODatabaseContext::Create, &dbaccess::ODatabaseContext::getImplementationName_static, &dbaccess::ODatabaseContext::getSupportedServiceNames_static, - &cppu::createOneInstanceComponentFactory, 0, 0 + &cppu::createOneInstanceComponentFactory, nullptr, 0 }, - { 0, 0, 0, 0, 0, 0 } + { nullptr, nullptr, nullptr, nullptr, nullptr, 0 } }; } diff --git a/dbaccess/source/core/recovery/subcomponentloader.cxx b/dbaccess/source/core/recovery/subcomponentloader.cxx index 26ab2d05e5da..625ca223f38b 100644 --- a/dbaccess/source/core/recovery/subcomponentloader.cxx +++ b/dbaccess/source/core/recovery/subcomponentloader.cxx @@ -81,7 +81,7 @@ namespace dbaccess aCommandOpen.Name = "show"; const sal_Int32 nCommandIdentifier = i_rData.xDocDefCommands->createCommandIdentifier(); - i_rData.xDocDefCommands->execute( aCommandOpen, nCommandIdentifier, NULL ); + i_rData.xDocDefCommands->execute( aCommandOpen, nCommandIdentifier, nullptr ); } else { @@ -131,7 +131,7 @@ namespace dbaccess SubComponentLoader::~SubComponentLoader() { - delete m_pData, m_pData = NULL; + delete m_pData, m_pData = nullptr; } void SAL_CALL SubComponentLoader::windowResized( const WindowEvent& i_rEvent ) throw (RuntimeException, std::exception) diff --git a/dbaccess/source/core/recovery/subcomponentrecovery.cxx b/dbaccess/source/core/recovery/subcomponentrecovery.cxx index 72ce9de40168..18e59d47eb8f 100644 --- a/dbaccess/source/core/recovery/subcomponentrecovery.cxx +++ b/dbaccess/source/core/recovery/subcomponentrecovery.cxx @@ -138,7 +138,7 @@ namespace dbaccess const SubComponentType i_eType, const OUString& i_rName ) { Reference< XController > xController( i_rAppUI, UNO_QUERY_THROW ); - ENSURE_OR_RETURN( ( i_eType == FORM ) || ( i_eType == REPORT ), "lcl_getSubComponentDef_nothrow: illegal controller", NULL ); + ENSURE_OR_RETURN( ( i_eType == FORM ) || ( i_eType == REPORT ), "lcl_getSubComponentDef_nothrow: illegal controller", nullptr ); Reference< XCommandProcessor > xCommandProcessor; try diff --git a/dbaccess/source/core/resource/core_resource.cxx b/dbaccess/source/core/resource/core_resource.cxx index 471d0497c36f..f2a7ea3b0f81 100644 --- a/dbaccess/source/core/resource/core_resource.cxx +++ b/dbaccess/source/core/resource/core_resource.cxx @@ -38,7 +38,7 @@ namespace dbaccess } sal_Int32 ResourceManager::s_nClients = 0; - ResMgr* ResourceManager::m_pImpl = NULL; + ResMgr* ResourceManager::m_pImpl = nullptr; void ResourceManager::ensureImplExists() { @@ -86,7 +86,7 @@ namespace dbaccess if (!--s_nClients && m_pImpl) { delete m_pImpl; - m_pImpl = NULL; + m_pImpl = nullptr; } } } diff --git a/dbaccess/source/ext/macromigration/docinteraction.cxx b/dbaccess/source/ext/macromigration/docinteraction.cxx index 22a88887414c..f51c015c1cf4 100644 --- a/dbaccess/source/ext/macromigration/docinteraction.cxx +++ b/dbaccess/source/ext/macromigration/docinteraction.cxx @@ -54,7 +54,7 @@ namespace dbmm Reference< XInteractionHandler > xHandler; explicit InteractionHandler_Data( const Reference<XComponentContext>& _rContext ) - :xHandler( css::task::InteractionHandler::createWithParent(_rContext, 0), UNO_QUERY ) + :xHandler( css::task::InteractionHandler::createWithParent(_rContext, nullptr), UNO_QUERY ) { } }; @@ -76,7 +76,7 @@ namespace dbmm { // create request DocumentPasswordRequest aRequest( - OUString(), NULL, + OUString(), nullptr, InteractionClassification_QUERY, _io_rPassword.isEmpty() ? PasswordRequestMode_PASSWORD_ENTER : PasswordRequestMode_PASSWORD_REENTER, _rDocumentName diff --git a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx index 8f5ca6483610..17420e54ead6 100644 --- a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx +++ b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx @@ -214,7 +214,7 @@ namespace dbmm enableButtons( WizardButtonFlags::FINISH | WizardButtonFlags::CANCEL | WizardButtonFlags::PREVIOUS | WizardButtonFlags::NEXT, false ); // start the migration asynchronously - PostUserEvent( LINK( this, MacroMigrationDialog, OnStartMigration ), NULL, true ); + PostUserEvent( LINK( this, MacroMigrationDialog, OnStartMigration ), nullptr, true ); } break; @@ -489,7 +489,7 @@ namespace dbmm } aViews.push_back( ViewDescriptor( xFrame, sViewName ) ); - xFrame->setComponent( NULL, NULL ); + xFrame->setComponent( nullptr, nullptr ); xController->dispose(); } diff --git a/dbaccess/source/ext/macromigration/migrationengine.cxx b/dbaccess/source/ext/macromigration/migrationengine.cxx index cc474d7b6b9d..a3170a20145e 100644 --- a/dbaccess/source/ext/macromigration/migrationengine.cxx +++ b/dbaccess/source/ext/macromigration/migrationengine.cxx @@ -238,7 +238,7 @@ namespace dbmm Command aCommand; aCommand.Name = OUString::createFromAscii( _pAsciiCommand ); return _rxCommandProc->execute( - aCommand, _rxCommandProc->createCommandIdentifier(), NULL ); + aCommand, _rxCommandProc->createCommandIdentifier(), nullptr ); } OUString lcl_getMimeType_nothrow( const Reference< XCommandProcessor >& _rxContent ) @@ -280,7 +280,7 @@ namespace dbmm aCommand.Argument <<= aLoadArgs.getPropertyValues(); Reference< XComponent > xDocComponent( xCommandProcessor->execute( - aCommand, xCommandProcessor->createCommandIdentifier(), NULL + aCommand, xCommandProcessor->createCommandIdentifier(), nullptr ), UNO_QUERY ); @@ -1337,7 +1337,7 @@ namespace dbmm // now that the concrete scripts storage does not have any elements anymore, // remove it - xScriptsRoot.reset( NULL ); // need to reset the storage to be allowed to remove it + xScriptsRoot.reset( nullptr ); // need to reset the storage to be allowed to remove it aDocStorage.removeScriptTypeStorage( _eScriptType ); // done so far diff --git a/dbaccess/source/ext/macromigration/migrationlog.cxx b/dbaccess/source/ext/macromigration/migrationlog.cxx index feee88118280..475ca472e993 100644 --- a/dbaccess/source/ext/macromigration/migrationlog.cxx +++ b/dbaccess/source/ext/macromigration/migrationlog.cxx @@ -188,7 +188,7 @@ namespace dbmm { static void lcl_appendErrorDescription( OUStringBuffer& _inout_rBuffer, const MigrationError& _rError ) { - const sal_Char* pAsciiErrorDescription( NULL ); + const sal_Char* pAsciiErrorDescription( nullptr ); ::std::vector< OUString > aParameterNames; switch ( _rError.eType ) { diff --git a/dbaccess/source/ext/macromigration/rangeprogressbar.hxx b/dbaccess/source/ext/macromigration/rangeprogressbar.hxx index d312a7925663..efa4339cdce5 100644 --- a/dbaccess/source/ext/macromigration/rangeprogressbar.hxx +++ b/dbaccess/source/ext/macromigration/rangeprogressbar.hxx @@ -31,7 +31,7 @@ namespace dbmm class RangeProgressBar { public: - explicit RangeProgressBar(ProgressBar *pBar = NULL) + explicit RangeProgressBar(ProgressBar *pBar = nullptr) : m_pBar(pBar) , m_nRange(0) { diff --git a/dbaccess/source/filter/xml/dbloader2.cxx b/dbaccess/source/filter/xml/dbloader2.cxx index 19333ade9d96..84cd8273e85e 100644 --- a/dbaccess/source/filter/xml/dbloader2.cxx +++ b/dbaccess/source/filter/xml/dbloader2.cxx @@ -263,7 +263,7 @@ private: DBContentLoader::DBContentLoader(const Reference< XComponentContext >& _rxFactory) :m_aContext( _rxFactory ) - ,m_nStartWizard(0) + ,m_nStartWizard(nullptr) { } @@ -403,7 +403,7 @@ void SAL_CALL DBContentLoader::load(const Reference< XFrame > & rFrame, const OU // not touch it. if ( !aMediaDesc.has( "InteractionHandler" ) ) { - Reference< XInteractionHandler2 > xHandler( InteractionHandler::createWithParent(m_aContext, 0) ); + Reference< XInteractionHandler2 > xHandler( InteractionHandler::createWithParent(m_aContext, nullptr) ); aMediaDesc.put( "InteractionHandler", xHandler ); } @@ -564,7 +564,7 @@ void DBContentLoader::cancel() throw(std::exception) IMPL_LINK_NOARG_TYPED( DBContentLoader, OnStartTableWizard, void*, void ) { - m_nStartWizard = 0; + m_nStartWizard = nullptr; try { Sequence< Any > aWizArgs(1); @@ -582,7 +582,7 @@ IMPL_LINK_NOARG_TYPED( DBContentLoader, OnStartTableWizard, void*, void ) { OSL_FAIL("caught an exception while starting the table wizard!"); } - m_xMySelf = NULL; + m_xMySelf = nullptr; } } diff --git a/dbaccess/source/filter/xml/xmlConnectionData.cxx b/dbaccess/source/filter/xml/xmlConnectionData.cxx index 759ba462a5a5..676a527bd263 100644 --- a/dbaccess/source/filter/xml/xmlConnectionData.cxx +++ b/dbaccess/source/filter/xml/xmlConnectionData.cxx @@ -54,7 +54,7 @@ SvXMLImportContext* OXMLConnectionData::CreateChildContext( const OUString& rLocalName, const Reference< XAttributeList > & xAttrList ) { - SvXMLImportContext *pContext = 0; + SvXMLImportContext *pContext = nullptr; const SvXMLTokenMap& rTokenMap = GetOwnImport().GetDataSourceElemTokenMap(); switch( rTokenMap.Get( nPrefix, rLocalName ) ) diff --git a/dbaccess/source/filter/xml/xmlDataSource.cxx b/dbaccess/source/filter/xml/xmlDataSource.cxx index f1bff587e2cf..9b03217ccd05 100644 --- a/dbaccess/source/filter/xml/xmlDataSource.cxx +++ b/dbaccess/source/filter/xml/xmlDataSource.cxx @@ -208,7 +208,7 @@ SvXMLImportContext* OXMLDataSource::CreateChildContext( const OUString& rLocalName, const Reference< XAttributeList > & xAttrList ) { - SvXMLImportContext *pContext = 0; + SvXMLImportContext *pContext = nullptr; const SvXMLTokenMap& rTokenMap = GetOwnImport().GetDataSourceElemTokenMap(); const sal_uInt16 nToken = rTokenMap.Get( nPrefix, rLocalName ); diff --git a/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx b/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx index 279e1cc24025..c153b7a71253 100644 --- a/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx +++ b/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx @@ -106,7 +106,7 @@ SvXMLImportContext* OXMLDataSourceSetting::CreateChildContext( const OUString& rLocalName, const Reference< XAttributeList > & xAttrList ) { - SvXMLImportContext *pContext = 0; + SvXMLImportContext *pContext = nullptr; const SvXMLTokenMap& rTokenMap = GetOwnImport().GetDataSourceInfoElemTokenMap(); switch( rTokenMap.Get( nPrefix, rLocalName ) ) diff --git a/dbaccess/source/filter/xml/xmlDataSourceSetting.hxx b/dbaccess/source/filter/xml/xmlDataSourceSetting.hxx index 674958f9deef..f5d684c25027 100644 --- a/dbaccess/source/filter/xml/xmlDataSourceSetting.hxx +++ b/dbaccess/source/filter/xml/xmlDataSourceSetting.hxx @@ -41,7 +41,7 @@ namespace dbaxml OXMLDataSourceSetting( ODBFilter& rImport, sal_uInt16 nPrfx, const OUString& rLName, const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList - ,OXMLDataSourceSetting* _pContainer = NULL); + ,OXMLDataSourceSetting* _pContainer = nullptr); virtual ~OXMLDataSourceSetting(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, diff --git a/dbaccess/source/filter/xml/xmlDataSourceSettings.cxx b/dbaccess/source/filter/xml/xmlDataSourceSettings.cxx index a043aa84f282..e4f0dc7c94ce 100644 --- a/dbaccess/source/filter/xml/xmlDataSourceSettings.cxx +++ b/dbaccess/source/filter/xml/xmlDataSourceSettings.cxx @@ -53,7 +53,7 @@ SvXMLImportContext* OXMLDataSourceSettings::CreateChildContext( const OUString& rLocalName, const Reference< XAttributeList > & xAttrList ) { - SvXMLImportContext *pContext = 0; + SvXMLImportContext *pContext = nullptr; const SvXMLTokenMap& rTokenMap = GetOwnImport().GetDataSourceInfoElemTokenMap(); switch( rTokenMap.Get( nPrefix, rLocalName ) ) diff --git a/dbaccess/source/filter/xml/xmlDatabase.cxx b/dbaccess/source/filter/xml/xmlDatabase.cxx index 967ee8744cf4..128c71f7f5c2 100644 --- a/dbaccess/source/filter/xml/xmlDatabase.cxx +++ b/dbaccess/source/filter/xml/xmlDatabase.cxx @@ -56,7 +56,7 @@ SvXMLImportContext* OXMLDatabase::CreateChildContext( const OUString& rLocalName, const Reference< XAttributeList > & xAttrList ) { - SvXMLImportContext *pContext = 0; + SvXMLImportContext *pContext = nullptr; const SvXMLTokenMap& rTokenMap = GetOwnImport().GetDatabaseElemTokenMap(); switch( rTokenMap.Get( nPrefix, rLocalName ) ) diff --git a/dbaccess/source/filter/xml/xmlDatabaseDescription.cxx b/dbaccess/source/filter/xml/xmlDatabaseDescription.cxx index 25cd46d7a63c..4d9df03a873b 100644 --- a/dbaccess/source/filter/xml/xmlDatabaseDescription.cxx +++ b/dbaccess/source/filter/xml/xmlDatabaseDescription.cxx @@ -52,7 +52,7 @@ SvXMLImportContext* OXMLDatabaseDescription::CreateChildContext( const OUString& rLocalName, const Reference< XAttributeList > & xAttrList ) { - SvXMLImportContext *pContext = 0; + SvXMLImportContext *pContext = nullptr; const SvXMLTokenMap& rTokenMap = GetOwnImport().GetDatabaseDescriptionElemTokenMap(); switch( rTokenMap.Get( nPrefix, rLocalName ) ) diff --git a/dbaccess/source/filter/xml/xmlDocuments.cxx b/dbaccess/source/filter/xml/xmlDocuments.cxx index 61d93708f7d4..58fbd2e39169 100644 --- a/dbaccess/source/filter/xml/xmlDocuments.cxx +++ b/dbaccess/source/filter/xml/xmlDocuments.cxx @@ -71,7 +71,7 @@ SvXMLImportContext* OXMLDocuments::CreateChildContext( const OUString& rLocalName, const Reference< XAttributeList > & xAttrList ) { - SvXMLImportContext *pContext = 0; + SvXMLImportContext *pContext = nullptr; const SvXMLTokenMap& rTokenMap = GetOwnImport().GetDocumentsElemTokenMap(); switch( rTokenMap.Get( nPrefix, rLocalName ) ) diff --git a/dbaccess/source/filter/xml/xmlHelper.cxx b/dbaccess/source/filter/xml/xmlHelper.cxx index 43a7fecffdfe..38071558aba6 100644 --- a/dbaccess/source/filter/xml/xmlHelper.cxx +++ b/dbaccess/source/filter/xml/xmlHelper.cxx @@ -47,7 +47,7 @@ OPropertyHandlerFactory::~OPropertyHandlerFactory() const XMLPropertyHandler* OPropertyHandlerFactory::GetPropertyHandler(sal_Int32 _nType) const { - const XMLPropertyHandler* pHandler = NULL; + const XMLPropertyHandler* pHandler = nullptr; switch (_nType) { @@ -70,7 +70,7 @@ const XMLPropertyHandler* OPropertyHandlerFactory::GetPropertyHandler(sal_Int32 return pHandler; } -#define MAP_END() { NULL, 0, 0, XML_TOKEN_INVALID, 0 , 0, SvtSaveOptions::ODFVER_010, false} +#define MAP_END() { nullptr, 0, 0, XML_TOKEN_INVALID, 0 , 0, SvtSaveOptions::ODFVER_010, false} rtl::Reference < XMLPropertySetMapper > OXMLHelper::GetTableStylesPropertySetMapper( bool bForExport ) { static const XMLPropertyMapEntry s_aTableStylesProperties[] = diff --git a/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx b/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx index 5abc7bf1500d..8a0f5d039500 100644 --- a/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx +++ b/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx @@ -122,7 +122,7 @@ SvXMLImportContext* OXMLHierarchyCollection::CreateChildContext( const OUString& rLocalName, const Reference< XAttributeList > & xAttrList ) { - SvXMLImportContext *pContext = 0; + SvXMLImportContext *pContext = nullptr; const SvXMLTokenMap& rTokenMap = GetOwnImport().GetDocumentsElemTokenMap(); switch( rTokenMap.Get( nPrefix, rLocalName ) ) diff --git a/dbaccess/source/filter/xml/xmlTable.cxx b/dbaccess/source/filter/xml/xmlTable.cxx index 7af6b199e04a..b2aadfa6fd00 100644 --- a/dbaccess/source/filter/xml/xmlTable.cxx +++ b/dbaccess/source/filter/xml/xmlTable.cxx @@ -112,7 +112,7 @@ SvXMLImportContext* OXMLTable::CreateChildContext( const OUString& rLocalName, const uno::Reference< XAttributeList > & xAttrList ) { - SvXMLImportContext *pContext = 0; + SvXMLImportContext *pContext = nullptr; const SvXMLTokenMap& rTokenMap = GetOwnImport().GetQueryElemTokenMap(); switch( rTokenMap.Get( nPrefix, rLocalName ) ) diff --git a/dbaccess/source/filter/xml/xmlTableFilterList.cxx b/dbaccess/source/filter/xml/xmlTableFilterList.cxx index 04c87a0300fa..f3df1aaab402 100644 --- a/dbaccess/source/filter/xml/xmlTableFilterList.cxx +++ b/dbaccess/source/filter/xml/xmlTableFilterList.cxx @@ -51,7 +51,7 @@ SvXMLImportContext* OXMLTableFilterList::CreateChildContext( const OUString& rLocalName, const Reference< XAttributeList > & /*xAttrList*/ ) { - SvXMLImportContext *pContext = 0; + SvXMLImportContext *pContext = nullptr; if ( XML_NAMESPACE_DB == nPrefix ) { diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx index e870a37397eb..1c24ca3e8ea4 100644 --- a/dbaccess/source/filter/xml/xmlfilter.cxx +++ b/dbaccess/source/filter/xml/xmlfilter.cxx @@ -147,7 +147,7 @@ sal_Int32 ReadThroughComponent( const uno::Reference< XDocumentHandler >& _xFilter) { OSL_ENSURE( xStorage.is(), "Need storage!"); - OSL_ENSURE(NULL != pStreamName, "Please, please, give me a name!"); + OSL_ENSURE(nullptr != pStreamName, "Please, please, give me a name!"); if ( xStorage.is() ) { @@ -164,7 +164,7 @@ sal_Int32 ReadThroughComponent( // if no stream can be opened, return immediately with OK signal // do we even have an alternative name? - if ( NULL == pCompatibilityStreamName ) + if ( nullptr == pCompatibilityStreamName ) return 0; // if so, does the stream exist? @@ -295,7 +295,7 @@ bool ODBFilter::implImport( const Sequence< PropertyValue >& rDescriptor ) { uno::Reference<XComponent> xCom(GetModel(),UNO_QUERY); - tools::SvRef<SfxMedium> pMedium(0); + tools::SvRef<SfxMedium> pMedium(nullptr); if (!xStorage.is()) { OUString sStreamRelPath; @@ -382,7 +382,7 @@ SvXMLImportContext* ODBFilter::CreateContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) { - SvXMLImportContext *pContext = 0; + SvXMLImportContext *pContext = nullptr; const SvXMLTokenMap& rTokenMap = GetDocElemTokenMap(); switch( rTokenMap.Get( nPrefix, rLocalName ) ) @@ -701,7 +701,7 @@ const SvXMLTokenMap& ODBFilter::GetColumnElemTokenMap() const SvXMLImportContext* ODBFilter::CreateStylesContext(sal_uInt16 _nPrefix,const OUString& rLocalName, const uno::Reference< XAttributeList>& xAttrList, bool bIsAutoStyle ) { - SvXMLImportContext *pContext = NULL; + SvXMLImportContext *pContext = nullptr; if (!pContext) { pContext = new OTableStylesContext(*this, _nPrefix, rLocalName, xAttrList, bIsAutoStyle); diff --git a/dbaccess/source/inc/apitools.hxx b/dbaccess/source/inc/apitools.hxx index f14ffd5fdf33..78217418bf45 100644 --- a/dbaccess/source/inc/apitools.hxx +++ b/dbaccess/source/inc/apitools.hxx @@ -185,7 +185,7 @@ public: #define IMPLEMENT_IMPLEMENTATION_ID( classname ) \ css::uno::Sequence< sal_Int8 > classname::getUnoTunnelImplementationId() \ { \ - static ::cppu::OImplementationId* pId = 0; \ + static ::cppu::OImplementationId* pId = nullptr; \ if ( !pId ) \ { \ ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); \ diff --git a/dbaccess/source/sdbtools/connection/objectnames.cxx b/dbaccess/source/sdbtools/connection/objectnames.cxx index 5edf3890e326..a0f08669ce83 100644 --- a/dbaccess/source/sdbtools/connection/objectnames.cxx +++ b/dbaccess/source/sdbtools/connection/objectnames.cxx @@ -293,7 +293,7 @@ namespace sdbtools ) throw IllegalArgumentException( OUString( SdbtRes( STR_INVALID_COMMAND_TYPE ) ), - NULL, + nullptr, 0 ); } @@ -316,7 +316,7 @@ namespace sdbtools { throw IllegalArgumentException( OUString( SdbtRes( STR_CONN_WITHOUT_QUERIES_OR_TABLES ) ), - NULL, + nullptr, 0 ); } @@ -347,7 +347,7 @@ namespace sdbtools { throw IllegalArgumentException( "The connection could not provide its database's meta data.", - NULL, + nullptr, 0 ); } diff --git a/dbaccess/source/sdbtools/connection/tablename.cxx b/dbaccess/source/sdbtools/connection/tablename.cxx index 64cce68c4fbc..a64a9f922e38 100644 --- a/dbaccess/source/sdbtools/connection/tablename.cxx +++ b/dbaccess/source/sdbtools/connection/tablename.cxx @@ -202,7 +202,7 @@ namespace sdbtools if ( !found ) throw IllegalArgumentException( OUString( SdbtRes( STR_INVALID_COMPOSITION_TYPE ) ), - NULL, + nullptr, 0 ); diff --git a/dbaccess/source/shared/registrationhelper.cxx b/dbaccess/source/shared/registrationhelper.cxx index 308abb04f26d..bac0be8a28aa 100644 --- a/dbaccess/source/shared/registrationhelper.cxx +++ b/dbaccess/source/shared/registrationhelper.cxx @@ -27,10 +27,10 @@ using namespace ::com::sun::star; using namespace ::comphelper; using namespace ::cppu; -uno::Sequence< OUString >* OModuleRegistration::s_pImplementationNames = NULL; -uno::Sequence< uno::Sequence< OUString > >* OModuleRegistration::s_pSupportedServices = NULL; -uno::Sequence< sal_Int64 >* OModuleRegistration::s_pCreationFunctionPointers = NULL; -uno::Sequence< sal_Int64 >* OModuleRegistration::s_pFactoryFunctionPointers = NULL; +uno::Sequence< OUString >* OModuleRegistration::s_pImplementationNames = nullptr; +uno::Sequence< uno::Sequence< OUString > >* OModuleRegistration::s_pSupportedServices = nullptr; +uno::Sequence< sal_Int64 >* OModuleRegistration::s_pCreationFunctionPointers = nullptr; +uno::Sequence< sal_Int64 >* OModuleRegistration::s_pFactoryFunctionPointers = nullptr; void OModuleRegistration::registerComponent( const OUString& _rImplementationName, @@ -97,10 +97,10 @@ void OModuleRegistration::revokeComponent(const OUString& _rImplementationName) if (s_pImplementationNames->getLength() == 0) { - delete s_pImplementationNames; s_pImplementationNames = NULL; - delete s_pSupportedServices; s_pSupportedServices = NULL; - delete s_pCreationFunctionPointers; s_pCreationFunctionPointers = NULL; - delete s_pFactoryFunctionPointers; s_pFactoryFunctionPointers = NULL; + delete s_pImplementationNames; s_pImplementationNames = nullptr; + delete s_pSupportedServices; s_pSupportedServices = nullptr; + delete s_pCreationFunctionPointers; s_pCreationFunctionPointers = nullptr; + delete s_pFactoryFunctionPointers; s_pFactoryFunctionPointers = nullptr; } } @@ -114,7 +114,7 @@ uno::Reference< uno::XInterface > OModuleRegistration::getComponentFactory( if (!s_pImplementationNames) { OSL_FAIL("OModuleRegistration::getComponentFactory : have no class infos ! Are you sure called this method at the right time ?"); - return NULL; + return nullptr; } OSL_ENSURE(s_pImplementationNames && s_pSupportedServices && s_pCreationFunctionPointers && s_pFactoryFunctionPointers, "OModuleRegistration::getComponentFactory : inconsistent state (the pointers) !"); @@ -138,7 +138,7 @@ uno::Reference< uno::XInterface > OModuleRegistration::getComponentFactory( const FactoryInstantiation FactoryInstantiationFunction = reinterpret_cast<const FactoryInstantiation>(*pFactoryFunction); const ComponentInstantiation ComponentInstantiationFunction = reinterpret_cast<const ComponentInstantiation>(*pComponentFunction); - xReturn = FactoryInstantiationFunction( _rxServiceManager, *pImplName, ComponentInstantiationFunction, *pServices, NULL); + xReturn = FactoryInstantiationFunction( _rxServiceManager, *pImplName, ComponentInstantiationFunction, *pServices, nullptr); if (xReturn.is()) { return xReturn.get(); @@ -146,7 +146,7 @@ uno::Reference< uno::XInterface > OModuleRegistration::getComponentFactory( } } - return NULL; + return nullptr; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx index def970574e1b..54ccc81c44c8 100644 --- a/dbaccess/source/ui/app/AppController.cxx +++ b/dbaccess/source/ui/app/AppController.cxx @@ -274,8 +274,8 @@ OApplicationController::OApplicationController(const Reference< XComponentContex ,m_pSubComponentManager( new SubComponentManager( *this, getSharedMutex() ) ) ,m_aTypeCollection( _rxORB ) ,m_aTableCopyHelper(this) - ,m_pClipbordNotifier(NULL) - ,m_nAsyncDrop(0) + ,m_pClipbordNotifier(nullptr) + ,m_nAsyncDrop(nullptr) ,m_aSelectContainerEvent( LINK( this, OApplicationController, OnSelectContainer ) ) ,m_ePreviewMode(E_PREVIEWNONE) ,m_eCurrentType(E_NONE) @@ -338,11 +338,11 @@ void SAL_CALL OApplicationController::disposing() if ( getView() ) { - getContainer()->showPreview(NULL); + getContainer()->showPreview(nullptr); m_pClipbordNotifier->ClearCallbackLink(); m_pClipbordNotifier->AddRemoveListener( getView(), false ); m_pClipbordNotifier->release(); - m_pClipbordNotifier = NULL; + m_pClipbordNotifier = nullptr; } disconnect(); @@ -364,7 +364,7 @@ void SAL_CALL OApplicationController::disposing() m_xDataSource->removePropertyChangeListener(PROPERTY_USER, this); // otherwise we may delete our datasource twice Reference<XPropertySet> xProp = m_xDataSource; - m_xDataSource = NULL; + m_xDataSource = nullptr; } Reference< XModifyBroadcaster > xBroadcaster( m_xModel, UNO_QUERY ); @@ -478,7 +478,7 @@ void SAL_CALL OApplicationController::disposing(const EventObject& _rSource) thr } else if ( _rSource.Source == m_xDataSource ) { - m_xDataSource = NULL; + m_xDataSource = nullptr; } else { @@ -1236,7 +1236,7 @@ void OApplicationController::Execute(sal_uInt16 _nId, const Sequence< PropertyVa case SID_APP_NEW_FOLDER: { ElementType eType = getContainer()->getElementType(); - OUString sName = getContainer()->getQualifiedName( NULL ); + OUString sName = getContainer()->getQualifiedName( nullptr ); insertHierachyElement(eType,sName); } break; @@ -1253,7 +1253,7 @@ void OApplicationController::Execute(sal_uInt16 _nId, const Sequence< PropertyVa const Reference< XDataSource > xDataSource( m_xDataSource, UNO_QUERY ); const Reference< XComponent > xComponent( aDesigner.createNew( xDataSource, aCreationArgs ), UNO_QUERY ); - onDocumentOpened( OUString(), E_QUERY, E_OPEN_DESIGN, xComponent, NULL ); + onDocumentOpened( OUString(), E_QUERY, E_OPEN_DESIGN, xComponent, nullptr ); } } break; @@ -1305,7 +1305,7 @@ void OApplicationController::Execute(sal_uInt16 _nId, const Sequence< PropertyVa const Reference< XDataSource > xDataSource( m_xDataSource, UNO_QUERY ); const Reference< XComponent > xComponent( aDesigner.createNew( xDataSource ), UNO_QUERY ); - onDocumentOpened( OUString(), SID_DB_APP_DSRELDESIGN, E_OPEN_DESIGN, xComponent, NULL ); + onDocumentOpened( OUString(), SID_DB_APP_DSRELDESIGN, E_OPEN_DESIGN, xComponent, nullptr ); } } } @@ -1778,13 +1778,13 @@ Reference< XComponent > OApplicationController::openElementWithArguments( const { OSL_PRECOND( getContainer(), "OApplicationController::openElementWithArguments: no view!" ); if ( !getContainer() ) - return NULL; + return nullptr; Reference< XComponent > xRet; if ( _eOpenMode == E_OPEN_DESIGN ) { // OJ: http://www.openoffice.org/issues/show_bug.cgi?id=30382 - getContainer()->showPreview(NULL); + getContainer()->showPreview(nullptr); } bool isStandaloneDocument = false; @@ -1869,7 +1869,7 @@ Reference< XComponent > OApplicationController::openElementWithArguments( const } xRet.set( pDesigner->openExisting( aDataSource, _sName, aArguments ) ); - onDocumentOpened( _sName, _eType, _eOpenMode, xRet, NULL ); + onDocumentOpened( _sName, _eType, _eOpenMode, xRet, nullptr ); } } break; @@ -2183,7 +2183,7 @@ void OApplicationController::onSelectionChanged() const ElementType eType = pView->getElementType(); if ( pView->isALeafSelected() ) { - const OUString sName = pView->getQualifiedName( NULL /* means 'first selected' */ ); + const OUString sName = pView->getQualifiedName( nullptr /* means 'first selected' */ ); showPreviewFor( eType, sName ); } } @@ -2362,7 +2362,7 @@ bool OApplicationController::requestQuickHelp( const SvTreeListEntry* /*_pEntry* bool OApplicationController::requestDrag( sal_Int8 /*_nAction*/, const Point& /*_rPosPixel*/ ) { - TransferableHelper* pTransfer = NULL; + TransferableHelper* pTransfer = nullptr; if ( getContainer() && getContainer()->getSelectionCount() ) { try @@ -2382,7 +2382,7 @@ bool OApplicationController::requestDrag( sal_Int8 /*_nAction*/, const Point& /* } } - return NULL != pTransfer; + return nullptr != pTransfer; } sal_Int8 OApplicationController::queryDrop( const AcceptDropEvent& _rEvt, const DataFlavorExVector& _rFlavors ) @@ -2447,7 +2447,7 @@ sal_Int8 OApplicationController::executeDrop( const ExecuteDropEvent& _rEvt ) if ( m_nAsyncDrop ) Application::RemoveUserEvent(m_nAsyncDrop); - m_nAsyncDrop = 0; + m_nAsyncDrop = nullptr; m_aAsyncDrop.aDroppedData.clear(); m_aAsyncDrop.nType = pView->getElementType(); m_aAsyncDrop.nAction = _rEvt.mnAction; @@ -2598,7 +2598,7 @@ void OApplicationController::OnFirstControllerConnected() aDetail.Message = OUString( ModuleRes( STR_SUB_DOCS_WITH_SCRIPTS_DETAIL ) ); aWarning.NextException <<= aDetail; - Reference< XExecutableDialog > xDialog = ErrorMessageDialog::create( getORB(), "", NULL, makeAny( aWarning ) ); + Reference< XExecutableDialog > xDialog = ErrorMessageDialog::create( getORB(), "", nullptr, makeAny( aWarning ) ); xDialog->execute(); } catch( const Exception& ) @@ -2735,7 +2735,7 @@ OUString OApplicationController::getCurrentlySelectedName(sal_Int32& _rnCommandT { try { - sName = getContainer()->getQualifiedName( NULL ); + sName = getContainer()->getQualifiedName( nullptr ); OSL_ENSURE( !sName.isEmpty(), "OApplicationController::getCurrentlySelectedName: no name given!" ); } catch( const Exception& ) diff --git a/dbaccess/source/ui/app/AppController.hxx b/dbaccess/source/ui/app/AppController.hxx index 687f8bfb2860..cc7bcf1ac543 100644 --- a/dbaccess/source/ui/app/AppController.hxx +++ b/dbaccess/source/ui/app/AppController.hxx @@ -468,7 +468,7 @@ namespace dbaui DO NOT CALL with getMutex() held!! */ - const SharedConnection& ensureConnection( ::dbtools::SQLExceptionInfo* _pErrorInfo = NULL ); + const SharedConnection& ensureConnection( ::dbtools::SQLExceptionInfo* _pErrorInfo = nullptr ); /** retrieves the current connection */ diff --git a/dbaccess/source/ui/app/AppControllerDnD.cxx b/dbaccess/source/ui/app/AppControllerDnD.cxx index 484acf870e8d..cc71d6b679c1 100644 --- a/dbaccess/source/ui/app/AppControllerDnD.cxx +++ b/dbaccess/source/ui/app/AppControllerDnD.cxx @@ -520,7 +520,7 @@ TransferableHelper* OApplicationController::copyObject() ::osl::MutexGuard aGuard( getMutex() ); ElementType eType = getContainer()->getElementType(); - TransferableHelper* pData = NULL; + TransferableHelper* pData = nullptr; switch( eType ) { case E_TABLE: @@ -531,7 +531,7 @@ TransferableHelper* OApplicationController::copyObject() if ( xConnection.is() ) xMetaData = xConnection->getMetaData(); - OUString sName = getContainer()->getQualifiedName( NULL ); + OUString sName = getContainer()->getQualifiedName( nullptr ); if ( !sName.isEmpty() ) { OUString sDataSource = getDatabaseName(); @@ -575,7 +575,7 @@ TransferableHelper* OApplicationController::copyObject() { DBG_UNHANDLED_EXCEPTION(); } - return NULL; + return nullptr; } bool OApplicationController::paste( ElementType _eType, const svx::ODataAccessDescriptor& _rPasteData, const OUString& _sParentFolder, bool _bMove) @@ -642,7 +642,7 @@ bool OApplicationController::paste( ElementType _eType, const svx::ODataAccessDe { // the concrete query Reference< XQueryDefinitionsSupplier > xSourceQuerySup( - getDataSourceByName( sDataSourceName, getView(), getORB(), NULL ), + getDataSourceByName( sDataSourceName, getView(), getORB(), nullptr ), UNO_QUERY_THROW ); Reference< XNameAccess > xQueries( xSourceQuerySup->getQueryDefinitions(), UNO_SET_THROW ); if ( xQueries->hasByName( sCommand ) ) @@ -798,7 +798,7 @@ bool OApplicationController::isTableFormat() const IMPL_LINK_NOARG_TYPED( OApplicationController, OnAsyncDrop, void*, void ) { - m_nAsyncDrop = 0; + m_nAsyncDrop = nullptr; SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); diff --git a/dbaccess/source/ui/app/AppControllerGen.cxx b/dbaccess/source/ui/app/AppControllerGen.cxx index df9e1c3909ff..286c752c7385 100644 --- a/dbaccess/source/ui/app/AppControllerGen.cxx +++ b/dbaccess/source/ui/app/AppControllerGen.cxx @@ -672,7 +672,7 @@ void OApplicationController::onLoadedMenu(const Reference< css::frame::XLayoutMa MnemonicGenerator aMnemonicGenerator; // - the menu already has mnemonics SystemWindow* pSystemWindow = getContainer()->GetSystemWindow(); - MenuBar* pMenu = pSystemWindow ? pSystemWindow->GetMenuBar() : NULL; + MenuBar* pMenu = pSystemWindow ? pSystemWindow->GetMenuBar() : nullptr; if ( pMenu ) { sal_uInt16 nMenuItems = pMenu->GetItemCount(); diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx index 8ab030f3979b..c2b063f8f0e3 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx @@ -93,7 +93,7 @@ namespace { SvTreeListEntry* lcl_findEntry_impl(DBTreeListBox& rTree,const OUString& _rName,SvTreeListEntry* _pFirst) { - SvTreeListEntry* pReturn = NULL; + SvTreeListEntry* pReturn = nullptr; sal_Int32 nIndex = 0; OUString sName( _rName.getToken(0,'/',nIndex) ); @@ -122,7 +122,7 @@ namespace { sal_Int32 nIndex = 0; OUString sErase = _rName.getToken(0,'/',nIndex); // we don't want to have the "private:forms" part - return (nIndex != -1 ? lcl_findEntry_impl(rTree,_rName.copy(sErase.getLength() + 1),_pFirst) : NULL); + return (nIndex != -1 ? lcl_findEntry_impl(rTree,_rName.copy(sErase.getLength() + 1),_pFirst) : nullptr); } // class OPreviewWindow class OTablePreviewWindow : public vcl::Window @@ -143,7 +143,7 @@ namespace { bool bRet = Window::Notify( rNEvt ); if ( rNEvt.GetType() == MouseNotifyEvent::INPUTENABLE && IsInputEnabled() ) - PostUserEvent( LINK( this, OTablePreviewWindow, OnDisableInput), NULL, true ); + PostUserEvent( LINK( this, OTablePreviewWindow, OnDisableInput), nullptr, true ); return bRet; } IMPL_LINK_NOARG_TYPED(OTablePreviewWindow, OnDisableInput, void*, void) @@ -220,7 +220,7 @@ OAppDetailPageHelper::OAppDetailPageHelper(vcl::Window* _pParent,OAppBorderWindo SetUniqueId(UID_APP_DETAILPAGE_HELPER); for (int i=0; i < E_ELEMENT_TYPE_COUNT; ++i) - m_pLists[i] = NULL; + m_pLists[i] = nullptr; ImplInitSettings(); } @@ -368,7 +368,7 @@ void OAppDetailPageHelper::describeCurrentSelectionForControl( const Control& _r void OAppDetailPageHelper::describeCurrentSelectionForType( const ElementType _eType, Sequence< NamedDatabaseObject >& _out_rSelectedObjects ) { OSL_ENSURE( _eType < E_ELEMENT_TYPE_COUNT, "OAppDetailPageHelper::describeCurrentSelectionForType: invalid type!" ); - DBTreeListBox* pList = ( _eType < E_ELEMENT_TYPE_COUNT ) ? m_pLists[ _eType ].get() : NULL; + DBTreeListBox* pList = ( _eType < E_ELEMENT_TYPE_COUNT ) ? m_pLists[ _eType ].get() : nullptr; OSL_ENSURE( pList, "OAppDetailPageHelper::describeCurrentSelectionForType: " "You really should ensure this type has already been viewed before!" ); if ( !pList ) @@ -557,7 +557,7 @@ bool OAppDetailPageHelper::isALeafSelected() const SvTreeListEntry* OAppDetailPageHelper::getEntry( const Point& _aPosPixel) const { - SvTreeListEntry* pReturn = NULL; + SvTreeListEntry* pReturn = nullptr; int nPos = getVisibleControlIndex(); if ( nPos < E_ELEMENT_TYPE_COUNT ) pReturn = m_pLists[nPos]->GetEntry( _aPosPixel, true ); @@ -650,7 +650,7 @@ void OAppDetailPageHelper::createPage(ElementType _eType,const Reference< XNameA { if ( !m_pLists[_eType]->GetEntryCount() && _xContainer.is() ) { - fillNames( _xContainer, _eType, nImageId, NULL ); + fillNames( _xContainer, _eType, nImageId, nullptr ); m_pLists[_eType]->SelectAll(false); } @@ -665,11 +665,11 @@ void OAppDetailPageHelper::setDetailPage(vcl::Window* _pWindow) if ( pCurrent ) pCurrent->Hide(); - showPreview(NULL); + showPreview(nullptr); bool bHasFocus = false; m_aFL->Show(); { - bHasFocus = pCurrent != 0 && pCurrent->HasChildPathFocus(); + bHasFocus = pCurrent != nullptr && pCurrent->HasChildPathFocus(); _pWindow->Show(); } m_aTBPreview->Show(); @@ -715,7 +715,7 @@ void OAppDetailPageHelper::fillNames( const Reference< XNameAccess >& _xContaine const OUString* pEnd = pIter + aSeq.getLength(); for(;pIter != pEnd;++pIter) { - SvTreeListEntry* pEntry = NULL; + SvTreeListEntry* pEntry = nullptr; Reference<XNameAccess> xSubElements(_xContainer->getByName(*pIter),UNO_QUERY); if ( xSubElements.is() ) { @@ -749,7 +749,7 @@ DBTreeListBox* OAppDetailPageHelper::createTree( DBTreeListBox* _pTreeView, cons _pTreeView->SetStyle(_pTreeView->GetStyle() | WB_HASLINES | WB_SORT | WB_HASBUTTONS | WB_HSCROLL |WB_HASBUTTONSATROOT | WB_TABSTOP); _pTreeView->GetModel()->SetSortMode(SortAscending); - _pTreeView->EnableCheckButton( NULL ); // do not show any buttons + _pTreeView->EnableCheckButton( nullptr ); // do not show any buttons _pTreeView->SetSelectionMode(MULTIPLE_SELECTION); _pTreeView->SetDefaultCollapsedEntryBmp( _rImage ); @@ -771,7 +771,7 @@ DBTreeListBox* OAppDetailPageHelper::createTree( DBTreeListBox* _pTreeView, cons void OAppDetailPageHelper::clearPages() { - showPreview(NULL); + showPreview(nullptr); for (size_t i=0; i < E_ELEMENT_TYPE_COUNT; ++i) { if ( m_pLists[i] ) @@ -795,7 +795,7 @@ void OAppDetailPageHelper::elementReplaced(ElementType _eType if ( pTreeView ) { OUString sNewName = _rNewName; - SvTreeListEntry* pEntry = NULL; + SvTreeListEntry* pEntry = nullptr; switch( _eType ) { case E_TABLE: @@ -823,7 +823,7 @@ void OAppDetailPageHelper::elementReplaced(ElementType _eType SvTreeListEntry* OAppDetailPageHelper::elementAdded(ElementType _eType,const OUString& _rName, const Any& _rObject ) { - SvTreeListEntry* pRet = NULL; + SvTreeListEntry* pRet = nullptr; DBTreeListBox* pTreeView = m_pLists[_eType]; if( _eType == E_TABLE && pTreeView ) { @@ -832,7 +832,7 @@ SvTreeListEntry* OAppDetailPageHelper::elementAdded(ElementType _eType,const OUS else if ( pTreeView ) { - SvTreeListEntry* pEntry = NULL; + SvTreeListEntry* pEntry = nullptr; Reference<XChild> xChild(_rObject,UNO_QUERY); if ( xChild.is() && E_QUERY != _eType ) { @@ -899,7 +899,7 @@ void OAppDetailPageHelper::elementRemoved( ElementType _eType,const OUString& _r OSL_FAIL("Invalid element type"); } if ( !pTreeView->GetEntryCount() ) - showPreview(NULL); + showPreview(nullptr); } } @@ -910,7 +910,7 @@ IMPL_LINK_TYPED(OAppDetailPageHelper, OnEntryEnterKey, DBTreeListBox*, _pTree, v IMPL_LINK_TYPED(OAppDetailPageHelper, OnEntryDoubleClick, SvTreeListBox*, _pTree, bool) { OSL_ENSURE( _pTree, "OAppDetailPageHelper, OnEntryDoubleClick: invalid callback!" ); - bool bHandled = ( _pTree != NULL ) && getBorderWin().getView()->getAppController().onEntryDoubleClick( *_pTree ); + bool bHandled = ( _pTree != nullptr ) && getBorderWin().getView()->getAppController().onEntryDoubleClick( *_pTree ); return bHandled; } @@ -1114,7 +1114,7 @@ void OAppDetailPageHelper::showPreview( const OUString& _sDataSourceName, Reference< XDatabaseDocumentUI > xApplication( getBorderWin().getView()->getAppController().getXController(), UNO_QUERY ); std::unique_ptr< DatabaseObjectView > pDispatcher( new ResultSetBrowser( getBorderWin().getView()->getORB(), - xApplication, NULL, _bTable + xApplication, nullptr, _bTable ) ); pDispatcher->setTargetFrame( Reference<XFrame>(m_xFrame,UNO_QUERY_THROW) ); @@ -1139,7 +1139,7 @@ void OAppDetailPageHelper::showPreview( const OUString& _sDataSourceName, } } if ( bClearPreview ) - showPreview(NULL); + showPreview(nullptr); } } @@ -1218,7 +1218,7 @@ void OAppDetailPageHelper::DataChanged( const DataChangedEvent& rDCEvt ) if ( m_pLists[ E_TABLE ] ) { OTableTreeListBox* pTableTree = dynamic_cast< OTableTreeListBox* >( m_pLists[ E_TABLE ].get() ); - OSL_ENSURE( pTableTree != NULL, "OAppDetailPageHelper::DataChanged: a tree list for tables which is no TableTreeList?" ); + OSL_ENSURE( pTableTree != nullptr, "OAppDetailPageHelper::DataChanged: a tree list for tables which is no TableTreeList?" ); if ( pTableTree ) pTableTree->notifyHiContrastChanged(); } diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.hxx b/dbaccess/source/ui/app/AppDetailPageHelper.hxx index d499006deab4..38631533ea54 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.hxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.hxx @@ -193,7 +193,7 @@ namespace dbaui inline DBTreeListBox* getCurrentView() const { ElementType eType = getElementType(); - return (eType != E_NONE ) ? m_pLists[static_cast<sal_Int32>(eType)].get() : NULL; + return (eType != E_NONE ) ? m_pLists[static_cast<sal_Int32>(eType)].get() : nullptr; } /// select all entries in the visible control diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx index 4305a105700b..0f537e8eb131 100644 --- a/dbaccess/source/ui/app/AppDetailView.cxx +++ b/dbaccess/source/ui/app/AppDetailView.cxx @@ -74,8 +74,8 @@ TaskEntry::TaskEntry( const sal_Char* _pAsciiUNOCommand, sal_uInt16 _nHelpID, sa OCreationList::OCreationList( OTasksWindow& _rParent ) :SvTreeListBox( &_rParent, WB_TABSTOP | WB_HASBUTTONSATROOT | WB_HASBUTTONS ) ,m_rTaskWindow( _rParent ) - ,m_pMouseDownEntry( NULL ) - ,m_pLastActiveEntry( NULL ) + ,m_pMouseDownEntry( nullptr ) + ,m_pLastActiveEntry( nullptr ) { sal_uInt16 nSize = SPACEBETWEENENTRIES; SetSpaceBetweenEntries(nSize); @@ -156,8 +156,8 @@ Rectangle OCreationList::GetFocusRect( SvTreeListEntry* _pEntry, long _nLine ) // try to let the focus rect start before the bitmap item - this looks better SvLBoxItem* pBitmapItem = _pEntry->GetFirstItem( SV_ITEM_ID_LBOXCONTEXTBMP ); - SvLBoxTab* pTab = pBitmapItem ? GetTab( _pEntry, pBitmapItem ) : NULL; - SvViewDataItem* pItemData = pBitmapItem ? GetViewDataItem( _pEntry, pBitmapItem ) : NULL; + SvLBoxTab* pTab = pBitmapItem ? GetTab( _pEntry, pBitmapItem ) : nullptr; + SvViewDataItem* pItemData = pBitmapItem ? GetViewDataItem( _pEntry, pBitmapItem ) : nullptr; OSL_ENSURE( pTab && pItemData, "OCreationList::GetFocusRect: could not find the first bitmap item!" ); if ( pTab && pItemData ) aRect.Left() = pTab->GetPos() - pItemData->maSize.Width() / 2; @@ -180,8 +180,8 @@ void OCreationList::StartDrag( sal_Int8 /*_nAction*/, const Point& /*_rPosPixel* void OCreationList::ModelHasCleared() { SvTreeListBox::ModelHasCleared(); - m_pLastActiveEntry = NULL; - m_pMouseDownEntry = NULL; + m_pLastActiveEntry = nullptr; + m_pMouseDownEntry = nullptr; } void OCreationList::GetFocus() @@ -195,7 +195,7 @@ void OCreationList::LoseFocus() { SvTreeListBox::LoseFocus(); m_pLastActiveEntry = GetCurEntry(); - setCurrentEntryInvalidate( NULL ); + setCurrentEntryInvalidate( nullptr ); } void OCreationList::MouseButtonDown( const MouseEvent& rMEvt ) @@ -215,7 +215,7 @@ void OCreationList::MouseMove( const MouseEvent& rMEvt ) { if ( rMEvt.IsLeaveWindow() ) { - setCurrentEntryInvalidate( NULL ); + setCurrentEntryInvalidate( nullptr ); } else if ( !rMEvt.IsSynthetic() ) { @@ -233,7 +233,7 @@ void OCreationList::MouseMove( const MouseEvent& rMEvt ) { OSL_ENSURE( ( GetCurEntry() == m_pMouseDownEntry ) || !GetCurEntry(), "OCreationList::MouseMove: inconsistence (2)!" ); - setCurrentEntryInvalidate( NULL ); + setCurrentEntryInvalidate( nullptr ); } } else @@ -268,7 +268,7 @@ void OCreationList::MouseButtonUp( const MouseEvent& rMEvt ) ReleaseMouse(); InvalidateEntry( m_pMouseDownEntry ); - m_pMouseDownEntry = NULL; + m_pMouseDownEntry = nullptr; } SvTreeListBox::MouseButtonUp( rMEvt ); @@ -572,8 +572,8 @@ OApplicationDetailView::~OApplicationDetailView() void OApplicationDetailView::dispose() { - set(NULL); - setSplitter(NULL); + set(nullptr); + setSplitter(nullptr); m_aHorzSplitter.disposeAndClear(); m_aTasks.disposeAndClear(); m_aContainer.disposeAndClear(); @@ -644,12 +644,12 @@ bool OApplicationDetailView::interceptKeyInput( const KeyEvent& _rEvent ) void OApplicationDetailView::createTablesPage(const Reference< XConnection >& _xConnection ) { - impl_createPage( E_TABLE, _xConnection, NULL ); + impl_createPage( E_TABLE, _xConnection, nullptr ); } void OApplicationDetailView::createPage( ElementType _eType,const Reference< XNameAccess >& _xContainer ) { - impl_createPage( _eType, NULL, _xContainer ); + impl_createPage( _eType, nullptr, _xContainer ); } void OApplicationDetailView::impl_createPage( ElementType _eType, const Reference< XConnection >& _rxConnection, diff --git a/dbaccess/source/ui/app/AppDetailView.hxx b/dbaccess/source/ui/app/AppDetailView.hxx index 776b5d094313..7ccccb81df79 100644 --- a/dbaccess/source/ui/app/AppDetailView.hxx +++ b/dbaccess/source/ui/app/AppDetailView.hxx @@ -66,7 +66,7 @@ namespace dbaui virtual void GetFocus() override; virtual void LoseFocus() override; - inline void resetLastActive() { m_pLastActiveEntry = NULL;} + inline void resetLastActive() { m_pLastActiveEntry = nullptr;} void updateHelpText(); diff --git a/dbaccess/source/ui/app/AppIconControl.cxx b/dbaccess/source/ui/app/AppIconControl.cxx index a78910f3854b..0fcf1e76b6a5 100644 --- a/dbaccess/source/ui/app/AppIconControl.cxx +++ b/dbaccess/source/ui/app/AppIconControl.cxx @@ -33,7 +33,7 @@ OApplicationIconControl::OApplicationIconControl(vcl::Window* _pParent) : SvtIconChoiceCtrl(_pParent,WB_ICON | WB_NOCOLUMNHEADER | WB_HIGHLIGHTFRAME | /*!WB_NOSELECTION |*/ WB_TABSTOP | WB_CLIPCHILDREN | WB_NOVSCROLL | WB_SMART_ARRANGE | WB_NOHSCROLL | WB_CENTER) ,DropTargetHelper(this) - ,m_pActionListener(NULL) + ,m_pActionListener(nullptr) { struct CategoryDescriptor @@ -74,7 +74,7 @@ void OApplicationIconControl::dispose() if ( pEntry ) { std::unique_ptr<ElementType> aType(static_cast<ElementType*>(pEntry->GetUserData())); - pEntry->SetUserData(NULL); + pEntry->SetUserData(nullptr); } } SvtIconChoiceCtrl::dispose(); diff --git a/dbaccess/source/ui/app/AppSwapWindow.cxx b/dbaccess/source/ui/app/AppSwapWindow.cxx index eb4a6189c97a..5e6db07d5fda 100644 --- a/dbaccess/source/ui/app/AppSwapWindow.cxx +++ b/dbaccess/source/ui/app/AppSwapWindow.cxx @@ -153,7 +153,7 @@ bool OApplicationSwapWindow::onContainerSelected( ElementType _eType ) return true; } - PostUserEvent( LINK( this, OApplicationSwapWindow, ChangeToLastSelected ), NULL, true ); + PostUserEvent( LINK( this, OApplicationSwapWindow, ChangeToLastSelected ), nullptr, true ); return false; } @@ -176,13 +176,13 @@ IMPL_LINK_NOARG_TYPED(OApplicationSwapWindow, ChangeToLastSelected, void*, void) void OApplicationSwapWindow::selectContainer(ElementType _eType) { sal_uLong nCount = m_aIconControl->GetEntryCount(); - SvxIconChoiceCtrlEntry* pEntry = NULL; + SvxIconChoiceCtrlEntry* pEntry = nullptr; for (sal_uLong i=0; i < nCount; ++i) { pEntry = m_aIconControl->GetEntry(i); if ( pEntry && *static_cast<ElementType*>(pEntry->GetUserData()) == _eType ) break; - pEntry = NULL; + pEntry = nullptr; } if ( pEntry ) diff --git a/dbaccess/source/ui/app/AppTitleWindow.cxx b/dbaccess/source/ui/app/AppTitleWindow.cxx index 764656c7f5b8..c05151a15fdc 100644 --- a/dbaccess/source/ui/app/AppTitleWindow.cxx +++ b/dbaccess/source/ui/app/AppTitleWindow.cxx @@ -31,7 +31,7 @@ OTitleWindow::OTitleWindow(vcl::Window* _pParent,sal_uInt16 _nTitleId,WinBits _n , m_aSpace1(VclPtr<FixedText>::Create(this)) , m_aSpace2(VclPtr<FixedText>::Create(this)) , m_aTitle(VclPtr<FixedText>::Create(this)) -, m_pChild(NULL) +, m_pChild(nullptr) , m_bShift(_bShift) { diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx index 95b0b3d46188..56947d139f90 100644 --- a/dbaccess/source/ui/app/AppView.cxx +++ b/dbaccess/source/ui/app/AppView.cxx @@ -60,8 +60,8 @@ using ::com::sun::star::sdb::application::NamedDatabaseObject; // class OAppBorderWindow OAppBorderWindow::OAppBorderWindow(OApplicationView* _pParent,PreviewMode _ePreviewMode) : Window(_pParent,WB_DIALOGCONTROL) - ,m_pPanel(NULL) - ,m_pDetailView(NULL) + ,m_pPanel(nullptr) + ,m_pDetailView(nullptr) ,m_pView(_pParent) { @@ -293,7 +293,7 @@ bool OApplicationView::PreNotify( NotifyEvent& rNEvt ) IClipboardTest* OApplicationView::getActiveChild() const { - IClipboardTest* pTest = NULL; + IClipboardTest* pTest = nullptr; if ( DETAIL == m_eChildFocus ) pTest = getDetailView(); return pTest; @@ -490,7 +490,7 @@ void OApplicationView::showPreview(const Reference< XContent >& _xContent) { OSL_ENSURE(m_pWin && getDetailView(),"Detail view is NULL! -> GPF"); stopComponentListening(m_xObject); - m_xObject = NULL; + m_xObject = nullptr; getDetailView()->showPreview(_xContent); } @@ -503,7 +503,7 @@ void OApplicationView::showPreview( const OUString& _sDataSourceName, if ( isPreviewEnabled() ) { stopComponentListening(m_xObject); - m_xObject = NULL; + m_xObject = nullptr; try { Reference<XNameAccess> xNameAccess; @@ -543,7 +543,7 @@ void OApplicationView::GetFocus() void OApplicationView::_disposing( const css::lang::EventObject& /*_rSource*/ ) { if ( m_pWin && getDetailView() ) - showPreview(NULL); + showPreview(nullptr); } void OApplicationView::ImplInitSettings() diff --git a/dbaccess/source/ui/app/subcomponentmanager.cxx b/dbaccess/source/ui/app/subcomponentmanager.cxx index 880504587747..52ee4d405f57 100644 --- a/dbaccess/source/ui/app/subcomponentmanager.cxx +++ b/dbaccess/source/ui/app/subcomponentmanager.cxx @@ -277,7 +277,7 @@ namespace dbaui Command aCommand; aCommand.Name = "close"; - _rxCommandProcessor->execute( aCommand, nCommandIdentifier, NULL ); + _rxCommandProcessor->execute( aCommand, nCommandIdentifier, nullptr ); bSuccess = true; } catch( const Exception& ) diff --git a/dbaccess/source/ui/browser/AsynchronousLink.cxx b/dbaccess/source/ui/browser/AsynchronousLink.cxx index 7715c91bd5f0..7381437bd0ac 100644 --- a/dbaccess/source/ui/browser/AsynchronousLink.cxx +++ b/dbaccess/source/ui/browser/AsynchronousLink.cxx @@ -27,7 +27,7 @@ OAsynchronousLink::OAsynchronousLink( const Link<void*,void>& _rHandler ) :m_aHandler(_rHandler) ,m_aEventSafety() ,m_aDestructionSafety() - ,m_nEventId(0) + ,m_nEventId(nullptr) { } @@ -37,7 +37,7 @@ OAsynchronousLink::~OAsynchronousLink() ::osl::MutexGuard aEventGuard( m_aEventSafety ); if ( m_nEventId ) Application::RemoveUserEvent(m_nEventId); - m_nEventId = 0; + m_nEventId = nullptr; } { @@ -62,7 +62,7 @@ void OAsynchronousLink::CancelCall() ::osl::MutexGuard aEventGuard( m_aEventSafety ); if ( m_nEventId ) Application::RemoveUserEvent( m_nEventId ); - m_nEventId = 0; + m_nEventId = nullptr; } IMPL_LINK_TYPED(OAsynchronousLink, OnAsyncCall, void*, _pArg, void) @@ -75,7 +75,7 @@ IMPL_LINK_TYPED(OAsynchronousLink, OnAsyncCall, void*, _pArg, void) // our destructor deleted the event just while we are waiting for m_aEventSafety // -> get outta here return; - m_nEventId = 0; + m_nEventId = nullptr; } } m_aHandler.Call(_pArg); diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx index 546c17bcb707..8b63e0ca5df7 100644 --- a/dbaccess/source/ui/browser/brwctrlr.cxx +++ b/dbaccess/source/ui/browser/brwctrlr.cxx @@ -284,7 +284,7 @@ void SAL_CALL SbaXDataBrowserController::FormControllerImpl::addChildController( Reference< runtime::XFormControllerContext > SAL_CALL SbaXDataBrowserController::FormControllerImpl::getContext() throw (RuntimeException, std::exception) { SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::FormControllerImpl::getContext: no support!!" ); - return NULL; + return nullptr; } void SAL_CALL SbaXDataBrowserController::FormControllerImpl::setContext( const Reference< runtime::XFormControllerContext >& /*_context*/ ) throw (RuntimeException, std::exception) @@ -295,7 +295,7 @@ void SAL_CALL SbaXDataBrowserController::FormControllerImpl::setContext( const R Reference< XInteractionHandler > SAL_CALL SbaXDataBrowserController::FormControllerImpl::getInteractionHandler() throw (RuntimeException, std::exception) { SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::FormControllerImpl::getInteractionHandler: no support!!" ); - return NULL; + return nullptr; } void SAL_CALL SbaXDataBrowserController::FormControllerImpl::setInteractionHandler( const Reference< XInteractionHandler >& /*_interactionHandler*/ ) throw (RuntimeException, std::exception) @@ -306,7 +306,7 @@ void SAL_CALL SbaXDataBrowserController::FormControllerImpl::setInteractionHandl Reference< XInterface > SAL_CALL SbaXDataBrowserController::FormControllerImpl::getParent( ) throw (RuntimeException, std::exception) { // don't have any parent form controllers - return NULL; + return nullptr; } void SAL_CALL SbaXDataBrowserController::FormControllerImpl::setParent( const Reference< XInterface >& /*Parent*/ ) throw (NoSupportException, RuntimeException, std::exception) @@ -534,13 +534,13 @@ Any SAL_CALL SbaXDataBrowserController::queryInterface(const Type& _rType) throw SbaXDataBrowserController::SbaXDataBrowserController(const Reference< css::uno::XComponentContext >& _rM) :SbaXDataBrowserController_Base(_rM) ,m_nRowSetPrivileges(0) - ,m_pClipbordNotifier( NULL ) + ,m_pClipbordNotifier( nullptr ) ,m_aAsyncGetCellFocus(LINK(this, SbaXDataBrowserController, OnAsyncGetCellFocus)) ,m_aAsyncDisplayError( LINK( this, SbaXDataBrowserController, OnAsyncDisplayError ) ) ,m_sStateSaveRecord(ModuleRes(RID_STR_SAVE_CURRENT_RECORD)) ,m_sStateUndoRecord(ModuleRes(RID_STR_UNDO_MODIFY_RECORD)) ,m_sModuleIdentifier( OUString( "com.sun.star.sdb.DataSourceBrowser" ) ) - ,m_pFormControllerImpl(NULL) + ,m_pFormControllerImpl(nullptr) ,m_nFormActionNestingLevel(0) ,m_bLoadCanceled( false ) ,m_bCannotSelectUnfiltered( true ) @@ -695,7 +695,7 @@ void SbaXDataBrowserController::initFormatter() m_xFormatter->attachNumberFormatsSupplier(xSupplier); } else // clear the formatter - m_xFormatter = NULL; + m_xFormatter = nullptr; } void SbaXDataBrowserController::describeSupportedFeatures() @@ -1200,7 +1200,7 @@ void SbaXDataBrowserController::disposing() m_pClipbordNotifier->ClearCallbackLink(); m_pClipbordNotifier->AddRemoveListener( getView(), false ); m_pClipbordNotifier->release(); - m_pClipbordNotifier = NULL; + m_pClipbordNotifier = nullptr; } if (getBrowserView()) @@ -1218,9 +1218,9 @@ void SbaXDataBrowserController::disposing() { ::comphelper::disposeComponent(m_xRowSet); - m_xRowSet = NULL; - m_xColumnsSupplier = NULL; - m_xLoadable = NULL; + m_xRowSet = nullptr; + m_xColumnsSupplier = nullptr; + m_xLoadable = nullptr; } catch(Exception&) { @@ -1247,7 +1247,7 @@ void SbaXDataBrowserController::frameAction(const css::frame::FrameActionEvent& if (getBrowserView() && getBrowserView()->getVclControl() && !m_aInvalidateClipboard.IsActive()) { m_aInvalidateClipboard.Start(); - OnInvalidateClipboard( NULL ); + OnInvalidateClipboard( nullptr ); } break; case FrameAction_FRAME_DEACTIVATING: @@ -1256,7 +1256,7 @@ void SbaXDataBrowserController::frameAction(const css::frame::FrameActionEvent& if (getBrowserView() && getBrowserView()->getVclControl() && m_aInvalidateClipboard.IsActive()) { m_aInvalidateClipboard.Stop(); - OnInvalidateClipboard( NULL ); + OnInvalidateClipboard( nullptr ); } // remove the "get cell focus"-event m_aAsyncGetCellFocus.CancelCall(); @@ -1324,7 +1324,7 @@ sal_Bool SbaXDataBrowserController::approveParameter(const css::form::DatabasePa pParamRequest->addContinuation(pAbort); // create the handler, let it handle the request - Reference< XInteractionHandler2 > xHandler( InteractionHandler::createWithParent(getORB(), 0) ); + Reference< XInteractionHandler2 > xHandler( InteractionHandler::createWithParent(getORB(), nullptr) ); xHandler->handle(xParamRequest); if (!pParamValues->wasSelected()) @@ -1476,7 +1476,7 @@ FeatureState SbaXDataBrowserController::GetState(sal_uInt16 nId) const case ID_BROWSER_CUT: { CellControllerRef xCurrentController = getBrowserView()->getVclControl()->Controller(); - if (xCurrentController.Is() && 0 != dynamic_cast< const EditCellController* >(xCurrentController.get())) + if (xCurrentController.Is() && nullptr != dynamic_cast< const EditCellController* >(xCurrentController.get())) { Edit& rEdit = static_cast<Edit&>(xCurrentController->GetWindow()); bool bHasLen = (rEdit.GetSelection().Len() != 0); @@ -1842,7 +1842,7 @@ void SbaXDataBrowserController::ExecuteSearch() Reference< css::util::XNumberFormatsSupplier > xNFS(::dbtools::getNumberFormats(::dbtools::getConnection(m_xRowSet), true, getORB())); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - AbstractFmSearchDialog* pDialog = NULL; + AbstractFmSearchDialog* pDialog = nullptr; if ( pFact ) { ::std::vector< OUString > aContextNames; @@ -2267,19 +2267,19 @@ void SbaXDataBrowserController::SelectionChanged() void SbaXDataBrowserController::CellActivated() { m_aInvalidateClipboard.Start(); - OnInvalidateClipboard( NULL ); + OnInvalidateClipboard( nullptr ); } void SbaXDataBrowserController::CellDeactivated() { m_aInvalidateClipboard.Stop(); - OnInvalidateClipboard( NULL ); + OnInvalidateClipboard( nullptr ); } IMPL_LINK_NOARG_TYPED(SbaXDataBrowserController, OnClipboardChanged, TransferableDataHelper*, void) { SolarMutexGuard aGuard; - OnInvalidateClipboard( NULL ); + OnInvalidateClipboard( nullptr ); } IMPL_LINK_TYPED(SbaXDataBrowserController, OnInvalidateClipboard, Timer*, _pTimer, void) @@ -2435,7 +2435,7 @@ IMPL_LINK_TYPED(SbaXDataBrowserController, OnCanceledNotFound, FmFoundRecordInfo IMPL_LINK_NOARG_TYPED(SbaXDataBrowserController, OnAsyncGetCellFocus, void*, void) { - SbaGridControl* pVclGrid = getBrowserView() ? getBrowserView()->getVclControl() : NULL; + SbaGridControl* pVclGrid = getBrowserView() ? getBrowserView()->getVclControl() : nullptr; // if we have a controller, but the window for the controller doesn't have the focus, we correct this if (pVclGrid && pVclGrid->IsEditing() && pVclGrid->HasChildPathFocus()) pVclGrid->Controller()->GetWindow().GrabFocus(); @@ -2492,7 +2492,7 @@ void SbaXDataBrowserController::initializeParser() const catch(Exception&) { DBG_UNHANDLED_EXCEPTION(); - m_xParser = NULL; + m_xParser = nullptr; // no further handling, we ignore the error } } diff --git a/dbaccess/source/ui/browser/brwview.cxx b/dbaccess/source/ui/browser/brwview.cxx index 4baa3b70ed73..148e428bc170 100644 --- a/dbaccess/source/ui/browser/brwview.cxx +++ b/dbaccess/source/ui/browser/brwview.cxx @@ -68,10 +68,10 @@ UnoDataBrowserView::UnoDataBrowserView( vcl::Window* pParent, IController& _rController, const Reference< css::uno::XComponentContext >& _rxContext) :ODataView(pParent,_rController,_rxContext) - ,m_pTreeView(NULL) - ,m_pSplitter(NULL) - ,m_pVclControl(NULL) - ,m_pStatus(NULL) + ,m_pTreeView(nullptr) + ,m_pSplitter(nullptr) + ,m_pVclControl(nullptr) + ,m_pStatus(nullptr) { } @@ -102,7 +102,7 @@ void UnoDataBrowserView::Construct(const Reference< css::awt::XControlModel >& x getContainer()->addControl(::comphelper::getString(xModelSet->getPropertyValue(PROPERTY_NAME)), m_xGrid); // get the VCL-control - m_pVclControl = NULL; + m_pVclControl = nullptr; getVclControl(); OSL_ENSURE(m_pVclControl != nullptr, "UnoDataBrowserView::Construct : no real grid control !"); @@ -122,7 +122,7 @@ UnoDataBrowserView::~UnoDataBrowserView() void UnoDataBrowserView::dispose() { m_pSplitter.disposeAndClear(); - setTreeView(NULL); + setTreeView(nullptr); m_pStatus.disposeAndClear(); @@ -292,7 +292,7 @@ void UnoDataBrowserView::GetFocus() void UnoDataBrowserView::_disposing( const css::lang::EventObject& /*_rSource*/ ) { stopComponentListening(Reference<XComponent>(VCLUnoHelper::GetInterface(m_pVclControl),UNO_QUERY)); - m_pVclControl = NULL; + m_pVclControl = nullptr; } bool UnoDataBrowserView::PreNotify( NotifyEvent& rNEvt ) diff --git a/dbaccess/source/ui/browser/dbexchange.cxx b/dbaccess/source/ui/browser/dbexchange.cxx index 373ca72e7f98..9cf3126d0306 100644 --- a/dbaccess/source/ui/browser/dbexchange.cxx +++ b/dbaccess/source/ui/browser/dbexchange.cxx @@ -65,8 +65,8 @@ namespace dbaui const Reference< XNumberFormatter >& _rxFormatter, const Reference< XComponentContext >& _rxORB) :ODataAccessObjectTransferable( _rDatasource,OUString(), _nCommandType, _rCommand, _rxConnection ) - ,m_pHtml(NULL) - ,m_pRtf(NULL) + ,m_pHtml(nullptr) + ,m_pRtf(nullptr) { osl_atomic_increment( &m_refCount ); lcl_setListener( _rxConnection, this, true ); @@ -84,8 +84,8 @@ namespace dbaui const Reference< XNumberFormatter >& _rxFormatter, const Reference< XComponentContext >& _rxORB) :ODataAccessObjectTransferable( _rDatasource, OUString(),_nCommandType, _rCommand) - ,m_pHtml(NULL) - ,m_pRtf(NULL) + ,m_pHtml(nullptr) + ,m_pRtf(nullptr) { m_pHtml.set( new OHTMLImportExport( getDescriptor(),_rxORB, _rxFormatter ) ); m_pRtf.set( new ORTFImportExport( getDescriptor(),_rxORB, _rxFormatter ) ); @@ -96,8 +96,8 @@ namespace dbaui const bool i_bBookmarkSelection, const Reference< XComponentContext >& i_rORB ) :ODataAccessObjectTransferable( i_rAliveForm ) - ,m_pHtml(NULL) - ,m_pRtf(NULL) + ,m_pHtml(nullptr) + ,m_pRtf(nullptr) { OSL_PRECOND( i_rORB.is(), "ODataClipboard::ODataClipboard: having no factory is not good ..." ); diff --git a/dbaccess/source/ui/browser/dbloader.cxx b/dbaccess/source/ui/browser/dbloader.cxx index fbd33ce972db..51165c739459 100644 --- a/dbaccess/source/ui/browser/dbloader.cxx +++ b/dbaccess/source/ui/browser/dbloader.cxx @@ -241,7 +241,7 @@ void SAL_CALL DBContentLoader::load(const Reference< XFrame > & rFrame, const OU else if ( !sDataSourceName.isEmpty() ) { ::dbtools::SQLExceptionInfo aError; - xDataSource.set( getDataSourceByName( sDataSourceName, NULL, m_xContext, &aError ) ); + xDataSource.set( getDataSourceByName( sDataSourceName, nullptr, m_xContext, &aError ) ); xDatabaseDocument.set( getDataSourceOrModel( xDataSource ), UNO_QUERY ); } else if ( xConnection.is() ) diff --git a/dbaccess/source/ui/browser/dbtreeview.cxx b/dbaccess/source/ui/browser/dbtreeview.cxx index 19d25d17f4cb..116b2051be6c 100644 --- a/dbaccess/source/ui/browser/dbtreeview.cxx +++ b/dbaccess/source/ui/browser/dbtreeview.cxx @@ -32,11 +32,11 @@ using namespace ::com::sun::star::lang; // class DBTreeView DBTreeView::DBTreeView( vcl::Window* pParent, WinBits nBits) : Window( pParent, nBits ) - , m_pTreeListBox(NULL) + , m_pTreeListBox(nullptr) { m_pTreeListBox = VclPtr<DBTreeListBox>::Create(this, WB_BORDER | WB_HASLINES | WB_HASLINESATROOT | WB_HASBUTTONS | WB_HSCROLL |WB_HASBUTTONSATROOT); - m_pTreeListBox->EnableCheckButton(NULL); + m_pTreeListBox->EnableCheckButton(nullptr); m_pTreeListBox->SetDragDropMode( DragDropMode::NONE ); m_pTreeListBox->EnableInplaceEditing( true ); m_pTreeListBox->SetHelpId(HID_TLB_TREELISTBOX); diff --git a/dbaccess/source/ui/browser/dsEntriesNoExp.cxx b/dbaccess/source/ui/browser/dsEntriesNoExp.cxx index 85630214bb10..17ea461e8c0e 100644 --- a/dbaccess/source/ui/browser/dsEntriesNoExp.cxx +++ b/dbaccess/source/ui/browser/dsEntriesNoExp.cxx @@ -106,7 +106,7 @@ SbaTableQueryBrowser::EntryType SbaTableQueryBrowser::getEntryType( const SvTree void SbaTableQueryBrowser::select(SvTreeListEntry* _pEntry, bool _bSelect) { - SvLBoxItem* pTextItem = _pEntry ? _pEntry->GetFirstItem(SV_ITEM_ID_BOLDLBSTRING) : NULL; + SvLBoxItem* pTextItem = _pEntry ? _pEntry->GetFirstItem(SV_ITEM_ID_BOLDLBSTRING) : nullptr; if (pTextItem) { static_cast<OBoldListboxString*>(pTextItem)->emphasize(_bSelect); @@ -128,7 +128,7 @@ void SbaTableQueryBrowser::selectPath(SvTreeListEntry* _pEntry, bool _bSelect) bool SbaTableQueryBrowser::isSelected(SvTreeListEntry* _pEntry) { - SvLBoxItem* pTextItem = _pEntry ? _pEntry->GetFirstItem(SV_ITEM_ID_BOLDLBSTRING) : NULL; + SvLBoxItem* pTextItem = _pEntry ? _pEntry->GetFirstItem(SV_ITEM_ID_BOLDLBSTRING) : nullptr; if (pTextItem) return static_cast<OBoldListboxString*>(pTextItem)->isEmphasized(); else { diff --git a/dbaccess/source/ui/browser/dsbrowserDnD.cxx b/dbaccess/source/ui/browser/dsbrowserDnD.cxx index b249306b1bc1..d7e8e292bb18 100644 --- a/dbaccess/source/ui/browser/dsbrowserDnD.cxx +++ b/dbaccess/source/ui/browser/dsbrowserDnD.cxx @@ -68,12 +68,12 @@ namespace dbaui OUString aName = GetEntryText( _pApplyTo ); OUString aDSName = getDataSourceAcessor( m_pTreeView->getListBox().GetRootLevelParent( _pApplyTo ) ); - ODataClipboard* pData = NULL; + ODataClipboard* pData = nullptr; SharedConnection xConnection; if ( CommandType::QUERY != _nCommandType ) { if ( _bAllowConnection && !ensureConnection( _pApplyTo, xConnection) ) - return NULL; + return nullptr; pData = new ODataClipboard(aDSName, _nCommandType, aName, xConnection, getNumberFormatter(), getORB()); } else @@ -90,7 +90,7 @@ namespace dbaui { DBG_UNHANDLED_EXCEPTION(); } - return NULL; + return nullptr; } sal_Int8 SbaTableQueryBrowser::queryDrop( const AcceptDropEvent& _rEvt, const DataFlavorExVector& _rFlavors ) { @@ -133,13 +133,13 @@ namespace dbaui if ( m_nAsyncDrop ) Application::RemoveUserEvent(m_nAsyncDrop); - m_nAsyncDrop = 0; + m_nAsyncDrop = nullptr; m_aAsyncDrop.aDroppedData.clear(); m_aAsyncDrop.nType = E_TABLE; m_aAsyncDrop.nAction = _rEvt.mnAction; m_aAsyncDrop.bError = false; m_aAsyncDrop.bHtml = false; - m_aAsyncDrop.pDroppedAt = NULL; + m_aAsyncDrop.pDroppedAt = nullptr; m_aAsyncDrop.aUrl.clear(); // loop through the available formats and see what we can do ... @@ -192,7 +192,7 @@ namespace dbaui if (pTransfer) pTransfer->StartDrag( &m_pTreeView->getListBox(), DND_ACTION_COPY ); - return NULL != pTransfer; + return nullptr != pTransfer; } IMPL_LINK_NOARG_TYPED(SbaTableQueryBrowser, OnCopyEntry, LinkParamNone*, void) { @@ -207,7 +207,7 @@ namespace dbaui } void SbaTableQueryBrowser::copyEntry(SvTreeListEntry* _pEntry) { - TransferableHelper* pTransfer = NULL; + TransferableHelper* pTransfer = nullptr; Reference< XTransferable> aEnsureDelete; EntryType eType = getEntryType(_pEntry); pTransfer = implCopyObject( _pEntry, eType == etQuery ? CommandType::QUERY : CommandType::TABLE); @@ -217,7 +217,7 @@ namespace dbaui } IMPL_LINK_NOARG_TYPED( SbaTableQueryBrowser, OnAsyncDrop, void*, void ) { - m_nAsyncDrop = 0; + m_nAsyncDrop = nullptr; SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); @@ -244,7 +244,7 @@ namespace dbaui DBTreeListUserData* pData = static_cast<DBTreeListUserData*>(pEntryLoop->GetUserData()); if(pData) { - pEntryLoop->SetUserData(NULL); + pEntryLoop->SetUserData(nullptr); Reference< XContainer > xContainer(pData->xContainer, UNO_QUERY); if (xContainer.is()) xContainer->removeContainerListener(this); @@ -261,7 +261,7 @@ namespace dbaui pEntryLoop = m_pTreeModel->Next(pEntryLoop); } } - m_pCurrentlyDisplayed = NULL; + m_pCurrentlyDisplayed = nullptr; } } // namespace dbaui diff --git a/dbaccess/source/ui/browser/exsrcbrw.cxx b/dbaccess/source/ui/browser/exsrcbrw.cxx index 901752e6ed4b..1b5d239eb9eb 100644 --- a/dbaccess/source/ui/browser/exsrcbrw.cxx +++ b/dbaccess/source/ui/browser/exsrcbrw.cxx @@ -62,7 +62,7 @@ Any SAL_CALL SbaExternalSourceBrowser::queryInterface(const Type& _rType) throw SbaExternalSourceBrowser::SbaExternalSourceBrowser(const Reference< css::uno::XComponentContext >& _rM) :SbaXDataBrowserController(_rM) ,m_aModifyListeners(getMutex()) - ,m_pDataSourceImpl(NULL) + ,m_pDataSourceImpl(nullptr) ,m_bInQueryDispatch( false ) { diff --git a/dbaccess/source/ui/browser/formadapter.cxx b/dbaccess/source/ui/browser/formadapter.cxx index 43e481ed4e7e..a25eefce39d5 100644 --- a/dbaccess/source/ui/browser/formadapter.cxx +++ b/dbaccess/source/ui/browser/formadapter.cxx @@ -685,7 +685,7 @@ Reference< XInterface > SAL_CALL SbaXFormAdapter::getStatement() throw( css::sdb { if (m_xMainForm.is()) return m_xMainForm->getStatement(); - return NULL; + return nullptr; } // css::sdbc::XResultSetUpdate diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx index 6f2b3526f2e6..29efea37a09c 100644 --- a/dbaccess/source/ui/browser/genericcontroller.cxx +++ b/dbaccess/source/ui/browser/genericcontroller.cxx @@ -158,7 +158,7 @@ struct OGenericUnoController_Data // OGenericUnoController OGenericUnoController::OGenericUnoController(const Reference< XComponentContext >& _rM) :OGenericUnoController_Base( getMutex() ) - ,m_pView(NULL) + ,m_pView(nullptr) #ifdef DBG_UTIL ,m_bDescribingSupportedFeatures( false ) #endif @@ -313,7 +313,7 @@ void SAL_CALL OGenericUnoController::initialize( const Sequence< Any >& aArgumen catch(Exception&) { // no one clears my view if I won't - m_pView = NULL; + m_pView = nullptr; throw; } } @@ -370,7 +370,7 @@ Reference< XWindow > SAL_CALL OGenericUnoController::getComponentWindow() throw Reference<XSidebarProvider> SAL_CALL OGenericUnoController::getSidebar() throw (RuntimeException, std::exception) { - return NULL; + return nullptr; } OUString SAL_CALL OGenericUnoController::getViewControllerName() throw (css::uno::RuntimeException, std::exception) @@ -606,7 +606,7 @@ void OGenericUnoController::InvalidateFeature(sal_uInt16 _nId, const Reference< void OGenericUnoController::InvalidateAll() { - ImplInvalidateFeature( ALL_FEATURES, NULL, true ); + ImplInvalidateFeature( ALL_FEATURES, nullptr, true ); } void OGenericUnoController::InvalidateAll_Impl() @@ -617,7 +617,7 @@ void OGenericUnoController::InvalidateAll_Impl() aIter != m_aSupportedFeatures.end(); ++aIter ) - ImplBroadcastFeatureState( aIter->first, NULL, true ); + ImplBroadcastFeatureState( aIter->first, nullptr, true ); { ::osl::MutexGuard aGuard( m_aFeatureMutex); @@ -794,7 +794,7 @@ void OGenericUnoController::disposing() m_arrStatusListener.clear(); } - m_xDatabaseContext = NULL; + m_xDatabaseContext = nullptr; { ::osl::MutexGuard aGuard( m_aFeatureMutex); m_aAsyncInvalidateAll.CancelCall(); @@ -806,10 +806,10 @@ void OGenericUnoController::disposing() // check out from all the objects we are listening // the frame stopFrameListening( m_aCurrentFrame.getFrame() ); - m_aCurrentFrame.attachFrame( NULL ); + m_aCurrentFrame.attachFrame( nullptr ); - m_xMasterDispatcher = NULL; - m_xSlaveDispatcher = NULL; + m_xMasterDispatcher = nullptr; + m_xSlaveDispatcher = nullptr; m_xTitleHelper.clear(); m_xUrlTransformer.clear(); m_aInitParameters.clear(); @@ -979,7 +979,7 @@ void OGenericUnoController::setView( const VclPtr<ODataView> &i_rView ) void OGenericUnoController::clearView() { - m_pView = NULL; + m_pView = nullptr; } void OGenericUnoController::showError(const SQLExceptionInfo& _rInfo) @@ -1106,7 +1106,7 @@ namespace { OUString lcl_getModuleHelpModuleName( const Reference< XFrame >& _rxFrame ) { - const sal_Char* pReturn = NULL; + const sal_Char* pReturn = nullptr; try { diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx index 638dd5ff9c42..759c50ffaaa4 100644 --- a/dbaccess/source/ui/browser/sbagrid.cxx +++ b/dbaccess/source/ui/browser/sbagrid.cxx @@ -281,7 +281,7 @@ void SAL_CALL SbaXGridControl::dispose() throw( RuntimeException, std::exception { (*aIter).second->disposeAndClear(aEvt); (*aIter).second->release(); - (*aIter).second = NULL; + (*aIter).second = nullptr; } } StatusMultiplexerArray().swap(m_aStatusMultiplexer); @@ -453,7 +453,7 @@ void SAL_CALL SbaXGridPeer::dispatch(const URL& aURL, const Sequence< PropertyVa { // notify any status listeners that the dialog is now active (well, about to be active) MapDispatchToBool::iterator aThisURLState = m_aDispatchStates.insert( MapDispatchToBool::value_type( eURLType, sal_True ) ).first; - NotifyStatusChanged( aURL, NULL ); + NotifyStatusChanged( aURL, nullptr ); // execute the dialog switch ( eURLType ) @@ -490,7 +490,7 @@ void SAL_CALL SbaXGridPeer::dispatch(const URL& aURL, const Sequence< PropertyVa // notify any status listeners that the dialog vanished m_aDispatchStates.erase( aThisURLState ); - NotifyStatusChanged( aURL, NULL ); + NotifyStatusChanged( aURL, nullptr ); } } @@ -546,7 +546,7 @@ SbaXGridPeer* SbaXGridPeer::getImplementation(const Reference< XInterface >& _rx _rxIFace, UNO_QUERY); if (xTunnel.is()) return reinterpret_cast<SbaXGridPeer*>(xTunnel->getSomething(getUnoTunnelId())); - return NULL; + return nullptr; } VclPtr<FmGridControl> SbaXGridPeer::imp_CreateControl(vcl::Window* pParent, WinBits nStyle) @@ -708,8 +708,8 @@ void SbaGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupM SbaGridControl::SbaGridControl(Reference< XComponentContext > _rM, vcl::Window* pParent, FmXGridPeer* _pPeer, WinBits nBits) :FmGridControl(_rM,pParent, _pPeer, nBits) - ,m_pMasterListener(NULL) - ,m_nAsyncDropEvent(0) + ,m_pMasterListener(nullptr) + ,m_nAsyncDropEvent(nullptr) ,m_nCurrentActionColId((sal_uInt16)-1) ,m_bActivatingForDrop(false) { @@ -735,7 +735,7 @@ VclPtr<BrowserHeader> SbaGridControl::imp_CreateHeaderBar(BrowseBox* pParent) CellController* SbaGridControl::GetController(long nRow, sal_uInt16 nCol) { if ( m_bActivatingForDrop ) - return NULL; + return nullptr; return FmGridControl::GetController(nRow, nCol); } @@ -772,7 +772,7 @@ SvNumberFormatter* SbaGridControl::GetDatasourceFormatter() SvNumberFormatsSupplierObj* pSupplierImpl = SvNumberFormatsSupplierObj::getImplementation( xSupplier ); if ( !pSupplierImpl ) - return NULL; + return nullptr; SvNumberFormatter* pFormatter = pSupplierImpl->GetNumberFormatter(); return pFormatter; @@ -1395,7 +1395,7 @@ sal_Int8 SbaGridControl::ExecuteDrop( const BrowserExecuteDropEvent& rEvt ) ActivateCell(); CellControllerRef xCurrentController = Controller(); - if (!xCurrentController.Is() || 0 == dynamic_cast< const EditCellController* >(xCurrentController.get())) + if (!xCurrentController.Is() || nullptr == dynamic_cast< const EditCellController* >(xCurrentController.get())) return DND_ACTION_NONE; Edit& rEdit = static_cast<Edit&>(xCurrentController->GetWindow()); @@ -1422,7 +1422,7 @@ sal_Int8 SbaGridControl::ExecuteDrop( const BrowserExecuteDropEvent& rEvt ) m_aDataDescriptor = ODataAccessObjectTransferable::extractObjectDescriptor(aDropped); if (m_nAsyncDropEvent) Application::RemoveUserEvent(m_nAsyncDropEvent); - m_nAsyncDropEvent = Application::PostUserEvent(LINK(this, SbaGridControl, AsynchDropEvent), NULL, true); + m_nAsyncDropEvent = Application::PostUserEvent(LINK(this, SbaGridControl, AsynchDropEvent), nullptr, true); return DND_ACTION_COPY; } } @@ -1444,7 +1444,7 @@ Reference< XPropertySet > SbaGridControl::getDataSource() const IMPL_LINK_NOARG_TYPED(SbaGridControl, AsynchDropEvent, void*, void) { - m_nAsyncDropEvent = 0; + m_nAsyncDropEvent = nullptr; Reference< XPropertySet > xDataSource = getDataSource(); if ( xDataSource.is() ) @@ -1452,7 +1452,7 @@ IMPL_LINK_NOARG_TYPED(SbaGridControl, AsynchDropEvent, void*, void) bool bCountFinal = false; xDataSource->getPropertyValue(PROPERTY_ISROWCOUNTFINAL) >>= bCountFinal; if ( !bCountFinal ) - setDataSource(NULL); // dettach from grid control + setDataSource(nullptr); // dettach from grid control Reference< XResultSetUpdate > xResultSetUpdate(xDataSource,UNO_QUERY); ODatabaseImportExport* pImExport = new ORowSetImportExport(this,xResultSetUpdate,m_aDataDescriptor, getContext()); Reference<XEventListener> xHolder = pImExport; @@ -1464,7 +1464,7 @@ IMPL_LINK_NOARG_TYPED(SbaGridControl, AsynchDropEvent, void*, void) if(!pImExport->Read()) { OUString sError = OUString(ModuleRes(STR_NO_COLUMNNAME_MATCHING)); - throwGenericSQLException(sError,NULL); + throwGenericSQLException(sError,nullptr); } AfterDrop(); Show(); diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index d994894ace88..fd349e989ffe 100644 --- a/dbaccess/source/ui/browser/unodatbr.cxx +++ b/dbaccess/source/ui/browser/unodatbr.cxx @@ -213,11 +213,11 @@ SbaTableQueryBrowser::SbaTableQueryBrowser(const Reference< XComponentContext >& ,m_aSelectionListeners( getMutex() ) ,m_aContextMenuInterceptors( getMutex() ) ,m_aTableCopyHelper(this) - ,m_pTreeView(NULL) - ,m_pSplitter(NULL) - ,m_pTreeModel(NULL) - ,m_pCurrentlyDisplayed(NULL) - ,m_nAsyncDrop(0) + ,m_pTreeView(nullptr) + ,m_pSplitter(nullptr) + ,m_pTreeModel(nullptr) + ,m_pCurrentlyDisplayed(nullptr) + ,m_nAsyncDrop(nullptr) ,m_nBorder(1) ,m_bQueryEscapeProcessing( false ) ,m_bShowMenu(false) @@ -296,13 +296,13 @@ void SAL_CALL SbaTableQueryBrowser::disposing() // reset the content's tree view: it holds a reference to our model which is to be deleted immediately, // and it will live longer than we do. if (getBrowserView()) - getBrowserView()->setTreeView(NULL); + getBrowserView()->setTreeView(nullptr); clearTreeModel(); // clear the tree model { ::std::unique_ptr<SvTreeList> aTemp(m_pTreeModel); - m_pTreeModel = NULL; + m_pTreeModel = nullptr; } // remove ourself as status listener @@ -1036,20 +1036,20 @@ void SAL_CALL SbaTableQueryBrowser::statusChanged( const FeatureStateEvent& _rEv void SbaTableQueryBrowser::checkDocumentDataSource() { - SvTreeListEntry* pDataSourceEntry = NULL; - SvTreeListEntry* pContainerEntry = NULL; + SvTreeListEntry* pDataSourceEntry = nullptr; + SvTreeListEntry* pContainerEntry = nullptr; SvTreeListEntry* pObjectEntry = getObjectEntry( m_aDocumentDataSource, &pDataSourceEntry, &pContainerEntry, false ); - bool bKnownDocDataSource = (NULL != pObjectEntry); + bool bKnownDocDataSource = (nullptr != pObjectEntry); if (!bKnownDocDataSource) { - if (NULL != pDataSourceEntry) + if (nullptr != pDataSourceEntry) { // at least the data source is known - if (NULL != pContainerEntry) + if (nullptr != pContainerEntry) bKnownDocDataSource = true; // assume we know it. // TODO: should we expand the object container? This may be too expensive just for checking .... else { - if ((NULL == pObjectEntry) && m_aDocumentDataSource.has(daCommandType) && m_aDocumentDataSource.has(daCommand)) + if ((nullptr == pObjectEntry) && m_aDocumentDataSource.has(daCommandType) && m_aDocumentDataSource.has(daCommand)) { // maybe we have a command to be displayed ? sal_Int32 nCommandType = CommandType::TABLE; m_aDocumentDataSource[daCommandType] >>= nCommandType; @@ -1132,11 +1132,11 @@ SvTreeListEntry* SbaTableQueryBrowser::getObjectEntry(const OUString& _rDataSour const SharedConnection& _rxConnection ) { if (_ppDataSourceEntry) - *_ppDataSourceEntry = NULL; + *_ppDataSourceEntry = nullptr; if (_ppContainerEntry) - *_ppContainerEntry = NULL; + *_ppContainerEntry = nullptr; - SvTreeListEntry* pObject = NULL; + SvTreeListEntry* pObject = nullptr; if ( m_pTreeView ) { // look for the data source entry @@ -1146,7 +1146,7 @@ SvTreeListEntry* SbaTableQueryBrowser::getObjectEntry(const OUString& _rDataSour // #i33699# FilterByEntryDataId aFilter( sDataSourceId ); - SvTreeListEntry* pDataSource = m_pTreeView->getListBox().GetEntryPosByName( sDisplayName, NULL, &aFilter ); + SvTreeListEntry* pDataSource = m_pTreeView->getListBox().GetEntryPosByName( sDisplayName, nullptr, &aFilter ); if ( !pDataSource ) // check if the data source name is a file location { if ( bIsDataSourceURL ) @@ -1154,7 +1154,7 @@ SvTreeListEntry* SbaTableQueryBrowser::getObjectEntry(const OUString& _rDataSour // special case, the data source is a URL // add new entries to the list box model implAddDatasource( _rDataSource, _rxConnection ); - pDataSource = m_pTreeView->getListBox().GetEntryPosByName( sDisplayName, NULL, &aFilter ); + pDataSource = m_pTreeView->getListBox().GetEntryPosByName( sDisplayName, nullptr, &aFilter ); OSL_ENSURE( pDataSource, "SbaTableQueryBrowser::getObjectEntry: hmm - did not find it again!" ); } } @@ -1169,7 +1169,7 @@ SvTreeListEntry* SbaTableQueryBrowser::getObjectEntry(const OUString& _rDataSour m_pTreeView->getListBox().Expand(pDataSource); // look for the object container - SvTreeListEntry* pCommandType = NULL; + SvTreeListEntry* pCommandType = nullptr; switch (_nCommandType) { case CommandType::TABLE: @@ -1391,7 +1391,7 @@ void SAL_CALL SbaTableQueryBrowser::disposing( const css::lang::EventObject& _rS { // our connection is in dispose so we have to find the entry equal with this connection // and close it what means to collapse the entry // get the top-level representing the removed data source - SvTreeListEntry* pDSLoop = m_pTreeView->getListBox().FirstChild(NULL); + SvTreeListEntry* pDSLoop = m_pTreeView->getListBox().FirstChild(nullptr); while (pDSLoop) { DBTreeListUserData* pData = static_cast<DBTreeListUserData*>(pDSLoop->GetUserData()); @@ -1694,11 +1694,11 @@ FeatureState SbaTableQueryBrowser::GetState(sal_uInt16 nId) const DBTreeListUserData* pDSData = pDataSourceEntry ? static_cast< DBTreeListUserData* >( pDataSourceEntry->GetUserData() ) - : NULL; + : nullptr; if ( nId == ID_TREE_CLOSE_CONN ) { - aReturn.bEnabled = ( pDSData != NULL ) && pDSData->xConnection.is(); + aReturn.bEnabled = ( pDSData != nullptr ) && pDSData->xConnection.is(); } else if ( nId == ID_TREE_EDIT_DATABASE ) { @@ -1706,7 +1706,7 @@ FeatureState SbaTableQueryBrowser::GetState(sal_uInt16 nId) const "/org.openoffice.Office.DataAccess/Policies/Features/Common" ) ); bool bHaveEditDatabase( true ); OSL_VERIFY( aConfig.getNodeValue( "EditDatabaseFromDataSourceView" ) >>= bHaveEditDatabase ); - aReturn.bEnabled = getORB().is() && ( pDataSourceEntry != NULL ) && bHaveEditDatabase; + aReturn.bEnabled = getORB().is() && ( pDataSourceEntry != nullptr ) && bHaveEditDatabase; } else if ( nId == ID_BROWSER_COPY ) { @@ -1946,7 +1946,7 @@ void SbaTableQueryBrowser::Execute(sal_uInt16 nId, const Sequence< PropertyValue { // transfer the selected rows only if not all rows are selected // (all rows means the whole table) // #i3832# - if (pSelection != NULL) + if (pSelection != nullptr) { aSelection.realloc(pSelection->GetSelectCount()); long nIdx = pSelection->FirstSelected(); @@ -2452,8 +2452,8 @@ bool SbaTableQueryBrowser::implSelect(const OUString& _rDataSourceName, const OU { if (_rDataSourceName.getLength() && _rCommand.getLength() && (-1 != _nCommandType)) { - SvTreeListEntry* pDataSource = NULL; - SvTreeListEntry* pCommandType = NULL; + SvTreeListEntry* pDataSource = nullptr; + SvTreeListEntry* pCommandType = nullptr; SvTreeListEntry* pCommand = getObjectEntry( _rDataSourceName, _rCommand, _nCommandType, &pDataSource, &pCommandType, true, _rxConnection ); if (pCommand) @@ -2479,7 +2479,7 @@ bool SbaTableQueryBrowser::implSelect(const OUString& _rDataSourceName, const OU if ( m_pCurrentlyDisplayed ) { // tell the old entry (if any) it has been deselected selectPath(m_pCurrentlyDisplayed, false); - m_pCurrentlyDisplayed = NULL; + m_pCurrentlyDisplayed = nullptr; } // we have a command and need to display this in the rowset @@ -2582,7 +2582,7 @@ bool SbaTableQueryBrowser::implSelect( SvTreeListEntry* _pEntry ) // tell the old entry it has been deselected selectPath(m_pCurrentlyDisplayed, false); - m_pCurrentlyDisplayed = NULL; + m_pCurrentlyDisplayed = nullptr; // not really loaded m_pCurrentlyDisplayed = _pEntry; @@ -2725,8 +2725,8 @@ bool SbaTableQueryBrowser::implSelect( SvTreeListEntry* _pEntry ) SvTreeListEntry* SbaTableQueryBrowser::getEntryFromContainer(const Reference<XNameAccess>& _rxNameAccess) { DBTreeListBox& rListBox = m_pTreeView->getListBox(); - SvTreeListEntry* pContainer = NULL; - SvTreeListEntry* pDSLoop = rListBox.FirstChild(NULL); + SvTreeListEntry* pContainer = nullptr; + SvTreeListEntry* pDSLoop = rListBox.FirstChild(nullptr); while (pDSLoop) { pContainer = rListBox.GetEntry(pDSLoop, CONTAINER_QUERIES); @@ -2740,7 +2740,7 @@ SvTreeListEntry* SbaTableQueryBrowser::getEntryFromContainer(const Reference<XNa break; pDSLoop = SvTreeList::NextSibling(pDSLoop); - pContainer = NULL; + pContainer = nullptr; } return pContainer; } @@ -2812,7 +2812,7 @@ void SAL_CALL SbaTableQueryBrowser::elementRemoved( const ContainerEvent& _rEven unloadAndCleanup( false ); // don't dispose the connection DBTreeListUserData* pData = static_cast<DBTreeListUserData*>(pTemp->GetUserData()); - pTemp->SetUserData(NULL); + pTemp->SetUserData(nullptr); delete pData; // the data could be null because we have a table which isn't correct m_pTreeModel->Remove(pTemp); @@ -2826,7 +2826,7 @@ void SAL_CALL SbaTableQueryBrowser::elementRemoved( const ContainerEvent& _rEven if (m_pTreeView->getListBox().GetEntryText(pChild) == aName) { DBTreeListUserData* pData = static_cast<DBTreeListUserData*>(pChild->GetUserData()); - pChild->SetUserData(NULL); + pChild->SetUserData(nullptr); delete pData; m_pTreeModel->Remove(pChild); break; @@ -2868,7 +2868,7 @@ void SAL_CALL SbaTableQueryBrowser::elementReplaced( const ContainerEvent& _rEve } else { - pTemp->SetUserData(NULL); + pTemp->SetUserData(nullptr); delete pData; } } @@ -2890,7 +2890,7 @@ void SAL_CALL SbaTableQueryBrowser::elementReplaced( const ContainerEvent& _rEve } else { - pChild->SetUserData(NULL); + pChild->SetUserData(nullptr); delete pData; } } @@ -2975,7 +2975,7 @@ void SbaTableQueryBrowser::closeConnection(SvTreeListEntry* _pDSEntry, bool _bDi SvTreeListEntry* pRemove = pElements; pElements = SvTreeList::NextSibling(pElements); DBTreeListUserData* pData = static_cast<DBTreeListUserData*>(pRemove->GetUserData()); - pRemove->SetUserData(NULL); + pRemove->SetUserData(nullptr); delete pData; m_pTreeModel->Remove(pRemove); } @@ -3001,7 +3001,7 @@ void SbaTableQueryBrowser::unloadAndCleanup( bool _bDisposeConnection ) { selectPath(m_pCurrentlyDisplayed, false); } - m_pCurrentlyDisplayed = NULL; + m_pCurrentlyDisplayed = nullptr; try { @@ -3287,7 +3287,7 @@ bool SbaTableQueryBrowser::ensureConnection(SvTreeListEntry* _pAnyEntry, SharedC DBTreeListUserData* pDSData = pDSEntry ? static_cast<DBTreeListUserData*>(pDSEntry->GetUserData()) - : NULL; + : nullptr; return ensureConnection( pDSEntry, pDSData, _rConnection ); } @@ -3307,7 +3307,7 @@ bool SbaTableQueryBrowser::getExistentConnectionFor( SvTreeListEntry* _pAnyEntry DBTreeListUserData* pDSData = pDSEntry ? static_cast< DBTreeListUserData* >( pDSEntry->GetUserData() ) - : NULL; + : nullptr; if ( pDSData ) _rConnection = pDSData->xConnection; return _rConnection.is(); @@ -3342,7 +3342,7 @@ bool SbaTableQueryBrowser::ensureConnection( SvTreeListEntry* _pDSEntry, void* p // connect _rConnection.reset( - connect( getDataSourceAcessor( _pDSEntry ), sConnectingContext, NULL ), + connect( getDataSourceAcessor( _pDSEntry ), sConnectingContext, nullptr ), SharedConnection::TakeOwnership ); @@ -3438,13 +3438,13 @@ void SbaTableQueryBrowser::implAdministrate( SvTreeListEntry* _pApplyTo ) if (pTopLevelSelected) sInitialSelection = getDataSourceAcessor( pTopLevelSelected ); - Reference< XDataSource > xDataSource( getDataSourceByName( sInitialSelection, getView(), getORB(), NULL ) ); + Reference< XDataSource > xDataSource( getDataSourceByName( sInitialSelection, getView(), getORB(), nullptr ) ); Reference< XModel > xDocumentModel( getDataSourceOrModel( xDataSource ), UNO_QUERY ); if ( xDocumentModel.is() ) { Reference< XInteractionHandler2 > xInteractionHandler( - InteractionHandler::createWithParent(getORB(), 0) ); + InteractionHandler::createWithParent(getORB(), nullptr) ); ::comphelper::NamedValueCollection aLoadArgs; aLoadArgs.put( "Model", xDocumentModel ); @@ -3484,7 +3484,7 @@ PopupMenu* SbaTableQueryBrowser::getContextMenu( Control& _rControl ) const OSL_PRECOND( &m_pTreeView->getListBox() == &_rControl, "SbaTableQueryBrowser::getContextMenu: where does this come from?" ); if ( &m_pTreeView->getListBox() != &_rControl ) - return NULL; + return nullptr; return new PopupMenu( ModuleRes( MENU_BROWSER_DEFAULTCONTEXT ) ); } @@ -3511,7 +3511,7 @@ Any SbaTableQueryBrowser::getCurrentSelection( Control& _rControl ) const if ( !pSelected ) return Any(); - OSL_ENSURE( m_pTreeView->getListBox().NextSelected( pSelected ) == NULL, + OSL_ENSURE( m_pTreeView->getListBox().NextSelected( pSelected ) == nullptr, "SbaTableQueryBrowser::getCurrentSelection: single-selection is expected here!" ); NamedDatabaseObject aSelectedObject; @@ -3679,8 +3679,8 @@ bool SbaTableQueryBrowser::preReloadForm() extractDescriptorProps(aDesc, sDataSource, sCommand, nCommandType, bEscapeProcessing); if ( !sDataSource.isEmpty() && !sCommand.isEmpty() && (-1 != nCommandType) ) { - SvTreeListEntry* pDataSource = NULL; - SvTreeListEntry* pCommandType = NULL; + SvTreeListEntry* pDataSource = nullptr; + SvTreeListEntry* pCommandType = nullptr; m_pCurrentlyDisplayed = getObjectEntry( sDataSource, sCommand, nCommandType, &pDataSource, &pCommandType, true, SharedConnection() ); bIni = true; } @@ -3740,7 +3740,7 @@ void SAL_CALL SbaTableQueryBrowser::registeredDatabaseLocation( const DatabaseRe void SbaTableQueryBrowser::impl_cleanupDataSourceEntry( const OUString& _rDataSourceName ) { // get the top-level representing the removed data source - SvTreeListEntry* pDataSourceEntry = m_pTreeView->getListBox().FirstChild( NULL ); + SvTreeListEntry* pDataSourceEntry = m_pTreeView->getListBox().FirstChild( nullptr ); while ( pDataSourceEntry ) { if ( m_pTreeView->getListBox().GetEntryText( pDataSourceEntry ) == _rDataSourceName ) @@ -3761,7 +3761,7 @@ void SbaTableQueryBrowser::impl_cleanupDataSourceEntry( const OUString& _rDataSo } else OSL_ENSURE( - ( NULL == m_pCurrentlyDisplayed ) + ( nullptr == m_pCurrentlyDisplayed ) || ( m_pTreeView->getListBox().GetRootLevelParent( m_pCurrentlyDisplayed ) != pDataSourceEntry ), "SbaTableQueryBrowser::impl_cleanupDataSourceEntry: inconsistence (2)!"); @@ -3775,13 +3775,13 @@ void SbaTableQueryBrowser::impl_cleanupDataSourceEntry( const OUString& _rDataSo { SvTreeListEntry* pEntry = (*it).get(); const DBTreeListUserData* pData = static_cast<const DBTreeListUserData*>(pEntry->GetUserData()); - pEntry->SetUserData(NULL); + pEntry->SetUserData(nullptr); delete pData; } // remove the entry DBTreeListUserData* pData = static_cast< DBTreeListUserData* >( pDataSourceEntry->GetUserData() ); - pDataSourceEntry->SetUserData( NULL ); + pDataSourceEntry->SetUserData( nullptr ); delete pData; m_pTreeModel->Remove( pDataSourceEntry ); } diff --git a/dbaccess/source/ui/control/ColumnControlWindow.cxx b/dbaccess/source/ui/control/ColumnControlWindow.cxx index bea1115205f0..82624b22406c 100644 --- a/dbaccess/source/ui/control/ColumnControlWindow.cxx +++ b/dbaccess/source/ui/control/ColumnControlWindow.cxx @@ -37,7 +37,7 @@ using namespace ::com::sun::star::lang; // OColumnControlWindow OColumnControlWindow::OColumnControlWindow(vcl::Window* pParent ,const Reference<XComponentContext>& _rxContext) - : OFieldDescControl(pParent,NULL) + : OFieldDescControl(pParent,nullptr) , m_xContext(_rxContext) , m_sTypeNames(ModuleRes(STR_TABLEDESIGN_DBFIELDTYPES)) , m_bAutoIncrementEnabled(true) @@ -128,7 +128,7 @@ Reference< XConnection> OColumnControlWindow::getConnection() void OColumnControlWindow::setConnection(const Reference< XConnection>& _xCon) { m_xConnection = _xCon; - m_xFormatter = NULL; + m_xFormatter = nullptr; m_aDestTypeInfoIndex.clear(); m_aDestTypeInfo.clear(); diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx index fbcbeb5272d4..97ddddebab75 100644 --- a/dbaccess/source/ui/control/FieldDescControl.cxx +++ b/dbaccess/source/ui/control/FieldDescControl.cxx @@ -93,35 +93,35 @@ namespace OFieldDescControl::OFieldDescControl( vcl::Window* pParent, OTableDesignHelpBar* pHelpBar ) :TabPage( pParent, WB_3DLOOK | WB_DIALOGCONTROL ) ,pHelp( pHelpBar ) - ,pLastFocusWindow(NULL) - ,m_pActFocusWindow(NULL) - ,pDefaultText(NULL) - ,pRequiredText(NULL) - ,pAutoIncrementText(NULL) - ,pTextLenText(NULL) - ,pNumTypeText(NULL) - ,pLengthText(NULL) - ,pScaleText(NULL) - ,pFormatText(NULL) - ,pBoolDefaultText(NULL) - ,m_pColumnNameText(NULL) - ,m_pTypeText(NULL) - ,m_pAutoIncrementValueText(NULL) - ,pRequired(NULL) - ,pNumType(NULL) - ,pAutoIncrement(NULL) - ,pDefault(NULL) - ,pTextLen(NULL) - ,pLength(NULL) - ,pScale(NULL) - ,pFormatSample(NULL) - ,pBoolDefault(NULL) - ,m_pColumnName(NULL) - ,m_pType(NULL) - ,m_pAutoIncrementValue(NULL) - ,pFormat(NULL) - ,m_pVertScroll( NULL ) - ,m_pHorzScroll( NULL ) + ,pLastFocusWindow(nullptr) + ,m_pActFocusWindow(nullptr) + ,pDefaultText(nullptr) + ,pRequiredText(nullptr) + ,pAutoIncrementText(nullptr) + ,pTextLenText(nullptr) + ,pNumTypeText(nullptr) + ,pLengthText(nullptr) + ,pScaleText(nullptr) + ,pFormatText(nullptr) + ,pBoolDefaultText(nullptr) + ,m_pColumnNameText(nullptr) + ,m_pTypeText(nullptr) + ,m_pAutoIncrementValueText(nullptr) + ,pRequired(nullptr) + ,pNumType(nullptr) + ,pAutoIncrement(nullptr) + ,pDefault(nullptr) + ,pTextLen(nullptr) + ,pLength(nullptr) + ,pScale(nullptr) + ,pFormatSample(nullptr) + ,pBoolDefault(nullptr) + ,m_pColumnName(nullptr) + ,m_pType(nullptr) + ,m_pAutoIncrementValue(nullptr) + ,pFormat(nullptr) + ,m_pVertScroll( nullptr ) + ,m_pHorzScroll( nullptr ) ,m_pPreviousType() ,m_nPos(-1) ,aYes(ModuleRes(STR_VALUE_YES)) @@ -131,7 +131,7 @@ OFieldDescControl::OFieldDescControl( vcl::Window* pParent, OTableDesignHelpBar* ,m_nWidth(50) ,m_bAdded(false) ,m_bRightAligned(false) - ,pActFieldDescr(NULL) + ,pActFieldDescr(nullptr) { Contruct(); } @@ -389,7 +389,7 @@ void OFieldDescControl::ScrollAllAggregates() OSL_ENSURE(sizeof(ppAggregates)/sizeof(ppAggregates[0]) == sizeof(ppAggregatesText)/sizeof(ppAggregatesText[0]),"Lists are not identical!"); for (sal_uInt16 i=0; i<sizeof(ppAggregates)/sizeof(ppAggregates[0]); ++i) - ScrollAggregate(ppAggregatesText[i],ppAggregates[i],NULL,nDeltaX, nDeltaY); + ScrollAggregate(ppAggregatesText[i],ppAggregates[i],nullptr,nDeltaX, nDeltaY); ScrollAggregate(pFormatText,pFormatSample,pFormat,nDeltaX, nDeltaY); } @@ -674,7 +674,7 @@ void OFieldDescControl::ArrangeAggregates() // And go ... int nCurrentControlPos = 0; - Control* pZOrderPredecessor = NULL; + Control* pZOrderPredecessor = nullptr; for (size_t i=0; i<sizeof(adAggregates)/sizeof(adAggregates[0]); i++) { if (adAggregates[i].pctrlInputControl) @@ -706,8 +706,8 @@ void OFieldDescControl::ArrangeAggregates() } // Finally, put the ScrollBars at the top of the z-order - m_pVertScroll->SetZOrder(NULL, ZOrderFlags::First); - m_pHorzScroll->SetZOrder(NULL, ZOrderFlags::First); + m_pVertScroll->SetZOrder(nullptr, ZOrderFlags::First); + m_pHorzScroll->SetZOrder(nullptr, ZOrderFlags::First); } void OFieldDescControl::ActivateAggregate( EControlType eType ) @@ -928,7 +928,7 @@ VclPtr<OPropNumericEditCtrl> OFieldDescControl::CreateNumericControl(sal_uInt16 void OFieldDescControl::DeactivateAggregate( EControlType eType ) { - pLastFocusWindow = NULL; + pLastFocusWindow = nullptr; // Destroy Controls switch( eType ) { @@ -1071,7 +1071,7 @@ void OFieldDescControl::DisplayData(OFieldDescription* pFieldDescr ) DeactivateAggregate( tpAutoIncrementValue ); m_pPreviousType = TOTypeInfoSP(); // Reset the saved focus' pointer - pLastFocusWindow = NULL; + pLastFocusWindow = nullptr; if ( m_bAdded ) { ::dbaui::notifySystemWindow(this,this,::comphelper::mem_fun(&TaskPaneList::RemoveWindow)); @@ -1098,7 +1098,7 @@ void OFieldDescControl::DisplayData(OFieldDescription* pFieldDescr ) if( m_pPreviousType != pFieldType ) { // Reset the saved focus' pointer - pLastFocusWindow = NULL; + pLastFocusWindow = nullptr; // Controls, which must NOT be displayed again DeactivateAggregate( tpNumType ); @@ -1509,7 +1509,7 @@ void OFieldDescControl::GetFocus() if( pLastFocusWindow ) { pLastFocusWindow->GrabFocus(); - pLastFocusWindow = NULL; + pLastFocusWindow = nullptr; } } @@ -1528,7 +1528,7 @@ void OFieldDescControl::implFocusLost(vcl::Window* _pWhich) void OFieldDescControl::LoseFocus() { - implFocusLost(NULL); + implFocusLost(nullptr); TabPage::LoseFocus(); } diff --git a/dbaccess/source/ui/control/RelationControl.cxx b/dbaccess/source/ui/control/RelationControl.cxx index e0d4b2ce6421..57bfb8a8139d 100644 --- a/dbaccess/source/ui/control/RelationControl.cxx +++ b/dbaccess/source/ui/control/RelationControl.cxx @@ -132,10 +132,10 @@ namespace dbaui EditBrowseBoxFlags::SMART_TAB_TRAVEL | EditBrowseBoxFlags::NO_HANDLE_COLUMN_CONTENT, WB_TABSTOP | WB_BORDER, BrowserMode::AUTOSIZE_LASTCOL) - , m_pBoxControl(NULL) + , m_pBoxControl(nullptr) , m_nDataPos(0) - , m_xSourceDef(NULL) - , m_xDestDef(NULL) + , m_xSourceDef(nullptr) + , m_xDestDef(nullptr) { } @@ -192,9 +192,9 @@ namespace dbaui bool ORelationControl::PreNotify(NotifyEvent& rNEvt) { if (rNEvt.GetType() == MouseNotifyEvent::LOSEFOCUS && !HasChildPathFocus() ) - PostUserEvent(LINK(this, ORelationControl, AsynchDeactivate), NULL, true); + PostUserEvent(LINK(this, ORelationControl, AsynchDeactivate), nullptr, true); else if (rNEvt.GetType() == MouseNotifyEvent::GETFOCUS) - PostUserEvent(LINK(this, ORelationControl, AsynchActivate), NULL, true); + PostUserEvent(LINK(this, ORelationControl, AsynchActivate), nullptr, true); return EditBrowseBox::PreNotify(rNEvt); } @@ -466,8 +466,8 @@ namespace dbaui void OTableListBoxControl::fillListBoxes() { OSL_ENSURE( !m_pTableMap->empty(), "OTableListBoxControl::fillListBoxes: no table window!"); - OTableWindow* pInitialLeft = NULL; - OTableWindow* pInitialRight = NULL; + OTableWindow* pInitialLeft = nullptr; + OTableWindow* pInitialRight = nullptr; // Collect the names of all TabWins OJoinTableView::OTableWindowMap::const_iterator aIter = m_pTableMap->begin(); @@ -517,8 +517,8 @@ namespace dbaui IMPL_LINK_TYPED( OTableListBoxControl, OnTableChanged, ListBox&, rListBox, void ) { OUString strSelected(rListBox.GetSelectEntry()); - OTableWindow* pLeft = NULL; - OTableWindow* pRight = NULL; + OTableWindow* pLeft = nullptr; + OTableWindow* pRight = nullptr; // Special treatment: If there are only two tables, we need to switch the other one too when changing in a LB if ( m_pTableMap->size() == 2 ) @@ -550,10 +550,10 @@ namespace dbaui { // First we need the TableDef to the Table and with it the TabWin OJoinTableView::OTableWindowMap::const_iterator aFind = m_pTableMap->find(strSelected); - OTableWindow* pLoop = NULL; + OTableWindow* pLoop = nullptr; if( aFind != m_pTableMap->end() ) pLoop = aFind->second; - OSL_ENSURE(pLoop != NULL, "ORelationDialog::OnTableChanged: invalid ListBox entry!"); + OSL_ENSURE(pLoop != nullptr, "ORelationDialog::OnTableChanged: invalid ListBox entry!"); // We need to find strSelect, because we filled the ListBoxes with the table names with which we compare now if (&rListBox == m_pLeftTable) { diff --git a/dbaccess/source/ui/control/ScrollHelper.cxx b/dbaccess/source/ui/control/ScrollHelper.cxx index e6270ca7674f..03bcdcb879a7 100644 --- a/dbaccess/source/ui/control/ScrollHelper.cxx +++ b/dbaccess/source/ui/control/ScrollHelper.cxx @@ -39,13 +39,13 @@ namespace dbaui // if pointer in bottom area begin scroll if( aScrollArea.IsInside(_rPoint) ) - m_aUpScroll.Call(NULL); + m_aUpScroll.Call(nullptr); else { aScrollArea.SetPos(Point(0,0)); // if pointer in top area begin scroll if( aScrollArea.IsInside(_rPoint) ) - m_aDownScroll.Call(NULL); + m_aDownScroll.Call(nullptr); } } } diff --git a/dbaccess/source/ui/control/TableGrantCtrl.cxx b/dbaccess/source/ui/control/TableGrantCtrl.cxx index 5316ef088533..15d4b944243d 100644 --- a/dbaccess/source/ui/control/TableGrantCtrl.cxx +++ b/dbaccess/source/ui/control/TableGrantCtrl.cxx @@ -48,10 +48,10 @@ const sal_uInt16 COL_DROP = 8; // OTableGrantControl OTableGrantControl::OTableGrantControl( vcl::Window* pParent, WinBits nBits) :EditBrowseBox( pParent, EditBrowseBoxFlags::SMART_TAB_TRAVEL | EditBrowseBoxFlags::NO_HANDLE_COLUMN_CONTENT, nBits ) - ,m_pCheckCell( NULL ) - ,m_pEdit( NULL ) + ,m_pCheckCell( nullptr ) + ,m_pEdit( nullptr ) ,m_nDataPos( 0 ) - ,m_nDeactivateEvent(0) + ,m_nDeactivateEvent(nullptr) { // Spalten einfuegen sal_uInt16 i=1; @@ -79,13 +79,13 @@ void OTableGrantControl::dispose() if (m_nDeactivateEvent) { Application::RemoveUserEvent(m_nDeactivateEvent); - m_nDeactivateEvent = 0; + m_nDeactivateEvent = nullptr; } m_pCheckCell.disposeAndClear(); m_pEdit.disposeAndClear(); - m_xTables = NULL; + m_xTables = nullptr; ::svt::EditBrowseBox::dispose(); } @@ -156,26 +156,26 @@ bool OTableGrantControl::PreNotify(NotifyEvent& rNEvt) { if (m_nDeactivateEvent) Application::RemoveUserEvent(m_nDeactivateEvent); - m_nDeactivateEvent = Application::PostUserEvent(LINK(this, OTableGrantControl, AsynchDeactivate), NULL, true); + m_nDeactivateEvent = Application::PostUserEvent(LINK(this, OTableGrantControl, AsynchDeactivate), nullptr, true); } if (rNEvt.GetType() == MouseNotifyEvent::GETFOCUS) { if (m_nDeactivateEvent) Application::RemoveUserEvent(m_nDeactivateEvent); - m_nDeactivateEvent = Application::PostUserEvent(LINK(this, OTableGrantControl, AsynchActivate), NULL, true); + m_nDeactivateEvent = Application::PostUserEvent(LINK(this, OTableGrantControl, AsynchActivate), nullptr, true); } return EditBrowseBox::PreNotify(rNEvt); } IMPL_LINK_NOARG_TYPED(OTableGrantControl, AsynchActivate, void*, void) { - m_nDeactivateEvent = 0; + m_nDeactivateEvent = nullptr; ActivateCell(); } IMPL_LINK_NOARG_TYPED(OTableGrantControl, AsynchDeactivate, void*, void) { - m_nDeactivateEvent = 0; + m_nDeactivateEvent = nullptr; DeactivateCell(); } @@ -360,7 +360,7 @@ void OTableGrantControl::setGrantUser(const Reference< XAuthorizable>& _xGrantUs CellController* OTableGrantControl::GetController( long nRow, sal_uInt16 nColumnId ) { - CellController* pController = NULL; + CellController* pController = nullptr; switch( nColumnId ) { case COL_TABLE_NAME: diff --git a/dbaccess/source/ui/control/VertSplitView.cxx b/dbaccess/source/ui/control/VertSplitView.cxx index d13f0bc8d248..f23f9becbbd7 100644 --- a/dbaccess/source/ui/control/VertSplitView.cxx +++ b/dbaccess/source/ui/control/VertSplitView.cxx @@ -29,9 +29,9 @@ using namespace ::dbaui; // class OSplitterView OSplitterView::OSplitterView(vcl::Window* _pParent,bool _bVertical) : Window(_pParent,WB_DIALOGCONTROL) // ,WB_BORDER - ,m_pSplitter( NULL ) - ,m_pLeft(NULL) - ,m_pRight(NULL) + ,m_pSplitter( nullptr ) + ,m_pLeft(nullptr) + ,m_pRight(nullptr) ,m_bVertical(_bVertical) { ImplInitSettings( true, true, true ); diff --git a/dbaccess/source/ui/control/curledit.cxx b/dbaccess/source/ui/control/curledit.cxx index 912dd3f780d4..3ce810781cdf 100644 --- a/dbaccess/source/ui/control/curledit.cxx +++ b/dbaccess/source/ui/control/curledit.cxx @@ -28,8 +28,8 @@ namespace dbaui OConnectionURLEdit::OConnectionURLEdit(vcl::Window* _pParent, WinBits _nBits,bool _bShowPrefix) :Edit(_pParent, _nBits) - ,m_pTypeCollection(NULL) - ,m_pForcedPrefix(NULL) + ,m_pTypeCollection(nullptr) + ,m_pForcedPrefix(nullptr) ,m_bShowPrefix(_bShowPrefix) { } diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx index abf996b8c494..4de1b8129b3e 100644 --- a/dbaccess/source/ui/control/dbtreelistbox.cxx +++ b/dbaccess/source/ui/control/dbtreelistbox.cxx @@ -56,9 +56,9 @@ using namespace ::com::sun::star::view; // class DBTreeListBox DBTreeListBox::DBTreeListBox( vcl::Window* pParent, WinBits nWinStyle ,bool _bHandleEnterKey) :SvTreeListBox(pParent,nWinStyle) - ,m_pDragedEntry(NULL) - ,m_pActionListener(NULL) - ,m_pContextMenuProvider( NULL ) + ,m_pDragedEntry(nullptr) + ,m_pActionListener(nullptr) + ,m_pContextMenuProvider( nullptr ) ,m_bHandleEnterKey(_bHandleEnterKey) { init(); @@ -99,7 +99,7 @@ SvTreeListEntry* DBTreeListBox::GetEntryPosByName( const OUString& aName, SvTree std::pair<SvTreeListEntries::iterator,SvTreeListEntries::iterator> aIters = myModel->GetChildIterators(pStart); - SvTreeListEntry* pEntry = NULL; + SvTreeListEntry* pEntry = nullptr; SvTreeListEntries::iterator it = aIters.first, itEnd = aIters.second; for (; it != itEnd; ++it) { @@ -113,7 +113,7 @@ SvTreeListEntry* DBTreeListBox::GetEntryPosByName( const OUString& aName, SvTree // found break; } - pEntry = NULL; + pEntry = nullptr; } return pEntry; @@ -171,7 +171,7 @@ void DBTreeListBox::SelectHdl() void DBTreeListBox::MouseButtonDown( const MouseEvent& rMEvt ) { - bool bHitEmptySpace = (NULL == GetEntry(rMEvt.GetPosPixel(), true)); + bool bHitEmptySpace = (nullptr == GetEntry(rMEvt.GetPosPixel(), true)); if (bHitEmptySpace && (rMEvt.GetClicks() == 2) && rMEvt.IsMod1()) Control::MouseButtonDown(rMEvt); else @@ -222,7 +222,7 @@ sal_Int8 DBTreeListBox::AcceptDrop( const AcceptDropEvent& _rEvt ) { SvTreeListEntry* pDroppedEntry = GetEntry(_rEvt.maPosPixel); // check if drag is on child entry, which is not allowed - SvTreeListEntry* pParent = NULL; + SvTreeListEntry* pParent = nullptr; if ( _rEvt.mnAction & DND_ACTION_MOVE ) { if ( !m_pDragedEntry ) // no entry to move @@ -233,7 +233,7 @@ sal_Int8 DBTreeListBox::AcceptDrop( const AcceptDropEvent& _rEvt ) return nDropOption; } - pParent = pDroppedEntry ? GetParent(pDroppedEntry) : NULL; + pParent = pDroppedEntry ? GetParent(pDroppedEntry) : nullptr; while ( pParent && pParent != m_pDragedEntry ) pParent = GetParent(pParent); } @@ -321,17 +321,17 @@ void DBTreeListBox::KeyInput( const KeyEvent& rKEvt ) case KeyFuncType::COPY: bHandled = ( m_aCopyHandler.IsSet() && !m_aSelectedEntries.empty() ); if ( bHandled ) - m_aCopyHandler.Call( NULL ); + m_aCopyHandler.Call( nullptr ); break; case KeyFuncType::PASTE: bHandled = ( m_aPasteHandler.IsSet() && !m_aSelectedEntries.empty() ); if ( bHandled ) - m_aPasteHandler.Call( NULL ); + m_aPasteHandler.Call( nullptr ); break; case KeyFuncType::DELETE: bHandled = ( m_aDeleteHandler.IsSet() && !m_aSelectedEntries.empty() ); if ( bHandled ) - m_aDeleteHandler.Call( NULL ); + m_aDeleteHandler.Call( nullptr ); break; default: break; @@ -575,7 +575,7 @@ std::unique_ptr<PopupMenu> DBTreeListBox::CreateContextMenu() aEvent.ExecutePosition.X = -1; aEvent.ExecutePosition.Y = -1; aEvent.ActionTriggerContainer = ::framework::ActionTriggerHelper::CreateActionTriggerContainerFromMenu( - pContextMenu.get(), 0 ); + pContextMenu.get(), nullptr ); aEvent.Selection = new SelectionSupplier( m_pContextMenuProvider->getCurrentSelection( *this ) ); ::cppu::OInterfaceIteratorHelper aIter( *pInterceptors ); @@ -593,7 +593,7 @@ std::unique_ptr<PopupMenu> DBTreeListBox::CreateContextMenu() switch ( eAction ) { case ContextMenuInterceptorAction_CANCELLED: - return NULL; + return nullptr; case ContextMenuInterceptorAction_EXECUTE_MODIFIED: bModifiedMenu = true; @@ -646,7 +646,7 @@ IMPL_LINK_NOARG_TYPED(DBTreeListBox, OnTimeOut, Timer*, void) { implStopSelectionTimer(); - m_aSelChangeHdl.Call( NULL ); + m_aSelChangeHdl.Call( nullptr ); } void DBTreeListBox::StateChanged( StateChangedType nStateChange ) diff --git a/dbaccess/source/ui/control/marktree.cxx b/dbaccess/source/ui/control/marktree.cxx index 60804e129908..9484b29a5bb9 100644 --- a/dbaccess/source/ui/control/marktree.cxx +++ b/dbaccess/source/ui/control/marktree.cxx @@ -182,7 +182,7 @@ void OMarkableTreeListBox::checkedButton_noBroadcast(SvTreeListEntry* _pEntry) } } - SvTreeListEntry* pEntry = IsSelected(_pEntry) ? FirstSelected() : NULL; + SvTreeListEntry* pEntry = IsSelected(_pEntry) ? FirstSelected() : nullptr; while(pEntry) { SetCheckButtonState(pEntry,eState); diff --git a/dbaccess/source/ui/control/sqledit.cxx b/dbaccess/source/ui/control/sqledit.cxx index 86338bf43bec..19574fa309a3 100644 --- a/dbaccess/source/ui/control/sqledit.cxx +++ b/dbaccess/source/ui/control/sqledit.cxx @@ -198,7 +198,7 @@ void OSqlEdit::SetText(const OUString& rNewText) if (m_timerUndoActionCreation.IsActive()) { // create the trailing undo-actions m_timerUndoActionCreation.Stop(); - LINK(this, OSqlEdit, OnUndoActionTimer).Call(NULL); + LINK(this, OSqlEdit, OnUndoActionTimer).Call(nullptr); } MultiLineEditSyntaxHighlight::SetText(rNewText); diff --git a/dbaccess/source/ui/control/tabletree.cxx b/dbaccess/source/ui/control/tabletree.cxx index d38d062b93df..6a746901883c 100644 --- a/dbaccess/source/ui/control/tabletree.cxx +++ b/dbaccess/source/ui/control/tabletree.cxx @@ -268,7 +268,7 @@ void OTableTreeListBox::UpdateTableList( const Reference< XConnection >& _rxConn sRootEntryText = ModuleRes(STR_ALL_VIEWS); else sRootEntryText = ModuleRes(STR_ALL_TABLES_AND_VIEWS); - InsertEntry( sRootEntryText, NULL, false, TREELIST_APPEND, reinterpret_cast< void* >( DatabaseObjectContainer::TABLES ) ); + InsertEntry( sRootEntryText, nullptr, false, TREELIST_APPEND, reinterpret_cast< void* >( DatabaseObjectContainer::TABLES ) ); } if ( _rTables.empty() ) @@ -344,7 +344,7 @@ void OTableTreeListBox::checkWildcard(SvTreeListEntry* _pEntry) SvTreeListEntry* OTableTreeListBox::getAllObjectsEntry() const { - return haveVirtualRoot() ? First() : NULL; + return haveVirtualRoot() ? First() : nullptr; } void OTableTreeListBox::checkedButton_noBroadcast(SvTreeListEntry* _pEntry) @@ -420,7 +420,7 @@ SvTreeListEntry* OTableTreeListBox::implAddEntry( { OSL_PRECOND( _rxMeta.is(), "OTableTreeListBox::implAddEntry: invalid meta data!" ); if ( !_rxMeta.is() ) - return NULL; + return nullptr; // split the complete name into it's components OUString sCatalog, sSchema, sName; @@ -458,7 +458,7 @@ SvTreeListEntry* OTableTreeListBox::implAddEntry( pParentEntry = pFolder; } - SvTreeListEntry* pRet = NULL; + SvTreeListEntry* pRet = nullptr; if ( !_bCheckName || !GetEntryPosByName( sName, pParentEntry ) ) { pRet = InsertEntry( sName, pParentEntry ); @@ -530,7 +530,7 @@ SvTreeListEntry* OTableTreeListBox::addedTable( const OUString& _rName ) { DBG_UNHANDLED_EXCEPTION(); } - return NULL; + return nullptr; } bool OTableTreeListBox::impl_getAndAssertMetaData( Reference< XDatabaseMetaData >& _out_rMetaData ) const @@ -565,10 +565,10 @@ OUString OTableTreeListBox::getQualifiedTableName( SvTreeListEntry* _pEntry ) co ) // here we support catalog but no schema ) { - if ( pCatalog == NULL ) + if ( pCatalog == nullptr ) { pCatalog = pSchema; - pSchema = NULL; + pSchema = nullptr; } sCatalog = GetEntryText( pCatalog ); } @@ -592,15 +592,15 @@ SvTreeListEntry* OTableTreeListBox::getEntryByQualifiedName( const OUString& _rN { Reference< XDatabaseMetaData > xMeta; if ( !impl_getAndAssertMetaData( xMeta ) ) - return NULL; + return nullptr; // split the complete name into it's components OUString sCatalog, sSchema, sName; qualifiedNameComponents(xMeta, _rName, sCatalog, sSchema, sName,::dbtools::eInDataManipulation); SvTreeListEntry* pParent = getAllObjectsEntry(); - SvTreeListEntry* pCat = NULL; - SvTreeListEntry* pSchema = NULL; + SvTreeListEntry* pCat = nullptr; + SvTreeListEntry* pSchema = nullptr; if ( !sCatalog.isEmpty() ) { pCat = GetEntryPosByName(sCatalog, pParent); @@ -621,7 +621,7 @@ SvTreeListEntry* OTableTreeListBox::getEntryByQualifiedName( const OUString& _rN { DBG_UNHANDLED_EXCEPTION(); } - return NULL; + return nullptr; } void OTableTreeListBox::removedTable( const OUString& _rName ) diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx index ecd2edc7bac8..da5b77b4a6cb 100644 --- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx @@ -90,7 +90,7 @@ namespace dbaui OConnectionHelper::OConnectionHelper( vcl::Window* pParent, const OString& _rId, const OUString& _rUIXMLDescription, const SfxItemSet& _rCoreAttrs) : OGenericAdministrationPage(pParent, _rId, _rUIXMLDescription, _rCoreAttrs) , m_bUserGrabFocus(false) - , m_pCollection(NULL) + , m_pCollection(nullptr) { get(m_pFT_Connection, "browseurllabel"); get(m_pConnectionURL, "browseurl"); @@ -536,7 +536,7 @@ namespace dbaui ::ucbhelper::Content aCheckExistence; IS_PATH_EXIST eExists = PATH_NOT_EXIST; Reference< css::task::XInteractionHandler > xInteractionHandler( - task::InteractionHandler::createWithParent(m_xORB, 0), UNO_QUERY ); + task::InteractionHandler::createWithParent(m_xORB, nullptr), UNO_QUERY ); OFilePickerInteractionHandler* pHandler = new OFilePickerInteractionHandler(xInteractionHandler); xInteractionHandler = pHandler; diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx index 8719315b9203..565386d7ea18 100644 --- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx +++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx @@ -183,7 +183,7 @@ using namespace ::com::sun::star; if ( m_pETHostServer->IsValueChangedFromSaved() ) { const DbuTypeCollectionItem* pCollectionItem = dynamic_cast<const DbuTypeCollectionItem*>( _rSet->GetItem(DSID_TYPECOLLECTION) ); - ::dbaccess::ODsnTypeCollection* pCollection = NULL; + ::dbaccess::ODsnTypeCollection* pCollection = nullptr; if (pCollectionItem) pCollection = pCollectionItem->getCollection(); OSL_ENSURE(pCollection, "OLDAPConnectionPageSetup::FillItemSet : really need a DSN type collection !"); @@ -279,7 +279,7 @@ using namespace ::com::sun::star; { // show the "Connect directly" option only if the driver is installed const DbuTypeCollectionItem* pCollectionItem = dynamic_cast<const DbuTypeCollectionItem*>( _rSet.GetItem(DSID_TYPECOLLECTION) ); - bool bHasMySQLNative = ( pCollectionItem != NULL ) && pCollectionItem->getCollection()->hasDriver( "sdbc:mysqlc:" ); + bool bHasMySQLNative = ( pCollectionItem != nullptr ) && pCollectionItem->getCollection()->hasDriver( "sdbc:mysqlc:" ); if ( bHasMySQLNative ) m_pNATIVEDatabase->Show(); @@ -414,7 +414,7 @@ using namespace ::com::sun::star; const SfxStringItem* pUrlItem = _rCoreAttrs.GetItem<SfxStringItem>(DSID_CONNECTURL); const DbuTypeCollectionItem* pTypesItem = _rCoreAttrs.GetItem<DbuTypeCollectionItem>(DSID_TYPECOLLECTION); - ::dbaccess::ODsnTypeCollection* pTypeCollection = pTypesItem ? pTypesItem->getCollection() : NULL; + ::dbaccess::ODsnTypeCollection* pTypeCollection = pTypesItem ? pTypesItem->getCollection() : nullptr; if (pTypeCollection && pUrlItem && pUrlItem->GetValue().getLength() ) { m_sDefaultJdbcDriverName = pTypeCollection->getJavaDriverClass(pUrlItem->GetValue()); diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx index 684f9bc85ec2..9f23a8e6dfa9 100644 --- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx +++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx @@ -86,7 +86,7 @@ namespace dbaui OLDAPConnectionPageSetup( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ); virtual ~OLDAPConnectionPageSetup(); virtual void dispose() override; - virtual void callModifiedHdl(void* pControl = 0) override; + virtual void callModifiedHdl(void* pControl = nullptr) override; protected: virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; @@ -126,7 +126,7 @@ namespace dbaui virtual bool FillItemSet( SfxItemSet* _rCoreAttrs ) override; virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; - virtual void callModifiedHdl(void* pControl = 0) override; + virtual void callModifiedHdl(void* pControl = nullptr) override; }; // OGeneralSpecialJDBCConnectionPageSetup @@ -150,7 +150,7 @@ namespace dbaui virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) override; virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) override; - virtual void callModifiedHdl(void* pControl = 0) override; + virtual void callModifiedHdl(void* pControl = nullptr) override; DECL_LINK_TYPED(OnTestJavaClickHdl, Button*, void); VclPtr<FixedText> m_pHeaderText; diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx index 2ec9b1b90fbb..d295374a4478 100644 --- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx +++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx @@ -245,13 +245,13 @@ bool ODbDataSourceAdministrationHelper::getCurrentSettings(Sequence< PropertyVal if ( !xHandler.is() ) { // instantiate the default SDB interaction handler - xHandler.set( task::InteractionHandler::createWithParent(m_xContext, 0), UNO_QUERY ); + xHandler.set( task::InteractionHandler::createWithParent(m_xContext, nullptr), UNO_QUERY ); } OUString sName = pName ? pName->GetValue() : OUString(); OUString sLoginRequest(ModuleRes(STR_ENTER_CONNECTION_PASSWORD)); OUString sTemp = sName; - sName = ::dbaui::getStrippedDatabaseName(NULL,sTemp); + sName = ::dbaui::getStrippedDatabaseName(nullptr,sTemp); if ( !sName.isEmpty() ) sLoginRequest = sLoginRequest.replaceAll("$name$", sName); else @@ -267,7 +267,7 @@ bool ODbDataSourceAdministrationHelper::getCurrentSettings(Sequence< PropertyVal aRequest.Diagnostic = sLoginRequest; aRequest.HasRealm = aRequest.HasAccount = sal_False; // aRequest.Realm - aRequest.HasUserName = pUser != 0; + aRequest.HasUserName = pUser != nullptr; aRequest.UserName = pUser ? OUString(pUser->GetValue()) : OUString(); aRequest.HasPassword = sal_True; //aRequest.Password @@ -535,7 +535,7 @@ OUString ODbDataSourceAdministrationHelper::getConnectionURL() const case ::dbaccess::DST_LDAP: { const SfxInt32Item* pPortNumber = m_pItemSetHelper->getOutputSet()->GetItem<SfxInt32Item>(DSID_CONN_LDAP_PORTNUMBER); - sNewUrl = pCollection->cutPrefix(pUrlItem->GetValue()) + lcl_createHostWithPort(NULL,pPortNumber); + sNewUrl = pCollection->cutPrefix(pUrlItem->GetValue()) + lcl_createHostWithPort(nullptr,pPortNumber); } break; case ::dbaccess::DST_JDBC: diff --git a/dbaccess/source/ui/dlg/QueryPropertiesDialog.cxx b/dbaccess/source/ui/dlg/QueryPropertiesDialog.cxx index 7182276a6224..2b0d4d303686 100644 --- a/dbaccess/source/ui/dlg/QueryPropertiesDialog.cxx +++ b/dbaccess/source/ui/dlg/QueryPropertiesDialog.cxx @@ -15,9 +15,9 @@ namespace dbaui QueryPropertiesDialog::QueryPropertiesDialog( vcl::Window* pParent, const bool bDistinct, const sal_Int64 nLimit ) : ModalDialog(pParent, "QueryPropertiesDialog", "dbaccess/ui/querypropertiesdialog.ui") - , m_pRB_Distinct( 0 ) - , m_pRB_NonDistinct( 0 ) - , m_pLB_Limit( 0 ) + , m_pRB_Distinct( nullptr ) + , m_pRB_NonDistinct( nullptr ) + , m_pLB_Limit( nullptr ) { get( m_pRB_Distinct, "distinct" ); get( m_pRB_NonDistinct, "nondistinct" ); diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx index 689a47d24e91..7a312f7d1452 100644 --- a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx @@ -109,7 +109,7 @@ namespace dbaui { TC_SEPARATORS, m_pFormatHeader }, { TC_HEADER, m_pRowHeader }, { TC_CHARSET, m_pCharSetHeader }, - { 0, NULL } + { 0, nullptr } }; for ( size_t section=0; section < sizeof( aSections ) / sizeof( aSections[0] ) - 1; ++section ) @@ -245,7 +245,7 @@ namespace dbaui { OUString sExtension = GetExtension(); OUString aErrorText; - Control* pErrorWin = NULL; + Control* pErrorWin = nullptr; OUString aDelText(m_pFieldSeparator->GetText()); if(aDelText.isEmpty()) { // No FieldSeparator diff --git a/dbaccess/source/ui/dlg/UserAdmin.cxx b/dbaccess/source/ui/dlg/UserAdmin.cxx index 954a530c63fc..94d98687a44e 100644 --- a/dbaccess/source/ui/dlg/UserAdmin.cxx +++ b/dbaccess/source/ui/dlg/UserAdmin.cxx @@ -118,10 +118,10 @@ IMPL_LINK_TYPED( OPasswordDialog, ModifiedHdl, Edit&, rEdit, void ) // OUserAdmin OUserAdmin::OUserAdmin(vcl::Window* pParent,const SfxItemSet& _rAttrSet) : OGenericAdministrationPage( pParent, "UserAdminPage", "dbaccess/ui/useradminpage.ui", _rAttrSet) - , m_pUSER(0) - , m_pNEWUSER(0) - , m_pCHANGEPWD(0) - , m_pDELETEUSER(0) + , m_pUSER(nullptr) + , m_pNEWUSER(nullptr) + , m_pCHANGEPWD(nullptr) + , m_pDELETEUSER(nullptr) ,m_TableCtrl(VclPtr<OTableGrantControl>::Create(get<VclAlignment>("table"), WB_TABSTOP)) { m_TableCtrl->Show(); @@ -144,7 +144,7 @@ OUserAdmin::~OUserAdmin() void OUserAdmin::dispose() { - m_xConnection = NULL; + m_xConnection = nullptr; m_TableCtrl.disposeAndClear(); m_pUSER.clear(); m_pNEWUSER.clear(); diff --git a/dbaccess/source/ui/dlg/UserAdminDlg.cxx b/dbaccess/source/ui/dlg/UserAdminDlg.cxx index 0d138142b99a..fc2241f15043 100644 --- a/dbaccess/source/ui/dlg/UserAdminDlg.cxx +++ b/dbaccess/source/ui/dlg/UserAdminDlg.cxx @@ -65,7 +65,7 @@ namespace dbaui delete pExampleSet; pExampleSet = new SfxItemSet(*GetInputSetImpl()); - AddTabPage("settings", OUserAdmin::Create, 0); + AddTabPage("settings", OUserAdmin::Create, nullptr); // remove the reset button - it's meaning is much too ambiguous in this dialog RemoveResetButton(); @@ -89,7 +89,7 @@ namespace dbaui } } - SetInputSet(NULL); + SetInputSet(nullptr); DELETEZ(pExampleSet); SfxTabDialog::dispose(); } @@ -102,7 +102,7 @@ namespace dbaui if ( !aMetaData.supportsUserAdministration( getORB() ) ) { OUString sError(ModuleRes(STR_USERADMIN_NOT_AVAILABLE)); - throw SQLException(sError,NULL,OUString("S1000") ,0,Any()); + throw SQLException(sError,nullptr,OUString("S1000") ,0,Any()); } } catch(const SQLException&) diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx index f5c23bdeb67a..91404f5330d0 100644 --- a/dbaccess/source/ui/dlg/adminpages.cxx +++ b/dbaccess/source/ui/dlg/adminpages.cxx @@ -59,8 +59,8 @@ namespace dbaui OGenericAdministrationPage::OGenericAdministrationPage(vcl::Window* _pParent, const OString& _rId, const OUString& _rUIXMLDescription, const SfxItemSet& _rAttrSet) :SfxTabPage(_pParent, _rId, _rUIXMLDescription, &_rAttrSet) ,m_abEnableRoadmap(false) - ,m_pAdminDialog(NULL) - ,m_pItemSetHelper(NULL) + ,m_pAdminDialog(nullptr) + ,m_pItemSetHelper(nullptr) { SetExchangeSupport(); diff --git a/dbaccess/source/ui/dlg/adminpages.hxx b/dbaccess/source/ui/dlg/adminpages.hxx index 5f32265b6489..17d66a91684f 100644 --- a/dbaccess/source/ui/dlg/adminpages.hxx +++ b/dbaccess/source/ui/dlg/adminpages.hxx @@ -136,7 +136,7 @@ namespace dbaui virtual void ActivatePage() override; protected: - virtual void callModifiedHdl(void* /*pControl*/ = 0) { m_aModifiedHandler.Call(this); } + virtual void callModifiedHdl(void* /*pControl*/ = nullptr) { m_aModifiedHandler.Call(this); } /// called from within DeactivatePage. The page is allowed to be deactivated if this method returns sal_True virtual bool prepareLeave() { return true; } diff --git a/dbaccess/source/ui/dlg/adtabdlg.cxx b/dbaccess/source/ui/dlg/adtabdlg.cxx index c689dd1814eb..1dcfc1f6a94a 100644 --- a/dbaccess/source/ui/dlg/adtabdlg.cxx +++ b/dbaccess/source/ui/dlg/adtabdlg.cxx @@ -343,7 +343,7 @@ OAddTableDlg::OAddTableDlg( vcl::Window* pParent, IAddTableDialogContext& _rCont m_pTableList->EnableInplaceEditing( false ); m_pTableList->SetStyle(m_pTableList->GetStyle() | WB_BORDER | WB_HASLINES |WB_HASBUTTONS | WB_HASBUTTONSATROOT | WB_HASLINESATROOT | WB_SORT | WB_HSCROLL ); - m_pTableList->EnableCheckButton( NULL ); // do not show any buttons + m_pTableList->EnableCheckButton( nullptr ); // do not show any buttons m_pTableList->SetSelectionMode( SINGLE_SELECTION ); m_pTableList->notifyHiContrastChanged(); m_pTableList->suppressEmptyFolders(); @@ -419,7 +419,7 @@ void OAddTableDlg::impl_addTable() IMPL_LINK_NOARG_TYPED( OAddTableDlg, AddClickHdl, Button*, void ) { - TableListDoubleClickHdl(NULL); + TableListDoubleClickHdl(nullptr); } IMPL_LINK_NOARG_TYPED( OAddTableDlg, TableListDoubleClickHdl, SvTreeListBox*, bool ) diff --git a/dbaccess/source/ui/dlg/advancedsettings.cxx b/dbaccess/source/ui/dlg/advancedsettings.cxx index 1f1e68595b33..d7a0fd7cd1a0 100644 --- a/dbaccess/source/ui/dlg/advancedsettings.cxx +++ b/dbaccess/source/ui/dlg/advancedsettings.cxx @@ -62,26 +62,26 @@ namespace dbaui SpecialSettingsPage::SpecialSettingsPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs, const DataSourceMetaData& _rDSMeta ) : OGenericAdministrationPage(pParent, "SpecialSettingsPage", "dbaccess/ui/specialsettingspage.ui", _rCoreAttrs) - , m_pIsSQL92Check( NULL ) - , m_pAppendTableAlias( NULL ) - , m_pAsBeforeCorrelationName( NULL ) - , m_pEnableOuterJoin( NULL ) - , m_pIgnoreDriverPrivileges( NULL ) - , m_pParameterSubstitution( NULL ) - , m_pSuppressVersionColumn( NULL ) - , m_pCatalog( NULL ) - , m_pSchema( NULL ) - , m_pIndexAppendix( NULL ) - , m_pDosLineEnds( NULL ) - , m_pCheckRequiredFields( NULL ) - , m_pIgnoreCurrency(NULL) - , m_pEscapeDateTime(NULL) - , m_pPrimaryKeySupport(NULL) - , m_pRespectDriverResultSetType(NULL) - , m_pBooleanComparisonModeLabel( NULL ) - , m_pBooleanComparisonMode( NULL ) - , m_pMaxRowScanLabel( NULL ) - , m_pMaxRowScan( NULL ) + , m_pIsSQL92Check( nullptr ) + , m_pAppendTableAlias( nullptr ) + , m_pAsBeforeCorrelationName( nullptr ) + , m_pEnableOuterJoin( nullptr ) + , m_pIgnoreDriverPrivileges( nullptr ) + , m_pParameterSubstitution( nullptr ) + , m_pSuppressVersionColumn( nullptr ) + , m_pCatalog( nullptr ) + , m_pSchema( nullptr ) + , m_pIndexAppendix( nullptr ) + , m_pDosLineEnds( nullptr ) + , m_pCheckRequiredFields( nullptr ) + , m_pIgnoreCurrency(nullptr) + , m_pEscapeDateTime(nullptr) + , m_pPrimaryKeySupport(nullptr) + , m_pRespectDriverResultSetType(nullptr) + , m_pBooleanComparisonModeLabel( nullptr ) + , m_pBooleanComparisonMode( nullptr ) + , m_pMaxRowScanLabel( nullptr ) + , m_pMaxRowScan( nullptr ) , m_aControlDependencies() , m_aBooleanSettings() , m_bHasBooleanComparisonMode( _rDSMeta.getFeatureSet().has( DSID_BOOLEANCOMPARISON ) ) @@ -105,7 +105,7 @@ namespace dbaui // check whether this must be a tristate check box const SfxPoolItem& rItem = _rCoreAttrs.Get( nItemId ); - if ( 0 != dynamic_cast< const OptionalBoolItem* >(&rItem) ) + if ( nullptr != dynamic_cast< const OptionalBoolItem* >(&rItem) ) (*setting->ppControl)->EnableTriState(); } } @@ -436,13 +436,13 @@ namespace dbaui // auto-generated values? if (rFeatures.supportsGeneratedValues()) - AddTabPage("generated", ODriversSettings::CreateGeneratedValuesPage, NULL); + AddTabPage("generated", ODriversSettings::CreateGeneratedValuesPage, nullptr); else RemoveTabPage("generated"); // any "special settings"? if (rFeatures.supportsAnySpecialSetting()) - AddTabPage("special", ODriversSettings::CreateSpecialSettingsPage, NULL); + AddTabPage("special", ODriversSettings::CreateSpecialSettingsPage, nullptr); else RemoveTabPage("special"); @@ -457,7 +457,7 @@ namespace dbaui void AdvancedSettingsDialog::dispose() { - SetInputSet(NULL); + SetInputSet(nullptr); DELETEZ(pExampleSet); SfxTabDialog::dispose(); } diff --git a/dbaccess/source/ui/dlg/dbadmin.cxx b/dbaccess/source/ui/dlg/dbadmin.cxx index 62c7668500cc..26a0879ae7e8 100644 --- a/dbaccess/source/ui/dlg/dbadmin.cxx +++ b/dbaccess/source/ui/dlg/dbadmin.cxx @@ -58,7 +58,7 @@ ODbAdminDialog::ODbAdminDialog(vcl::Window* _pParent m_pImpl.reset(new ODbDataSourceAdministrationHelper(_rxContext,this,this)); // add the initial tab page - m_nMainPageID = AddTabPage("advanced", OConnectionTabPage::Create, NULL); + m_nMainPageID = AddTabPage("advanced", OConnectionTabPage::Create, nullptr); // remove the reset button - it's meaning is much too ambiguous in this dialog RemoveResetButton(); @@ -71,7 +71,7 @@ ODbAdminDialog::~ODbAdminDialog() void ODbAdminDialog::dispose() { - SetInputSet(NULL); + SetInputSet(nullptr); DELETEZ(pExampleSet); SfxTabDialog::dispose(); } @@ -99,7 +99,7 @@ void ODbAdminDialog::PageCreated(sal_uInt16 _nId, SfxTabPage& _rPage) void ODbAdminDialog::addDetailPage(sal_uInt16 _nPageId, sal_uInt16 _nTextId, CreateTabPage _pCreateFunc) { - AddTabPage(_nPageId, OUString(ModuleRes(_nTextId)), _pCreateFunc, NULL); + AddTabPage(_nPageId, OUString(ModuleRes(_nTextId)), _pCreateFunc, nullptr); m_aCurrentDetailPages.push(_nPageId); } @@ -159,7 +159,7 @@ void ODbAdminDialog::impl_selectDataSource(const css::uno::Any& _aDataSourceName case ::dbaccess::DST_USERDEFINE10: { OUString aTitle(ModuleRes(STR_PAGETITLE_ADVANCED)); - AddTabPage(PAGE_USERDRIVER, aTitle, ODriversSettings::CreateUser, 0, false, 1); + AddTabPage(PAGE_USERDRIVER, aTitle, ODriversSettings::CreateUser, nullptr, false, 1); m_aCurrentDetailPages.push(PAGE_USERDRIVER); } break; @@ -204,7 +204,7 @@ void ODbAdminDialog::impl_resetPages(const Reference< XPropertySet >& _rxDatasou ::dbaccess::ODsnTypeCollection* pCollection = rCollectionItem.getCollection(); if ( pCollection->determineType(getDatasourceType( *pExampleSet )) == ::dbaccess::DST_MYSQL_NATIVE ) { - AddTabPage( PAGE_MYSQL_NATIVE, OUString( ModuleRes( STR_PAGETITLE_CONNECTION ) ), ODriversSettings::CreateMySQLNATIVE, NULL ); + AddTabPage( PAGE_MYSQL_NATIVE, OUString( ModuleRes( STR_PAGETITLE_CONNECTION ) ), ODriversSettings::CreateMySQLNATIVE, nullptr ); RemoveTabPage("advanced"); m_nMainPageID = PAGE_MYSQL_NATIVE; } @@ -298,9 +298,9 @@ void ODbAdminDialog::clearPassword() SfxItemSet* ODbAdminDialog::createItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rpPool, SfxPoolItem**& _rppDefaults, ::dbaccess::ODsnTypeCollection* _pTypeCollection) { // just to be sure .... - _rpSet = NULL; - _rpPool = NULL; - _rppDefaults = NULL; + _rpSet = nullptr; + _rpPool = nullptr; + _rppDefaults = nullptr; const OUString sFilterAll( "%", 1, RTL_TEXTENCODING_ASCII_US ); // create and initialize the defaults @@ -451,7 +451,7 @@ void ODbAdminDialog::destroyItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rpPool, if (_rpSet) { delete _rpSet; - _rpSet = NULL; + _rpSet = nullptr; } // delete the pool @@ -460,11 +460,11 @@ void ODbAdminDialog::destroyItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rpPool, _rpPool->ReleaseDefaults(true); // the "true" means delete the items, too SfxItemPool::Free(_rpPool); - _rpPool = NULL; + _rpPool = nullptr; } // reset the defaults ptr - _rppDefaults = NULL; + _rppDefaults = nullptr; // no need to explicitly delete the defaults, this has been done by the ReleaseDefaults } diff --git a/dbaccess/source/ui/dlg/dbwiz.cxx b/dbaccess/source/ui/dlg/dbwiz.cxx index 938d30dfcb23..85cf0b4a9a53 100644 --- a/dbaccess/source/ui/dlg/dbwiz.cxx +++ b/dbaccess/source/ui/dlg/dbwiz.cxx @@ -68,7 +68,7 @@ ODbTypeWizDialog::ODbTypeWizDialog(vcl::Window* _pParent ,const css::uno::Any& _aDataSourceName ) :OWizardMachine(_pParent, WizardButtonFlags::NEXT | WizardButtonFlags::PREVIOUS | WizardButtonFlags::FINISH | WizardButtonFlags::CANCEL | WizardButtonFlags::HELP ) - ,m_pOutSet(NULL) + ,m_pOutSet(nullptr) { m_pImpl.reset(new ODbDataSourceAdministrationHelper(_rxORB,this,this)); m_pImpl->setDataSourceOrName(_aDataSourceName); diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx index 7263981da244..e8bda3d711d0 100644 --- a/dbaccess/source/ui/dlg/dbwizsetup.cxx +++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx @@ -108,7 +108,7 @@ ODbTypeWizDialogSetup::ODbTypeWizDialogSetup(vcl::Window* _pParent ) :svt::RoadmapWizard( _pParent, WizardButtonFlags::NEXT | WizardButtonFlags::PREVIOUS | WizardButtonFlags::FINISH | WizardButtonFlags::CANCEL | WizardButtonFlags::HELP ) - , m_pOutSet(NULL) + , m_pOutSet(nullptr) , m_bIsConnectable( false) , m_sRM_IntroText( ModuleRes( STR_PAGETITLE_INTROPAGE ) ) , m_sRM_dBaseText( ModuleRes( STR_PAGETITLE_DBASE ) ) @@ -125,10 +125,10 @@ ODbTypeWizDialogSetup::ODbTypeWizDialogSetup(vcl::Window* _pParent , m_sRM_AuthentificationText( ModuleRes( STR_PAGETITLE_AUTHENTIFICATION ) ) , m_sRM_FinalText( ModuleRes( STR_PAGETITLE_FINAL ) ) , m_sWorkPath( SvtPathOptions().GetWorkPath() ) - , m_pGeneralPage( NULL ) - , m_pMySQLIntroPage( NULL ) - , m_pFinalPage( NULL ) - , m_pCollection( NULL ) + , m_pGeneralPage( nullptr ) + , m_pMySQLIntroPage( nullptr ) + , m_pFinalPage( nullptr ) + , m_pCollection( nullptr ) { // no local resources needed anymore // extract the datasource type collection from the item set @@ -268,7 +268,7 @@ ODbTypeWizDialogSetup::~ODbTypeWizDialogSetup() void ODbTypeWizDialogSetup::dispose() { delete m_pOutSet; - m_pOutSet = NULL; + m_pOutSet = nullptr; m_pGeneralPage.clear(); m_pMySQLIntroPage.clear(); m_pFinalPage.clear(); @@ -681,7 +681,7 @@ namespace bool ODbTypeWizDialogSetup::SaveDatabaseDocument() { - Reference< XInteractionHandler2 > xHandler( InteractionHandler::createWithParent(getORB(), 0) ); + Reference< XInteractionHandler2 > xHandler( InteractionHandler::createWithParent(getORB(), nullptr) ); try { if (callSaveAsDialog()) @@ -907,7 +907,7 @@ bool ODbTypeWizDialogSetup::SaveDatabaseDocument() { m_xDesktop.set( Desktop::create(_rxORB) ); m_xFrameLoader.set( m_xDesktop, UNO_QUERY_THROW ); - m_xInteractionHandler = InteractionHandler::createWithParent(_rxORB, 0); + m_xInteractionHandler = InteractionHandler::createWithParent(_rxORB, nullptr); } catch( const Exception& ) { diff --git a/dbaccess/source/ui/dlg/detailpages.cxx b/dbaccess/source/ui/dlg/detailpages.cxx index 00f48c517555..b873bb0401e3 100644 --- a/dbaccess/source/ui/dlg/detailpages.cxx +++ b/dbaccess/source/ui/dlg/detailpages.cxx @@ -61,15 +61,15 @@ namespace dbaui sal_uInt32 nControlFlags) :OGenericAdministrationPage(pParent, rId, rUIXMLDescription, _rCoreAttrs) - ,m_pOptionsLabel(NULL) - ,m_pOptions(NULL) - ,m_pCharsetLabel(NULL) - ,m_pCharset(NULL) - ,m_pAutoRetrievingEnabled(NULL) - ,m_pAutoIncrementLabel(NULL) - ,m_pAutoIncrement(NULL) - ,m_pAutoRetrievingLabel(NULL) - ,m_pAutoRetrieving(NULL) + ,m_pOptionsLabel(nullptr) + ,m_pOptions(nullptr) + ,m_pCharsetLabel(nullptr) + ,m_pCharset(nullptr) + ,m_pAutoRetrievingEnabled(nullptr) + ,m_pAutoIncrementLabel(nullptr) + ,m_pAutoIncrement(nullptr) + ,m_pAutoRetrievingLabel(nullptr) + ,m_pAutoRetrieving(nullptr) ,m_nControlFlags(nControlFlags) { @@ -224,7 +224,7 @@ namespace dbaui // get the DSN string (needed for the index dialog) const SfxStringItem* pUrlItem = _rSet.GetItem<SfxStringItem>(DSID_CONNECTURL); const DbuTypeCollectionItem* pTypesItem = _rSet.GetItem<DbuTypeCollectionItem>(DSID_TYPECOLLECTION); - ::dbaccess::ODsnTypeCollection* pTypeCollection = pTypesItem ? pTypesItem->getCollection() : NULL; + ::dbaccess::ODsnTypeCollection* pTypeCollection = pTypesItem ? pTypesItem->getCollection() : nullptr; if (pTypeCollection && pUrlItem && pUrlItem->GetValue().getLength()) m_sDsn = pTypeCollection->cutPrefix(pUrlItem->GetValue()); @@ -426,7 +426,7 @@ namespace dbaui const SfxStringItem* pUrlItem = _rCoreAttrs.GetItem<SfxStringItem>(DSID_CONNECTURL); const DbuTypeCollectionItem* pTypesItem = _rCoreAttrs.GetItem<DbuTypeCollectionItem>(DSID_TYPECOLLECTION); - ::dbaccess::ODsnTypeCollection* pTypeCollection = pTypesItem ? pTypesItem->getCollection() : NULL; + ::dbaccess::ODsnTypeCollection* pTypeCollection = pTypesItem ? pTypesItem->getCollection() : nullptr; if (pTypeCollection && pUrlItem && pUrlItem->GetValue().getLength() ) { m_sDefaultJdbcDriverName = pTypeCollection->getJavaDriverClass(pUrlItem->GetValue()); diff --git a/dbaccess/source/ui/dlg/directsql.cxx b/dbaccess/source/ui/dlg/directsql.cxx index 9bb7810e4959..2a507262a3d1 100644 --- a/dbaccess/source/ui/dlg/directsql.cxx +++ b/dbaccess/source/ui/dlg/directsql.cxx @@ -110,7 +110,7 @@ namespace dbaui aError->Execute(); } - PostUserEvent(LINK(this, DirectSQLDialog, OnClose), NULL, true); + PostUserEvent(LINK(this, DirectSQLDialog, OnClose), nullptr, true); } sal_Int32 DirectSQLDialog::getHistorySize() const @@ -170,7 +170,7 @@ namespace dbaui if (!m_xConnection.is()) return "have no connection!"; - return NULL; + return nullptr; } #endif diff --git a/dbaccess/source/ui/dlg/dsnItem.hxx b/dbaccess/source/ui/dlg/dsnItem.hxx index 0fc204c6b3d9..de3f074b0525 100644 --- a/dbaccess/source/ui/dlg/dsnItem.hxx +++ b/dbaccess/source/ui/dlg/dsnItem.hxx @@ -37,11 +37,11 @@ namespace dbaui public: TYPEINFO_OVERRIDE(); - DbuTypeCollectionItem(sal_Int16 nWhich = 0, ::dbaccess::ODsnTypeCollection* _pCollection = NULL); + DbuTypeCollectionItem(sal_Int16 nWhich = 0, ::dbaccess::ODsnTypeCollection* _pCollection = nullptr); DbuTypeCollectionItem(const DbuTypeCollectionItem& _rSource); virtual bool operator==(const SfxPoolItem& _rItem) const override; - virtual SfxPoolItem* Clone(SfxItemPool* _pPool = NULL) const override; + virtual SfxPoolItem* Clone(SfxItemPool* _pPool = nullptr) const override; ::dbaccess::ODsnTypeCollection* getCollection() const { return m_pCollection; } }; diff --git a/dbaccess/source/ui/dlg/dsselect.hxx b/dbaccess/source/ui/dlg/dsselect.hxx index 115f2b640567..a4a357345481 100644 --- a/dbaccess/source/ui/dlg/dsselect.hxx +++ b/dbaccess/source/ui/dlg/dsselect.hxx @@ -52,7 +52,7 @@ protected: #endif public: - ODatasourceSelectDialog( vcl::Window* _pParent, const StringBag& _rDatasources, SfxItemSet* _pOutputSet = NULL ); + ODatasourceSelectDialog( vcl::Window* _pParent, const StringBag& _rDatasources, SfxItemSet* _pOutputSet = nullptr ); virtual ~ODatasourceSelectDialog(); virtual void dispose() override; OUString GetSelected() const { return m_pDatasource->GetSelectEntry();} diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx index a2681aeaa329..ffe6c1d3c4fa 100644 --- a/dbaccess/source/ui/dlg/generalpage.cxx +++ b/dbaccess/source/ui/dlg/generalpage.cxx @@ -54,12 +54,12 @@ namespace dbaui OGeneralPage::OGeneralPage( vcl::Window* pParent, const OUString& _rUIXMLDescription, const SfxItemSet& _rItems ) :OGenericAdministrationPage( pParent, "PageGeneral", _rUIXMLDescription, _rItems ) ,m_eNotSupportedKnownType ( ::dbaccess::DST_UNKNOWN ) - ,m_pSpecialMessage ( NULL ) + ,m_pSpecialMessage ( nullptr ) ,m_eLastMessage ( smNone ) ,m_bDisplayingInvalid ( false ) ,m_bInitTypeList ( true ) - ,m_pDatasourceType ( NULL ) - ,m_pCollection ( NULL ) + ,m_pDatasourceType ( nullptr ) + ,m_pCollection ( nullptr ) { get( m_pDatasourceType, "datasourceType" ); get( m_pSpecialMessage, "specialMessage" ); @@ -489,14 +489,14 @@ namespace dbaui // OGeneralPageWizard OGeneralPageWizard::OGeneralPageWizard( vcl::Window* pParent, const SfxItemSet& _rItems ) :OGeneralPage( pParent, "dbaccess/ui/generalpagewizard.ui", _rItems ) - ,m_pRB_CreateDatabase ( NULL ) - ,m_pRB_OpenExistingDatabase ( NULL ) - ,m_pRB_ConnectDatabase ( NULL ) - ,m_pFT_EmbeddedDBLabel ( NULL ) - ,m_pEmbeddedDBType ( NULL ) - ,m_pFT_DocListLabel ( NULL ) - ,m_pLB_DocumentList ( NULL ) - ,m_pPB_OpenDatabase ( NULL ) + ,m_pRB_CreateDatabase ( nullptr ) + ,m_pRB_OpenExistingDatabase ( nullptr ) + ,m_pRB_ConnectDatabase ( nullptr ) + ,m_pFT_EmbeddedDBLabel ( nullptr ) + ,m_pEmbeddedDBType ( nullptr ) + ,m_pFT_DocListLabel ( nullptr ) + ,m_pLB_DocumentList ( nullptr ) + ,m_pPB_OpenDatabase ( nullptr ) ,m_eOriginalCreationMode ( eCreateNew ) ,m_bInitEmbeddedDBList ( true ) { diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx index 76cba671709a..02babdd93f9e 100644 --- a/dbaccess/source/ui/dlg/indexdialog.cxx +++ b/dbaccess/source/ui/dlg/indexdialog.cxx @@ -169,8 +169,8 @@ namespace dbaui :ModalDialog( _pParent, "IndexDesignDialog", "dbaccess/ui/indexdesigndialog.ui") ,m_xConnection(_rxConnection) ,m_aGeometrySettings(E_DIALOG, OUString("dbaccess.tabledesign.indexdialog")) - ,m_pIndexes(NULL) - ,m_pPreviousSelection(NULL) + ,m_pIndexes(nullptr) + ,m_pPreviousSelection(nullptr) ,m_bEditAgain(false) ,m_xContext(_rxContext) { @@ -267,7 +267,7 @@ namespace dbaui m_pActions->EnableItem(mnNewCmdId, !m_pIndexList->IsEditingActive()); SvTreeListEntry* pSelected = m_pIndexList->FirstSelected(); - bool bSelectedAnything = NULL != pSelected; + bool bSelectedAnything = nullptr != pSelected; if (pSelected) { @@ -295,7 +295,7 @@ namespace dbaui Indexes::iterator aEnd = m_pIndexes->end(); for (; aIndexLoop != aEnd; ++aIndexLoop) { - SvTreeListEntry* pNewEntry = NULL; + SvTreeListEntry* pNewEntry = nullptr; if (aIndexLoop->bPrimaryKey) pNewEntry = m_pIndexList->InsertEntry(aIndexLoop->sName, aPKeyIcon, aPKeyIcon); else @@ -314,7 +314,7 @@ namespace dbaui void DbaIndexDialog::dispose() { - setToolBox(NULL); + setToolBox(nullptr); delete m_pIndexes; m_pActions.clear(); m_pIndexList.clear(); @@ -473,7 +473,7 @@ namespace dbaui // if the removed entry was the selected on... if (m_pPreviousSelection == _pEntry) - m_pPreviousSelection = NULL; + m_pPreviousSelection = nullptr; // the Remove automatically selected another entry (if possible), but we disabled the calling of the handler // to prevent that we missed something... call the handler directly @@ -790,7 +790,7 @@ namespace dbaui } } - bool bHaveSelection = (NULL != m_pIndexList->FirstSelected()); + bool bHaveSelection = (nullptr != m_pIndexList->FirstSelected()); // disable/enable the detail controls m_pIndexDetails->Enable(bHaveSelection); diff --git a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx index 695ea3f47fc8..d66e76db7678 100644 --- a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx +++ b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx @@ -70,8 +70,8 @@ namespace dbaui IndexFieldsControl::IndexFieldsControl( vcl::Window* _pParent, WinBits nWinStyle) : EditBrowseBox(_pParent, EditBrowseBoxFlags::SMART_TAB_TRAVEL | EditBrowseBoxFlags::ACTIVATE_ON_BUTTONDOWN, nWinStyle, BROWSER_STANDARD_FLAGS) , m_aSeekRow(m_aFields.end()) - , m_pSortingCell(NULL) - , m_pFieldNameCell(NULL) + , m_pSortingCell(nullptr) + , m_pFieldNameCell(nullptr) , m_nMaxColumnsInIndex(0) , m_bAddIndexAppendix(false) { @@ -251,12 +251,12 @@ namespace dbaui CellController* IndexFieldsControl::GetController(long _nRow, sal_uInt16 _nColumnId) { if (!IsEnabled()) - return NULL; + return nullptr; IndexFields::const_iterator aRow; bool bNewField = !implGetFieldDesc(_nRow, aRow); - DbaMouseDownListBoxController* pReturn = NULL; + DbaMouseDownListBoxController* pReturn = nullptr; switch (_nColumnId) { case COLUMN_ID_ORDER: diff --git a/dbaccess/source/ui/dlg/odbcconfig.cxx b/dbaccess/source/ui/dlg/odbcconfig.cxx index e6308c7557a2..25e53dbdc149 100644 --- a/dbaccess/source/ui/dlg/odbcconfig.cxx +++ b/dbaccess/source/ui/dlg/odbcconfig.cxx @@ -76,7 +76,7 @@ bool OOdbcEnumeration::load(const sal_Char* _pLibPath) #ifdef HAVE_ODBC_SUPPORT // load the module m_pOdbcLib = osl_loadModule(m_sLibPath.pData, SAL_LOADMODULE_NOW); - return (NULL != m_pOdbcLib); + return (nullptr != m_pOdbcLib); #else return sal_False; #endif @@ -88,7 +88,7 @@ void OOdbcEnumeration::unload() if (isLoaded()) { osl_unloadModule(m_pOdbcLib); - m_pOdbcLib = NULL; + m_pOdbcLib = nullptr; } #endif } @@ -103,19 +103,19 @@ struct OdbcTypesImpl { #ifdef HAVE_ODBC_SUPPORT SQLHANDLE hEnvironment; - OdbcTypesImpl() : hEnvironment(0) { } + OdbcTypesImpl() : hEnvironment(nullptr) { } #else void* pDummy; #endif }; OOdbcEnumeration::OOdbcEnumeration() - :m_pOdbcLib(NULL) + :m_pOdbcLib(nullptr) #ifdef HAVE_ODBC_SUPPORT - ,m_pAllocHandle(NULL) - ,m_pFreeHandle(NULL) - ,m_pSetEnvAttr(NULL) - ,m_pDataSources(NULL) + ,m_pAllocHandle(nullptr) + ,m_pFreeHandle(nullptr) + ,m_pSetEnvAttr(nullptr) + ,m_pDataSources(nullptr) ,m_pImpl(new OdbcTypesImpl) #endif { @@ -138,7 +138,7 @@ OOdbcEnumeration::OOdbcEnumeration() if (!m_pAllocHandle || !m_pSetEnvAttr || !m_pDataSources || !m_pFreeHandle) { unload(); - m_pAllocHandle = m_pFreeHandle = m_pSetEnvAttr = m_pDataSources = NULL; + m_pAllocHandle = m_pFreeHandle = m_pSetEnvAttr = m_pDataSources = nullptr; } #endif } @@ -179,7 +179,7 @@ void OOdbcEnumeration::freeEnv() #ifdef HAVE_ODBC_SUPPORT if (m_pImpl->hEnvironment) NSQLFreeHandle(SQL_HANDLE_ENV, m_pImpl->hEnvironment); - m_pImpl->hEnvironment = 0; + m_pImpl->hEnvironment = nullptr; #endif } diff --git a/dbaccess/source/ui/dlg/odbcconfig.hxx b/dbaccess/source/ui/dlg/odbcconfig.hxx index 3142f5cd9b8a..4d69bf1b5976 100644 --- a/dbaccess/source/ui/dlg/odbcconfig.hxx +++ b/dbaccess/source/ui/dlg/odbcconfig.hxx @@ -62,7 +62,7 @@ public: ~OOdbcEnumeration(); #ifdef HAVE_ODBC_SUPPORT - bool isLoaded() const { return NULL != m_pOdbcLib; } + bool isLoaded() const { return nullptr != m_pOdbcLib; } #else bool isLoaded() const { return false; } #endif diff --git a/dbaccess/source/ui/dlg/optionalboolitem.hxx b/dbaccess/source/ui/dlg/optionalboolitem.hxx index 8b72335950d1..3bb698a7586f 100644 --- a/dbaccess/source/ui/dlg/optionalboolitem.hxx +++ b/dbaccess/source/ui/dlg/optionalboolitem.hxx @@ -38,7 +38,7 @@ namespace dbaui OptionalBoolItem( const OptionalBoolItem& _rSource ); virtual bool operator==( const SfxPoolItem& _rItem ) const override; - virtual SfxPoolItem* Clone( SfxItemPool* _pPool = NULL ) const override; + virtual SfxPoolItem* Clone( SfxItemPool* _pPool = nullptr ) const override; bool HasValue() const { return !!m_aValue; } void ClearValue() { m_aValue.reset(); } diff --git a/dbaccess/source/ui/dlg/queryfilter.cxx b/dbaccess/source/ui/dlg/queryfilter.cxx index 46cab6256d30..c5105f940c4b 100644 --- a/dbaccess/source/ui/dlg/queryfilter.cxx +++ b/dbaccess/source/ui/dlg/queryfilter.cxx @@ -516,9 +516,9 @@ void DlgFilterCrit::SetLine( sal_uInt16 nIdx,const PropertyValue& _rItem,bool _b aStr = comphelper::string::stripStart(aStr, ' '); // to make sure that we only set first three - ListBox* pColumnListControl = NULL; - ListBox* pPredicateListControl = NULL; - Edit* pPredicateValueControl = NULL; + ListBox* pColumnListControl = nullptr; + ListBox* pPredicateListControl = nullptr; + Edit* pPredicateValueControl = nullptr; switch( nIdx ) { case 0: @@ -770,7 +770,7 @@ void DlgFilterCrit::BuildWherePart() Sequence<Sequence<PropertyValue> >& _rValues = aFilter; if ( getCondition(*m_pLB_WHEREFIELD2,*m_pLB_WHERECOMP2,*m_pET_WHEREVALUE2,aValue) ) _rValues = aHaving; - PropertyValue* pPos = NULL; + PropertyValue* pPos = nullptr; if ( m_pLB_WHERECOND2->GetSelectEntryPos() ) { sal_Int32 nPos = _rValues.getLength(); @@ -794,7 +794,7 @@ void DlgFilterCrit::BuildWherePart() Sequence<Sequence<PropertyValue> >& _rValues = aFilter; if ( getCondition(*m_pLB_WHEREFIELD3,*m_pLB_WHERECOMP3,*m_pET_WHEREVALUE3,aValue) ) _rValues = aHaving; - PropertyValue* pPos = NULL; + PropertyValue* pPos = nullptr; if ( m_pLB_WHERECOND3->GetSelectEntryPos() ) { sal_Int32 nPos = _rValues.getLength(); diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx index 8ab9396e8c41..bae6b8dfe07e 100644 --- a/dbaccess/source/ui/dlg/sqlmessage.cxx +++ b/dbaccess/source/ui/dlg/sqlmessage.cxx @@ -434,7 +434,7 @@ void OSQLMessageBox::impl_positionControls() if ( m_pImpl->aDisplayInfo.empty() ) return; - const ExceptionDisplayInfo* pSecondInfo = NULL; + const ExceptionDisplayInfo* pSecondInfo = nullptr; const ExceptionDisplayInfo& rFirstInfo = *m_pImpl->aDisplayInfo.begin(); if ( m_pImpl->aDisplayInfo.size() > 1 ) diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx index 69a6d7714647..b49bd07b13e2 100644 --- a/dbaccess/source/ui/dlg/tablespage.cxx +++ b/dbaccess/source/ui/dlg/tablespage.cxx @@ -364,7 +364,7 @@ namespace dbaui m_pTablesList->Expand(pExpand); pExpand = m_pTablesList->FirstChild(pExpand); if (pExpand && SvTreeList::NextSibling(pExpand)) - pExpand = NULL; + pExpand = nullptr; } // update the toolbox according the current selection and check state @@ -453,8 +453,8 @@ namespace dbaui { bool bCatalogWildcard = false; bool bSchemaWildcard = false; - SvTreeListEntry* pSchema = NULL; - SvTreeListEntry* pCatalog = NULL; + SvTreeListEntry* pSchema = nullptr; + SvTreeListEntry* pCatalog = nullptr; if (m_pTablesList->GetCheckButtonState(pEntry) == SV_BUTTON_CHECKED && !m_pTablesList->GetModel()->HasChildren(pEntry)) { // checked and a leaf, which means it's no catalog, no schema, but a real table @@ -464,7 +464,7 @@ namespace dbaui pSchema = m_pTablesList->GetModel()->GetParent(pEntry); if (pAllObjectsEntry == pSchema) // do not want to have the root entry - pSchema = NULL; + pSchema = nullptr; if (pSchema) { // it's a real schema entry, not the "all objects" root @@ -473,7 +473,7 @@ namespace dbaui pCatalog = m_pTablesList->GetModel()->GetParent(pSchema); if (pAllObjectsEntry == pCatalog) // do not want to have the root entry - pCatalog = NULL; + pCatalog = nullptr; if (pCatalog) { // it's a real catalog entry, not the "all objects" root @@ -533,7 +533,7 @@ namespace dbaui SvTreeListEntry* OTableSubscriptionPage::implNextSibling(SvTreeListEntry* _pEntry) const { - SvTreeListEntry* pReturn = NULL; + SvTreeListEntry* pReturn = nullptr; if (_pEntry) { pReturn = SvTreeList::NextSibling(_pEntry); diff --git a/dbaccess/source/ui/inc/HtmlReader.hxx b/dbaccess/source/ui/inc/HtmlReader.hxx index 9c5ca32e82ee..56731055ab10 100644 --- a/dbaccess/source/ui/inc/HtmlReader.hxx +++ b/dbaccess/source/ui/inc/HtmlReader.hxx @@ -56,8 +56,8 @@ namespace dbaui const SharedConnection& _rxConnection, const css::uno::Reference< css::util::XNumberFormatter >& _rxNumberF, const css::uno::Reference< css::uno::XComponentContext >& _rxContext, - const TColumnVector* rList = 0, - const OTypeInfoMap* _pInfoMap = 0); + const TColumnVector* rList = nullptr, + const OTypeInfoMap* _pInfoMap = nullptr); // required for automatic type recognition OHTMLReader(SvStream& rIn, sal_Int32 nRows, diff --git a/dbaccess/source/ui/inc/JoinTableView.hxx b/dbaccess/source/ui/inc/JoinTableView.hxx index cbe7edc79e3e..919a7e7d540a 100644 --- a/dbaccess/source/ui/inc/JoinTableView.hxx +++ b/dbaccess/source/ui/inc/JoinTableView.hxx @@ -201,7 +201,7 @@ namespace dbaui */ sal_Int32 getConnectionCount(const OTableWindow* _pFromWin) const; - OTableConnection* GetTabConn(const OTableWindow* pLhs,const OTableWindow* pRhs,bool _bSupressCrossOrNaturalJoin = false,const OTableConnection* _rpFirstAfter = NULL) const; + OTableConnection* GetTabConn(const OTableWindow* pLhs,const OTableWindow* pRhs,bool _bSupressCrossOrNaturalJoin = false,const OTableConnection* _rpFirstAfter = nullptr) const; /** clear the window map and connection vector without destroying it @@ -320,7 +320,7 @@ namespace dbaui modified @param _pAction a possible undo action to add at the controller */ - void invalidateAndModify(SfxUndoAction *_pAction=NULL); + void invalidateAndModify(SfxUndoAction *_pAction=nullptr); private: using Window::Scroll; diff --git a/dbaccess/source/ui/inc/RtfReader.hxx b/dbaccess/source/ui/inc/RtfReader.hxx index fe8a02e53ace..1ad04c2bbc8b 100644 --- a/dbaccess/source/ui/inc/RtfReader.hxx +++ b/dbaccess/source/ui/inc/RtfReader.hxx @@ -44,8 +44,8 @@ namespace dbaui const SharedConnection& _rxConnection, const css::uno::Reference< css::util::XNumberFormatter >& _rxNumberF, const css::uno::Reference< css::uno::XComponentContext >& _rxContext, - const TColumnVector* rList = 0, - const OTypeInfoMap* _pInfoMap = 0); + const TColumnVector* rList = nullptr, + const OTypeInfoMap* _pInfoMap = nullptr); // required for automatic type recognition ORTFReader( SvStream& rIn, sal_Int32 nRows, diff --git a/dbaccess/source/ui/inc/TableCopyHelper.hxx b/dbaccess/source/ui/inc/TableCopyHelper.hxx index 20e951c9928f..98e0169d543e 100644 --- a/dbaccess/source/ui/inc/TableCopyHelper.hxx +++ b/dbaccess/source/ui/inc/TableCopyHelper.hxx @@ -85,7 +85,7 @@ namespace dbaui DropDescriptor() : nType(E_TABLE) - , pDroppedAt(NULL) + , pDroppedAt(nullptr) , nAction(DND_ACTION_NONE) , bHtml(false) , bError(false) diff --git a/dbaccess/source/ui/inc/TableDesignView.hxx b/dbaccess/source/ui/inc/TableDesignView.hxx index 27ded225b463..8111b634ffe7 100644 --- a/dbaccess/source/ui/inc/TableDesignView.hxx +++ b/dbaccess/source/ui/inc/TableDesignView.hxx @@ -83,8 +83,8 @@ namespace dbaui virtual bool PreNotify( NotifyEvent& rNEvt ) override; virtual void GetFocus() override; - OTableEditorCtrl* GetEditorCtrl() const { return m_pWin ? m_pWin->GetEditorCtrl() : NULL; } - OTableFieldDescWin* GetDescWin() const { return m_pWin ? m_pWin->GetDescWin() : NULL; } + OTableEditorCtrl* GetEditorCtrl() const { return m_pWin ? m_pWin->GetEditorCtrl() : nullptr; } + OTableFieldDescWin* GetDescWin() const { return m_pWin ? m_pWin->GetDescWin() : nullptr; } OTableController& getController() const { return m_rController; } css::lang::Locale getLocale() const { return m_aLocale;} diff --git a/dbaccess/source/ui/inc/TableRow.hxx b/dbaccess/source/ui/inc/TableRow.hxx index fa57cf0dc376..a59c978fb8b7 100644 --- a/dbaccess/source/ui/inc/TableRow.hxx +++ b/dbaccess/source/ui/inc/TableRow.hxx @@ -43,7 +43,7 @@ namespace dbaui ~OTableRow(); inline OFieldDescription* GetActFieldDescr() const { return m_pActFieldDescr; } - inline bool isValid() const { return GetActFieldDescr() != NULL; } + inline bool isValid() const { return GetActFieldDescr() != nullptr; } void SetFieldType( const TOTypeInfoSP& _pType, bool _bForce = false ); diff --git a/dbaccess/source/ui/inc/TableWindowListBox.hxx b/dbaccess/source/ui/inc/TableWindowListBox.hxx index 2a5fc96f267c..5a3ce03125b0 100644 --- a/dbaccess/source/ui/inc/TableWindowListBox.hxx +++ b/dbaccess/source/ui/inc/TableWindowListBox.hxx @@ -34,7 +34,7 @@ namespace dbaui SvTreeListEntry* pEntry; // the entry, which was dragged or to which was dropped on OJoinExchangeData(OTableWindowListBox* pBox); - OJoinExchangeData() : pListBox(NULL), pEntry(NULL) { } + OJoinExchangeData() : pListBox(nullptr), pEntry(nullptr) { } }; struct OJoinDropData { diff --git a/dbaccess/source/ui/inc/TokenWriter.hxx b/dbaccess/source/ui/inc/TokenWriter.hxx index da97dfa25e11..edee89a421c8 100644 --- a/dbaccess/source/ui/inc/TokenWriter.hxx +++ b/dbaccess/source/ui/inc/TokenWriter.hxx @@ -215,7 +215,7 @@ namespace dbaui // import data ORowSetImportExport(const SharedConnection& _rxConnection, const css::uno::Reference< css::uno::XComponentContext >& _rM) - : ODatabaseImportExport(_rxConnection,NULL,_rM) + : ODatabaseImportExport(_rxConnection,nullptr,_rM) {} virtual bool Write() override; diff --git a/dbaccess/source/ui/inc/UITools.hxx b/dbaccess/source/ui/inc/UITools.hxx index b6571e267c95..b9a45cf42620 100644 --- a/dbaccess/source/ui/inc/UITools.hxx +++ b/dbaccess/source/ui/inc/UITools.hxx @@ -395,7 +395,7 @@ namespace dbaui const OUString& _sParentFolder, bool _bForm, bool _bCollection = true, - const css::uno::Reference< css::ucb::XContent>& _xContent = NULL, + const css::uno::Reference< css::ucb::XContent>& _xContent = nullptr, bool _bMove = false ); diff --git a/dbaccess/source/ui/inc/VertSplitView.hxx b/dbaccess/source/ui/inc/VertSplitView.hxx index 51957716716f..dbc1d3b77078 100644 --- a/dbaccess/source/ui/inc/VertSplitView.hxx +++ b/dbaccess/source/ui/inc/VertSplitView.hxx @@ -44,7 +44,7 @@ namespace dbaui virtual void GetFocus() override; void setSplitter(Splitter* _pSplitter); - void set(vcl::Window* _pRight,Window* _pLeft = NULL); + void set(vcl::Window* _pRight,Window* _pLeft = nullptr); virtual void Resize() override; }; } diff --git a/dbaccess/source/ui/inc/WTypeSelect.hxx b/dbaccess/source/ui/inc/WTypeSelect.hxx index 38eab2ac471b..2501707225b2 100644 --- a/dbaccess/source/ui/inc/WTypeSelect.hxx +++ b/dbaccess/source/ui/inc/WTypeSelect.hxx @@ -51,7 +51,7 @@ namespace dbaui virtual OUString getAutoIncrementValue() const override; public: - OWizTypeSelectControl(vcl::Window* pParent, vcl::Window* pParentTabPage, OTableDesignHelpBar* pHelpBar=NULL); + OWizTypeSelectControl(vcl::Window* pParent, vcl::Window* pParentTabPage, OTableDesignHelpBar* pHelpBar=nullptr); virtual ~OWizTypeSelectControl(); virtual void dispose() override; @@ -75,7 +75,7 @@ namespace dbaui OWizTypeSelectList( vcl::Window* pParent, WinBits nStyle = WB_BORDER ) : MultiListBox(pParent,nStyle) , m_bPKey(false) - , m_pParentTabPage(NULL) + , m_pParentTabPage(nullptr) {} virtual ~OWizTypeSelectList(); virtual void dispose() override; @@ -119,7 +119,7 @@ namespace dbaui virtual bool LeavePage() override; virtual OUString GetTitle() const override; - OWizTypeSelect(vcl::Window* pParent, SvStream* _pStream = NULL ); + OWizTypeSelect(vcl::Window* pParent, SvStream* _pStream = nullptr ); virtual ~OWizTypeSelect(); virtual void dispose() override; diff --git a/dbaccess/source/ui/inc/dbtreelistbox.hxx b/dbaccess/source/ui/inc/dbtreelistbox.hxx index 177f8ca0576f..f5ec587b8dff 100644 --- a/dbaccess/source/ui/inc/dbtreelistbox.hxx +++ b/dbaccess/source/ui/inc/dbtreelistbox.hxx @@ -97,7 +97,7 @@ namespace dbaui // (normally, the expand handler is called only once) void EnableExpandHandler(SvTreeListEntry* _pEntry); - SvTreeListEntry* GetEntryPosByName( const OUString& aName, SvTreeListEntry* pStart = NULL, const IEntryFilter* _pFilter = NULL ) const; + SvTreeListEntry* GetEntryPosByName( const OUString& aName, SvTreeListEntry* pStart = nullptr, const IEntryFilter* _pFilter = nullptr ) const; virtual void RequestingChildren( SvTreeListEntry* pParent ) override; virtual void SelectHdl() override; virtual void DeselectHdl() override; diff --git a/dbaccess/source/ui/inc/formadapter.hxx b/dbaccess/source/ui/inc/formadapter.hxx index ea87b32a7a11..82eb85c7b730 100644 --- a/dbaccess/source/ui/inc/formadapter.hxx +++ b/dbaccess/source/ui/inc/formadapter.hxx @@ -426,7 +426,7 @@ namespace dbaui protected: // container handling - void implInsert(const css::uno::Any& aElement, sal_Int32 nIndex, const OUString* pNewElName = NULL) throw(css::lang::IllegalArgumentException); + void implInsert(const css::uno::Any& aElement, sal_Int32 nIndex, const OUString* pNewElName = nullptr) throw(css::lang::IllegalArgumentException); sal_Int32 implGetPos(const OUString& rName); void StopListening(); diff --git a/dbaccess/source/ui/inc/propertysetitem.hxx b/dbaccess/source/ui/inc/propertysetitem.hxx index 311cd7253fb4..4584a32c4799 100644 --- a/dbaccess/source/ui/inc/propertysetitem.hxx +++ b/dbaccess/source/ui/inc/propertysetitem.hxx @@ -41,7 +41,7 @@ namespace dbaui OPropertySetItem(const OPropertySetItem& _rSource); virtual bool operator==(const SfxPoolItem& _rItem) const override; - virtual SfxPoolItem* Clone(SfxItemPool* _pPool = NULL) const override; + virtual SfxPoolItem* Clone(SfxItemPool* _pPool = nullptr) const override; }; } // namespace dbaui diff --git a/dbaccess/source/ui/inc/sqlmessage.hxx b/dbaccess/source/ui/inc/sqlmessage.hxx index e4a7e8f6069c..9524247f3502 100644 --- a/dbaccess/source/ui/inc/sqlmessage.hxx +++ b/dbaccess/source/ui/inc/sqlmessage.hxx @@ -87,7 +87,7 @@ public: const OUString& rMessage, WinBits nStyle = WB_OK | WB_DEF_OK, MessageType _eType = Info, - const ::dbtools::SQLExceptionInfo* _pAdditionalErrorInfo = NULL ); + const ::dbtools::SQLExceptionInfo* _pAdditionalErrorInfo = nullptr ); virtual ~OSQLMessageBox(); virtual void dispose() override; @@ -111,7 +111,7 @@ public: OSQLWarningBox( vcl::Window* _pParent, const OUString& _rMessage, WinBits _nStyle = WB_OK | WB_DEF_OK, - const ::dbtools::SQLExceptionInfo* _pAdditionalErrorInfo = NULL ); + const ::dbtools::SQLExceptionInfo* _pAdditionalErrorInfo = nullptr ); }; // OSQLErrorBox @@ -121,7 +121,7 @@ public: OSQLErrorBox( vcl::Window* _pParent, const OUString& _rMessage, WinBits _nStyle = WB_OK | WB_DEF_OK, - const ::dbtools::SQLExceptionInfo* _pAdditionalErrorInfo = NULL ); + const ::dbtools::SQLExceptionInfo* _pAdditionalErrorInfo = nullptr ); }; } // namespace dbaui diff --git a/dbaccess/source/ui/inc/stringlistitem.hxx b/dbaccess/source/ui/inc/stringlistitem.hxx index 84395bd42c51..e0c7bf7f1325 100644 --- a/dbaccess/source/ui/inc/stringlistitem.hxx +++ b/dbaccess/source/ui/inc/stringlistitem.hxx @@ -41,7 +41,7 @@ public: OStringListItem(const OStringListItem& _rSource); virtual bool operator==(const SfxPoolItem& _rItem) const override; - virtual SfxPoolItem* Clone(SfxItemPool* _pPool = NULL) const override; + virtual SfxPoolItem* Clone(SfxItemPool* _pPool = nullptr) const override; css::uno::Sequence< OUString > getList() const { return m_aList; } }; diff --git a/dbaccess/source/ui/inc/unodatbr.hxx b/dbaccess/source/ui/inc/unodatbr.hxx index 61f5c70412da..97893d8f0b6b 100644 --- a/dbaccess/source/ui/inc/unodatbr.hxx +++ b/dbaccess/source/ui/inc/unodatbr.hxx @@ -395,7 +395,7 @@ namespace dbaui If <TRUE/>, all ancestor on the way to the entry will be expanded */ SvTreeListEntry* getObjectEntry(const svx::ODataAccessDescriptor& _rDescriptor, - SvTreeListEntry** _ppDataSourceEntry = NULL, SvTreeListEntry** _ppContainerEntry = NULL, + SvTreeListEntry** _ppDataSourceEntry = nullptr, SvTreeListEntry** _ppContainerEntry = nullptr, bool _bExpandAncestors = true ); /** retrieves the tree entry for the object described by data source name, command and command type @@ -416,7 +416,7 @@ namespace dbaui */ SvTreeListEntry* getObjectEntry( const OUString& _rDataSource, const OUString& _rCommand, sal_Int32 _nCommandType, - SvTreeListEntry** _ppDataSourceEntry = NULL, SvTreeListEntry** _ppContainerEntry = NULL, + SvTreeListEntry** _ppDataSourceEntry = nullptr, SvTreeListEntry** _ppContainerEntry = nullptr, bool _bExpandAncestors = true, const SharedConnection& _rxConnection = SharedConnection() ); diff --git a/dbaccess/source/ui/misc/DExport.cxx b/dbaccess/source/ui/misc/DExport.cxx index 8b971f286e33..77ac7f94ddda 100644 --- a/dbaccess/source/ui/misc/DExport.cxx +++ b/dbaccess/source/ui/misc/DExport.cxx @@ -92,7 +92,7 @@ ODatabaseExport::ODatabaseExport(sal_Int32 nRows, ,m_aDestColumns(true) ,m_xFormatter(_rxNumberF) ,m_xContext(_rxContext) - ,m_pFormatter(NULL) + ,m_pFormatter(nullptr) ,m_rInputStream( _rInputStream ) ,m_pTypeInfo() ,m_pColumnList(pList) @@ -146,11 +146,11 @@ ODatabaseExport::ODatabaseExport(const SharedConnection& _rxConnection, ,m_xConnection(_rxConnection) ,m_xFormatter(_rxNumberF) ,m_xContext(_rxContext) - ,m_pFormatter(NULL) + ,m_pFormatter(nullptr) ,m_rInputStream( _rInputStream ) ,m_pTypeInfo() - ,m_pColumnList(NULL) - ,m_pInfoMap(NULL) + ,m_pColumnList(nullptr) + ,m_pInfoMap(nullptr) ,m_nColumnPos(0) ,m_nRows(1) ,m_nRowCount(0) @@ -284,7 +284,7 @@ ODatabaseExport::ODatabaseExport(const SharedConnection& _rxConnection, ODatabaseExport::~ODatabaseExport() { - m_pFormatter = NULL; + m_pFormatter = nullptr; ODatabaseExport::TColumns::iterator aIter = m_aDestColumns.begin(); ODatabaseExport::TColumns::iterator aEnd = m_aDestColumns.end(); @@ -678,7 +678,7 @@ bool ODatabaseExport::createRowSet() { m_pUpdateHelper.reset(new OParameterUpdateHelper(createPreparedStatment(m_xConnection->getMetaData(),m_xTable,m_vColumns))); - return m_pUpdateHelper.get() != NULL; + return m_pUpdateHelper.get() != nullptr; } bool ODatabaseExport::executeWizard(const OUString& _rTableName, const Any& _aTextColor, const FontDescriptor& _rFont) @@ -797,7 +797,7 @@ void ODatabaseExport::ensureFormatter() Reference< XNumberFormatsSupplier > xSupplier = m_xFormatter->getNumberFormatsSupplier(); Reference< XUnoTunnel > xTunnel(xSupplier,UNO_QUERY); SvNumberFormatsSupplierObj* pSupplierImpl = reinterpret_cast<SvNumberFormatsSupplierObj*>(xTunnel->getSomething(SvNumberFormatsSupplierObj::getUnoTunnelId())); - m_pFormatter = pSupplierImpl ? pSupplierImpl->GetNumberFormatter() : NULL; + m_pFormatter = pSupplierImpl ? pSupplierImpl->GetNumberFormatter() : nullptr; Reference<XPropertySet> xNumberFormatSettings = xSupplier->getNumberFormatSettings(); xNumberFormatSettings->getPropertyValue("NullDate") >>= m_aNullDate; } diff --git a/dbaccess/source/ui/misc/HtmlReader.cxx b/dbaccess/source/ui/misc/HtmlReader.cxx index 7d11395f351b..1020cafc1477 100644 --- a/dbaccess/source/ui/misc/HtmlReader.cxx +++ b/dbaccess/source/ui/misc/HtmlReader.cxx @@ -163,7 +163,7 @@ void OHTMLReader::NextToken( int nToken ) case HTML_TABLE_OFF: if(!--m_nTableCount) { - m_xTable = NULL; + m_xTable = nullptr; } break; case HTML_TABLEROW_ON: @@ -517,7 +517,7 @@ bool OHTMLReader::CreateTable(int nToken) void OHTMLReader::setTextEncoding() { m_bMetaOptions = true; - ParseMetaOptions(NULL, NULL); + ParseMetaOptions(nullptr, nullptr); } void OHTMLReader::release() diff --git a/dbaccess/source/ui/misc/RowSetDrop.cxx b/dbaccess/source/ui/misc/RowSetDrop.cxx index a1f5f4b936ac..63ba6749d3ed 100644 --- a/dbaccess/source/ui/misc/RowSetDrop.cxx +++ b/dbaccess/source/ui/misc/RowSetDrop.cxx @@ -44,7 +44,7 @@ ORowSetImportExport::ORowSetImportExport( vcl::Window* _pParent, const Reference< XComponentContext >& _rM, const OUString& rExchange ) - : ODatabaseImportExport(_aDataDescriptor,_rM,NULL,rExchange) + : ODatabaseImportExport(_aDataDescriptor,_rM,nullptr,rExchange) ,m_xTargetResultSetUpdate(_xResultSetUpdate) ,m_xTargetRowUpdate(_xResultSetUpdate,UNO_QUERY) ,m_pParent(_pParent) diff --git a/dbaccess/source/ui/misc/TableCopyHelper.cxx b/dbaccess/source/ui/misc/TableCopyHelper.cxx index 4dd0dd097c33..1b14e462b7c9 100644 --- a/dbaccess/source/ui/misc/TableCopyHelper.cxx +++ b/dbaccess/source/ui/misc/TableCopyHelper.cxx @@ -235,7 +235,7 @@ void OTableCopyHelper::pasteTable( const TransferableDataHelper& _rTransData bool OTableCopyHelper::copyTagTable(OTableCopyHelper::DropDescriptor& _rDesc, bool _bCheck, const SharedConnection& _xConnection) { Reference<XEventListener> xEvt; - ODatabaseImportExport* pImport = NULL; + ODatabaseImportExport* pImport = nullptr; if ( _rDesc.bHtml ) pImport = new OHTMLImportExport(_xConnection,getNumberFormatter(_xConnection, m_pController->getORB()),m_pController->getORB()); else @@ -293,7 +293,7 @@ bool OTableCopyHelper::copyTagTable(const TransferableDataHelper& _aDroppedData _rAsyncDrop.aHtmlRtfStorage = aNew; } else - _rAsyncDrop.aHtmlRtfStorage = NULL; + _rAsyncDrop.aHtmlRtfStorage = nullptr; } return bRet; } @@ -305,7 +305,7 @@ void OTableCopyHelper::asyncCopyTagTable( DropDescriptor& _rDesc if ( _rDesc.aHtmlRtfStorage.Is() ) { copyTagTable(_rDesc,false,_xConnection); - _rDesc.aHtmlRtfStorage = NULL; + _rDesc.aHtmlRtfStorage = nullptr; // we now have to delete the temp file created in executeDrop INetURLObject aURL; aURL.SetURL(_rDesc.aUrl); diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx index c90f206c2149..ffbb1158b6a0 100644 --- a/dbaccess/source/ui/misc/TokenWriter.cxx +++ b/dbaccess/source/ui/misc/TokenWriter.cxx @@ -92,8 +92,8 @@ ODatabaseImportExport::ODatabaseImportExport(const svx::ODataAccessDescriptor& _ ,m_xContext(_rM) ,m_nCommandType(CommandType::TABLE) ,m_bNeedToReInitialize(false) - ,m_pReader(NULL) - ,m_pRowMarker(NULL) + ,m_pReader(nullptr) + ,m_pRowMarker(nullptr) ,m_bInInitialize(false) ,m_bCheckOnly(false) { @@ -116,14 +116,14 @@ ODatabaseImportExport::ODatabaseImportExport(const svx::ODataAccessDescriptor& _ ODatabaseImportExport::ODatabaseImportExport( const ::dbtools::SharedConnection& _rxConnection, const Reference< XNumberFormatter >& _rxNumberF, const Reference< XComponentContext >& _rM ) :m_bBookmarkSelection( false ) - ,m_pStream(NULL) + ,m_pStream(nullptr) ,m_xConnection(_rxConnection) ,m_xFormatter(_rxNumberF) ,m_xContext(_rM) ,m_nCommandType(css::sdb::CommandType::TABLE) ,m_bNeedToReInitialize(false) - ,m_pReader(NULL) - ,m_pRowMarker(NULL) + ,m_pReader(nullptr) + ,m_pRowMarker(nullptr) ,m_bInInitialize(false) ,m_bCheckOnly(false) { @@ -313,8 +313,8 @@ void ODatabaseImportExport::initialize() } catch(Exception& ) { - m_xRow = NULL; - m_xResultSetMetaData = NULL; + m_xRow = nullptr; + m_xResultSetMetaData = nullptr; ::comphelper::disposeComponent(m_xResultSet); throw; } @@ -613,7 +613,7 @@ bool ORTFImportExport::Read() m_pReader->enableCheckOnly(); eState = static_cast<ORTFReader*>(m_pReader)->CallParser(); m_pReader->release(); - m_pReader = NULL; + m_pReader = nullptr; } return eState != SVPAR_ERROR; @@ -685,7 +685,7 @@ bool OHTMLImportExport::Read() m_pReader->SetTableName(m_sDefaultTableName); eState = static_cast<OHTMLReader*>(m_pReader)->CallParser(); m_pReader->release(); - m_pReader = NULL; + m_pReader = nullptr; } return eState != SVPAR_ERROR; @@ -937,7 +937,7 @@ void OHTMLImportExport::WriteCell( sal_Int32 nFormat, sal_Int32 nWidthPixel, sal Reference< css::util::XNumberFormatsSupplier > xSupplier = m_xFormatter->getNumberFormatsSupplier(); SvNumberFormatsSupplierObj* pSupplierImpl = SvNumberFormatsSupplierObj::getImplementation( xSupplier ); - SvNumberFormatter* pFormatter = pSupplierImpl ? pSupplierImpl->GetNumberFormatter() : NULL; + SvNumberFormatter* pFormatter = pSupplierImpl ? pSupplierImpl->GetNumberFormatter() : nullptr; if(pFormatter) { double fVal = 0.0; diff --git a/dbaccess/source/ui/misc/ToolBoxHelper.cxx b/dbaccess/source/ui/misc/ToolBoxHelper.cxx index a7baf7c152d5..00c5df7c6afb 100644 --- a/dbaccess/source/ui/misc/ToolBoxHelper.cxx +++ b/dbaccess/source/ui/misc/ToolBoxHelper.cxx @@ -30,7 +30,7 @@ namespace dbaui { OToolBoxHelper::OToolBoxHelper() : m_nSymbolsSize(-1) - , m_pToolBox(NULL) + , m_pToolBox(nullptr) { OSL_ENSURE(m_nSymbolsSize != SvtMiscOptions().GetCurrentSymbolsSize(),"SymbolsSize should not be identical"); @@ -92,7 +92,7 @@ namespace dbaui m_pToolBox = _pTB; if ( m_pToolBox ) { - ConfigOptionsChanged(NULL); + ConfigOptionsChanged(nullptr); if ( bFirstTime ) adjustToolBoxSize(m_pToolBox); } diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx index 0398b56afac4..a725df434609 100644 --- a/dbaccess/source/ui/misc/UITools.cxx +++ b/dbaccess/source/ui/misc/UITools.cxx @@ -185,7 +185,7 @@ SQLExceptionInfo createConnection( const Reference< css::beans::XPropertySet>& } else { // instantiate the default SDB interaction handler - Reference< XInteractionHandler > xHandler( InteractionHandler::createWithParent(_rxContext, 0), UNO_QUERY); + Reference< XInteractionHandler > xHandler( InteractionHandler::createWithParent(_rxContext, nullptr), UNO_QUERY); _rOUTConnection = xConnectionCompletion->connectWithCompletion(xHandler); } } @@ -959,7 +959,7 @@ bool appendToFilter(const Reference<XConnection>& _xConnection, void notifySystemWindow(vcl::Window* _pWindow, vcl::Window* _pToRegister, const ::comphelper::mem_fun1_t<TaskPaneList,vcl::Window*>& _rMemFunc) { OSL_ENSURE(_pWindow,"Window can not be null!"); - SystemWindow* pSystemWindow = _pWindow ? _pWindow->GetSystemWindow() : NULL; + SystemWindow* pSystemWindow = _pWindow ? _pWindow->GetSystemWindow() : nullptr; if ( pSystemWindow ) { _rMemFunc( pSystemWindow->GetTaskPaneList(), _pToRegister ); @@ -1325,11 +1325,11 @@ Reference< XPropertySet > createView( const OUString& _rName, const Reference< X Reference<XDataDescriptorFactory> xFact(xViews,UNO_QUERY); OSL_ENSURE(xFact.is(),"No XDataDescriptorFactory available!"); if(!xFact.is()) - return NULL; + return nullptr; Reference<XPropertySet> xView = xFact->createDataDescriptor(); if ( !xView.is() ) - return NULL; + return nullptr; OUString sCatalog,sSchema,sTable; ::dbtools::qualifiedNameComponents(_rxConnection->getMetaData(), @@ -1349,7 +1349,7 @@ Reference< XPropertySet > createView( const OUString& _rName, const Reference< X if(xAppend.is()) xAppend->appendByDescriptor(xView); - xView = NULL; + xView = nullptr; // we need to reget the view because after appending it, it is no longer valid // but this time it isn't a view object it is a table object with type "VIEW" Reference<XTablesSupplier> xTabSup(_rxConnection,UNO_QUERY); @@ -1449,7 +1449,7 @@ bool insertHierachyElement( vcl::Window* _pParent, const Reference< XComponentCo { OUString sError(ModuleRes(STR_NAME_ALREADY_EXISTS)); sError = sError.replaceFirst("#",sNewName); - throw SQLException(sError,NULL,OUString("S1000") ,0,Any()); + throw SQLException(sError,nullptr,OUString("S1000") ,0,Any()); } try diff --git a/dbaccess/source/ui/misc/WCPage.cxx b/dbaccess/source/ui/misc/WCPage.cxx index fd9206ee9079..e3fffb1ffb54 100644 --- a/dbaccess/source/ui/misc/WCPage.cxx +++ b/dbaccess/source/ui/misc/WCPage.cxx @@ -55,8 +55,8 @@ namespace CopyTableOperation = css::sdb::application::CopyTableOperation; OCopyTable::OCopyTable(vcl::Window * pParent) : OWizardPage(pParent, "CopyTablePage", "dbaccess/ui/copytablepage.ui") , m_nOldOperation(0) - , m_pPage2(NULL) - , m_pPage3(NULL) + , m_pPage2(nullptr) + , m_pPage3(nullptr) , m_bPKeyAllowed(false) , m_bUseHeaderAllowed(true) { diff --git a/dbaccess/source/ui/misc/WColumnSelect.cxx b/dbaccess/source/ui/misc/WColumnSelect.cxx index c9212bc6312b..b85bb7477f86 100644 --- a/dbaccess/source/ui/misc/WColumnSelect.cxx +++ b/dbaccess/source/ui/misc/WColumnSelect.cxx @@ -185,8 +185,8 @@ bool OWizColumnSelect::LeavePage() IMPL_LINK_TYPED( OWizColumnSelect, ButtonClickHdl, Button *, pButton, void ) { - ListBox *pLeft = NULL; - ListBox *pRight = NULL; + ListBox *pLeft = nullptr; + ListBox *pRight = nullptr; bool bAll = false; if (pButton == m_pColumn_RH) diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx index 09a99bfa15b4..51549cc3b29d 100644 --- a/dbaccess/source/ui/misc/WCopyTable.cxx +++ b/dbaccess/source/ui/misc/WCopyTable.cxx @@ -381,7 +381,7 @@ OFieldDescription* NamedTableCopySource::createFieldDescription( const OUString& if ( col->GetName() == _rColumnName ) return new OFieldDescription( *col ); - return NULL; + return nullptr; } OUString NamedTableCopySource::getSelectStatement() const @@ -463,7 +463,7 @@ Sequence< OUString > DummyCopySource::getPrimaryKeyColumnNames() const OFieldDescription* DummyCopySource::createFieldDescription( const OUString& /*_rColumnName*/ ) const { SAL_WARN("dbaccess.ui", "DummyCopySource::createFieldDescription: not to be called!" ); - return NULL; + return nullptr; } OUString DummyCopySource::getSelectStatement() const @@ -621,7 +621,7 @@ OCopyTableWizard::OCopyTableWizard( vcl::Window* pParent, const OUString& _rDefa ::dbaui::fillTypeInfo( _xConnection, m_sTypeNames, m_aTypeInfo, m_aTypeInfoIndex ); ::dbaui::fillTypeInfo( _xConnection, m_sTypeNames, m_aDestTypeInfo, m_aDestTypeInfoIndex ); - m_xInteractionHandler.set( InteractionHandler::createWithParent(m_xContext, 0), UNO_QUERY ); + m_xInteractionHandler.set( InteractionHandler::createWithParent(m_xContext, nullptr), UNO_QUERY ); VclPtrInstance<OCopyTable> pPage1( this ); pPage1->disallowViews(); @@ -1047,7 +1047,7 @@ void OCopyTableWizard::loadData( const ICopyTableSourceObject& _rSourceObject, _rColVector.clear(); _rColumns.clear(); - OFieldDescription* pActFieldDescr = NULL; + OFieldDescription* pActFieldDescr = nullptr; OUString sCreateParam("x"); // ReadOnly-Flag // On drop no line must be editable. @@ -1136,7 +1136,7 @@ void OCopyTableWizard::appendColumns( Reference<XColumnsSupplier>& _rxColSup, co xColumn->setPropertyValue(PROPERTY_NAME,makeAny(pField->GetName())); xAppend->appendByDescriptor(xColumn); - xColumn = NULL; + xColumn = nullptr; // now only the settings are missing if(xColumns->hasByName(pField->GetName())) { @@ -1203,12 +1203,12 @@ Reference< XPropertySet > OCopyTableWizard::createTable() Reference<XDataDescriptorFactory> xFact(xTables,UNO_QUERY); OSL_ENSURE(xFact.is(),"No XDataDescriptorFactory available!"); if(!xFact.is()) - return NULL; + return nullptr; xTable = xFact->createDataDescriptor(); OSL_ENSURE(xTable.is(),"Could not create a new object!"); if(!xTable.is()) - return NULL; + return nullptr; OUString sCatalog,sSchema,sTable; Reference< XDatabaseMetaData> xMetaData = m_xDestConnection->getMetaData(); @@ -1259,7 +1259,7 @@ Reference< XPropertySet > OCopyTableWizard::createTable() m_sName = sComposedName; } else - xTable = NULL; + xTable = nullptr; } if(xTable.is()) { diff --git a/dbaccess/source/ui/misc/WExtendPages.cxx b/dbaccess/source/ui/misc/WExtendPages.cxx index 6a21d512bd0f..0cbe34343250 100644 --- a/dbaccess/source/ui/misc/WExtendPages.cxx +++ b/dbaccess/source/ui/misc/WExtendPages.cxx @@ -55,7 +55,7 @@ OWizNormalExtend::OWizNormalExtend(vcl::Window* pParent) : OWizTypeSelect( pPare SvParser* OWizNormalExtend::createReader(sal_Int32 /*_nRows*/) { - return NULL; + return nullptr; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/misc/WNameMatch.cxx b/dbaccess/source/ui/misc/WNameMatch.cxx index a32640c471df..004f33a4a26b 100644 --- a/dbaccess/source/ui/misc/WNameMatch.cxx +++ b/dbaccess/source/ui/misc/WNameMatch.cxx @@ -62,7 +62,7 @@ OWizNameMatching::OWizNameMatching( vcl::Window* pParent) m_pCTRL_LEFT->SetSelectHdl(LINK(this,OWizNameMatching,TableListClickHdl)); m_pCTRL_RIGHT->SetSelectHdl(LINK(this,OWizNameMatching,TableListRightSelectHdl)); - m_pCTRL_RIGHT->EnableCheckButton( NULL ); + m_pCTRL_RIGHT->EnableCheckButton( nullptr ); m_pCTRL_LEFT->SetStyle( m_pCTRL_LEFT->GetStyle() | WB_FORCE_MAKEVISIBLE ); m_pCTRL_RIGHT->SetStyle( m_pCTRL_RIGHT->GetStyle() | WB_FORCE_MAKEVISIBLE ); @@ -215,8 +215,8 @@ IMPL_LINK_TYPED( OWizNameMatching, ButtonClickHdl, Button *, pButton, void ) else if(pButton == m_pColumn_down) nPos += 2; - m_pCTRL_LEFT->ModelIsMoving(pEntry,NULL,nPos); - m_pCTRL_LEFT->GetModel()->Move(pEntry,NULL,nPos); + m_pCTRL_LEFT->ModelIsMoving(pEntry,nullptr,nPos); + m_pCTRL_LEFT->GetModel()->Move(pEntry,nullptr,nPos); m_pCTRL_LEFT->ModelHasMoved(pEntry); long nThumbPos = m_pCTRL_LEFT->GetVScroll()->GetThumbPos(); @@ -242,8 +242,8 @@ IMPL_LINK_TYPED( OWizNameMatching, RightButtonClickHdl, Button *, pButton, void else if(pButton == m_pColumn_down_right) nPos += 2; - m_pCTRL_RIGHT->ModelIsMoving(pEntry,NULL,nPos); - m_pCTRL_RIGHT->GetModel()->Move(pEntry,NULL,nPos); + m_pCTRL_RIGHT->ModelIsMoving(pEntry,nullptr,nPos); + m_pCTRL_RIGHT->GetModel()->Move(pEntry,nullptr,nPos); m_pCTRL_RIGHT->ModelHasMoved(pEntry); long nThumbPos = m_pCTRL_RIGHT->GetVScroll()->GetThumbPos(); long nVisibleSize = m_pCTRL_RIGHT->GetVScroll()->GetVisibleSize(); @@ -397,7 +397,7 @@ void OColumnTreeBox::FillListBox( const ODatabaseExport::TColumnVector& _rList) ODatabaseExport::TColumnVector::const_iterator aEnd = _rList.end(); for(;aIter != aEnd;++aIter) { - SvTreeListEntry* pEntry = InsertEntry((*aIter)->first, 0, false, TREELIST_APPEND, (*aIter)->second); + SvTreeListEntry* pEntry = InsertEntry((*aIter)->first, nullptr, false, TREELIST_APPEND, (*aIter)->second); SvButtonState eState = !(m_bReadOnly && (*aIter)->second->IsAutoIncrement()) ? SV_BUTTON_CHECKED : SV_BUTTON_UNCHECKED; SetCheckButtonState( pEntry, eState ); } diff --git a/dbaccess/source/ui/misc/controllerframe.cxx b/dbaccess/source/ui/misc/controllerframe.cxx index f10b18cf92b9..ecc2647e8680 100644 --- a/dbaccess/source/ui/misc/controllerframe.cxx +++ b/dbaccess/source/ui/misc/controllerframe.cxx @@ -126,7 +126,7 @@ namespace dbaui if ( _rData.m_pListener.get() ) { _rData.m_pListener->dispose(); - _rData.m_pListener = NULL; + _rData.m_pListener = nullptr; } // remember new frame @@ -245,7 +245,7 @@ namespace dbaui void FrameWindowActivationListener::dispose() { impl_registerOnFrameContainerWindow_nothrow( false ); - m_pData = NULL; + m_pData = nullptr; } void FrameWindowActivationListener::impl_registerOnFrameContainerWindow_nothrow( bool _bRegister ) diff --git a/dbaccess/source/ui/misc/databaseobjectview.cxx b/dbaccess/source/ui/misc/databaseobjectview.cxx index c4441a46d350..54dc283f642d 100644 --- a/dbaccess/source/ui/misc/databaseobjectview.cxx +++ b/dbaccess/source/ui/misc/databaseobjectview.cxx @@ -240,7 +240,7 @@ namespace dbaui { try { AsyncDialogExecutor::executeModalDialogAsync( xDialog ); } catch( const Exception& ) { DBG_UNHANDLED_EXCEPTION(); } - return NULL; + return nullptr; } Reference< XComponent > xDesignerComponent( xDesigner, UNO_QUERY ); diff --git a/dbaccess/source/ui/misc/datasourceconnector.cxx b/dbaccess/source/ui/misc/datasourceconnector.cxx index 7c2b8015b6ba..830445e65a21 100644 --- a/dbaccess/source/ui/misc/datasourceconnector.cxx +++ b/dbaccess/source/ui/misc/datasourceconnector.cxx @@ -130,7 +130,7 @@ namespace dbaui if ( !xHandler.is() ) { // instantiate the default SDB interaction handler - xHandler.set( InteractionHandler::createWithParent(m_xContext, 0), UNO_QUERY ); + xHandler.set( InteractionHandler::createWithParent(m_xContext, nullptr), UNO_QUERY ); } xConnection = xConnectionCompletion->connectWithCompletion(xHandler); diff --git a/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx b/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx index 1e9ac26c5add..17710da59276 100644 --- a/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx +++ b/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx @@ -300,7 +300,7 @@ namespace dbaui OSL_ENSURE(!m_pImpl->m_bSuspended, "Cannot reconnect while suspended!"); stopConnectionListening( m_pImpl->m_xConnection ); - m_pImpl->m_aSdbMetaData.reset( NULL ); + m_pImpl->m_aSdbMetaData.reset( nullptr ); m_pImpl->m_xConnection.clear(); // reconnect @@ -314,7 +314,7 @@ namespace dbaui // now really reconnect ... if ( bReConnect ) { - m_pImpl->m_xConnection.reset( connect( m_pImpl->m_aDataSource.getDataSource(), NULL ), SharedConnection::TakeOwnership ); + m_pImpl->m_xConnection.reset( connect( m_pImpl->m_aDataSource.getDataSource(), nullptr ), SharedConnection::TakeOwnership ); m_pImpl->m_aSdbMetaData.reset( m_pImpl->m_xConnection ); } @@ -325,7 +325,7 @@ namespace dbaui void DBSubComponentController::disconnect() { stopConnectionListening(m_pImpl->m_xConnection); - m_pImpl->m_aSdbMetaData.reset( NULL ); + m_pImpl->m_aSdbMetaData.reset( nullptr ); m_pImpl->m_xConnection.clear(); InvalidateAll(); @@ -450,7 +450,7 @@ namespace dbaui { OUString aMessage(ModuleRes(RID_STR_CONNECTION_LOST)); Reference< XWindow > xWindow = getTopMostContainerWindow(); - vcl::Window* pWin = NULL; + vcl::Window* pWin = nullptr; if ( xWindow.is() ) pWin = VCLUnoHelper::GetWindow(xWindow); if ( !pWin ) @@ -555,7 +555,7 @@ namespace dbaui { ::osl::MutexGuard aGuard( getMutex() ); if ( !m_pImpl->documentHasScriptSupport() ) - return NULL; + return nullptr; return Reference< XEmbeddedScripts >( getDatabaseDocument(), UNO_QUERY_THROW ); } diff --git a/dbaccess/source/ui/misc/dsmeta.cxx b/dbaccess/source/ui/misc/dsmeta.cxx index 3e9645fed631..ecae43d52ddd 100644 --- a/dbaccess/source/ui/misc/dsmeta.cxx +++ b/dbaccess/source/ui/misc/dsmeta.cxx @@ -79,7 +79,7 @@ namespace dbaui { DSID_PRIMARY_KEY_SUPPORT, "PrimaryKeySupport" }, { DSID_RESPECTRESULTSETTYPE, "RespectDriverResultSetType" }, { DSID_MAX_ROW_SCAN, "MaxRowScan" }, - { 0, NULL } + { 0, nullptr } }; return s_aMappings; } diff --git a/dbaccess/source/ui/misc/linkeddocuments.cxx b/dbaccess/source/ui/misc/linkeddocuments.cxx index 40f62b4ad299..c544b2159afa 100644 --- a/dbaccess/source/ui/misc/linkeddocuments.cxx +++ b/dbaccess/source/ui/misc/linkeddocuments.cxx @@ -300,7 +300,7 @@ namespace dbaui aCommand.Name = "openDesign"; aCommand.Argument <<= aCommandArgs.getPropertyValues(); WaitObject aWaitCursor( m_pDialogParent ); - xNewDocument.set( xContent->execute( aCommand, xContent->createCommandIdentifier(), NULL ), UNO_QUERY ); + xNewDocument.set( xContent->execute( aCommand, xContent->createCommandIdentifier(), nullptr ), UNO_QUERY ); } } catch(const Exception&) diff --git a/dbaccess/source/ui/misc/moduledbu.cxx b/dbaccess/source/ui/misc/moduledbu.cxx index 702b14e0ac65..8e3086025908 100644 --- a/dbaccess/source/ui/misc/moduledbu.cxx +++ b/dbaccess/source/ui/misc/moduledbu.cxx @@ -47,7 +47,7 @@ public: }; OModuleImpl::OModuleImpl() - :m_pResources(NULL) + :m_pResources(nullptr) { } @@ -72,7 +72,7 @@ ResMgr* OModuleImpl::getResManager() // OModule ::osl::Mutex OModule::s_aMutex; sal_Int32 OModule::s_nClients = 0; -OModuleImpl* OModule::s_pImpl = NULL; +OModuleImpl* OModule::s_pImpl = nullptr; ResMgr* OModule::getResManager() { ENTER_MOD_METHOD(); @@ -91,7 +91,7 @@ void OModule::revokeClient() if (!--s_nClients && s_pImpl) { delete s_pImpl; - s_pImpl = NULL; + s_pImpl = nullptr; } } diff --git a/dbaccess/source/ui/querydesign/ConnectionLine.cxx b/dbaccess/source/ui/querydesign/ConnectionLine.cxx index f53be6ff5d76..4f078f9ce4f5 100644 --- a/dbaccess/source/ui/querydesign/ConnectionLine.cxx +++ b/dbaccess/source/ui/querydesign/ConnectionLine.cxx @@ -49,7 +49,7 @@ namespace */ Rectangle GetTextPos(const OTableWindow* _pWin, const Point& _aConnPos,const Point& _aDescrLinePos) { - OTableWindowListBox* pListBox = _pWin ? _pWin->GetListBox() : NULL; + OTableWindowListBox* pListBox = _pWin ? _pWin->GetListBox() : nullptr; OSL_ENSURE(_pWin && pListBox, "OConnectionLine::GetSourceTextPos : invalid call !"); Rectangle aReturn; @@ -117,7 +117,7 @@ OConnectionLine::OConnectionLine( OTableConnection* _pConn, OConnectionLineDataR } OConnectionLine::OConnectionLine( const OConnectionLine& _rLine ) - : m_pTabConn(NULL) + : m_pTabConn(nullptr) { m_pData = new OConnectionLineData( *_rLine.GetData() ); *this = _rLine; diff --git a/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx b/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx index 2b7f4ae55b3f..b79145fcd4aa 100644 --- a/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx +++ b/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx @@ -38,13 +38,13 @@ namespace dbaui using namespace ::com::sun::star; OConnectionLineAccess::OConnectionLineAccess(OTableConnection* _pLine) - : VCLXAccessibleComponent(_pLine->GetComponentInterface().is() ? _pLine->GetWindowPeer() : NULL) + : VCLXAccessibleComponent(_pLine->GetComponentInterface().is() ? _pLine->GetWindowPeer() : nullptr) ,m_pLine(_pLine) { } void SAL_CALL OConnectionLineAccess::disposing() { - m_pLine = NULL; + m_pLine = nullptr; VCLXAccessibleComponent::disposing(); } Any SAL_CALL OConnectionLineAccess::queryInterface( const Type& aType ) throw (RuntimeException, std::exception) diff --git a/dbaccess/source/ui/querydesign/JAccess.cxx b/dbaccess/source/ui/querydesign/JAccess.cxx index 5ef3db8704b7..30351dd6a639 100644 --- a/dbaccess/source/ui/querydesign/JAccess.cxx +++ b/dbaccess/source/ui/querydesign/JAccess.cxx @@ -33,7 +33,7 @@ namespace dbaui using namespace ::com::sun::star::lang; OJoinDesignViewAccess::OJoinDesignViewAccess(OJoinTableView* _pTableView) - :VCLXAccessibleComponent(_pTableView->GetComponentInterface().is() ? _pTableView->GetWindowPeer() : NULL) + :VCLXAccessibleComponent(_pTableView->GetComponentInterface().is() ? _pTableView->GetWindowPeer() : nullptr) ,m_pTableView(_pTableView) { } @@ -48,7 +48,7 @@ namespace dbaui void OJoinDesignViewAccess::clearTableView() { ::osl::MutexGuard aGuard( m_aMutex ); - m_pTableView = NULL; + m_pTableView = nullptr; } // XAccessibleContext sal_Int32 SAL_CALL OJoinDesignViewAccess::getAccessibleChildCount( ) throw (RuntimeException, std::exception) diff --git a/dbaccess/source/ui/querydesign/JoinController.cxx b/dbaccess/source/ui/querydesign/JoinController.cxx index f8f4e1dce412..5fd3147b360a 100644 --- a/dbaccess/source/ui/querydesign/JoinController.cxx +++ b/dbaccess/source/ui/querydesign/JoinController.cxx @@ -140,14 +140,14 @@ OJoinTableView* AddTableDialogContext::getTableView() const { if ( m_rController.getJoinView() ) return m_rController.getJoinView()->getTableView(); - return NULL; + return nullptr; } // OJoinController OJoinController::OJoinController(const Reference< XComponentContext >& _rM) :OJoinController_BASE(_rM) - ,m_pAddTableDialog(NULL) + ,m_pAddTableDialog(nullptr) { } @@ -194,7 +194,7 @@ void OJoinController::SaveTabWinPosSize(OTableWindow* pTabWin, long nOffsetX, lo { // the data for the window TTableWindowData::value_type pData = pTabWin->GetData(); - OSL_ENSURE(pData != 0, "SaveTabWinPosSize : TabWin hat keine Daten !"); + OSL_ENSURE(pData != nullptr, "SaveTabWinPosSize : TabWin hat keine Daten !"); // set Position & Size of data anew (with current window parameters) Point aPos = pTabWin->GetPosPixel(); @@ -217,7 +217,7 @@ FeatureState OJoinController::GetState(sal_uInt16 _nId) const aReturn.bChecked = isEditable(); break; case ID_BROWSER_ADDTABLE: - aReturn.bEnabled = ( getView() != NULL ) + aReturn.bEnabled = ( getView() != nullptr ) && const_cast< OJoinController* >( this )->getJoinView()->getTableView()->IsAddAllowed(); aReturn.bChecked = aReturn.bEnabled && m_pAddTableDialog != nullptr && m_pAddTableDialog->IsVisible() ; if ( aReturn.bEnabled ) diff --git a/dbaccess/source/ui/querydesign/JoinDesignView.cxx b/dbaccess/source/ui/querydesign/JoinDesignView.cxx index a5701f9311cc..81564fb9f9bb 100644 --- a/dbaccess/source/ui/querydesign/JoinDesignView.cxx +++ b/dbaccess/source/ui/querydesign/JoinDesignView.cxx @@ -53,7 +53,7 @@ namespace dbaui // OJoinDesignView OJoinDesignView::OJoinDesignView(vcl::Window* _pParent, OJoinController& _rController,const Reference< XComponentContext >& _rxContext) :ODataView( _pParent, _rController, _rxContext ) - ,m_pTableView(NULL) + ,m_pTableView(nullptr) ,m_rController( _rController ) { m_pScrollWindow = VclPtr<OScrollWindowHelper>::Create(this); diff --git a/dbaccess/source/ui/querydesign/JoinExchange.cxx b/dbaccess/source/ui/querydesign/JoinExchange.cxx index 0cc4c779c3c4..c4c0dcf61c63 100644 --- a/dbaccess/source/ui/querydesign/JoinExchange.cxx +++ b/dbaccess/source/ui/querydesign/JoinExchange.cxx @@ -34,7 +34,7 @@ namespace dbaui OJoinExchObj::OJoinExchObj(const OJoinExchangeData& jxdSource,bool _bFirstEntry) :m_bFirstEntry(_bFirstEntry) ,m_jxdSourceDescription(jxdSource) - ,m_pDragListener(NULL) + ,m_pDragListener(nullptr) { // add available types to list } @@ -53,7 +53,7 @@ namespace dbaui { if (m_pDragListener) m_pDragListener->dragFinished(); - m_pDragListener = NULL; + m_pDragListener = nullptr; } bool OJoinExchObj::isFormatAvailable( const DataFlavorExVector& _rFormats ,SotClipboardFormatId _nSlotID) @@ -85,7 +85,7 @@ namespace dbaui Sequence< sal_Int8 > OJoinExchObj::getUnoTunnelImplementationId() { - static ::cppu::OImplementationId * pId = 0; + static ::cppu::OImplementationId * pId = nullptr; if (! pId) { ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx index 9cfe84f2f4d4..70379a872a0f 100644 --- a/dbaccess/source/ui/querydesign/JoinTableView.cxx +++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx @@ -66,7 +66,7 @@ OScrollWindowHelper::OScrollWindowHelper( vcl::Window* pParent) : Window( pParen ,m_aHScrollBar( VclPtr<ScrollBar>::Create(this, WB_HSCROLL|WB_REPEAT|WB_DRAG) ) ,m_aVScrollBar( VclPtr<ScrollBar>::Create(this, WB_VSCROLL|WB_REPEAT|WB_DRAG) ) ,m_pCornerWindow(VclPtr<ScrollBarBox>::Create(this, WB_3DLOOK)) - ,m_pTableView(NULL) + ,m_pTableView(nullptr) { // ScrollBars @@ -162,13 +162,13 @@ OJoinTableView::OJoinTableView( vcl::Window* pParent, OJoinDesignView* pView ) ,DropTargetHelper(this) ,m_aDragOffset( Point(0,0) ) ,m_aScrollOffset( Point(0,0) ) - ,m_pDragWin( NULL ) - ,m_pSizingWin( NULL ) - ,m_pSelectedConn( NULL ) + ,m_pDragWin( nullptr ) + ,m_pSizingWin( nullptr ) + ,m_pSelectedConn( nullptr ) ,m_bTrackingInitiallyMoved(false) - ,m_pLastFocusTabWin(NULL) + ,m_pLastFocusTabWin(nullptr) ,m_pView( pView ) - ,m_pAccessible(NULL) + ,m_pAccessible(nullptr) { SetSizePixel( Size(1000, 1000) ); @@ -187,7 +187,7 @@ void OJoinTableView::dispose() if( m_pAccessible ) { m_pAccessible->clearTableView(); - m_pAccessible = NULL; + m_pAccessible = nullptr; } // delete lists clearLayoutInformation(); @@ -314,7 +314,7 @@ OTableWindowData* OJoinTableView::CreateImpl(const OUString& _rComposedName ,const OUString& _sTableName ,const OUString& _rWinName) { - return new OTableWindowData( NULL,_rComposedName,_sTableName, _rWinName ); + return new OTableWindowData( nullptr,_rComposedName,_sTableName, _rWinName ); } void OJoinTableView::AddTabWin(const OUString& _rComposedName, const OUString& rWinName, bool /*bNewTable*/) @@ -393,7 +393,7 @@ void OJoinTableView::RemoveTabWin( OTableWindow* pTabWin ) m_aTableMap.erase( pTabWin->GetComposedName() ); if (pTabWin == m_pLastFocusTabWin) - m_pLastFocusTabWin = NULL; + m_pLastFocusTabWin = nullptr; pTabWin->clearListBox(); pTabWin->disposeOnce(); @@ -622,7 +622,7 @@ void OJoinTableView::BeginChildMove( OTableWindow* pTabWin, const Point& rMouseP SetPointer(Pointer(PointerStyle::Move)); Point aMousePos = ScreenToOutputPixel( rMousePos ); m_aDragOffset = aMousePos - pTabWin->GetPosPixel(); - m_pDragWin->SetZOrder(NULL, ZOrderFlags::First); + m_pDragWin->SetZOrder(nullptr, ZOrderFlags::First); m_bTrackingInitiallyMoved = false; StartTracking(); } @@ -752,7 +752,7 @@ void OJoinTableView::Tracking( const TrackingEvent& rTEvt ) // position window EndTracking(); - m_pDragWin->SetZOrder(NULL, ZOrderFlags::First); + m_pDragWin->SetZOrder(nullptr, ZOrderFlags::First); // check, if I really moved // (this prevents setting the modified-Flag, when there actually was no change0 TTableWindowData::value_type pData = m_pDragWin->GetData(); @@ -766,7 +766,7 @@ void OJoinTableView::Tracking( const TrackingEvent& rTEvt ) m_pDragWin->GrabFocus(); } - m_pDragWin = NULL; + m_pDragWin = nullptr; SetPointer(Pointer(PointerStyle::Arrow)); } // else we handle the resizing @@ -784,7 +784,7 @@ void OJoinTableView::Tracking( const TrackingEvent& rTEvt ) TabWinSized(m_pSizingWin, ptOld, szOld); m_pSizingWin->Invalidate( m_aSizingRect ); - m_pSizingWin = NULL; + m_pSizingWin = nullptr; } } else if (rTEvt.IsTrackingCanceled()) @@ -878,7 +878,7 @@ void OJoinTableView::DeselectConn(OTableConnection* pConn) pWin->GetListBox()->SelectAll(false); pConn->Deselect(); - m_pSelectedConn = NULL; + m_pSelectedConn = nullptr; } void OJoinTableView::SelectConn(OTableConnection* pConn) @@ -992,8 +992,8 @@ void OJoinTableView::ClearAll() } m_vTableConnection.clear(); - m_pLastFocusTabWin = NULL; - m_pSelectedConn = NULL; + m_pLastFocusTabWin = nullptr; + m_pSelectedConn = nullptr; // scroll to the upper left ScrollPane(-GetScrollOffset().X(), true, true); @@ -1198,7 +1198,7 @@ void OJoinTableView::Command(const CommandEvent& rEvt) OTableConnection* OJoinTableView::GetTabConn(const OTableWindow* pLhs,const OTableWindow* pRhs,bool _bSupressCrossOrNaturalJoin,const OTableConnection* _rpFirstAfter) const { - OTableConnection* pConn = NULL; + OTableConnection* pConn = nullptr; OSL_ENSURE(pRhs || pLhs, "OJoinTableView::GetTabConn : invalid args !"); // only one NULL-arg allowed @@ -1214,12 +1214,12 @@ OTableConnection* OJoinTableView::GetTabConn(const OTableWindow* pLhs,const OTab if ( ( (pData->GetSourceWin() == pLhs) && ( (pData->GetDestWin() == pRhs) - || (NULL == pRhs) + || (nullptr == pRhs) ) ) || ( (pData->GetSourceWin() == pRhs) && ( (pData->GetDestWin() == pLhs) - || (NULL == pLhs) + || (nullptr == pLhs) ) ) ) @@ -1294,8 +1294,8 @@ bool OJoinTableView::PreNotify(NotifyEvent& rNEvt) if (aIter->second && aIter->second->HasChildPathFocus()) break; - OTableWindow* pNextWin = NULL; - OTableConnection* pNextConn = NULL; + OTableWindow* pNextWin = nullptr; + OTableConnection* pNextConn = nullptr; if (aIter != m_aTableMap.end()) { // there is a currently active tab win @@ -1411,7 +1411,7 @@ bool OJoinTableView::PreNotify(NotifyEvent& rNEvt) vcl::Window* pSource = rNEvt.GetWindow(); if (pSource) { - vcl::Window* pSearchFor = NULL; + vcl::Window* pSearchFor = nullptr; if (pSource->GetParent() == this) // it may be one of the tab wins pSearchFor = pSource; @@ -1524,8 +1524,8 @@ void OJoinTableView::dragFinished( ) void OJoinTableView::clearLayoutInformation() { - m_pLastFocusTabWin = NULL; - m_pSelectedConn = NULL; + m_pLastFocusTabWin = nullptr; + m_pSelectedConn = nullptr; // delete lists OTableWindowMap::iterator aIter = m_aTableMap.begin(); OTableWindowMap::iterator aEnd = m_aTableMap.end(); diff --git a/dbaccess/source/ui/querydesign/QTableWindow.cxx b/dbaccess/source/ui/querydesign/QTableWindow.cxx index 6a7d1a8e9803..61949b640c1b 100644 --- a/dbaccess/source/ui/querydesign/QTableWindow.cxx +++ b/dbaccess/source/ui/querydesign/QTableWindow.cxx @@ -53,7 +53,7 @@ OQueryTableWindow::OQueryTableWindow( vcl::Window* pParent, const TTableWindowDa :OTableWindow( pParent, pTabWinData ) ,m_nAliasNum(0) { - if (pszInitialAlias != NULL) + if (pszInitialAlias != nullptr) m_strInitialAlias = OUString(pszInitialAlias); else m_strInitialAlias = GetAliasName(); @@ -116,19 +116,19 @@ void* OQueryTableWindow::createUserData(const Reference< XPropertySet>& _xColumn void OQueryTableWindow::deleteUserData(void*& _pUserData) { delete static_cast<OTableFieldInfo*>(_pUserData); - _pUserData = NULL; + _pUserData = nullptr; } void OQueryTableWindow::OnEntryDoubleClicked(SvTreeListEntry* pEntry) { - OSL_ENSURE(pEntry != NULL, "OQueryTableWindow::OnEntryDoubleClicked : pEntry must not be NULL !"); + OSL_ENSURE(pEntry != nullptr, "OQueryTableWindow::OnEntryDoubleClicked : pEntry must not be NULL !"); // you could also scan that and then return, but like this it could possibly hint to faults at the caller if (getTableView()->getDesignView()->getController().isReadOnly()) return; OTableFieldInfo* pInf = static_cast<OTableFieldInfo*>(pEntry->GetUserData()); - OSL_ENSURE(pInf != NULL, "OQueryTableWindow::OnEntryDoubleClicked : field doesn't have FieldInfo !"); + OSL_ENSURE(pInf != nullptr, "OQueryTableWindow::OnEntryDoubleClicked : field doesn't have FieldInfo !"); // build up DragInfo OTableFieldDescRef aInfo = new OTableFieldDesc(GetTableName(), m_xListBox->GetEntryText(pEntry)); diff --git a/dbaccess/source/ui/querydesign/QTableWindow.hxx b/dbaccess/source/ui/querydesign/QTableWindow.hxx index ae895710f8f7..140e55dc5abb 100644 --- a/dbaccess/source/ui/querydesign/QTableWindow.hxx +++ b/dbaccess/source/ui/querydesign/QTableWindow.hxx @@ -31,7 +31,7 @@ namespace dbaui sal_Int32 m_nAliasNum; OUString m_strInitialAlias; public: - OQueryTableWindow( vcl::Window* pParent, const TTableWindowData::value_type& pTabWinData, sal_Unicode* pszInitialAlias = NULL ); + OQueryTableWindow( vcl::Window* pParent, const TTableWindowData::value_type& pTabWinData, sal_Unicode* pszInitialAlias = nullptr ); OUString GetAliasName() const { diff --git a/dbaccess/source/ui/querydesign/QTableWindowData.cxx b/dbaccess/source/ui/querydesign/QTableWindowData.cxx index 9f825975e7bc..c6a8e4f39d06 100644 --- a/dbaccess/source/ui/querydesign/QTableWindowData.cxx +++ b/dbaccess/source/ui/querydesign/QTableWindowData.cxx @@ -26,7 +26,7 @@ using namespace ::com::sun::star::uno; // class OQueryTableWindowData OQueryTableWindowData::OQueryTableWindowData(const OUString& _rComposedName, const OUString& rTableName, const OUString& rTableAlias ) - :OTableWindowData(NULL,_rComposedName, rTableName, rTableAlias) + :OTableWindowData(nullptr,_rComposedName, rTableName, rTableAlias) { } diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx index 6d1907a77959..d39a21af25db 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx +++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx @@ -120,7 +120,7 @@ namespace { sTableRange = ::connectivity::OSQLParseNode::getTableRange(_pTableRef); if ( sTableRange.isEmpty() ) - _pTableRef->parseNodeToStr(sTableRange,xConnection,NULL,false,false); + _pTableRef->parseNodeToStr(sTableRange,xConnection,nullptr,false,false); } return sTableRange; } @@ -215,7 +215,7 @@ namespace for (sal_uInt32 i=0; !bError && i < nCount; ++i) { const ::connectivity::OSQLParseNode* pParseNode = pTableRefList->getChild(i); - const ::connectivity::OSQLParseNode* pJoinNode = NULL; + const ::connectivity::OSQLParseNode* pJoinNode = nullptr; if ( SQL_ISRULE( pParseNode, qualified_join ) || SQL_ISRULE( pParseNode, joined_table ) || SQL_ISRULE( pParseNode, cross_union ) ) pJoinNode = pParseNode; @@ -601,7 +601,7 @@ namespace bool GetInnerJoinCriteria( const OQueryDesignView* _pView, const ::connectivity::OSQLParseNode *pCondition) { - return InsertJoinConnection(_pView,pCondition, INNER_JOIN,NULL,NULL) != eOk; + return InsertJoinConnection(_pView,pCondition, INNER_JOIN,nullptr,nullptr) != eOk; } OUString GenerateSelectList( const OQueryDesignView* _pView, OTableFields& _rFieldList, @@ -1341,7 +1341,7 @@ namespace { // check if we have to put the or criteria on one line. const ::connectivity::OSQLParseNode* pSearchCondition = pCondition->getChild(1); - bool bMustAddOrOnOneLine = CheckOrCriteria(pSearchCondition,NULL); + bool bMustAddOrOnOneLine = CheckOrCriteria(pSearchCondition,nullptr); if ( SQL_ISRULE( pSearchCondition, search_condition) ) // we have a or { _pSelectionBrw->DuplicateConditionLevel( nLevel); @@ -1752,7 +1752,7 @@ namespace if ( pTabWin && pTabWin->ExistsField( _rColumName, _rInfo ) ) return pTabWin; } - return NULL; + return nullptr; } } @@ -1774,7 +1774,7 @@ namespace if (aTableRange.isEmpty()) { // SELECT column, ... - bFound = NULL != lcl_findColumnInTables( aColumnName, *pTabList, _raInfo ); + bFound = nullptr != lcl_findColumnInTables( aColumnName, *pTabList, _raInfo ); if ( bFound && ( aColumnName.toChar() != '*' ) ) _raInfo->SetFieldAlias(aColumnAlias); } @@ -1802,7 +1802,7 @@ namespace bool checkJoinConditions( const OQueryDesignView* _pView, const ::connectivity::OSQLParseNode* _pNode ) { - const ::connectivity::OSQLParseNode* pJoinNode = NULL; + const ::connectivity::OSQLParseNode* pJoinNode = nullptr; bool bRet = true; if (SQL_ISRULE(_pNode,qualified_join)) pJoinNode = _pNode; @@ -1910,7 +1910,7 @@ namespace OTableFields::iterator aEnd = rUnUsedFields.end(); for(OTableFields::iterator aIter = rUnUsedFields.begin();aIter != aEnd;++aIter) if(_pSelectionBrw->InsertField(*aIter,BROWSER_INVALIDID,false,false).is()) - (*aIter) = NULL; + (*aIter) = nullptr; OTableFields().swap( rUnUsedFields ); } @@ -2117,7 +2117,7 @@ namespace const ::connectivity::OSQLParseNode* pNode, OJoinTableView::OTableWindowMap* pTabList ) { - if( pNode==0 || !SQL_ISRULE(pNode,select_statement)) + if( pNode==nullptr || !SQL_ISRULE(pNode,select_statement)) return eNoSelectStatement; ::connectivity::OSQLParseNode* pParseTree = pNode->getChild(2); // selection @@ -2181,7 +2181,7 @@ namespace &rController.getParser().getContext()); sal_Int32 nFunctionType = FKT_NONE; - ::connectivity::OSQLParseNode* pParamRef = NULL; + ::connectivity::OSQLParseNode* pParamRef = nullptr; sal_Int32 nColumnRefPos = pColumnRef->count() - 2; if ( nColumnRefPos >= 0 && static_cast<sal_uInt32>(nColumnRefPos) < pColumnRef->count() ) pParamRef = pColumnRef->getChild(nColumnRefPos); @@ -2226,7 +2226,7 @@ namespace aInfo->SetFieldType(TAB_NORMAL_FIELD); aInfo->SetField(sFieldName); } - aInfo->SetTabWindow(NULL); + aInfo->SetTabWindow(nullptr); aInfo->SetFieldAlias(aColumnAlias); } else @@ -2255,7 +2255,7 @@ namespace &rController.getParser().getContext(), true); // quote is to true because we need quoted elements inside the function - aInfo->SetTabWindow( NULL ); + aInfo->SetTabWindow( nullptr ); // since we support queries in queries, the thingie might belong to an existing "table" OQueryTableWindow* pExistingTable = lcl_findColumnInTables( aColumns, *pTabList, aInfo ); @@ -2297,7 +2297,7 @@ namespace if (!pParseRoot->getChild(3)->getChild(ORDER_BY_CHILD_POS)->isLeaf()) { ::connectivity::OSQLParseNode* pNode = pParseRoot->getChild(3)->getChild(ORDER_BY_CHILD_POS)->getChild(2); - ::connectivity::OSQLParseNode* pParamRef = NULL; + ::connectivity::OSQLParseNode* pParamRef = nullptr; OQueryController& rController = static_cast<OQueryController&>(_pView->getController()); EOrderDir eOrderDir; @@ -2388,7 +2388,7 @@ namespace for( sal_uInt32 i=0 ; i < pGroupBy->count() && eOk == eErrorCode; ++i ) { OTableFieldDescRef aDragInfo = new OTableFieldDesc(); - ::connectivity::OSQLParseNode* pParamRef = NULL; + ::connectivity::OSQLParseNode* pParamRef = nullptr; ::connectivity::OSQLParseNode* pArgument = pGroupBy->getChild( i ); if(SQL_ISRULE(pArgument,column_ref)) { @@ -2733,7 +2733,7 @@ sal_Int32 OQueryDesignView::getColWidth(sal_uInt16 _nColPos) const void OQueryDesignView::fillValidFields(const OUString& sAliasName, ComboBox* pFieldList) { - OSL_ENSURE(pFieldList != NULL, "OQueryDesignView::FillValidFields : What the hell do you think I can do with a NULL-ptr ? This will crash !"); + OSL_ENSURE(pFieldList != nullptr, "OQueryDesignView::FillValidFields : What the hell do you think I can do with a NULL-ptr ? This will crash !"); pFieldList->Clear(); bool bAllTables = sAliasName.isEmpty(); @@ -3004,10 +3004,10 @@ OSQLParseNode* OQueryDesignView::getPredicateTreeFromEntry(OTableFieldDescRef pE { OSL_ENSURE(pEntry.is(),"Entry is null!"); if(!pEntry.is()) - return NULL; + return nullptr; Reference< XConnection> xConnection = static_cast<OQueryController&>(getController()).getConnection(); if(!xConnection.is()) - return NULL; + return nullptr; ::connectivity::OSQLParser& rParser( static_cast<OQueryController&>(getController()).getParser() ); OQueryTableWindow* pWin = static_cast<OQueryTableWindow*>(pEntry->GetTabWindow()); @@ -3552,7 +3552,7 @@ void OQueryDesignView::fillFunctionInfo( const ::connectivity::OSQLParseNode* p aInfo->SetDataType(nDataType); aInfo->SetFieldType(TAB_NORMAL_FIELD); aInfo->SetField(sFunctionTerm); - aInfo->SetTabWindow(NULL); + aInfo->SetTabWindow(nullptr); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx b/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx index 02c59c3cb998..edfe52f00f58 100644 --- a/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx +++ b/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx @@ -39,7 +39,7 @@ OQueryTabConnUndoAction::~OQueryTabConnUndoAction() OQueryTabConnUndoAction::OQueryTabConnUndoAction(OQueryTableView* pOwner, sal_uInt16 nCommentID) :OQueryDesignUndoAction(pOwner, nCommentID) - ,m_pConnection(NULL) + ,m_pConnection(nullptr) ,m_bOwnerOfConn(false) { } diff --git a/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx b/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx index d898780b9d48..d4d287b97fbc 100644 --- a/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx +++ b/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx @@ -36,12 +36,12 @@ OQueryDesignFieldUndoAct::OQueryDesignFieldUndoAct(OSelectionBrowseBox* pSelBrwB OQueryDesignFieldUndoAct::~OQueryDesignFieldUndoAct() { - pOwner = NULL; + pOwner = nullptr; } OQueryTabWinUndoAct::OQueryTabWinUndoAct(OQueryTableView* pOwner, sal_uInt16 nCommentID) : OQueryDesignUndoAction(pOwner, nCommentID) - , m_pTabWin(NULL) + , m_pTabWin(nullptr) , m_bOwnerOfObjects(false) { } diff --git a/dbaccess/source/ui/querydesign/QueryTableView.cxx b/dbaccess/source/ui/querydesign/QueryTableView.cxx index 4ddd95c62329..fb53cd47acb2 100644 --- a/dbaccess/source/ui/querydesign/QueryTableView.cxx +++ b/dbaccess/source/ui/querydesign/QueryTableView.cxx @@ -326,7 +326,7 @@ VclPtr<OTableWindow> OQueryTableView::createWindow(const TTableWindowData::value void OQueryTableView::NotifyTabConnection(const OQueryTableConnection& rNewConn, bool _bCreateUndoAction) { // let's first check if I have the connection already - OQueryTableConnection* pTabConn = NULL; + OQueryTableConnection* pTabConn = nullptr; const auto& rConnections = getTableConnections(); auto aEnd = rConnections.end(); auto aIter = ::std::find( rConnections.begin(), @@ -349,7 +349,7 @@ void OQueryTableView::NotifyTabConnection(const OQueryTableConnection& rNewConn, pTabConn = static_cast<OQueryTableConnection*>((*aIter).get()); // no -> insert - if (pTabConn == NULL) + if (pTabConn == nullptr) { // the new data ... OQueryTableConnectionData* pNewData = static_cast< OQueryTableConnectionData*>(rNewConn.GetData()->NewInstance()); @@ -467,7 +467,7 @@ void OQueryTableView::AddTabWin(const OUString& _rComposedName, const OUString& if(!bSuccess) { // reset table window - pUndoAction->SetTabWin(NULL); + pUndoAction->SetTabWin(nullptr); pUndoAction->SetOwnership(false); delete pUndoAction; @@ -699,7 +699,7 @@ OQueryTableWindow* OQueryTableView::FindTable(const OUString& rAliasName) OTableWindowMap::const_iterator aIter = GetTabWinMap().find(rAliasName); if(aIter != GetTabWinMap().end()) return static_cast<OQueryTableWindow*>(aIter->second.get()); - return NULL; + return nullptr; } bool OQueryTableView::FindTableFromField(const OUString& rFieldName, OTableFieldDescRef& rInfo, sal_uInt16& rCnt) @@ -736,7 +736,7 @@ bool OQueryTableView::ContainsTabWin(const OTableWindow& rTabWin) void OQueryTableView::RemoveTabWin(OTableWindow* pTabWin) { - OSL_ENSURE(pTabWin != NULL, "OQueryTableView::RemoveTabWin : Window should not be NULL !"); + OSL_ENSURE(pTabWin != nullptr, "OQueryTableView::RemoveTabWin : Window should not be NULL !"); if(pTabWin && ContainsTabWin(*pTabWin)) // #i122589# check if registered before deleting { @@ -818,7 +818,7 @@ void OQueryTableView::HideTabWin( OQueryTableWindow* pTabWin, OQueryTabWinUndoAc // and its data, gets destroyed and destroys both the window and its data if (m_pLastFocusTabWin == pTabWin) - m_pLastFocusTabWin = NULL; + m_pLastFocusTabWin = nullptr; // collect connections belonging to the window and pass to UndoAction sal_Int16 nCnt = 0; @@ -867,7 +867,7 @@ bool OQueryTableView::ShowTabWin( OQueryTableWindow* pTabWin, OQueryTabWinUndoAc if (pTabWin->Init()) { TTableWindowData::value_type pData = pTabWin->GetData(); - OSL_ENSURE(pData != 0, "OQueryTableView::ShowTabWin : TabWin has no data !"); + OSL_ENSURE(pData != nullptr, "OQueryTableView::ShowTabWin : TabWin has no data !"); // If there is a position and size defined, we use them if (pData->HasPosition() && pData->HasSize()) { @@ -929,7 +929,7 @@ bool OQueryTableView::ShowTabWin( OQueryTableWindow* pTabWin, OQueryTabWinUndoAc void OQueryTableView::InsertField(const OTableFieldDescRef& rInfo) { - OSL_ENSURE(getDesignView() != NULL, "OQueryTableView::InsertField : has no Parent !"); + OSL_ENSURE(getDesignView() != nullptr, "OQueryTableView::InsertField : has no Parent !"); static_cast<OQueryDesignView*>(getDesignView())->InsertField(rInfo); } @@ -949,7 +949,7 @@ bool OQueryTableView::ExistsAVisitedConn(const OQueryTableWindow* pFrom) const void OQueryTableView::onNoColumns_throw() { OUString sError( ModuleRes( STR_STATEMENT_WITHOUT_RESULT_SET ) ); - ::dbtools::throwSQLException( sError, ::dbtools::SQL_GENERAL_ERROR, NULL ); + ::dbtools::throwSQLException( sError, ::dbtools::SQL_GENERAL_ERROR, nullptr ); } bool OQueryTableView::supressCrossNaturalJoin(const TTableConnectionData::value_type& _pData) const diff --git a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx index be066e36512a..f114478dee8b 100644 --- a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx +++ b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx @@ -143,7 +143,7 @@ void OQueryViewSwitch::paste() OQueryContainerWindow* OQueryViewSwitch::getContainer() const { - vcl::Window* pDesignParent = getDesignView() ? getDesignView()->GetParent() : NULL; + vcl::Window* pDesignParent = getDesignView() ? getDesignView()->GetParent() : nullptr; return static_cast< OQueryContainerWindow* >( pDesignParent ); } @@ -247,7 +247,7 @@ bool OQueryViewSwitch::impl_postViewSwitch( const bool i_bGraphicalDesign, const OAddTableDlg* OQueryViewSwitch::getAddTableDialog() { if ( !m_pDesignView ) - return NULL; + return nullptr; return m_pDesignView->getController().getAddTableDialog(); } diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index 30f4f013e80b..67b8d374c9b4 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -427,15 +427,15 @@ void OSelectionBrowseBox::SetReadOnly(bool bRO) CellController* OSelectionBrowseBox::GetController(long nRow, sal_uInt16 nColId) { if ( nColId > getFields().size() ) - return NULL; + return nullptr; OTableFieldDescRef pEntry = getFields()[nColId-1]; OSL_ENSURE(pEntry.is(), "OSelectionBrowseBox::GetController : keine FieldDescription !"); if (!pEntry.is()) - return NULL; + return nullptr; if (static_cast<OQueryController&>(getDesignView()->getController()).isReadOnly()) - return NULL; + return nullptr; long nCellIndex = GetRealRow(nRow); switch (nCellIndex) @@ -662,16 +662,16 @@ bool OSelectionBrowseBox::saveField(OUString& _sFieldName ,OTableFieldDescRef& _ ::connectivity::OSQLParser& rParser( rController.getParser() ); { // automatically add parentheses around subqueries - OSQLParseNode *pParseNode = NULL; + OSQLParseNode *pParseNode = nullptr; OUString devnull; pParseNode = rParser.parseTree( devnull, _sFieldName, true ); - if (pParseNode == NULL) + if (pParseNode == nullptr) pParseNode = rParser.parseTree( devnull, _sFieldName ); - if (pParseNode != NULL && SQL_ISRULE(pParseNode, select_statement)) + if (pParseNode != nullptr && SQL_ISRULE(pParseNode, select_statement)) _sFieldName = "(" + _sFieldName + ")"; } - OSQLParseNode* pParseNode = NULL; + OSQLParseNode* pParseNode = nullptr; { // 4 passes in trying to interprete the field name // - don't quote the field name, parse internationally @@ -710,10 +710,10 @@ bool OSelectionBrowseBox::saveField(OUString& _sFieldName ,OTableFieldDescRef& _ pParseNode = rParser.parseTree( sErrorMsg, sSql, bInternational ); } - while ( ( pParseNode == NULL ) && ( --nPass > 0 ) ); + while ( ( pParseNode == nullptr ) && ( --nPass > 0 ) ); } - if ( pParseNode == NULL ) + if ( pParseNode == nullptr ) { // something different which we have to check OUString sErrorMessage( ModuleRes( STR_QRY_COLUMN_NOT_FOUND ) ); @@ -887,7 +887,7 @@ bool OSelectionBrowseBox::saveField(OUString& _sFieldName ,OTableFieldDescRef& _ bool OSelectionBrowseBox::SaveModified() { OQueryController& rController = static_cast<OQueryController&>(getDesignView()->getController()); - OTableFieldDescRef pEntry = NULL; + OTableFieldDescRef pEntry = nullptr; sal_uInt16 nCurrentColumnPos = GetColumnPos(GetCurColumnId()); if(getFields().size() > static_cast<sal_uInt16>(nCurrentColumnPos - 1)) pEntry = getEntry(nCurrentColumnPos - 1); @@ -1003,7 +1003,7 @@ bool OSelectionBrowseBox::SaveModified() { pEntry->SetAlias(OUString()); pEntry->SetTable(OUString()); - pEntry->SetTabWindow(NULL); + pEntry->SetTabWindow(nullptr); } sNewValue = pEntry->GetAlias(); @@ -1199,7 +1199,7 @@ bool OSelectionBrowseBox::SaveModified() if ( bListAction && !m_bInUndoMode ) static_cast<OQueryController&>(getDesignView()->getController()).GetUndoManager().LeaveListAction(); - return pEntry != NULL && !bError; + return pEntry != nullptr && !bError; } bool OSelectionBrowseBox::SeekRow(long nRow) @@ -1212,7 +1212,7 @@ void OSelectionBrowseBox::PaintCell(OutputDevice& rDev, const Rectangle& rRect, { rDev.SetClipRegion(vcl::Region(rRect)); - OTableFieldDescRef pEntry = NULL; + OTableFieldDescRef pEntry = nullptr; sal_uInt16 nPos = GetColumnPos(nColumnId); if(getFields().size() > sal_uInt16(nPos - 1)) pEntry = getFields()[nPos - 1]; @@ -1426,7 +1426,7 @@ void OSelectionBrowseBox::DeleteFields(const OUString& rAliasName) DeactivateCell(); OTableFields::reverse_iterator aIter = getFields().rbegin(); - OTableFieldDescRef pEntry = NULL; + OTableFieldDescRef pEntry = nullptr; for(sal_uInt16 nPos=sal::static_int_cast< sal_uInt16 >(getFields().size());aIter != getFields().rend();++aIter,--nPos) { pEntry = *aIter; @@ -1488,7 +1488,7 @@ void OSelectionBrowseBox::InsertColumn(OTableFieldDescRef pEntry, sal_uInt16& _n // put at the end of the list if to small or to big, if ((_nColumnPosition == BROWSER_INVALIDID) || (_nColumnPosition >= getFields().size())) // append the field { - if (FindFirstFreeCol(_nColumnPosition) == NULL) // no more free columns + if (FindFirstFreeCol(_nColumnPosition) == nullptr) // no more free columns { AppendNewCol(); _nColumnPosition = sal::static_int_cast< sal_uInt16 >( @@ -1538,7 +1538,7 @@ OTableFieldDescRef OSelectionBrowseBox::InsertField(const OJoinExchangeData& jxd { OQueryTableWindow* pSourceWin = static_cast<OQueryTableWindow*>(jxdSource.pListBox->GetTabWin()); if (!pSourceWin) - return NULL; + return nullptr; // name and position of the selected field OUString aFieldName = jxdSource.pListBox->GetEntryText(jxdSource.pEntry); @@ -1562,7 +1562,7 @@ OTableFieldDescRef OSelectionBrowseBox::InsertField(const OTableFieldDescRef& _r { if(m_nMaxColumns && m_nMaxColumns <= FieldsCount()) - return NULL; + return nullptr; if (bActivate) SaveModified(); @@ -1616,12 +1616,12 @@ OTableFieldDescRef OSelectionBrowseBox::FindFirstFreeCol(sal_uInt16& _rColumnPos ++aIter; } - return NULL; + return nullptr; } void OSelectionBrowseBox::CheckFreeColumns(sal_uInt16& _rColumnPosition) { - if (FindFirstFreeCol(_rColumnPosition) == NULL) + if (FindFirstFreeCol(_rColumnPosition) == nullptr) { // it is full, append a Packen column AppendNewCol(DEFAULT_QUERY_COLS); @@ -2111,7 +2111,7 @@ OUString OSelectionBrowseBox::GetCellText(long nRow, sal_uInt16 nColId) const sal_uInt16 nPos = GetColumnPos(nColId); OTableFieldDescRef pEntry = getFields()[nPos-1]; - OSL_ENSURE(pEntry != NULL, "OSelectionBrowseBox::GetCellText : invalid column id, prepare for GPF ... "); + OSL_ENSURE(pEntry != nullptr, "OSelectionBrowseBox::GetCellText : invalid column id, prepare for GPF ... "); if ( pEntry->IsEmpty() ) return OUString(); @@ -2232,7 +2232,7 @@ OUString OSelectionBrowseBox::GetCellContents(sal_Int32 nCellIndex, sal_uInt16 n sal_uInt16 nPos = GetColumnPos(nColId); OTableFieldDescRef pEntry = getFields()[nPos - 1]; - OSL_ENSURE(pEntry != NULL, "OSelectionBrowseBox::GetCellContents : invalid column id, prepare for GPF ... "); + OSL_ENSURE(pEntry != nullptr, "OSelectionBrowseBox::GetCellContents : invalid column id, prepare for GPF ... "); switch (nCellIndex) { @@ -2258,7 +2258,7 @@ void OSelectionBrowseBox::SetCellContents(sal_Int32 nRow, sal_uInt16 nColId, con sal_uInt16 nPos = GetColumnPos(nColId); OTableFieldDescRef pEntry = getEntry(nPos - 1); - OSL_ENSURE(pEntry != NULL, "OSelectionBrowseBox::SetCellContents : invalid column id, prepare for GPF ... "); + OSL_ENSURE(pEntry != nullptr, "OSelectionBrowseBox::SetCellContents : invalid column id, prepare for GPF ... "); switch (nRow) { @@ -2662,7 +2662,7 @@ void OSelectionBrowseBox::setFunctionCell(OTableFieldDescRef& _pEntry) Reference< XAccessible > OSelectionBrowseBox::CreateAccessibleCell( sal_Int32 _nRow, sal_uInt16 _nColumnPos ) { - OTableFieldDescRef pEntry = NULL; + OTableFieldDescRef pEntry = nullptr; if(getFields().size() > sal_uInt16(_nColumnPos - 1)) pEntry = getFields()[_nColumnPos - 1]; diff --git a/dbaccess/source/ui/querydesign/TableConnection.cxx b/dbaccess/source/ui/querydesign/TableConnection.cxx index 46ed63cbaebe..2d43b018a594 100644 --- a/dbaccess/source/ui/querydesign/TableConnection.cxx +++ b/dbaccess/source/ui/querydesign/TableConnection.cxx @@ -44,7 +44,7 @@ namespace dbaui OTableConnection::OTableConnection( const OTableConnection& _rConn ) : Window(_rConn.m_pParent.get()) ,m_pData(_rConn.GetData()->NewInstance()) - ,m_pParent(NULL) + ,m_pParent(nullptr) { *this = _rConn; } diff --git a/dbaccess/source/ui/querydesign/TableConnectionData.cxx b/dbaccess/source/ui/querydesign/TableConnectionData.cxx index 9278e271033d..c49b8dd3b943 100644 --- a/dbaccess/source/ui/querydesign/TableConnectionData.cxx +++ b/dbaccess/source/ui/querydesign/TableConnectionData.cxx @@ -98,7 +98,7 @@ bool OTableConnectionData::SetConnLine( sal_uInt16 nIndex, const OUString& rSour return AppendConnLine(rSourceFieldName, rDestFieldName); OConnectionLineDataRef pConnLineData = m_vConnLineData[nIndex]; - OSL_ENSURE(pConnLineData != NULL, "OTableConnectionData::SetConnLine : habe ungueltiges LineData-Objekt"); + OSL_ENSURE(pConnLineData != nullptr, "OTableConnectionData::SetConnLine : habe ungueltiges LineData-Objekt"); pConnLineData->SetSourceFieldName( rSourceFieldName ); pConnLineData->SetDestFieldName( rDestFieldName ); diff --git a/dbaccess/source/ui/querydesign/TableFieldDescription.cxx b/dbaccess/source/ui/querydesign/TableFieldDescription.cxx index 0c0c1e10a3f4..052d5bd24c15 100644 --- a/dbaccess/source/ui/querydesign/TableFieldDescription.cxx +++ b/dbaccess/source/ui/querydesign/TableFieldDescription.cxx @@ -34,7 +34,7 @@ using namespace comphelper; using namespace dbaui; OTableFieldDesc::OTableFieldDesc() - :m_pTabWindow(0) + :m_pTabWindow(nullptr) ,m_eDataType(1000) ,m_eFunctionType( FKT_NONE ) ,m_eFieldType(TAB_NORMAL_FIELD) @@ -49,13 +49,13 @@ OTableFieldDesc::OTableFieldDesc() OTableFieldDesc::OTableFieldDesc(const OTableFieldDesc& rRS) : ::salhelper::SimpleReferenceObject() - , m_pTabWindow(NULL) + , m_pTabWindow(nullptr) { *this = rRS; } OTableFieldDesc::OTableFieldDesc(const OUString& rT, const OUString& rF ) - :m_pTabWindow(0) + :m_pTabWindow(nullptr) ,m_eDataType(1000) ,m_eFunctionType( FKT_NONE ) ,m_eFieldType(TAB_NORMAL_FIELD) diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx b/dbaccess/source/ui/querydesign/TableWindow.cxx index e922ebf7c85d..903337bba807 100644 --- a/dbaccess/source/ui/querydesign/TableWindow.cxx +++ b/dbaccess/source/ui/querydesign/TableWindow.cxx @@ -95,7 +95,7 @@ OTableWindow::OTableWindow( vcl::Window* pParent, const TTableWindowData::value_ ,Window( pParent, WB_3DLOOK|WB_MOVEABLE ) ,m_aTypeImage( VclPtr<FixedImage>::Create(this) ) ,m_xTitle( VclPtr<OTableWindowTitle>::Create(this) ) - ,m_pAccessible(NULL) + ,m_pAccessible(nullptr) ,m_pData( pTabWinData ) ,m_nMoveCount(0) ,m_nMoveIncrement(1) @@ -135,7 +135,7 @@ void OTableWindow::dispose() if ( m_pContainerListener.is() ) m_pContainerListener->dispose(); - m_pAccessible = NULL; + m_pAccessible = nullptr; m_aTypeImage.disposeAndClear(); m_xTitle.disposeAndClear(); vcl::Window::dispose(); @@ -206,7 +206,7 @@ bool OTableWindow::FillListBox() if (GetData()->IsShowAll()) { SvTreeListEntry* pEntry = m_xListBox->InsertEntry( OUString("*") ); - pEntry->SetUserData( createUserData(NULL,false) ); + pEntry->SetUserData( createUserData(nullptr,false) ); } Reference<XNameAccess> xPKeyColumns; @@ -227,7 +227,7 @@ bool OTableWindow::FillListBox() const OUString* pIter = aColumns.getConstArray(); const OUString* pEnd = pIter + aColumns.getLength(); - SvTreeListEntry* pEntry = NULL; + SvTreeListEntry* pEntry = nullptr; for (; pIter != pEnd; ++pIter) { bool bPrimaryKeyColumn = xPKeyColumns.is() && xPKeyColumns->hasByName( *pIter ); @@ -253,13 +253,13 @@ bool OTableWindow::FillListBox() void* OTableWindow::createUserData(const Reference< XPropertySet>& /*_xColumn*/,bool /*_bPrimaryKey*/) { - return NULL; + return nullptr; } void OTableWindow::deleteUserData(void*& _pUserData) { OSL_ENSURE(!_pUserData,"INVALID call. Need to delete the userclass!"); - _pUserData = NULL; + _pUserData = nullptr; } void OTableWindow::clearListBox() diff --git a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx index 94c8c36983f4..4174e97f564a 100644 --- a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx +++ b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx @@ -40,13 +40,13 @@ namespace dbaui using namespace ::com::sun::star; OTableWindowAccess::OTableWindowAccess(OTableWindow* _pTable) - :VCLXAccessibleComponent(_pTable->GetComponentInterface().is() ? _pTable->GetWindowPeer() : NULL) + :VCLXAccessibleComponent(_pTable->GetComponentInterface().is() ? _pTable->GetWindowPeer() : nullptr) ,m_pTable(_pTable) { } void SAL_CALL OTableWindowAccess::disposing() { - m_pTable = NULL; + m_pTable = nullptr; VCLXAccessibleComponent::disposing(); } void OTableWindowAccess::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) @@ -54,7 +54,7 @@ namespace dbaui if ( rVclWindowEvent.GetId() == VCLEVENT_OBJECT_DYING ) { ::osl::MutexGuard aGuard( m_aMutex ); - m_pTable = NULL; + m_pTable = nullptr; } VCLXAccessibleComponent::ProcessWindowEvent( rVclWindowEvent ); diff --git a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx index 0de7e8330992..ab38fcc18069 100644 --- a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx +++ b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx @@ -44,8 +44,8 @@ OTableWindowListBox::OTableWindowListBox( OTableWindow* pParent ) :SvTreeListBox( pParent, WB_HASBUTTONS | WB_BORDER) ,m_aMousePos( Point(0,0) ) ,m_pTabWin( pParent ) - ,m_nDropEvent(0) - ,m_nUiEvent(0) + ,m_nDropEvent(nullptr) + ,m_nUiEvent(nullptr) ,m_bReallyScrolled( false ) { m_aScrollTimer.SetTimeout( SCROLLING_TIMESPAN ); @@ -63,7 +63,7 @@ void OTableWindowListBox::dragFinished( ) // second look for ui activities which should happen after d&d if (m_nUiEvent) Application::RemoveUserEvent(m_nUiEvent); - m_nUiEvent = Application::PostUserEvent(LINK(this, OTableWindowListBox, LookForUiHdl), NULL, true); + m_nUiEvent = Application::PostUserEvent(LINK(this, OTableWindowListBox, LookForUiHdl), nullptr, true); } OTableWindowListBox::~OTableWindowListBox() @@ -114,7 +114,7 @@ SvTreeListEntry* OTableWindowListBox::GetEntryFromText( const OUString& rEntryTe { } - return NULL; + return nullptr; } void OTableWindowListBox::NotifyScrolled() @@ -277,14 +277,14 @@ sal_Int8 OTableWindowListBox::AcceptDrop( const AcceptDropEvent& _rEvt ) IMPL_LINK_NOARG_TYPED( OTableWindowListBox, LookForUiHdl, void*, void ) { - m_nUiEvent = 0; + m_nUiEvent = nullptr; m_pTabWin->getTableView()->lookForUiActivities(); } IMPL_LINK_NOARG_TYPED( OTableWindowListBox, DropHdl, void*, void ) { // create the connection - m_nDropEvent = 0; + m_nDropEvent = nullptr; OSL_ENSURE(m_pTabWin,"No TableWindow!"); try { @@ -309,7 +309,7 @@ sal_Int8 OTableWindowListBox::ExecuteDrop( const ExecuteDropEvent& _rEvt ) if (m_nDropEvent) Application::RemoveUserEvent(m_nDropEvent); - m_nDropEvent = Application::PostUserEvent(LINK(this, OTableWindowListBox, DropHdl), NULL, true); + m_nDropEvent = Application::PostUserEvent(LINK(this, OTableWindowListBox, DropHdl), nullptr, true); return DND_ACTION_LINK; } @@ -328,7 +328,7 @@ void OTableWindowListBox::GetFocus() if(m_pTabWin) m_pTabWin->setActive(); - if (GetCurEntry() != NULL) + if (GetCurEntry() != nullptr) { if ( GetSelectionCount() == 0 || GetCurEntry() != FirstSelected() ) { @@ -346,7 +346,7 @@ IMPL_LINK_NOARG_TYPED( OTableWindowListBox, OnDoubleClick, SvTreeListBox *, bool { // tell my parent vcl::Window* pParent = Window::GetParent(); - OSL_ENSURE(pParent != NULL, "OTableWindowListBox::OnDoubleClick : habe kein Parent !"); + OSL_ENSURE(pParent != nullptr, "OTableWindowListBox::OnDoubleClick : habe kein Parent !"); static_cast<OTableWindow*>(pParent)->OnEntryDoubleClicked(GetHdlEntry()); diff --git a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx index 505f2e91a42f..46c6154ceb6c 100644 --- a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx +++ b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx @@ -91,7 +91,7 @@ LimitBoxController::LimitBoxController( svt::ToolboxController( rxContext, uno::Reference< frame::XFrame >(), OUString( ".uno:DBLimit" ) ), - m_pLimitBox( NULL ) + m_pLimitBox( nullptr ) { } diff --git a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx index 0c6bec9d688e..1b8a39f75b62 100644 --- a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx +++ b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx @@ -44,8 +44,8 @@ namespace dbaui // OQueryContainerWindow OQueryContainerWindow::OQueryContainerWindow(vcl::Window* pParent, OQueryController& _rController,const Reference< XComponentContext >& _rxContext) :ODataView( pParent, _rController, _rxContext ) - ,m_pViewSwitch(NULL) - ,m_pBeamer(NULL) + ,m_pViewSwitch(nullptr) + ,m_pBeamer(nullptr) { m_pViewSwitch = new OQueryViewSwitch( this, _rController, _rxContext ); @@ -62,7 +62,7 @@ namespace dbaui { { std::unique_ptr<OQueryViewSwitch> aTemp(m_pViewSwitch); - m_pViewSwitch = NULL; + m_pViewSwitch = nullptr; } if ( m_pBeamer ) ::dbaui::notifySystemWindow(this,m_pBeamer,::comphelper::mem_fun(&TaskPaneList::RemoveWindow)); @@ -70,7 +70,7 @@ namespace dbaui if ( m_xBeamer.is() ) { Reference< css::util::XCloseable > xCloseable(m_xBeamer,UNO_QUERY); - m_xBeamer = NULL; + m_xBeamer = nullptr; if(xCloseable.is()) xCloseable->close(sal_False); // false - holds the ownership of this frame } @@ -150,8 +150,8 @@ namespace dbaui { // here I know that we will be destroyed from the frame ::dbaui::notifySystemWindow(this,m_pBeamer,::comphelper::mem_fun(&TaskPaneList::RemoveWindow)); - m_pBeamer = NULL; - m_xBeamer = NULL; + m_pBeamer = nullptr; + m_xBeamer = nullptr; m_pSplitter->Hide(); Resize(); } diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx index 8cc18c58a052..ff47a4c63196 100644 --- a/dbaccess/source/ui/querydesign/querycontroller.cxx +++ b/dbaccess/source/ui/querydesign/querycontroller.cxx @@ -331,7 +331,7 @@ OQueryController::OQueryController(const Reference< XComponentContext >& _rM) ,OQueryController_PBase( getBroadcastHelper() ) ,m_pParseContext( new svxform::OSystemParseContext ) ,m_aSqlParser( _rM, m_pParseContext ) - ,m_pSqlIterator(NULL) + ,m_pSqlIterator(nullptr) ,m_nLimit(-1) ,m_nVisibleRows(0x400) ,m_nSplitPos(-1) @@ -445,7 +445,7 @@ void OQueryController::deleteIterator() delete m_pSqlIterator->getParseTree(); m_pSqlIterator->dispose(); delete m_pSqlIterator; - m_pSqlIterator = NULL; + m_pSqlIterator = nullptr; } } @@ -489,7 +489,7 @@ FeatureState OQueryController::GetState(sal_uInt16 _nId) const case ID_BROWSER_ESCAPEPROCESSING: aReturn.bChecked = !m_bEscapeProcessing; - aReturn.bEnabled = ( m_pSqlIterator != NULL ) && !m_bGraphicalDesign; + aReturn.bEnabled = ( m_pSqlIterator != nullptr ) && !m_bGraphicalDesign; break; case SID_RELATION_ADD_RELATION: aReturn.bEnabled = isEditable() && m_bGraphicalDesign && m_vTableData.size() > 1; @@ -610,7 +610,7 @@ void OQueryController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >& { // change the view of the data delete m_pSqlIterator->getParseTree(); - m_pSqlIterator->setParseTree(NULL); + m_pSqlIterator->setParseTree(nullptr); m_bGraphicalDesign = !m_bGraphicalDesign; impl_setViewMode( &aError ); } @@ -634,7 +634,7 @@ void OQueryController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >& { aError = SQLException( OUString( ModuleRes( STR_QRY_NOSELECT ) ), - NULL, + nullptr, "S1000", 1000, Any() @@ -657,7 +657,7 @@ void OQueryController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >& { aError = SQLException( OUString( ModuleRes( STR_QRY_SYNTAX ) ), - NULL, + nullptr, "S1000", 1000, Any() @@ -831,7 +831,7 @@ bool OQueryController::impl_setViewMode( ::dbtools::SQLExceptionInfo* _pErrorInf { m_bGraphicalDesign = !m_bGraphicalDesign; // restore old state - getContainer()->switchView( NULL ); + getContainer()->switchView( nullptr ); // don't pass &aError here, this would overwrite the error which the first switchView call // returned in this location. if ( _pErrorInfo ) @@ -1099,12 +1099,12 @@ void OQueryController::setQueryComposer() } catch(const Exception&) { - m_xComposer = NULL; + m_xComposer = nullptr; } OSL_ENSURE(m_xComposer.is(),"No querycomposer available!"); Reference<XTablesSupplier> xTablesSup(getConnection(), UNO_QUERY); deleteIterator(); - m_pSqlIterator = new ::connectivity::OSQLParseTreeIterator( getConnection(), xTablesSup->getTables(), m_aSqlParser, NULL ); + m_pSqlIterator = new ::connectivity::OSQLParseTreeIterator( getConnection(), xTablesSup->getTables(), m_aSqlParser, nullptr ); } } } @@ -1191,7 +1191,7 @@ void OQueryController::reconnect(bool _bUI) { m_bGraphicalDesign = false; // don't call Execute(SQL) because this changes the sql statement - impl_setViewMode( NULL ); + impl_setViewMode( nullptr ); } InvalidateAll(); } @@ -1242,7 +1242,7 @@ void OQueryController::execute_QueryPropDlg() m_bDistinct = aQueryPropDlg->getDistinct(); m_nLimit = aQueryPropDlg->getLimit(); InvalidateFeature( SID_QUERY_DISTINCT_VALUES ); - InvalidateFeature( SID_QUERY_LIMIT, 0, true ); + InvalidateFeature( SID_QUERY_LIMIT, nullptr, true ); } } @@ -1760,7 +1760,7 @@ OUString OQueryController::translateStatement( bool _bFireStatementChange ) ModuleRes aModuleRes(STR_QRY_NOSELECT); OUString sTmpStr(aModuleRes); OUString sError(sTmpStr); - showError(SQLException(sError,NULL,"S1000",1000,Any())); + showError(SQLException(sError,nullptr,"S1000",1000,Any())); } else sTranslatedStmt = m_sStatement; @@ -1922,7 +1922,7 @@ void OQueryController::impl_reset( const bool i_bForceCurrentControllerSettings void OQueryController::reset() { impl_reset(); - getContainer()->reset( NULL ); + getContainer()->reset( nullptr ); ClearUndoManager(); } diff --git a/dbaccess/source/ui/querydesign/querydlg.cxx b/dbaccess/source/ui/querydesign/querydlg.cxx index 5dfbbd5ec23f..dc743c061ab0 100644 --- a/dbaccess/source/ui/querydesign/querydlg.cxx +++ b/dbaccess/source/ui/querydesign/querydlg.cxx @@ -47,7 +47,7 @@ DlgQryJoin::DlgQryJoin( OQueryTableView * pParent, const Reference< XConnection >& _xConnection, bool _bAllowTableSelect) : ModalDialog( pParent, "JoinDialog", "dbaccess/ui/joindialog.ui" ) - , m_pTableControl( NULL ) + , m_pTableControl( nullptr ) , m_pTableMap(_pTableMap) , m_pTableView(pParent) , eJoinType(static_cast<OQueryTableConnectionData*>(_pData.get())->GetJoinType()) diff --git a/dbaccess/source/ui/relationdesign/RTableConnection.cxx b/dbaccess/source/ui/relationdesign/RTableConnection.cxx index 35cc2e16d8f7..35d9798f17f5 100644 --- a/dbaccess/source/ui/relationdesign/RTableConnection.cxx +++ b/dbaccess/source/ui/relationdesign/RTableConnection.cxx @@ -60,7 +60,7 @@ void ORelationTableConnection::Draw(vcl::RenderContext& rRenderContext, const Re long nTop = GetBoundingRect().Bottom(); long nTemp; - const OConnectionLine* pTopLine = NULL; + const OConnectionLine* pTopLine = nullptr; const ::std::vector<OConnectionLine*>& rConnLineList = GetConnLineList(); std::vector<OConnectionLine*>::const_iterator aIter = rConnLineList.begin(); std::vector<OConnectionLine*>::const_iterator aEnd = rConnLineList.end(); diff --git a/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx b/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx index 9cc424a45826..87dba9402cb4 100644 --- a/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx +++ b/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx @@ -379,7 +379,7 @@ xKey.clear(); { DropRelation(); OUString sError(ModuleRes(STR_QUERY_REL_COULD_NOT_CREATE)); - ::dbtools::throwGenericSQLException(sError,NULL); + ::dbtools::throwGenericSQLException(sError,nullptr); } // The fields the relation marks may not be the same as our LineDatas mark after the relation has been updated diff --git a/dbaccess/source/ui/relationdesign/RelationTableView.cxx b/dbaccess/source/ui/relationdesign/RelationTableView.cxx index 81b3a2a6dccf..97a5402b7534 100644 --- a/dbaccess/source/ui/relationdesign/RelationTableView.cxx +++ b/dbaccess/source/ui/relationdesign/RelationTableView.cxx @@ -64,7 +64,7 @@ using namespace ::com::sun::star::accessibility; ORelationTableView::ORelationTableView( vcl::Window* pParent, ORelationDesignView* pView ) :OJoinTableView( pParent, pView ) , ::comphelper::OContainerListener(m_aMutex) - ,m_pExistingConnection(NULL) + ,m_pExistingConnection(nullptr) ,m_bInRemove(false) { @@ -288,7 +288,7 @@ void ORelationTableView::AddTabWin(const OUString& _rComposedName, const OUStrin if(aIter != GetTabWinMap().end()) { - aIter->second->SetZOrder(NULL, ZOrderFlags::First); + aIter->second->SetZOrder(nullptr, ZOrderFlags::First); aIter->second->GrabFocus(); EnsureVisible(aIter->second); // no new one @@ -360,7 +360,7 @@ void ORelationTableView::lookForUiActivities() ConnDoubleClicked(m_pExistingConnection); m_pCurrentlyTabConnData.reset(); } - m_pExistingConnection = NULL; + m_pExistingConnection = nullptr; } if(m_pCurrentlyTabConnData) { diff --git a/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx b/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx index 9b968d4b3e01..eddff2dce7e4 100644 --- a/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx +++ b/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx @@ -49,7 +49,7 @@ void OFieldDescGenWin::dispose() void OFieldDescGenWin::Init() { - OSL_ENSURE(GetEditorCtrl() != NULL, "OFieldDescGenWin::Init : have no editor control !"); + OSL_ENSURE(GetEditorCtrl() != nullptr, "OFieldDescGenWin::Init : have no editor control !"); m_pFieldControl->Init(); } diff --git a/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx b/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx index 08265142077d..69c6fb40fad9 100644 --- a/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx +++ b/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx @@ -179,7 +179,7 @@ void OFieldDescription::FillFromTypeInfo(const TOTypeInfoSP& _pType,bool _bForce SetControlDefault(Any()); } - bool bForce = _bForce || pOldType.get() == NULL || pOldType->nType != _pType->nType; + bool bForce = _bForce || pOldType.get() == nullptr || pOldType->nType != _pType->nType; switch ( _pType->nType ) { case DataType::CHAR: diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx index 36d4f93b4ef8..e6f8284eb828 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.cxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx @@ -134,16 +134,16 @@ void OTableEditorCtrl::Init() OTableEditorCtrl::OTableEditorCtrl(vcl::Window* pWindow) :OTableRowView(pWindow) - ,pNameCell(NULL) - ,pTypeCell(NULL) - ,pHelpTextCell(NULL) - ,pDescrCell(NULL) - ,pDescrWin(NULL) - ,nCutEvent(0) - ,nPasteEvent(0) - ,nDeleteEvent(0) - ,nInsNewRowsEvent(0) - ,nInvalidateTypeEvent(0) + ,pNameCell(nullptr) + ,pTypeCell(nullptr) + ,pHelpTextCell(nullptr) + ,pDescrCell(nullptr) + ,pDescrWin(nullptr) + ,nCutEvent(nullptr) + ,nPasteEvent(nullptr) + ,nDeleteEvent(nullptr) + ,nInsNewRowsEvent(nullptr) + ,nInvalidateTypeEvent(nullptr) ,m_eChildFocus(NONE) ,nOldDataPos(-1) ,bSaveOnMove(true) @@ -296,7 +296,7 @@ bool OTableEditorCtrl::SetDataPtr( long nRow ) if(nRow >= (long)m_pRowList->size()) return false; pActRow = (*m_pRowList)[nRow]; - return pActRow != 0; + return pActRow != nullptr; } bool OTableEditorCtrl::SeekRow(long _nRow) @@ -326,12 +326,12 @@ CellController* OTableEditorCtrl::GetController(long nRow, sal_uInt16 nColumnId) if (IsReadOnly() || ( xTable.is() && xTable->getPropertySetInfo()->hasPropertyByName(PROPERTY_TYPE) && ::comphelper::getString(xTable->getPropertyValue(PROPERTY_TYPE)) == "VIEW")) - return NULL; + return nullptr; // If the row is ReadOnly, editing is forbidden SetDataPtr( nRow ); if( pActRow->IsReadOnly() ) - return NULL; + return nullptr; OFieldDescription* pActFieldDescr = pActRow->GetActFieldDescr(); switch (nColumnId) @@ -341,19 +341,19 @@ CellController* OTableEditorCtrl::GetController(long nRow, sal_uInt16 nColumnId) case FIELD_TYPE: if (pActFieldDescr && !pActFieldDescr->GetName().isEmpty()) return new ListBoxCellController( pTypeCell ); - else return NULL; + else return nullptr; case HELP_TEXT: if (pActFieldDescr && !pActFieldDescr->GetName().isEmpty()) return new EditCellController( pHelpTextCell ); else - return NULL; + return nullptr; case COLUMN_DESCRIPTION: if (pActFieldDescr && !pActFieldDescr->GetName().isEmpty()) return new EditCellController( pDescrCell ); else - return NULL; + return nullptr; default: - return NULL; + return nullptr; } } @@ -427,7 +427,7 @@ EditBrowseBox::RowStatus OTableEditorCtrl::GetRowStatus(long nRow) const bool OTableEditorCtrl::SaveCurRow() { - if (GetFieldDescr(GetCurRow()) == NULL) + if (GetFieldDescr(GetCurRow()) == nullptr) // there is no data in the current row return true; if (!SaveModified()) @@ -632,7 +632,7 @@ bool OTableEditorCtrl::CursorMoving(long nNewRow, sal_uInt16 nNewCol) IMPL_LINK_NOARG_TYPED( OTableEditorCtrl, InvalidateFieldType, void*, void ) { - nInvalidateTypeEvent = 0; + nInvalidateTypeEvent = nullptr; Invalidate( GetFieldRectPixel(nOldDataPos, FIELD_TYPE) ); } @@ -669,7 +669,7 @@ void OTableEditorCtrl::CellModified( long nRow, sal_uInt16 nColId ) else pActRow->SetFieldType( GetView()->getController().getTypeInfoFallBack() ); - nInvalidateTypeEvent = Application::PostUserEvent( LINK(this, OTableEditorCtrl, InvalidateFieldType), NULL, true ); + nInvalidateTypeEvent = Application::PostUserEvent( LINK(this, OTableEditorCtrl, InvalidateFieldType), nullptr, true ); pActFieldDescr = pActRow->GetActFieldDescr(); pDescrWin->DisplayData( pActFieldDescr ); GetUndoManager().AddUndoAction( new OTableEditorTypeSelUndoAct(this, nRow, nColId+1, TOTypeInfoSP()) ); @@ -1087,11 +1087,11 @@ OFieldDescription* OTableEditorCtrl::GetFieldDescr( long nRow ) if( (nRow<0) || (sal::static_int_cast< unsigned long >(nRow)>=nListCount) ) { OSL_FAIL("(nRow<0) || (nRow>=nListCount)"); - return NULL; + return nullptr; } std::shared_ptr<OTableRow> pRow = (*m_pRowList)[ nRow ]; if( !pRow ) - return NULL; + return nullptr; return pRow->GetActFieldDescr(); } @@ -1207,7 +1207,7 @@ void OTableEditorCtrl::cut() { if (nCutEvent) Application::RemoveUserEvent(nCutEvent); - nCutEvent = Application::PostUserEvent(LINK(this, OTableEditorCtrl, DelayedCut), NULL, true); + nCutEvent = Application::PostUserEvent(LINK(this, OTableEditorCtrl, DelayedCut), nullptr, true); } } @@ -1230,7 +1230,7 @@ void OTableEditorCtrl::paste() { if( nPasteEvent ) Application::RemoveUserEvent( nPasteEvent ); - nPasteEvent = Application::PostUserEvent( LINK(this, OTableEditorCtrl, DelayedPaste), NULL, true ); + nPasteEvent = Application::PostUserEvent( LINK(this, OTableEditorCtrl, DelayedPaste), nullptr, true ); } else if(m_eChildFocus == NAME) { @@ -1418,12 +1418,12 @@ void OTableEditorCtrl::Command(const CommandEvent& rEvt) case SID_DELETE: if( nDeleteEvent ) Application::RemoveUserEvent( nDeleteEvent ); - nDeleteEvent = Application::PostUserEvent( LINK(this, OTableEditorCtrl, DelayedDelete), NULL, true ); + nDeleteEvent = Application::PostUserEvent( LINK(this, OTableEditorCtrl, DelayedDelete), nullptr, true ); break; case SID_TABLEDESIGN_INSERTROWS: if( nInsNewRowsEvent ) Application::RemoveUserEvent( nInsNewRowsEvent ); - nInsNewRowsEvent = Application::PostUserEvent( LINK(this, OTableEditorCtrl, DelayedInsNewRows), NULL, true ); + nInsNewRowsEvent = Application::PostUserEvent( LINK(this, OTableEditorCtrl, DelayedInsNewRows), nullptr, true ); break; case SID_TABLEDESIGN_TABED_PRIMARYKEY: SetPrimaryKey( !IsPrimaryKey() ); @@ -1443,13 +1443,13 @@ void OTableEditorCtrl::Command(const CommandEvent& rEvt) IMPL_LINK_NOARG_TYPED( OTableEditorCtrl, DelayedCut, void*, void ) { - nCutEvent = 0; + nCutEvent = nullptr; OTableRowView::cut(); } IMPL_LINK_NOARG_TYPED( OTableEditorCtrl, DelayedPaste, void*, void ) { - nPasteEvent = 0; + nPasteEvent = nullptr; sal_Int32 nPastePosition = GetView()->getController().getFirstEmptyRowPosition(); if ( !GetView()->getController().getTable().is() ) @@ -1475,13 +1475,13 @@ IMPL_LINK_NOARG_TYPED( OTableEditorCtrl, DelayedPaste, void*, void ) IMPL_LINK_NOARG_TYPED( OTableEditorCtrl, DelayedDelete, void*, void ) { - nDeleteEvent = 0; + nDeleteEvent = nullptr; DeleteRows(); } IMPL_LINK_NOARG_TYPED( OTableEditorCtrl, DelayedInsNewRows, void*, void ) { - nInsNewRowsEvent = 0; + nInsNewRowsEvent = nullptr; sal_Int32 nPastePosition = GetView()->getController().getFirstEmptyRowPosition(); if ( !GetView()->getController().getTable().is() ) nPastePosition = GetSelectRowCount() ? FirstSelectedRow() : m_nDataPos; @@ -1618,7 +1618,7 @@ void OTableEditorCtrl::SwitchType( const TOTypeInfoSP& _pType ) } pActFieldDescr = pRow->GetActFieldDescr(); - if (pActFieldDescr != NULL && !pActFieldDescr->GetFormatKey()) + if (pActFieldDescr != nullptr && !pActFieldDescr->GetFormatKey()) { sal_Int32 nFormatKey = ::dbtools::getDefaultNumberFormat( pActFieldDescr->GetType(), pActFieldDescr->GetScale(), diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx b/dbaccess/source/ui/tabledesign/TableController.cxx index 0099ac8dea38..b923b2fef0a4 100644 --- a/dbaccess/source/ui/tabledesign/TableController.cxx +++ b/dbaccess/source/ui/tabledesign/TableController.cxx @@ -433,7 +433,7 @@ bool OTableController::doSaveDoc(bool _bSaveAs) { m_sName.clear(); stopTableListening(); - m_xTable = NULL; + m_xTable = nullptr; } } return ! (aInfo.isValid() || bError); @@ -631,7 +631,7 @@ void SAL_CALL OTableController::disposing( const EventObject& _rSource ) throw(R if ( _rSource.Source == m_xTable ) { // some deleted our table so we have a new one stopTableListening(); - m_xTable = NULL; + m_xTable = nullptr; m_bNew = true; setModified(sal_True); } @@ -652,7 +652,7 @@ void OTableController::losingConnection( ) xComponent->removeEventListener(xEvtL); } stopTableListening(); - m_xTable = NULL; + m_xTable = nullptr; assignTable(); if(!m_xTable.is()) { @@ -702,7 +702,7 @@ void OTableController::appendColumns(Reference<XColumnsSupplier>& _rxColSup, boo xColumn->setPropertyValue(PROPERTY_NAME,makeAny(pField->GetName())); xAppend->appendByDescriptor(xColumn); - xColumn = NULL; + xColumn = nullptr; // now only the settings are missing if(xColumns->hasByName(pField->GetName())) { @@ -1093,7 +1093,7 @@ void OTableController::alterColumns() } } // exceptions are caught outside - xNewColumn = NULL; + xNewColumn = nullptr; if(xColumns->hasByName(pField->GetName())) xColumns->getByName(pField->GetName()) >>= xColumn; bReload = true; @@ -1197,7 +1197,7 @@ void OTableController::alterColumns() ScopedVclPtrInstance< OSQLMessageBox > aMsg(getView(),aTitle,aMsgT,WB_YES_NO| WB_DEF_YES); if(aMsg->Execute() == RET_YES) { - xKeyColumns = NULL; + xKeyColumns = nullptr; dropPrimaryKey(); } else diff --git a/dbaccess/source/ui/tabledesign/TableDesignView.cxx b/dbaccess/source/ui/tabledesign/TableDesignView.cxx index 5029b3b5a544..2b92d44af4cb 100644 --- a/dbaccess/source/ui/tabledesign/TableDesignView.cxx +++ b/dbaccess/source/ui/tabledesign/TableDesignView.cxx @@ -239,7 +239,7 @@ bool OTableDesignView::PreNotify( NotifyEvent& rNEvt ) IClipboardTest* OTableDesignView::getActiveChild() const { - IClipboardTest* pTest = NULL; + IClipboardTest* pTest = nullptr; switch(m_eChildFocus) { case DESCRIPTION: @@ -304,7 +304,7 @@ void OTableDesignView::reSync() { GetEditorCtrl()->DeactivateCell(); std::shared_ptr<OTableRow> pRow = (*GetEditorCtrl()->GetRowList())[GetEditorCtrl()->GetCurRow()]; - OFieldDescription* pFieldDescr = pRow ? pRow->GetActFieldDescr() : NULL; + OFieldDescription* pFieldDescr = pRow ? pRow->GetActFieldDescr() : nullptr; if ( pFieldDescr ) GetDescWin()->DisplayData(pFieldDescr); } diff --git a/dbaccess/source/ui/tabledesign/TableFieldControl.cxx b/dbaccess/source/ui/tabledesign/TableFieldControl.cxx index be3d5a18f751..c013589cd796 100644 --- a/dbaccess/source/ui/tabledesign/TableFieldControl.cxx +++ b/dbaccess/source/ui/tabledesign/TableFieldControl.cxx @@ -108,7 +108,7 @@ css::uno::Reference< css::sdbc::XDatabaseMetaData> OTableFieldControl::getMetaDa { Reference<XConnection> xCon = GetCtrl()->GetView()->getController().getConnection(); if(!xCon.is()) - return NULL; + return nullptr; return xCon->getMetaData(); } diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx index cf07ff4dae6b..d0557ddc033b 100644 --- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx +++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx @@ -83,7 +83,7 @@ void OTableFieldDescWin::dispose() void OTableFieldDescWin::Init() { - OSL_ENSURE(getGenPage() != NULL, "OTableFieldDescWin::Init : ups ... no GenericPage ... this will crash ..."); + OSL_ENSURE(getGenPage() != nullptr, "OTableFieldDescWin::Init : ups ... no GenericPage ... this will crash ..."); getGenPage()->Init(); } @@ -202,7 +202,7 @@ void OTableFieldDescWin::Resize() IClipboardTest* OTableFieldDescWin::getActiveChild() const { - IClipboardTest* pTest = NULL; + IClipboardTest* pTest = nullptr; switch(m_eChildFocus) { case DESCRIPTION: diff --git a/dbaccess/source/ui/tabledesign/TableRow.cxx b/dbaccess/source/ui/tabledesign/TableRow.cxx index 4a85ffe77676..d1cb623b0ad3 100644 --- a/dbaccess/source/ui/tabledesign/TableRow.cxx +++ b/dbaccess/source/ui/tabledesign/TableRow.cxx @@ -31,7 +31,7 @@ using namespace ::com::sun::star::beans; // class OTableRow OTableRow::OTableRow() - :m_pActFieldDescr( NULL ) + :m_pActFieldDescr( nullptr ) ,m_nPos( -1 ) ,m_bReadOnly( false ) ,m_bOwnsDescriptions(false) @@ -39,7 +39,7 @@ OTableRow::OTableRow() } OTableRow::OTableRow(const Reference< XPropertySet >& xAffectedCol) - :m_pActFieldDescr( NULL ) + :m_pActFieldDescr( nullptr ) ,m_nPos( -1 ) ,m_bReadOnly( false ) ,m_bOwnsDescriptions(true) @@ -48,7 +48,7 @@ OTableRow::OTableRow(const Reference< XPropertySet >& xAffectedCol) } OTableRow::OTableRow( const OTableRow& rRow, long nPosition ) - :m_pActFieldDescr(NULL) + :m_pActFieldDescr(nullptr) ,m_nPos( nPosition ) ,m_bReadOnly(rRow.IsReadOnly()) ,m_bOwnsDescriptions(false) @@ -93,7 +93,7 @@ void OTableRow::SetFieldType( const TOTypeInfoSP& _pType, bool _bForce ) else { delete m_pActFieldDescr; - m_pActFieldDescr = NULL; + m_pActFieldDescr = nullptr; } } diff --git a/dbaccess/source/ui/uno/ColumnControl.cxx b/dbaccess/source/ui/uno/ColumnControl.cxx index 726672a7fd2e..8a19477eebed 100644 --- a/dbaccess/source/ui/uno/ColumnControl.cxx +++ b/dbaccess/source/ui/uno/ColumnControl.cxx @@ -65,7 +65,7 @@ void SAL_CALL OColumnControl::createPeer(const Reference< XToolkit >& /*rToolkit { mbCreatingPeer = true; - vcl::Window* pParentWin = NULL; + vcl::Window* pParentWin = nullptr; if (rParentPeer.is()) { VCLXWindow* pParent = VCLXWindow::GetImplementation(rParentPeer); @@ -74,7 +74,7 @@ void SAL_CALL OColumnControl::createPeer(const Reference< XToolkit >& /*rToolkit } OColumnPeer* pPeer = new OColumnPeer( pParentWin, m_xContext ); - OSL_ENSURE(pPeer != NULL, "FmXGridControl::createPeer : imp_CreatePeer didn't return a peer !"); + OSL_ENSURE(pPeer != nullptr, "FmXGridControl::createPeer : imp_CreatePeer didn't return a peer !"); setPeer( pPeer ); UnoControlComponentInfos aComponentInfos(maComponentInfos); diff --git a/dbaccess/source/ui/uno/ColumnPeer.cxx b/dbaccess/source/ui/uno/ColumnPeer.cxx index 7a32f0b175f6..5d0ac17d3c4e 100644 --- a/dbaccess/source/ui/uno/ColumnPeer.cxx +++ b/dbaccess/source/ui/uno/ColumnPeer.cxx @@ -32,7 +32,7 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::sdbc; OColumnPeer::OColumnPeer(vcl::Window* _pParent,const Reference<XComponentContext>& _rxContext) - :m_pActFieldDescr(NULL) + :m_pActFieldDescr(nullptr) { osl_atomic_increment( &m_refCount ); { @@ -61,7 +61,7 @@ void OColumnPeer::setColumn(const Reference< XPropertySet>& _xColumn) if ( m_pActFieldDescr ) { delete m_pActFieldDescr; - m_pActFieldDescr = NULL; + m_pActFieldDescr = nullptr; } if ( _xColumn.is() ) { diff --git a/dbaccess/source/ui/uno/composerdialogs.cxx b/dbaccess/source/ui/uno/composerdialogs.cxx index d60cddcd9a35..c18655155efd 100644 --- a/dbaccess/source/ui/uno/composerdialogs.cxx +++ b/dbaccess/source/ui/uno/composerdialogs.cxx @@ -119,7 +119,7 @@ namespace dbaui if ( !xConnection.is() || !xColumns.is() || !m_xComposer.is() ) // can't create the dialog if I have improper settings - return NULL; + return nullptr; return createComposerDialog( _pParent, xConnection, xColumns ); } diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx b/dbaccess/source/ui/uno/copytablewizard.cxx index 0a463f08dfc6..8fd501275a64 100644 --- a/dbaccess/source/ui/uno/copytablewizard.cxx +++ b/dbaccess/source/ui/uno/copytablewizard.cxx @@ -1476,7 +1476,7 @@ void SAL_CALL CopyTableWizard::initialize( const Sequence< Any >& _rArguments ) ); } if ( !m_xInteractionHandler.is() ) - m_xInteractionHandler.set( InteractionHandler::createWithParent(m_xContext, 0), UNO_QUERY ); + m_xInteractionHandler.set( InteractionHandler::createWithParent(m_xContext, nullptr), UNO_QUERY ); Reference< XInteractionHandler > xSourceDocHandler; Reference< XPropertySet > xSourceDescriptor( impl_ensureDataAccessDescriptor_throw( _rArguments, 0, m_xSourceConnection, xSourceDocHandler ) ); diff --git a/dbaccess/source/ui/uno/dbinteraction.cxx b/dbaccess/source/ui/uno/dbinteraction.cxx index 1cf3748e6ca7..35f8a599f7ee 100644 --- a/dbaccess/source/ui/uno/dbinteraction.cxx +++ b/dbaccess/source/ui/uno/dbinteraction.cxx @@ -238,7 +238,7 @@ namespace dbaui if ( -1 != nApprovePos ) { // ask whether it should be saved - nRet = ExecuteQuerySaveDocument(NULL,_rDocuRequest.Name); + nRet = ExecuteQuerySaveDocument(nullptr,_rDocuRequest.Name); } if ( RET_CANCEL == nRet ) @@ -292,7 +292,7 @@ namespace dbaui if ( m_xContext.is() ) { Reference< XInteractionHandler2 > xFallbackHandler( - InteractionHandler::createWithParent(m_xContext, 0) ); + InteractionHandler::createWithParent(m_xContext, nullptr) ); xFallbackHandler->handle( _rxRequest ); return true; } diff --git a/dbaccess/source/ui/uno/unoDirectSql.cxx b/dbaccess/source/ui/uno/unoDirectSql.cxx index 796e7f4d4dfc..52a32ba81d79 100644 --- a/dbaccess/source/ui/uno/unoDirectSql.cxx +++ b/dbaccess/source/ui/uno/unoDirectSql.cxx @@ -88,7 +88,7 @@ namespace dbaui { // the connection the row set is working with ODatasourceConnector aDSConnector(m_aContext, _pParent); - xConnection = aDSConnector.connect( m_sInitialSelection, NULL ); + xConnection = aDSConnector.connect( m_sInitialSelection, nullptr ); } catch( const Exception& ) { @@ -97,7 +97,7 @@ namespace dbaui } if ( !xConnection.is() ) // can't create the dialog if I have improper settings - return NULL; + return nullptr; return VclPtr<DirectSQLDialog>::Create( _pParent, xConnection ); } diff --git a/dbaccess/source/ui/uno/unoadmin.cxx b/dbaccess/source/ui/uno/unoadmin.cxx index 7653ec7d03d0..6d4c2819cce6 100644 --- a/dbaccess/source/ui/uno/unoadmin.cxx +++ b/dbaccess/source/ui/uno/unoadmin.cxx @@ -43,10 +43,10 @@ namespace dbaui ODatabaseAdministrationDialog::ODatabaseAdministrationDialog(const Reference< XComponentContext >& _rxORB) :ODatabaseAdministrationDialogBase(_rxORB) - ,m_pDatasourceItems(NULL) - ,m_pItemPool(NULL) - ,m_pItemPoolDefaults(NULL) - ,m_pCollection(NULL) + ,m_pDatasourceItems(nullptr) + ,m_pItemPool(nullptr) + ,m_pItemPoolDefaults(nullptr) + ,m_pCollection(nullptr) { m_pCollection = new ::dbaccess::ODsnTypeCollection(_rxORB); @@ -65,7 +65,7 @@ ODatabaseAdministrationDialog::~ODatabaseAdministrationDialog() } delete m_pCollection; - m_pCollection = NULL; + m_pCollection = nullptr; } |