Kaydet (Commit) 319c0b24 authored tarafından Caolán McNamara's avatar Caolán McNamara

weld calc header/footer dialog

Change-Id: Ied5ca56637b2f7be2d769d8f773a6e012d6e5b1f
Reviewed-on: https://gerrit.libreoffice.org/70415
Tested-by: Jenkins
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 2fb6e836
...@@ -193,37 +193,38 @@ IMPL_LINK_NOARG(ScHFPage, HFEditHdl, void*, void) ...@@ -193,37 +193,38 @@ IMPL_LINK_NOARG(ScHFPage, HFEditHdl, void*, void)
else else
{ {
OUString aText; 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); bool bRightPage = m_xCntSharedBox->get_active() || (SvxPageUsage::Left != nPageUsage);
if ( nId == SID_ATTR_PAGE_HEADERSET ) if ( nId == SID_ATTR_PAGE_HEADERSET )
{ {
aText = ScResId( STR_PAGEHEADER ); aText = ScResId( STR_PAGEHEADER );
if ( bRightPage ) if ( bRightPage )
pDlg->SetTabPage( ScRightHeaderEditPage::Create( pDlg->get_content_area(), &aDataSet ) ); aDlg.SetTabPage(ScRightHeaderEditPage::Create(pPageParent, &aDataSet));
else else
pDlg->SetTabPage( ScLeftHeaderEditPage::Create( pDlg->get_content_area(), &aDataSet ) ); aDlg.SetTabPage(ScLeftHeaderEditPage::Create(pPageParent, &aDataSet));
} }
else else
{ {
aText = ScResId( STR_PAGEFOOTER ); aText = ScResId( STR_PAGEFOOTER );
if ( bRightPage ) if ( bRightPage )
pDlg->SetTabPage( ScRightFooterEditPage::Create( pDlg->get_content_area(), &aDataSet ) ); aDlg.SetTabPage(ScRightFooterEditPage::Create(pPageParent, &aDataSet));
else else
pDlg->SetTabPage( ScLeftFooterEditPage::Create( pDlg->get_content_area(), &aDataSet ) ); aDlg.SetTabPage(ScLeftFooterEditPage::Create(pPageParent, &aDataSet));
} }
SvxNumType eNumType = aDataSet.Get(ATTR_PAGE).GetNumType(); 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 += " (" + ScResId( STR_PAGESTYLE );
aText += ": " + aStrPageStyle + ")"; 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());
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment