desktop/source/lib/init.cxx | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
New commits: commit 4fa2dc9a253d15d4503e0f9403f2fdac126e8b42 Author: Michael Meeks <[email protected]> Date: Tue Mar 5 16:52:39 2013 +0000 liblibo: better init code. Change-Id: I8757739960cb1c764a5a66bd67d34731e3dfbf31 diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index ce7632f..de5788d 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -1,4 +1,4 @@ -/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* * This file is part of the LibreOffice project. * @@ -89,13 +89,15 @@ aBasicErrorFunc( const OUString &rErr, const OUString &rAction ) static void initialize_uno( const rtl::OUString &aUserProfileURL ) { + xContext = cppu::defaultBootstrap_InitialComponentContext(); + fprintf( stderr, "Uno initialized %d\n", xContext.is() ); + xFactory = xContext->getServiceManager(); + xSFactory = uno::Reference<lang::XMultiServiceFactory>(xFactory, uno::UNO_QUERY_THROW); + comphelper::setProcessServiceFactory(xSFactory); + // set UserInstallation to user profile dir in test/user-template rtl::Bootstrap aDefaultVars; aDefaultVars.set(rtl::OUString("UserInstallation"), aUserProfileURL ); - - xContext = comphelper::getProcessComponentContext(); - xFactory = xContext->getServiceManager(); - xSFactory = uno::Reference<lang::XMultiServiceFactory>(xFactory, uno::UNO_QUERY_THROW); } bool _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
