include/svx/colorwindow.hxx | 81 +++++++++++++++++++++++++++++
svx/source/tbxctrls/colorwindow.hxx | 83 ------------------------------
svx/source/tbxctrls/extrusioncontrols.cxx | 2
svx/source/tbxctrls/tbcontrl.cxx | 6 --
4 files changed, 83 insertions(+), 89 deletions(-)
New commits:
commit c7b0d2f107ee0088516ed14cc570f12c28ad067d
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri Oct 28 13:22:31 2016 +0100
drop SvxColorWindow::Resize
Change-Id: I22ed6ace464cdfd4ee0c12e8269d8141efce57a6
diff --git a/include/svx/colorwindow.hxx b/include/svx/colorwindow.hxx
index b9def74..8b185d9 100644
--- a/include/svx/colorwindow.hxx
+++ b/include/svx/colorwindow.hxx
@@ -58,9 +58,6 @@ private:
DECL_LINK( AutoColorClickHdl, Button*, void );
DECL_LINK( OpenPickerClickHdl, Button*, void );
-protected:
- virtual void Resize() override;
-
public:
SvxColorWindow( const OUString& rCommand,
PaletteManager& rPaletteManager,
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index c1cc24c..5d3b359 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -1474,10 +1474,6 @@ IMPL_LINK_NOARG(SvxColorWindow, OpenPickerClickHdl,
Button*, void)
mrPaletteManager.PopupColorPicker(maCommand);
}
-void SvxColorWindow::Resize()
-{
-}
-
void SvxColorWindow::StartSelection()
{
mpColorSet->StartSelection();
commit eb153b8f1af3044ec8b621f29c81ddff89b99584
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri Oct 28 13:19:20 2016 +0100
move SvxColorWindow to include/svx
Change-Id: Ie2e11c8582cbb204178c0616580f942d1ce773fb
diff --git a/svx/source/tbxctrls/colorwindow.hxx b/include/svx/colorwindow.hxx
similarity index 97%
rename from svx/source/tbxctrls/colorwindow.hxx
rename to include/svx/colorwindow.hxx
index 19b9132..b9def74 100644
--- a/svx/source/tbxctrls/colorwindow.hxx
+++ b/include/svx/colorwindow.hxx
@@ -32,8 +32,9 @@
#include <functional>
class BorderColorStatus;
+class Button;
-class SvxColorWindow : public SfxPopupWindow
+class SVX_DLLPUBLIC SvxColorWindow : public SfxPopupWindow
{
private:
const sal_uInt16 theSlotId;
diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx
b/svx/source/tbxctrls/extrusioncontrols.cxx
index 4a74d5d..9bc40b2 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 c93eb0e..c1cc24c 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>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
