chart2/source/controller/dialogs/DataBrowser.cxx | 2 --
dbaccess/source/ui/control/tabletree.cxx | 1 -
dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx | 1 -
dbaccess/source/ui/inc/WCPage.hxx | 1 -
dbaccess/source/ui/relationdesign/RelationController.cxx | 1 -
extensions/source/propctrlr/standardcontrol.hxx | 1 -
include/vcl/toolkit/roadmap.hxx | 2 +-
include/vcl/toolkit/throbber.hxx | 2 +-
include/vcl/uitest/uiobject.hxx | 4 ++--
solenv/clang-format/blacklist | 4 ++--
svx/source/fmcomp/fmgridcl.cxx | 1 -
sw/source/core/doc/docedt.cxx | 1 -
sw/source/core/docnode/ndcopy.cxx | 1 -
sw/source/ui/dbui/mmresultdialogs.cxx | 2 +-
sw/source/ui/index/cnttab.cxx | 1 -
sw/source/uibase/app/docsh.cxx | 1 -
sw/source/uibase/uiview/viewsrch.cxx | 1 -
sw/source/uibase/utlui/navipi.cxx | 1 -
toolkit/source/awt/vclxspinbutton.cxx | 2 +-
toolkit/source/awt/vclxtoolkit.cxx | 4 ++--
toolkit/source/awt/vclxwindows.cxx | 2 +-
vcl/source/control/imgctrl.cxx | 2 +-
vcl/source/control/spinbtn.cxx | 2 +-
vcl/source/uitest/uiobject.cxx | 2 +-
vcl/workben/svpclient.cxx | 2 +-
25 files changed, 15 insertions(+), 29 deletions(-)
New commits:
commit f645993593ff931d1659e701487131e3bd1b40f5
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Oct 29 17:22:19 2019 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Oct 30 09:13:07 2019 +0100
imgctrl.hxx only used by vcl and toolkit
Change-Id: I77e2efa77d9fbc0830553faed269e1fec2b2a286
Reviewed-on: https://gerrit.libreoffice.org/81713
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/include/vcl/imgctrl.hxx b/include/vcl/toolkit/imgctrl.hxx
similarity index 100%
rename from include/vcl/imgctrl.hxx
rename to include/vcl/toolkit/imgctrl.hxx
diff --git a/include/vcl/toolkit/roadmap.hxx b/include/vcl/toolkit/roadmap.hxx
index 0c08147b0784..3ec6f7574a2c 100644
--- a/include/vcl/toolkit/roadmap.hxx
+++ b/include/vcl/toolkit/roadmap.hxx
@@ -21,7 +21,7 @@
#include <vcl/dllapi.h>
#include <vcl/ctrl.hxx>
-#include <vcl/imgctrl.hxx>
+#include <vcl/toolkit/imgctrl.hxx>
#include <memory>
class Bitmap;
diff --git a/include/vcl/toolkit/throbber.hxx b/include/vcl/toolkit/throbber.hxx
index b0f49b18c38e..7034bfa82b22 100644
--- a/include/vcl/toolkit/throbber.hxx
+++ b/include/vcl/toolkit/throbber.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_VCL_THROBBER_HXX
#include <vcl/dllapi.h>
-#include <vcl/imgctrl.hxx>
+#include <vcl/toolkit/imgctrl.hxx>
#include <vcl/timer.hxx>
#include <vector>
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index a113d1c9cb2c..c3693241d5af 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -7818,7 +7818,6 @@ include/vcl/imapcirc.hxx
include/vcl/imapobj.hxx
include/vcl/imappoly.hxx
include/vcl/imaprect.hxx
-include/vcl/imgctrl.hxx
include/vcl/inetimg.hxx
include/vcl/inputctx.hxx
include/vcl/inputtypes.hxx
@@ -7900,6 +7899,7 @@ include/vcl/threadex.hxx
include/vcl/timer.hxx
include/vcl/toolbox.hxx
include/vcl/toolkit/group.hxx
+include/vcl/toolkit/imgctrl.hxx
include/vcl/toolkit/morebtn.hxx
include/vcl/toolkit/roadmap.hxx
include/vcl/toolkit/spin.hxx
diff --git a/toolkit/source/awt/vclxtoolkit.cxx
b/toolkit/source/awt/vclxtoolkit.cxx
index b0ccf3b64870..754176927e2e 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -90,7 +90,6 @@
#include <vcl/fixed.hxx>
#include <vcl/floatwin.hxx>
#include <vcl/scheduler.hxx>
-#include <vcl/imgctrl.hxx>
#include <vcl/longcurr.hxx>
#include <vcl/lstbox.hxx>
#include <vcl/menubtn.hxx>
@@ -108,6 +107,7 @@
#include <vcl/window.hxx>
#include <vcl/wrkwin.hxx>
#include <vcl/toolkit/group.hxx>
+#include <vcl/toolkit/imgctrl.hxx>
#include <vcl/toolkit/morebtn.hxx>
#include <vcl/toolkit/roadmap.hxx>
#include <vcl/toolkit/spin.hxx>
diff --git a/toolkit/source/awt/vclxwindows.cxx
b/toolkit/source/awt/vclxwindows.cxx
index 5d327f6b13d3..4d072ced46e6 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -47,7 +47,7 @@
#include <vcl/field.hxx>
#include <vcl/fixedhyper.hxx>
#include <vcl/longcurr.hxx>
-#include <vcl/imgctrl.hxx>
+#include <vcl/toolkit/imgctrl.hxx>
#include <vcl/dialog.hxx>
#include <vcl/scrbar.hxx>
#include <vcl/svapp.hxx>
diff --git a/vcl/source/control/imgctrl.cxx b/vcl/source/control/imgctrl.cxx
index 7e6fca11b0eb..3c60d92a4429 100644
--- a/vcl/source/control/imgctrl.cxx
+++ b/vcl/source/control/imgctrl.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <vcl/imgctrl.hxx>
+#include <vcl/toolkit/imgctrl.hxx>
#include <com/sun/star/awt/ImageScaleMode.hpp>
#include <osl/diagnose.h>
diff --git a/vcl/workben/svpclient.cxx b/vcl/workben/svpclient.cxx
index 74ccb9f9205f..93fa276b61f2 100644
--- a/vcl/workben/svpclient.cxx
+++ b/vcl/workben/svpclient.cxx
@@ -32,7 +32,7 @@
#include <vcl/wrkwin.hxx>
#include <vcl/button.hxx>
#include <vcl/lstbox.hxx>
-#include <vcl/imgctrl.hxx>
+#include <vcl/toolkit/imgctrl.hxx>
#include <vcl/bitmapex.hxx>
#include <vcl/graphicfilter.hxx>
#include <vcl/graph.hxx>
commit 3e041c06897fb917977c18f57bde5871b0466a99
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Oct 29 17:06:09 2019 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Oct 30 09:12:44 2019 +0100
remove some unnecessary includes
Change-Id: I5cad1142641587ef4393cbf73384f93540d61038
Reviewed-on: https://gerrit.libreoffice.org/81712
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx
b/chart2/source/controller/dialogs/DataBrowser.cxx
index e05cdeb8174d..10c1ecaffe44 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -31,8 +31,6 @@
#include <bitmaps.hlst>
#include <helpids.h>
-#include <vcl/fixed.hxx>
-#include <vcl/image.hxx>
#include <vcl/weld.hxx>
#include <vcl/settings.hxx>
#include <vcl/svapp.hxx>
diff --git a/dbaccess/source/ui/control/tabletree.cxx
b/dbaccess/source/ui/control/tabletree.cxx
index d591ececdf30..e34cd4918e2e 100644
--- a/dbaccess/source/ui/control/tabletree.cxx
+++ b/dbaccess/source/ui/control/tabletree.cxx
@@ -21,7 +21,6 @@
#include <tabletree.hxx>
#include <imageprovider.hxx>
#include <strings.hrc>
-#include <vcl/layout.hxx>
#include <vcl/menu.hxx>
#include <connectivity/dbtools.hxx>
#include <comphelper/types.hxx>
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
index 42bfc5c88079..c806685f9f30 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
@@ -30,7 +30,6 @@
#include <svl/intitem.hxx>
#include <dsitems.hxx>
#include "dsnItem.hxx"
-#include <vcl/layout.hxx>
#include <vcl/mnemonic.hxx>
#include <svl/cjkoptions.hxx>
diff --git a/dbaccess/source/ui/inc/WCPage.hxx
b/dbaccess/source/ui/inc/WCPage.hxx
index f89c89821800..2dbe36d01c5a 100644
--- a/dbaccess/source/ui/inc/WCPage.hxx
+++ b/dbaccess/source/ui/inc/WCPage.hxx
@@ -22,7 +22,6 @@
#include "WTabPage.hxx"
#include "QEnumTypes.hxx"
-#include <vcl/fixed.hxx>
namespace dbaui
{
diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx
b/dbaccess/source/ui/relationdesign/RelationController.cxx
index 8ded88ed3c97..e3ec54717b89 100644
--- a/dbaccess/source/ui/relationdesign/RelationController.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationController.cxx
@@ -56,7 +56,6 @@
#include <com/sun/star/io/XActiveDataSink.hpp>
#include <sqlmessage.hxx>
#include <RelationController.hxx>
-#include <vcl/layout.hxx>
#include <TableWindowData.hxx>
#include <UITools.hxx>
#include <RTableConnectionData.hxx>
diff --git a/extensions/source/propctrlr/standardcontrol.hxx
b/extensions/source/propctrlr/standardcontrol.hxx
index 6da36353c28e..f78c225e1175 100644
--- a/extensions/source/propctrlr/standardcontrol.hxx
+++ b/extensions/source/propctrlr/standardcontrol.hxx
@@ -28,7 +28,6 @@
#include <com/sun/star/inspection/XHyperlinkControl.hpp>
#include <com/sun/star/uno/Sequence.hxx>
#include <vcl/field.hxx>
-#include <vcl/longcurr.hxx>
#include <svtools/ctrlbox.hxx>
#include <vcl/lstbox.hxx>
#include <vcl/combobox.hxx>
diff --git a/include/vcl/uitest/uiobject.hxx b/include/vcl/uitest/uiobject.hxx
index c805f81f1b84..409dbf1e5b99 100644
--- a/include/vcl/uitest/uiobject.hxx
+++ b/include/vcl/uitest/uiobject.hxx
@@ -19,7 +19,6 @@
#include <vcl/tabpage.hxx>
#include <vcl/lstbox.hxx>
#include <vcl/combobox.hxx>
-#include <vcl/spinfld.hxx>
#include <vcl/tabctrl.hxx>
#include <vcl/treelistbox.hxx>
@@ -29,6 +28,7 @@
class Edit;
class SpinButton;
+class SpinField;
typedef std::map<const OUString, OUString> StringMap;
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index d5d9b3218772..ebbe12f2b96f 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -71,7 +71,6 @@
#include <tools/diagnose_ex.h>
#include <vcl/help.hxx>
#include <vcl/image.hxx>
-#include <vcl/longcurr.hxx>
#include <vcl/menu.hxx>
#include <vcl/settings.hxx>
#include <sal/log.hxx>
diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
index 46305d27996f..7161caa5ff92 100644
--- a/sw/source/core/doc/docedt.cxx
+++ b/sw/source/core/doc/docedt.cxx
@@ -36,7 +36,6 @@
#include <splargs.hxx>
#include <txtfrm.hxx>
#include <breakit.hxx>
-#include <vcl/layout.hxx>
#include <editsh.hxx>
#include <fmtfld.hxx>
#include <docufld.hxx>
diff --git a/sw/source/core/docnode/ndcopy.cxx
b/sw/source/core/docnode/ndcopy.cxx
index 1331c4e5b8a1..e08835cf66e1 100644
--- a/sw/source/core/docnode/ndcopy.cxx
+++ b/sw/source/core/docnode/ndcopy.cxx
@@ -27,7 +27,6 @@
#include <docary.hxx>
#include <ddefld.hxx>
#include <swddetbl.hxx>
-#include <vcl/fmtfield.hxx>
#include <ndindex.hxx>
#include <vector>
#include <osl/diagnose.h>
diff --git a/sw/source/ui/dbui/mmresultdialogs.cxx
b/sw/source/ui/dbui/mmresultdialogs.cxx
index 4bb4b971d5a9..53a76b8eb2bb 100644
--- a/sw/source/ui/dbui/mmresultdialogs.cxx
+++ b/sw/source/ui/dbui/mmresultdialogs.cxx
@@ -41,8 +41,8 @@
#include <svl/stritem.hxx>
#include <svtools/ehdl.hxx>
#include <svtools/sfxecode.hxx>
-#include <vcl/layout.hxx>
#include <vcl/stdtext.hxx>
+#include <vcl/svapp.hxx>
#include <vcl/weld.hxx>
#include <sfx2/dinfdlg.hxx>
#include <sfx2/printer.hxx>
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 3ef5fb14bb3f..6873180815ea 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -22,7 +22,6 @@
#include <sal/log.hxx>
#include <svl/style.hxx>
#include <vcl/help.hxx>
-#include <vcl/layout.hxx>
#include <vcl/weld.hxx>
#include <svl/stritem.hxx>
#include <svl/urihelper.hxx>
diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx
index 2ee6242d6b9f..8ca4d4a07651 100644
--- a/sw/source/uibase/app/docsh.cxx
+++ b/sw/source/uibase/app/docsh.cxx
@@ -20,7 +20,6 @@
#include <config_features.h>
#include <hintids.hxx>
-#include <vcl/layout.hxx>
#include <vcl/weld.hxx>
#include <vcl/svapp.hxx>
#include <vcl/syswin.hxx>
diff --git a/sw/source/uibase/uiview/viewsrch.cxx
b/sw/source/uibase/uiview/viewsrch.cxx
index 6d07a2a36441..615c1288052b 100644
--- a/sw/source/uibase/uiview/viewsrch.cxx
+++ b/sw/source/uibase/uiview/viewsrch.cxx
@@ -43,7 +43,6 @@
#include <svx/srchdlg.hxx>
#include <svx/dialogs.hrc>
#include <svx/svxids.hrc>
-#include <vcl/layout.hxx>
#include <editeng/unolingu.hxx>
#include <edtwin.hxx>
#include <swmodule.hxx>
diff --git a/sw/source/uibase/utlui/navipi.cxx
b/sw/source/uibase/utlui/navipi.cxx
index 4d2615eb5979..0046f06a66f9 100644
--- a/sw/source/uibase/utlui/navipi.cxx
+++ b/sw/source/uibase/utlui/navipi.cxx
@@ -23,7 +23,6 @@
#include <svl/stritem.hxx>
#include <vcl/builderfactory.hxx>
#include <vcl/graphicfilter.hxx>
-#include <vcl/layout.hxx>
#include <svl/urihelper.hxx>
#include <sot/formats.hxx>
#include <sot/filelist.hxx>
commit b8adb8264b48e66d7435e4463f575e25c5e02250
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Oct 29 17:00:54 2019 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Oct 30 09:12:20 2019 +0100
SpinButton only needed by vcl and toolkit
Change-Id: I1a99231a895269bc728ed7730fe277bb8e73a25e
Reviewed-on: https://gerrit.libreoffice.org/81711
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/include/vcl/spin.hxx b/include/vcl/toolkit/spin.hxx
similarity index 100%
rename from include/vcl/spin.hxx
rename to include/vcl/toolkit/spin.hxx
diff --git a/include/vcl/uitest/uiobject.hxx b/include/vcl/uitest/uiobject.hxx
index 3a94ffa53bc5..c805f81f1b84 100644
--- a/include/vcl/uitest/uiobject.hxx
+++ b/include/vcl/uitest/uiobject.hxx
@@ -15,7 +15,6 @@
#include <memory>
#include <vcl/window.hxx>
-#include <vcl/spin.hxx>
#include <vcl/button.hxx>
#include <vcl/tabpage.hxx>
#include <vcl/lstbox.hxx>
@@ -29,6 +28,7 @@
#include <set>
class Edit;
+class SpinButton;
typedef std::map<const OUString, OUString> StringMap;
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index b12f71769717..a113d1c9cb2c 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -7874,7 +7874,6 @@ include/vcl/seleng.hxx
include/vcl/settings.hxx
include/vcl/slider.hxx
include/vcl/sound.hxx
-include/vcl/spin.hxx
include/vcl/spinfld.hxx
include/vcl/split.hxx
include/vcl/splitwin.hxx
@@ -7903,6 +7902,7 @@ include/vcl/toolbox.hxx
include/vcl/toolkit/group.hxx
include/vcl/toolkit/morebtn.hxx
include/vcl/toolkit/roadmap.hxx
+include/vcl/toolkit/spin.hxx
include/vcl/toolkit/tabdlg.hxx
include/vcl/toolkit/throbber.hxx
include/vcl/toolkit/unowrap.hxx
diff --git a/toolkit/source/awt/vclxspinbutton.cxx
b/toolkit/source/awt/vclxspinbutton.cxx
index d0231442108e..fc6819ef3eef 100644
--- a/toolkit/source/awt/vclxspinbutton.cxx
+++ b/toolkit/source/awt/vclxspinbutton.cxx
@@ -21,7 +21,7 @@
#include <toolkit/helper/property.hxx>
#include <com/sun/star/awt/ScrollBarOrientation.hpp>
-#include <vcl/spin.hxx>
+#include <vcl/toolkit/spin.hxx>
#include <vcl/svapp.hxx>
#include "vclxwindows_internal.hxx"
diff --git a/toolkit/source/awt/vclxtoolkit.cxx
b/toolkit/source/awt/vclxtoolkit.cxx
index c70c9b8d4888..b0ccf3b64870 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -96,7 +96,6 @@
#include <vcl/menubtn.hxx>
#include <vcl/stdtext.hxx>
#include <vcl/scrbar.hxx>
-#include <vcl/spin.hxx>
#include <vcl/split.hxx>
#include <vcl/splitwin.hxx>
#include <vcl/status.hxx>
@@ -111,6 +110,7 @@
#include <vcl/toolkit/group.hxx>
#include <vcl/toolkit/morebtn.hxx>
#include <vcl/toolkit/roadmap.hxx>
+#include <vcl/toolkit/spin.hxx>
#include <vcl/toolkit/tabdlg.hxx>
#include <vcl/toolkit/throbber.hxx>
#if HAVE_FEATURE_OPENGL
diff --git a/vcl/source/control/spinbtn.cxx b/vcl/source/control/spinbtn.cxx
index 41d815c1c578..6c738b5056ad 100644
--- a/vcl/source/control/spinbtn.cxx
+++ b/vcl/source/control/spinbtn.cxx
@@ -18,7 +18,7 @@
*/
#include <vcl/event.hxx>
-#include <vcl/spin.hxx>
+#include <vcl/toolkit/spin.hxx>
#include <vcl/settings.hxx>
#include <vcl/vclevent.hxx>
diff --git a/vcl/source/uitest/uiobject.cxx b/vcl/source/uitest/uiobject.cxx
index 4cf20f316c21..201a05e02bb7 100644
--- a/vcl/source/uitest/uiobject.cxx
+++ b/vcl/source/uitest/uiobject.cxx
@@ -13,7 +13,7 @@
#include <vcl/tabpage.hxx>
#include <vcl/lstbox.hxx>
#include <vcl/combobox.hxx>
-#include <vcl/spin.hxx>
+#include <vcl/toolkit/spin.hxx>
#include <vcl/spinfld.hxx>
#include <vcl/button.hxx>
#include <vcl/dialog.hxx>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
