[Libreoffice-commits] core.git: dbaccess/inc include/vcl toolkit/inc

[Caolán McNamara]

 dbaccess/inc/pch/precompiled_dbu.hxx |    1 -
 include/vcl/msgbox.hxx               |   28 ----------------------------
 toolkit/inc/helper/msgbox.hxx        |   25 +++++++++++++++++++++++++
 3 files changed, 25 insertions(+), 29 deletions(-)

New commits:
commit bcb1392505ee3a19d8062402ff66888f1631b264
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Mar 21 16:05:52 2018 +0000

    move MessBoxStyle to last consumer
    
    Change-Id: I1edbf247999cd59cee4d268ed686e8ed9b61d99f
    Reviewed-on: https://gerrit.libreoffice.org/51712
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/dbaccess/inc/pch/precompiled_dbu.hxx b/dbaccess/inc/pch/precompiled_dbu.hxx
index 1a7661b30ce4..76a71af8ed9c 100644
--- a/dbaccess/inc/pch/precompiled_dbu.hxx
+++ b/dbaccess/inc/pch/precompiled_dbu.hxx
@@ -79,7 +79,6 @@
 #include <vcl/menu.hxx>
 #include <vcl/metaact.hxx>
 #include <vcl/metaactiontypes.hxx>
-#include <vcl/msgbox.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/outdevmap.hxx>
 #include <vcl/outdevstate.hxx>
diff --git a/include/vcl/msgbox.hxx b/include/vcl/msgbox.hxx
index 57d34a41afd1..ccdcf3aec7ff 100644
--- a/include/vcl/msgbox.hxx
+++ b/include/vcl/msgbox.hxx
@@ -21,34 +21,6 @@
 #define INCLUDED_VCL_MSGBOX_HXX
 
 #include <vcl/dllapi.h>
-#include <vcl/btndlg.hxx>
-#include <vcl/image.hxx>
-#include <vcl/bitmap.hxx>
-#include <o3tl/typed_flags_set.hxx>
-
-class VclMultiLineEdit;
-class FixedImage;
-class CheckBox;
-
-// Window-Bits for MessageBoxen
-enum class MessBoxStyle {
-    NONE              = 0x0000,
-    Ok                = 0x0001,
-    OkCancel          = 0x0002,
-    YesNo             = 0x0004,
-    YesNoCancel       = 0x0008,
-    RetryCancel       = 0x0010,
-    DefaultOk         = 0x0020,
-    DefaultCancel     = 0x0040,
-    DefaultRetry      = 0x0080,
-    DefaultYes        = 0x0100,
-    DefaultNo         = 0x0200,
-    AbortRetryIgnore  = 0x1000,
-    DefaultIgnore     = 0x2000,
-};
-namespace o3tl {
-    template<> struct typed_flags<MessBoxStyle> : is_typed_flags<MessBoxStyle, 0x3fff> {};
-}
 
 VCL_DLLPUBLIC Image const & GetStandardInfoBoxImage();
 VCL_DLLPUBLIC OUString GetStandardInfoBoxText();
diff --git a/toolkit/inc/helper/msgbox.hxx b/toolkit/inc/helper/msgbox.hxx
index 327c87e971b9..40c7aa5514b3 100644
--- a/toolkit/inc/helper/msgbox.hxx
+++ b/toolkit/inc/helper/msgbox.hxx
@@ -17,8 +17,33 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <o3tl/typed_flags_set.hxx>
 #include <vcl/btndlg.hxx>
 
+// Window-Bits for MessageBoxen
+enum class MessBoxStyle
+{
+    NONE = 0x0000,
+    Ok = 0x0001,
+    OkCancel = 0x0002,
+    YesNo = 0x0004,
+    YesNoCancel = 0x0008,
+    RetryCancel = 0x0010,
+    DefaultOk = 0x0020,
+    DefaultCancel = 0x0040,
+    DefaultRetry = 0x0080,
+    DefaultYes = 0x0100,
+    DefaultNo = 0x0200,
+    AbortRetryIgnore = 0x1000,
+    DefaultIgnore = 0x2000,
+};
+namespace o3tl
+{
+template <> struct typed_flags<MessBoxStyle> : is_typed_flags<MessBoxStyle, 0x3fff>
+{
+};
+}
+
 class MessBox : public ButtonDialog
 {
     VclPtr<VclMultiLineEdit> mpVCLMultiLineEdit;