diff options
Diffstat (limited to 'svx/source/svdraw/svdouno.cxx')
-rw-r--r-- | svx/source/svdraw/svdouno.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/svx/source/svdraw/svdouno.cxx b/svx/source/svdraw/svdouno.cxx index e5c95130c9c8..b68a5574eb6b 100644 --- a/svx/source/svdraw/svdouno.cxx +++ b/svx/source/svdraw/svdouno.cxx @@ -88,7 +88,7 @@ void SAL_CALL SdrControlEventListenerImpl::disposing( const css::lang::EventObje { if (pObj) { - pObj->xUnoControlModel = NULL; + pObj->xUnoControlModel = nullptr; } } @@ -118,7 +118,7 @@ namespace { OSL_PRECOND( _pObject, "lcl_ensureControlVisibility: no object -> no survival!" ); - SdrPageView* pPageView = _pView ? _pView->GetSdrPageView() : NULL; + SdrPageView* pPageView = _pView ? _pView->GetSdrPageView() : nullptr; DBG_ASSERT( pPageView, "lcl_ensureControlVisibility: no view found!" ); if ( !pPageView ) return; @@ -280,7 +280,7 @@ SdrUnoObj& SdrUnoObj::operator= (const SdrUnoObj& rObj) SdrRectObj::operator= (rObj); // release the reference to the current control model - SetUnoControlModel( NULL ); + SetUnoControlModel( nullptr ); aUnoControlModelTypeName = rObj.aUnoControlModelTypeName; aUnoControlTypeName = rObj.aUnoControlTypeName; @@ -359,7 +359,7 @@ bool SdrUnoObj::supportsFullDrag() const SdrObject* SdrUnoObj::getFullDragClone() const { - SdrObject* pRetval = 0; + SdrObject* pRetval = nullptr; static bool bHandleSpecial(false); if(bHandleSpecial) @@ -516,7 +516,7 @@ void SdrUnoObj::SetUnoControlModel( const uno::Reference< awt::XControlModel >& } // invalidate all ViewObject contacts - ViewContactOfUnoControl* pVC = NULL; + ViewContactOfUnoControl* pVC = nullptr; if ( impl_getViewContact( pVC ) ) { // flushViewObjectContacts() removes all existing VOCs for the local DrawHierarchy. This @@ -533,12 +533,12 @@ uno::Reference< awt::XControl > SdrUnoObj::GetUnoControl(const SdrView& _rView, SdrPageView* pPageView = _rView.GetSdrPageView(); OSL_ENSURE( pPageView && GetPage() == pPageView->GetPage(), "SdrUnoObj::GetUnoControl: This object is not displayed in that particular view!" ); if ( !pPageView || GetPage() != pPageView->GetPage() ) - return NULL; + return nullptr; SdrPageWindow* pPageWindow = pPageView->FindPageWindow( _rOut ); OSL_ENSURE( pPageWindow, "SdrUnoObj::GetUnoControl: did not find my SdrPageWindow!" ); if ( !pPageWindow ) - return NULL; + return nullptr; ViewObjectContact& rViewObjectContact( GetViewContact().GetViewObjectContact( pPageWindow->GetObjectContact() ) ); ViewObjectContactOfUnoControl* pUnoContact = dynamic_cast< ViewObjectContactOfUnoControl* >( &rViewObjectContact ); @@ -555,7 +555,7 @@ uno::Reference< awt::XControl > SdrUnoObj::GetTemporaryControlForWindow( { uno::Reference< awt::XControl > xControl; - ViewContactOfUnoControl* pVC = NULL; + ViewContactOfUnoControl* pVC = nullptr; if ( impl_getViewContact( pVC ) ) xControl = pVC->getTemporaryControlForWindow( _rWindow, _inout_ControlContainer ); @@ -568,7 +568,7 @@ bool SdrUnoObj::impl_getViewContact( ViewContactOfUnoControl*& _out_rpContact ) ViewContact& rViewContact( GetViewContact() ); _out_rpContact = dynamic_cast< ViewContactOfUnoControl* >( &rViewContact ); DBG_ASSERT( _out_rpContact, "SdrUnoObj::impl_getViewContact: could not find my ViewContact!" ); - return ( _out_rpContact != NULL ); + return ( _out_rpContact != nullptr ); } |