diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/com/sun/star/uno/Reference.h | 2 | ||||
-rw-r--r-- | include/com/sun/star/uno/Reference.hxx | 8 | ||||
-rw-r--r-- | include/rtl/ref.hxx | 8 | ||||
-rw-r--r-- | include/salhelper/dynload.hxx | 2 | ||||
-rw-r--r-- | include/salhelper/singletonref.hxx | 2 | ||||
-rw-r--r-- | include/sfx2/itemconnect.hxx | 2 | ||||
-rw-r--r-- | include/tools/ref.hxx | 20 | ||||
-rw-r--r-- | include/tools/weakbase.hxx | 4 |
8 files changed, 24 insertions, 24 deletions
diff --git a/include/com/sun/star/uno/Reference.h b/include/com/sun/star/uno/Reference.h index 8e266cd72f43..368c9982a2fd 100644 --- a/include/com/sun/star/uno/Reference.h +++ b/include/com/sun/star/uno/Reference.h @@ -408,7 +408,7 @@ public: @return UNacquired interface pointer */ inline interface_type * SAL_CALL operator -> () const { - assert(_pInterface != 0); + assert(_pInterface != NULL); return castFromXInterface(_pInterface); } diff --git a/include/com/sun/star/uno/Reference.hxx b/include/com/sun/star/uno/Reference.hxx index b25083d8e030..f7a713196eaa 100644 --- a/include/com/sun/star/uno/Reference.hxx +++ b/include/com/sun/star/uno/Reference.hxx @@ -113,7 +113,7 @@ inline Reference< interface_type >::~Reference() template< class interface_type > inline Reference< interface_type >::Reference() { - _pInterface = 0; + _pInterface = NULL; } template< class interface_type > @@ -221,7 +221,7 @@ inline void Reference< interface_type >::clear() if (_pInterface) { XInterface * const pOld = _pInterface; - _pInterface = 0; + _pInterface = NULL; pOld->release(); } } @@ -236,7 +236,7 @@ inline bool Reference< interface_type >::set( _pInterface = castToXInterface(pInterface); if (pOld) pOld->release(); - return (0 != pInterface); + return (NULL != pInterface); } template< class interface_type > @@ -247,7 +247,7 @@ inline bool Reference< interface_type >::set( _pInterface = castToXInterface(pInterface); if (pOld) pOld->release(); - return (0 != pInterface); + return (NULL != pInterface); } template< class interface_type > diff --git a/include/rtl/ref.hxx b/include/rtl/ref.hxx index 3ffcfc049c15..ea219cdae77b 100644 --- a/include/rtl/ref.hxx +++ b/include/rtl/ref.hxx @@ -153,7 +153,7 @@ public: if (m_pBody) { reference_type * const pOld = m_pBody; - m_pBody = 0; + m_pBody = NULL; pOld->release(); } return *this; @@ -174,7 +174,7 @@ public: */ inline reference_type * SAL_CALL operator->() const { - assert(m_pBody != 0); + assert(m_pBody != NULL); return m_pBody; } @@ -183,7 +183,7 @@ public: */ inline reference_type & SAL_CALL operator*() const { - assert(m_pBody != 0); + assert(m_pBody != NULL); return *m_pBody; } @@ -192,7 +192,7 @@ public: */ inline bool SAL_CALL is() const { - return (m_pBody != 0); + return (m_pBody != NULL); } diff --git a/include/salhelper/dynload.hxx b/include/salhelper/dynload.hxx index 91d70c12d2a6..b5b16fae4638 100644 --- a/include/salhelper/dynload.hxx +++ b/include/salhelper/dynload.hxx @@ -108,7 +108,7 @@ public: /// Default constructor ODynamicLoader() { - m_pLoader = 0; + m_pLoader = NULL; } /** Constructor, loads the library if necessary otherwise the refernece count will diff --git a/include/salhelper/singletonref.hxx b/include/salhelper/singletonref.hxx index 84064be2a0ce..52e54a513dc5 100644 --- a/include/salhelper/singletonref.hxx +++ b/include/salhelper/singletonref.hxx @@ -128,7 +128,7 @@ class SingletonRef if (m_nRef == 0) { delete m_pInstance; - m_pInstance = 0; + m_pInstance = NULL; } // <- GLOBAL SAFE } diff --git a/include/sfx2/itemconnect.hxx b/include/sfx2/itemconnect.hxx index c0cf7a62b093..ae265b752497 100644 --- a/include/sfx2/itemconnect.hxx +++ b/include/sfx2/itemconnect.hxx @@ -473,7 +473,7 @@ template< typename ItemWrpT, typename ControlWrpT > void ItemControlConnection< ItemWrpT, ControlWrpT >::Reset( const SfxItemSet& rItemSet ) { const ItemType* pItem = maItemWrp.GetUniqueItem( rItemSet ); - mxCtrlWrp->SetControlDontKnow( pItem == 0 ); + mxCtrlWrp->SetControlDontKnow( pItem == nullptr ); if( pItem ) mxCtrlWrp->SetControlValue( maItemWrp.GetItemValue( *pItem ) ); } diff --git a/include/tools/ref.hxx b/include/tools/ref.hxx index 9cd1bf550f3e..2ca5def8d543 100644 --- a/include/tools/ref.hxx +++ b/include/tools/ref.hxx @@ -36,24 +36,24 @@ public: SvRef(SvRef const & rObj): pObj(rObj.pObj) { - if (pObj != 0) pObj->AddNextRef(); + if (pObj != nullptr) pObj->AddNextRef(); } SvRef(T * pObjP): pObj(pObjP) { - if (pObj != 0) pObj->AddFirstRef(); + if (pObj != nullptr) pObj->AddFirstRef(); } ~SvRef() { - if (pObj != 0) pObj->ReleaseRef(); + if (pObj != nullptr) pObj->ReleaseRef(); } void Clear() { - if (pObj != 0) { + if (pObj != nullptr) { T * pRefObj = pObj; - pObj = 0; + pObj = nullptr; pRefObj->ReleaseRef(); } } @@ -65,21 +65,21 @@ public: } T * pRefObj = pObj; pObj = rObj.pObj; - if (pRefObj != 0) { + if (pRefObj != nullptr) { pRefObj->ReleaseRef(); } return *this; } - bool Is() const { return pObj != 0; } + bool Is() const { return pObj != nullptr; } T * get() const { return pObj; } T * operator &() const { return pObj; } - T * operator ->() const { assert(pObj != 0); return pObj; } + T * operator ->() const { assert(pObj != nullptr); return pObj; } - T & operator *() const { assert(pObj != 0); return *pObj; } + T & operator *() const { assert(pObj != nullptr); return *pObj; } operator T *() const { return pObj; } @@ -157,7 +157,7 @@ class SvCompatWeakHdl : public SvRefBase SvCompatWeakHdl( T* pObj ) : _pObj( pObj ) {} public: - void ResetWeakBase( ) { _pObj = 0; } + void ResetWeakBase( ) { _pObj = nullptr; } T* GetObj() { return _pObj; } }; diff --git a/include/tools/weakbase.hxx b/include/tools/weakbase.hxx index 652ea45d50d6..4087160409a3 100644 --- a/include/tools/weakbase.hxx +++ b/include/tools/weakbase.hxx @@ -137,7 +137,7 @@ inline WeakReference<reference_type>& WeakReference<reference_type>::operator= ( template< class reference_type > inline WeakBase< reference_type >::WeakBase() { - mpWeakConnection = 0; + mpWeakConnection = nullptr; } template< class reference_type > @@ -147,7 +147,7 @@ inline WeakBase< reference_type >::~WeakBase() { mpWeakConnection->mpReference = 0; mpWeakConnection->release(); - mpWeakConnection = 0; + mpWeakConnection = nullptr; } } |