summaryrefslogtreecommitdiff
path: root/configmgr/source/components.cxx
diff options
context:
space:
mode:
authorsb <sb@openoffice.org>2010-10-28 16:37:27 +0200
committersb <sb@openoffice.org>2010-10-28 16:37:27 +0200
commit43c80a7f3d338ef28b9d4a94415ca72acccbd8dc (patch)
tree9020bdc053c963d364609561fd506f0b2c434c04 /configmgr/source/components.cxx
parent2d0a9ecb3724b9744fdf566b4e1a520ade3c570e (diff)
sb132: #i114877# combined configmgr::Components::{init,get}Singleton
Diffstat (limited to 'configmgr/source/components.cxx')
-rw-r--r--configmgr/source/components.cxx6
1 files changed, 1 insertions, 5 deletions
diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx
index 32478e9681..2d148959ed 100644
--- a/configmgr/source/components.cxx
+++ b/configmgr/source/components.cxx
@@ -214,7 +214,7 @@ void Components::WriteThread::run() {
reference_->clear();
}
-void Components::initSingleton(
+Components & Components::getSingleton(
css::uno::Reference< css::uno::XComponentContext > const & context)
{
OSL_ASSERT(context.is());
@@ -223,10 +223,6 @@ void Components::initSingleton(
static Components theSingleton(context);
singleton = &theSingleton;
}
-}
-
-Components & Components::getSingleton() {
- OSL_ASSERT(singletonCreated);
if (singleton == 0) {
throw css::uno::RuntimeException(
rtl::OUString(