1 files changed, 5 insertions, 24 deletions
diff --git a/extensions/source/logging/logger.cxx b/extensions/source/logging/logger.cxx
index 1770ca377175..4ae2f79362fc 100644
--- a/extensions/source/logging/logger.cxx
+++ b/extensions/source/logging/logger.cxx
@@ -32,8 +32,8 @@
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <cppuhelper/weakref.hxx>
-#include <rtl/ref.hxx>
 #include <map>
+#include <utility>
 
 
 namespace logging
@@ -64,7 +64,7 @@ namespace logging
         // </attributes>
 
     public:
-        EventLogger( const Reference< XComponentContext >& _rxContext, const OUString& _rName );
+        EventLogger( const Reference< XComponentContext >& _rxContext, OUString _aName );
 
         // XLogger
         virtual OUString SAL_CALL getName() override;
@@ -114,11 +114,11 @@ namespace logging
 
     }
 
-    EventLogger::EventLogger( const Reference< XComponentContext >& _rxContext, const OUString& _rName )
+    EventLogger::EventLogger( const Reference< XComponentContext >& _rxContext, OUString _aName )
         :m_aHandlers( m_aMutex )
         ,m_nEventNumber( 0 )
         ,m_nLogLevel( css::logging::LogLevel::OFF )
-        ,m_sName( _rName )
+        ,m_sName(std::move( _aName ))
     {
         osl_atomic_increment( &m_refCount );
         {
@@ -255,31 +255,12 @@ namespace logging
 
 } // namespace logging
 
-namespace {
-
-struct Instance {
-    explicit Instance(
-        css::uno::Reference<css::uno::XComponentContext> const & context):
-        instance(static_cast<cppu::OWeakObject *>(new logging::LoggerPool(context)))
-    {}
-
-    rtl::Reference<css::uno::XInterface> instance;
-};
-
-struct Singleton:
-    public rtl::StaticWithArg<
-        Instance, css::uno::Reference<css::uno::XComponentContext>, Singleton>
-{};
-
-}
-
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
 com_sun_star_comp_extensions_LoggerPool(
     css::uno::XComponentContext *context,
     css::uno::Sequence<css::uno::Any> const &)
 {
-    return cppu::acquire(static_cast<cppu::OWeakObject *>(
-                Singleton::get(context).instance.get()));
+    return cppu::acquire(new logging::LoggerPool(context));
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */