From a2b256df787e76c90c110f363cf7a3b84b54947f Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Fri, 2 Oct 2020 14:26:51 +0200 Subject: Use the new single-instance="true" attribute in embeddedobj Change-Id: Icead3bb5715a08bc2a2dfbb16c074d1b19e316a9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103855 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- embeddedobj/source/commonembedding/xfactory.cxx | 9 +++------ embeddedobj/source/general/xcreator.cxx | 6 ++---- embeddedobj/source/msole/emboleobj.component | 3 ++- embeddedobj/source/msole/emboleobj.windows.component | 6 ++++-- embeddedobj/source/msole/xdialogcreator.cxx | 5 ++--- embeddedobj/source/msole/xolefactory.cxx | 5 ++--- embeddedobj/util/embobj.component | 9 ++++++--- 7 files changed, 21 insertions(+), 22 deletions(-) (limited to 'embeddedobj') diff --git a/embeddedobj/source/commonembedding/xfactory.cxx b/embeddedobj/source/commonembedding/xfactory.cxx index a4ef74d08ee4..3f7cb8fde98f 100644 --- a/embeddedobj/source/commonembedding/xfactory.cxx +++ b/embeddedobj/source/commonembedding/xfactory.cxx @@ -24,6 +24,7 @@ #include #include #include +#include #include #include "xfactory.hxx" @@ -367,9 +368,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* embeddedobj_OOoEmbeddedObjectFactory_get_implementation( css::uno::XComponentContext* context, css::uno::Sequence const&) { - static rtl::Reference g_Instance(new OOoEmbeddedObjectFactory(context)); - g_Instance->acquire(); - return static_cast(g_Instance.get()); + return cppu::acquire(static_cast(new OOoEmbeddedObjectFactory(context))); } @@ -413,8 +412,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* embeddedobj_OOoSpecialEmbeddedObjectFactory_get_implementation( css::uno::XComponentContext* context, css::uno::Sequence const&) { - static rtl::Reference g_Instance(new OOoSpecialEmbeddedObjectFactory(context)); - g_Instance->acquire(); - return static_cast(g_Instance.get()); + return cppu::acquire(static_cast(new OOoSpecialEmbeddedObjectFactory(context))); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/embeddedobj/source/general/xcreator.cxx b/embeddedobj/source/general/xcreator.cxx index 9e9bb0934603..a54295895190 100644 --- a/embeddedobj/source/general/xcreator.cxx +++ b/embeddedobj/source/general/xcreator.cxx @@ -28,9 +28,9 @@ #include #include +#include #include #include -#include #include #include @@ -410,9 +410,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* embeddedobj_UNOEmbeddedObjectCreator_get_implementation( css::uno::XComponentContext* context, css::uno::Sequence const&) { - static rtl::Reference g_Instance(new UNOEmbeddedObjectCreator(context)); - g_Instance->acquire(); - return static_cast(g_Instance.get()); + return cppu::acquire(static_cast(new UNOEmbeddedObjectCreator(context))); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/embeddedobj/source/msole/emboleobj.component b/embeddedobj/source/msole/emboleobj.component index bf7e128f04e5..ac09d3a6d32d 100644 --- a/embeddedobj/source/msole/emboleobj.component +++ b/embeddedobj/source/msole/emboleobj.component @@ -20,7 +20,8 @@ + constructor="embeddedobj_OleEmbeddedObjectFactory_get_implementation" + single-instance="true"> diff --git a/embeddedobj/source/msole/emboleobj.windows.component b/embeddedobj/source/msole/emboleobj.windows.component index e41c81d33048..89b644fc79b0 100644 --- a/embeddedobj/source/msole/emboleobj.windows.component +++ b/embeddedobj/source/msole/emboleobj.windows.component @@ -20,12 +20,14 @@ + constructor="embeddedobj_MSOLEDialogObjectCreator_get_implementation" + single-instance="true"> + constructor="embeddedobj_OleEmbeddedObjectFactory_get_implementation" + single-instance="true"> diff --git a/embeddedobj/source/msole/xdialogcreator.cxx b/embeddedobj/source/msole/xdialogcreator.cxx index 49e9c0c925e4..415039c3f1fc 100644 --- a/embeddedobj/source/msole/xdialogcreator.cxx +++ b/embeddedobj/source/msole/xdialogcreator.cxx @@ -35,6 +35,7 @@ #include #include #include +#include #include "xdialogcreator.hxx" #include @@ -323,9 +324,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* embeddedobj_MSOLEDialogObjectCreator_get_implementation( css::uno::XComponentContext* context, css::uno::Sequence const&) { - static rtl::Reference g_Instance(new MSOLEDialogObjectCreator(context)); - g_Instance->acquire(); - return static_cast(g_Instance.get()); + return cppu::acquire(static_cast(new MSOLEDialogObjectCreator(context))); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/embeddedobj/source/msole/xolefactory.cxx b/embeddedobj/source/msole/xolefactory.cxx index 9ecd2c690bf5..b18ba1153498 100644 --- a/embeddedobj/source/msole/xolefactory.cxx +++ b/embeddedobj/source/msole/xolefactory.cxx @@ -28,6 +28,7 @@ #include #include +#include using namespace ::com::sun::star; @@ -244,9 +245,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* embeddedobj_OleEmbeddedObjectFactory_get_implementation( css::uno::XComponentContext* context, css::uno::Sequence const&) { - static rtl::Reference g_Instance(new OleEmbeddedObjectFactory(context)); - g_Instance->acquire(); - return static_cast(g_Instance.get()); + return cppu::acquire(static_cast(new OleEmbeddedObjectFactory(context))); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/embeddedobj/util/embobj.component b/embeddedobj/util/embobj.component index e3cbe3a5fa79..0e68c26b3bac 100644 --- a/embeddedobj/util/embobj.component +++ b/embeddedobj/util/embobj.component @@ -20,17 +20,20 @@ + constructor="embeddedobj_UNOEmbeddedObjectCreator_get_implementation" + single-instance="true"> + constructor="embeddedobj_OOoEmbeddedObjectFactory_get_implementation" + single-instance="true"> + constructor="embeddedobj_OOoSpecialEmbeddedObjectFactory_get_implementation" + single-instance="true"> -- cgit