From bfafc8c3a137a98ad2cd939b11161f9961bc48d7 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Sat, 10 Aug 2013 11:17:05 +0100 Subject: callcatcher: update unused code mostly ResId using ctors left stranded post .ui conversion Change-Id: I06689eea30ee9146ba05294f52056c0d263695f5 --- sfx2/source/dialog/tabdlg.cxx | 37 ------------------------------ sfx2/source/sidebar/ControlFactory.cxx | 15 ------------- sfx2/source/sidebar/SidebarToolBox.cxx | 41 ---------------------------------- 3 files changed, 93 deletions(-) (limited to 'sfx2') diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index f6c3e127f295..2a9c6057a404 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -731,43 +731,6 @@ void SfxTabDialog::SetApplyHandler(const Link& _rHdl) // ----------------------------------------------------------------------- -void SfxTabDialog::EnableApplyButton(sal_Bool bEnable) -{ - if ( IsApplyButtonEnabled() == bEnable ) - // nothing to do - return; - - // create or remove the apply button - if ( bEnable ) - { - m_pApplyBtn = new PushButton(m_pActionArea); - // in the z-order, the apply button should be behind the ok button, thus appearing at the right side of it - m_pApplyBtn->SetZOrder(m_pOKBtn, WINDOW_ZORDER_BEHIND); - m_pApplyBtn->SetText(SfxResId( STR_APPLY ).toString()); - m_pApplyBtn->Show(); - - m_pApplyBtn->SetHelpId( HID_TABDLG_APPLY_BTN ); - } - else - { - delete m_pApplyBtn; - m_pApplyBtn = NULL; - } - - // adjust the layout - if (IsReallyShown()) - AdjustLayout(); -} - -// ----------------------------------------------------------------------- - -sal_Bool SfxTabDialog::IsApplyButtonEnabled() const -{ - return ( NULL != m_pApplyBtn ); -} - -// ----------------------------------------------------------------------- - void SfxTabDialog::Start_Impl() { DBG_ASSERT( pImpl->aData.size() == m_pTabCtrl->GetPageCount(), "not all pages registered" ); diff --git a/sfx2/source/sidebar/ControlFactory.cxx b/sfx2/source/sidebar/ControlFactory.cxx index 1b79267f7923..ea5d19a90cf4 100644 --- a/sfx2/source/sidebar/ControlFactory.cxx +++ b/sfx2/source/sidebar/ControlFactory.cxx @@ -34,26 +34,11 @@ CheckBox* ControlFactory::CreateMenuButton (Window* pParentWindow) return new MenuButton(pParentWindow); } - - - ImageRadioButton* ControlFactory::CreateTabItem (Window* pParentWindow) { return new TabItem(pParentWindow); } - - - -ImageRadioButton* ControlFactory::CreateCustomImageRadionButton( - Window* pParentWindow, - const ResId& rResId ) -{ - return new CustomImageRadioButton( - pParentWindow, - rResId ); -} - } } // end of namespace sfx2::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/sidebar/SidebarToolBox.cxx b/sfx2/source/sidebar/SidebarToolBox.cxx index 8b0e89945b35..6d93c5f455f9 100644 --- a/sfx2/source/sidebar/SidebarToolBox.cxx +++ b/sfx2/source/sidebar/SidebarToolBox.cxx @@ -39,47 +39,6 @@ using ::rtl::OUString; namespace sfx2 { namespace sidebar { -SidebarToolBox::SidebarToolBox ( - Window* pParentWindow, - const ResId& rResId, - const cssu::Reference& rxFrame) - : ToolBox(pParentWindow, rResId), - mbParentIsBorder(false), - maItemSeparator(Theme::GetImage(Theme::Image_ToolBoxItemSeparator)), - maControllers(), - mbAreHandlersRegistered(false) -{ - SetBackground(Wallpaper()); - SetPaintTransparent(true); - SetToolboxButtonSize( TOOLBOX_BUTTONSIZE_SMALL ); - - if (rxFrame.is()) - { - const sal_uInt16 nItemCount (GetItemCount()); - if (nItemCount == 1) - { - // When there is only one item then make that as wide as - // the tool box. - CreateController(GetItemId(0), rxFrame, GetSizePixel().Width()); - } - else - for (sal_uInt16 nItemIndex=0; nItemIndex