diff options
author | Caolán McNamara <caolanm@redhat.com> | 2013-08-11 10:45:41 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-08-11 11:28:47 +0100 |
commit | 16b35898c35db6b2da69e336903f9bbf73c78326 (patch) | |
tree | 9c4d2e711e8c3d48697b58413a3c86c4fd14114e /sfx2 | |
parent | fe842b034fb5f9b3a8444f66cc51f12464444ca9 (diff) |
callcatcher: another layer of unused methods
Change-Id: I70e84f691bcf1b1e1025fd5a534c275633f865d1
Diffstat (limited to 'sfx2')
-rw-r--r-- | sfx2/Library_sfx.mk | 1 | ||||
-rw-r--r-- | sfx2/source/sidebar/ControlFactory.cxx | 1 | ||||
-rw-r--r-- | sfx2/source/sidebar/CustomImageRadioButton.cxx | 77 | ||||
-rw-r--r-- | sfx2/source/sidebar/CustomImageRadioButton.hxx | 48 | ||||
-rw-r--r-- | sfx2/source/sidebar/SidebarToolBox.cxx | 39 |
5 files changed, 0 insertions, 166 deletions
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk index 836f23224823..03f3afee04a7 100644 --- a/sfx2/Library_sfx.mk +++ b/sfx2/Library_sfx.mk @@ -250,7 +250,6 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\ sfx2/source/sidebar/ControlFactory \ sfx2/source/sidebar/ControllerFactory \ sfx2/source/sidebar/ControllerItem \ - sfx2/source/sidebar/CustomImageRadioButton \ sfx2/source/sidebar/Deck \ sfx2/source/sidebar/DeckDescriptor \ sfx2/source/sidebar/DeckLayouter \ diff --git a/sfx2/source/sidebar/ControlFactory.cxx b/sfx2/source/sidebar/ControlFactory.cxx index ea5d19a90cf4..2e6743423f90 100644 --- a/sfx2/source/sidebar/ControlFactory.cxx +++ b/sfx2/source/sidebar/ControlFactory.cxx @@ -22,7 +22,6 @@ #include "TabItem.hxx" #include "sfx2/sidebar/SidebarToolBox.hxx" #include "ToolBoxBackground.hxx" -#include "CustomImageRadioButton.hxx" #include <vcl/toolbox.hxx> diff --git a/sfx2/source/sidebar/CustomImageRadioButton.cxx b/sfx2/source/sidebar/CustomImageRadioButton.cxx deleted file mode 100644 index a92f4d91a1ba..000000000000 --- a/sfx2/source/sidebar/CustomImageRadioButton.cxx +++ /dev/null @@ -1,77 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#include "CustomImageRadioButton.hxx" - -#include "DrawHelper.hxx" -#include "Paint.hxx" -#include "sfx2/sidebar/Tools.hxx" - -using namespace ::com::sun::star; -using namespace ::com::sun::star::uno; - - -namespace sfx2 { namespace sidebar { - - -CustomImageRadioButton::CustomImageRadioButton ( - Window* pParentWindow, - const ResId& rResId ) - : ImageRadioButton( pParentWindow, rResId ) -{ - SetStyle( GetStyle() | WB_NOPOINTERFOCUS ); -} - - -CustomImageRadioButton::~CustomImageRadioButton (void) -{ -} - - -void CustomImageRadioButton::Paint (const Rectangle& /*rUpdateArea*/) -{ - Rectangle aPaintRect( Rectangle(Point(0,0), GetSizePixel() ) ); - SetMouseRect( aPaintRect ); - SetStateRect( aPaintRect ); - - const Theme::ThemeItem eBackground = - IsMouseOver() - ? Theme::Paint_TabItemBackgroundHighlight - : Theme::Paint_PanelBackground; - DrawHelper::DrawRoundedRectangle( - *this, - aPaintRect, - Theme::GetInteger(Theme::Int_ButtonCornerRadius), - IsChecked() || IsMouseOver() ? Theme::GetColor(Theme::Color_TabItemBorder) : Color(0xffffffff), - Theme::GetPaint( eBackground ) ); - - const Image& rIcon = GetModeRadioImage(); - const Size aIconSize (rIcon.GetSizePixel()); - const Point aIconLocation( - (GetSizePixel().Width() - aIconSize.Width())/2, - (GetSizePixel().Height() - aIconSize.Height())/2 ); - DrawImage( - aIconLocation, - rIcon, - IsEnabled() ? 0 : IMAGE_DRAW_DISABLE ); -} - - -} } // end of namespace sfx2::sidebar - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/sidebar/CustomImageRadioButton.hxx b/sfx2/source/sidebar/CustomImageRadioButton.hxx deleted file mode 100644 index e6ddf0c7f198..000000000000 --- a/sfx2/source/sidebar/CustomImageRadioButton.hxx +++ /dev/null @@ -1,48 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#ifndef SFX_SIDEBAR_CUSTOM_IMAGE_RADIO_BUTTON_HXX -#define SFX_SIDEBAR_CUSTOM_IMAGE_RADIO_BUTTON_HXX - -#include "vcl/button.hxx" - -#include "sfx2/sidebar/Theme.hxx" - -namespace sfx2 { namespace sidebar { - -/** A custom image radion button with more control over used colors for sidebar -*/ -class CustomImageRadioButton - : public ImageRadioButton -{ -public: - CustomImageRadioButton( - Window* pParentWindow, - const ResId& rResId ); - - virtual ~CustomImageRadioButton(void); - - virtual void Paint( const Rectangle& rUpdateArea ); -}; - - -} } // end of namespace sfx2::sidebar - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/sidebar/SidebarToolBox.cxx b/sfx2/source/sidebar/SidebarToolBox.cxx index 6d93c5f455f9..28685cc03817 100644 --- a/sfx2/source/sidebar/SidebarToolBox.cxx +++ b/sfx2/source/sidebar/SidebarToolBox.cxx @@ -94,30 +94,6 @@ void SidebarToolBox::InsertItem(const OUString& rCommand, RegisterHandlers(); } -void SidebarToolBox::SetBorderWindow (const Window* pBorderWindow) -{ - if (pBorderWindow != GetParent()) - { - OSL_ASSERT("SetBorderWindow can only handle parent as border window"); - return; - } - - if ( ! mbParentIsBorder) - { - mbParentIsBorder = true; - - setPosSizePixel ( - GetPosPixel().X(), - GetPosPixel().Y(), - GetSizePixel().Width(), - GetSizePixel().Height(), - WINDOW_POSSIZE_ALL); - } -} - - - - void SidebarToolBox::Paint (const Rectangle& rRect) { ToolBox::Paint(rRect); @@ -280,21 +256,6 @@ void SidebarToolBox::SetController( -void SidebarToolBox::UpdateIcons (const Reference<frame::XFrame>& rxFrame) -{ - for (ControllerContainer::iterator iController(maControllers.begin()), iEnd(maControllers.end()); - iController!=iEnd; - ++iController) - { - const ::rtl::OUString sCommandURL (iController->second.msCurrentCommand); - Image aImage (framework::GetImageFromURL(rxFrame, sCommandURL, false)); - SetItemImage(iController->first, aImage); - } -} - - - - sal_uInt16 SidebarToolBox::GetItemIdForSubToolbarName (const OUString& rsSubToolbarName) const { for (ControllerContainer::const_iterator iController(maControllers.begin()), iEnd(maControllers.end()); |