move scrbar.hxx to vcl/toolkit

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

19 files changed, 46 insertions, 40 deletions

diff --git a/accessibility/source/standard/vclxaccessiblescrollbar.cxx b/accessibility/source/standard/vclxaccessiblescrollbar.cxx
index 57ea5365b141..130b6d71aabb 100644
--- a/accessibility/source/standard/vclxaccessiblescrollbar.cxx
+++ b/accessibility/source/standard/vclxaccessiblescrollbar.cxx
@@ -27,7 +27,7 @@
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <com/sun/star/awt/ScrollBarOrientation.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
-#include <vcl/scrbar.hxx>
+#include <vcl/toolkit/scrbar.hxx>
 #include <vcl/vclevent.hxx>
 #include <strings.hxx>
 
diff --git a/include/vcl/scrbar.hxx b/include/vcl/toolkit/scrbar.hxx
index dd8f309152b6..32704522bbaf 100644
--- a/include/vcl/scrbar.hxx
+++ b/include/vcl/toolkit/scrbar.hxx
@@ -17,8 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_SCRBAR_HXX
-#define INCLUDED_VCL_SCRBAR_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/ctrl.hxx>
@@ -147,6 +150,4 @@ public:
     virtual void    DataChanged( const DataChangedEvent& rDCEvt ) override;
 };
 
-#endif // INCLUDED_VCL_SCRBAR_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index 2f49fd77545a..0cd36cb7d1c3 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -6386,7 +6386,6 @@ include/vcl/salgtype.hxx
 include/vcl/salnativewidgets.hxx
 include/vcl/scheduler.hxx
 include/vcl/scopedbitmapaccess.hxx
-include/vcl/scrbar.hxx
 include/vcl/seleng.hxx
 include/vcl/settings.hxx
 include/vcl/split.hxx
@@ -6428,6 +6427,7 @@ include/vcl/toolkit/menubtn.hxx
 include/vcl/toolkit/morebtn.hxx
 include/vcl/toolkit/prgsbar.hxx
 include/vcl/toolkit/roadmap.hxx
+include/vcl/toolkit/scrbar.hxx
 include/vcl/toolkit/spin.hxx
 include/vcl/toolkit/spinfld.hxx
 include/vcl/toolkit/svlbitm.hxx
diff --git a/toolkit/inc/helper/scrollabledialog.hxx b/toolkit/inc/helper/scrollabledialog.hxx
index 26068b4f5c98..b93751c6802d 100644
--- a/toolkit/inc/helper/scrollabledialog.hxx
+++ b/toolkit/inc/helper/scrollabledialog.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_TOOLKIT_AWT_SCROLLABLEDIALOG_HXX
 
 #include <vcl/toolkit/dialog.hxx>
-#include <vcl/scrbar.hxx>
+#include <vcl/toolkit/scrbar.hxx>
 
 namespace toolkit
 {
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index 18daef169414..b0650c8602c7 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -111,7 +111,7 @@
 #include <vcl/toolkit/longcurr.hxx>
 #include <vcl/toolkit/menubtn.hxx>
 #include <vcl/stdtext.hxx>
-#include <vcl/scrbar.hxx>
+#include <vcl/toolkit/scrbar.hxx>
 #include <vcl/split.hxx>
 #include <vcl/splitwin.hxx>
 #include <vcl/status.hxx>
diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx
index e444d6d3ae9d..15b7b3c146cf 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -52,7 +52,7 @@
 #include <vcl/toolkit/imgctrl.hxx>
 #include <vcl/toolkit/dialog.hxx>
 #include <vcl/toolkit/prgsbar.hxx>
-#include <vcl/scrbar.hxx>
+#include <vcl/toolkit/scrbar.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/tabpage.hxx>
 #include <vcl/tabctrl.hxx>
diff --git a/toolkit/source/controls/table/tablecontrol_impl.cxx b/toolkit/source/controls/table/tablecontrol_impl.cxx
index 9b70c0c2ddb1..1569adba520e 100644
--- a/toolkit/source/controls/table/tablecontrol_impl.cxx
+++ b/toolkit/source/controls/table/tablecontrol_impl.cxx
@@ -33,7 +33,7 @@
 
 #include <comphelper/flagguard.hxx>
 #include <vcl/accessiblefactory.hxx>
-#include <vcl/scrbar.hxx>
+#include <vcl/toolkit/scrbar.hxx>
 #include <vcl/seleng.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/image.hxx>
diff --git a/toolkit/source/controls/table/tabledatawindow.cxx b/toolkit/source/controls/table/tabledatawindow.cxx
index 8a024a9bc736..46c742e3c472 100644
--- a/toolkit/source/controls/table/tabledatawindow.cxx
+++ b/toolkit/source/controls/table/tabledatawindow.cxx
@@ -24,7 +24,7 @@
 #include "tablegeometry.hxx"
 
 #include <vcl/help.hxx>
-#include <vcl/scrbar.hxx>
+#include <vcl/toolkit/scrbar.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/commandevent.hxx>
 
diff --git a/vcl/inc/pch/precompiled_vcl.hxx b/vcl/inc/pch/precompiled_vcl.hxx
index 57f917ca67d0..492852aa9f14 100644
--- a/vcl/inc/pch/precompiled_vcl.hxx
+++ b/vcl/inc/pch/precompiled_vcl.hxx
@@ -13,7 +13,7 @@
  manual changes will be rewritten by the next run of update_pch.sh (which presumably
  also fixes all possible problems, so it's usually better to use it).
 
- Generated on 2021-11-29 09:46:20 using:
+ Generated on 2022-08-08 12:39:25 using:
  ./bin/update_pch vcl vcl --cutoff=6 --exclude:system --include:module --include:local
 
  If after updating build fails, use the following command to locate conflicting headers:
@@ -37,7 +37,9 @@
 #include <hb.h>
 #include <initializer_list>
 #include <iomanip>
+#include <iterator>
 #include <limits>
+#include <list>
 #include <map>
 #include <math.h>
 #include <memory>
@@ -53,6 +55,7 @@
 #include <string_view>
 #include <type_traits>
 #include <unordered_map>
+#include <unordered_set>
 #include <utility>
 #include <vector>
 #include <boost/math/special_functions/sinc.hpp>
@@ -60,6 +63,7 @@
 #include <boost/property_tree/json_parser.hpp>
 #include <boost/property_tree/ptree.hpp>
 #include <boost/property_tree/ptree_fwd.hpp>
+#include <boost/rational.hpp>
 #endif // PCH_LEVEL >= 1
 #if PCH_LEVEL >= 2
 #include <osl/conditn.hxx>
@@ -74,8 +78,10 @@
 #include <osl/mutex.h>
 #include <osl/mutex.hxx>
 #include <osl/nlsupport.h>
-#include <osl/process.h>
+#include <osl/security.h>
 #include <osl/signal.h>
+#include <osl/socket.h>
+#include <osl/socket.hxx>
 #include <osl/thread.h>
 #include <osl/time.h>
 #include <rtl/alloc.h>
@@ -86,8 +92,10 @@
 #include <rtl/crc.h>
 #include <rtl/digest.h>
 #include <rtl/instance.hxx>
+#include <rtl/locale.h>
 #include <rtl/math.h>
 #include <rtl/math.hxx>
+#include <rtl/process.h>
 #include <rtl/ref.hxx>
 #include <rtl/strbuf.hxx>
 #include <rtl/string.h>
@@ -120,6 +128,7 @@
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
+#include <basegfx/range/Range2D.hxx>
 #include <basegfx/range/b2drange.hxx>
 #include <basegfx/range/basicrange.hxx>
 #include <basegfx/tuple/Tuple2D.hxx>
@@ -146,14 +155,6 @@
 #include <com/sun/star/datatransfer/dnd/XDropTargetListener.hpp>
 #include <com/sun/star/embed/Aspects.hpp>
 #include <com/sun/star/frame/XTerminateListener.hpp>
-#include <com/sun/star/i18n/Calendar2.hpp>
-#include <com/sun/star/i18n/DirectionProperty.hpp>
-#include <com/sun/star/i18n/KCharacterType.hpp>
-#include <com/sun/star/i18n/NativeNumberXmlAttributes.hpp>
-#include <com/sun/star/i18n/ParseResult.hpp>
-#include <com/sun/star/i18n/TransliterationModules.hpp>
-#include <com/sun/star/i18n/TransliterationModulesExtra.hpp>
-#include <com/sun/star/i18n/UnicodeScript.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/lang/EventObject.hpp>
 #include <com/sun/star/lang/Locale.hpp>
@@ -164,7 +165,6 @@
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/uno/Any.h>
 #include <com/sun/star/uno/Any.hxx>
-#include <com/sun/star/uno/Exception.hpp>
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/RuntimeException.hpp>
@@ -186,13 +186,13 @@
 #include <comphelper/lok.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/propertyvalue.hxx>
+#include <comphelper/scopeguard.hxx>
 #include <comphelper/sequence.hxx>
 #include <comphelper/string.hxx>
 #include <cppu/cppudllapi.h>
 #include <cppu/unotype.hxx>
 #include <cppuhelper/cppuhelperdllapi.h>
 #include <cppuhelper/implbase.hxx>
-#include <cppuhelper/interfacecontainer.h>
 #include <cppuhelper/supportsservice.hxx>
 #include <cppuhelper/weak.hxx>
 #include <cppuhelper/weakagg.hxx>
@@ -205,10 +205,11 @@
 #include <i18nlangtag/languagetag.hxx>
 #include <i18nlangtag/mslangid.hxx>
 #include <i18nutil/i18nutildllapi.h>
-#include <i18nutil/transliteration.hxx>
 #include <o3tl/cow_wrapper.hxx>
+#include <o3tl/hash_combine.hxx>
 #include <o3tl/safeint.hxx>
 #include <o3tl/sorted_vector.hxx>
+#include <o3tl/string_view.hxx>
 #include <o3tl/strong_int.hxx>
 #include <o3tl/typed_flags_set.hxx>
 #include <o3tl/underlyingenumvalue.hxx>
@@ -259,7 +260,6 @@
 #include <uno/any2.h>
 #include <uno/data.h>
 #include <uno/sequence2.h>
-#include <unotools/calendarwrapper.hxx>
 #include <unotools/configmgr.hxx>
 #include <unotools/fontdefs.hxx>
 #include <unotools/localedatawrapper.hxx>
@@ -275,8 +275,11 @@
 #include <configsettings.hxx>
 #include <drawmode.hxx>
 #include <fontattributes.hxx>
+#include <fontsubset.hxx>
+#include <glyphid.hxx>
 #include <impfontcache.hxx>
 #include <impglyphitem.hxx>
+#include <ppdparser.hxx>
 #include <salbmp.hxx>
 #include <salframe.hxx>
 #include <salgdi.hxx>
@@ -302,7 +305,6 @@
 #include <vcl/FilterConfigItem.hxx>
 #include <vcl/QueueInfo.hxx>
 #include <vcl/TypeSerializer.hxx>
-#include <vcl/alpha.hxx>
 #include <vcl/bitmap.hxx>
 #include <vcl/bitmapex.hxx>
 #include <vcl/builder.hxx>
@@ -325,6 +327,8 @@
 #include <vcl/font.hxx>
 #include <vcl/formatter.hxx>
 #include <vcl/gdimtf.hxx>
+#include <vcl/gfxlink.hxx>
+#include <vcl/glyphitem.hxx>
 #include <vcl/gradient.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/graphicfilter.hxx>
@@ -341,7 +345,7 @@
 #include <vcl/outdev.hxx>
 #include <vcl/ptrstyle.hxx>
 #include <vcl/quickselectionengine.hxx>
-#include <vcl/scrbar.hxx>
+#include <vcl/salnativewidgets.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/syswin.hxx>
@@ -357,6 +361,7 @@
 #include <vcl/toolkit/fixed.hxx>
 #include <vcl/toolkit/floatwin.hxx>
 #include <vcl/toolkit/lstbox.hxx>
+#include <vcl/toolkit/scrbar.hxx>
 #include <vcl/toolkit/spinfld.hxx>
 #include <vcl/toolkit/svlbitm.hxx>
 #include <vcl/toolkit/treelist.hxx>
diff --git a/vcl/inc/slider.hxx b/vcl/inc/slider.hxx
index 3c92adfc38bf..dc69df8a0a1a 100644
--- a/vcl/inc/slider.hxx
+++ b/vcl/inc/slider.hxx
@@ -22,7 +22,7 @@
 
 #include <vcl/dllapi.h>
 #include <vcl/ctrl.hxx>
-#include <vcl/scrbar.hxx>
+#include <vcl/toolkit/scrbar.hxx>
 
 class Slider final : public Control
 {
diff --git a/vcl/inc/svimpbox.hxx b/vcl/inc/svimpbox.hxx
index 1acd895743fd..949a488ed816 100644
--- a/vcl/inc/svimpbox.hxx
+++ b/vcl/inc/svimpbox.hxx
@@ -22,11 +22,11 @@
 
 #include <vcl/dllapi.h>
 #include <vcl/seleng.hxx>
-#include <vcl/scrbar.hxx>
 #include <vcl/idle.hxx>
 #include <vcl/image.hxx>
 #include <vcl/svtaccessiblefactory.hxx>
 #include <vcl/vclevent.hxx>
+#include <vcl/toolkit/scrbar.hxx>
 #include <vcl/toolkit/treelistbox.hxx>
 #include <o3tl/enumarray.hxx>
 #include <memory>
diff --git a/vcl/source/control/imivctl.hxx b/vcl/source/control/imivctl.hxx
index b242ef91da7f..be442e495678 100644
--- a/vcl/source/control/imivctl.hxx
+++ b/vcl/source/control/imivctl.hxx
@@ -23,14 +23,14 @@
 #include <sal/config.h>
 
 #include <o3tl/safeint.hxx>
-#include <vcl/toolkit/ivctrl.hxx>
 #include <vcl/virdev.hxx>
-#include <vcl/scrbar.hxx>
 #include <vcl/timer.hxx>
 #include <vcl/idle.hxx>
 #include <vcl/vclptr.hxx>
 #include <tools/debug.hxx>
 #include <vcl/svtaccessiblefactory.hxx>
+#include <vcl/toolkit/ivctrl.hxx>
+#include <vcl/toolkit/scrbar.hxx>
 
 #include <limits.h>
 
diff --git a/vcl/source/control/imp_listbox.cxx b/vcl/source/control/imp_listbox.cxx
index b16adb9ccec6..911770678667 100644
--- a/vcl/source/control/imp_listbox.cxx
+++ b/vcl/source/control/imp_listbox.cxx
@@ -22,10 +22,10 @@
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/event.hxx>
-#include <vcl/scrbar.hxx>
-#include <vcl/toolkit/lstbox.hxx>
 #include <vcl/i18nhelp.hxx>
 #include <vcl/naturalsort.hxx>
+#include <vcl/toolkit/lstbox.hxx>
+#include <vcl/toolkit/scrbar.hxx>
 
 #include <listbox.hxx>
 #include <svdata.hxx>
diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx
index 2994fa0e9b61..3c132664590f 100644
--- a/vcl/source/control/scrbar.cxx
+++ b/vcl/source/control/scrbar.cxx
@@ -19,9 +19,9 @@
 
 #include <vcl/event.hxx>
 #include <vcl/decoview.hxx>
-#include <vcl/scrbar.hxx>
 #include <vcl/timer.hxx>
 #include <vcl/settings.hxx>
+#include <vcl/toolkit/scrbar.hxx>
 #include <vcl/vclevent.hxx>
 
 #include <sal/log.hxx>
diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx
index 03ed860bdaca..a647e2df3402 100644
--- a/vcl/source/edit/vclmedit.cxx
+++ b/vcl/source/edit/vclmedit.cxx
@@ -26,7 +26,6 @@
 #include <vcl/menu.hxx>
 #include <vcl/specialchars.hxx>
 #include <vcl/timer.hxx>
-#include <vcl/toolkit/vclmedit.hxx>
 #include <vcl/vclevent.hxx>
 #include <vcl/xtextedt.hxx>
 #include <vcl/textview.hxx>
@@ -36,8 +35,9 @@
 #include <svl/lstner.hxx>
 #include <vcl/uitest/uiobject.hxx>
 
-#include <vcl/scrbar.hxx>
 #include <vcl/settings.hxx>
+#include <vcl/toolkit/scrbar.hxx>
+#include <vcl/toolkit/vclmedit.hxx>
 #include <vcl/weld.hxx>
 #include <osl/diagnose.h>
 #include <tools/json_writer.hxx>
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 3aaefe33a477..f26d14462171 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -44,7 +44,7 @@
 #include <vcl/toolkit/menubtn.hxx>
 #include <vcl/mnemonic.hxx>
 #include <vcl/toolkit/prgsbar.hxx>
-#include <vcl/scrbar.hxx>
+#include <vcl/toolkit/scrbar.hxx>
 #include <vcl/split.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/toolkit/svtabbx.hxx>
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index ffdfce012f75..c254169281b1 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -44,7 +44,7 @@
 #include <vcl/help.hxx>
 #include <vcl/toolkit/dialog.hxx>
 #include <vcl/layout.hxx>
-#include <vcl/scrbar.hxx>
+#include <vcl/toolkit/scrbar.hxx>
 #include <vcl/stdtext.hxx>
 #include <vcl/split.hxx>
 #include <vcl/svapp.hxx>
diff --git a/vcl/source/window/tabpage.cxx b/vcl/source/window/tabpage.cxx
index 34f52d8b3bbd..5a83165eb1af 100644
--- a/vcl/source/window/tabpage.cxx
+++ b/vcl/source/window/tabpage.cxx
@@ -22,7 +22,7 @@
 #include <vcl/tabpage.hxx>
 #include <vcl/bitmapex.hxx>
 #include <vcl/settings.hxx>
-#include <vcl/scrbar.hxx>
+#include <vcl/toolkit/scrbar.hxx>
 #include <svdata.hxx>
 
 void TabPage::ImplInit( vcl::Window* pParent, WinBits nStyle )
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index 6c99b8113a34..ee3133373b31 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -31,7 +31,7 @@
 #include <vcl/timer.hxx>
 #include <vcl/window.hxx>
 #include <vcl/scrollable.hxx>
-#include <vcl/scrbar.hxx>
+#include <vcl/toolkit/scrbar.hxx>
 #include <vcl/dockwin.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/builder.hxx>