diff options
30 files changed, 30 insertions, 151 deletions
diff --git a/include/svx/sidebar/AreaPropertyPanelBase.hxx b/include/svx/sidebar/AreaPropertyPanelBase.hxx index f6827b54612e..7668f3bc8864 100644 --- a/include/svx/sidebar/AreaPropertyPanelBase.hxx +++ b/include/svx/sidebar/AreaPropertyPanelBase.hxx @@ -170,7 +170,7 @@ protected: DECL_LINK_TYPED(ClickImportBitmapHdl, Button*, void); // for transparency gradient - VclPtr<PopupControl> CreateTransparencyGradientControl (PopupContainer* pParent); + VclPtr<Control> CreateTransparencyGradientControl (PopupContainer* pParent); DECL_LINK_TYPED( ClickTrGrHdl_Impl, ToolBox*, void ); void Initialize(); diff --git a/include/svx/sidebar/AreaTransparencyGradientPopup.hxx b/include/svx/sidebar/AreaTransparencyGradientPopup.hxx index c7aee94b6f48..31c041b3219a 100644 --- a/include/svx/sidebar/AreaTransparencyGradientPopup.hxx +++ b/include/svx/sidebar/AreaTransparencyGradientPopup.hxx @@ -35,7 +35,7 @@ class AreaTransparencyGradientPopup public: AreaTransparencyGradientPopup ( vcl::Window* pParent, - ::std::function<PopupControl*(PopupContainer*)> const& rControlCreator); + ::std::function<Control*(PopupContainer*)> const& rControlCreator); virtual ~AreaTransparencyGradientPopup() override; void Rearrange (XFillFloatTransparenceItem* pItem); diff --git a/include/svx/sidebar/Popup.hxx b/include/svx/sidebar/Popup.hxx index 78d6de2a496f..0e0bccf7117e 100644 --- a/include/svx/sidebar/Popup.hxx +++ b/include/svx/sidebar/Popup.hxx @@ -24,7 +24,6 @@ #include <tools/link.hxx> #include <vcl/vclptr.hxx> #include <svx/sidebar/PopupContainer.hxx> -#include <svx/sidebar/PopupControl.hxx> #include <functional> @@ -33,7 +32,7 @@ class ToolBox; namespace svx { namespace sidebar { -/** A wrapper around a PopupContainer and a PopupControl object. +/** A wrapper around a PopupContainer and a Control object. Usually used as drop down for a toolbox. Use Show() to start drop down mode and Hide() to end it. */ @@ -43,15 +42,15 @@ public: /** Create a Popup wrapper object. @param pParent Parent window of the PopupContainer, which in turn is the - parent of the PopupControl. + parent of the Control. @param rControlCreator - A functor that is called to create the PopupControl object + A functor that is called to create the Control object (usually an instance of a class derived from - PopupControl). + Control). */ Popup ( vcl::Window* pParent, - const ::std::function<PopupControl*(PopupContainer*)>& rControlCreator, + const ::std::function<Control*(PopupContainer*)>& rControlCreator, const ::rtl::OUString& rsAccessibleName); virtual ~Popup(); @@ -73,9 +72,9 @@ public: void dispose(); protected: - VclPtr<PopupControl> mxControl; + VclPtr<Control> mxControl; - /** Make sure that both PopupContainer and PopupControl objects + /** Make sure that both PopupContainer and Control objects exist. Calls the maControlCreator functor if necessary. */ void ProvideContainerAndControl(); @@ -87,7 +86,7 @@ protected: private: VclPtr<vcl::Window> mpParent; - ::std::function<VclPtr<PopupControl>(PopupContainer*)> maControlCreator; + ::std::function<VclPtr<Control>(PopupContainer*)> maControlCreator; ::std::function<void()> maPopupModeEndCallback; const ::rtl::OUString msAccessibleName; VclPtr<PopupContainer> mxContainer; diff --git a/include/svx/sidebar/PopupControl.hxx b/include/svx/sidebar/PopupControl.hxx deleted file mode 100644 index 8f87c9a9f99a..000000000000 --- a/include/svx/sidebar/PopupControl.hxx +++ /dev/null @@ -1,49 +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 INCLUDED_SVX_SIDEBAR_POPUPCONTROL_HXX -#define INCLUDED_SVX_SIDEBAR_POPUPCONTROL_HXX - -#include <svx/svxdllapi.h> -#include <vcl/ctrl.hxx> - -namespace svx { namespace sidebar { - -/** Base class for sidebar related popup controls. - A PopupControl is typically a child of a PopupContainer and - provides the actual content of a popup. - This base class takes care of painting the proper background and - border for sidebar popups. - Specialize by derivation. -*/ -class SVX_DLLPUBLIC PopupControl - : public Control -{ -public: - PopupControl ( - vcl::Window* pParent, - const ResId& rResId); - - virtual void Paint (vcl::RenderContext& rRenderContext, const Rectangle& rect) override; -}; - -} } // end of namespace svx::sidebar - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx index a4251454885a..3cc6e4f47701 100644 --- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx +++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx @@ -50,7 +50,7 @@ const char UNO_LINESTYLE[] = ".uno:LineStyle"; namespace sc { namespace sidebar { -svx::sidebar::PopupControl* CellAppearancePropertyPanel::CreateCellLineStylePopupControl(svx::sidebar::PopupContainer* pParent) +Control* CellAppearancePropertyPanel::CreateCellLineStylePopupControl(svx::sidebar::PopupContainer* pParent) { return VclPtr<CellLineStyleControl>::Create(pParent, *this); } @@ -63,7 +63,7 @@ void CellAppearancePropertyPanel::EndCellLineStylePopupMode() } } -svx::sidebar::PopupControl* CellAppearancePropertyPanel::CreateCellBorderStylePopupControl(svx::sidebar::PopupContainer* pParent) +Control* CellAppearancePropertyPanel::CreateCellBorderStylePopupControl(svx::sidebar::PopupContainer* pParent) { return VclPtr<CellBorderStyleControl>::Create(pParent, *this); } diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx index 10b5a3757431..1e6dfcf5229f 100644 --- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx +++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx @@ -26,7 +26,6 @@ class FixedText; namespace svx { namespace sidebar { - class PopupControl; class PopupContainer; }} namespace sc { namespace sidebar { @@ -142,11 +141,11 @@ private: DECL_LINK_TYPED(TbxLineStyleSelectHdl, ToolBox*, void); // for CellLineStyle popup - svx::sidebar::PopupControl* CreateCellLineStylePopupControl(svx::sidebar::PopupContainer* pParent); + Control* CreateCellLineStylePopupControl(svx::sidebar::PopupContainer* pParent); void EndCellLineStylePopupMode(); // for CellBorderStyle popup - svx::sidebar::PopupControl* CreateCellBorderStylePopupControl(svx::sidebar::PopupContainer* pParent); + Control* CreateCellBorderStylePopupControl(svx::sidebar::PopupContainer* pParent); void EndCellBorderStylePopupMode(); void Initialize(); diff --git a/sc/source/ui/sidebar/CellBorderStyleControl.cxx b/sc/source/ui/sidebar/CellBorderStyleControl.cxx index 8280bc3ed43f..47a60cc15d51 100644 --- a/sc/source/ui/sidebar/CellBorderStyleControl.cxx +++ b/sc/source/ui/sidebar/CellBorderStyleControl.cxx @@ -43,7 +43,7 @@ namespace sc { namespace sidebar { #define FRM_VALID_ALL 0xff CellBorderStyleControl::CellBorderStyleControl(vcl::Window* pParent, CellAppearancePropertyPanel& rPanel) -: svx::sidebar::PopupControl(pParent, ScResId(RID_POPUPPANEL_APPEARANCE_CELL_BORDERSTYLE)), +: Control(pParent, ScResId(RID_POPUPPANEL_APPEARANCE_CELL_BORDERSTYLE)), mrCellAppearancePropertyPanel(rPanel), maTBBorder1(VclPtr<ToolBox>::Create(this, ScResId(TB_BORDER1))), maTBBorder2(VclPtr<ToolBox>::Create(this, ScResId(TB_BORDER2))), @@ -69,7 +69,7 @@ void CellBorderStyleControl::dispose() maTBBorder3.disposeAndClear(); maFL1.disposeAndClear(); maFL2.disposeAndClear(); - svx::sidebar::PopupControl::dispose(); + Control::dispose(); } void CellBorderStyleControl::Initialize() diff --git a/sc/source/ui/sidebar/CellBorderStyleControl.hxx b/sc/source/ui/sidebar/CellBorderStyleControl.hxx index a19580f1fb15..38c2710ec2cc 100644 --- a/sc/source/ui/sidebar/CellBorderStyleControl.hxx +++ b/sc/source/ui/sidebar/CellBorderStyleControl.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_SC_SOURCE_UI_SIDEBAR_CELLBORDERSTYLECONTROL_HXX #define INCLUDED_SC_SOURCE_UI_SIDEBAR_CELLBORDERSTYLECONTROL_HXX -#include <svx/sidebar/PopupControl.hxx> #include <vcl/button.hxx> #include <vcl/toolbox.hxx> #include <vcl/fixed.hxx> @@ -28,7 +27,7 @@ namespace sc { namespace sidebar { class CellAppearancePropertyPanel; -class CellBorderStyleControl : public svx::sidebar::PopupControl +class CellBorderStyleControl : public Control { private: CellAppearancePropertyPanel& mrCellAppearancePropertyPanel; diff --git a/sc/source/ui/sidebar/CellBorderStylePopup.cxx b/sc/source/ui/sidebar/CellBorderStylePopup.cxx index f71603e9ccb9..7b5e8712febd 100644 --- a/sc/source/ui/sidebar/CellBorderStylePopup.cxx +++ b/sc/source/ui/sidebar/CellBorderStylePopup.cxx @@ -24,7 +24,7 @@ namespace sc { namespace sidebar { CellBorderStylePopup::CellBorderStylePopup ( vcl::Window* pParent, - const ::std::function<svx::sidebar::PopupControl* (svx::sidebar::PopupContainer*)>& rControlCreator) + const ::std::function<Control* (svx::sidebar::PopupContainer*)>& rControlCreator) : Popup(pParent, rControlCreator, ::OUString("CellBorderStyle")) { } diff --git a/sc/source/ui/sidebar/CellBorderStylePopup.hxx b/sc/source/ui/sidebar/CellBorderStylePopup.hxx index 7b3e82204830..17909b7ea373 100644 --- a/sc/source/ui/sidebar/CellBorderStylePopup.hxx +++ b/sc/source/ui/sidebar/CellBorderStylePopup.hxx @@ -30,7 +30,7 @@ class CellBorderStylePopup : public svx::sidebar::Popup public: CellBorderStylePopup( vcl::Window* pParent, - const ::std::function<svx::sidebar::PopupControl*(svx::sidebar::PopupContainer*)>& rControlCreator); + const ::std::function<Control*(svx::sidebar::PopupContainer*)>& rControlCreator); virtual ~CellBorderStylePopup() override; }; diff --git a/sc/source/ui/sidebar/CellLineStyleControl.cxx b/sc/source/ui/sidebar/CellLineStyleControl.cxx index 59a25ed95e8b..d383adee797b 100644 --- a/sc/source/ui/sidebar/CellLineStyleControl.cxx +++ b/sc/source/ui/sidebar/CellLineStyleControl.cxx @@ -34,7 +34,7 @@ namespace sc { namespace sidebar { CellLineStyleControl::CellLineStyleControl(vcl::Window* pParent, CellAppearancePropertyPanel& rPanel) -: svx::sidebar::PopupControl(pParent, ScResId(RID_POPUPPANEL_APPEARANCE_CELL_LINESTYLE)), +: Control(pParent, ScResId(RID_POPUPPANEL_APPEARANCE_CELL_LINESTYLE)), mrCellAppearancePropertyPanel(rPanel), maPushButtonMoreOptions(VclPtr<PushButton>::Create(this, ScResId(PB_OPTIONS))), maCellLineStyleValueSet(VclPtr<sc::sidebar::CellLineStyleValueSet>::Create(this, ScResId(VS_STYLE))), @@ -53,7 +53,7 @@ void CellLineStyleControl::dispose() { maPushButtonMoreOptions.disposeAndClear(); maCellLineStyleValueSet.disposeAndClear(); - svx::sidebar::PopupControl::dispose(); + Control::dispose(); } void CellLineStyleControl::Initialize() diff --git a/sc/source/ui/sidebar/CellLineStyleControl.hxx b/sc/source/ui/sidebar/CellLineStyleControl.hxx index ef74eb096a91..9e98e686a558 100644 --- a/sc/source/ui/sidebar/CellLineStyleControl.hxx +++ b/sc/source/ui/sidebar/CellLineStyleControl.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_SC_SOURCE_UI_SIDEBAR_CELLLINESTYLECONTROL_HXX #define INCLUDED_SC_SOURCE_UI_SIDEBAR_CELLLINESTYLECONTROL_HXX -#include <svx/sidebar/PopupControl.hxx> #include <vcl/button.hxx> #include "CellLineStyleValueSet.hxx" @@ -27,7 +26,7 @@ namespace sc { namespace sidebar { class CellAppearancePropertyPanel; -class CellLineStyleControl : public svx::sidebar::PopupControl +class CellLineStyleControl : public Control { private: CellAppearancePropertyPanel& mrCellAppearancePropertyPanel; diff --git a/sc/source/ui/sidebar/CellLineStylePopup.cxx b/sc/source/ui/sidebar/CellLineStylePopup.cxx index 59b4b065f134..363029bf1037 100644 --- a/sc/source/ui/sidebar/CellLineStylePopup.cxx +++ b/sc/source/ui/sidebar/CellLineStylePopup.cxx @@ -24,7 +24,7 @@ namespace sc { namespace sidebar { CellLineStylePopup::CellLineStylePopup ( vcl::Window* pParent, - const ::std::function<svx::sidebar::PopupControl* (svx::sidebar::PopupContainer*)>& rControlCreator) + const ::std::function<Control* (svx::sidebar::PopupContainer*)>& rControlCreator) : Popup(pParent, rControlCreator, OUString("CellLineStyle")) { } diff --git a/sc/source/ui/sidebar/CellLineStylePopup.hxx b/sc/source/ui/sidebar/CellLineStylePopup.hxx index 7e908291c17c..d72128c29462 100644 --- a/sc/source/ui/sidebar/CellLineStylePopup.hxx +++ b/sc/source/ui/sidebar/CellLineStylePopup.hxx @@ -30,7 +30,7 @@ class CellLineStylePopup : public svx::sidebar::Popup public: CellLineStylePopup( vcl::Window* pParent, - const ::std::function<svx::sidebar::PopupControl* (svx::sidebar::PopupContainer*)>& rControlCreator); + const ::std::function<Control* (svx::sidebar::PopupContainer*)>& rControlCreator); virtual ~CellLineStylePopup() override; void SetLineStyleSelect(sal_uInt16 out, sal_uInt16 in, sal_uInt16 dis); diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk index 9c09ed0624c0..f5af93df8c49 100644 --- a/svx/Library_svx.mk +++ b/svx/Library_svx.mk @@ -206,7 +206,6 @@ $(eval $(call gb_Library_add_exception_objects,svx,\ svx/source/sidebar/possize/SidebarDialControl \ svx/source/sidebar/shapes/DefaultShapesPanel \ svx/source/sidebar/shapes/ShapesUtil \ - svx/source/sidebar/tools/PopupControl \ svx/source/sidebar/tools/PopupContainer \ svx/source/sidebar/tools/Popup \ svx/source/sidebar/tools/ValueSetWithTextControl \ diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx index 726dee0fc1f0..0d729d84fc4b 100644 --- a/svx/inc/pch/precompiled_svx.hxx +++ b/svx/inc/pch/precompiled_svx.hxx @@ -439,7 +439,6 @@ #include <svx/sidebar/LinePropertyPanelBase.hxx> #include <svx/sidebar/Popup.hxx> #include <svx/sidebar/PopupContainer.hxx> -#include <svx/sidebar/PopupControl.hxx> #include <svx/srchdlg.hxx> #include <svx/svddef.hxx> #include <svx/svdetc.hxx> diff --git a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx index c9a0a072d431..d9ef7c235332 100644 --- a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx +++ b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx @@ -495,7 +495,7 @@ IMPL_LINK_NOARG_TYPED(AreaPropertyPanelBase, ChangeGradientAngle, Edit&, void) SelectFillAttrHdl_Impl(); } -VclPtr<PopupControl> AreaPropertyPanelBase::CreateTransparencyGradientControl (PopupContainer* pParent) +VclPtr<Control> AreaPropertyPanelBase::CreateTransparencyGradientControl (PopupContainer* pParent) { return VclPtrInstance<AreaTransparencyGradientControl>(pParent, *this); } diff --git a/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx b/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx index d6e64d49e98e..7b895945cdc0 100644 --- a/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx +++ b/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx @@ -52,7 +52,7 @@ namespace svx { namespace sidebar { AreaTransparencyGradientControl::AreaTransparencyGradientControl ( vcl::Window* pParent, AreaPropertyPanelBase& rPanel) - : PopupControl( pParent,SVX_RES(RID_POPUPPANEL_AREAPAGE_TRGR)), + : Control( pParent,SVX_RES(RID_POPUPPANEL_AREAPAGE_TRGR)), maFtTrgrCenterX(VclPtr<FixedText>::Create(this, SVX_RES(FT_TRGR_CENTER_X))), maMtrTrgrCenterX(VclPtr<MetricField>::Create(this, SVX_RES(MTR_TRGR_CENTER_X))), maFtTrgrCenterY(VclPtr<FixedText>::Create(this, SVX_RES(FT_TRGR_CENTER_Y))), @@ -119,7 +119,7 @@ void AreaTransparencyGradientControl::dispose() maMtrTrgrEndValue.disposeAndClear(); maFtTrgrBorder.disposeAndClear(); maMtrTrgrBorder.disposeAndClear(); - PopupControl::dispose(); + Control::dispose(); } void AreaTransparencyGradientControl::Rearrange(XFillFloatTransparenceItem* pGradientItem) diff --git a/svx/source/sidebar/area/AreaTransparencyGradientControl.hxx b/svx/source/sidebar/area/AreaTransparencyGradientControl.hxx index 04b6b6d67b17..304e030ed171 100644 --- a/svx/source/sidebar/area/AreaTransparencyGradientControl.hxx +++ b/svx/source/sidebar/area/AreaTransparencyGradientControl.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SVX_SOURCE_SIDEBAR_AREA_AREATRANSPARENCYGRADIENTCONTROL_HXX #define INCLUDED_SVX_SOURCE_SIDEBAR_AREA_AREATRANSPARENCYGRADIENTCONTROL_HXX -#include "svx/sidebar/PopupControl.hxx" #include <vcl/fixed.hxx> #include <vcl/field.hxx> @@ -35,7 +34,7 @@ namespace svx { namespace sidebar { class AreaPropertyPanelBase; -class AreaTransparencyGradientControl : public PopupControl +class AreaTransparencyGradientControl : public Control { public: AreaTransparencyGradientControl ( diff --git a/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx b/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx index 04db2e750878..5dfe37c63362 100644 --- a/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx +++ b/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx @@ -23,7 +23,7 @@ namespace svx { namespace sidebar { AreaTransparencyGradientPopup::AreaTransparencyGradientPopup ( vcl::Window* pParent, - const ::std::function<PopupControl* (PopupContainer*)>& rControlCreator) + const ::std::function<Control* (PopupContainer*)>& rControlCreator) : Popup( pParent, rControlCreator, diff --git a/svx/source/sidebar/line/LinePropertyPanel.cxx b/svx/source/sidebar/line/LinePropertyPanel.cxx index b5038bc10ed4..45f68d5b3fed 100644 --- a/svx/source/sidebar/line/LinePropertyPanel.cxx +++ b/svx/source/sidebar/line/LinePropertyPanel.cxx @@ -46,7 +46,6 @@ #include <svx/xlncapit.hxx> #include <svx/xlinjoit.hxx> #include "svx/sidebar/PopupContainer.hxx" -#include "svx/sidebar/PopupControl.hxx" using namespace css; using namespace css::uno; diff --git a/svx/source/sidebar/line/LinePropertyPanelBase.cxx b/svx/source/sidebar/line/LinePropertyPanelBase.cxx index fb197524517b..653a13fe8f5f 100644 --- a/svx/source/sidebar/line/LinePropertyPanelBase.cxx +++ b/svx/source/sidebar/line/LinePropertyPanelBase.cxx @@ -46,7 +46,6 @@ #include <svx/xlncapit.hxx> #include <svx/xlinjoit.hxx> #include "svx/sidebar/PopupContainer.hxx" -#include "svx/sidebar/PopupControl.hxx" using namespace css; using namespace css::uno; diff --git a/svx/source/sidebar/text/TextCharacterSpacingControl.hxx b/svx/source/sidebar/text/TextCharacterSpacingControl.hxx index 7e4893b81323..0046ea35bce9 100644 --- a/svx/source/sidebar/text/TextCharacterSpacingControl.hxx +++ b/svx/source/sidebar/text/TextCharacterSpacingControl.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_SVX_SOURCE_SIDEBAR_TEXT_TEXTCHARACTERSPACINGCONTROL_HXX #define INCLUDED_SVX_SOURCE_SIDEBAR_TEXT_TEXTCHARACTERSPACINGCONTROL_HXX -#include "svx/sidebar/PopupControl.hxx" #include <sfx2/bindings.hxx> #include <vcl/fixed.hxx> #include <vcl/field.hxx> diff --git a/svx/source/sidebar/text/TextPropertyPanel.hxx b/svx/source/sidebar/text/TextPropertyPanel.hxx index d005ac740e82..13ba78aed883 100644 --- a/svx/source/sidebar/text/TextPropertyPanel.hxx +++ b/svx/source/sidebar/text/TextPropertyPanel.hxx @@ -35,7 +35,6 @@ class ToolBox; namespace svx { namespace sidebar { -class PopupControl; class PopupContainer; class TextPropertyPanel diff --git a/svx/source/sidebar/text/TextUnderlineControl.hxx b/svx/source/sidebar/text/TextUnderlineControl.hxx index 7e82602a03fc..0fd0dfff1aa6 100644 --- a/svx/source/sidebar/text/TextUnderlineControl.hxx +++ b/svx/source/sidebar/text/TextUnderlineControl.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SVX_SOURCE_SIDEBAR_TEXT_TEXTUNDERLINECONTROL_HXX #define INCLUDED_SVX_SOURCE_SIDEBAR_TEXT_TEXTUNDERLINECONTROL_HXX -#include "svx/sidebar/PopupControl.hxx" #include <sfx2/bindings.hxx> #include <vcl/button.hxx> #include <vcl/vclenum.hxx> diff --git a/svx/source/sidebar/tools/Popup.cxx b/svx/source/sidebar/tools/Popup.cxx index 041c31d8a012..ffd1bf5e7404 100644 --- a/svx/source/sidebar/tools/Popup.cxx +++ b/svx/source/sidebar/tools/Popup.cxx @@ -18,7 +18,6 @@ */ #include "svx/sidebar/Popup.hxx" #include "svx/sidebar/PopupContainer.hxx" -#include "svx/sidebar/PopupControl.hxx" #include <vcl/toolbox.hxx> @@ -27,7 +26,7 @@ namespace svx { namespace sidebar { Popup::Popup ( vcl::Window* pParent, - const ::std::function<PopupControl* (PopupContainer*)>& rControlCreator, + const ::std::function<Control* (PopupContainer*)>& rControlCreator, const ::rtl::OUString& rsAccessibleName) : mxControl(), mpParent(pParent), diff --git a/svx/source/sidebar/tools/PopupControl.cxx b/svx/source/sidebar/tools/PopupControl.cxx deleted file mode 100644 index 93e696a3a621..000000000000 --- a/svx/source/sidebar/tools/PopupControl.cxx +++ /dev/null @@ -1,51 +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 "svx/sidebar/PopupControl.hxx" -#include <sfx2/sidebar/Theme.hxx> -#include <vcl/gradient.hxx> - -using ::sfx2::sidebar::Theme; - -namespace svx { namespace sidebar { - -PopupControl::PopupControl ( - vcl::Window* pParent, - const ResId& rResId) - : Control( pParent,rResId) -{ - EnableChildTransparentMode(); - SetControlBackground(); - - SetBackground(Theme::GetWallpaper(Theme::Paint_DropDownBackground)); -} - -void PopupControl::Paint (vcl::RenderContext& rRenderContext, const Rectangle& rRect) -{ - Control::Paint(rRenderContext, rRect); - - // The background is taken care of by setting the background color - // in the constructor. Here we just paint the border. - rRenderContext.SetFillColor(); - rRenderContext.SetLineColor(Theme::GetColor(Theme::Color_DropDownBorder)); - rRenderContext.DrawRect(Rectangle(Point(0,0), GetOutputSizePixel())); -} - -} } // end of namespace svx::sidebar - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/sidebar/PageMarginControl.hxx b/sw/source/uibase/sidebar/PageMarginControl.hxx index 5336b14bf26f..822d7a8bdd40 100644 --- a/sw/source/uibase/sidebar/PageMarginControl.hxx +++ b/sw/source/uibase/sidebar/PageMarginControl.hxx @@ -19,8 +19,6 @@ #ifndef INCLUDED_SW_SOURCE_UIBASE_SIDEBAR_PAGEMARGINCONTROL_HXX #define INCLUDED_SW_SOURCE_UIBASE_SIDEBAR_PAGEMARGINCONTROL_HXX -#include <svx/sidebar/PopupControl.hxx> - #include <tools/fldunit.hxx> #include <svl/poolitem.hxx> #include <svx/rulritem.hxx> diff --git a/sw/source/uibase/sidebar/PagePropertyPanel.hxx b/sw/source/uibase/sidebar/PagePropertyPanel.hxx index e3cd3e995c1f..0c3bf05553b3 100644 --- a/sw/source/uibase/sidebar/PagePropertyPanel.hxx +++ b/sw/source/uibase/sidebar/PagePropertyPanel.hxx @@ -27,10 +27,6 @@ #include <sfx2/sidebar/ControllerItem.hxx> -namespace svx { namespace sidebar { - class PopupControl; -} } - #include <i18nutil/paper.hxx> #include <svx/pageitem.hxx> diff --git a/sw/source/uibase/sidebar/PageSizeControl.hxx b/sw/source/uibase/sidebar/PageSizeControl.hxx index 36c8c87c4fdb..3bd1da17beb1 100644 --- a/sw/source/uibase/sidebar/PageSizeControl.hxx +++ b/sw/source/uibase/sidebar/PageSizeControl.hxx @@ -19,8 +19,6 @@ #ifndef INCLUDED_SW_SOURCE_UIBASE_SIDEBAR_PAGESIZECONTROL_HXX #define INCLUDED_SW_SOURCE_UIBASE_SIDEBAR_PAGESIZECONTROL_HXX -#include <svx/sidebar/PopupControl.hxx> - #include <i18nutil/paper.hxx> #include <vcl/button.hxx> |