From 71c4a2b761885c2d5515e89fd5aedf7d1e8a249b Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 12 May 2016 09:38:28 +0100 Subject: mpDefDialogParent is not used since 2002 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit i.e. commit c0ae87cb5f2989bc4b8dff4907994d513ee87e39 Author: Stephan Schäfer Date: Tue Oct 22 08:39:05 2002 +0000 #103442# choose DefDialogParent on-the-fly and so calling SetDefDialogParent doesn't achieve anything Change-Id: I2ec72da47b2dac03fdddbdb9eba5ae4bf205eb22 --- basctl/source/basicide/macrodlg.cxx | 9 +-------- basctl/source/basicide/moduldlg.cxx | 7 +------ 2 files changed, 2 insertions(+), 14 deletions(-) (limited to 'basctl/source') diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx index c3619246ef45..ec7ed3a5c414 100644 --- a/basctl/source/basicide/macrodlg.cxx +++ b/basctl/source/basicide/macrodlg.cxx @@ -242,16 +242,9 @@ short MacroChooser::Execute() if ( StarBASIC::IsRunning() ) m_pCloseButton->GrabFocus(); - vcl::Window* pPrevDlgParent = Application::GetDefDialogParent(); - Application::SetDefDialogParent( this ); - short nRet = ModalDialog::Execute(); - // #57314# If the BasicIDE has been activated, don't reset the DefModalDialogParent to the inactive document. - if ( Application::GetDefDialogParent() == this ) - Application::SetDefDialogParent( pPrevDlgParent ); - return nRet; + return ModalDialog::Execute(); } - void MacroChooser::EnableButton( Button& rButton, bool bEnable ) { if ( bEnable ) diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx index bf5b6ae32a89..a1eafce59e58 100644 --- a/basctl/source/basicide/moduldlg.cxx +++ b/basctl/source/basicide/moduldlg.cxx @@ -503,14 +503,9 @@ void OrganizeDialog::dispose() short OrganizeDialog::Execute() { - vcl::Window* pPrevDlgParent = Application::GetDefDialogParent(); - Application::SetDefDialogParent( this ); - short nRet = TabDialog::Execute(); - Application::SetDefDialogParent( pPrevDlgParent ); - return nRet; + return TabDialog::Execute(); } - IMPL_LINK_TYPED( OrganizeDialog, ActivatePageHdl, TabControl *, pTabCtrl, void ) { sal_uInt16 nId = pTabCtrl->GetCurPageId(); -- cgit