diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:14:16 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:31:24 +0100 |
commit | 217f7f236fd0ef0535cf11de35807bc5f1de9bb6 (patch) | |
tree | f49d8a62e6500bd025853388b5dd9d33de357b9a /editeng/source/accessibility/AccessibleContextBase.cxx | |
parent | 6bab3811c374e3185ea07e7cb0d08f8b90ef81aa (diff) |
loplugin:nullptr (automatic rewrite)
Change-Id: I9fe00eef7ddcd4a3c87e497a8d62f98e71a0d6d8
Diffstat (limited to 'editeng/source/accessibility/AccessibleContextBase.cxx')
-rw-r--r-- | editeng/source/accessibility/AccessibleContextBase.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/editeng/source/accessibility/AccessibleContextBase.cxx b/editeng/source/accessibility/AccessibleContextBase.cxx index 64e53572accf..3e5481f82d4b 100644 --- a/editeng/source/accessibility/AccessibleContextBase.cxx +++ b/editeng/source/accessibility/AccessibleContextBase.cxx @@ -46,8 +46,8 @@ AccessibleContextBase::AccessibleContextBase ( const uno::Reference<XAccessible>& rxParent, const sal_Int16 aRole) : WeakComponentImplHelper(MutexOwner::maMutex), - mxStateSet (NULL), - mxRelationSet (NULL), + mxStateSet (nullptr), + mxRelationSet (nullptr), mxParent(rxParent), msDescription(), meDescriptionOrigin(NotSet), @@ -83,7 +83,7 @@ bool AccessibleContextBase::SetState (sal_Int16 aState) ::osl::ClearableMutexGuard aGuard (maMutex); ::utl::AccessibleStateSetHelper* pStateSet = static_cast< ::utl::AccessibleStateSetHelper*>(mxStateSet.get()); - if ((pStateSet != NULL) && !pStateSet->contains(aState)) + if ((pStateSet != nullptr) && !pStateSet->contains(aState)) { pStateSet->AddState (aState); // Clear the mutex guard so that it is not locked during calls to @@ -114,7 +114,7 @@ bool AccessibleContextBase::ResetState (sal_Int16 aState) ::osl::ClearableMutexGuard aGuard (maMutex); ::utl::AccessibleStateSetHelper* pStateSet = static_cast< ::utl::AccessibleStateSetHelper*>(mxStateSet.get()); - if ((pStateSet != NULL) && pStateSet->contains(aState)) + if ((pStateSet != nullptr) && pStateSet->contains(aState)) { pStateSet->RemoveState (aState); // Clear the mutex guard so that it is not locked during calls to listeners. @@ -140,7 +140,7 @@ bool AccessibleContextBase::GetState (sal_Int16 aState) ::osl::MutexGuard aGuard (maMutex); ::utl::AccessibleStateSetHelper* pStateSet = static_cast< ::utl::AccessibleStateSetHelper*>(mxStateSet.get()); - if (pStateSet != NULL) + if (pStateSet != nullptr) return pStateSet->contains(aState); else // If there is no state set then return false as a default value. @@ -216,7 +216,7 @@ uno::Reference<XAccessible> SAL_CALL ThrowIfDisposed (); throw lang::IndexOutOfBoundsException ( "no child with index " + OUString::number(nIndex), - NULL); + nullptr); } @@ -323,13 +323,13 @@ uno::Reference<XAccessibleRelationSet> SAL_CALL // Create a copy of the relation set and return it. ::utl::AccessibleRelationSetHelper* pRelationSet = static_cast< ::utl::AccessibleRelationSetHelper*>(mxRelationSet.get()); - if (pRelationSet != NULL) + if (pRelationSet != nullptr) { return uno::Reference<XAccessibleRelationSet> ( new ::utl::AccessibleRelationSetHelper (*pRelationSet)); } else - return uno::Reference<XAccessibleRelationSet>(NULL); + return uno::Reference<XAccessibleRelationSet>(nullptr); } @@ -345,7 +345,7 @@ uno::Reference<XAccessibleStateSet> SAL_CALL AccessibleContextBase::getAccessibleStateSet() throw (css::uno::RuntimeException, std::exception) { - ::utl::AccessibleStateSetHelper* pStateSet = NULL; + ::utl::AccessibleStateSetHelper* pStateSet = nullptr; if (rBHelper.bDisposed) { @@ -371,7 +371,7 @@ uno::Reference<XAccessibleStateSet> SAL_CALL pStateSet->RemoveState (aState); } #endif - if (pStateSet != NULL) + if (pStateSet != nullptr) pStateSet = new ::utl::AccessibleStateSetHelper (*pStateSet); } |