extensions/prop: create instances with uno constructors

See tdf#74608 for motivation.

Change-Id: I89d2c8d0b2bf960b3de1853c69fa64ff41b484ef
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99185
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

1 files changed, 4 insertions, 21 deletions

diff --git a/extensions/source/propctrlr/formcontroller.hxx b/extensions/source/propctrlr/formcontroller.hxx
index 82dd842ef8b4..b66b9de604ca 100644
--- a/extensions/source/propctrlr/formcontroller.hxx
+++ b/extensions/source/propctrlr/formcontroller.hxx
@@ -30,17 +30,6 @@ namespace pcr
 {
 
 
-    //= ServiceDescriptor
-
-    struct ServiceDescriptor
-    {
-        OUString
-            ( *GetImplementationName )( void );
-        css::uno::Sequence< OUString >
-            ( *GetSupportedServiceNames )( void );
-    };
-
-
     //= FormController
 
     class FormController;
@@ -57,24 +46,18 @@ namespace pcr
                             ,public FormController_PropertyBase2
     {
     private:
-        ServiceDescriptor           m_aServiceDescriptor;
         css::uno::Reference< css::beans::XPropertySet >
                                     m_xCurrentInspectee;
+        OUString                    m_sImplementationName;
+        css::uno::Sequence<OUString> m_aSupportedServiceNames;
     public:
         FormController(
             const css::uno::Reference< css::uno::XComponentContext >& _rxContext,
-            ServiceDescriptor _aServiceDescriptor,
+            const OUString& sImplementName,
+            const css::uno::Sequence<OUString>& aSupportedServiceNames,
             bool _bUseFormFormComponentHandlers
         );
 
-        // XServiceInfo - static versions
-        /// @throws css::uno::RuntimeException
-        static OUString getImplementationName_static(  );
-        /// @throws css::uno::RuntimeException
-        static css::uno::Sequence< OUString > getSupportedServiceNames_static(  );
-        static css::uno::Reference< css::uno::XInterface >
-                        Create(const css::uno::Reference< css::uno::XComponentContext >&);
-
     protected:
         virtual ~FormController() override;