sc/source/ui/inc/tphf.hxx     |    4 ++--
 sc/source/ui/pagedlg/tphf.cxx |   14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit c330763e1bfdae5894d4a0303a7a947e5b7870e0
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Oct 3 09:16:06 2018 +0100
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Oct 3 12:04:23 2018 +0200

    crash in calc page dialog
    
    Change-Id: I06072af58b0e302930a8d305f2b667843c42cd03
    Reviewed-on: https://gerrit.libreoffice.org/61284
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>
    Tested-by: Caolán McNamara <caol...@redhat.com>

diff --git a/sc/source/ui/inc/tphf.hxx b/sc/source/ui/inc/tphf.hxx
index 0aa107f4cf31..94a8b28c1186 100644
--- a/sc/source/ui/inc/tphf.hxx
+++ b/sc/source/ui/inc/tphf.hxx
@@ -64,7 +64,7 @@ public:
     static const sal_uInt16*      GetRanges();
 
 private:
-    ScHeaderPage( vcl::Window* pParent, const SfxItemSet& rSet );
+    ScHeaderPage(TabPageParent pParent, const SfxItemSet& rSet);
 };
 
 class ScFooterPage : public ScHFPage
@@ -75,7 +75,7 @@ public:
     static const sal_uInt16*      GetRanges();
 
 private:
-    ScFooterPage( vcl::Window* pParent, const SfxItemSet& rSet );
+    ScFooterPage(TabPageParent pParent, const SfxItemSet& rSet);
 };
 
 #endif // INCLUDED_SC_SOURCE_UI_INC_TPHF_HXX
diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxx
index e638b64c44e2..934679230aeb 100644
--- a/sc/source/ui/pagedlg/tphf.cxx
+++ b/sc/source/ui/pagedlg/tphf.cxx
@@ -229,14 +229,14 @@ IMPL_LINK_NOARG(ScHFPage, HFEditHdl, void*, void)
 
 // class ScHeaderPage
 
-ScHeaderPage::ScHeaderPage( vcl::Window* pParent, const SfxItemSet& rSet )
-    : ScHFPage( pParent, rSet, SID_ATTR_PAGE_HEADERSET )
+ScHeaderPage::ScHeaderPage(TabPageParent pParent, const SfxItemSet& rSet)
+    : ScHFPage(pParent, rSet, SID_ATTR_PAGE_HEADERSET)
 {
 }
 
-VclPtr<SfxTabPage> ScHeaderPage::Create( TabPageParent pParent, const 
SfxItemSet* rCoreSet )
+VclPtr<SfxTabPage> ScHeaderPage::Create(TabPageParent pParent, const 
SfxItemSet* rCoreSet)
 {
-    return VclPtr<ScHeaderPage>::Create( pParent.pParent, *rCoreSet );
+    return VclPtr<ScHeaderPage>::Create(pParent, *rCoreSet);
 }
 
 const sal_uInt16* ScHeaderPage::GetRanges()
@@ -246,14 +246,14 @@ const sal_uInt16* ScHeaderPage::GetRanges()
 
 // class ScFooterPage
 
-ScFooterPage::ScFooterPage( vcl::Window* pParent, const SfxItemSet& rSet )
+ScFooterPage::ScFooterPage(TabPageParent pParent, const SfxItemSet& rSet)
     : ScHFPage( pParent, rSet, SID_ATTR_PAGE_FOOTERSET )
 {
 }
 
-VclPtr<SfxTabPage> ScFooterPage::Create( TabPageParent pParent, const 
SfxItemSet* rCoreSet )
+VclPtr<SfxTabPage> ScFooterPage::Create(TabPageParent pParent, const 
SfxItemSet* rCoreSet)
 {
-    return VclPtr<ScFooterPage>::Create( pParent.pParent, *rCoreSet );
+    return VclPtr<ScFooterPage>::Create(pParent, *rCoreSet);
 }
 
 const sal_uInt16* ScFooterPage::GetRanges()
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to