summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-05-12 09:38:28 +0100
committerCaolán McNamara <caolanm@redhat.com>2016-05-12 10:09:26 +0100
commit71c4a2b761885c2d5515e89fd5aedf7d1e8a249b (patch)
treec8d9cbd035e2dcf601c18ef28cbb12f4f043295f /sd
parent533fd775d51472e6cff93487a27136f67f06d77f (diff)
mpDefDialogParent is not used since 2002
i.e. commit c0ae87cb5f2989bc4b8dff4907994d513ee87e39 Author: Stephan Schäfer <ssa@openoffice.org> 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
Diffstat (limited to 'sd')
-rw-r--r--sd/source/ui/dlg/dlgass.cxx10
-rw-r--r--sd/source/ui/dlg/tpaction.cxx5
-rw-r--r--sd/source/ui/func/fuinsfil.cxx7
3 files changed, 0 insertions, 22 deletions
diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx
index 50581e0061c3..5f4a8caed73b 100644
--- a/sd/source/ui/dlg/dlgass.cxx
+++ b/sd/source/ui/dlg/dlgass.cxx
@@ -1457,9 +1457,6 @@ void AssistentDlgImpl::UpdatePreview( bool bDocPreview )
{
CloseDocShell();
- vcl::Window *pParent = Application::GetDefDialogParent();
- Application::SetDefDialogParent( mpWindow );
-
SfxErrorContext eEC(ERRCTX_SFX_LOADTEMPLATE,mpWindow);
if(IsOwnFormat(aDocFile))
@@ -1489,8 +1486,6 @@ void AssistentDlgImpl::UpdatePreview( bool bDocPreview )
xDocShell = pRet->GetFrame()->GetObjectShell();
}
- Application::SetDefDialogParent( pParent );
-
mnShowPage = 0;
mbDocPreview = bDocPreview;
maDocFile = aDocFile;
@@ -1503,9 +1498,6 @@ void AssistentDlgImpl::UpdatePreview( bool bDocPreview )
SfxObjectShellLock xLayoutDocShell;
SfxErrorContext eEC(ERRCTX_SFX_LOADTEMPLATE,mpWindow);
- vcl::Window *pParent = Application::GetDefDialogParent();
- Application::SetDefDialogParent( mpWindow );
-
if(IsOwnFormat(aLayoutFile))
{
SfxItemSet* pSet = new SfxAllItemSet( pSfxApp->GetPool() );
@@ -1518,8 +1510,6 @@ void AssistentDlgImpl::UpdatePreview( bool bDocPreview )
SavePassword( xLayoutDocShell, aLayoutFile );
}
- Application::SetDefDialogParent( pParent );
-
// determine the implementation
SfxObjectShell* pShell = xDocShell;
DrawDocShell* pDocShell = dynamic_cast< DrawDocShell *>( pShell );
diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx
index 99175dbee38f..49393bd441d5 100644
--- a/sd/source/ui/dlg/tpaction.cxx
+++ b/sd/source/ui/dlg/tpaction.cxx
@@ -429,9 +429,6 @@ void SdTPAction::OpenFileDialog()
}
else if (bMacro)
{
- vcl::Window* pOldWin = Application::GetDefDialogParent();
- Application::SetDefDialogParent( this );
-
// choose macro dialog
OUString aScriptURL = SfxApplication::ChooseScript();
@@ -439,8 +436,6 @@ void SdTPAction::OpenFileDialog()
{
SetEditText( aScriptURL );
}
-
- Application::SetDefDialogParent( pOldWin );
}
else
{
diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx
index badd3edb7ddb..0e9ad314705b 100644
--- a/sd/source/ui/func/fuinsfil.cxx
+++ b/sd/source/ui/func/fuinsfil.cxx
@@ -332,15 +332,8 @@ bool FuInsertFile::InsSDDinDrMode(SfxMedium* pMedium)
if( !pDlg )
return false;
- /* Maybe a QueryBox is opened ("update links?"), therefore the dialog
- becomes the current DefModalDialogParent */
- vcl::Window* pDefParent = Application::GetDefDialogParent();
- Application::SetDefDialogParent(pDlg->GetWindow());
-
sal_uInt16 nRet = pDlg->Execute();
- Application::SetDefDialogParent(pDefParent);
-
mpDocSh->SetWaitCursor( true );
if( nRet == RET_OK )