unowrap.hxx is also exposed for toolkit only

Change-Id: Ife3648c8ca84c942f02fb6eab2990ec3eb3eb3f9
Reviewed-on: https://gerrit.libreoffice.org/61764
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

16 files changed, 14 insertions, 15 deletions

diff --git a/canvas/workben/canvasdemo.cxx b/canvas/workben/canvasdemo.cxx
index c419bb72775a..20b345e5060a 100644
--- a/canvas/workben/canvasdemo.cxx
+++ b/canvas/workben/canvasdemo.cxx
@@ -49,7 +49,6 @@
 #include <sal/macros.h>
 #include <vcl/canvastools.hxx>
 #include <vcl/svapp.hxx>
-#include <vcl/unowrap.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/window.hxx>
 
diff --git a/include/vcl/unowrap.hxx b/include/vcl/toolkit/unowrap.hxx
index bc4cc3ca848e..bc4cc3ca848e 100644
--- a/include/vcl/unowrap.hxx
+++ b/include/vcl/toolkit/unowrap.hxx
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index 5f15395d1dca..6d0368fc6783 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -8052,6 +8052,7 @@ include/vcl/throbber.hxx
 include/vcl/timer.hxx
 include/vcl/toolbox.hxx
 include/vcl/toolkit/group.hxx
+include/vcl/toolkit/unowrap.hxx
 include/vcl/txtattr.hxx
 include/vcl/uitest/factory.hxx
 include/vcl/uitest/logger.hxx
@@ -8059,7 +8060,6 @@ include/vcl/uitest/uiobject.hxx
 include/vcl/uitest/uitest.hxx
 include/vcl/unohelp.hxx
 include/vcl/unohelp2.hxx
-include/vcl/unowrap.hxx
 include/vcl/vclenum.hxx
 include/vcl/vclevent.hxx
 include/vcl/vcllayout.hxx
diff --git a/toolkit/inc/helper/unowrapper.hxx b/toolkit/inc/helper/unowrapper.hxx
index 31844f12cd35..1c6c2a5e8a67 100644
--- a/toolkit/inc/helper/unowrapper.hxx
+++ b/toolkit/inc/helper/unowrapper.hxx
@@ -25,7 +25,7 @@
 #include <com/sun/star/awt/XWindowPeer.hpp>
 #include <com/sun/star/accessibility/XAccessible.hpp>
 
-#include <vcl/unowrap.hxx>
+#include <vcl/toolkit/unowrap.hxx>
 #include <vcl/window.hxx>
 
 #include <helper/accessibilityclient.hxx>
diff --git a/vcl/inc/pch/precompiled_vcl.hxx b/vcl/inc/pch/precompiled_vcl.hxx
index 509a0493ffec..c37db5d2bd15 100644
--- a/vcl/inc/pch/precompiled_vcl.hxx
+++ b/vcl/inc/pch/precompiled_vcl.hxx
@@ -179,9 +179,9 @@
 #include <vcl/taskpanelist.hxx>
 #include <vcl/timer.hxx>
 #include <vcl/toolbox.hxx>
+#include <vcl/toolkit/unowrap.hxx>
 #include <vcl/uitest/uiobject.hxx>
 #include <vcl/unohelp.hxx>
-#include <vcl/unowrap.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/vclptr.hxx>
 #include <vcl/vclreferencebase.hxx>
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index aed6316810e9..efb5214ddb33 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -45,7 +45,7 @@
 #include <vcl/sysdata.hxx>
 #include <vcl/tabctrl.hxx>
 #include <vcl/tabpage.hxx>
-#include <vcl/unowrap.hxx>
+#include <vcl/toolkit/unowrap.hxx>
 #include <vcl/weld.hxx>
 #include <bitmaps.hlst>
 
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 43cdf894e3c2..cd4422f0ef89 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -45,7 +45,7 @@
 #include <vcl/wrkwin.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/cvtgrf.hxx>
-#include <vcl/unowrap.hxx>
+#include <vcl/toolkit/unowrap.hxx>
 #include <vcl/timer.hxx>
 #include <vcl/scheduler.hxx>
 #include <vcl/unohelp.hxx>
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index 4f660133ebf6..673e800e4ac4 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -42,7 +42,7 @@
 #include <vcl/image.hxx>
 #include <vcl/ImageTree.hxx>
 #include <vcl/settings.hxx>
-#include <vcl/unowrap.hxx>
+#include <vcl/toolkit/unowrap.hxx>
 #include <vcl/commandinfoprovider.hxx>
 #include <vcl/configsettings.hxx>
 #include <vcl/lazydelete.hxx>
diff --git a/vcl/source/outdev/outdev.cxx b/vcl/source/outdev/outdev.cxx
index 340c0a68f495..a58bc91779cc 100644
--- a/vcl/source/outdev/outdev.cxx
+++ b/vcl/source/outdev/outdev.cxx
@@ -24,7 +24,7 @@
 #include <vcl/metaact.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/outdev.hxx>
-#include <vcl/unowrap.hxx>
+#include <vcl/toolkit/unowrap.hxx>
 #include <vcl/sysdata.hxx>
 
 #include <salgdi.hxx>
diff --git a/vcl/source/window/accessibility.cxx b/vcl/source/window/accessibility.cxx
index 6802b1a604f7..069cac8e11e7 100644
--- a/vcl/source/window/accessibility.cxx
+++ b/vcl/source/window/accessibility.cxx
@@ -44,7 +44,7 @@
 #include <vcl/button.hxx>
 #include <vcl/taskpanelist.hxx>
 #include <vcl/dialog.hxx>
-#include <vcl/unowrap.hxx>
+#include <vcl/toolkit/unowrap.hxx>
 #include <vcl/gdimtf.hxx>
 #include <vcl/pdfextoutdevdata.hxx>
 #include <vcl/popupmenuwindow.hxx>
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 5b2ec3b225db..a03ea6021d33 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -50,7 +50,7 @@
 #include <vcl/tabctrl.hxx>
 #include <vcl/tabpage.hxx>
 #include <vcl/decoview.hxx>
-#include <vcl/unowrap.hxx>
+#include <vcl/toolkit/unowrap.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/uitest/uiobject.hxx>
 #include <vcl/uitest/logger.hxx>
diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx
index 795a6f98c0fa..c5d6a93798d4 100644
--- a/vcl/source/window/dockmgr.cxx
+++ b/vcl/source/window/dockmgr.cxx
@@ -33,7 +33,7 @@
 #include <vcl/timer.hxx>
 #include <vcl/idle.hxx>
 #include <vcl/lineinfo.hxx>
-#include <vcl/unowrap.hxx>
+#include <vcl/toolkit/unowrap.hxx>
 #include <vcl/settings.hxx>
 
 #define DOCKWIN_FLOATSTYLES         (WB_SIZEABLE | WB_MOVEABLE | WB_CLOSEABLE | WB_STANDALONE | WB_ROLLABLE )
diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx
index 9a2419c88ec7..ec203fc743bf 100644
--- a/vcl/source/window/dockwin.cxx
+++ b/vcl/source/window/dockwin.cxx
@@ -26,7 +26,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/timer.hxx>
 #include <vcl/idle.hxx>
-#include <vcl/unowrap.hxx>
+#include <vcl/toolkit/unowrap.hxx>
 #include <vcl/settings.hxx>
 
 #include <svdata.hxx>
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 30741a4ed620..4839f9e314c8 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -59,7 +59,7 @@
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/accessibility/XAccessible.hpp>
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
-#include <vcl/unowrap.hxx>
+#include <vcl/toolkit/unowrap.hxx>
 
 #include <vcl/unohelp.hxx>
 #include <vcl/configsettings.hxx>
diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx
index c5db670b3c6d..734e1d0b946f 100644
--- a/vcl/source/window/syswin.cxx
+++ b/vcl/source/window/syswin.cxx
@@ -31,7 +31,7 @@
 #include <vcl/event.hxx>
 #include <vcl/syswin.hxx>
 #include <vcl/taskpanelist.hxx>
-#include <vcl/unowrap.hxx>
+#include <vcl/toolkit/unowrap.hxx>
 #include <vcl/tabctrl.hxx>
 #include <vcl/tabpage.hxx>
 #include <vcl/mnemonic.hxx>
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 7675cf9ae221..32ff0470013e 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -38,7 +38,7 @@
 #include <vcl/button.hxx>
 #include <vcl/taskpanelist.hxx>
 #include <vcl/dialog.hxx>
-#include <vcl/unowrap.hxx>
+#include <vcl/toolkit/unowrap.hxx>
 #include <vcl/gdimtf.hxx>
 #include <vcl/lazydelete.hxx>
 #include <vcl/virdev.hxx>