sb121: #i110006# do not leak Component singleton (based on a patch by cmc)

1 files changed, 3 insertions, 2 deletions

diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx
index 51a1a6547d9b..51cc76bef602 100644
--- a/configmgr/source/components.cxx
+++ b/configmgr/source/components.cxx
@@ -112,7 +112,7 @@ rtl::OUString expand(rtl::OUString const & str) {
 }
 
 static bool singletonCreated = false;
-static Components * singleton; // leaks
+static Components * singleton = 0;
 
 }
 
@@ -122,7 +122,8 @@ void Components::initSingleton(
     OSL_ASSERT(context.is());
     if (!singletonCreated) {
         singletonCreated = true;
-        singleton = new Components(context);
+        static Components theSingleton(context);
+        singleton = &theSingleton;
     }
 }