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

[Caolán McNamara (via logerrit)]

 sc/source/ui/pagedlg/tphf.cxx |   19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

New commits:
commit 319c0b2433bb8dd405ed1630dd464ed2b11afefb
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Apr 8 12:29:04 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Apr 8 22:22:20 2019 +0200

    weld calc header/footer dialog
    
    Change-Id: Ied5ca56637b2f7be2d769d8f773a6e012d6e5b1f
    Reviewed-on: https://gerrit.libreoffice.org/70415
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxx
index 6065acfac08c..bac0f9a26c18 100644
--- a/sc/source/ui/pagedlg/tphf.cxx
+++ b/sc/source/ui/pagedlg/tphf.cxx
@@ -193,37 +193,38 @@ IMPL_LINK_NOARG(ScHFPage, HFEditHdl, void*, void)
     else
     {
         OUString  aText;
-        VclPtrInstance< SfxSingleTabDialog > pDlg(nullptr, aDataSet);
+        SfxSingleTabDialogController aDlg(GetDialogFrameWeld(), &aDataSet);
+        TabPageParent pPageParent(aDlg.get_content_area(), &aDlg);
         bool bRightPage = m_xCntSharedBox->get_active() || (SvxPageUsage::Left != nPageUsage);
 
         if ( nId == SID_ATTR_PAGE_HEADERSET )
         {
             aText = ScResId( STR_PAGEHEADER );
             if ( bRightPage )
-                pDlg->SetTabPage( ScRightHeaderEditPage::Create( pDlg->get_content_area(), &aDataSet ) );
+                aDlg.SetTabPage(ScRightHeaderEditPage::Create(pPageParent, &aDataSet));
             else
-                pDlg->SetTabPage( ScLeftHeaderEditPage::Create( pDlg->get_content_area(), &aDataSet ) );
+                aDlg.SetTabPage(ScLeftHeaderEditPage::Create(pPageParent, &aDataSet));
         }
         else
         {
             aText = ScResId( STR_PAGEFOOTER );
             if ( bRightPage )
-                pDlg->SetTabPage( ScRightFooterEditPage::Create( pDlg->get_content_area(), &aDataSet ) );
+                aDlg.SetTabPage(ScRightFooterEditPage::Create(pPageParent, &aDataSet));
             else
-                pDlg->SetTabPage( ScLeftFooterEditPage::Create( pDlg->get_content_area(), &aDataSet ) );
+                aDlg.SetTabPage(ScLeftFooterEditPage::Create(pPageParent, &aDataSet));
         }
 
         SvxNumType eNumType = aDataSet.Get(ATTR_PAGE).GetNumType();
-        static_cast<ScHFEditPage*>(pDlg->GetTabPage())->SetNumType(eNumType);
+        static_cast<ScHFEditPage*>(aDlg.GetTabPage())->SetNumType(eNumType);
 
         aText += " (" + ScResId( STR_PAGESTYLE );
         aText += ": " + aStrPageStyle + ")";
 
-        pDlg->SetText( aText );
+        aDlg.set_title(aText);
 
-        if ( pDlg->Execute() == RET_OK )
+        if (aDlg.run() == RET_OK)
         {
-            aDataSet.Put( *pDlg->GetOutputItemSet() );
+            aDataSet.Put(*aDlg.GetOutputItemSet());
         }
     }
 }