diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-09-20 14:38:56 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-09-20 18:13:49 +0200 |
| commit | b461619a05667c2c1da84617a477c9bc6d593cd8 (patch) | |
| tree | e68f759ed2359898b803434e272abc9b75b790b2 /svx/source | |
| parent | 1c52d39970de2daeac565165491ba82122ce299c (diff) | |
weld CropDialog
Change-Id: Ia63a7e0831328e4ddd329fd2ba042515cf38e414
Reviewed-on: https://gerrit.libreoffice.org/60817
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'svx/source')
| -rw-r--r-- | svx/source/tbxctrls/grafctrl.cxx | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx index 7783a14dab88..ac0364c45d43 100644 --- a/svx/source/tbxctrls/grafctrl.cxx +++ b/svx/source/tbxctrls/grafctrl.cxx @@ -697,21 +697,22 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView ) aCropDlgAttr.Put( SdrGrafCropItem( aLTSize.Width(), aLTSize.Height(), aRBSize.Width(), aRBSize.Height() ) ); - ScopedVclPtrInstance<SfxSingleTabDialog> aCropDialog( - SfxViewShell::Current() ? SfxViewShell::Current()->GetWindow() : nullptr, + vcl::Window* pParent(SfxViewShell::Current() ? SfxViewShell::Current()->GetWindow() : nullptr); + SfxSingleTabDialogController aCropDialog(pParent ? pParent->GetFrameWeld() : nullptr, aCropDlgAttr); const OUString aCropStr(SvxResId(RID_SVXSTR_GRAFCROP)); SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); ::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( RID_SVXPAGE_GRFCROP ); - VclPtr<SfxTabPage> pTabPage = (*fnCreatePage)( aCropDialog->get_content_area(), &aCropDlgAttr ); + TabPageParent pPageParent(aCropDialog.get_content_area(), &aCropDialog); + VclPtr<SfxTabPage> xTabPage = (*fnCreatePage)(pPageParent, &aCropDlgAttr); - pTabPage->SetText( aCropStr ); - aCropDialog->SetTabPage( pTabPage ); + xTabPage->SetText(aCropStr); + aCropDialog.SetTabPage(xTabPage); - if( aCropDialog->Execute() == RET_OK ) + if (aCropDialog.run() == RET_OK) { - const SfxItemSet* pOutAttr = aCropDialog->GetOutputItemSet(); + const SfxItemSet* pOutAttr = aCropDialog.GetOutputItemSet(); if( pOutAttr ) { |