diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-09-15 15:42:18 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-09-18 18:12:10 +0200 |
| commit | 6d184e2e23b319128f94649f4e15c2f7bcbffca9 (patch) | |
| tree | 23541a6cccacb3a315196ed89c39a7e4a577cc9b /sw/source/uibase/shells | |
| parent | 03cecc2985c10ecfb2efab28f5b03e451e82c777 (diff) | |
weld SwParaDlg
Change-Id: Idb330d63480c0b973190d5f7696aac8f232a16c3
Reviewed-on: https://gerrit.libreoffice.org/60529
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/source/uibase/shells')
| -rw-r--r-- | sw/source/uibase/shells/annotsh.cxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/shells/drwtxtex.cxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/shells/textsh1.cxx | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/sw/source/uibase/shells/annotsh.cxx b/sw/source/uibase/shells/annotsh.cxx index c38a6cc9e09f..878bed0f36f1 100644 --- a/sw/source/uibase/shells/annotsh.cxx +++ b/sw/source/uibase/shells/annotsh.cxx @@ -531,7 +531,7 @@ void SwAnnotationShell::Exec( SfxRequest &rReq ) aDlgAttr.Put( SvxOrphansItem( 0, RES_PARATR_ORPHANS ) ); SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); - ScopedVclPtr<SfxAbstractTabDialog> pDlg(pFact->CreateSwParaDlg( rView.GetWindow(), rView, aDlgAttr, true )); + ScopedVclPtr<SfxAbstractTabDialog> pDlg(pFact->CreateSwParaDlg(rView.GetFrameWeld(), rView, aDlgAttr, true)); sal_uInt16 nRet = pDlg->Execute(); if(RET_OK == nRet) { diff --git a/sw/source/uibase/shells/drwtxtex.cxx b/sw/source/uibase/shells/drwtxtex.cxx index 9ca968a609ae..5d14a5ae5792 100644 --- a/sw/source/uibase/shells/drwtxtex.cxx +++ b/sw/source/uibase/shells/drwtxtex.cxx @@ -424,7 +424,7 @@ void SwDrawTextShell::Execute( SfxRequest &rReq ) aDlgAttr.Put( SvxOrphansItem( 0, RES_PARATR_ORPHANS ) ); SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); - ScopedVclPtr<SfxAbstractTabDialog> pDlg(pFact->CreateSwParaDlg( GetView().GetWindow(), GetView(), aDlgAttr, true )); + ScopedVclPtr<SfxAbstractTabDialog> pDlg(pFact->CreateSwParaDlg(GetView().GetFrameWeld(), GetView(), aDlgAttr, true)); sal_uInt16 nRet = pDlg->Execute(); if(RET_OK == nRet) { diff --git a/sw/source/uibase/shells/textsh1.cxx b/sw/source/uibase/shells/textsh1.cxx index 21e8f0f8c3fc..ae305812d594 100644 --- a/sw/source/uibase/shells/textsh1.cxx +++ b/sw/source/uibase/shells/textsh1.cxx @@ -1048,7 +1048,7 @@ void SwTextShell::Execute(SfxRequest &rReq) sDefPage = OUStringToOString(static_cast<const SfxStringItem*>(pItem)->GetValue(), RTL_TEXTENCODING_UTF8); SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); - pDlg.reset(pFact->CreateSwParaDlg( GetView().GetWindow(),GetView(), aCoreSet, false, sDefPage )); + pDlg.reset(pFact->CreateSwParaDlg(GetView().GetFrameWeld(), GetView(), aCoreSet, false, sDefPage)); } if ( !bUseDialog ) @@ -1101,6 +1101,7 @@ void SwTextShell::Execute(SfxRequest &rReq) sw_ParagraphDialogResult(pSet, rWrtSh, *pRequest, rWrtSh.GetCursor()); } + pDlg->disposeOnce(); }); } } |