move SvxColorWindow to include/svx

Change-Id: Ie2e11c8582cbb204178c0616580f942d1ce773fb

3 files changed, 2 insertions, 85 deletions

diff --git a/svx/source/tbxctrls/colorwindow.hxx b/svx/source/tbxctrls/colorwindow.hxx
deleted file mode 100644
index 19b913254d22..000000000000
--- a/svx/source/tbxctrls/colorwindow.hxx
+++ /dev/null
@@ -1,83 +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_SOURCE_TBXCTRLS_COLORWINDOW_HXX
-#define INCLUDED_SVX_SOURCE_TBXCTRLS_COLORWINDOW_HXX
-
-#include <sfx2/tbxctrl.hxx>
-#include <svtools/valueset.hxx>
-#include <svl/lstner.hxx>
-#include <rtl/ustring.hxx>
-#include <com/sun/star/frame/XFrame.hpp>
-#include <svx/SvxColorValueSet.hxx>
-#include <svx/PaletteManager.hxx>
-#include <vcl/lstbox.hxx>
-
-#include <functional>
-
-class BorderColorStatus;
-
-class SvxColorWindow : public SfxPopupWindow
-{
-private:
-    const sal_uInt16    theSlotId;
-    VclPtr<SvxColorValueSet>   mpColorSet;
-    VclPtr<SvxColorValueSet>   mpRecentColorSet;
-
-    VclPtr<ListBox>     mpPaletteListBox;
-    VclPtr<PushButton>  mpButtonAutoColor;
-    VclPtr<PushButton>  mpButtonPicker;
-    VclPtr<FixedLine>   mpAutomaticSeparator;
-    OUString            maCommand;
-    Link<const Color&, void> maSelectedLink;
-
-    PaletteManager&     mrPaletteManager;
-    BorderColorStatus&  mrBorderColorStatus;
-
-    std::function<void(const OUString&, const Color&)> maColorSelectFunction;
-
-    DECL_LINK( SelectHdl, ValueSet*, void );
-    DECL_LINK( SelectPaletteHdl, ListBox&, void);
-    DECL_LINK( AutoColorClickHdl, Button*, void );
-    DECL_LINK( OpenPickerClickHdl, Button*, void );
-
-protected:
-    virtual void    Resize() override;
-
-public:
-    SvxColorWindow( const OUString& rCommand,
-                         PaletteManager& rPaletteManager,
-                         BorderColorStatus& rBorderColorStatus,
-                         sal_uInt16 nSlotId,
-                         const css::uno::Reference< css::frame::XFrame >& rFrame,
-                         vcl::Window* pParentWindow,
-                         std::function<void(const OUString&, const Color&)> const & maColorSelectFunction);
-    virtual ~SvxColorWindow() override;
-    virtual void        dispose() override;
-    void                StartSelection();
-
-    virtual void        KeyInput( const KeyEvent& rKEvt ) override;
-    virtual void        statusChanged( const css::frame::FeatureStateEvent& rEvent ) override;
-
-    void SetSelectedHdl( const Link<const Color&, void>& rLink ) { maSelectedLink = rLink; }
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx
index 4a74d5d661c9..9bc40b2c2b35 100644
--- a/svx/source/tbxctrls/extrusioncontrols.cxx
+++ b/svx/source/tbxctrls/extrusioncontrols.cxx
@@ -23,6 +23,7 @@
 #include <osl/mutex.hxx>
 
 #include <svtools/toolbarmenu.hxx>
+#include <svx/colorwindow.hxx>
 #include <vcl/toolbox.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/dispatch.hxx>
@@ -41,7 +42,6 @@
 #include "helpid.hrc"
 #include "extrusioncontrols.hxx"
 #include "extrusioncontrols.hrc"
-#include "colorwindow.hxx"
 #include "extrusiondepthdialog.hxx"
 
 using namespace ::com::sun::star::uno;
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index c93eb0ee53b3..c1cc24c547da 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -84,11 +84,11 @@
 #include <editeng/wghtitem.hxx>
 #include <editeng/svxfont.hxx>
 #include <editeng/cmapitem.hxx>
+#include <svx/colorwindow.hxx>
 #include "svx/drawitem.hxx"
 #include <svx/tbcontrl.hxx>
 #include "svx/dlgutil.hxx"
 #include <svx/dialmgr.hxx>
-#include "colorwindow.hxx"
 #include <memory>
 
 #include <svx/framelink.hxx>