From 08079bd1df02221e211582316201dac84a57c5dd Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 22 Aug 2012 21:18:52 +0100 Subject: get_by_name -> get and pretty up widget type casting Like Noel G points out, it's not like there any other way to get a widget other than "by_name" Change-Id: Iefe2a16472e2916dbeba1ba3c0c115cc6416ab5b --- sfx2/source/dialog/tabdlg.cxx | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'sfx2') diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index 003ce87f18e7..307e07ca53ba 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -515,8 +515,7 @@ void SfxTabDialog::Init_Impl( sal_Bool bFmtFlag, const String* pUserButtonText, */ { - fprintf(stderr, "BUILDER is %p\n", m_pUIBuilder); - m_pVBox = m_pUIBuilder ? static_cast(m_pUIBuilder->get_by_name("dialog-vbox1")) : NULL; + m_pVBox = m_pUIBuilder ? m_pUIBuilder->get("dialog-vbox1") : NULL; m_bOwnsVBox = m_pVBox == NULL; if (m_bOwnsVBox) { @@ -524,7 +523,7 @@ void SfxTabDialog::Init_Impl( sal_Bool bFmtFlag, const String* pUserButtonText, m_pVBox->set_expand(true); } - m_pTabCtrl = m_pUIBuilder ? static_cast(m_pUIBuilder->get_by_name(SAL_STRINGIFY(ID_TABCONTROL))) : NULL; + m_pTabCtrl = m_pUIBuilder ? m_pUIBuilder->get(SAL_STRINGIFY(ID_TABCONTROL)) : NULL; m_bOwnsTabCtrl = m_pTabCtrl == NULL; if (m_bOwnsTabCtrl) { @@ -532,42 +531,42 @@ void SfxTabDialog::Init_Impl( sal_Bool bFmtFlag, const String* pUserButtonText, m_pTabCtrl->set_expand(true); } - m_pActionArea = m_pUIBuilder ? static_cast(m_pUIBuilder->get_by_name("dialog-action_area1")) : NULL; + m_pActionArea = m_pUIBuilder ? m_pUIBuilder->get("dialog-action_area1") : NULL; m_bOwnsActionArea = m_pActionArea == NULL; if (m_bOwnsActionArea) m_pActionArea = new VclHButtonBox(m_pVBox); - m_pOKBtn = m_pUIBuilder ? static_cast(m_pUIBuilder->get_by_name("ok")) : NULL; + m_pOKBtn = m_pUIBuilder ? m_pUIBuilder->get("ok") : NULL; m_bOwnsOKBtn = m_pOKBtn == NULL; if (m_bOwnsOKBtn) m_pOKBtn = new OKButton(m_pActionArea); - m_pApplyBtn = m_pUIBuilder ? static_cast(m_pUIBuilder->get_by_name("apply")) : NULL; + m_pApplyBtn = m_pUIBuilder ? m_pUIBuilder->get("apply") : NULL; m_bOwnsApplyBtn = m_pApplyBtn == NULL; if (m_bOwnsApplyBtn) m_pApplyBtn = NULL; - m_pUserBtn = m_pUIBuilder ? static_cast(m_pUIBuilder->get_by_name("user")) : NULL; + m_pUserBtn = m_pUIBuilder ? m_pUIBuilder->get("user") : NULL; m_bOwnsUserBtn = m_pUserBtn == NULL; if (m_bOwnsUserBtn) m_pUserBtn = pUserButtonText ? new PushButton(m_pActionArea) : NULL; - m_pCancelBtn = m_pUIBuilder ? static_cast(m_pUIBuilder->get_by_name("cancel")) : NULL; + m_pCancelBtn = m_pUIBuilder ? m_pUIBuilder->get("cancel") : NULL; m_bOwnsCancelBtn = m_pCancelBtn == NULL; if (m_bOwnsCancelBtn) m_pCancelBtn = new CancelButton(m_pActionArea); - m_pHelpBtn = m_pUIBuilder ? static_cast(m_pUIBuilder->get_by_name("help")) : NULL; + m_pHelpBtn = m_pUIBuilder ? m_pUIBuilder->get("help") : NULL; m_bOwnsHelpBtn = m_pHelpBtn == NULL; if (m_bOwnsHelpBtn) m_pHelpBtn = new HelpButton(m_pActionArea); - m_pResetBtn = m_pUIBuilder ? static_cast(m_pUIBuilder->get_by_name("reset")) : NULL; + m_pResetBtn = m_pUIBuilder ? m_pUIBuilder->get("reset") : NULL; m_bOwnsResetBtn = m_pResetBtn == NULL; if (m_bOwnsResetBtn) m_pResetBtn = new PushButton(m_pActionArea); - m_pBaseFmtBtn = m_pUIBuilder ? static_cast(m_pUIBuilder->get_by_name("standard")) : NULL; + m_pBaseFmtBtn = m_pUIBuilder ? m_pUIBuilder->get("standard") : NULL; m_bOwnsBaseFmtBtn = m_pBaseFmtBtn == NULL; if (m_bOwnsBaseFmtBtn) m_pBaseFmtBtn = new PushButton(m_pActionArea); -- cgit