diff options
Diffstat (limited to 'connectivity/source/commontools')
17 files changed, 62 insertions, 62 deletions
diff --git a/connectivity/source/commontools/CommonTools.cxx b/connectivity/source/commontools/CommonTools.cxx index d97bc0758564..8a0f25b2d316 100644 --- a/connectivity/source/commontools/CommonTools.cxx +++ b/connectivity/source/commontools/CommonTools.cxx @@ -135,7 +135,7 @@ namespace connectivity else { sal_Int32 nValue = 0; - jvmaccess::VirtualMachine* pJVM = NULL; + jvmaccess::VirtualMachine* pJVM = nullptr; if ( uaJVM >>= nValue ) pJVM = reinterpret_cast< jvmaccess::VirtualMachine* > (nValue); else @@ -166,7 +166,7 @@ namespace connectivity OString sClassName = OUStringToOString(_sClassName, RTL_TEXTENCODING_ASCII_US); sClassName = sClassName.replace('.','/'); jobject out = pEnv->FindClass(sClassName.getStr()); - bRet = out != NULL; + bRet = out != nullptr; pEnv->DeleteLocalRef( out ); } } diff --git a/connectivity/source/commontools/ConnectionWrapper.cxx b/connectivity/source/commontools/ConnectionWrapper.cxx index f7b5427dbe4e..26ef016aae29 100644 --- a/connectivity/source/commontools/ConnectionWrapper.cxx +++ b/connectivity/source/commontools/ConnectionWrapper.cxx @@ -51,7 +51,7 @@ void OConnectionWrapper::setDelegation(Reference< XAggregation >& _rxProxyConnec { // transfer the (one and only) real ref to the aggregate to our member m_xProxyConnection = _rxProxyConnection; - _rxProxyConnection = NULL; + _rxProxyConnection = nullptr; ::comphelper::query_aggregation(m_xProxyConnection,m_xConnection); m_xTypeProvider.set(m_xConnection,UNO_QUERY); m_xUnoTunnel.set(m_xConnection,UNO_QUERY); @@ -100,7 +100,7 @@ m_xConnection.clear(); OConnectionWrapper::~OConnectionWrapper() { if (m_xProxyConnection.is()) - m_xProxyConnection->setDelegator(NULL); + m_xProxyConnection->setDelegator(nullptr); } // XServiceInfo @@ -166,7 +166,7 @@ sal_Int64 SAL_CALL OConnectionWrapper::getSomething( const Sequence< sal_Int8 >& Sequence< sal_Int8 > OConnectionWrapper::getUnoTunnelImplementationId() { - static ::cppu::OImplementationId * pId = 0; + static ::cppu::OImplementationId * pId = nullptr; if (! pId) { ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); diff --git a/connectivity/source/commontools/DriversConfig.cxx b/connectivity/source/commontools/DriversConfig.cxx index 908159d133e8..ef7c03ab30b5 100644 --- a/connectivity/source/commontools/DriversConfig.cxx +++ b/connectivity/source/commontools/DriversConfig.cxx @@ -206,7 +206,7 @@ const ::comphelper::NamedValueCollection& DriversConfig::getMetaData(const OUStr const ::comphelper::NamedValueCollection& DriversConfig::impl_get(const OUString& _sURL,sal_Int32 _nProps) const { const TInstalledDrivers& rDrivers = m_aNode->getInstalledDrivers(m_xORB); - const ::comphelper::NamedValueCollection* pRet = NULL; + const ::comphelper::NamedValueCollection* pRet = nullptr; OUString sOldPattern; TInstalledDrivers::const_iterator aIter = rDrivers.begin(); TInstalledDrivers::const_iterator aEnd = rDrivers.end(); @@ -230,7 +230,7 @@ const ::comphelper::NamedValueCollection& DriversConfig::impl_get(const OUString sOldPattern = aIter->first; } } // for(;aIter != aEnd;++aIter) - if ( pRet == NULL ) + if ( pRet == nullptr ) { static const ::comphelper::NamedValueCollection s_sEmpty; pRet = &s_sEmpty; diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx index 0662f68d8797..59507f5d4b35 100644 --- a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx +++ b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx @@ -55,8 +55,8 @@ using namespace ::com::sun::star::lang; ODatabaseMetaDataResultSet::ODatabaseMetaDataResultSet() :ODatabaseMetaDataResultSet_BASE(m_aMutex) ,::comphelper::OPropertyContainer(ODatabaseMetaDataResultSet_BASE::rBHelper) - ,m_aStatement(NULL) - ,m_xMetaData(NULL) + ,m_aStatement(nullptr) + ,m_xMetaData(nullptr) ,m_nColPos(0) ,m_bBOF(true) ,m_bEOF(true) @@ -68,8 +68,8 @@ ODatabaseMetaDataResultSet::ODatabaseMetaDataResultSet() ODatabaseMetaDataResultSet::ODatabaseMetaDataResultSet( MetaDataResultSetType _eType ) :ODatabaseMetaDataResultSet_BASE(m_aMutex) ,::comphelper::OPropertyContainer(ODatabaseMetaDataResultSet_BASE::rBHelper) - ,m_aStatement(NULL) - ,m_xMetaData(NULL) + ,m_aStatement(nullptr) + ,m_xMetaData(nullptr) ,m_nColPos(0) ,m_bBOF(true) ,m_bEOF(true) @@ -124,7 +124,7 @@ void ODatabaseMetaDataResultSet::disposing() OPropertySetHelper::disposing(); ::osl::MutexGuard aGuard(m_aMutex); - m_aStatement = NULL; + m_aStatement = nullptr; m_xMetaData.clear(); m_aRowsIter = m_aRows.end(); m_aRows.clear(); @@ -193,12 +193,12 @@ void ODatabaseMetaDataResultSet::checkIndex(sal_Int32 columnIndex ) throw(::com: Reference< ::com::sun::star::io::XInputStream > SAL_CALL ODatabaseMetaDataResultSet::getBinaryStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) { - return NULL; + return nullptr; } Reference< ::com::sun::star::io::XInputStream > SAL_CALL ODatabaseMetaDataResultSet::getCharacterStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) { - return NULL; + return nullptr; } @@ -271,25 +271,25 @@ Reference< XResultSetMetaData > SAL_CALL ODatabaseMetaDataResultSet::getMetaData Reference< XArray > SAL_CALL ODatabaseMetaDataResultSet::getArray( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) { - return NULL; + return nullptr; } Reference< XClob > SAL_CALL ODatabaseMetaDataResultSet::getClob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) { - return NULL; + return nullptr; } Reference< XBlob > SAL_CALL ODatabaseMetaDataResultSet::getBlob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) { - return NULL; + return nullptr; } Reference< XRef > SAL_CALL ODatabaseMetaDataResultSet::getRef( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) { - return NULL; + return nullptr; } @@ -889,10 +889,10 @@ namespace { cppu::ImplementationEntry entries[] = { { &ODatabaseMetaDataResultSet_CreateInstance, &ODatabaseMetaDataResultSet::getImplementationName_Static, &ODatabaseMetaDataResultSet::getSupportedServiceNames_Static, - &cppu::createSingleComponentFactory, 0, 0 }, + &cppu::createSingleComponentFactory, nullptr, 0 }, { &ParameterSubstitution::create, &ParameterSubstitution::getImplementationName_Static, &ParameterSubstitution::getSupportedServiceNames_Static, - &cppu::createSingleComponentFactory, 0, 0 }, - { 0, 0, 0, 0, 0, 0 } + &cppu::createSingleComponentFactory, nullptr, 0 }, + { nullptr, nullptr, nullptr, nullptr, nullptr, 0 } }; } diff --git a/connectivity/source/commontools/FValue.cxx b/connectivity/source/commontools/FValue.cxx index 1b92f570b9c3..e6927497e9c4 100644 --- a/connectivity/source/commontools/FValue.cxx +++ b/connectivity/source/commontools/FValue.cxx @@ -186,7 +186,7 @@ namespace tracing const sal_Char* pName; sal_Int32 nAllocatedUnits; - AllocationType( ) : pName( NULL ), nAllocatedUnits( 0 ) { } + AllocationType( ) : pName( nullptr ), nAllocatedUnits( 0 ) { } }; @@ -350,36 +350,36 @@ void ORowSetValue::free() case DataType::LONGVARCHAR: OSL_ENSURE(m_aValue.m_pString,"String pointer is null!"); rtl_uString_release(m_aValue.m_pString); - m_aValue.m_pString = NULL; + m_aValue.m_pString = nullptr; break; case DataType::DATE: delete static_cast<css::util::Date*>(m_aValue.m_pValue); TRACE_FREE( Date ) - m_aValue.m_pValue = NULL; + m_aValue.m_pValue = nullptr; break; case DataType::TIME: delete static_cast<css::util::Time*>(m_aValue.m_pValue); TRACE_FREE( tools::Time ) - m_aValue.m_pValue = NULL; + m_aValue.m_pValue = nullptr; break; case DataType::TIMESTAMP: delete static_cast<css::util::DateTime*>(m_aValue.m_pValue); TRACE_FREE( DateTime ) - m_aValue.m_pValue = NULL; + m_aValue.m_pValue = nullptr; break; case DataType::BINARY: case DataType::VARBINARY: case DataType::LONGVARBINARY: delete static_cast<Sequence<sal_Int8>*>(m_aValue.m_pValue); TRACE_FREE( Sequence_sal_Int8 ) - m_aValue.m_pValue = NULL; + m_aValue.m_pValue = nullptr; break; case DataType::BLOB: case DataType::CLOB: case DataType::OBJECT: delete static_cast<Any*>(m_aValue.m_pValue); TRACE_FREE( Any ) - m_aValue.m_pValue = NULL; + m_aValue.m_pValue = nullptr; break; case DataType::BIT: case DataType::TINYINT: @@ -396,7 +396,7 @@ void ORowSetValue::free() { delete static_cast<Any*>(m_aValue.m_pValue); TRACE_FREE( Any ) - m_aValue.m_pValue = NULL; + m_aValue.m_pValue = nullptr; } break; @@ -2257,7 +2257,7 @@ namespace detail virtual Sequence< sal_Int8 > getBytes() const override { return m_xRow->getBytes( m_nPos ); }; virtual Reference< XBlob > getBlob() const override { return m_xRow->getBlob( m_nPos ); }; virtual Reference< XClob > getClob() const override { return m_xRow->getClob( m_nPos ); }; - virtual Any getObject() const override { return m_xRow->getObject( m_nPos ,NULL); }; + virtual Any getObject() const override { return m_xRow->getObject( m_nPos ,nullptr); }; virtual bool wasNull() const override { return m_xRow->wasNull( ); }; private: @@ -2288,7 +2288,7 @@ namespace detail virtual Sequence< sal_Int8 > getBytes() const override { return m_xColumn->getBytes(); }; virtual Reference< XBlob > getBlob() const override { return m_xColumn->getBlob(); }; virtual Reference< XClob > getClob() const override { return m_xColumn->getClob(); }; - virtual Any getObject() const override { return m_xColumn->getObject( NULL ); }; + virtual Any getObject() const override { return m_xColumn->getObject( nullptr ); }; virtual bool wasNull() const override { return m_xColumn->wasNull( ); }; private: diff --git a/connectivity/source/commontools/TColumnsHelper.cxx b/connectivity/source/commontools/TColumnsHelper.cxx index 3a14693a934c..fef9a9f07c51 100644 --- a/connectivity/source/commontools/TColumnsHelper.cxx +++ b/connectivity/source/commontools/TColumnsHelper.cxx @@ -64,15 +64,15 @@ OColumnsHelper::OColumnsHelper( ::cppu::OWeakObject& _rParent ,const TStringVector &_rVector ,bool _bUseHardRef ) : OCollection(_rParent,_bCase,_rMutex,_rVector,false,_bUseHardRef) - ,m_pImpl(NULL) - ,m_pTable(NULL) + ,m_pImpl(nullptr) + ,m_pTable(nullptr) { } OColumnsHelper::~OColumnsHelper() { delete m_pImpl; - m_pImpl = NULL; + m_pImpl = nullptr; } @@ -180,7 +180,7 @@ sdbcx::ObjectType OColumnsHelper::appendObject( const OUString& _rForName, const OUString aSql = "ALTER TABLE " + ::dbtools::composeTableName( xMetaData, m_pTable, ::dbtools::eInTableDefinitions, false, false, true ) + " ADD " + - ::dbtools::createStandardColumnPart(descriptor,m_pTable->getConnection(),NULL,m_pTable->getTypeCreatePattern()); + ::dbtools::createStandardColumnPart(descriptor,m_pTable->getConnection(),nullptr,m_pTable->getTypeCreatePattern()); Reference< XStatement > xStmt = m_pTable->getConnection()->createStatement( ); if ( xStmt.is() ) diff --git a/connectivity/source/commontools/TConnection.cxx b/connectivity/source/commontools/TConnection.cxx index ab74964f0cae..e613468454b7 100644 --- a/connectivity/source/commontools/TConnection.cxx +++ b/connectivity/source/commontools/TConnection.cxx @@ -65,7 +65,7 @@ sal_Int64 SAL_CALL OMetaConnection::getSomething( const ::com::sun::star::uno::S Sequence< sal_Int8 > OMetaConnection::getUnoTunnelImplementationId() { - static ::cppu::OImplementationId * pId = 0; + static ::cppu::OImplementationId * pId = nullptr; if (! pId) { ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); diff --git a/connectivity/source/commontools/TIndexes.cxx b/connectivity/source/commontools/TIndexes.cxx index 6b3b8d9197dd..2dc5164caa8e 100644 --- a/connectivity/source/commontools/TIndexes.cxx +++ b/connectivity/source/commontools/TIndexes.cxx @@ -52,7 +52,7 @@ sdbcx::ObjectType OIndexesHelper::createObject(const OUString& _rName) { Reference< XConnection> xConnection = m_pTable->getConnection(); if ( !xConnection.is() ) - return NULL; + return nullptr; sdbcx::ObjectType xRet; OUString aName,aQualifier; @@ -125,7 +125,7 @@ sdbcx::ObjectType OIndexesHelper::appendObject( const OUString& _rForName, const { Reference< XConnection> xConnection = m_pTable->getConnection(); if ( !xConnection.is() ) - return NULL; + return nullptr; if ( m_pTable->isNew() ) return cloneDescriptor( descriptor ); diff --git a/connectivity/source/commontools/TKeys.cxx b/connectivity/source/commontools/TKeys.cxx index f24a9f2a19a2..7856f522b568 100644 --- a/connectivity/source/commontools/TKeys.cxx +++ b/connectivity/source/commontools/TKeys.cxx @@ -52,7 +52,7 @@ OKeysHelper::OKeysHelper( OTableHelper* _pTable, sdbcx::ObjectType OKeysHelper::createObject(const OUString& _rName) { - sdbcx::ObjectType xRet = NULL; + sdbcx::ObjectType xRet = nullptr; if(!_rName.isEmpty()) { @@ -83,7 +83,7 @@ Reference< XPropertySet > OKeysHelper::createDescriptor() */ OUString getKeyRuleString(bool _bUpdate,sal_Int32 _nKeyRule) { - const char* pKeyRule = NULL; + const char* pKeyRule = nullptr; switch ( _nKeyRule ) { case KeyRule::CASCADE: @@ -128,7 +128,7 @@ sdbcx::ObjectType OKeysHelper::appendObject( const OUString& _rForName, const Re { Reference< XConnection> xConnection = m_pTable->getConnection(); if ( !xConnection.is() ) - return NULL; + return nullptr; if ( m_pTable->isNew() ) { Reference< XPropertySet > xNewDescriptor( cloneDescriptor( descriptor ) ); diff --git a/connectivity/source/commontools/TSortIndex.cxx b/connectivity/source/commontools/TSortIndex.cxx index 09c58ed1dc3c..59d170d1b564 100644 --- a/connectivity/source/commontools/TSortIndex.cxx +++ b/connectivity/source/commontools/TSortIndex.cxx @@ -126,7 +126,7 @@ void OSortIndex::Freeze() for(;aIter != m_aKeyValues.end();++aIter) { delete aIter->second; - aIter->second = NULL; + aIter->second = nullptr; } m_bFrozen = true; diff --git a/connectivity/source/commontools/TTableHelper.cxx b/connectivity/source/commontools/TTableHelper.cxx index b33f6bf49f0d..95aede3a8005 100644 --- a/connectivity/source/commontools/TTableHelper.cxx +++ b/connectivity/source/commontools/TTableHelper.cxx @@ -87,7 +87,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; } inline void add(const OUString& _sRefName) { m_aRefNames.insert(::std::map< OUString,bool>::value_type(_sRefName,true)); } }; } @@ -180,8 +180,8 @@ void SAL_CALL OTableHelper::disposing() } OTable_TYPEDEF::disposing(); - m_pImpl->m_xConnection = NULL; - m_pImpl->m_xMetaData = NULL; + m_pImpl->m_xConnection = nullptr; + m_pImpl->m_xMetaData = nullptr; } @@ -306,7 +306,7 @@ void OTableHelper::refreshColumns() const ColumnDesc* OTableHelper::getColumnDescription(const OUString& _sName) const { - const ColumnDesc* pRet = NULL; + const ColumnDesc* pRet = nullptr; ::std::vector< ColumnDesc >::const_iterator aEnd = m_pImpl->m_aColumnDesc.end(); for (::std::vector< ColumnDesc >::const_iterator aIter = m_pImpl->m_aColumnDesc.begin();aIter != aEnd;++aIter) { diff --git a/connectivity/source/commontools/dbexception.cxx b/connectivity/source/commontools/dbexception.cxx index 391f15374033..da440efd1a13 100644 --- a/connectivity/source/commontools/dbexception.cxx +++ b/connectivity/source/commontools/dbexception.cxx @@ -226,7 +226,7 @@ void SQLExceptionInfo::append( TYPE _eType, const OUString& _rErrorMessage, cons // find the end of the current chain Any* pChainIterator = &m_aContent; - SQLException* pLastException = NULL; + SQLException* pLastException = nullptr; const Type& aSQLExceptionType( cppu::UnoType<SQLException>::get() ); while ( pChainIterator ) { @@ -259,7 +259,7 @@ void SQLExceptionInfo::doThrow() } SQLExceptionIteratorHelper::SQLExceptionIteratorHelper( const SQLExceptionInfo& _rChainStart ) - :m_pCurrent( NULL ) + :m_pCurrent( nullptr ) ,m_eCurrentType( SQLExceptionInfo::UNDEFINED ) { if ( _rChainStart.isValid() ) @@ -315,7 +315,7 @@ const ::com::sun::star::sdbc::SQLException* SQLExceptionIteratorHelper::next() if ( !isAssignableFrom( aTypeException, aNextElementType ) ) { // no SQLException at all in the next chain element - m_pCurrent = NULL; + m_pCurrent = nullptr; m_eCurrentType = SQLExceptionInfo::UNDEFINED; return pReturn; } diff --git a/connectivity/source/commontools/dbmetadata.cxx b/connectivity/source/commontools/dbmetadata.cxx index 48f1bcba26df..1498478a711f 100644 --- a/connectivity/source/commontools/dbmetadata.cxx +++ b/connectivity/source/commontools/dbmetadata.cxx @@ -113,7 +113,7 @@ namespace dbtools { ::connectivity::SharedResources aResources; const OUString sError( aResources.getResourceString(STR_NO_CONNECTION_GIVEN)); - throwSQLException( sError, SQL_CONNECTION_DOES_NOT_EXIST, NULL ); + throwSQLException( sError, SQL_CONNECTION_DOES_NOT_EXIST, nullptr ); } } diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx index 247b8d71dd72..16e0b1250f30 100644 --- a/connectivity/source/commontools/dbtools.cxx +++ b/connectivity/source/commontools/dbtools.cxx @@ -239,7 +239,7 @@ Reference< XDataSource> getDataSource_allowException( const OUString& _rsTitleOrPath, const Reference< XComponentContext >& _rxContext ) { - ENSURE_OR_RETURN( !_rsTitleOrPath.isEmpty(), "getDataSource_allowException: invalid arg !", NULL ); + ENSURE_OR_RETURN( !_rsTitleOrPath.isEmpty(), "getDataSource_allowException: invalid arg !", nullptr ); Reference< XDatabaseContext> xDatabaseContext = DatabaseContext::create(_rxContext); @@ -295,7 +295,7 @@ Reference< XConnection > getConnection_allowException( if (xConnectionCompletion.is()) { // instantiate the default SDB interaction handler Reference< XInteractionHandler > xHandler( - InteractionHandler::createWithParent(_rxContext, 0), UNO_QUERY ); + InteractionHandler::createWithParent(_rxContext, nullptr), UNO_QUERY ); xConnection = xConnectionCompletion->connectWithCompletion(xHandler); } } @@ -1910,7 +1910,7 @@ void setObjectWithInfo(const Reference<XParameters>& _xParams, STR_UNKNOWN_PARA_TYPE, "$position$", OUString::number(parameterIndex) ) ); - ::dbtools::throwGenericSQLException(sError,NULL); + ::dbtools::throwGenericSQLException(sError,nullptr); } } } @@ -1979,7 +1979,7 @@ void release(oslInterlockedCount& _refCount, { ::osl::MutexGuard aGuard( rBHelper.rMutex ); xParent = _xInterface; - _xInterface = NULL; + _xInterface = nullptr; } // First dispose diff --git a/connectivity/source/commontools/dbtools2.cxx b/connectivity/source/commontools/dbtools2.cxx index 97dd6d7c1d80..632345565d91 100644 --- a/connectivity/source/commontools/dbtools2.cxx +++ b/connectivity/source/commontools/dbtools2.cxx @@ -927,7 +927,7 @@ sal_Int32 DBTypeConversion::convertUnicodeString( const OUString& _rSource, OStr throw SQLException( sMessage, - NULL, + nullptr, OUString( "22018" ), 22018, Any() @@ -953,7 +953,7 @@ sal_Int32 DBTypeConversion::convertUnicodeStringToLength( const OUString& _rSour throw SQLException( sMessage, - NULL, + nullptr, OUString( "22001" ), 22001, Any() diff --git a/connectivity/source/commontools/parameters.cxx b/connectivity/source/commontools/parameters.cxx index 20fce17e255c..dd87288b6076 100644 --- a/connectivity/source/commontools/parameters.cxx +++ b/connectivity/source/commontools/parameters.cxx @@ -59,7 +59,7 @@ namespace dbtools :m_rMutex ( _rMutex ) ,m_aParameterListeners( _rMutex ) ,m_xContext ( _rxContext ) - ,m_pOuterParameters ( NULL ) + ,m_pOuterParameters ( nullptr ) ,m_nInnerCount ( 0 ) ,m_bUpToDate ( false ) { @@ -98,7 +98,7 @@ namespace dbtools m_xInnerParamColumns.clear(); if ( m_pOuterParameters.is() ) m_pOuterParameters->dispose(); - m_pOuterParameters = NULL; + m_pOuterParameters = nullptr; m_nInnerCount = 0; ParameterInformation aEmptyInfo; m_aParameterInformation.swap( aEmptyInfo ); @@ -299,7 +299,7 @@ namespace dbtools // remember meta information about this new parameter ::std::pair< ParameterInformation::iterator, bool > aInsertionPos = m_aParameterInformation.insert( - ParameterInformation::value_type( sNewParamName, ParameterMetaData( NULL ) ) + ParameterInformation::value_type( sNewParamName, ParameterMetaData( nullptr ) ) ); OSL_ENSURE( aInsertionPos.second, "ParameterManager::classifyLinks: there already was a parameter with this name!" ); aInsertionPos.first->second.eType = eLinkedByColumnName; diff --git a/connectivity/source/commontools/sqlerror.cxx b/connectivity/source/commontools/sqlerror.cxx index 6c5a8e179cf0..3b5eda4372e3 100644 --- a/connectivity/source/commontools/sqlerror.cxx +++ b/connectivity/source/commontools/sqlerror.cxx @@ -182,7 +182,7 @@ namespace connectivity { raiseTypedException( _eCondition, - NULL, + nullptr, ::cppu::UnoType< SQLException >::get(), _rParamValue1, _rParamValue2, @@ -198,7 +198,7 @@ namespace connectivity throw ::std::bad_cast(); // default-construct an exception of the desired type - Any aException( NULL, _rExceptionType ); + Any aException( nullptr, _rExceptionType ); // fill it SQLException* pException = static_cast< SQLException* >( aException.pData ); @@ -273,7 +273,7 @@ namespace connectivity m_bAttemptedInit = true; m_pResources.reset( new ::comphelper::OfficeResourceBundle( m_aContext, "sdberr" ) ); - return m_pResources.get() != NULL; + return m_pResources.get() != nullptr; } SQLError::SQLError( const Reference<XComponentContext> & _rxContext ) |