Kaydet (Commit) 269f953a authored tarafından Ras-al-Ghul's avatar Ras-al-Ghul Kaydeden (comit) Michael Meeks

tdf#96888 Kill internal vcl dog-tags ...

This is a cleanup to https://gerrit.libreoffice.org/#/c/21230/

Change-Id: I3999c8af1b906105a448e61353a839237aec7098
Reviewed-on: https://gerrit.libreoffice.org/21276Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarMichael Meeks <michael.meeks@collabora.com>
üst 86d06c91
...@@ -2272,15 +2272,12 @@ void RadioButton::ImplUncheckAllOther() ...@@ -2272,15 +2272,12 @@ void RadioButton::ImplUncheckAllOther()
// iterate over radio button group and checked buttons // iterate over radio button group and checked buttons
for (auto aI = aGroup.begin(), aEnd = aGroup.end(); aI != aEnd; ++aI) for (auto aI = aGroup.begin(), aEnd = aGroup.end(); aI != aEnd; ++aI)
{ {
RadioButton *pWindow = *aI; VclPtr<RadioButton> pWindow = *aI;
if ( pWindow->IsChecked() ) if ( pWindow->IsChecked() )
{ {
ImplDelData aDelData;
pWindow->ImplAddDel( &aDelData );
pWindow->SetState( false ); pWindow->SetState( false );
if ( aDelData.IsDead() ) if ( pWindow->IsDisposed() )
return; return;
pWindow->ImplRemoveDel( &aDelData );
} }
// not inside if clause to always remove wrongly set WB_TABSTOPS // not inside if clause to always remove wrongly set WB_TABSTOPS
...@@ -2295,24 +2292,22 @@ void RadioButton::ImplCallClick( bool bGrabFocus, GetFocusFlags nFocusFlags ) ...@@ -2295,24 +2292,22 @@ void RadioButton::ImplCallClick( bool bGrabFocus, GetFocusFlags nFocusFlags )
mpWindowImpl->mnStyle |= WB_TABSTOP; mpWindowImpl->mnStyle |= WB_TABSTOP;
Invalidate(); Invalidate();
Update(); Update();
ImplDelData aDelData; VclPtr<vcl::Window> xWindow = this;
ImplAddDel( &aDelData );
if ( mbRadioCheck ) if ( mbRadioCheck )
ImplUncheckAllOther(); ImplUncheckAllOther();
if ( aDelData.IsDead() ) if ( xWindow->IsDisposed() )
return; return;
if ( bGrabFocus ) if ( bGrabFocus )
ImplGrabFocus( nFocusFlags ); ImplGrabFocus( nFocusFlags );
if ( aDelData.IsDead() ) if ( xWindow->IsDisposed() )
return; return;
if ( mbStateChanged ) if ( mbStateChanged )
Toggle(); Toggle();
if ( aDelData.IsDead() ) if ( xWindow->IsDisposed() )
return; return;
Click(); Click();
if ( aDelData.IsDead() ) if ( xWindow->IsDisposed() )
return; return;
ImplRemoveDel( &aDelData );
mbStateChanged = false; mbStateChanged = false;
} }
...@@ -2737,17 +2732,15 @@ void RadioButton::Check( bool bCheck ) ...@@ -2737,17 +2732,15 @@ void RadioButton::Check( bool bCheck )
if ( mbChecked != bCheck ) if ( mbChecked != bCheck )
{ {
mbChecked = bCheck; mbChecked = bCheck;
ImplDelData aDelData; VclPtr<vcl::Window> xWindow = this;
ImplAddDel( &aDelData );
CompatStateChanged( StateChangedType::State ); CompatStateChanged( StateChangedType::State );
if ( aDelData.IsDead() ) if ( xWindow->IsDisposed() )
return; return;
if ( bCheck && mbRadioCheck ) if ( bCheck && mbRadioCheck )
ImplUncheckAllOther(); ImplUncheckAllOther();
if ( aDelData.IsDead() ) if ( xWindow->IsDisposed() )
return; return;
Toggle(); Toggle();
ImplRemoveDel( &aDelData );
} }
} }
...@@ -3231,17 +3224,15 @@ void CheckBox::ImplCheck() ...@@ -3231,17 +3224,15 @@ void CheckBox::ImplCheck()
eNewState = TRISTATE_FALSE; eNewState = TRISTATE_FALSE;
meState = eNewState; meState = eNewState;
ImplDelData aDelData; VclPtr<vcl::Window> xWindow = this;
ImplAddDel( &aDelData );
if( (GetStyle() & WB_EARLYTOGGLE) ) if( (GetStyle() & WB_EARLYTOGGLE) )
Toggle(); Toggle();
Invalidate(); Invalidate();
Update(); Update();
if( ! (GetStyle() & WB_EARLYTOGGLE) ) if( ! (GetStyle() & WB_EARLYTOGGLE) )
Toggle(); Toggle();
if ( aDelData.IsDead() ) if ( xWindow->IsDisposed() )
return; return;
ImplRemoveDel( &aDelData );
Click(); Click();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment