diff options
Diffstat (limited to 'svtools/source/control/valueacc.cxx')
| -rw-r--r-- | svtools/source/control/valueacc.cxx | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/svtools/source/control/valueacc.cxx b/svtools/source/control/valueacc.cxx index 89eb0756073f..24c3b27edef4 100644 --- a/svtools/source/control/valueacc.cxx +++ b/svtools/source/control/valueacc.cxx @@ -40,7 +40,7 @@ ValueSetItem::ValueSetItem( ValueSet& rParent ) , mnId(0) , meType(VALUESETITEM_NONE) , mbVisible(true) - , mpData(NULL) + , mpData(nullptr) , mbSelected(false) , mxAcc() { @@ -130,11 +130,11 @@ ValueSetAcc* ValueSetAcc::getImplementation( const uno::Reference< uno::XInterfa try { uno::Reference< lang::XUnoTunnel > xUnoTunnel( rxData, uno::UNO_QUERY ); - return( xUnoTunnel.is() ? reinterpret_cast<ValueSetAcc*>(sal::static_int_cast<sal_IntPtr>(xUnoTunnel->getSomething( ValueSetAcc::getUnoTunnelId() ))) : NULL ); + return( xUnoTunnel.is() ? reinterpret_cast<ValueSetAcc*>(sal::static_int_cast<sal_IntPtr>(xUnoTunnel->getSomething( ValueSetAcc::getUnoTunnelId() ))) : nullptr ); } catch(const css::uno::Exception&) { - return NULL; + return nullptr; } } @@ -554,7 +554,7 @@ void SAL_CALL ValueSetAcc::selectAccessibleChild( sal_Int32 nChildIndex ) const SolarMutexGuard aSolarGuard; ValueSetItem* pItem = getItem (sal::static_int_cast< sal_uInt16 >(nChildIndex)); - if(pItem != NULL) + if(pItem != nullptr) { mpParent->SelectItem( pItem->mnId ); mpParent->Select (); @@ -573,7 +573,7 @@ sal_Bool SAL_CALL ValueSetAcc::isAccessibleChildSelected( sal_Int32 nChildIndex ValueSetItem* pItem = getItem (sal::static_int_cast< sal_uInt16 >(nChildIndex)); bool bRet = false; - if (pItem != NULL) + if (pItem != nullptr) bRet = mpParent->IsItemSelected( pItem->mnId ); else throw lang::IndexOutOfBoundsException(); @@ -683,7 +683,7 @@ void SAL_CALL ValueSetAcc::disposing() // Reset the pointer to the parent. It has to be the one who has // disposed us because he is dying. - mpParent = NULL; + mpParent = nullptr; } // Inform all listeners that this objects is disposing. @@ -719,7 +719,7 @@ sal_uInt16 ValueSetAcc::getItemCount() const ValueSetItem* ValueSetAcc::getItem (sal_uInt16 nIndex) const { - ValueSetItem* pItem = NULL; + ValueSetItem* pItem = nullptr; if (HasNoneField()) { @@ -730,7 +730,7 @@ ValueSetItem* ValueSetAcc::getItem (sal_uInt16 nIndex) const // Shift down the index to compensate for the none field. nIndex -= 1; } - if (pItem == NULL) + if (pItem == nullptr) pItem = mpParent->ImplGetItem (static_cast<sal_uInt16>(nIndex)); return pItem; @@ -797,7 +797,7 @@ void ValueItemAcc::FireAccessibleEvent( short nEventId, const uno::Any& rOldValu void ValueItemAcc::ParentDestroyed() { const ::osl::MutexGuard aGuard( maMutex ); - mpParent = NULL; + mpParent = nullptr; } namespace @@ -818,11 +818,11 @@ ValueItemAcc* ValueItemAcc::getImplementation( const uno::Reference< uno::XInter try { uno::Reference< lang::XUnoTunnel > xUnoTunnel( rxData, uno::UNO_QUERY ); - return( xUnoTunnel.is() ? reinterpret_cast<ValueItemAcc*>(sal::static_int_cast<sal_IntPtr>(xUnoTunnel->getSomething( ValueItemAcc::getUnoTunnelId() ))) : NULL ); + return( xUnoTunnel.is() ? reinterpret_cast<ValueItemAcc*>(sal::static_int_cast<sal_IntPtr>(xUnoTunnel->getSomething( ValueItemAcc::getUnoTunnelId() ))) : nullptr ); } catch(const css::uno::Exception&) { - return NULL; + return nullptr; } } @@ -890,11 +890,11 @@ sal_Int32 SAL_CALL ValueItemAcc::getAccessibleIndexInParent() } catch (const lang::IndexOutOfBoundsException&) { - pItem = NULL; + pItem = nullptr; } // Do not create an accessible object for the test. - if (pItem != NULL && pItem->mxAcc.is()) + if (pItem != nullptr && pItem->mxAcc.is()) if (pItem->GetAccessible( mbIsTransientChildrenDisabled ).get() == this ) { nIndexInParent = i; |