9 files changed, 19 insertions, 7 deletions
diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx
index a79465163328..99e223ab61b9 100644
--- a/include/sfx2/tabdlg.hxx
+++ b/include/sfx2/tabdlg.hxx
@@ -200,6 +200,8 @@ public:
 
     //calls Ok without closing dialog
     bool Apply();
+
+    virtual FactoryFunction GetUITestFactory() const override;
 };
 
 namespace sfx { class ItemConnectionBase; }
diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx
index e40e16f8d96b..472949d86d99 100644
--- a/include/vcl/button.hxx
+++ b/include/vcl/button.hxx
@@ -96,6 +96,8 @@ public:
     /// Sets the button state according to the FeatureStateEvent emitted by an Uno state change.
     virtual void        statusChanged(const css::frame::FeatureStateEvent& rEvent);
 
+    virtual FactoryFunction GetUITestFactory() const;
+
 protected:
 
     /// Handler for click, in case we want the button to handle uno commands (.uno:Something).
@@ -474,8 +476,9 @@ public:
 
     virtual bool set_property(const OString &rKey, const OString &rValue) override;
     virtual void ShowFocus(const Rectangle& rRect) override;
-};
 
+    virtual FactoryFunction GetUITestFactory() const override;
+};
 
 inline void CheckBox::Check( bool bCheck )
 {
diff --git a/include/vcl/combobox.hxx b/include/vcl/combobox.hxx
index 61ad35838e4c..fd568f635146 100644
--- a/include/vcl/combobox.hxx
+++ b/include/vcl/combobox.hxx
@@ -181,6 +181,8 @@ public:
     void setMaxWidthChars(sal_Int32 nWidth);
 
     virtual bool set_property(const OString &rKey, const OString &rValue) override;
+
+    virtual FactoryFunction GetUITestFactory() const override;
 };
 
 #endif  // _COMBOBOX_HXX
diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx
index 9c0774712e31..afa8c2e33e81 100644
--- a/include/vcl/dialog.hxx
+++ b/include/vcl/dialog.hxx
@@ -96,6 +96,8 @@ public:
     virtual short   Execute();
     bool            IsInExecute() const { return mbInExecute; }
 
+    virtual FactoryFunction GetUITestFactory() const;
+
     // Dialog::Execute replacement API
 public:
     virtual void    StartExecuteModal( const Link<Dialog&,void>& rEndDialogHdl );
diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx
index 722a25855e20..357dc6af7de2 100644
--- a/include/vcl/edit.hxx
+++ b/include/vcl/edit.hxx
@@ -274,6 +274,8 @@ public:
 
     void SetTextFilter(TextFilter* pFilter) { mpFilterText = pFilter; }
 
+    virtual FactoryFunction GetUITestFactory() const override;
+
     // returns the minimum size a bordered Edit should have given the current
     // global style settings (needed by sc's inputwin.cxx)
     static Size GetMinimumEditSize();
diff --git a/include/vcl/lstbox.hxx b/include/vcl/lstbox.hxx
index c480e46d4e25..e35366a1358a 100644
--- a/include/vcl/lstbox.hxx
+++ b/include/vcl/lstbox.hxx
@@ -274,6 +274,8 @@ public:
     void EnableQuickSelection( bool b );
 
     static sal_Int32 NaturalSortCompare(const OUString &rA, const OUString &rB);
+
+    virtual FactoryFunction GetUITestFactory() const override;
 };
 
 class VCL_DLLPUBLIC MultiListBox : public ListBox
diff --git a/include/vcl/spinfld.hxx b/include/vcl/spinfld.hxx
index bd1375af624f..f3346431ad89 100644
--- a/include/vcl/spinfld.hxx
+++ b/include/vcl/spinfld.hxx
@@ -99,6 +99,8 @@ public:
     virtual Size    CalcMinimumSizeForText(const OUString &rString) const override;
     virtual Size    GetOptimalSize() const override;
     virtual Size    CalcSize(sal_Int32 nChars) const override;
+
+    virtual FactoryFunction GetUITestFactory() const override;
 };
 
 #endif // INCLUDED_VCL_SPINFLD_HXX
diff --git a/include/vcl/uitest/factory.hxx b/include/vcl/uitest/factory.hxx
index 2e804497810c..da645f309b79 100644
--- a/include/vcl/uitest/factory.hxx
+++ b/include/vcl/uitest/factory.hxx
@@ -7,10 +7,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <vcl/dllapi.h>
-
-#include <tools/wintypes.hxx>
-
 #include <memory>
 #include <functional>
 
@@ -24,6 +20,4 @@ class UIObject;
 
 typedef std::function<std::unique_ptr<UIObject>(vcl::Window*)> FactoryFunction;
 
-void UITEST_DLLPUBLIC registerUITestFactory(WindowType eType, FactoryFunction aFactory);
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 933e490e2684..d49ce633bd25 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -33,6 +33,7 @@
 #include <vcl/keycodes.hxx>
 #include <vcl/region.hxx>
 #include <vcl/salnativewidgets.hxx>
+#include <vcl/uitest/factory.hxx>
 #include <rtl/ustring.hxx>
 #include <rtl/ref.hxx>
 #include <cppuhelper/weakref.hxx>
@@ -1587,6 +1588,8 @@ public:
 
     virtual OUString GetSurroundingText() const;
     virtual Selection GetSurroundingTextSelection() const;
+
+    virtual FactoryFunction GetUITestFactory() const;
 };
 
 }