diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2020-10-02 14:27:24 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2020-10-02 20:44:52 +0200 |
| commit | d777da05516d25fa1f027ea81436be65b5816d70 (patch) | |
| tree | 3f7f4112f7fcb59baad0fab3c874e9557e6beec0 /desktop | |
| parent | f4bf7804d5aeb35a9b0c6517997cf079ff770e9e (diff) | |
Use the new single-instance="true" attribute in desktop
Change-Id: I8ac760a1215dbaaa76923dc07c21cc971f735412
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103856
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/splash/spl.component | 2 | ||||
| -rw-r--r-- | desktop/source/splash/unxsplash.cxx | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/desktop/source/splash/spl.component b/desktop/source/splash/spl.component index 204dbffa8b89..a15cbdf54492 100644 --- a/desktop/source/splash/spl.component +++ b/desktop/source/splash/spl.component @@ -24,7 +24,7 @@ <service name="com.sun.star.office.SplashScreen"/> </implementation> <implementation name="com.sun.star.office.comp.PipeSplashScreen" - constructor="desktop_UnxSplash_get_implementation"> + constructor="desktop_UnxSplash_get_implementation" single-instance="true"> <service name="com.sun.star.office.PipeSplashScreen"/> </implementation> </component> diff --git a/desktop/source/splash/unxsplash.cxx b/desktop/source/splash/unxsplash.cxx index efee99e46023..2cf813ac2165 100644 --- a/desktop/source/splash/unxsplash.cxx +++ b/desktop/source/splash/unxsplash.cxx @@ -122,10 +122,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* desktop_UnxSplash_get_implementation( css::uno::XComponentContext* , css::uno::Sequence<css::uno::Any> const&) { - static rtl::Reference< desktop::UnxSplashScreen > m_xINSTANCE(new desktop::UnxSplashScreen()); - - m_xINSTANCE->acquire(); - return static_cast<cppu::OWeakObject*>(m_xINSTANCE.get()); + return cppu::acquire(static_cast<cppu::OWeakObject*>(new desktop::UnxSplashScreen())); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |