diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-10-03 11:02:11 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-10-03 14:33:05 +0200 |
| commit | 68be4ff2f37d6deaceba19c3d098c4a15de4788c (patch) | |
| tree | 4dac525aab480b6f3484cb5f8023cfdf5f443890 /sc | |
| parent | b0fddbc128158da81d008636a7e270b8ee9a19cc (diff) | |
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@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/pagedlg/tphf.cxx | 32 |
1 files changed, 16 insertions, 16 deletions
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() ); } } } |