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/ui/envelp | |
| 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/ui/envelp')
| -rw-r--r-- | sw/source/ui/envelp/envfmt.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx index a79e88eb14ef..d18b62b97dd3 100644 --- a/sw/source/ui/envelp/envfmt.cxx +++ b/sw/source/ui/envelp/envfmt.cxx @@ -290,14 +290,13 @@ void SwEnvFormatPage::Edit(const OString& rIdent, bool bSender) ::PrepareBoxInfo( aTmpSet, *pSh ); const OUString sFormatStr = pColl->GetName(); - VclPtrInstance< SwParaDlg > pDlg(nullptr /*TODO*/, pSh->GetView(), aTmpSet, DLG_ENVELOP, &sFormatStr); - //VclPtrInstance< SwParaDlg > pDlg(GetParentSwEnvDlg(), pSh->GetView(), aTmpSet, DLG_ENVELOP, &sFormatStr); + SwParaDlg aDlg(GetDialogFrameWeld(), pSh->GetView(), aTmpSet, DLG_ENVELOP, &sFormatStr); - if ( pDlg->Execute() == RET_OK ) + if (aDlg.execute() == RET_OK) { // maybe relocate defaults const SfxPoolItem* pItem = nullptr; - SfxItemSet* pOutputSet = const_cast<SfxItemSet*>(pDlg->GetOutputItemSet()); + SfxItemSet* pOutputSet = const_cast<SfxItemSet*>(aDlg.GetOutputItemSet()); sal_uInt16 nNewDist; if( SfxItemState::SET == pOutputSet->GetItemState( SID_ATTR_TABSTOP_DEFAULTS, |