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, 5 insertions, 7 deletions

diff --git a/extensions/source/propctrlr/buttonnavigationhandler.hxx b/extensions/source/propctrlr/buttonnavigationhandler.hxx
index 79ae7910aaf2..86a60c6ea75d 100644
--- a/extensions/source/propctrlr/buttonnavigationhandler.hxx
+++ b/extensions/source/propctrlr/buttonnavigationhandler.hxx
@@ -26,11 +26,9 @@
 namespace pcr
 {
 
-    class ButtonNavigationHandler;
-    typedef HandlerComponentBase< ButtonNavigationHandler > ButtonNavigationHandler_Base;
     /** a property handler for any virtual string properties
     */
-    class ButtonNavigationHandler : public ButtonNavigationHandler_Base
+    class ButtonNavigationHandler : public PropertyHandlerComponent
     {
     private:
         css::uno::Reference< css::inspection::XPropertyHandler >
@@ -40,10 +38,6 @@ namespace pcr
         explicit ButtonNavigationHandler(
             const css::uno::Reference< css::uno::XComponentContext >& _rxContext
         );
-        /// @throws css::uno::RuntimeException
-        static OUString getImplementationName_static(  );
-        /// @throws css::uno::RuntimeException
-        static css::uno::Sequence< OUString > getSupportedServiceNames_static(  );
 
     protected:
         virtual ~ButtonNavigationHandler() override;
@@ -51,6 +45,10 @@ namespace pcr
         static bool    isNavigationCapableButton( const css::uno::Reference< css::beans::XPropertySet >& _rxComponent );
 
     protected:
+        // XServiceInfo
+        virtual OUString SAL_CALL getImplementationName() override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames () override;
+
         // XPropertyHandler overriables
         virtual void                                    SAL_CALL inspect( const css::uno::Reference< css::uno::XInterface >& _rxIntrospectee ) override;
         virtual css::uno::Any                           SAL_CALL getPropertyValue( const OUString& _rPropertyName ) override;