SvtIconChoiceCtrl can move into toolkit only headers

Change-Id: Ice3c01019d3e961c0ef1dce7d3eaf4f602269fff
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101488
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

12 files changed, 17 insertions, 16 deletions

diff --git a/accessibility/source/extended/accessibleiconchoicectrl.cxx b/accessibility/source/extended/accessibleiconchoicectrl.cxx
index f521a235e8d2..9ad90c3879eb 100644
--- a/accessibility/source/extended/accessibleiconchoicectrl.cxx
+++ b/accessibility/source/extended/accessibleiconchoicectrl.cxx
@@ -24,7 +24,7 @@
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <unotools/accessiblestatesethelper.hxx>
-#include <vcl/ivctrl.hxx>
+#include <vcl/toolkit/ivctrl.hxx>
 #include <cppuhelper/supportsservice.hxx>
 
 
diff --git a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
index 5ab257135dd3..f52c0afa3565 100644
--- a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
+++ b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <extended/accessibleiconchoicectrlentry.hxx>
-#include <vcl/ivctrl.hxx>
+#include <vcl/toolkit/ivctrl.hxx>
 #include <com/sun/star/awt/Rectangle.hpp>
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
diff --git a/compilerplugins/clang/unusedenumconstants.writeonly.results b/compilerplugins/clang/unusedenumconstants.writeonly.results
index 5697a03ed5a3..23472d504263 100644
--- a/compilerplugins/clang/unusedenumconstants.writeonly.results
+++ b/compilerplugins/clang/unusedenumconstants.writeonly.results
@@ -2766,9 +2766,9 @@ include/vcl/image.hxx:38
     enum StockImage Yes
 include/vcl/inputctx.hxx:32
     enum InputContextFlags ExtText
-include/vcl/ivctrl.hxx:50
+include/vcl/toolkit/ivctrl.hxx:50
     enum SvxIconChoiceCtrlTextMode Short
-include/vcl/ivctrl.hxx:55
+include/vcl/toolkit/ivctrl.hxx:55
     enum SvxIconChoiceCtrlPositionMode Free
 include/vcl/keycod.hxx:29
     enum KeyFuncType NEW
diff --git a/include/vcl/ivctrl.hxx b/include/vcl/toolkit/ivctrl.hxx
index 753b5ed4a6c2..d07b798881c7 100644
--- a/include/vcl/ivctrl.hxx
+++ b/include/vcl/toolkit/ivctrl.hxx
@@ -17,8 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_IVCTRL_HXX
-#define INCLUDED_VCL_IVCTRL_HXX
+#pragma once
+
+#if !defined(VCL_DLLIMPLEMENTATION) && !defined(TOOLKIT_DLLIMPLEMENTATION) && !defined(VCL_INTERNALS)
+#error "don't use this in new code"
+#endif
 
 #include <memory>
 #include <vcl/dllapi.h>
@@ -277,6 +280,4 @@ public:
     virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override;
 };
 
-#endif // INCLUDED_VCL_IVCTRL_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index 2b14dbb51193..84ddb0686497 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -7356,7 +7356,6 @@ include/vcl/inetimg.hxx
 include/vcl/inputctx.hxx
 include/vcl/inputtypes.hxx
 include/vcl/introwin.hxx
-include/vcl/ivctrl.hxx
 include/vcl/jobset.hxx
 include/vcl/keycod.hxx
 include/vcl/keycodes.hxx
@@ -7429,6 +7428,7 @@ include/vcl/toolkit/fixedhyper.hxx
 include/vcl/toolkit/fmtfield.hxx
 include/vcl/toolkit/group.hxx
 include/vcl/toolkit/imgctrl.hxx
+include/vcl/toolkit/ivctrl.hxx
 include/vcl/toolkit/longcurr.hxx
 include/vcl/toolkit/lstbox.hxx
 include/vcl/toolkit/morebtn.hxx
diff --git a/vcl/inc/verticaltabctrl.hxx b/vcl/inc/verticaltabctrl.hxx
index 060777c65602..f25f0f39d302 100644
--- a/vcl/inc/verticaltabctrl.hxx
+++ b/vcl/inc/verticaltabctrl.hxx
@@ -21,7 +21,7 @@
 
 #include <memory>
 #include <vcl/dllapi.h>
-#include <vcl/ivctrl.hxx>
+#include <vcl/toolkit/ivctrl.hxx>
 #include <vcl/layout.hxx>
 
 struct VerticalTabPageData;
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index df22a2c3d784..a152131338b3 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -50,7 +50,7 @@
 #include <vcl/toolkit/fixedhyper.hxx>
 #include <vcl/toolkit/fmtfield.hxx>
 #include <vcl/headbar.hxx>
-#include <vcl/ivctrl.hxx>
+#include <vcl/toolkit/ivctrl.hxx>
 #include <vcl/layout.hxx>
 #include <vcl/menubtn.hxx>
 #include <vcl/toolkit/prgsbar.hxx>
diff --git a/vcl/source/control/imivctl.hxx b/vcl/source/control/imivctl.hxx
index 797cf6ebb9be..d361b28c8ce3 100644
--- a/vcl/source/control/imivctl.hxx
+++ b/vcl/source/control/imivctl.hxx
@@ -23,7 +23,7 @@
 #include <sal/config.h>
 
 #include <o3tl/safeint.hxx>
-#include <vcl/ivctrl.hxx>
+#include <vcl/toolkit/ivctrl.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/scrbar.hxx>
 #include <vcl/timer.hxx>
diff --git a/vcl/source/control/imivctl1.cxx b/vcl/source/control/imivctl1.cxx
index aa088ab5ca37..7ba4ef997499 100644
--- a/vcl/source/control/imivctl1.cxx
+++ b/vcl/source/control/imivctl1.cxx
@@ -33,7 +33,7 @@
 #include <vcl/settings.hxx>
 #include <vcl/commandevent.hxx>
 
-#include <vcl/ivctrl.hxx>
+#include <vcl/toolkit/ivctrl.hxx>
 #include "imivctl.hxx"
 
 #include <algorithm>
diff --git a/vcl/source/control/ivctrl.cxx b/vcl/source/control/ivctrl.cxx
index 71b6b98df54f..bb4be632334a 100644
--- a/vcl/source/control/ivctrl.cxx
+++ b/vcl/source/control/ivctrl.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include <vcl/ivctrl.hxx>
+#include <vcl/toolkit/ivctrl.hxx>
 #include "imivctl.hxx"
 #include <vcl/accessiblefactory.hxx>
 #include <vcl/bitmapex.hxx>
diff --git a/vcl/source/uitest/uiobject.cxx b/vcl/source/uitest/uiobject.cxx
index d0dc54274235..d206bd4e1124 100644
--- a/vcl/source/uitest/uiobject.cxx
+++ b/vcl/source/uitest/uiobject.cxx
@@ -21,7 +21,7 @@
 #include <vcl/toolkit/spin.hxx>
 #include <vcl/toolkit/fmtfield.hxx>
 #include <vcl/toolkit/spinfld.hxx>
-#include <vcl/ivctrl.hxx>
+#include <vcl/toolkit/ivctrl.hxx>
 #include <vcl/toolkit/button.hxx>
 #include <vcl/toolkit/dialog.hxx>
 #include <vcl/toolkit/field.hxx>
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index f51ed30232e9..d3f9febb7208 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -32,7 +32,7 @@
 #include <vcl/toolkit/fixedhyper.hxx>
 #include <vcl/headbar.hxx>
 #include <vcl/IPrioritable.hxx>
-#include <vcl/ivctrl.hxx>
+#include <vcl/toolkit/ivctrl.hxx>
 #include <vcl/layout.hxx>
 #include <vcl/toolkit/lstbox.hxx>
 #include <vcl/menubtn.hxx>