forward decl vcl::Window in uiobject.hxx

Change-Id: Ic4355a7cbf15e211b820e8343638100f729b4189
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113969
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

6 files changed, 9 insertions, 6 deletions

diff --git a/include/vcl/uitest/uiobject.hxx b/include/vcl/uitest/uiobject.hxx
index c9f2b922a792..1a2c192a4c63 100644
--- a/include/vcl/uitest/uiobject.hxx
+++ b/include/vcl/uitest/uiobject.hxx
@@ -14,7 +14,8 @@
 #include <map>
 #include <memory>
 
-#include <vcl/window.hxx>
+#include <vcl/vclevent.hxx>
+#include <vcl/vclptr.hxx>
 #include <vcl/dllapi.h>
 
 #include <set>
@@ -38,6 +39,7 @@ class VclDrawingArea;
 class VclMultiLineEdit;
 class MenuButton;
 class ToolBox;
+namespace vcl { class Window; }
 namespace weld { class CustomWidgetController; }
 
 typedef std::map<OUString, OUString> StringMap;
diff --git a/svtools/source/uitest/uiobject.cxx b/svtools/source/uitest/uiobject.cxx
index 0b3d78daf7b0..2de31226f93d 100644
--- a/svtools/source/uitest/uiobject.cxx
+++ b/svtools/source/uitest/uiobject.cxx
@@ -10,6 +10,7 @@
 #include <memory>
 #include <uiobject.hxx>
 #include <svtools/valueset.hxx>
+#include <vcl/window.hxx>
 
 ValueSetUIObject::ValueSetUIObject(const VclPtr<vcl::Window>& rSetWin)
     : DrawingAreaUIObject(rSetWin)
diff --git a/svx/source/dialog/weldeditview.cxx b/svx/source/dialog/weldeditview.cxx
index 379e53d32523..5cab041bae76 100644
--- a/svx/source/dialog/weldeditview.cxx
+++ b/svx/source/dialog/weldeditview.cxx
@@ -43,6 +43,7 @@
 #include <vcl/ptrstyle.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
+#include <vcl/window.hxx>
 #include <vcl/uitest/uiobject.hxx>
 
 void WeldEditView::SetText(const OUString& rStr) { GetEditEngine()->SetText(rStr); }
diff --git a/svx/source/uitest/sdrobject.cxx b/svx/source/uitest/sdrobject.cxx
index 8229a454376f..0d287de2a8a7 100644
--- a/svx/source/uitest/sdrobject.cxx
+++ b/svx/source/uitest/sdrobject.cxx
@@ -8,13 +8,11 @@
  */
 
 #include <svx/uiobject.hxx>
-
 #include <svx/svdobj.hxx>
-
+#include <svx/SvxColorValueSet.hxx>
 #include <tools/fract.hxx>
-
+#include <vcl/window.hxx>
 #include <memory>
-#include <svx/SvxColorValueSet.hxx>
 
 SdrUIObject::~SdrUIObject() {}
 
diff --git a/svx/source/uitest/uiobject.cxx b/svx/source/uitest/uiobject.cxx
index 9c46d0993441..1c56b9b61bb0 100644
--- a/svx/source/uitest/uiobject.cxx
+++ b/svx/source/uitest/uiobject.cxx
@@ -10,8 +10,8 @@
 #include <memory>
 #include <uiobject.hxx>
 #include <svx/charmap.hxx>
-
 #include <svx/numvset.hxx>
+#include <vcl/window.hxx>
 
 SvxShowCharSetUIObject::SvxShowCharSetUIObject(const VclPtr<vcl::Window>& rCharSetWin)
     : DrawingAreaUIObject(rCharSetWin)
diff --git a/vcl/source/uitest/uno/uiobject_uno.hxx b/vcl/source/uitest/uno/uiobject_uno.hxx
index 2f98ab7c04a6..0cc904860efd 100644
--- a/vcl/source/uitest/uno/uiobject_uno.hxx
+++ b/vcl/source/uitest/uno/uiobject_uno.hxx
@@ -19,6 +19,7 @@
 #include <condition_variable>
 #include <mutex>
 
+#include <tools/link.hxx>
 #include <vcl/uitest/uiobject.hxx>
 
 class Timer;