diff options
Diffstat (limited to 'svx/source/accessibility/GraphCtlAccessibleContext.cxx')
-rw-r--r-- | svx/source/accessibility/GraphCtlAccessibleContext.cxx | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx b/svx/source/accessibility/GraphCtlAccessibleContext.cxx index 7bed55b7f3bf..0aa17dbce2df 100644 --- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx +++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx @@ -70,27 +70,27 @@ SvxGraphCtrlAccessibleContext::SvxGraphCtrlAccessibleContext( SvxGraphCtrlAccessibleContext_Base( m_aMutex ), mxParent( rxParent ), mpControl( &rRepr ), - mpModel (NULL), - mpPage (NULL), - mpView (NULL), + mpModel (nullptr), + mpPage (nullptr), + mpView (nullptr), mnClientId( 0 ), mbDisposed( false ) { if (mpControl != nullptr) { mpModel = mpControl->GetSdrModel(); - if (mpModel != NULL) + if (mpModel != nullptr) mpPage = mpModel->GetPage( 0 ); mpView = mpControl->GetSdrView(); - if( mpModel == NULL || mpPage == NULL || mpView == NULL ) + if( mpModel == nullptr || mpPage == nullptr || mpView == nullptr ) { mbDisposed = true; // Set all the pointers to NULL just in case they are used as // a disposed flag. - mpModel = NULL; - mpPage = NULL; - mpView = NULL; + mpModel = nullptr; + mpPage = nullptr; + mpView = nullptr; } } @@ -201,11 +201,11 @@ Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleAt Point aPnt( rPoint.X, rPoint.Y ); mpControl->PixelToLogic( aPnt ); - SdrObject* pObj = 0; + SdrObject* pObj = nullptr; if(mpView && mpView->GetSdrPageView()) { - pObj = SdrObjListPrimitiveHit(*mpPage, aPnt, 1, *mpView->GetSdrPageView(), 0, false); + pObj = SdrObjListPrimitiveHit(*mpPage, aPnt, 1, *mpView->GetSdrPageView(), nullptr, false); } if( pObj ) @@ -265,7 +265,7 @@ sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleChildCount() thro { ::SolarMutexGuard aGuard; - if( NULL == mpPage ) + if( nullptr == mpPage ) throw DisposedException(); return mpPage->GetObjCount(); @@ -279,7 +279,7 @@ SdrObject* SvxGraphCtrlAccessibleContext::getSdrObject( sal_Int32 nIndex ) { ::SolarMutexGuard aGuard; - if( NULL == mpPage ) + if( nullptr == mpPage ) throw DisposedException(); if( (nIndex < 0) || ( static_cast<size_t>(nIndex) >= mpPage->GetObjCount() ) ) @@ -535,7 +535,7 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::selectAccessibleChild( sal_Int32 nI { ::SolarMutexGuard aGuard; - if( NULL == mpView ) + if( nullptr == mpView ) throw DisposedException(); SdrObject* pObj = getSdrObject( nIndex ); @@ -550,7 +550,7 @@ sal_Bool SAL_CALL SvxGraphCtrlAccessibleContext::isAccessibleChildSelected( sal_ { ::SolarMutexGuard aGuard; - if( NULL == mpView ) + if( nullptr == mpView ) throw DisposedException(); return mpView->IsObjMarked( getSdrObject( nIndex ) ); @@ -562,7 +562,7 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::clearAccessibleSelection() throw( R { ::SolarMutexGuard aGuard; - if( NULL == mpView ) + if( nullptr == mpView ) throw DisposedException(); mpView->UnmarkAllObj(); @@ -574,7 +574,7 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::selectAllAccessibleChildren() throw { ::SolarMutexGuard aGuard; - if( NULL == mpView ) + if( nullptr == mpView ) throw DisposedException(); mpView->MarkAllObj(); @@ -586,7 +586,7 @@ sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getSelectedAccessibleChildCoun { ::SolarMutexGuard aGuard; - if( NULL == mpView ) + if( nullptr == mpView ) throw DisposedException(); const SdrMarkList& rList = mpView->GetMarkedObjectList(); @@ -661,19 +661,19 @@ void SvxGraphCtrlAccessibleContext::setModelAndView ( ::SolarMutexGuard aGuard; mpModel = pModel; - if (mpModel != NULL) + if (mpModel != nullptr) mpPage = mpModel->GetPage( 0 ); mpView = pView; - if (mpModel == NULL || mpPage == NULL || mpView == NULL) + if (mpModel == nullptr || mpPage == nullptr || mpView == nullptr) { mbDisposed = true; // Set all the pointers to NULL just in case they are used as // a disposed flag. - mpModel = NULL; - mpPage = NULL; - mpView = NULL; + mpModel = nullptr; + mpPage = nullptr; + mpView = nullptr; } maTreeInfo.SetSdrView (mpView); @@ -692,9 +692,9 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::disposing() mbDisposed = true; - mpControl = NULL; // object dies with representation - mpView = NULL; - mpPage = NULL; + mpControl = nullptr; // object dies with representation + mpView = nullptr; + mpPage = nullptr; { ShapesMapType::iterator I; @@ -746,13 +746,13 @@ Rectangle SvxGraphCtrlAccessibleContext::GetBoundingBox() throw( RuntimeExceptio Rectangle aBounds ( 0, 0, 0, 0 ); vcl::Window* pWindow = mpControl; - if (pWindow != NULL) + if (pWindow != nullptr) { - aBounds = pWindow->GetWindowExtentsRelative (NULL); + aBounds = pWindow->GetWindowExtentsRelative (nullptr); vcl::Window* pParent = pWindow->GetAccessibleParentWindow(); - if (pParent != NULL) + if (pParent != nullptr) { - Rectangle aParentRect = pParent->GetWindowExtentsRelative (NULL); + Rectangle aParentRect = pParent->GetWindowExtentsRelative (nullptr); aBounds -= aParentRect.TopLeft(); } } @@ -830,7 +830,7 @@ Point SvxGraphCtrlAccessibleContext::LogicToPixel (const Point& rPoint) const { if( mpControl ) { - Rectangle aBBox(mpControl->GetWindowExtentsRelative(NULL)); + Rectangle aBBox(mpControl->GetWindowExtentsRelative(nullptr)); return mpControl->LogicToPixel (rPoint) + aBBox.TopLeft(); } else |