diff options
| -rw-r--r-- | accessibility/source/extended/accessibleiconchoicectrlentry.cxx | 2 | ||||
| -rw-r--r-- | accessibility/source/extended/accessiblelistboxentry.cxx | 2 | ||||
| -rw-r--r-- | accessibility/source/standard/vclxaccessiblestatusbaritem.cxx | 2 | ||||
| -rw-r--r-- | include/vcl/toolkit/controllayout.hxx (renamed from include/vcl/controllayout.hxx) | 4 | ||||
| -rw-r--r-- | solenv/clang-format/blacklist | 2 | ||||
| -rw-r--r-- | vcl/inc/controldata.hxx | 2 | ||||
| -rw-r--r-- | vcl/inc/toolbox.h | 2 | ||||
| -rw-r--r-- | vcl/source/control/tabctrl.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/outdev/text.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/window/menu.cxx | 2 |
10 files changed, 13 insertions, 9 deletions
diff --git a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx index 2add209c4d65..aac52d59c113 100644 --- a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx +++ b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx @@ -24,7 +24,7 @@ #include <com/sun/star/accessibility/AccessibleStateType.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <vcl/svapp.hxx> -#include <vcl/controllayout.hxx> +#include <vcl/toolkit/controllayout.hxx> #include <vcl/settings.hxx> #include <toolkit/helper/convert.hxx> #include <unotools/accessiblestatesethelper.hxx> diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx b/accessibility/source/extended/accessiblelistboxentry.cxx index 22dc36aef3a1..6c8c0a1d52da 100644 --- a/accessibility/source/extended/accessiblelistboxentry.cxx +++ b/accessibility/source/extended/accessiblelistboxentry.cxx @@ -29,7 +29,7 @@ #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <i18nlangtag/languagetag.hxx> #include <vcl/svapp.hxx> -#include <vcl/controllayout.hxx> +#include <vcl/toolkit/controllayout.hxx> #include <vcl/settings.hxx> #include <toolkit/helper/convert.hxx> #include <unotools/accessiblestatesethelper.hxx> diff --git a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx index ac6e4aff65b2..b0a97f951a59 100644 --- a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx +++ b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx @@ -33,7 +33,7 @@ #include <vcl/svapp.hxx> #include <vcl/unohelp2.hxx> #include <vcl/status.hxx> -#include <vcl/controllayout.hxx> +#include <vcl/toolkit/controllayout.hxx> #include <vcl/settings.hxx> #include <i18nlangtag/languagetag.hxx> diff --git a/include/vcl/controllayout.hxx b/include/vcl/toolkit/controllayout.hxx index 3e311ba45306..ffd643f640ee 100644 --- a/include/vcl/controllayout.hxx +++ b/include/vcl/toolkit/controllayout.hxx @@ -20,6 +20,10 @@ #ifndef INCLUDED_VCL_CONTROLLAYOUT_HXX #define INCLUDED_VCL_CONTROLLAYOUT_HXX +#if !defined(VCL_DLLIMPLEMENTATION) && !defined(TOOLKIT_DLLIMPLEMENTATION) && !defined(VCL_INTERNALS) +#error "don't use this in new code" +#endif + #include <rtl/ustring.hxx> #include <tools/gen.hxx> #include <vector> diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist index 66b455d7fda1..ddfe3e914923 100644 --- a/solenv/clang-format/blacklist +++ b/solenv/clang-format/blacklist @@ -7350,7 +7350,6 @@ include/vcl/checksum.hxx include/vcl/combobox.hxx include/vcl/commandevent.hxx include/vcl/commandinfoprovider.hxx -include/vcl/controllayout.hxx include/vcl/ctrl.hxx include/vcl/cursor.hxx include/vcl/cvtgrf.hxx @@ -7467,6 +7466,7 @@ include/vcl/textview.hxx include/vcl/threadex.hxx include/vcl/timer.hxx include/vcl/toolbox.hxx +include/vcl/toolkit/controllayout.hxx include/vcl/toolkit/dialog.hxx include/vcl/toolkit/field.hxx include/vcl/toolkit/fixedhyper.hxx diff --git a/vcl/inc/controldata.hxx b/vcl/inc/controldata.hxx index fddd371d8a2e..ed6e3a368967 100644 --- a/vcl/inc/controldata.hxx +++ b/vcl/inc/controldata.hxx @@ -21,7 +21,7 @@ #define INCLUDED_VCL_INC_CONTROLDATA_HXX #include <memory> -#include <vcl/controllayout.hxx> +#include <vcl/toolkit/controllayout.hxx> namespace vcl { diff --git a/vcl/inc/toolbox.h b/vcl/inc/toolbox.h index b534b219245f..bf4c51c5d0f8 100644 --- a/vcl/inc/toolbox.h +++ b/vcl/inc/toolbox.h @@ -21,7 +21,7 @@ #define INCLUDED_VCL_INC_TOOLBOX_H #include <vcl/toolbox.hxx> -#include <vcl/controllayout.hxx> +#include <vcl/toolkit/controllayout.hxx> #include <vector> diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx index 9d05aa450b4a..c02ed29fddff 100644 --- a/vcl/source/control/tabctrl.cxx +++ b/vcl/source/control/tabctrl.cxx @@ -28,7 +28,7 @@ #include <vcl/button.hxx> #include <vcl/tabpage.hxx> #include <vcl/tabctrl.hxx> -#include <vcl/controllayout.hxx> +#include <vcl/toolkit/controllayout.hxx> #include <vcl/layout.hxx> #include <vcl/lstbox.hxx> #include <vcl/settings.hxx> diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx index f17f3375f246..fa0c7b128dab 100644 --- a/vcl/source/outdev/text.cxx +++ b/vcl/source/outdev/text.cxx @@ -37,7 +37,7 @@ #include <vcl/virdev.hxx> #include <vcl/sysdata.hxx> #include <vcl/unohelp.hxx> -#include <vcl/controllayout.hxx> +#include <vcl/toolkit/controllayout.hxx> #ifdef MACOSX # include <vcl/opengl/OpenGLHelper.hxx> #endif diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index c3cf735253aa..bcfbdbb37773 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -30,7 +30,7 @@ #include <vcl/decoview.hxx> #include <vcl/menu.hxx> #include <vcl/taskpanelist.hxx> -#include <vcl/controllayout.hxx> +#include <vcl/toolkit/controllayout.hxx> #include <vcl/settings.hxx> #include <vcl/commandinfoprovider.hxx> |