include/vcl/syswin.hxx | 16 ----------------
include/vcl/vclenum.hxx | 16 ++++++++++++++++
2 files changed, 16 insertions(+), 16 deletions(-)
New commits:
commit 39759e85d9931ba9dcee04bb4010c51d729b7ecf
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Oct 30 09:09:46 2019 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Oct 30 16:17:58 2019 +0100
move WindowStateState to vclenum.hxx
Change-Id: Ia1b7c2bfa2fc1ee8ff65bdde79ba9be59700c17b
Reviewed-on: https://gerrit.libreoffice.org/81742
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/include/vcl/syswin.hxx b/include/vcl/syswin.hxx
index 57ca00e619a7..ce69f1f81b1c 100644
--- a/include/vcl/syswin.hxx
+++ b/include/vcl/syswin.hxx
@@ -43,22 +43,6 @@ class TaskPaneList;
#define ICON_MATH_DOCUMENT 13
#define ICON_MACROLIBRARY 1
-enum class WindowStateState {
- NONE = 0x0000,
- Normal = 0x0001,
- Minimized = 0x0002,
- Maximized = 0x0004,
- Rollup = 0x0008,
- MaximizedHorz = 0x0010,
- MaximizedVert = 0x0020,
- FullScreen = 0x0040,
- SystemMask = 0xffff
-};
-namespace o3tl
-{
- template<> struct typed_flags<WindowStateState> :
is_typed_flags<WindowStateState, 0xffff> {};
-}
-
class VCL_PLUGIN_PUBLIC WindowStateData
{
private:
diff --git a/include/vcl/vclenum.hxx b/include/vcl/vclenum.hxx
index 7d8728e90dc1..90bfa9900566 100644
--- a/include/vcl/vclenum.hxx
+++ b/include/vcl/vclenum.hxx
@@ -298,6 +298,22 @@ enum class ToolBoxButtonSize
Size32,
};
+enum class WindowStateState {
+ NONE = 0x0000,
+ Normal = 0x0001,
+ Minimized = 0x0002,
+ Maximized = 0x0004,
+ Rollup = 0x0008,
+ MaximizedHorz = 0x0010,
+ MaximizedVert = 0x0020,
+ FullScreen = 0x0040,
+ SystemMask = 0xffff
+};
+namespace o3tl
+{
+ template<> struct typed_flags<WindowStateState> :
is_typed_flags<WindowStateState, 0xffff> {};
+}
+
#endif // INCLUDED_VCL_VCLENUM_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
