[Libreoffice-commits] core.git: include/vcl solenv/clang-format toolkit/inc toolkit/Library_tk.mk toolkit/source vcl/Library_vcl.mk vcl/source

[Caolán McNamara]

 solenv/clang-format/blacklist    |    4 ++--
 toolkit/Library_tk.mk            |    1 +
 toolkit/inc/helper/btndlg.hxx    |   13 ++++++-------
 toolkit/inc/helper/msgbox.hxx    |    2 +-
 toolkit/source/helper/btndlg.cxx |    3 +--
 vcl/Library_vcl.mk               |    1 -
 6 files changed, 11 insertions(+), 13 deletions(-)

New commits:
commit 751191ed2d7d6af6eddc3d738e8c45b0a2ab2572
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Mar 21 16:12:56 2018 +0000

    move btndlg from vcl to toolkit
    
    Change-Id: Iecc528bce1df9a67af43f9d9dd3ed41af24b0fad
    Reviewed-on: https://gerrit.libreoffice.org/51713
    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/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index 29b995cbdc69..5e1551bdcc14 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -7976,7 +7976,6 @@ include/vcl/animate.hxx
 include/vcl/bitmap.hxx
 include/vcl/bitmapaccess.hxx
 include/vcl/bitmapex.hxx
-include/vcl/btndlg.hxx
 include/vcl/builder.hxx
 include/vcl/builderfactory.hxx
 include/vcl/button.hxx
@@ -16739,6 +16738,7 @@ testtools/source/performance/ubtest.cxx
 toolkit/inc/helper/accessibilityclient.hxx
 toolkit/inc/helper/imagealign.hxx
 toolkit/inc/helper/tkresmgr.hxx
+toolkit/inc/helper/btndlg.hxx
 toolkit/inc/helper/unopropertyarrayhelper.hxx
 toolkit/inc/helper/unowrapper.hxx
 toolkit/source/awt/animatedimagespeer.cxx
@@ -16801,6 +16801,7 @@ toolkit/source/controls/unocontrolcontainermodel.cxx
 toolkit/source/controls/unocontrolmodel.cxx
 toolkit/source/controls/unocontrols.cxx
 toolkit/source/helper/accessibilityclient.cxx
+toolkit/source/helper/btndlg.cxx
 toolkit/source/helper/formpdfexport.cxx
 toolkit/source/helper/imagealign.cxx
 toolkit/source/helper/listenermultiplexer.cxx
@@ -18267,7 +18268,6 @@ vcl/source/window/accel.cxx
 vcl/source/window/accessibility.cxx
 vcl/source/window/accmgr.cxx
 vcl/source/window/brdwin.cxx
-vcl/source/window/btndlg.cxx
 vcl/source/window/builder.cxx
 vcl/source/window/clipping.cxx
 vcl/source/window/commandevent.cxx
diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk
index 94e08a8dee74..29dc182bbc4f 100644
--- a/toolkit/Library_tk.mk
+++ b/toolkit/Library_tk.mk
@@ -109,6 +109,7 @@ $(eval $(call gb_Library_add_exception_objects,tk,\
     toolkit/source/controls/unocontrolmodel \
     toolkit/source/controls/unocontrols \
     toolkit/source/helper/accessibilityclient \
+    toolkit/source/helper/btndlg \
     toolkit/source/helper/formpdfexport \
     toolkit/source/helper/imagealign \
     toolkit/source/helper/listenermultiplexer \
diff --git a/include/vcl/btndlg.hxx b/toolkit/inc/helper/btndlg.hxx
similarity index 88%
rename from include/vcl/btndlg.hxx
rename to toolkit/inc/helper/btndlg.hxx
index 86122f979d8a..eb278846d5f1 100644
--- a/include/vcl/btndlg.hxx
+++ b/toolkit/inc/helper/btndlg.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_VCL_BTNDLG_HXX
 #define INCLUDED_VCL_BTNDLG_HXX
 
-#include <vcl/dllapi.h>
 #include <vcl/dialog.hxx>
 #include <o3tl/typed_flags_set.hxx>
 
@@ -47,7 +46,7 @@ namespace o3tl
     template<> struct typed_flags<ButtonDialogFlags> : is_typed_flags<ButtonDialogFlags, 0x001f> {};
 }
 
-class VCL_DLLPUBLIC ButtonDialog : public Dialog
+class ButtonDialog : public Dialog
 {
 public:
                         ButtonDialog( vcl::Window* pParent, WinBits nStyle );
@@ -83,11 +82,11 @@ private:
     sal_uInt16          mnFocusButtonId;
     bool                mbFormat;
 
-    SAL_DLLPRIVATE void             ImplInitButtonDialogData();
-    SAL_DLLPRIVATE VclPtr<PushButton> ImplCreatePushButton( ButtonDialogFlags nBtnFlags );
-    SAL_DLLPRIVATE ImplBtnDlgItem*  ImplGetItem( sal_uInt16 nId ) const;
-    DECL_DLLPRIVATE_LINK(     ImplClickHdl, Button* pBtn, void );
-    SAL_DLLPRIVATE void             ImplPosControls();
+    void             ImplInitButtonDialogData();
+    VclPtr<PushButton> ImplCreatePushButton( ButtonDialogFlags nBtnFlags );
+    ImplBtnDlgItem*  ImplGetItem( sal_uInt16 nId ) const;
+    DECL_LINK( ImplClickHdl, Button* pBtn, void );
+    void             ImplPosControls();
 
 };
 
diff --git a/toolkit/inc/helper/msgbox.hxx b/toolkit/inc/helper/msgbox.hxx
index 40c7aa5514b3..0fc7631d93de 100644
--- a/toolkit/inc/helper/msgbox.hxx
+++ b/toolkit/inc/helper/msgbox.hxx
@@ -18,7 +18,7 @@
  */
 
 #include <o3tl/typed_flags_set.hxx>
-#include <vcl/btndlg.hxx>
+#include <helper/btndlg.hxx>
 
 // Window-Bits for MessageBoxen
 enum class MessBoxStyle
diff --git a/vcl/source/window/btndlg.cxx b/toolkit/source/helper/btndlg.cxx
similarity index 99%
rename from vcl/source/window/btndlg.cxx
rename to toolkit/source/helper/btndlg.cxx
index ba1b1d77e697..28d63b2c3f3e 100644
--- a/vcl/source/window/btndlg.cxx
+++ b/toolkit/source/helper/btndlg.cxx
@@ -18,10 +18,9 @@
  */
 
 #include <memory>
-#include <svdata.hxx>
 
 #include <vcl/button.hxx>
-#include <vcl/btndlg.hxx>
+#include <helper/btndlg.hxx>
 
 
 struct ImplBtnDlgItem
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index a777f238a070..82971a424eb3 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -142,7 +142,6 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
     vcl/source/window/stacking \
     vcl/source/window/debug \
     vcl/source/window/globalization \
-    vcl/source/window/btndlg \
     vcl/source/window/builder \
     vcl/source/window/commandevent \
     vcl/source/window/cursor \