accessibility/inc/pch/precompiled_acc.hxx | 3 +--
basctl/inc/pch/precompiled_basctl.hxx | 3 +--
chart2/inc/pch/precompiled_chartcontroller.hxx | 3 +--
cui/inc/pch/precompiled_cui.hxx | 4 +---
framework/source/uielement/toolbarmanager.cxx | 1 -
include/vcl/floatwin.hxx | 22 ----------------------
include/vcl/vclenum.hxx | 21 +++++++++++++++++++++
sc/inc/pch/precompiled_sc.hxx | 4 ++--
sc/source/ui/cctrl/checklistmenu.cxx | 1 -
sd/inc/pch/precompiled_sdui.hxx | 3 +--
svtools/inc/pch/precompiled_svt.hxx | 3 +--
svtools/source/uno/popupwindowcontroller.cxx | 1 -
svx/inc/pch/precompiled_svxcore.hxx | 4 +---
sw/inc/pch/precompiled_swui.hxx | 3 +--
vcl/source/app/salvtables.cxx | 1 -
vcl/source/control/calendar.cxx | 1 -
16 files changed, 31 insertions(+), 47 deletions(-)
New commits:
commit 9ad76a23eb25daddeec5f2586a10487c8a7bdc36
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Feb 25 10:53:34 2021 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Thu Feb 25 21:12:33 2021 +0100
allow use of FloatWinPopupFlags without including complete floatwin.hxx
Change-Id: Ica412938ead6f213668b3aa876bff81d8f512f1a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111526
Tested-by: Caolán McNamara <caol...@redhat.com>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/accessibility/inc/pch/precompiled_acc.hxx
b/accessibility/inc/pch/precompiled_acc.hxx
index ce849da0fb6e..75a1b90727ef 100644
--- a/accessibility/inc/pch/precompiled_acc.hxx
+++ b/accessibility/inc/pch/precompiled_acc.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-02-19 15:34:31 using:
+ Generated on 2021-02-25 10:08:05 using:
./bin/update_pch accessibility acc --cutoff=4 --exclude:system
--include:module --include:local
If after updating build fails, use the following command to locate
conflicting headers:
@@ -101,7 +101,6 @@
#include <vcl/dockwin.hxx>
#include <vcl/errcode.hxx>
#include <vcl/event.hxx>
-#include <vcl/floatwin.hxx>
#include <vcl/fntstyle.hxx>
#include <vcl/font.hxx>
#include <vcl/idle.hxx>
diff --git a/basctl/inc/pch/precompiled_basctl.hxx
b/basctl/inc/pch/precompiled_basctl.hxx
index 579f24d0583d..1bcbf15f062d 100644
--- a/basctl/inc/pch/precompiled_basctl.hxx
+++ b/basctl/inc/pch/precompiled_basctl.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-02-19 15:34:32 using:
+ Generated on 2021-02-25 10:08:21 using:
./bin/update_pch basctl basctl --cutoff=3 --exclude:system --include:module
--exclude:local
If after updating build fails, use the following command to locate
conflicting headers:
@@ -115,7 +115,6 @@
#include <vcl/dllapi.h>
#include <vcl/errcode.hxx>
#include <vcl/event.hxx>
-#include <vcl/floatwin.hxx>
#include <vcl/fntstyle.hxx>
#include <vcl/font.hxx>
#include <vcl/gdimtf.hxx>
diff --git a/chart2/inc/pch/precompiled_chartcontroller.hxx
b/chart2/inc/pch/precompiled_chartcontroller.hxx
index 3791367acd6b..99b2d0e76252 100644
--- a/chart2/inc/pch/precompiled_chartcontroller.hxx
+++ b/chart2/inc/pch/precompiled_chartcontroller.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-02-19 15:34:34 using:
+ Generated on 2021-02-25 10:08:39 using:
./bin/update_pch chart2 chartcontroller --cutoff=6 --exclude:system
--include:module --include:local
If after updating build fails, use the following command to locate
conflicting headers:
@@ -105,7 +105,6 @@
#include <vcl/dllapi.h>
#include <vcl/dockwin.hxx>
#include <vcl/errcode.hxx>
-#include <vcl/floatwin.hxx>
#include <vcl/fntstyle.hxx>
#include <vcl/font.hxx>
#include <vcl/gdimtf.hxx>
diff --git a/cui/inc/pch/precompiled_cui.hxx b/cui/inc/pch/precompiled_cui.hxx
index 9371309652f6..169f3ff5d30b 100644
--- a/cui/inc/pch/precompiled_cui.hxx
+++ b/cui/inc/pch/precompiled_cui.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-02-19 15:34:39 using:
+ Generated on 2021-02-25 10:08:53 using:
./bin/update_pch cui cui --cutoff=8 --exclude:system --include:module
--exclude:local
If after updating build fails, use the following command to locate
conflicting headers:
@@ -113,7 +113,6 @@
#include <vcl/dllapi.h>
#include <vcl/errcode.hxx>
#include <vcl/event.hxx>
-#include <vcl/floatwin.hxx>
#include <vcl/fntstyle.hxx>
#include <vcl/font.hxx>
#include <vcl/gfxlink.hxx>
@@ -228,7 +227,6 @@
#include <com/sun/star/uno/Type.h>
#include <com/sun/star/uno/Type.hxx>
#include <com/sun/star/uno/TypeClass.hdl>
-#include <com/sun/star/uno/XAggregation.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/uno/XInterface.hpp>
#include <com/sun/star/uno/XWeak.hpp>
diff --git a/framework/source/uielement/toolbarmanager.cxx
b/framework/source/uielement/toolbarmanager.cxx
index 6a52ba57b578..6902bcf49e00 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -64,7 +64,6 @@
#include <svtools/imgdef.hxx>
#include <vcl/event.hxx>
#include <vcl/svapp.hxx>
-#include <vcl/floatwin.hxx>
#include <vcl/menu.hxx>
#include <vcl/syswin.hxx>
#include <vcl/taskpanelist.hxx>
diff --git a/include/vcl/floatwin.hxx b/include/vcl/floatwin.hxx
index ef3c38c6bd72..1c715a46cbc7 100644
--- a/include/vcl/floatwin.hxx
+++ b/include/vcl/floatwin.hxx
@@ -27,28 +27,6 @@
class ToolBox;
-
-enum class FloatWinPopupFlags
-{
- NONE = 0x000000,
- AllowTearOff = 0x000001,
- Down = 0x000002,
- Up = 0x000004,
- Left = 0x000008,
- Right = 0x000010,
- NoKeyClose = 0x000020,
- AllMouseButtonClose = 0x000040,
- NoAppFocusClose = 0x000080,
- NewLevel = 0x000100,
- NoMouseUpClose = 0x000200,
- GrabFocus = 0x000400,
- NoHorzPlacement = 0x000800,
-};
-namespace o3tl
-{
- template<> struct typed_flags<FloatWinPopupFlags> :
is_typed_flags<FloatWinPopupFlags, 0x0fff> {};
-}
-
enum class FloatWinPopupEndFlags
{
NONE = 0x00,
diff --git a/include/vcl/vclenum.hxx b/include/vcl/vclenum.hxx
index 3e8fb266610b..005e48c5406a 100644
--- a/include/vcl/vclenum.hxx
+++ b/include/vcl/vclenum.hxx
@@ -366,6 +366,27 @@ enum class TxtAlign
Right
};
+enum class FloatWinPopupFlags
+{
+ NONE = 0x000000,
+ AllowTearOff = 0x000001,
+ Down = 0x000002,
+ Up = 0x000004,
+ Left = 0x000008,
+ Right = 0x000010,
+ NoKeyClose = 0x000020,
+ AllMouseButtonClose = 0x000040,
+ NoAppFocusClose = 0x000080,
+ NewLevel = 0x000100,
+ NoMouseUpClose = 0x000200,
+ GrabFocus = 0x000400,
+ NoHorzPlacement = 0x000800,
+};
+namespace o3tl
+{
+ template<> struct typed_flags<FloatWinPopupFlags> :
is_typed_flags<FloatWinPopupFlags, 0x0fff> {};
+}
+
#endif // INCLUDED_VCL_VCLENUM_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/pch/precompiled_sc.hxx b/sc/inc/pch/precompiled_sc.hxx
index 2e4ae25dd549..513665079891 100644
--- a/sc/inc/pch/precompiled_sc.hxx
+++ b/sc/inc/pch/precompiled_sc.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-02-19 15:35:00 using:
+ Generated on 2021-02-25 10:10:23 using:
./bin/update_pch sc sc --cutoff=12 --exclude:system --include:module
--include:local
If after updating build fails, use the following command to locate
conflicting headers:
@@ -123,7 +123,6 @@
#include <vcl/customweld.hxx>
#include <vcl/dllapi.h>
#include <vcl/errcode.hxx>
-#include <vcl/floatwin.hxx>
#include <vcl/fntstyle.hxx>
#include <vcl/font.hxx>
#include <vcl/gfxlink.hxx>
@@ -332,6 +331,7 @@
#include <o3tl/strong_int.hxx>
#include <o3tl/typed_flags_set.hxx>
#include <o3tl/underlyingenumvalue.hxx>
+#include <o3tl/unit_conversion.hxx>
#include <salhelper/salhelperdllapi.h>
#include <salhelper/simplereferenceobject.hxx>
#include <salhelper/thread.hxx>
diff --git a/sc/source/ui/cctrl/checklistmenu.cxx
b/sc/source/ui/cctrl/checklistmenu.cxx
index 2e33aed9767e..19c098a8d96e 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -23,7 +23,6 @@
#include <vcl/decoview.hxx>
#include <vcl/event.hxx>
-#include <vcl/floatwin.hxx>
#include <vcl/dockwin.hxx>
#include <vcl/settings.hxx>
#include <vcl/svapp.hxx>
diff --git a/sd/inc/pch/precompiled_sdui.hxx b/sd/inc/pch/precompiled_sdui.hxx
index f14026ff755a..b001f6e9513f 100644
--- a/sd/inc/pch/precompiled_sdui.hxx
+++ b/sd/inc/pch/precompiled_sdui.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-02-19 15:35:10 using:
+ Generated on 2021-02-25 10:52:03 using:
./bin/update_pch sd sdui --cutoff=4 --exclude:system --include:module
--include:local
If after updating build fails, use the following command to locate
conflicting headers:
@@ -115,7 +115,6 @@
#include <vcl/dockwin.hxx>
#include <vcl/errcode.hxx>
#include <vcl/event.hxx>
-#include <vcl/floatwin.hxx>
#include <vcl/fntstyle.hxx>
#include <vcl/font.hxx>
#include <vcl/formatter.hxx>
diff --git a/svtools/inc/pch/precompiled_svt.hxx
b/svtools/inc/pch/precompiled_svt.hxx
index 6058ce56fc40..1458ac1207ab 100644
--- a/svtools/inc/pch/precompiled_svt.hxx
+++ b/svtools/inc/pch/precompiled_svt.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-02-19 15:35:11 using:
+ Generated on 2021-02-25 10:06:21 using:
./bin/update_pch svtools svt --cutoff=4 --exclude:system --include:module
--exclude:local
If after updating build fails, use the following command to locate
conflicting headers:
@@ -103,7 +103,6 @@
#include <vcl/dllapi.h>
#include <vcl/errcode.hxx>
#include <vcl/event.hxx>
-#include <vcl/floatwin.hxx>
#include <vcl/fntstyle.hxx>
#include <vcl/font.hxx>
#include <vcl/gfxlink.hxx>
diff --git a/svtools/source/uno/popupwindowcontroller.cxx
b/svtools/source/uno/popupwindowcontroller.cxx
index ff3d4ebed962..fe7eac4ff847 100644
--- a/svtools/source/uno/popupwindowcontroller.cxx
+++ b/svtools/source/uno/popupwindowcontroller.cxx
@@ -20,7 +20,6 @@
#include <cppuhelper/supportsservice.hxx>
#include <toolkit/helper/vclunohelper.hxx>
-#include <vcl/floatwin.hxx>
#include <vcl/svapp.hxx>
#include <vcl/toolbox.hxx>
diff --git a/svx/inc/pch/precompiled_svxcore.hxx
b/svx/inc/pch/precompiled_svxcore.hxx
index 2b44fbb17b95..d0c6418cc805 100644
--- a/svx/inc/pch/precompiled_svxcore.hxx
+++ b/svx/inc/pch/precompiled_svxcore.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-02-22 20:25:01 using:
+ Generated on 2021-02-25 10:11:08 using:
./bin/update_pch svx svxcore --cutoff=7 --exclude:system --include:module
--exclude:local
If after updating build fails, use the following command to locate
conflicting headers:
@@ -63,7 +63,6 @@
#include <osl/getglobalmutex.hxx>
#include <osl/interlck.h>
#include <osl/mutex.hxx>
-#include <osl/thread.h>
#include <osl/time.h>
#include <rtl/alloc.h>
#include <rtl/character.hxx>
@@ -111,7 +110,6 @@
#include <vcl/dockwin.hxx>
#include <vcl/errcode.hxx>
#include <vcl/event.hxx>
-#include <vcl/floatwin.hxx>
#include <vcl/fntstyle.hxx>
#include <vcl/font.hxx>
#include <vcl/gdimtf.hxx>
diff --git a/sw/inc/pch/precompiled_swui.hxx b/sw/inc/pch/precompiled_swui.hxx
index 587b05c404ab..6c8d2f084784 100644
--- a/sw/inc/pch/precompiled_swui.hxx
+++ b/sw/inc/pch/precompiled_swui.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-02-19 15:35:37 using:
+ Generated on 2021-02-25 10:07:10 using:
./bin/update_pch sw swui --cutoff=3 --exclude:system --include:module
--include:local
If after updating build fails, use the following command to locate
conflicting headers:
@@ -112,7 +112,6 @@
#include <vcl/dockwin.hxx>
#include <vcl/errcode.hxx>
#include <vcl/event.hxx>
-#include <vcl/floatwin.hxx>
#include <vcl/fntstyle.hxx>
#include <vcl/font.hxx>
#include <vcl/formatter.hxx>
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 207708bf56d5..7bb05907ecba 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -47,7 +47,6 @@
#include <tools/helpers.hxx>
#include <vcl/abstdlg.hxx>
#include <vcl/builder.hxx>
-#include <vcl/floatwin.hxx>
#include <vcl/toolkit/combobox.hxx>
#include <vcl/toolkit/dialog.hxx>
#include <vcl/toolkit/fixed.hxx>
diff --git a/vcl/source/control/calendar.cxx b/vcl/source/control/calendar.cxx
index 68c4d74950ef..efcfc0c63800 100644
--- a/vcl/source/control/calendar.cxx
+++ b/vcl/source/control/calendar.cxx
@@ -26,7 +26,6 @@
#include <vcl/toolkit/calendar.hxx>
#include <vcl/commandevent.hxx>
#include <vcl/dockwin.hxx>
-#include <vcl/floatwin.hxx>
#include <unotools/calendarwrapper.hxx>
#include <unotools/localedatawrapper.hxx>
#include <com/sun/star/i18n/Weekdays.hpp>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
