[Libreoffice-commits] core.git: svx/source

[Libreoffice Gerrit user]

 svx/source/tbxctrls/grafctrl.cxx |   15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

New commits:
commit b461619a05667c2c1da84617a477c9bc6d593cd8
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Sep 20 14:38:56 2018 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Sep 20 18:13:49 2018 +0200

    weld CropDialog
    
    Change-Id: Ia63a7e0831328e4ddd329fd2ba042515cf38e414
    Reviewed-on: https://gerrit.libreoffice.org/60817
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

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 )
                         {