diff options
Diffstat (limited to 'configmgr/source/components.cxx')
| -rwxr-xr-x[-rw-r--r--] | configmgr/source/components.cxx | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx index 44c2d32a924e..108e08fa7a12 100644..100755 --- a/configmgr/source/components.cxx +++ b/configmgr/source/components.cxx @@ -217,7 +217,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()); @@ -226,10 +226,6 @@ void Components::initSingleton( singleton = &theSingleton; singletonCreated = true; } -} - -Components & Components::getSingleton() { - OSL_ASSERT(singletonCreated); if (singleton == 0) { throw css::uno::RuntimeException( rtl::OUString( @@ -869,7 +865,7 @@ void Components::parseModificationLayer() { "configmgr user registrymodifications.xcu does not (yet) exist"); // Migrate old user layer data (can be removed once migration is no // longer relevant, probably OOo 4; also see hack for xsi namespace in - // XmlReader constructor): + // xmlreader::XmlReader::registerNamespaceIri): parseFiles( Data::NO_LAYER, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".xcu")), &parseXcuFile, |