[Libreoffice-commits] core.git: Branch 'feature/liblibo' - desktop/source

[Michael Meeks]

 desktop/source/lib/init.cxx |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

New commits:
commit e4a160d1a72e8652e204bb45a488ba6ace8f8039
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Wed Mar 6 19:02:14 2013 +0000

    liblibo: get fundamentalrc setup right - bootstrapping a little further.
    
    Change-Id: I42d5ff32c2a3b721689676f5295e148c3364518d

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index de5788d..fc25403 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -87,8 +87,10 @@ aBasicErrorFunc( const OUString &rErr, const OUString &rAction )
 }
 
 static void
-initialize_uno( const rtl::OUString &aUserProfileURL )
+initialize_uno( const rtl::OUString &aAppURL )
 {
+    rtl::Bootstrap::setIniFilename( aAppURL + "/fundamentalrc" );
+
     xContext = cppu::defaultBootstrap_InitialComponentContext();
     fprintf( stderr, "Uno initialized %d\n", xContext.is() );
     xFactory = xContext->getServiceManager();
@@ -97,7 +99,8 @@ initialize_uno( const rtl::OUString &aUserProfileURL )
 
     // set UserInstallation to user profile dir in test/user-template
     rtl::Bootstrap aDefaultVars;
-    aDefaultVars.set(rtl::OUString("UserInstallation"), aUserProfileURL );
+    aDefaultVars.set(rtl::OUString("UserInstallation"), aAppURL + "../registry" );
+    // configmgr setup ?
 }
 
 bool
@@ -117,7 +120,7 @@ LibLibreOffice_Impl::initialize( const char *app_path )
         return false;
 
     try {
-        initialize_uno( aAppURL + "../registry" );
+        initialize_uno( aAppURL );
         force_c_locale();
         InitVCL();
         if (Application::IsHeadlessModeRequested())