accessibility/Library_acc.mk | 4 ++++
accessibility/source/extended/accessibletablistbox.cxx | 4 +---
accessibility/source/extended/accessibletablistboxtable.cxx | 4 +---
dbaccess/source/ui/app/AppController.cxx | 1 -
dbaccess/source/ui/app/AppControllerDnD.cxx | 1 -
include/vcl/toolkit/dialog.hxx | 2 +-
include/vcl/toolkit/field.hxx | 2 +-
include/vcl/toolkit/fixedhyper.hxx | 2 +-
include/vcl/toolkit/group.hxx | 2 +-
include/vcl/toolkit/imgctrl.hxx | 2 +-
include/vcl/toolkit/morebtn.hxx | 2 +-
include/vcl/toolkit/prgsbar.hxx | 2 +-
include/vcl/toolkit/roadmap.hxx | 2 +-
include/vcl/toolkit/spin.hxx | 2 +-
include/vcl/toolkit/svtabbx.hxx | 10 +++++-----
include/vcl/toolkit/tabdlg.hxx | 2 +-
include/vcl/toolkit/throbber.hxx | 2 +-
include/vcl/toolkit/unowrap.hxx | 2 +-
sc/source/ui/navipi/content.cxx | 1 -
solenv/clang-format/blacklist | 2 +-
vcl/CppunitTest_vcl_lifecycle.mk | 2 +-
vcl/Executable_icontest.mk | 2 +-
vcl/Executable_ui-previewer.mk | 2 +-
vcl/inc/treeglue.hxx | 2 +-
vcl/source/app/salvtables.cxx | 2 +-
vcl/source/treelist/svtabbx.cxx | 2 +-
vcl/source/window/builder.cxx | 2 +-
27 files changed, 31 insertions(+), 34 deletions(-)
New commits:
commit b17741499383424a1d9ea4c2eb22906a3a6565aa
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Feb 18 12:20:39 2020 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Feb 19 09:53:31 2020 +0100
drop some unneeded includes
Change-Id: Ia7cd7968346ce724ef763ce9578190ae12bdc5b3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88932
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/dbaccess/source/ui/app/AppController.cxx
b/dbaccess/source/ui/app/AppController.cxx
index 087f7e500f0f..3b7a3a607716 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -69,7 +69,6 @@
#include <vcl/treelistbox.hxx>
#include <vcl/transfer.hxx>
#include <svtools/cliplistener.hxx>
-#include <vcl/svlbitm.hxx>
#include <svtools/insdlg.hxx>
#include <comphelper/sequence.hxx>
diff --git a/dbaccess/source/ui/app/AppControllerDnD.cxx
b/dbaccess/source/ui/app/AppControllerDnD.cxx
index f7dc6d0bfad9..a7ee7749495b 100644
--- a/dbaccess/source/ui/app/AppControllerDnD.cxx
+++ b/dbaccess/source/ui/app/AppControllerDnD.cxx
@@ -56,7 +56,6 @@
#include <strings.hrc>
#include <vcl/menu.hxx>
#include <vcl/svapp.hxx>
-#include <vcl/svlbitm.hxx>
#include <listviewitems.hxx>
#include "AppDetailView.hxx"
#include <linkeddocuments.hxx>
diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx
index a64e772ac138..0e073beb92bc 100644
--- a/sc/source/ui/navipi/content.cxx
+++ b/sc/source/ui/navipi/content.cxx
@@ -27,7 +27,6 @@
#include <vcl/help.hxx>
#include <vcl/svapp.hxx>
#include <tools/urlobj.hxx>
-#include <vcl/svlbitm.hxx>
#include <vcl/treelistentry.hxx>
#include <sal/log.hxx>
#include <unotools/charclass.hxx>
commit a1fcbda2f88ed6a44d491f3ed1ecc248f3de53c7
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Feb 18 12:09:27 2020 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Feb 19 09:53:06 2020 +0100
move svtabbx.hxx to vcl/toolkit
Change-Id: Id4cf566f896b15b8d4e4cafbb92a990cedb447e7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88931
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/accessibility/Library_acc.mk b/accessibility/Library_acc.mk
index 54b3cf820da8..caf3d612330b 100644
--- a/accessibility/Library_acc.mk
+++ b/accessibility/Library_acc.mk
@@ -37,6 +37,10 @@ $(eval $(call gb_Library_use_libraries,acc,\
vcl \
))
+$(eval $(call gb_Library_add_defs,acc,\
+ -DVCL_INTERNALS \
+))
+
$(eval $(call gb_Library_add_exception_objects,acc,\
accessibility/source/extended/AccessibleBrowseBox \
accessibility/source/extended/AccessibleBrowseBoxBase \
diff --git a/accessibility/source/extended/accessibletablistbox.cxx
b/accessibility/source/extended/accessibletablistbox.cxx
index 2bd92178de9f..4bcfa92f7378 100644
--- a/accessibility/source/extended/accessibletablistbox.cxx
+++ b/accessibility/source/extended/accessibletablistbox.cxx
@@ -17,13 +17,11 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <extended/accessibletablistbox.hxx>
#include <extended/accessibletablistboxtable.hxx>
-#include <vcl/svtabbx.hxx>
+#include <vcl/toolkit/svtabbx.hxx>
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
-
namespace accessibility
{
diff --git a/accessibility/source/extended/accessibletablistboxtable.cxx
b/accessibility/source/extended/accessibletablistboxtable.cxx
index e0e3ca23ebc4..9b324862e1ef 100644
--- a/accessibility/source/extended/accessibletablistboxtable.cxx
+++ b/accessibility/source/extended/accessibletablistboxtable.cxx
@@ -17,15 +17,13 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <extended/accessibletablistboxtable.hxx>
#include <extended/AccessibleBrowseBoxTableCell.hxx>
#include <extended/AccessibleBrowseBoxCheckBoxCell.hxx>
-#include <vcl/svtabbx.hxx>
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
-
+#include <vcl/toolkit/svtabbx.hxx>
namespace accessibility
{
diff --git a/include/vcl/toolkit/dialog.hxx b/include/vcl/toolkit/dialog.hxx
index 2b341e7f99f1..96d843441f57 100644
--- a/include/vcl/toolkit/dialog.hxx
+++ b/include/vcl/toolkit/dialog.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_VCL_DIALOG_HXX
#define INCLUDED_VCL_DIALOG_HXX
-#if !defined(VCL_DLLIMPLEMENTATION) && !defined(TOOLKIT_DLLIMPLEMENTATION) &&
!defined(VCL_WORKBEN)
+#if !defined(VCL_DLLIMPLEMENTATION) && !defined(TOOLKIT_DLLIMPLEMENTATION) &&
!defined(VCL_INTERNALS)
#error "don't use this in new code"
#endif
diff --git a/include/vcl/toolkit/field.hxx b/include/vcl/toolkit/field.hxx
index cb6e93a436e5..460cbb3ee3ed 100644
--- a/include/vcl/toolkit/field.hxx
+++ b/include/vcl/toolkit/field.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_VCL_TOOLKIT_FIELD_HXX
#define INCLUDED_VCL_TOOLKIT_FIELD_HXX
-#if !defined(VCL_DLLIMPLEMENTATION) && !defined(TOOLKIT_DLLIMPLEMENTATION) &&
!defined(VCL_WORKBEN)
+#if !defined(VCL_DLLIMPLEMENTATION) && !defined(TOOLKIT_DLLIMPLEMENTATION) &&
!defined(VCL_INTERNALS)
#error "don't use this in new code"
#endif
diff --git a/include/vcl/toolkit/fixedhyper.hxx
b/include/vcl/toolkit/fixedhyper.hxx
index 58872639fd14..d4d5ab5051ce 100644
--- a/include/vcl/toolkit/fixedhyper.hxx
+++ b/include/vcl/toolkit/fixedhyper.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_VCL_FIXEDHYPER_HXX
#define INCLUDED_VCL_FIXEDHYPER_HXX
-#if !defined(VCL_DLLIMPLEMENTATION) && !defined(TOOLKIT_DLLIMPLEMENTATION) &&
!defined(VCL_WORKBEN)
+#if !defined(VCL_DLLIMPLEMENTATION) && !defined(TOOLKIT_DLLIMPLEMENTATION) &&
!defined(VCL_INTERNALS)
#error "don't use this in new code"
#endif
diff --git a/include/vcl/toolkit/group.hxx b/include/vcl/toolkit/group.hxx
index c7cd83d8d46c..bd88e1fdabbe 100644
--- a/include/vcl/toolkit/group.hxx
+++ b/include/vcl/toolkit/group.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_VCL_GROUP_HXX
#define INCLUDED_VCL_GROUP_HXX
-#if !defined(VCL_DLLIMPLEMENTATION) && !defined(TOOLKIT_DLLIMPLEMENTATION) &&
!defined(VCL_WORKBEN)
+#if !defined(VCL_DLLIMPLEMENTATION) && !defined(TOOLKIT_DLLIMPLEMENTATION) &&
!defined(VCL_INTERNALS)
#error "don't use this in new code"
#endif
diff --git a/include/vcl/toolkit/imgctrl.hxx b/include/vcl/toolkit/imgctrl.hxx
index 31fb55fef93d..c226f1f07407 100644
--- a/include/vcl/toolkit/imgctrl.hxx
+++ b/include/vcl/toolkit/imgctrl.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_VCL_IMGCTRL_HXX
#define INCLUDED_VCL_IMGCTRL_HXX
-#if !defined(VCL_DLLIMPLEMENTATION) && !defined(TOOLKIT_DLLIMPLEMENTATION) &&
!defined(VCL_WORKBEN)
+#if !defined(VCL_DLLIMPLEMENTATION) && !defined(TOOLKIT_DLLIMPLEMENTATION) &&
!defined(VCL_INTERNALS)
#error "don't use this in new code"
#endif
diff --git a/include/vcl/toolkit/morebtn.hxx b/include/vcl/toolkit/morebtn.hxx
index 52ac74e97c65..9ea7e5db63a9 100644
--- a/include/vcl/toolkit/morebtn.hxx
+++ b/include/vcl/toolkit/morebtn.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_VCL_MOREBTN_HXX
#define INCLUDED_VCL_MOREBTN_HXX
-#if !defined(VCL_DLLIMPLEMENTATION) && !defined(TOOLKIT_DLLIMPLEMENTATION) &&
!defined(VCL_WORKBEN)
+#if !defined(VCL_DLLIMPLEMENTATION) && !defined(TOOLKIT_DLLIMPLEMENTATION) &&
!defined(VCL_INTERNALS)
#error "don't use this in new code"
#endif
diff --git a/include/vcl/toolkit/prgsbar.hxx b/include/vcl/toolkit/prgsbar.hxx
index 19fc72c46e72..ec48518c009f 100644
--- a/include/vcl/toolkit/prgsbar.hxx
+++ b/include/vcl/toolkit/prgsbar.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_VCL_PRGSBAR_HXX
#define INCLUDED_VCL_PRGSBAR_HXX
-#if !defined(VCL_DLLIMPLEMENTATION) && !defined(TOOLKIT_DLLIMPLEMENTATION) &&
!defined(VCL_WORKBEN)
+#if !defined(VCL_DLLIMPLEMENTATION) && !defined(TOOLKIT_DLLIMPLEMENTATION) &&
!defined(VCL_INTERNALS)
#error "don't use this in new code"
#endif
diff --git a/include/vcl/toolkit/roadmap.hxx b/include/vcl/toolkit/roadmap.hxx
index 1c7e7de94153..05e125497479 100644
--- a/include/vcl/toolkit/roadmap.hxx
+++ b/include/vcl/toolkit/roadmap.hxx
@@ -19,7 +19,7 @@
#ifndef INCLUDED_VCL_INC_ROADMAP_HXX
#define INCLUDED_VCL_INC_ROADMAP_HXX
-#if !defined(VCL_DLLIMPLEMENTATION) && !defined(TOOLKIT_DLLIMPLEMENTATION) &&
!defined(VCL_WORKBEN)
+#if !defined(VCL_DLLIMPLEMENTATION) && !defined(TOOLKIT_DLLIMPLEMENTATION) &&
!defined(VCL_INTERNALS)
#error "don't use this in new code"
#endif
diff --git a/include/vcl/toolkit/spin.hxx b/include/vcl/toolkit/spin.hxx
index 689e3fc1b871..8e0533bcbf45 100644
--- a/include/vcl/toolkit/spin.hxx
+++ b/include/vcl/toolkit/spin.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_VCL_SPIN_HXX
#define INCLUDED_VCL_SPIN_HXX
-#if !defined(VCL_DLLIMPLEMENTATION) && !defined(TOOLKIT_DLLIMPLEMENTATION) &&
!defined(VCL_WORKBEN)
+#if !defined(VCL_DLLIMPLEMENTATION) && !defined(TOOLKIT_DLLIMPLEMENTATION) &&
!defined(VCL_INTERNALS)
#error "don't use this in new code"
#endif
diff --git a/include/vcl/svtabbx.hxx b/include/vcl/toolkit/svtabbx.hxx
similarity index 98%
rename from include/vcl/svtabbx.hxx
rename to include/vcl/toolkit/svtabbx.hxx
index ddd8520baad3..70057be1fea2 100644
--- a/include/vcl/svtabbx.hxx
+++ b/include/vcl/toolkit/svtabbx.hxx
@@ -16,8 +16,11 @@
* 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_VCL_SVTABBX_HXX
-#define INCLUDED_VCL_SVTABBX_HXX
+#pragma once
+
+#if !defined(VCL_DLLIMPLEMENTATION) && !defined(TOOLKIT_DLLIMPLEMENTATION) &&
!defined(VCL_INTERNALS)
+#error "don't use this in new code"
+#endif
#include <vcl/dllapi.h>
#include <vcl/treelistbox.hxx>
@@ -212,7 +215,4 @@ public:
virtual sal_Int32 GetFieldIndexAtPoint(sal_Int32
_nRow,sal_Int32 _nColumnPos,const Point& _rPoint) override;
};
-#endif // INCLUDED_VCL_SVTABBX_HXX
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/toolkit/tabdlg.hxx b/include/vcl/toolkit/tabdlg.hxx
index 71f127a5eb1b..e869cd4d2620 100644
--- a/include/vcl/toolkit/tabdlg.hxx
+++ b/include/vcl/toolkit/tabdlg.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_VCL_TABDLG_HXX
#define INCLUDED_VCL_TABDLG_HXX
-#if !defined(VCL_DLLIMPLEMENTATION) && !defined(TOOLKIT_DLLIMPLEMENTATION) &&
!defined(VCL_WORKBEN)
+#if !defined(VCL_DLLIMPLEMENTATION) && !defined(TOOLKIT_DLLIMPLEMENTATION) &&
!defined(VCL_INTERNALS)
#error "don't use this in new code"
#endif
diff --git a/include/vcl/toolkit/throbber.hxx b/include/vcl/toolkit/throbber.hxx
index eedef7a13fca..e105d7f22455 100644
--- a/include/vcl/toolkit/throbber.hxx
+++ b/include/vcl/toolkit/throbber.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_VCL_THROBBER_HXX
#define INCLUDED_VCL_THROBBER_HXX
-#if !defined(VCL_DLLIMPLEMENTATION) && !defined(TOOLKIT_DLLIMPLEMENTATION) &&
!defined(VCL_WORKBEN)
+#if !defined(VCL_DLLIMPLEMENTATION) && !defined(TOOLKIT_DLLIMPLEMENTATION) &&
!defined(VCL_INTERNALS)
#error "don't use this in new code"
#endif
diff --git a/include/vcl/toolkit/unowrap.hxx b/include/vcl/toolkit/unowrap.hxx
index b3c937768786..042a11d035ef 100644
--- a/include/vcl/toolkit/unowrap.hxx
+++ b/include/vcl/toolkit/unowrap.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_VCL_UNOWRAP_HXX
#define INCLUDED_VCL_UNOWRAP_HXX
-#if !defined(VCL_DLLIMPLEMENTATION) && !defined(TOOLKIT_DLLIMPLEMENTATION) &&
!defined(VCL_WORKBEN)
+#if !defined(VCL_DLLIMPLEMENTATION) && !defined(TOOLKIT_DLLIMPLEMENTATION) &&
!defined(VCL_INTERNALS)
#error "don't use this in new code"
#endif
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index 3a59c481e0f9..e6a489e1d86f 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -7479,7 +7479,6 @@ include/vcl/status.hxx
include/vcl/stdtext.hxx
include/vcl/svapp.hxx
include/vcl/svlbitm.hxx
-include/vcl/svtabbx.hxx
include/vcl/svtaccessiblefactory.hxx
include/vcl/syschild.hxx
include/vcl/sysdata.hxx
@@ -7504,6 +7503,7 @@ include/vcl/toolkit/morebtn.hxx
include/vcl/toolkit/prgsbar.hxx
include/vcl/toolkit/roadmap.hxx
include/vcl/toolkit/spin.hxx
+include/vcl/toolkit/svtabbx.hxx
include/vcl/toolkit/tabdlg.hxx
include/vcl/toolkit/throbber.hxx
include/vcl/toolkit/unowrap.hxx
diff --git a/vcl/CppunitTest_vcl_lifecycle.mk b/vcl/CppunitTest_vcl_lifecycle.mk
index ff6a85c1b057..4e88950138b8 100644
--- a/vcl/CppunitTest_vcl_lifecycle.mk
+++ b/vcl/CppunitTest_vcl_lifecycle.mk
@@ -34,7 +34,7 @@ $(eval $(call gb_CppunitTest_use_libraries,vcl_lifecycle, \
))
$(eval $(call gb_CppunitTest_add_defs,vcl_lifecycle,\
- -DVCL_WORKBEN \
+ -DVCL_INTERNALS \
))
$(eval $(call gb_CppunitTest_use_sdk_api,vcl_lifecycle))
diff --git a/vcl/Executable_icontest.mk b/vcl/Executable_icontest.mk
index cdf47e6dc198..78a10ccc6c78 100644
--- a/vcl/Executable_icontest.mk
+++ b/vcl/Executable_icontest.mk
@@ -26,7 +26,7 @@ $(eval $(call gb_Executable_add_defs,icontest,\
endif
$(eval $(call gb_Executable_add_defs,icontest,\
- -DVCL_WORKBEN \
+ -DVCL_INTERNALS \
))
$(eval $(call gb_Executable_use_api,icontest,\
diff --git a/vcl/Executable_ui-previewer.mk b/vcl/Executable_ui-previewer.mk
index b848c07a300a..bee97cbac14b 100644
--- a/vcl/Executable_ui-previewer.mk
+++ b/vcl/Executable_ui-previewer.mk
@@ -35,7 +35,7 @@ $(eval $(call
gb_Executable_add_exception_objects,ui-previewer,\
))
$(eval $(call gb_Executable_add_defs,ui-previewer,\
- -DVCL_WORKBEN \
+ -DVCL_INTERNALS \
))
ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS)))
diff --git a/vcl/inc/treeglue.hxx b/vcl/inc/treeglue.hxx
index 9de3a9d4222a..ebc0e57b2ccb 100644
--- a/vcl/inc/treeglue.hxx
+++ b/vcl/inc/treeglue.hxx
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include <vcl/svtabbx.hxx>
+#include <vcl/toolkit/svtabbx.hxx>
#include "svimpbox.hxx"
//the default NotifyStartDrag is weird to me, and defaults to enabling all
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 06dab9d22380..68347a215ada 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -59,7 +59,7 @@
#include <slider.hxx>
#include <vcl/sysdata.hxx>
#include <vcl/svlbitm.hxx>
-#include <vcl/svtabbx.hxx>
+#include <vcl/toolkit/svtabbx.hxx>
#include <vcl/tabctrl.hxx>
#include <vcl/tabpage.hxx>
#include <vcl/treelistentry.hxx>
diff --git a/vcl/source/treelist/svtabbx.cxx b/vcl/source/treelist/svtabbx.cxx
index 52ade983e94a..94fee305b044 100644
--- a/vcl/source/treelist/svtabbx.cxx
+++ b/vcl/source/treelist/svtabbx.cxx
@@ -19,7 +19,7 @@
#include <vcl/svtaccessiblefactory.hxx>
#include <vcl/accessiblefactory.hxx>
-#include <vcl/svtabbx.hxx>
+#include <vcl/toolkit/svtabbx.hxx>
#include <vcl/headbar.hxx>
#include <vcl/svlbitm.hxx>
#include <vcl/treelistentry.hxx>
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index dd614b891fe9..f9fbbf90e25e 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -41,7 +41,7 @@
#include <vcl/scrbar.hxx>
#include <vcl/split.hxx>
#include <vcl/svapp.hxx>
-#include <vcl/svtabbx.hxx>
+#include <vcl/toolkit/svtabbx.hxx>
#include <vcl/tabctrl.hxx>
#include <vcl/tabpage.hxx>
#include <vcl/toolkit/throbber.hxx>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
