[Libreoffice-commits] core.git: sd/source

[Noel Grandin (via logerrit)]

 sd/source/ui/framework/factories/PresentationFactory.cxx |    4 +---
 sd/source/ui/framework/module/ModuleController.cxx       |    2 +-
 sd/source/ui/inc/framework/PresentationFactory.hxx       |   11 ++---------
 3 files changed, 4 insertions(+), 13 deletions(-)

New commits:
commit c92060d20c30c7a90c2c2e63fd98cb4d185bb402
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Fri Jan 20 14:00:15 2023 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Fri Jan 20 17:41:56 2023 +0000

    PresentationFactoryProvider can just be a static method
    
    Change-Id: Ie46d784b10e01e394235b31d986868d72c4dbd10
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145896
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/sd/source/ui/framework/factories/PresentationFactory.cxx 
b/sd/source/ui/framework/factories/PresentationFactory.cxx
index 6603f5db5159..60ebb6efd11c 100644
--- a/sd/source/ui/framework/factories/PresentationFactory.cxx
+++ b/sd/source/ui/framework/factories/PresentationFactory.cxx
@@ -129,9 +129,7 @@ void PresentationFactory::ThrowIfDisposed() const
     }
 }
 
-//===== PresentationFactoryProvider ===========================================
-
-PresentationFactoryProvider::PresentationFactoryProvider (const 
Reference<frame::XController>& rxController)
+void PresentationFactory::install(const Reference<frame::XController>& 
rxController)
 {
     try
     {
diff --git a/sd/source/ui/framework/module/ModuleController.cxx 
b/sd/source/ui/framework/module/ModuleController.cxx
index 066f25ba70e1..a703c48ca27c 100644
--- a/sd/source/ui/framework/module/ModuleController.cxx
+++ b/sd/source/ui/framework/module/ModuleController.cxx
@@ -127,7 +127,7 @@ void ModuleController::InstantiateStartupServices()
         // at the configuration controller.
         Reference<uno::XComponentContext> xContext =
             ::comphelper::getProcessComponentContext();
-        rtl::Reference<::sd::framework::PresentationFactoryProvider> x = new 
sd::framework::PresentationFactoryProvider(mxController);
+        sd::framework::PresentationFactory::install(mxController);
     }
     catch (Exception&)
     {
diff --git a/sd/source/ui/inc/framework/PresentationFactory.hxx 
b/sd/source/ui/inc/framework/PresentationFactory.hxx
index bf3523c4bcb3..261e6fd26332 100644
--- a/sd/source/ui/inc/framework/PresentationFactory.hxx
+++ b/sd/source/ui/inc/framework/PresentationFactory.hxx
@@ -44,6 +44,8 @@ public:
         const css::uno::Reference<css::frame::XController>& rxController);
     virtual ~PresentationFactory() override;
 
+    static void install(const css::uno::Reference<css::frame::XController>& 
rxController);
+
     // XResourceFactory
 
     virtual css::uno::Reference<css::drawing::framework::XResource>
@@ -72,15 +74,6 @@ private:
     void ThrowIfDisposed() const;
 };
 
-typedef comphelper::WeakComponentImplHelper<> 
PresentationFactoryProviderInterfaceBase;
-
-class PresentationFactoryProvider
-    : public PresentationFactoryProviderInterfaceBase
-{
-public:
-    PresentationFactoryProvider(const 
css::uno::Reference<css::frame::XController>& rxController);
-};
-
 } // end of namespace sd::framework
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */