sc/source/ui/inc/acredlin.hxx | 1 -
sc/source/ui/inc/autofmt.hxx | 1 -
sc/source/ui/inc/consdlg.hxx | 1 -
sc/source/ui/inc/filtdlg.hxx | 1 -
sc/source/ui/inc/highred.hxx | 1 -
sc/source/ui/inc/namedlg.hxx | 1 -
sc/source/ui/inc/pfiltdlg.hxx | 1 -
sc/source/ui/inc/pvfundlg.hxx | 1 -
sc/source/ui/inc/simpref.hxx | 1 -
solenv/clang-format/blacklist | 4 ++--
svx/source/dialog/srchdlg.cxx | 1 -
toolkit/source/awt/vclxtoolkit.cxx | 2 +-
vcl/Library_vcl.mk | 2 +-
vcl/source/toolkit/morebtn.cxx | 2 +-
14 files changed, 5 insertions(+), 15 deletions(-)
New commits:
commit 26c7c10d2de625f616d34897fa45c1b9b22c50a8
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Sun Oct 14 20:09:47 2018 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Sun Oct 14 22:27:05 2018 +0200
MoreButton is solely used by toolkit
Change-Id: Ieb436b49be3598e316d59a6d89cb211879d061c1
Reviewed-on: https://gerrit.libreoffice.org/61766
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/include/vcl/morebtn.hxx b/include/vcl/toolkit/morebtn.hxx
similarity index 100%
rename from include/vcl/morebtn.hxx
rename to include/vcl/toolkit/morebtn.hxx
diff --git a/sc/source/ui/inc/acredlin.hxx b/sc/source/ui/inc/acredlin.hxx
index 52526a8bbafb..2cca8dcc3416 100644
--- a/sc/source/ui/inc/acredlin.hxx
+++ b/sc/source/ui/inc/acredlin.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_SC_SOURCE_UI_INC_ACREDLIN_HXX
#define INCLUDED_SC_SOURCE_UI_INC_ACREDLIN_HXX
-#include <vcl/morebtn.hxx>
#include <vcl/combobox.hxx>
#include <svtools/headbar.hxx>
#include <svtools/simptabl.hxx>
diff --git a/sc/source/ui/inc/autofmt.hxx b/sc/source/ui/inc/autofmt.hxx
index fc7bbde7d4d9..25e70f9e69b0 100644
--- a/sc/source/ui/inc/autofmt.hxx
+++ b/sc/source/ui/inc/autofmt.hxx
@@ -24,7 +24,6 @@
#include <vcl/fixed.hxx>
#include <vcl/lstbox.hxx>
#include <vcl/button.hxx>
-#include <vcl/morebtn.hxx>
#include <svtools/scriptedtext.hxx>
#include <svx/framelinkarray.hxx>
#include <scdllapi.h>
diff --git a/sc/source/ui/inc/consdlg.hxx b/sc/source/ui/inc/consdlg.hxx
index 13db9eff938f..5c6429e8825c 100644
--- a/sc/source/ui/inc/consdlg.hxx
+++ b/sc/source/ui/inc/consdlg.hxx
@@ -23,7 +23,6 @@
#include <vcl/fixed.hxx>
#include <vcl/lstbox.hxx>
#include <vcl/layout.hxx>
-#include <vcl/morebtn.hxx>
#include <global.hxx>
#include "anyrefdg.hxx"
diff --git a/sc/source/ui/inc/filtdlg.hxx b/sc/source/ui/inc/filtdlg.hxx
index 8200b1c4b242..86df47984813 100644
--- a/sc/source/ui/inc/filtdlg.hxx
+++ b/sc/source/ui/inc/filtdlg.hxx
@@ -23,7 +23,6 @@
#include <vcl/combobox.hxx>
#include <vcl/lstbox.hxx>
#include <vcl/layout.hxx>
-#include <vcl/morebtn.hxx>
#include <global.hxx>
#include <address.hxx>
#include "anyrefdg.hxx"
diff --git a/sc/source/ui/inc/highred.hxx b/sc/source/ui/inc/highred.hxx
index 909c18f7865f..c13d4a1b5518 100644
--- a/sc/source/ui/inc/highred.hxx
+++ b/sc/source/ui/inc/highred.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_SC_SOURCE_UI_INC_HIGHRED_HXX
#define INCLUDED_SC_SOURCE_UI_INC_HIGHRED_HXX
-#include <vcl/morebtn.hxx>
#include <vcl/combobox.hxx>
#include <svtools/headbar.hxx>
#include <svtools/simptabl.hxx>
diff --git a/sc/source/ui/inc/namedlg.hxx b/sc/source/ui/inc/namedlg.hxx
index b9ea2bc75e6e..4139c1ae1c75 100644
--- a/sc/source/ui/inc/namedlg.hxx
+++ b/sc/source/ui/inc/namedlg.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_SC_SOURCE_UI_INC_NAMEDLG_HXX
#define INCLUDED_SC_SOURCE_UI_INC_NAMEDLG_HXX
-#include <vcl/morebtn.hxx>
#include <vcl/combobox.hxx>
#include <vcl/fixed.hxx>
#include <vcl/lstbox.hxx>
diff --git a/sc/source/ui/inc/pfiltdlg.hxx b/sc/source/ui/inc/pfiltdlg.hxx
index 07f2ab565bcc..31d7b04d73a6 100644
--- a/sc/source/ui/inc/pfiltdlg.hxx
+++ b/sc/source/ui/inc/pfiltdlg.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_SC_SOURCE_UI_INC_PFILTDLG_HXX
#define INCLUDED_SC_SOURCE_UI_INC_PFILTDLG_HXX
-#include <vcl/morebtn.hxx>
#include <vcl/button.hxx>
#include <vcl/fixed.hxx>
#include <vcl/dialog.hxx>
diff --git a/sc/source/ui/inc/pvfundlg.hxx b/sc/source/ui/inc/pvfundlg.hxx
index d7db0bf76530..40ce2858ef67 100644
--- a/sc/source/ui/inc/pvfundlg.hxx
+++ b/sc/source/ui/inc/pvfundlg.hxx
@@ -29,7 +29,6 @@
#include <vcl/lstbox.hxx>
#include <vcl/dialog.hxx>
#include <vcl/button.hxx>
-#include <vcl/morebtn.hxx>
#include <vcl/field.hxx>
#include <vcl/weld.hxx>
#include <svx/checklbx.hxx>
diff --git a/sc/source/ui/inc/simpref.hxx b/sc/source/ui/inc/simpref.hxx
index 5babf263e4f3..94b67684743d 100644
--- a/sc/source/ui/inc/simpref.hxx
+++ b/sc/source/ui/inc/simpref.hxx
@@ -22,7 +22,6 @@
#include <vcl/combobox.hxx>
#include <vcl/fixed.hxx>
-#include <vcl/morebtn.hxx>
#include "anyrefdg.hxx"
#include <dbdata.hxx>
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index 6d0368fc6783..6afa247fbfab 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -7991,7 +7991,6 @@ include/vcl/metaactiontypes.hxx
include/vcl/metric.hxx
include/vcl/mnemonic.hxx
include/vcl/mnemonicengine.hxx
-include/vcl/morebtn.hxx
include/vcl/msgbox.hxx
include/vcl/notebookbar.hxx
include/vcl/oldprintadaptor.hxx
@@ -8052,6 +8051,7 @@ include/vcl/throbber.hxx
include/vcl/timer.hxx
include/vcl/toolbox.hxx
include/vcl/toolkit/group.hxx
+include/vcl/toolkit/morebtn.hxx
include/vcl/toolkit/unowrap.hxx
include/vcl/txtattr.hxx
include/vcl/uitest/factory.hxx
@@ -17993,7 +17993,6 @@ vcl/source/control/listbox.cxx
vcl/source/control/listctrl.cxx
vcl/source/control/longcurr.cxx
vcl/source/control/menubtn.cxx
-vcl/source/control/morebtn.cxx
vcl/source/control/notebookbar.cxx
vcl/source/control/prgsbar.cxx
vcl/source/control/quickselectionengine.cxx
@@ -18181,6 +18180,7 @@ vcl/source/outdev/vclreferencebase.cxx
vcl/source/outdev/wallpaper.cxx
vcl/source/salmain/salmain.cxx
vcl/source/toolkit/group.cxx
+vcl/source/toolkit/morebtn.cxx
vcl/source/uipreviewer/previewer.cxx
vcl/source/uitest/logger.cxx
vcl/source/uitest/uiobject.cxx
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index c94056e3f0dd..82e587626734 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -20,7 +20,6 @@
#include <sal/macros.h>
#include <vcl/wrkwin.hxx>
-#include <vcl/morebtn.hxx>
#include <vcl/timer.hxx>
#include <svl/slstitm.hxx>
#include <svl/itemiter.hxx>
diff --git a/toolkit/source/awt/vclxtoolkit.cxx
b/toolkit/source/awt/vclxtoolkit.cxx
index 4f078e2968f5..7632a50005c2 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -100,7 +100,7 @@
#include <vcl/longcurr.hxx>
#include <vcl/lstbox.hxx>
#include <vcl/menubtn.hxx>
-#include <vcl/morebtn.hxx>
+#include <vcl/toolkit/morebtn.hxx>
#include <vcl/msgbox.hxx>
#include <vcl/scrbar.hxx>
#include <vcl/spin.hxx>
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index b856204a8569..a16134017627 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -188,7 +188,6 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
vcl/source/control/imp_listbox \
vcl/source/control/listbox \
vcl/source/control/menubtn \
- vcl/source/control/morebtn \
vcl/source/control/notebookbar \
vcl/source/control/quickselectionengine \
vcl/source/control/prgsbar \
@@ -207,6 +206,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
vcl/source/edit/txtattr \
vcl/source/edit/xtextedt \
vcl/source/toolkit/group \
+ vcl/source/toolkit/morebtn \
vcl/source/outdev/outdev \
vcl/source/outdev/outdevstate \
vcl/source/outdev/outdevstatestack \
diff --git a/vcl/source/control/morebtn.cxx b/vcl/source/toolkit/morebtn.cxx
similarity index 98%
rename from vcl/source/control/morebtn.cxx
rename to vcl/source/toolkit/morebtn.cxx
index 6756853fe5ec..42923e1104a2 100644
--- a/vcl/source/control/morebtn.cxx
+++ b/vcl/source/toolkit/morebtn.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <vcl/morebtn.hxx>
+#include <vcl/toolkit/morebtn.hxx>
#include <vector>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
