mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loplugin:nullptr (automatic rewrite)

Browse Source 
Change-Id: I2bba104b1bff30910864e45b5b032533099742ff
This commit is contained in:
Stephan Bergmann 2015-11-10 10:13:39 +01:00
parent b58d56c510
commit 89c4edc13f
222 changed files with 1034 additions and 1034 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dbaccess/source/core/api/BookmarkSet.hxx
View File

@ -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;

2
dbaccess/source/core/api/CRowSetColumn.cxx
View File

@ -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 )
{
}

2
dbaccess/source/core/api/CRowSetDataColumn.cxx
View File

@ -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)

8
dbaccess/source/core/api/CacheSet.cxx
View File

@ -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&)
{

10
dbaccess/source/core/api/FilteredContainer.cxx
View File

@ -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;
}

6
dbaccess/source/core/api/HelperCollections.cxx
View File

@ -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;
}
}

4
dbaccess/source/core/api/HelperCollections.hxx
View File

@ -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,

4
dbaccess/source/core/api/KeySet.cxx
View File

@ -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);
}

4
dbaccess/source/core/api/OptimisticSet.cxx
View File

@ -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)
{
}

44
dbaccess/source/core/api/RowSet.cxx
View File

@ -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() );

20
dbaccess/source/core/api/RowSetBase.cxx
View File

@ -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)

46
dbaccess/source/core/api/RowSetCache.cxx
View File

@ -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;
}
}

2
dbaccess/source/core/api/RowSetCacheIterator.hxx
View File

@ -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&);

2
dbaccess/source/core/api/RowSetRow.hxx
View File

@ -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; }
};

22
dbaccess/source/core/api/SingleSelectQueryComposer.cxx
View File

@ -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;
}
}

2
dbaccess/source/core/api/StaticSet.cxx
View File

@ -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: */

2
dbaccess/source/core/api/StaticSet.hxx
View File

@ -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;

18
dbaccess/source/core/api/TableDeco.cxx
View File

@ -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() )

2
dbaccess/source/core/api/WrappedResultSet.hxx
View File

@ -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;

12
dbaccess/source/core/api/column.cxx
View File

@ -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();
}

4
dbaccess/source/core/api/datacolumn.cxx
View File

@ -101,8 +101,8 @@ void ODataColumn::disposing()
{
OResultColumn::disposing();
m_xRow = NULL;
m_xRowUpdate = NULL;
m_xRow = nullptr;
m_xRowUpdate = nullptr;
}
// css::sdb::XColumn

8
dbaccess/source/core/api/definitioncolumn.cxx
View File

@ -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 );
}

4
dbaccess/source/core/api/preparedstatement.cxx
View File

@ -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();
}

16
dbaccess/source/core/api/query.cxx
View File

@ -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)

16
dbaccess/source/core/api/querycontainer.cxx
View File

@ -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;

4
dbaccess/source/core/api/querydescriptor.cxx
View File

@ -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;
}
}

2
dbaccess/source/core/api/resultcolumn.cxx
View File

@ -126,7 +126,7 @@ void OResultColumn::disposing()
OColumn::disposing();
MutexGuard aGuard(m_aMutex);
m_xMetaData = NULL;
m_xMetaData = nullptr;
}
// comphelper::OPropertyArrayUsageHelper

8
dbaccess/source/core/api/resultset.cxx
View File

@ -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();
}

12
dbaccess/source/core/api/statement.cxx
View File

@ -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;

14
dbaccess/source/core/api/table.cxx
View File

@ -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: */

8
dbaccess/source/core/api/tablecontainer.cxx
View File

@ -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)

6
dbaccess/source/core/dataaccess/ComponentDefinition.cxx
View File

@ -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();

8
dbaccess/source/core/dataaccess/ContentHelper.cxx
View File

@ -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() )

30
dbaccess/source/core/dataaccess/ModelImpl.cxx
View File

@ -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 )

4
dbaccess/source/core/dataaccess/ModelImpl.hxx
View File

@ -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
*/

2
dbaccess/source/core/dataaccess/commanddefinition.cxx
View File

@ -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)

8
dbaccess/source/core/dataaccess/connection.cxx
View File

@ -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

8
dbaccess/source/core/dataaccess/databasecontext.cxx
View File

@ -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() );

28
dbaccess/source/core/dataaccess/databasedocument.cxx
View File

@ -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 );

8
dbaccess/source/core/dataaccess/definitioncontainer.cxx
View File

@ -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);

6
dbaccess/source/core/dataaccess/documentcontainer.cxx
View File

@ -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)

32
dbaccess/source/core/dataaccess/documentdefinition.cxx
View File

@ -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;
}

2
dbaccess/source/core/dataaccess/documentdefinition.hxx
View File

@ -295,7 +295,7 @@ private:
void loadEmbeddedObjectForPreview()
{
loadEmbeddedObject(
NULL,
nullptr,
css::uno::Sequence< sal_Int8 >(),
css::uno::Sequence< css::beans::PropertyValue >(),
true,

8
dbaccess/source/core/dataaccess/documenteventnotifier.hxx
View File

@ -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()
)
{

2
dbaccess/source/core/dataaccess/documentevents.cxx
View File

@ -99,7 +99,7 @@ namespace dbaccess
{ "OnTitleChanged", false },
{ "OnSubComponentOpened", false },
{ "OnSubComponentClosed", false },
{ NULL, false }
{ nullptr, false }
};
return s_aData;
}

8
dbaccess/source/core/dataaccess/intercept.cxx
View File

@ -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);

8
dbaccess/source/core/misc/PropertyForward.cxx
View File

@ -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 )

4
dbaccess/source/core/misc/apitools.cxx
View File

@ -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)!" );

6
dbaccess/source/core/misc/services.cxx
View File

@ -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 }
};
}

4
dbaccess/source/core/recovery/subcomponentloader.cxx
View File

@ -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)

2
dbaccess/source/core/recovery/subcomponentrecovery.cxx
View File

@ -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

4
dbaccess/source/core/resource/core_resource.cxx
View File

@ -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;
}
}
}

4
dbaccess/source/ext/macromigration/docinteraction.cxx
View File

@ -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

4
dbaccess/source/ext/macromigration/macromigrationdialog.cxx
View File

@ -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();
}

6
dbaccess/source/ext/macromigration/migrationengine.cxx
View File

@ -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

2
dbaccess/source/ext/macromigration/migrationlog.cxx
View File

@ -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 )
{

2
dbaccess/source/ext/macromigration/rangeprogressbar.hxx
View File

@ -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)
{

8
dbaccess/source/filter/xml/dbloader2.cxx
View File

@ -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;
}
}

2
dbaccess/source/filter/xml/xmlConnectionData.cxx
View File

@ -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 ) )

2
dbaccess/source/filter/xml/xmlDataSource.cxx
View File

@ -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 );

2
dbaccess/source/filter/xml/xmlDataSourceSetting.cxx
View File

@ -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 ) )

2
dbaccess/source/filter/xml/xmlDataSourceSetting.hxx
View File

@ -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,

2
dbaccess/source/filter/xml/xmlDataSourceSettings.cxx
View File

@ -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 ) )

2
dbaccess/source/filter/xml/xmlDatabase.cxx
View File

@ -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 ) )

2
dbaccess/source/filter/xml/xmlDatabaseDescription.cxx
View File

@ -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 ) )

2
dbaccess/source/filter/xml/xmlDocuments.cxx
View File

@ -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 ) )

4
dbaccess/source/filter/xml/xmlHelper.cxx
View File

@ -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[] =

2
dbaccess/source/filter/xml/xmlHierarchyCollection.cxx
View File

@ -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 ) )

2
dbaccess/source/filter/xml/xmlTable.cxx
View File

@ -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 ) )

2
dbaccess/source/filter/xml/xmlTableFilterList.cxx
View File

@ -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 )
{

10
dbaccess/source/filter/xml/xmlfilter.cxx
View File

@ -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);

2
dbaccess/source/inc/apitools.hxx
View File

@ -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() ); \

6
dbaccess/source/sdbtools/connection/objectnames.cxx
View File

@ -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
);
}

2
dbaccess/source/sdbtools/connection/tablename.cxx
View File

@ -202,7 +202,7 @@ namespace sdbtools
if ( !found )
throw IllegalArgumentException(
OUString( SdbtRes( STR_INVALID_COMPOSITION_TYPE ) ),
NULL,
nullptr,
0
);

22
dbaccess/source/shared/registrationhelper.cxx
View File

@ -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: */

36
dbaccess/source/ui/app/AppController.cxx
View File

@ -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& )

2
dbaccess/source/ui/app/AppController.hxx
View File

@ -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
*/

10
dbaccess/source/ui/app/AppControllerDnD.cxx
View File

@ -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() );

2
dbaccess/source/ui/app/AppControllerGen.cxx
View File

@ -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();

40
dbaccess/source/ui/app/AppDetailPageHelper.cxx
View File

@ -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();
}

2
dbaccess/source/ui/app/AppDetailPageHelper.hxx
View File

@ -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

28
dbaccess/source/ui/app/AppDetailView.cxx
View File

@ -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,

2
dbaccess/source/ui/app/AppDetailView.hxx
View File

@ -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();

4
dbaccess/source/ui/app/AppIconControl.cxx
View File

@ -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();

6
dbaccess/source/ui/app/AppSwapWindow.cxx
View File

@ -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 )

2
dbaccess/source/ui/app/AppTitleWindow.cxx
View File

@ -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)
{

12
dbaccess/source/ui/app/AppView.cxx
View File

@ -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()

2
dbaccess/source/ui/app/subcomponentmanager.cxx
View File

@ -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& )

8
dbaccess/source/ui/browser/AsynchronousLink.cxx
View File

@ -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);

40
dbaccess/source/ui/browser/brwctrlr.cxx
View File

@ -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
}
}

14
dbaccess/source/ui/browser/brwview.cxx
View File

@ -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 )

12
dbaccess/source/ui/browser/dbexchange.cxx
View File

@ -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 ..." );

2
dbaccess/source/ui/browser/dbloader.cxx
View File

@ -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() )

4
dbaccess/source/ui/browser/dbtreeview.cxx
View File

@ -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);

4
dbaccess/source/ui/browser/dsEntriesNoExp.cxx
View File

@ -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 {

20
dbaccess/source/ui/browser/dsbrowserDnD.cxx
View File

@ -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

2
dbaccess/source/ui/browser/exsrcbrw.cxx
View File

@ -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 )
{

2
dbaccess/source/ui/browser/formadapter.cxx
View File

@ -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

22
dbaccess/source/ui/browser/genericcontroller.cxx
View File

@ -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
{

26
dbaccess/source/ui/browser/sbagrid.cxx
View File

@ -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();

Some files were not shown because too many files have changed in this diff Show More