Kaydet (Commit) 3a393557 authored tarafından Caolán McNamara's avatar Caolán McNamara

allow SfxTabDialog ok button to have custom text

Change-Id: Ia38a982b37568c9225c03197a085db3164602f85
üst 0c68a386
...@@ -363,7 +363,7 @@ IMPL_LINK_NOARG(SvxSingleNumPickTabPage, NumSelectHdl_Impl) ...@@ -363,7 +363,7 @@ IMPL_LINK_NOARG(SvxSingleNumPickTabPage, NumSelectHdl_Impl)
IMPL_LINK_NOARG(SvxSingleNumPickTabPage, DoubleClickHdl_Impl) IMPL_LINK_NOARG(SvxSingleNumPickTabPage, DoubleClickHdl_Impl)
{ {
NumSelectHdl_Impl(m_pExamplesVS); NumSelectHdl_Impl(m_pExamplesVS);
OKButton& rOk = GetTabDialog()->GetOKButton(); PushButton& rOk = GetTabDialog()->GetOKButton();
rOk.GetClickHdl().Call(&rOk); rOk.GetClickHdl().Call(&rOk);
return 0; return 0;
} }
...@@ -514,7 +514,7 @@ IMPL_LINK_NOARG(SvxBulletPickTabPage, NumSelectHdl_Impl) ...@@ -514,7 +514,7 @@ IMPL_LINK_NOARG(SvxBulletPickTabPage, NumSelectHdl_Impl)
IMPL_LINK_NOARG(SvxBulletPickTabPage, DoubleClickHdl_Impl) IMPL_LINK_NOARG(SvxBulletPickTabPage, DoubleClickHdl_Impl)
{ {
NumSelectHdl_Impl(m_pExamplesVS); NumSelectHdl_Impl(m_pExamplesVS);
OKButton& rOk = GetTabDialog()->GetOKButton(); PushButton& rOk = GetTabDialog()->GetOKButton();
rOk.GetClickHdl().Call(&rOk); rOk.GetClickHdl().Call(&rOk);
return 0; return 0;
} }
...@@ -765,7 +765,7 @@ IMPL_LINK_NOARG(SvxNumPickTabPage, NumSelectHdl_Impl) ...@@ -765,7 +765,7 @@ IMPL_LINK_NOARG(SvxNumPickTabPage, NumSelectHdl_Impl)
IMPL_LINK_NOARG(SvxNumPickTabPage, DoubleClickHdl_Impl) IMPL_LINK_NOARG(SvxNumPickTabPage, DoubleClickHdl_Impl)
{ {
NumSelectHdl_Impl(m_pExamplesVS); NumSelectHdl_Impl(m_pExamplesVS);
OKButton& rOk = GetTabDialog()->GetOKButton(); PushButton& rOk = GetTabDialog()->GetOKButton();
rOk.GetClickHdl().Call(&rOk); rOk.GetClickHdl().Call(&rOk);
return 0; return 0;
} }
...@@ -979,7 +979,7 @@ IMPL_LINK_NOARG(SvxBitmapPickTabPage, NumSelectHdl_Impl) ...@@ -979,7 +979,7 @@ IMPL_LINK_NOARG(SvxBitmapPickTabPage, NumSelectHdl_Impl)
IMPL_LINK_NOARG(SvxBitmapPickTabPage, DoubleClickHdl_Impl) IMPL_LINK_NOARG(SvxBitmapPickTabPage, DoubleClickHdl_Impl)
{ {
NumSelectHdl_Impl(m_pExamplesVS); NumSelectHdl_Impl(m_pExamplesVS);
OKButton& rOk = GetTabDialog()->GetOKButton(); PushButton& rOk = GetTabDialog()->GetOKButton();
rOk.GetClickHdl().Call(&rOk); rOk.GetClickHdl().Call(&rOk);
return 0; return 0;
} }
......
...@@ -68,7 +68,7 @@ friend class SfxTabDialogController; ...@@ -68,7 +68,7 @@ friend class SfxTabDialogController;
VclBox *m_pBox; VclBox *m_pBox;
TabControl *m_pTabCtrl; TabControl *m_pTabCtrl;
OKButton *m_pOKBtn; PushButton* m_pOKBtn;
PushButton* m_pApplyBtn; PushButton* m_pApplyBtn;
PushButton* m_pUserBtn; PushButton* m_pUserBtn;
CancelButton* m_pCancelBtn; CancelButton* m_pCancelBtn;
...@@ -205,8 +205,8 @@ public: ...@@ -205,8 +205,8 @@ public:
const SfxItemSet* GetOutputItemSet() const { return pOutSet; } const SfxItemSet* GetOutputItemSet() const { return pOutSet; }
sal_Bool IsFormat() const { return bFmt; } sal_Bool IsFormat() const { return bFmt; }
const OKButton& GetOKButton() const { return *m_pOKBtn; } const PushButton& GetOKButton() const { return *m_pOKBtn; }
OKButton& GetOKButton() { return *m_pOKBtn; } PushButton& GetOKButton() { return *m_pOKBtn; }
const CancelButton& GetCancelButton() const { return *m_pCancelBtn; } const CancelButton& GetCancelButton() const { return *m_pCancelBtn; }
CancelButton& GetCancelButton() { return *m_pCancelBtn; } CancelButton& GetCancelButton() { return *m_pCancelBtn; }
const HelpButton& GetHelpButton() const { return *m_pHelpBtn; } const HelpButton& GetHelpButton() const { return *m_pHelpBtn; }
......
...@@ -594,7 +594,7 @@ void SfxTabDialog::Init_Impl( sal_Bool bFmtFlag, const String* pUserButtonText, ...@@ -594,7 +594,7 @@ void SfxTabDialog::Init_Impl( sal_Bool bFmtFlag, const String* pUserButtonText,
set_action_area(m_pActionArea); set_action_area(m_pActionArea);
} }
m_pOKBtn = m_pUIBuilder ? m_pUIBuilder->get<OKButton>("ok") : NULL; m_pOKBtn = m_pUIBuilder ? m_pUIBuilder->get<PushButton>("ok") : NULL;
m_bOwnsOKBtn = m_pOKBtn == NULL; m_bOwnsOKBtn = m_pOKBtn == NULL;
if (m_bOwnsOKBtn) if (m_bOwnsOKBtn)
m_pOKBtn = new OKButton(m_pActionArea); m_pOKBtn = new OKButton(m_pActionArea);
......
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