[Libreoffice-commits] .: vcl/inc vcl/source
Michael Meeks
michael at kemper.freedesktop.org
Mon Jul 16 03:46:54 PDT 2012
vcl/inc/svdata.hxx | 1
vcl/source/app/help.cxx | 2 -
vcl/source/app/svapp.cxx | 2 -
vcl/source/control/button.cxx | 18 +++++++-------
vcl/source/control/ctrl.cxx | 4 +--
vcl/source/control/lstbox.cxx | 2 -
vcl/source/window/dialog.cxx | 10 +++----
vcl/source/window/dndevdis.cxx | 2 -
vcl/source/window/dockwin.cxx | 2 -
vcl/source/window/menu.cxx | 6 ++--
vcl/source/window/syswin.cxx | 2 -
vcl/source/window/toolbox.cxx | 8 +++---
vcl/source/window/toolbox2.cxx | 6 ++--
vcl/source/window/window.cxx | 40 +++++++++++++++----------------
vcl/source/window/window2.cxx | 2 -
vcl/source/window/winproc.cxx | 52 ++++++++++++++++++++---------------------
16 files changed, 79 insertions(+), 80 deletions(-)
New commits:
commit 8a768fe2d780bdcb60c0dc0c4bc38410052233a4
Author: Jesso Clarence Murugan <developer.jesso at gmail.com>
Date: Mon Jul 16 12:18:02 2012 +0300
Replaced all calls to deprecated function ImplDelData::IsDelete()
Deleted the function ImplDelData::IsDelete() and replaced all calls
to it with calls to ImplDelData::IsDead() directly. IsDelete () function
itself was only a simple wrapper to IsDead () (and mentioned as deprecated)
Change-Id: I71baf68801219cfbe2d2dc41d6bd5e419b9b4a87
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
index ef30625..c0b8226 100644
--- a/vcl/inc/svdata.hxx
+++ b/vcl/inc/svdata.hxx
@@ -431,7 +431,6 @@ struct ImplDelData
DBG_ASSERT( mbDel == sal_False, "object deleted while in use !" );
return (mbDel!=sal_False);
}
- sal_Bool /*deprecated */IsDelete() const { return (sal_Bool)IsDead(); }
private:
void AttachToWindow( const Window* );
diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx
index 48881ba..c57cb74 100644
--- a/vcl/source/app/help.cxx
+++ b/vcl/source/app/help.cxx
@@ -400,7 +400,7 @@ void HelpTextWindow::ImplShow()
{
ImplDelData aDogTag( this );
Show( sal_True, SHOW_NOACTIVATE );
- if( !aDogTag.IsDelete() )
+ if( !aDogTag.IsDead() )
Update();
}
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 3611f43..c78bb97 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -1024,7 +1024,7 @@ void Application::RemoveUserEvent( sal_uLong nUserEvent )
if ( pSVEvent->mpWindow )
{
- if( ! pSVEvent->maDelData.IsDelete() )
+ if( ! pSVEvent->maDelData.IsDead() )
pSVEvent->mpWindow->ImplRemoveDel( &(pSVEvent->maDelData) );
pSVEvent->mpWindow = NULL;
}
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 9ba7e8f..3dd6097 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -2346,7 +2346,7 @@ void RadioButton::ImplUncheckAllOther()
ImplDelData aDelData;
pWindow->ImplAddDel( &aDelData );
((RadioButton*)pWindow)->SetState( sal_False );
- if ( aDelData.IsDelete() )
+ if ( aDelData.IsDead() )
return;
pWindow->ImplRemoveDel( &aDelData );
}
@@ -2376,7 +2376,7 @@ void RadioButton::ImplUncheckAllOther()
ImplDelData aDelData;
pWindow->ImplAddDel( &aDelData );
((RadioButton*)pWindow)->SetState( sal_False );
- if ( aDelData.IsDelete() )
+ if ( aDelData.IsDead() )
return;
pWindow->ImplRemoveDel( &aDelData );
}
@@ -2401,18 +2401,18 @@ void RadioButton::ImplCallClick( sal_Bool bGrabFocus, sal_uInt16 nFocusFlags )
ImplAddDel( &aDelData );
if ( mbRadioCheck )
ImplUncheckAllOther();
- if ( aDelData.IsDelete() )
+ if ( aDelData.IsDead() )
return;
if ( bGrabFocus )
ImplGrabFocus( nFocusFlags );
- if ( aDelData.IsDelete() )
+ if ( aDelData.IsDead() )
return;
if ( mbStateChanged )
Toggle();
- if ( aDelData.IsDelete() )
+ if ( aDelData.IsDead() )
return;
Click();
- if ( aDelData.IsDelete() )
+ if ( aDelData.IsDead() )
return;
ImplRemoveDel( &aDelData );
mbStateChanged = sal_False;
@@ -2831,11 +2831,11 @@ void RadioButton::Check( sal_Bool bCheck )
ImplDelData aDelData;
ImplAddDel( &aDelData );
StateChanged( STATE_CHANGE_STATE );
- if ( aDelData.IsDelete() )
+ if ( aDelData.IsDead() )
return;
if ( bCheck && mbRadioCheck )
ImplUncheckAllOther();
- if ( aDelData.IsDelete() )
+ if ( aDelData.IsDead() )
return;
Toggle();
ImplRemoveDel( &aDelData );
@@ -3351,7 +3351,7 @@ void CheckBox::ImplCheck()
ImplInvalidateOrDrawCheckBoxState();
if( ! (GetStyle() & WB_EARLYTOGGLE) )
Toggle();
- if ( aDelData.IsDelete() )
+ if ( aDelData.IsDead() )
return;
ImplRemoveDel( &aDelData );
Click();
diff --git a/vcl/source/control/ctrl.cxx b/vcl/source/control/ctrl.cxx
index cd1c7df..5039c2b 100644
--- a/vcl/source/control/ctrl.cxx
+++ b/vcl/source/control/ctrl.cxx
@@ -371,11 +371,11 @@ sal_Bool Control::ImplCallEventListenersAndHandler( sal_uLong nEvent, const Lin
ImplAddDel( &aCheckDelete );
ImplCallEventListeners( nEvent );
- if ( !aCheckDelete.IsDelete() )
+ if ( !aCheckDelete.IsDead() )
{
rHandler.Call( pCaller );
- if ( !aCheckDelete.IsDelete() )
+ if ( !aCheckDelete.IsDead() )
{
ImplRemoveDel( &aCheckDelete );
return sal_False;
diff --git a/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx
index bf12e2d..6a36f00 100644
--- a/vcl/source/control/lstbox.cxx
+++ b/vcl/source/control/lstbox.cxx
@@ -348,7 +348,7 @@ IMPL_LINK_NOARG(ListBox, ImplPopupModeEndHdl)
ImplDelData aCheckDelete;
ImplAddDel( &aCheckDelete );
Select();
- if ( aCheckDelete.IsDelete() )
+ if ( aCheckDelete.IsDead() )
return 0;
ImplRemoveDel( &aCheckDelete );
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index c284d34..bc7b73e 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -519,7 +519,7 @@ sal_Bool Dialog::Close()
return sal_False;
}
//liuchen 2009-7-22
- if ( aDelData.IsDelete() )
+ if ( aDelData.IsDead() )
return sal_False;
ImplRemoveDel( &aDelData );
@@ -543,7 +543,7 @@ sal_Bool Dialog::Close()
else
bRet = sal_False;
}
- if ( aDelData.IsDelete() )
+ if ( aDelData.IsDead() )
return sal_True;
ImplRemoveDel( &aDelData );
return bRet;
@@ -677,7 +677,7 @@ short Dialog::Execute()
// Yield util EndDialog is called or dialog gets destroyed
// (the latter should not happen, but better safe than sorry
- while ( !aDelData.IsDelete() && mbInExecute )
+ while ( !aDelData.IsDead() && mbInExecute )
Application::Yield();
ImplEndExecuteModal();
@@ -685,13 +685,13 @@ short Dialog::Execute()
#ifdef DBG_UTIL
if( pDialogParent )
{
- if( ! aParentDelData.IsDelete() )
+ if( ! aParentDelData.IsDead() )
pDialogParent->ImplRemoveDel( &aParentDelData );
else
OSL_FAIL( "Dialog::Execute() - Parent of dialog destroyed in Execute()" );
}
#endif
- if ( !aDelData.IsDelete() )
+ if ( !aDelData.IsDead() )
ImplRemoveDel( &aDelData );
#ifdef DBG_UTIL
else
diff --git a/vcl/source/window/dndevdis.cxx b/vcl/source/window/dndevdis.cxx
index fc7c8fc..b6d3986 100644
--- a/vcl/source/window/dndevdis.cxx
+++ b/vcl/source/window/dndevdis.cxx
@@ -451,7 +451,7 @@ sal_Int32 DNDEventDispatcher::fireDropEvent( Window *pWindow,
xContext, nDropAction, relLoc.X(), relLoc.Y(), nSourceActions, xTransferable );
}
- if ( !aDelData.IsDelete() )
+ if ( !aDelData.IsDead() )
{
pWindow->ImplRemoveDel( &aDelData );
// release UI lock
diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx
index a98b994..ada5546 100644
--- a/vcl/source/window/dockwin.cxx
+++ b/vcl/source/window/dockwin.cxx
@@ -713,7 +713,7 @@ sal_Bool DockingWindow::Close()
ImplDelData aDelData;
ImplAddDel( &aDelData );
ImplCallEventListeners( VCLEVENT_WINDOW_CLOSE );
- if ( aDelData.IsDelete() )
+ if ( aDelData.IsDead() )
return sal_False;
ImplRemoveDel( &aDelData );
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 3b4ac0d..d39ac24 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -3624,7 +3624,7 @@ sal_uInt16 PopupMenu::ImplExecute( Window* pW, const Rectangle& rRect, sal_uLong
Activate();
bInCallback = sal_False;
- if ( aDelData.IsDelete() )
+ if ( aDelData.IsDead() )
return 0; // Error
pW->ImplRemoveDel( &aDelData );
@@ -3766,7 +3766,7 @@ sal_uInt16 PopupMenu::ImplExecute( Window* pW, const Rectangle& rRect, sal_uLong
if( ! aModalWinDel.IsDead() )
pW->ImplDecModalCount();
- if ( !aDelData.IsDelete() )
+ if ( !aDelData.IsDead() )
pWin->ImplRemoveDel( &aDelData );
else
return 0;
@@ -4980,7 +4980,7 @@ void MenuFloatingWindow::KeyInput( const KeyEvent& rKEvent )
}
}
// #105474# check if menu window was not destroyed
- if ( !aDelData.IsDelete() )
+ if ( !aDelData.IsDead() )
{
ImplRemoveDel( &aDelData );
bKeyInput = sal_False;
diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx
index a7a8ce0..0f356a9 100644
--- a/vcl/source/window/syswin.cxx
+++ b/vcl/source/window/syswin.cxx
@@ -192,7 +192,7 @@ sal_Bool SystemWindow::Close()
ImplDelData aDelData;
ImplAddDel( &aDelData );
ImplCallEventListeners( VCLEVENT_WINDOW_CLOSE );
- if ( aDelData.IsDelete() )
+ if ( aDelData.IsDead() )
return sal_False;
ImplRemoveDel( &aDelData );
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index f0d0936..9d3e115 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -3579,7 +3579,7 @@ sal_Bool ToolBox::ImplHandleMouseButtonUp( const MouseEvent& rMEvt, sal_Bool bCa
ImplDelData aDelData;
ImplAddDel( &aDelData );
Select();
- if ( aDelData.IsDelete() )
+ if ( aDelData.IsDead() )
return sal_True;
ImplRemoveDel( &aDelData );
}
@@ -4107,7 +4107,7 @@ void ToolBox::Tracking( const TrackingEvent& rTEvt )
else
ImplHandleMouseMove( rTEvt.GetMouseEvent(), rTEvt.IsTrackingRepeat() );
- if ( aDelData.IsDelete() )
+ if ( aDelData.IsDead() )
// toolbox was deleted
return;
ImplRemoveDel( &aDelData );
@@ -4992,7 +4992,7 @@ sal_Bool ToolBox::ImplActivateItem( KeyCode aKeyCode )
ImplDelData aDelData;
ImplAddDel( &aDelData );
Select();
- if ( aDelData.IsDelete() )
+ if ( aDelData.IsDead() )
return bRet;
ImplRemoveDel( &aDelData );
@@ -5234,7 +5234,7 @@ void ToolBox::KeyInput( const KeyEvent& rKEvt )
}
}
- if ( aDelData.IsDelete() )
+ if ( aDelData.IsDead() )
return;
ImplRemoveDel( &aDelData );
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index ff2c3bb..0a16c9d 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -524,7 +524,7 @@ void ToolBox::Select()
ImplCallEventListeners( VCLEVENT_TOOLBOX_SELECT );
maSelectHdl.Call( this );
- if ( aDelData.IsDelete() )
+ if ( aDelData.IsDead() )
return;
ImplRemoveDel( &aDelData );
@@ -2047,7 +2047,7 @@ void ToolBox::ImplExecuteCustomMenu()
sal_uInt16 uId = GetMenu()->Execute( pWin, Rectangle( ImplGetPopupPosition( aMenuRect, Size() ), Size() ),
POPUPMENU_EXECUTE_DOWN | POPUPMENU_NOMOUSEUPCLOSE );
- if ( aDelData.IsDelete() )
+ if ( aDelData.IsDead() )
return;
ImplRemoveDel( &aDelData );
@@ -2055,7 +2055,7 @@ void ToolBox::ImplExecuteCustomMenu()
GetMenu()->RemoveEventListener( LINK( this, ToolBox, ImplCustomMenuListener ) );
if( bBorderDel )
{
- if( aBorderDel.IsDelete() )
+ if( aBorderDel.IsDead() )
return;
pWin->ImplRemoveDel( &aBorderDel );
}
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 9c45e8b..a39d855 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -4010,7 +4010,7 @@ void Window::ImplGrabFocus( sal_uInt16 nFlags )
}
// call Get- and LoseFocus
- if ( pOldFocusWindow && ! aOldFocusDel.IsDelete() )
+ if ( pOldFocusWindow && ! aOldFocusDel.IsDead() )
{
if ( pOldFocusWindow->IsTracking() &&
(pSVData->maWinData.mnTrackFlags & STARTTRACK_FOCUSCANCEL) )
@@ -4040,15 +4040,15 @@ void Window::ImplGrabFocus( sal_uInt16 nFlags )
// notify the new focus window so it can restore the inner focus
// eg, toolboxes can select their recent active item
if( pOldFocusWindow &&
- ! aOldFocusDel.IsDelete() &&
+ ! aOldFocusDel.IsDead() &&
( pOldFocusWindow->GetDialogControlFlags() & WINDOW_DLGCTRL_FLOATWIN_POPUPMODEEND_CANCEL ) )
mpWindowImpl->mnGetFocusFlags |= GETFOCUS_FLOATWIN_POPUPMODEEND_CANCEL;
NotifyEvent aNEvt( EVENT_GETFOCUS, this );
- if ( !ImplCallPreNotify( aNEvt ) && !aDogTag.IsDelete() )
+ if ( !ImplCallPreNotify( aNEvt ) && !aDogTag.IsDead() )
GetFocus();
- if( !aDogTag.IsDelete() )
- ImplCallActivateListeners( (pOldFocusWindow && ! aOldFocusDel.IsDelete()) ? pOldFocusWindow : NULL );
- if( !aDogTag.IsDelete() )
+ if( !aDogTag.IsDead() )
+ ImplCallActivateListeners( (pOldFocusWindow && ! aOldFocusDel.IsDead()) ? pOldFocusWindow : NULL );
+ if( !aDogTag.IsDead() )
{
mpWindowImpl->mnGetFocusFlags = 0;
mpWindowImpl->mbInFocusHdl = sal_False;
@@ -4760,7 +4760,7 @@ void Window::GetFocus()
{
ImplDelData aDogtag( this );
mpWindowImpl->mpLastFocusWindow->GrabFocus();
- if( aDogtag.IsDelete() )
+ if( aDogtag.IsDead() )
return;
}
@@ -4967,7 +4967,7 @@ void Window::ImplNotifyKeyMouseCommandEventListeners( NotifyEvent& rNEvt )
ImplCallEventListeners( VCLEVENT_WINDOW_KEYUP, (void*)rNEvt.GetKeyEvent() );
}
- if ( aDelData.IsDelete() )
+ if ( aDelData.IsDead() )
return;
ImplRemoveDel( &aDelData );
@@ -5168,12 +5168,12 @@ void Window::CallEventListeners( sal_uLong nEvent, void* pData )
ImplGetSVData()->mpApp->ImplCallEventListeners( &aEvent );
- if ( aDelData.IsDelete() )
+ if ( aDelData.IsDead() )
return;
mpWindowImpl->maEventListeners.Call( &aEvent );
- if ( aDelData.IsDelete() )
+ if ( aDelData.IsDead() )
return;
ImplRemoveDel( &aDelData );
@@ -5185,7 +5185,7 @@ void Window::CallEventListeners( sal_uLong nEvent, void* pData )
pWindow->mpWindowImpl->maChildEventListeners.Call( &aEvent );
- if ( aDelData.IsDelete() )
+ if ( aDelData.IsDead() )
return;
pWindow->ImplRemoveDel( &aDelData );
@@ -6174,7 +6174,7 @@ void Window::Show( sal_Bool bVisible, sal_uInt16 nFlags )
if ( !bVisible )
{
ImplHideAllOverlaps();
- if( aDogTag.IsDelete() )
+ if( aDogTag.IsDead() )
return;
if ( mpWindowImpl->mpBorderWindow )
@@ -6211,7 +6211,7 @@ void Window::Show( sal_Bool bVisible, sal_uInt16 nFlags )
aInvRegion = mpWindowImpl->maWinClipRegion;
}
- if( aDogTag.IsDelete() )
+ if( aDogTag.IsDead() )
return;
bRealVisibilityChanged = mpWindowImpl->mbReallyVisible;
@@ -6342,7 +6342,7 @@ void Window::Show( sal_Bool bVisible, sal_uInt16 nFlags )
mpWindowImpl->mbPaintFrame = sal_True;
sal_Bool bNoActivate = (nFlags & (SHOW_NOACTIVATE|SHOW_NOFOCUSCHANGE)) ? sal_True : sal_False;
mpWindowImpl->mpFrame->Show( sal_True, bNoActivate );
- if( aDogTag.IsDelete() )
+ if( aDogTag.IsDead() )
return;
// Query the correct size of the window, if we are waiting for
@@ -6356,7 +6356,7 @@ void Window::Show( sal_Bool bVisible, sal_uInt16 nFlags )
}
}
- if( aDogTag.IsDelete() )
+ if( aDogTag.IsDead() )
return;
#if OSL_DEBUG_LEVEL > 0
@@ -6369,7 +6369,7 @@ void Window::Show( sal_Bool bVisible, sal_uInt16 nFlags )
ImplShowAllOverlaps();
}
- if( aDogTag.IsDelete() )
+ if( aDogTag.IsDead() )
return;
// invalidate all saved backgrounds
if ( mpWindowImpl->mpFrameData->mpFirstBackWin )
@@ -6382,7 +6382,7 @@ void Window::Show( sal_Bool bVisible, sal_uInt16 nFlags )
// now only notify with a NULL data pointer, for all other clients except the access bridge.
if ( !bRealVisibilityChanged )
ImplCallEventListeners( mpWindowImpl->mbVisible ? VCLEVENT_WINDOW_SHOW : VCLEVENT_WINDOW_HIDE, NULL );
- if( aDogTag.IsDelete() )
+ if( aDogTag.IsDead() )
return;
// #107575#, if a floating windows is shown that grabs the focus, we have to notify the toolkit about it
@@ -6420,7 +6420,7 @@ Size Window::GetSizePixel() const
ImplDelData aDogtag( this );
mpWindowImpl->mpFrameData->maResizeTimer.Stop();
mpWindowImpl->mpFrameData->maResizeTimer.GetTimeoutHdl().Call( NULL );
- if( aDogtag.IsDelete() )
+ if( aDogtag.IsDead() )
return Size(0,0);
}
@@ -8109,7 +8109,7 @@ void Window::ImplCallDeactivateListeners( Window *pNew )
{
ImplDelData aDogtag( this );
ImplCallEventListeners( VCLEVENT_WINDOW_DEACTIVATE );
- if( aDogtag.IsDelete() )
+ if( aDogtag.IsDead() )
return;
// #100759#, avoid walking the wrong frame's hierarchy
@@ -8128,7 +8128,7 @@ void Window::ImplCallActivateListeners( Window *pOld )
{
ImplDelData aDogtag( this );
ImplCallEventListeners( VCLEVENT_WINDOW_ACTIVATE, pOld );
- if( aDogtag.IsDelete() )
+ if( aDogtag.IsDead() )
return;
// #106298# revoke the change for 105369, because this change
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index bea09c6..c1445d1 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -832,7 +832,7 @@ sal_Bool Window::EndSaveFocus( sal_uIntPtr nSaveId, sal_Bool bRestore )
{
sal_Bool bOK = sal_True;
ImplFocusDelData* pDelData = (ImplFocusDelData*)(void*)nSaveId;
- if ( !pDelData->IsDelete() )
+ if ( !pDelData->IsDead() )
{
pDelData->mpFocusWin->ImplRemoveDel( pDelData );
if ( bRestore )
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index b5096ab..e35015f 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -300,17 +300,17 @@ static sal_Bool ImplCallCommand( Window* pChild, sal_uInt16 nEvt, void* pData =
NotifyEvent aNCmdEvt( EVENT_COMMAND, pChild, &aCEvt );
ImplDelData aDelData( pChild );
sal_Bool bPreNotify = (ImplCallPreNotify( aNCmdEvt ) != 0);
- if ( aDelData.IsDelete() )
+ if ( aDelData.IsDead() )
return sal_False;
if ( !bPreNotify )
{
pChild->ImplGetWindowImpl()->mbCommand = sal_False;
pChild->Command( aCEvt );
- if( aDelData.IsDelete() )
+ if( aDelData.IsDead() )
return sal_False;
pChild->ImplNotifyKeyMouseCommandEventListeners( aNCmdEvt );
- if ( aDelData.IsDelete() )
+ if ( aDelData.IsDead() )
return sal_False;
if ( pChild->ImplGetWindowImpl()->mbCommand )
return sal_True;
@@ -336,7 +336,7 @@ static long ContextMenuEventLink( void* pCEvent, void* )
{
ContextMenuEvent* pEv = (ContextMenuEvent*)pCEvent;
- if( ! pEv->aDelData.IsDelete() )
+ if( ! pEv->aDelData.IsDead() )
{
pEv->pWindow->ImplRemoveDel( &pEv->aDelData );
ImplCallCommand( pEv->pWindow, COMMAND_CONTEXTMENU, NULL, sal_True, &pEv->aChildPos );
@@ -399,7 +399,7 @@ long ImplHandleMouseEvent( Window* pWindow, sal_uInt16 nSVEvent, sal_Bool bMouse
ImplDestroyHelpWindow( true );
- if ( aDelData.IsDelete() )
+ if ( aDelData.IsDead() )
return 1; // pWindow is dead now - avoid crash! (#122045#)
}
}
@@ -631,7 +631,7 @@ long ImplHandleMouseEvent( Window* pWindow, sal_uInt16 nSVEvent, sal_Bool bMouse
{
pMouseMoveWin->MouseMove( aMLeaveEvt );
// #82968#
- if( !aDelData.IsDelete() )
+ if( !aDelData.IsDead() )
aNLeaveEvt.GetWindow()->ImplNotifyKeyMouseCommandEventListeners( aNLeaveEvt );
}
@@ -640,12 +640,12 @@ long ImplHandleMouseEvent( Window* pWindow, sal_uInt16 nSVEvent, sal_Bool bMouse
if ( pChild )
{
- if ( aDelData2.IsDelete() )
+ if ( aDelData2.IsDead() )
pChild = NULL;
else
pChild->ImplRemoveDel( &aDelData2 );
}
- if ( aDelData.IsDelete() )
+ if ( aDelData.IsDead() )
return 1;
pMouseMoveWin->ImplRemoveDel( &aDelData );
}
@@ -719,7 +719,7 @@ long ImplHandleMouseEvent( Window* pWindow, sal_uInt16 nSVEvent, sal_Bool bMouse
pChild->ImplAddDel( &aDelData );
if ( ImplHandleMouseFloatMode( pChild, aMousePos, nCode, nSVEvent, bMouseLeave ) )
{
- if ( !aDelData.IsDelete() )
+ if ( !aDelData.IsDead() )
{
pChild->ImplRemoveDel( &aDelData );
pChild->ImplGetFrameData()->mbStartDragCalled = sal_True;
@@ -747,11 +747,11 @@ long ImplHandleMouseEvent( Window* pWindow, sal_uInt16 nSVEvent, sal_Bool bMouse
if( !pSVData->maWinData.mpFirstFloat && // totop for floating windows in popup would change the focus and would close them immediately
!(pChild->ImplGetFrameWindow()->GetStyle() & WB_OWNERDRAWDECORATION) ) // ownerdrawdecorated windows must never grab focus
pChild->ToTop();
- if ( aDelData.IsDelete() )
+ if ( aDelData.IsDead() )
return 1;
}
- if ( ImplCallPreNotify( aNEvt ) || aDelData.IsDelete() )
+ if ( ImplCallPreNotify( aNEvt ) || aDelData.IsDead() )
nRet = 1;
else
{
@@ -762,7 +762,7 @@ long ImplHandleMouseEvent( Window* pWindow, sal_uInt16 nSVEvent, sal_Bool bMouse
{
TrackingEvent aTEvt( aMEvt );
pChild->Tracking( aTEvt );
- if ( !aDelData.IsDelete() )
+ if ( !aDelData.IsDead() )
{
// When ScrollRepeat, we restart the timer
if ( pSVData->maWinData.mpTrackTimer &&
@@ -779,7 +779,7 @@ long ImplHandleMouseEvent( Window* pWindow, sal_uInt16 nSVEvent, sal_Bool bMouse
(pChild->GetSettings().GetMouseSettings().GetOptions() & MOUSE_OPTION_AUTOFOCUS) )
pChild->ToTop( TOTOP_NOGRABFOCUS );
- if( aDelData.IsDelete() )
+ if( aDelData.IsDead() )
bCallHelpRequest = sal_False;
else
{
@@ -819,11 +819,11 @@ long ImplHandleMouseEvent( Window* pWindow, sal_uInt16 nSVEvent, sal_Bool bMouse
}
// #82968#
- if ( !aDelData.IsDelete() )
+ if ( !aDelData.IsDead() )
aNEvt.GetWindow()->ImplNotifyKeyMouseCommandEventListeners( aNEvt );
}
- if ( aDelData.IsDelete() )
+ if ( aDelData.IsDead() )
return 1;
@@ -1105,7 +1105,7 @@ static long ImplHandleKey( Window* pWindow, sal_uInt16 nSVEvent,
sal_Bool bKeyPreNotify = (ImplCallPreNotify( aNotifyEvt ) != 0);
long nRet = 1;
- if ( !bKeyPreNotify && !aDelData.IsDelete() )
+ if ( !bKeyPreNotify && !aDelData.IsDead() )
{
if ( nSVEvent == EVENT_KEYINPUT )
{
@@ -1118,11 +1118,11 @@ static long ImplHandleKey( Window* pWindow, sal_uInt16 nSVEvent,
pChild->KeyUp( aKeyEvt );
}
// #82968#
- if( !aDelData.IsDelete() )
+ if( !aDelData.IsDead() )
aNotifyEvt.GetWindow()->ImplNotifyKeyMouseCommandEventListeners( aNotifyEvt );
}
- if ( aDelData.IsDelete() )
+ if ( aDelData.IsDead() )
return 1;
pChild->ImplRemoveDel( &aDelData );
@@ -1216,7 +1216,7 @@ static long ImplHandleKey( Window* pWindow, sal_uInt16 nSVEvent,
KeyEvent aKEvt( (xub_Unicode)nCharCode, aKeyCode, nRepeat );
NotifyEvent aNEvt( nSVEvent, pChild, &aKEvt );
sal_Bool bPreNotify = (ImplCallPreNotify( aNEvt ) != 0);
- if ( aChildDelData.IsDelete() )
+ if ( aChildDelData.IsDead() )
return 1;
if ( !bPreNotify )
@@ -1232,9 +1232,9 @@ static long ImplHandleKey( Window* pWindow, sal_uInt16 nSVEvent,
pChild->KeyUp( aKEvt );
}
// #82968#
- if( !aChildDelData.IsDelete() )
+ if( !aChildDelData.IsDead() )
aNEvt.GetWindow()->ImplNotifyKeyMouseCommandEventListeners( aNEvt );
- if ( aChildDelData.IsDelete() )
+ if ( aChildDelData.IsDead() )
return 1;
}
@@ -1439,13 +1439,13 @@ static sal_Bool ImplCallWheelCommand( Window* pWindow, const Point& rPos,
NotifyEvent aNCmdEvt( EVENT_COMMAND, pWindow, &aCEvt );
ImplDelData aDelData( pWindow );
sal_Bool bPreNotify = (ImplCallPreNotify( aNCmdEvt ) != 0);
- if ( aDelData.IsDelete() )
+ if ( aDelData.IsDead() )
return sal_False;
if ( !bPreNotify )
{
pWindow->ImplGetWindowImpl()->mbCommand = sal_False;
pWindow->Command( aCEvt );
- if ( aDelData.IsDelete() )
+ if ( aDelData.IsDead() )
return sal_False;
if ( pWindow->ImplGetWindowImpl()->mbCommand )
return sal_True;
@@ -1464,7 +1464,7 @@ static long ImplHandleWheelEvent( Window* pWindow, const SalWheelMouseEvent& rEv
pSVData->maWinData.mpAutoScrollWin->EndAutoScroll();
if ( pSVData->maHelpData.mpHelpWin )
ImplDestroyHelpWindow( true );
- if( aDogTag.IsDelete() )
+ if( aDogTag.IsDead() )
return 0;
sal_uInt16 nMode;
@@ -1910,7 +1910,7 @@ static long DelayedCloseEventLink( void* pCEvent, void* )
{
DelayedCloseEvent* pEv = (DelayedCloseEvent*)pCEvent;
- if( ! pEv->aDelData.IsDelete() )
+ if( ! pEv->aDelData.IsDead() )
{
pEv->pWindow->ImplRemoveDel( &pEv->aDelData );
// dispatch to correct window type
@@ -1987,7 +1987,7 @@ static void ImplHandleUserEvent( ImplSVEvent* pSVEvent )
{
if ( pSVEvent )
{
- if ( pSVEvent->mbCall && !pSVEvent->maDelData.IsDelete() )
+ if ( pSVEvent->mbCall && !pSVEvent->maDelData.IsDead() )
{
if ( pSVEvent->mpWindow )
{
More information about the Libreoffice-commits
mailing list