[Libreoffice-commits] core.git: accessibility/source include/vcl solenv/clang-format toolkit/source vcl/Executable_vcldemo.mk vcl/inc vcl/qa vcl/source vcl/workben

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Wed May 20 18:25:20 UTC 2020 

 accessibility/source/helper/acc_factory.cxx          |    2 +-
 accessibility/source/standard/vclxaccessiblebox.cxx  |    2 +-
 accessibility/source/standard/vclxaccessiblelist.cxx |    2 +-
 include/vcl/toolkit/combobox.hxx                     |    4 ++++
 include/vcl/toolkit/field.hxx                        |    2 +-
 solenv/clang-format/blacklist                        |    2 +-
 toolkit/source/awt/vclxtoolkit.cxx                   |    2 +-
 toolkit/source/awt/vclxwindows.cxx                   |    2 +-
 vcl/Executable_vcldemo.mk                            |    4 ++++
 vcl/inc/jsdialog/jsdialogbuilder.hxx                 |    4 ++--
 vcl/inc/salvtables.hxx                               |    2 +-
 vcl/qa/cppunit/lifecycle.cxx                         |    2 +-
 vcl/source/app/salvtables.cxx                        |    2 +-
 vcl/source/control/combobox.cxx                      |    2 +-
 vcl/source/uitest/uiobject.cxx                       |    2 +-
 vcl/workben/vcldemo.cxx                              |    2 +-
 16 files changed, 23 insertions(+), 15 deletions(-)

New commits:
commit 4a231d1fc13fa13ec48e7d41d0a8c59a2527a3f4
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed May 13 15:58:03 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed May 20 20:24:32 2020 +0200

    move ComboBox to toolkit-only headers
    
    Change-Id: If5f0ab1fba8fa7302b7c0e8d2b25761ab64c97e1
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94143
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/accessibility/source/helper/acc_factory.cxx b/accessibility/source/helper/acc_factory.cxx
index 68fb48922a9b..02d75771fb98 100644
--- a/accessibility/source/helper/acc_factory.cxx
+++ b/accessibility/source/helper/acc_factory.cxx
@@ -54,7 +54,7 @@
 #include <extended/accessibleeditbrowseboxcell.hxx>
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <vcl/lstbox.hxx>
-#include <vcl/combobox.hxx>
+#include <vcl/toolkit/combobox.hxx>
 #include <extended/AccessibleGridControl.hxx>
 #include <vcl/accessibletable.hxx>
 #include <vcl/popupmenuwindow.hxx>
diff --git a/accessibility/source/standard/vclxaccessiblebox.cxx b/accessibility/source/standard/vclxaccessiblebox.cxx
index 109a76b6c364..fd382ff5b06b 100644
--- a/accessibility/source/standard/vclxaccessiblebox.cxx
+++ b/accessibility/source/standard/vclxaccessiblebox.cxx
@@ -28,7 +28,7 @@
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <vcl/svapp.hxx>
-#include <vcl/combobox.hxx>
+#include <vcl/toolkit/combobox.hxx>
 #include <vcl/lstbox.hxx>
 #include <strings.hxx>
 
diff --git a/accessibility/source/standard/vclxaccessiblelist.cxx b/accessibility/source/standard/vclxaccessiblelist.cxx
index 5eae30ecd602..e405b30fb4c3 100644
--- a/accessibility/source/standard/vclxaccessiblelist.cxx
+++ b/accessibility/source/standard/vclxaccessiblelist.cxx
@@ -30,7 +30,7 @@
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <o3tl/safeint.hxx>
 #include <vcl/svapp.hxx>
-#include <vcl/combobox.hxx>
+#include <vcl/toolkit/combobox.hxx>
 #include <vcl/lstbox.hxx>
 #include <toolkit/helper/convert.hxx>
 
diff --git a/include/vcl/combobox.hxx b/include/vcl/toolkit/combobox.hxx
similarity index 98%
rename from include/vcl/combobox.hxx
rename to include/vcl/toolkit/combobox.hxx
index ee5f72bcad8d..81bd8c2dfc57 100644
--- a/include/vcl/combobox.hxx
+++ b/include/vcl/toolkit/combobox.hxx
@@ -20,6 +20,10 @@
 #ifndef INCLUDED_VCL_COMBOBOX_HXX
 #define INCLUDED_VCL_COMBOBOX_HXX
 
+#if !defined(VCL_DLLIMPLEMENTATION) && !defined(TOOLKIT_DLLIMPLEMENTATION) && !defined(VCL_INTERNALS)
+#error "don't use this in new code"
+#endif
+
 #include <memory>
 #include <vcl/dllapi.h>
 #include <vcl/edit.hxx>
diff --git a/include/vcl/toolkit/field.hxx b/include/vcl/toolkit/field.hxx
index ce3f1277e862..e78b174e74a5 100644
--- a/include/vcl/toolkit/field.hxx
+++ b/include/vcl/toolkit/field.hxx
@@ -25,7 +25,7 @@
 #endif
 
 #include <config_options.h>
-#include <vcl/combobox.hxx>
+#include <vcl/toolkit/combobox.hxx>
 #include <vcl/field.hxx>
 #include <vcl/longcurr.hxx>
 
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index 15313bf28a61..6c5a6a477d3e 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -7332,7 +7332,6 @@ include/vcl/cairo.hxx
 include/vcl/calendar.hxx
 include/vcl/canvastools.hxx
 include/vcl/checksum.hxx
-include/vcl/combobox.hxx
 include/vcl/commandevent.hxx
 include/vcl/commandinfoprovider.hxx
 include/vcl/ctrl.hxx
@@ -7451,6 +7450,7 @@ include/vcl/threadex.hxx
 include/vcl/timer.hxx
 include/vcl/toolbox.hxx
 include/vcl/toolkit/button.hxx
+include/vcl/toolkit/combobox.hxx
 include/vcl/toolkit/controllayout.hxx
 include/vcl/toolkit/dialog.hxx
 include/vcl/toolkit/field.hxx
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index 773b3e930537..b7f6f2f43f91 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -81,7 +81,7 @@
 #include <controls/filectrl.hxx>
 #include <controls/treecontrolpeer.hxx>
 #include <vcl/toolkit/button.hxx>
-#include <vcl/combobox.hxx>
+#include <vcl/toolkit/combobox.hxx>
 #include <vcl/ctrl.hxx>
 #include <vcl/toolkit/dialog.hxx>
 #include <vcl/dockingarea.hxx>
diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx
index 97b7fa6677b5..ab190525b478 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -45,7 +45,7 @@
 #include <vcl/button.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/lstbox.hxx>
-#include <vcl/combobox.hxx>
+#include <vcl/toolkit/combobox.hxx>
 #include <vcl/toolkit/field.hxx>
 #include <vcl/toolkit/fixedhyper.hxx>
 #include <vcl/longcurr.hxx>
diff --git a/vcl/Executable_vcldemo.mk b/vcl/Executable_vcldemo.mk
index 55848b280339..a9a8d195fdc9 100644
--- a/vcl/Executable_vcldemo.mk
+++ b/vcl/Executable_vcldemo.mk
@@ -26,6 +26,10 @@ $(eval $(call gb_Executable_use_externals,vcldemo,\
 ))
 endif
 
+$(eval $(call gb_Executable_add_defs,vcldemo,\
+    -DVCL_INTERNALS \
+))
+
 $(eval $(call gb_Executable_set_include,vcldemo,\
     $$(INCLUDE) \
     -I$(SRCDIR)/vcl/inc \
diff --git a/vcl/inc/jsdialog/jsdialogbuilder.hxx b/vcl/inc/jsdialog/jsdialogbuilder.hxx
index ae8261871ee7..d01521924170 100644
--- a/vcl/inc/jsdialog/jsdialogbuilder.hxx
+++ b/vcl/inc/jsdialog/jsdialogbuilder.hxx
@@ -7,7 +7,7 @@
 #include <vcl/virdev.hxx>
 #include <vcl/builder.hxx>
 #include <salvtables.hxx>
-#include <vcl/combobox.hxx>
+#include <vcl/toolkit/combobox.hxx>
 #include <vcl/button.hxx>
 
 class JSDialogSender
@@ -130,4 +130,4 @@ public:
     virtual void insert_page(const OString& rIdent, const OUString& rLabel, int nPos) override;
 };
 
-#endif
\ No newline at end of file
+#endif
diff --git a/vcl/inc/salvtables.hxx b/vcl/inc/salvtables.hxx
index b42440f4b477..6cc85731952e 100644
--- a/vcl/inc/salvtables.hxx
+++ b/vcl/inc/salvtables.hxx
@@ -19,7 +19,7 @@
 #include <vcl/fixed.hxx>
 #include <vcl/lstbox.hxx>
 #include <vcl/menubtn.hxx>
-#include <vcl/combobox.hxx>
+#include <vcl/toolkit/combobox.hxx>
 #include <vcl/tabctrl.hxx>
 #include <vcl/layout.hxx>
 #include "messagedialog.hxx"
diff --git a/vcl/qa/cppunit/lifecycle.cxx b/vcl/qa/cppunit/lifecycle.cxx
index e55e7da8ebaf..a4a3f5d9e3d2 100644
--- a/vcl/qa/cppunit/lifecycle.cxx
+++ b/vcl/qa/cppunit/lifecycle.cxx
@@ -11,8 +11,8 @@
 
 #include <vcl/wrkwin.hxx>
 #include <vcl/edit.hxx>
-#include <vcl/combobox.hxx>
 #include <vcl/toolkit/button.hxx>
+#include <vcl/toolkit/combobox.hxx>
 #include <vcl/toolkit/dialog.hxx>
 #include <vcl/toolkit/field.hxx>
 #include <vcl/virdev.hxx>
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index c53c7603a8c4..b3c9d2cfb77d 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -45,7 +45,7 @@
 #include <vcl/abstdlg.hxx>
 #include <vcl/builder.hxx>
 #include <vcl/calendar.hxx>
-#include <vcl/combobox.hxx>
+#include <vcl/toolkit/combobox.hxx>
 #include <vcl/toolkit/dialog.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/toolkit/fixedhyper.hxx>
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 3c82e3ddd1c0..1ca1d398a676 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <vcl/combobox.hxx>
+#include <vcl/toolkit/combobox.hxx>
 
 #include <set>
 
diff --git a/vcl/source/uitest/uiobject.cxx b/vcl/source/uitest/uiobject.cxx
index 4dde9aa09874..22496e2375a0 100644
--- a/vcl/source/uitest/uiobject.cxx
+++ b/vcl/source/uitest/uiobject.cxx
@@ -12,7 +12,7 @@
 #include <vcl/uitest/formattedfielduiobject.hxx>
 
 #include <vcl/svapp.hxx>
-#include <vcl/combobox.hxx>
+#include <vcl/toolkit/combobox.hxx>
 #include <vcl/event.hxx>
 #include <vcl/floatwin.hxx>
 #include <vcl/tabpage.hxx>
diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index 5ca05d716c85..13bdfed953bf 100644
--- a/vcl/workben/vcldemo.cxx
+++ b/vcl/workben/vcldemo.cxx
@@ -44,7 +44,7 @@
 #include <vcl/virdev.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <vcl/button.hxx>
-#include <vcl/combobox.hxx>
+#include <vcl/toolkit/combobox.hxx>
 #include <vcl/toolbox.hxx>
 #include <vcl/pngwrite.hxx>
 #include <vcl/floatwin.hxx>

More information about the Libreoffice-commits mailing list