summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/canvas/vclwrapper.hxx2
-rw-r--r--include/comphelper/listenernotification.hxx4
-rw-r--r--include/comphelper/sequence.hxx8
-rw-r--r--include/comphelper/types.hxx6
-rw-r--r--include/comphelper/uno3.hxx2
-rw-r--r--include/editeng/AccessibleParaManager.hxx2
-rw-r--r--include/registry/registry.hxx2
-rw-r--r--include/svx/svdobj.hxx2
-rw-r--r--include/unotools/sharedunocomponent.hxx2
-rw-r--r--include/vcl/lazydelete.hxx8
-rw-r--r--include/vcl/vclptr.hxx2
11 files changed, 20 insertions, 20 deletions
diff --git a/include/canvas/vclwrapper.hxx b/include/canvas/vclwrapper.hxx
index 330e88cb88ad..b3a28771c8c8 100644
--- a/include/canvas/vclwrapper.hxx
+++ b/include/canvas/vclwrapper.hxx
@@ -76,7 +76,7 @@ namespace canvas
if( rOrig.mpWrappee )
mpWrappee = new Wrappee( *rOrig.mpWrappee );
else
- mpWrappee = NULL;
+ mpWrappee = nullptr;
}
// This object has value semantics, thus, forward copy
diff --git a/include/comphelper/listenernotification.hxx b/include/comphelper/listenernotification.hxx
index 65edfa5c36a1..fd11ce6574a4 100644
--- a/include/comphelper/listenernotification.hxx
+++ b/include/comphelper/listenernotification.hxx
@@ -166,7 +166,7 @@ namespace comphelper
public:
OSimpleListenerContainer( ::osl::Mutex& _rMutex )
:OListenerContainer( _rMutex )
- ,m_pNotificationMethod( NULL )
+ ,m_pNotificationMethod( nullptr )
{
}
@@ -208,7 +208,7 @@ namespace comphelper
{
m_pNotificationMethod = _pNotify;
bool bRet = OListenerContainer::impl_notify( _rEvent );
- m_pNotificationMethod = NULL;
+ m_pNotificationMethod = nullptr;
return bRet;
}
diff --git a/include/comphelper/sequence.hxx b/include/comphelper/sequence.hxx
index 17d1b67c0d64..a5fba55f1ec6 100644
--- a/include/comphelper/sequence.hxx
+++ b/include/comphelper/sequence.hxx
@@ -157,9 +157,9 @@ namespace comphelper
template <class TYPE>
inline OSequenceIterator<TYPE>::OSequenceIterator(const css::uno::Sequence< TYPE >& _rSeq)
- :m_pElements(NULL)
+ :m_pElements(nullptr)
,m_nLen(0)
- ,m_pCurrent(NULL)
+ ,m_pCurrent(nullptr)
{
construct(_rSeq);
}
@@ -167,9 +167,9 @@ namespace comphelper
template <class TYPE>
inline OSequenceIterator<TYPE>::OSequenceIterator(const css::uno::Any& _rSequenceAny)
- :m_pElements(NULL)
+ :m_pElements(nullptr)
,m_nLen(0)
- ,m_pCurrent(NULL)
+ ,m_pCurrent(nullptr)
{
css::uno::Sequence< TYPE > aContainer;
bool bSuccess = _rSequenceAny >>= aContainer;
diff --git a/include/comphelper/types.hxx b/include/comphelper/types.hxx
index 6901e6c52ded..e01e6f640f8f 100644
--- a/include/comphelper/types.hxx
+++ b/include/comphelper/types.hxx
@@ -57,19 +57,19 @@ namespace comphelper
if (xComp.is())
{
xComp->dispose();
- _rxComp = NULL;
+ _rxComp = nullptr;
}
}
template <class TYPE>
bool getImplementation(TYPE*& _pObject, const css::uno::Reference< css::uno::XInterface >& _rxIFace)
{
- _pObject = NULL;
+ _pObject = nullptr;
css::uno::Reference< css::lang::XUnoTunnel > xTunnel(_rxIFace, css::uno::UNO_QUERY);
if (xTunnel.is())
_pObject = reinterpret_cast< TYPE* >(xTunnel->getSomething(TYPE::getUnoTunnelImplementationId()));
- return (_pObject != NULL);
+ return (_pObject != nullptr);
}
diff --git a/include/comphelper/uno3.hxx b/include/comphelper/uno3.hxx
index a75a4abbb9d3..b5167181e03a 100644
--- a/include/comphelper/uno3.hxx
+++ b/include/comphelper/uno3.hxx
@@ -170,7 +170,7 @@ namespace comphelper
template <class iface>
bool query_aggregation(const css::uno::Reference< css::uno::XAggregation >& _rxAggregate, css::uno::Reference<iface>& _rxOut)
{
- _rxOut = static_cast<iface*>(NULL);
+ _rxOut = static_cast<iface*>(nullptr);
if (_rxAggregate.is())
{
css::uno::Any aCheck = _rxAggregate->queryAggregation(
diff --git a/include/editeng/AccessibleParaManager.hxx b/include/editeng/AccessibleParaManager.hxx
index e4684d2984b1..295d7b12a4be 100644
--- a/include/editeng/AccessibleParaManager.hxx
+++ b/include/editeng/AccessibleParaManager.hxx
@@ -98,7 +98,7 @@ namespace accessibility
typedef CppType InterfaceType;
typedef HardCppRef< UnoInterfaceType, InterfaceType > HardRefType;
- WeakCppRef() : maWeakRef(), maUnsafeRef( NULL ) {}
+ WeakCppRef() : maWeakRef(), maUnsafeRef( nullptr ) {}
WeakCppRef( InterfaceType& rImpl ) :
maWeakRef( css::uno::Reference< UnoInterfaceType >( rImpl, css::uno::UNO_QUERY ) ),
maUnsafeRef( &rImpl )
diff --git a/include/registry/registry.hxx b/include/registry/registry.hxx
index dbbe0f1eab8a..7c42e57d11f2 100644
--- a/include/registry/registry.hxx
+++ b/include/registry/registry.hxx
@@ -275,7 +275,7 @@ public:
/// Default constructor
RegistryValueList()
: m_length(0)
- , m_pValueList(NULL)
+ , m_pValueList(nullptr)
, m_valueType(RegValueType::NOT_DEFINED)
{}
diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index e14d1d306c2f..a76cb712915a 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -1020,7 +1020,7 @@ template< typename T > T* SdrObject::CloneHelper() const
{
OSL_ASSERT( typeid( T ) == typeid( *this ));
T* pObj = dynamic_cast< T* >( SdrObjFactory::MakeNewObject(GetObjInventor(),GetObjIdentifier(),nullptr));
- if (pObj!=NULL)
+ if (pObj!=nullptr)
*pObj=*static_cast< const T* >( this );
return pObj;
}
diff --git a/include/unotools/sharedunocomponent.hxx b/include/unotools/sharedunocomponent.hxx
index 0d7921b75a1f..137d1314fbc2 100644
--- a/include/unotools/sharedunocomponent.hxx
+++ b/include/unotools/sharedunocomponent.hxx
@@ -233,7 +233,7 @@ namespace utl
template < class INTERFACE, class COMPONENT >
void SharedUNOComponent< INTERFACE, COMPONENT >::reset( const css::uno::Reference< INTERFACE >& _rxComponent, AssignmentMode _eMode )
{
- m_xComponent.reset(_eMode == TakeOwnership ? new COMPONENT( _rxComponent ) : NULL);
+ m_xComponent.reset(_eMode == TakeOwnership ? new COMPONENT( _rxComponent ) : nullptr);
m_xTypedComponent = _rxComponent;
}
diff --git a/include/vcl/lazydelete.hxx b/include/vcl/lazydelete.hxx
index 0b4bdca556bd..c643b9bdcde1 100644
--- a/include/vcl/lazydelete.hxx
+++ b/include/vcl/lazydelete.hxx
@@ -239,7 +239,7 @@ namespace vcl
class DeleteOnDeinit : public DeleteOnDeinitBase
{
T* m_pT;
- virtual void doCleanup() override { delete m_pT; m_pT = NULL; }
+ virtual void doCleanup() override { delete m_pT; m_pT = nullptr; }
public:
DeleteOnDeinit( T* i_pT ) : m_pT( i_pT ) { addDeinitContainer( this ); }
virtual ~DeleteOnDeinit() {}
@@ -253,8 +253,8 @@ namespace vcl
// set contents, deleting old contents
// ownership is transferred !
- void reset( T* i_pNew = NULL )
- { OSL_ASSERT( i_pNew != m_pT || i_pNew == NULL ); T* pOld = m_pT; m_pT = i_pNew; delete pOld; }
+ void reset( T* i_pNew = nullptr )
+ { OSL_ASSERT( i_pNew != m_pT || i_pNew == nullptr ); T* pOld = m_pT; m_pT = i_pNew; delete pOld; }
};
/** Similar to DeleteOnDeinit, the DeleteUnoReferenceOnDeinit
@@ -272,7 +272,7 @@ namespace vcl
class DeleteUnoReferenceOnDeinit : public vcl::DeleteOnDeinitBase
{
css::uno::Reference<I> m_xI;
- virtual void doCleanup() override { set(NULL); }
+ virtual void doCleanup() override { set(nullptr); }
public:
DeleteUnoReferenceOnDeinit(const css::uno::Reference<I>& r_xI ) : m_xI( r_xI ) {
addDeinitContainer( this ); }
diff --git a/include/vcl/vclptr.hxx b/include/vcl/vclptr.hxx
index 0eb16a9678bb..392d8476a2ec 100644
--- a/include/vcl/vclptr.hxx
+++ b/include/vcl/vclptr.hxx
@@ -184,7 +184,7 @@ public:
inline explicit operator bool () const
{
- return m_rInnerRef.get() != NULL;
+ return m_rInnerRef.get() != nullptr;
}
inline void clear()
generated by cgit (git 2.34.1) at 2024-08-06 09:15:29 +0000