[Libreoffice-commits] core.git: 2 commits - cui/source include/vcl reportdesign/source

[Caolán McNamara (via logerrit)]

 cui/source/options/optgdlg.cxx           |    2 +-
 include/vcl/toolbox.hxx                  |   10 ----------
 include/vcl/vclenum.hxx                  |   10 ++++++++++
 reportdesign/source/ui/dlg/Condition.hxx |    6 ------
 4 files changed, 11 insertions(+), 17 deletions(-)

New commits:
commit 414d10d8a3041e5e2aa899b59c1919e41c75371d
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sat Oct 12 20:04:46 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sun Oct 13 16:18:19 2019 +0200

    move ToolBoxButtonSize into vclenum
    
    Change-Id: I684d192296642bc507a6f75dd52a5ce72b028157
    Reviewed-on: https://gerrit.libreoffice.org/80721
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index fb320a25c289..1aae24ea20e1 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -68,10 +68,10 @@
 #include <com/sun/star/office/Quickstart.hpp>
 #include <com/sun/star/linguistic2/XLinguProperties.hpp>
 
+#include <vcl/vclenum.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/IconThemeInfo.hxx>
-#include <vcl/toolbox.hxx>
 #if HAVE_FEATURE_OPENGL
 #include <vcl/opengl/OpenGLWrapper.hxx>
 #endif
diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx
index 0fa569248dd2..56fe90bff710 100644
--- a/include/vcl/toolbox.hxx
+++ b/include/vcl/toolbox.hxx
@@ -58,16 +58,6 @@ namespace o3tl
     template<> struct typed_flags<ToolBoxMenuType> : is_typed_flags<ToolBoxMenuType, 0x0003> {};
 }
 
-// small, large, size32 force an exact toolbox size for proper alignment
-// DontCare will let the toolbox decide about its size
-enum class ToolBoxButtonSize
-{
-    DontCare,
-    Small,
-    Large,
-    Size32,
-};
-
 enum class ToolBoxLayoutMode
 {
     Normal,  // traditional layout, items are centered in the toolbar
diff --git a/include/vcl/vclenum.hxx b/include/vcl/vclenum.hxx
index c7ced830da49..7d8728e90dc1 100644
--- a/include/vcl/vclenum.hxx
+++ b/include/vcl/vclenum.hxx
@@ -288,6 +288,16 @@ namespace o3tl
     template<> struct typed_flags<WizardButtonFlags> : is_typed_flags<WizardButtonFlags, 0x001f> {};
 }
 
+// small, large, size32 force an exact toolbox size for proper alignment
+// DontCare will let the toolbox decide about its size
+enum class ToolBoxButtonSize
+{
+    DontCare,
+    Small,
+    Large,
+    Size32,
+};
+
 #endif // INCLUDED_VCL_VCLENUM_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit d0a537a26a5f9def5d85f5c027a9029dda1e58bd
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sat Oct 12 19:51:13 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sun Oct 13 16:18:08 2019 +0200

    drop some unnecessary includes
    
    Change-Id: I07693dd5199a1fcc08c7ba25bd986d9da76958b3
    Reviewed-on: https://gerrit.libreoffice.org/80720
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/reportdesign/source/ui/dlg/Condition.hxx b/reportdesign/source/ui/dlg/Condition.hxx
index 680632e8db51..d16e81ce8ca3 100644
--- a/reportdesign/source/ui/dlg/Condition.hxx
+++ b/reportdesign/source/ui/dlg/Condition.hxx
@@ -27,12 +27,6 @@
 #include <svx/colorwindow.hxx>
 #include <svx/fntctrl.hxx>
 
-#include <vcl/fixed.hxx>
-#include <vcl/lstbox.hxx>
-#include <vcl/field.hxx>
-#include <vcl/button.hxx>
-#include <vcl/toolbox.hxx>
-#include <vcl/builder.hxx>
 #include <vcl/customweld.hxx>
 #include <vcl/weld.hxx>