diff options
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/ui/dbui/mmdocselectpage.cxx | 6 | ||||
| -rw-r--r-- | sw/source/uibase/app/docsh2.cxx | 11 |
2 files changed, 8 insertions, 9 deletions
diff --git a/sw/source/ui/dbui/mmdocselectpage.cxx b/sw/source/ui/dbui/mmdocselectpage.cxx index 5f1c0ffc1314..b869e40cd5c7 100644 --- a/sw/source/ui/dbui/mmdocselectpage.cxx +++ b/sw/source/ui/dbui/mmdocselectpage.cxx @@ -123,12 +123,12 @@ IMPL_LINK(SwMailMergeDocSelectPage, FileSelectHdl, Button*, pButton, void) if(bTemplate) { m_pLoadTemplateRB->Check(); - VclPtrInstance< SfxNewFileDialog > pNewFileDlg(this, SfxNewFileDialogMode::NONE); - sal_uInt16 nRet = pNewFileDlg->Execute(); + SfxNewFileDialog aNewFileDlg(GetFrameWeld(), SfxNewFileDialogMode::NONE); + sal_uInt16 nRet = aNewFileDlg.run(); if(RET_TEMPLATE_LOAD == nRet) bTemplate = false; else if(RET_CANCEL != nRet) - m_sLoadTemplateName = pNewFileDlg->GetTemplateFileName(); + m_sLoadTemplateName = aNewFileDlg.GetTemplateFileName(); } else m_pLoadDocRB->Check(); diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx index 65b718c52f67..3f72351acd3d 100644 --- a/sw/source/uibase/app/docsh2.cxx +++ b/sw/source/uibase/app/docsh2.cxx @@ -500,11 +500,10 @@ void SwDocShell::Execute(SfxRequest& rReq) if ( aFileName.isEmpty() ) { SvtPathOptions aPathOpt; - ScopedVclPtr<SfxNewFileDialog> pNewFileDlg( - VclPtr<SfxNewFileDialog>::Create(&GetView()->GetViewFrame()->GetWindow(), SfxNewFileDialogMode::LoadTemplate)); - pNewFileDlg->SetTemplateFlags(nFlags); + SfxNewFileDialog aNewFileDlg(GetView()->GetViewFrame()->GetWindow().GetFrameWeld(), SfxNewFileDialogMode::LoadTemplate); + aNewFileDlg.SetTemplateFlags(nFlags); - nRet = pNewFileDlg->Execute(); + nRet = aNewFileDlg.run(); if(RET_TEMPLATE_LOAD == nRet) { FileDialogHelper aDlgHelper(TemplateDescription::FILEOPEN_SIMPLE, @@ -560,10 +559,10 @@ void SwDocShell::Execute(SfxRequest& rReq) } else if( RET_OK == nRet) { - aFileName = pNewFileDlg->GetTemplateFileName(); + aFileName = aNewFileDlg.GetTemplateFileName(); } - nFlags = pNewFileDlg->GetTemplateFlags(); + nFlags = aNewFileDlg.GetTemplateFlags(); rReq.AppendItem( SfxStringItem( SID_TEMPLATE_NAME, aFileName ) ); rReq.AppendItem( SfxInt32Item( SID_TEMPLATE_LOAD, static_cast<long>(nFlags) ) ); } |