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

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

Did a small change to bool Dialog::Close() in dialog.cxx file. Patch No. 2

Change-Id: I5268e77bef2225308e9d01831c7b09de19c3ded9
Reviewed-on: https://gerrit.libreoffice.org/21212Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarMichael Meeks <michael.meeks@collabora.com>
üst 08f0ef29
......@@ -728,12 +728,10 @@ void Dialog::DataChanged( const DataChangedEvent& rDCEvt )
bool Dialog::Close()
{
ImplDelData aDelData;
ImplAddDel( &aDelData );
VclPtr<vcl::Window> xWindow = this;
CallEventListeners( VCLEVENT_WINDOW_CLOSE );
if ( aDelData.IsDead() )
if ( xWindow->IsDisposed() )
return false;
ImplRemoveDel( &aDelData );
if ( mpWindowImpl->mxWindowPeer.is() && IsCreatedWithToolkit() && !IsInExecute() )
return false;
......@@ -743,7 +741,6 @@ bool Dialog::Close()
if ( !(GetStyle() & WB_CLOSEABLE) )
{
bool bRet = true;
ImplAddDel( &aDelData );
PushButton* pButton = ImplGetCancelButton( this );
if ( pButton )
pButton->Click();
......@@ -755,9 +752,8 @@ bool Dialog::Close()
else
bRet = false;
}
if ( aDelData.IsDead() )
if ( xWindow->IsDisposed() )
return true;
ImplRemoveDel( &aDelData );
return bRet;
}
......
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