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

[Libreoffice Gerrit user]

 cui/uiconfig/ui/numberingoptionspage.ui |    1 -
 sc/source/ui/pagedlg/tphf.cxx           |   32 ++++++++++++++++----------------
 2 files changed, 16 insertions(+), 17 deletions(-)

New commits:
commit bc8aec6280e1a0558ab9c3ef6f85325e9997d7da
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Oct 3 11:20:35 2018 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Oct 3 14:33:17 2018 +0200

    make position and options level treeview match in size
    
    Change-Id: I3e9216e95c845a319fc7315f80e926023ddd911b
    Reviewed-on: https://gerrit.libreoffice.org/61292
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/cui/uiconfig/ui/numberingoptionspage.ui b/cui/uiconfig/ui/numberingoptionspage.ui
index 22725e92ceee..7b64b2e6769e 100644
--- a/cui/uiconfig/ui/numberingoptionspage.ui
+++ b/cui/uiconfig/ui/numberingoptionspage.ui
@@ -92,7 +92,6 @@
                   <object class="GtkTreeView" id="levellb">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="hexpand">True</property>
                     <property name="vexpand">True</property>
                     <property name="model">liststore1</property>
                     <property name="headers_visible">False</property>
commit 68be4ff2f37d6deaceba19c3d098c4a15de4788c
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Oct 3 11:02:11 2018 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Oct 3 14:33:05 2018 +0200

    unweld HeaderEditPage for now
    
    not ready yet
    
    Change-Id: I022b47c521a63fb18052274aa8e2020dc6210d9c
    Reviewed-on: https://gerrit.libreoffice.org/61289
    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 934679230aeb..cc7b9cf20b17 100644
--- a/sc/source/ui/pagedlg/tphf.cxx
+++ b/sc/source/ui/pagedlg/tphf.cxx
@@ -192,37 +192,37 @@ IMPL_LINK_NOARG(ScHFPage, HFEditHdl, void*, void)
     else
     {
         OUString  aText;
+        VclPtrInstance< SfxSingleTabDialog > pDlg(nullptr, aDataSet);
         bool bRightPage = m_xCntSharedBox->get_active() || (SvxPageUsage::Left != nPageUsage);
 
-        SfxSingleTabDialogController aDlg(GetDialogFrameWeld(), aDataSet);
-        TabPageParent pPageParent(aDlg.get_content_area(), &aDlg);
-        if (nId == SID_ATTR_PAGE_HEADERSET)
+        if ( nId == SID_ATTR_PAGE_HEADERSET )
         {
-            aText = ScResId(STR_PAGEHEADER);
-            if (bRightPage)
-                aDlg.SetTabPage(ScRightHeaderEditPage::Create(pPageParent, &aDataSet));
+            aText = ScResId( STR_PAGEHEADER );
+            if ( bRightPage )
+                pDlg->SetTabPage( ScRightHeaderEditPage::Create( pDlg->get_content_area(), &aDataSet ) );
             else
-                aDlg.SetTabPage(ScLeftHeaderEditPage::Create(pPageParent, &aDataSet));
+                pDlg->SetTabPage( ScLeftHeaderEditPage::Create( pDlg->get_content_area(), &aDataSet ) );
         }
         else
         {
-            aText = ScResId(STR_PAGEFOOTER);
-            if (bRightPage)
-                aDlg.SetTabPage(ScRightFooterEditPage::Create(pPageParent, &aDataSet));
+            aText = ScResId( STR_PAGEFOOTER );
+            if ( bRightPage )
+                pDlg->SetTabPage( ScRightFooterEditPage::Create( pDlg->get_content_area(), &aDataSet ) );
             else
-                aDlg.SetTabPage(ScLeftFooterEditPage::Create(pPageParent, &aDataSet));
+                pDlg->SetTabPage( ScLeftFooterEditPage::Create( pDlg->get_content_area(), &aDataSet ) );
         }
 
         SvxNumType eNumType = aDataSet.Get(ATTR_PAGE).GetNumType();
-        static_cast<ScHFEditPage*>(aDlg.GetTabPage())->SetNumType(eNumType);
+        static_cast<ScHFEditPage*>(pDlg->GetTabPage())->SetNumType(eNumType);
 
-        aText += " (" + ScResId(STR_PAGESTYLE) + ": " + aStrPageStyle + ")";
+        aText += " (" + ScResId( STR_PAGESTYLE );
+        aText += ": " + aStrPageStyle + ")";
 
-        aDlg.set_title(aText);
+        pDlg->SetText( aText );
 
-        if (aDlg.run() == RET_OK)
+        if ( pDlg->Execute() == RET_OK )
         {
-            aDataSet.Put(*aDlg.GetOutputItemSet());
+            aDataSet.Put( *pDlg->GetOutputItemSet() );
         }
     }
 }