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

[Caolán McNamara]

 sc/inc/helpids.h              |    8 --------
 sc/source/ui/pagedlg/tphf.cxx |    8 ++++----
 2 files changed, 4 insertions(+), 12 deletions(-)

New commits:
commit e4f4d46b3a972c0ebba9f3c6a84bcf649fc8aef3
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon May 13 16:39:19 2013 +0100

    set correct single tab page parent
    
    Change-Id: I078240882f727aa5f71785d7a0039eff8b402541

diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxx
index 090bc6e..bcc4594 100644
--- a/sc/source/ui/pagedlg/tphf.cxx
+++ b/sc/source/ui/pagedlg/tphf.cxx
@@ -227,17 +227,17 @@ IMPL_LINK_NOARG(ScHFPage, HFEditHdl)
         {
             aText = ScGlobal::GetRscString( STR_PAGEHEADER );
             if ( bRightPage )
-                pDlg->setTabPage( ScRightHeaderEditPage::Create( pDlg, aDataSet ), NULL, nSettingsId );
+                pDlg->setTabPage( ScRightHeaderEditPage::Create( pDlg->get_content_area(), aDataSet ), NULL, nSettingsId );
             else
-                pDlg->setTabPage( ScLeftHeaderEditPage::Create( pDlg, aDataSet ), NULL, nSettingsId );
+                pDlg->setTabPage( ScLeftHeaderEditPage::Create( pDlg->get_content_area(), aDataSet ), NULL, nSettingsId );
         }
         else
         {
             aText = ScGlobal::GetRscString( STR_PAGEFOOTER );
             if ( bRightPage )
-                pDlg->setTabPage( ScRightFooterEditPage::Create( pDlg, aDataSet ), NULL, nSettingsId );
+                pDlg->setTabPage( ScRightFooterEditPage::Create( pDlg->get_content_area(), aDataSet ), NULL, nSettingsId );
             else
-                pDlg->setTabPage( ScLeftFooterEditPage::Create( pDlg, aDataSet ), NULL, nSettingsId );
+                pDlg->setTabPage( ScLeftFooterEditPage::Create( pDlg->get_content_area(), aDataSet ), NULL, nSettingsId );
         }
 
         SvxNumType eNumType = ((const SvxPageItem&)aDataSet.Get(ATTR_PAGE)).GetNumType();
commit f040f912ead88f9a9ba6a983bc81f68818ce7b9d
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon May 13 16:12:07 2013 +0100

    unused helpids
    
    Change-Id: I88d8aab53bf18720ebea4f3cc07de0368e943c29

diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h
index 5c6fc5c..9dcf44b 100644
--- a/sc/inc/helpids.h
+++ b/sc/inc/helpids.h
@@ -97,14 +97,6 @@
 #define HID_SC_GROUP_COLS                                       "SC_HID_SC_GROUP_COLS"
 #define HID_SC_GROUP_ROWS                                       "SC_HID_SC_GROUP_ROWS"
 
-#define HID_SC_HF_TEXT                                          "SC_HID_SC_HF_TEXT"
-#define HID_SC_HF_FILE                                          "SC_HID_SC_HF_FILE"
-#define HID_SC_HF_TABLE                                         "SC_HID_SC_HF_TABLE"
-#define HID_SC_HF_PAGE                                          "SC_HID_SC_HF_PAGE"
-#define HID_SC_HF_PAGES                                         "SC_HID_SC_HF_PAGES"
-#define HID_SC_HF_DATE                                          "SC_HID_SC_HF_DATE"
-#define HID_SC_HF_TIME                                          "SC_HID_SC_HF_TIME"
-
 #define HID_SC_HEADER_EDIT                                      "SC_HID_SC_HEADER_EDIT"
 #define HID_SC_FOOTER_EDIT                                      "SC_HID_SC_FOOTER_EDIT"