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

diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx
index 76e92f064638..7233d2df6446 100644
--- a/extensions/source/propctrlr/propcontroller.cxx
+++ b/extensions/source/propctrlr/propcontroller.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "pcrservices.hxx"
 #include "propcontroller.hxx"
 #include "handlerhelper.hxx"
 #include "standardcontrol.hxx"
@@ -50,12 +49,6 @@
 #include <algorithm>
 #include <sal/log.hxx>
 
-// !!! outside the namespace !!!
-extern "C" void createRegistryInfo_OPropertyBrowserController()
-{
-    ::pcr::OAutoRegistration< ::pcr::OPropertyBrowserController > aAutoRegistration;
-}
-
 namespace pcr
 {
     using namespace ::com::sun::star;
@@ -512,7 +505,7 @@ namespace pcr
 
     OUString SAL_CALL OPropertyBrowserController::getImplementationName(  )
     {
-        return getImplementationName_static();
+        return "org.openoffice.comp.extensions.ObjectInspector";
     }
 
     sal_Bool SAL_CALL OPropertyBrowserController::supportsService( const OUString& ServiceName )
@@ -523,28 +516,10 @@ namespace pcr
 
     Sequence< OUString > SAL_CALL OPropertyBrowserController::getSupportedServiceNames(  )
     {
-        return getSupportedServiceNames_static();
-    }
-
-
-    OUString OPropertyBrowserController::getImplementationName_static(  )
-    {
-        return "org.openoffice.comp.extensions.ObjectInspector";
-    }
-
-
-    Sequence< OUString > OPropertyBrowserController::getSupportedServiceNames_static(  )
-    {
         return { "com.sun.star.inspection.ObjectInspector" };
     }
 
 
-    Reference< XInterface > OPropertyBrowserController::Create(const Reference< XComponentContext >& _rxContext)
-    {
-        return *(new OPropertyBrowserController( _rxContext ) );
-    }
-
-
     void SAL_CALL OPropertyBrowserController::focusGained( const FocusEvent& _rSource )
     {
         Reference< XWindow > xSourceWindow(_rSource.Source, UNO_QUERY);
@@ -1658,5 +1633,11 @@ namespace pcr
 
 } // namespace pcr
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
+extensions_propctrlr_OPropertyBrowserController_get_implementation(
+    css::uno::XComponentContext* context , css::uno::Sequence<css::uno::Any> const&)
+{
+    return cppu::acquire(new pcr::OPropertyBrowserController(context));
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */