From c54f77b7180b271fecff3737bc391e19f050ec11 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Mon, 15 Jul 2013 08:55:35 +0100 Subject: callcatcher: update unused code All FontSizeBoxs and SmFontPickListBoxs are now .ui loaded, .res ctors unused Change-Id: I50aa8606fefacab0b15b6795a7ba90dff8109802 --- svx/Library_svx.mk | 1 - svx/source/sidebar/line/LineStyleValueSet.cxx | 127 -------------------------- svx/source/sidebar/line/LineStyleValueSet.hxx | 47 ---------- svx/source/sidebar/text/SvxSBFontNameBox.cxx | 13 --- svx/source/sidebar/text/SvxSBFontNameBox.hxx | 21 +---- 5 files changed, 2 insertions(+), 207 deletions(-) delete mode 100644 svx/source/sidebar/line/LineStyleValueSet.cxx delete mode 100644 svx/source/sidebar/line/LineStyleValueSet.hxx (limited to 'svx') diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk index efe212762f52..2a51f46e43ad 100644 --- a/svx/Library_svx.mk +++ b/svx/Library_svx.mk @@ -189,7 +189,6 @@ $(eval $(call gb_Library_add_exception_objects,svx,\ svx/source/sidebar/area/AreaTransparencyGradientPopup \ svx/source/sidebar/graphic/GraphicPropertyPanel \ svx/source/sidebar/line/LinePropertyPanel \ - svx/source/sidebar/line/LineStyleValueSet \ svx/source/sidebar/line/LineWidthControl \ svx/source/sidebar/line/LineWidthValueSet \ svx/source/sidebar/line/LineWidthPopup \ diff --git a/svx/source/sidebar/line/LineStyleValueSet.cxx b/svx/source/sidebar/line/LineStyleValueSet.cxx deleted file mode 100644 index 41abbc4ee8fd..000000000000 --- a/svx/source/sidebar/line/LineStyleValueSet.cxx +++ /dev/null @@ -1,127 +0,0 @@ -/* - * 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 "LineStyleValueSet.hxx" - -#include - - -namespace svx { namespace sidebar { - -LineStyleValueSet::LineStyleValueSet ( - Window* pParent, - const ResId& rResId) - : ValueSet( pParent, rResId ), - pVDev(NULL), - mbSelectFirst(true) -{ - SetColCount( 1 ); -} - - - - -LineStyleValueSet::~LineStyleValueSet (void) -{ - delete pVDev; -} - - - - -void LineStyleValueSet::SetFirstString(XubString str) -{ - strNone = str; -} - - - - -void LineStyleValueSet::UserDraw( const UserDrawEvent& rUDEvt ) -{ - Rectangle aRect = rUDEvt.GetRect(); - OutputDevice* pDev = rUDEvt.GetDevice(); - sal_uInt16 nItemId = rUDEvt.GetItemId(); - - long nRectHeight = aRect.GetHeight(); - //Point aBLPos = aRect.TopLeft(); - if(nItemId == 1) - { - Color aOldFillColor = pDev->GetFillColor(); - - //draw back - if( mbSelectFirst ) - { - Color aBackColor(50,107,197); - Rectangle aBackRect = aRect; - aBackRect.Top() += 3; - aBackRect.Bottom() -= 2; - pDev->SetFillColor(aBackColor); - pDev->DrawRect(aBackRect); - } - else - { - pDev->SetFillColor( COL_TRANSPARENT ); - pDev->DrawRect(aRect); - } - pDev->SetFillColor(aOldFillColor); - - //draw text - Font aOldFont = pDev->GetFont(); - Color aOldColor = pDev->GetLineColor(); - Font aFont(OutputDevice::GetDefaultFont( - DEFAULTFONT_UI_SANS, MsLangId::getSystemLanguage(), DEFAULTFONT_FLAGS_ONLYONE)); - Size aSize = aFont.GetSize(); - aSize.Height() = nRectHeight*3/5; - if( mbSelectFirst ) - aFont.SetColor(COL_WHITE); - else - //aFont.SetColor(COL_BLACK); - aFont.SetColor(GetSettings().GetStyleSettings().GetFieldTextColor()); //high contrast - aFont.SetFillColor(COL_BLUE); - aFont.SetSize( aSize ); - pDev->SetFont(aFont); -// String sText("None", 9, RTL_TEXTENCODING_ASCII_US); - - // Point aStart(aBLPos.X() + 8 , aBLPos.Y() + nRectHeight/6); - Rectangle aStrRect = aRect; - aStrRect.Top() += nRectHeight/6; - aStrRect.Bottom() -= nRectHeight/6; - aStrRect.Left() += 8; - pDev->DrawText(aStrRect, strNone, TEXT_DRAW_ENDELLIPSIS); - - pDev->SetFont(aOldFont); - pDev->SetLineColor(aOldColor); - - - } - Invalidate( aRect ); -} - - - - -void LineStyleValueSet::SetFirstSelect(bool bSel) -{ - mbSelectFirst = bSel; -} - - - -} } // end of namespace svx::sidebar - -// eof diff --git a/svx/source/sidebar/line/LineStyleValueSet.hxx b/svx/source/sidebar/line/LineStyleValueSet.hxx deleted file mode 100644 index 862cf18e5842..000000000000 --- a/svx/source/sidebar/line/LineStyleValueSet.hxx +++ /dev/null @@ -1,47 +0,0 @@ -/* - * 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 SVX_SIDEBAR_LINE_STYLE_VALUE_SET_HXX -#define SVX_SIDEBAR_LINE_STYLE_VALUE_SET_HXX - -#include - -namespace svx { namespace sidebar { - -class LineStyleValueSet - : public ValueSet -{ -public: - LineStyleValueSet (Window* pParent, const ResId& rResId); - virtual ~LineStyleValueSet (void); - - void SetFirstSelect(bool bSel); - void SetFirstString(XubString str); - - virtual void UserDraw( const UserDrawEvent& rUDEvt ); - -private: - VirtualDevice* pVDev; - bool mbSelectFirst; - XubString strNone; -}; - -} } // end of namespace svx::sidebar - -#endif - -// eof diff --git a/svx/source/sidebar/text/SvxSBFontNameBox.cxx b/svx/source/sidebar/text/SvxSBFontNameBox.cxx index 89910cc57089..b94c6131e361 100644 --- a/svx/source/sidebar/text/SvxSBFontNameBox.cxx +++ b/svx/source/sidebar/text/SvxSBFontNameBox.cxx @@ -80,19 +80,6 @@ namespace { } } - - - -SvxSBFontNameBox::SvxSBFontNameBox( Window* pParent, const ResId& rResId ) : - FontNameBox ( pParent, rResId ) -, pFontList ( NULL ) -, nFtCount ( 0 ) -, pBindings(NULL) -{ - EnableControls_Impl(); -// StartListening( *SFX_APP() ); -} - SvxSBFontNameBox::SvxSBFontNameBox( Window* pParent ) : FontNameBox ( pParent, WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_TABSTOP|WB_DROPDOWN ) , pFontList ( NULL ) diff --git a/svx/source/sidebar/text/SvxSBFontNameBox.hxx b/svx/source/sidebar/text/SvxSBFontNameBox.hxx index 7470f06d55e0..558399f2febc 100644 --- a/svx/source/sidebar/text/SvxSBFontNameBox.hxx +++ b/svx/source/sidebar/text/SvxSBFontNameBox.hxx @@ -22,22 +22,6 @@ #include #include -/* -#include -#include -#include - -#include -#include -#include - -#include -#include -#include - -#define FONT_COLOR 1 -#define BACK_COLOR 2 -*/ namespace svx { class ToolboxButtonColorUpdater; @@ -58,10 +42,9 @@ protected: virtual void Select(); public: - SvxSBFontNameBox( Window* pParent, const ResId& rResId ); - SvxSBFontNameBox( Window* pParent ); + SvxSBFontNameBox(Window* pParent); void FillList(); - sal_uInt16 GetListCount() { return nFtCount; } + sal_uInt16 GetListCount() const { return nFtCount; } void Clear() { FontNameBox::Clear(); nFtCount = 0; } void Fill( const FontList* pList ) { FontNameBox::Fill( pList ); -- cgit