uitest: a slightly better approach for the factory problem in the ui testing

Change-Id: I15dbf2446791c4be9be4e18e63c0d03104d8d405

2 files changed, 20 insertions, 35 deletions

diff --git a/vcl/inc/uitest/factory.hxx b/vcl/inc/uitest/factory.hxx
deleted file mode 100644
index 7018a198f984..000000000000
--- a/vcl/inc/uitest/factory.hxx
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#include <vcl/uitest/factory.hxx>
-
-#include <tools/wintypes.hxx>
-
-#include <memory>
-#include <map>
-
-namespace vcl
-{
-
-class Window;
-
-}
-
-class UIObject;
-
-class UITestWrapperFactory
-{
-public:
-    static std::unique_ptr<UIObject> createObject(vcl::Window* pWindow);
-
-    static std::map<WindowType, FactoryFunction> aFactoryMap;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/uitest/uiobject_impl.hxx b/vcl/inc/uitest/uiobject_impl.hxx
index 3bac973ecb58..f0843a7d0b0d 100644
--- a/vcl/inc/uitest/uiobject_impl.hxx
+++ b/vcl/inc/uitest/uiobject_impl.hxx
@@ -40,6 +40,8 @@ public:
 
     virtual void dumpHierarchy() const override;
 
+    static std::unique_ptr<UIObject> create(vcl::Window* pWindow);
+
 protected:
 
     virtual OUString get_name() const;
@@ -61,6 +63,8 @@ public:
 
     virtual UIObjectType get_type() const override;
 
+    static std::unique_ptr<UIObject> create(vcl::Window* pWindow);
+
 protected:
 
     virtual OUString get_name() const override;
@@ -78,6 +82,8 @@ public:
 
     virtual StringMap get_state() override;
 
+    static std::unique_ptr<UIObject> create(vcl::Window* pWindow);
+
 protected:
 
     virtual OUString get_name() const override;
@@ -98,6 +104,8 @@ public:
 
     virtual UIObjectType get_type() const override;
 
+    static std::unique_ptr<UIObject> create(vcl::Window* pWindow);
+
 protected:
 
     virtual OUString get_name() const override;
@@ -119,6 +127,8 @@ public:
 
     virtual UIObjectType get_type() const override;
 
+    static std::unique_ptr<UIObject> create(vcl::Window* pWindow);
+
 protected:
 
     virtual OUString get_name() const override;
@@ -136,9 +146,10 @@ public:
 
     virtual StringMap get_state() override;
 
-
     virtual UIObjectType get_type() const override;
 
+    static std::unique_ptr<UIObject> create(vcl::Window* pWindow);
+
 protected:
 
     virtual OUString get_name() const override;
@@ -160,6 +171,8 @@ public:
 
     virtual UIObjectType get_type() const override;
 
+    static std::unique_ptr<UIObject> create(vcl::Window* pWindow);
+
 protected:
 
     virtual OUString get_name() const override;
@@ -182,6 +195,8 @@ public:
 
     virtual UIObjectType get_type() const override;
 
+    static std::unique_ptr<UIObject> create(vcl::Window* pWindow);
+
 protected:
 
     virtual OUString get_name() const override;
@@ -203,6 +218,8 @@ public:
 
     virtual UIObjectType get_type() const override;
 
+    static std::unique_ptr<UIObject> create(vcl::Window* pWindow);
+
 protected:
 
     virtual OUString get_name() const override;
@@ -223,6 +240,8 @@ public:
 
     virtual UIObjectType get_type() const override;
 
+    static std::unique_ptr<UIObject> create(vcl::Window* pWindow);
+
 protected:
 
     virtual OUString get_name() const override;