diff options
-rw-r--r-- | solenv/clang-format/excludelist | 2 | ||||
-rw-r--r-- | vcl/inc/accel.hxx (renamed from include/vcl/accel.hxx) | 24 | ||||
-rw-r--r-- | vcl/inc/pch/precompiled_vcl.hxx | 17 | ||||
-rw-r--r-- | vcl/source/treelist/treelistbox.cxx | 2 | ||||
-rw-r--r-- | vcl/source/window/accel.cxx | 2 | ||||
-rw-r--r-- | vcl/source/window/accmgr.cxx | 2 | ||||
-rw-r--r-- | vcl/source/window/dialog.cxx | 2 | ||||
-rw-r--r-- | vcl/source/window/dockwin.cxx | 2 | ||||
-rw-r--r-- | vcl/source/window/syswin.cxx | 2 | ||||
-rw-r--r-- | vcl/source/window/toolbox.cxx | 2 |
10 files changed, 27 insertions, 30 deletions
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index 4a73ed236375..c78867fd03db 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -6351,7 +6351,6 @@ include/vcl/ITiledRenderable.hxx include/vcl/ImageTree.hxx include/vcl/Scanline.hxx include/vcl/abstdlg.hxx -include/vcl/accel.hxx include/vcl/accessiblefactory.hxx include/vcl/accessibletable.hxx include/vcl/accessibletableprovider.hxx @@ -14433,6 +14432,7 @@ vcl/inc/ResampleKernel.hxx vcl/inc/WidgetThemeLibraryTypes.hxx vcl/inc/bitmap/bmpfast.hxx vcl/inc/accel.h +vcl/inc/accel.hxx vcl/inc/accmgr.hxx vcl/inc/brdwin.hxx vcl/inc/bubblewindow.hxx diff --git a/include/vcl/accel.hxx b/vcl/inc/accel.hxx index f48c05c21ba8..53677cfcfb7c 100644 --- a/include/vcl/accel.hxx +++ b/vcl/inc/accel.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_VCL_ACCEL_HXX -#define INCLUDED_VCL_ACCEL_HXX +#pragma once #include <config_options.h> #include <tools/link.hxx> @@ -29,9 +28,8 @@ class ImplAccelData; class ImplAccelEntry; class CommandEvent; -namespace vcl { class Window; } -class UNLESS_MERGELIBS(VCL_DLLPUBLIC) Accelerator +class Accelerator { friend class ImplAccelManager; @@ -44,17 +42,13 @@ private: sal_uInt16 mnCurId; bool* mpDel; - SAL_DLLPRIVATE void ImplInit(); - SAL_DLLPRIVATE void ImplCopyData( ImplAccelData& rAccelData ); - SAL_DLLPRIVATE void ImplDeleteData(); - SAL_DLLPRIVATE void ImplInsertAccel( - sal_uInt16 nItemId, - const vcl::KeyCode& rKeyCode, - bool bEnable, - Accelerator* pAutoAccel ); + void ImplInit(); + void ImplCopyData( ImplAccelData& rAccelData ); + void ImplDeleteData(); + void ImplInsertAccel(sal_uInt16 nItemId, const vcl::KeyCode& rKeyCode, + bool bEnable, Accelerator* pAutoAccel); - SAL_DLLPRIVATE ImplAccelEntry* - ImplGetAccelData( const vcl::KeyCode& rKeyCode ) const; + ImplAccelEntry* ImplGetAccelData( const vcl::KeyCode& rKeyCode ) const; public: Accelerator(); @@ -79,6 +73,4 @@ public: Accelerator& operator=( const Accelerator& rAccel ); }; -#endif // INCLUDED_VCL_ACCEL_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/pch/precompiled_vcl.hxx b/vcl/inc/pch/precompiled_vcl.hxx index a7ef0ce02759..cf78b4ff9e0e 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-04-08 13:57:45 using: + Generated on 2021-08-04 20:14:15 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: @@ -35,11 +35,11 @@ #include <functional> #include <initializer_list> #include <iomanip> -#include <limits.h> #include <limits> #include <map> #include <math.h> #include <memory> +#include <mutex> #include <new> #include <optional> #include <ostream> @@ -62,8 +62,11 @@ #if PCH_LEVEL >= 2 #include <osl/conditn.hxx> #include <osl/diagnose.h> +#include <osl/doublecheckedlocking.h> #include <osl/endian.h> +#include <osl/file.h> #include <osl/file.hxx> +#include <osl/getglobalmutex.hxx> #include <osl/interlck.h> #include <osl/module.hxx> #include <osl/mutex.h> @@ -116,6 +119,8 @@ #include <basegfx/polygon/b2dpolypolygon.hxx> #include <basegfx/range/b2drange.hxx> #include <basegfx/range/basicrange.hxx> +#include <basegfx/tuple/Tuple2D.hxx> +#include <basegfx/tuple/Tuple3D.hxx> #include <basegfx/tuple/b2dtuple.hxx> #include <basegfx/tuple/b2ituple.hxx> #include <basegfx/tuple/b3dtuple.hxx> @@ -180,9 +185,6 @@ #include <cppu/unotype.hxx> #include <cppuhelper/cppuhelperdllapi.h> #include <cppuhelper/implbase.hxx> -#include <cppuhelper/implbase_ex.hxx> -#include <cppuhelper/implbase_ex_post.hxx> -#include <cppuhelper/implbase_ex_pre.hxx> #include <cppuhelper/interfacecontainer.h> #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/weak.hxx> @@ -246,12 +248,14 @@ #include <uno/sequence2.h> #include <unotools/configmgr.hxx> #include <unotools/localedatawrapper.hxx> +#include <unotools/syslocale.hxx> #include <unotools/ucbstreamhelper.hxx> #include <unotools/unotoolsdllapi.h> #endif // PCH_LEVEL >= 3 #if PCH_LEVEL >= 4 #include <PhysicalFontCollection.hxx> #include <PhysicalFontFace.hxx> +#include <accel.hxx> #include <brdwin.hxx> #include <configsettings.hxx> #include <fontattributes.hxx> @@ -282,7 +286,6 @@ #include <vcl/FilterConfigItem.hxx> #include <vcl/QueueInfo.hxx> #include <vcl/TypeSerializer.hxx> -#include <vcl/accel.hxx> #include <vcl/alpha.hxx> #include <vcl/bitmap.hxx> #include <vcl/bitmapex.hxx> @@ -302,6 +305,7 @@ #include <vcl/event.hxx> #include <vcl/fntstyle.hxx> #include <vcl/font.hxx> +#include <vcl/formatter.hxx> #include <vcl/gdimtf.hxx> #include <vcl/glyphitem.hxx> #include <vcl/gradient.hxx> @@ -330,6 +334,7 @@ #include <vcl/toolbox.hxx> #include <vcl/toolkit/button.hxx> #include <vcl/toolkit/combobox.hxx> +#include <vcl/toolkit/controllayout.hxx> #include <vcl/toolkit/dialog.hxx> #include <vcl/toolkit/edit.hxx> #include <vcl/toolkit/fixed.hxx> diff --git a/vcl/source/treelist/treelistbox.cxx b/vcl/source/treelist/treelistbox.cxx index 2338292820e9..ee4b01981007 100644 --- a/vcl/source/treelist/treelistbox.cxx +++ b/vcl/source/treelist/treelistbox.cxx @@ -27,7 +27,6 @@ #include <vcl/accessiblefactory.hxx> #include <com/sun/star/accessibility/AccessibleStateType.hpp> #include <vcl/svapp.hxx> -#include <vcl/accel.hxx> #include <vcl/builder.hxx> #include <vcl/toolkit/edit.hxx> #include <vcl/settings.hxx> @@ -43,6 +42,7 @@ #include <vcl/toolkit/svlbitm.hxx> #include <vcl/toolkit/treelistentry.hxx> #include <vcl/toolkit/viewdataentry.hxx> +#include <accel.hxx> #include <svimpbox.hxx> #include <set> diff --git a/vcl/source/window/accel.cxx b/vcl/source/window/accel.cxx index c580679bd8b0..1a0039bd2e0c 100644 --- a/vcl/source/window/accel.cxx +++ b/vcl/source/window/accel.cxx @@ -21,7 +21,7 @@ #include <osl/diagnose.h> #include <tools/solar.h> #include <accel.h> -#include <vcl/accel.hxx> +#include <accel.hxx> #include <map> #include <vector> diff --git a/vcl/source/window/accmgr.cxx b/vcl/source/window/accmgr.cxx index 5ab0279b3a10..c588bb4d8f5a 100644 --- a/vcl/source/window/accmgr.cxx +++ b/vcl/source/window/accmgr.cxx @@ -19,7 +19,7 @@ #include <accel.h> -#include <vcl/accel.hxx> +#include <accel.hxx> #include <accmgr.hxx> #include <algorithm> diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index 9cb7fb142c5f..ca5298bef0e4 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -34,6 +34,7 @@ #include <svdata.hxx> #include <window.h> +#include <accel.hxx> #include <brdwin.hxx> #include <rtl/bootstrap.hxx> @@ -41,7 +42,6 @@ #include <sal/log.hxx> #include <vcl/abstdlg.hxx> -#include <vcl/accel.hxx> #include <vcl/builder.hxx> #include <vcl/toolkit/floatwin.hxx> #include <vcl/layout.hxx> diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx index 619d8fbb6093..892a1cf95727 100644 --- a/vcl/source/window/dockwin.cxx +++ b/vcl/source/window/dockwin.cxx @@ -19,7 +19,6 @@ #include <tools/time.hxx> #include <sal/log.hxx> -#include <vcl/accel.hxx> #include <vcl/event.hxx> #include <vcl/toolkit/floatwin.hxx> #include <vcl/layout.hxx> @@ -29,6 +28,7 @@ #include <vcl/idle.hxx> #include <vcl/settings.hxx> +#include <accel.hxx> #include <svdata.hxx> #include <window.h> #include <brdwin.hxx> diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx index 3d8a2dd18a06..c1a946d04007 100644 --- a/vcl/source/window/syswin.cxx +++ b/vcl/source/window/syswin.cxx @@ -23,7 +23,6 @@ #include <sal/config.h> #include <sal/log.hxx> -#include <vcl/accel.hxx> #include <vcl/layout.hxx> #include <vcl/mnemonic.hxx> #include <vcl/settings.hxx> @@ -38,6 +37,7 @@ #include <rtl/strbuf.hxx> +#include <accel.hxx> #include <salframe.hxx> #include <svdata.hxx> #include <brdwin.hxx> diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index 38704c2dae69..ee1359ca0491 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -22,7 +22,6 @@ #include <vcl/event.hxx> #include <vcl/decoview.hxx> #include <vcl/toolkit/floatwin.hxx> -#include <vcl/accel.hxx> #include <vcl/svapp.hxx> #include <vcl/help.hxx> #include <vcl/mnemonic.hxx> @@ -39,6 +38,7 @@ #include <sal/log.hxx> #include <osl/diagnose.h> +#include <accel.hxx> #include <svdata.hxx> #include <window.h> #include <toolbox.h> |