diff options
Diffstat (limited to 'sd/source/ui/annotations/annotationtag.cxx')
-rw-r--r-- | sd/source/ui/annotations/annotationtag.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sd/source/ui/annotations/annotationtag.cxx b/sd/source/ui/annotations/annotationtag.cxx index 7fdfec5dd74c..0c3638f0db2f 100644 --- a/sd/source/ui/annotations/annotationtag.cxx +++ b/sd/source/ui/annotations/annotationtag.cxx @@ -214,7 +214,7 @@ void AnnotationHdl::CreateB2dIAObject() rtl::Reference< sdr::overlay::OverlayManager > xManager = rPageWindow.GetOverlayManager(); if(rPaintWindow.OutputToWindow() && xManager.is() ) { - sdr::overlay::OverlayObject* pOverlayObject = 0; + sdr::overlay::OverlayObject* pOverlayObject = nullptr; // animate focused handles if(bFocused) @@ -255,8 +255,8 @@ AnnotationTag::AnnotationTag( AnnotationManagerImpl& rManager, ::sd::View& rView , maColor( rColor ) , mnIndex( nIndex ) , mrFont( rFont ) -, mnClosePopupEvent( 0 ) -, mpListenWindow( 0 ) +, mnClosePopupEvent( nullptr ) +, mpListenWindow( nullptr ) { } @@ -479,7 +479,7 @@ void AnnotationTag::disposing() if( mnClosePopupEvent ) { Application::RemoveUserEvent( mnClosePopupEvent ); - mnClosePopupEvent = 0; + mnClosePopupEvent = nullptr; } mxAnnotation.clear(); @@ -632,8 +632,8 @@ IMPL_LINK_TYPED(AnnotationTag, WindowEventHandler, VclWindowEvent&, rEvent, void { // if we stop pressing the button without a mouse move we open the popup mpListenWindow->RemoveEventListener( LINK(this, AnnotationTag, WindowEventHandler)); - mpListenWindow = 0; - if( mpAnnotationWindow.get() == 0 ) + mpListenWindow = nullptr; + if( mpAnnotationWindow.get() == nullptr ) OpenPopup(false); } break; @@ -641,7 +641,7 @@ IMPL_LINK_TYPED(AnnotationTag, WindowEventHandler, VclWindowEvent&, rEvent, void { // if we move the mouse after a button down we wan't to start draging mpListenWindow->RemoveEventListener( LINK(this, AnnotationTag, WindowEventHandler)); - mpListenWindow = 0; + mpListenWindow = nullptr; SdrHdl* pHdl = mrView.PickHandle(maMouseDownPos); if( pHdl ) @@ -652,12 +652,12 @@ IMPL_LINK_TYPED(AnnotationTag, WindowEventHandler, VclWindowEvent&, rEvent, void rtl::Reference< AnnotationTag > xTag( this ); SdrDragMethod* pDragMethod = new AnnotationDragMove( mrView, xTag ); - mrView.BegDragObj(maMouseDownPos, NULL, pHdl, nDrgLog, pDragMethod ); + mrView.BegDragObj(maMouseDownPos, nullptr, pHdl, nDrgLog, pDragMethod ); } } break; case VCLEVENT_OBJECT_DYING: - mpListenWindow = 0; + mpListenWindow = nullptr; break; } } @@ -666,7 +666,7 @@ IMPL_LINK_TYPED(AnnotationTag, WindowEventHandler, VclWindowEvent&, rEvent, void IMPL_LINK_NOARG_TYPED(AnnotationTag, ClosePopupHdl, void*, void) { - mnClosePopupEvent = 0; + mnClosePopupEvent = nullptr; ClosePopup(); } |