summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-09-01 13:39:20 +0100
committerCaolán McNamara <caolanm@redhat.com>2011-09-01 13:44:49 +0100
commita78a6e013b8d97891aa2b9c9a5dce64a82dc2f06 (patch)
tree416fc58bdbbfb19456637a925b8e89a6150c548d
parentafac5725dc27c54823e48c582d9f65bdcae8127f (diff)
Resolves: fdo#37195 CreateProcessServiceFactory can't happen before sync
If CreateProcessServiceFactory is called, then common.rdb of "Users/YOU/AppData/Roaming/LibreOffice/3/user/extensions/bundled/registry/ com.sun.star.comp.deployment.component.PackageRegistryBackend/common.rdb" is opened mmapped On a new start of an LibreOffice which wants to synchronize new config over an old config, then it will want do a copy of "install/share/prereg/bundled/registry/ com.sun.star.comp.deployment.component.PackageRegistryBackend/common.rdb" over "Users/YOU/AppData/Roaming/LibreOffice/3/user/extensions/bundled/registry/ com.sun.star.comp.deployment.component.PackageRegistryBackend/common.rdb" which will fail on windows with error 1224, i.e. ERROR_USER_MAPPED_FILE That aborts the copy_bundled_recursive copy, leaving an old config pointing to the old location of dictionaries. So for windows at least, CreateProcessServiceFactory shouldn't happen before copy_bundled_recursive.
-rw-r--r--desktop/inc/app.hxx4
-rw-r--r--desktop/source/app/app.cxx14
-rw-r--r--desktop/source/app/sofficemain.cxx1
3 files changed, 14 insertions, 5 deletions
diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
index b950d2583097..f4b00f53fc35 100644
--- a/desktop/inc/app.hxx
+++ b/desktop/inc/app.hxx
@@ -138,11 +138,11 @@ class Desktop : public Application
void SetSplashScreenText( const ::rtl::OUString& rText );
void SetSplashScreenProgress( sal_Int32 );
- void CreateProcessServiceFactory();
+ static void ensureProcessServiceFactory();
private:
// Bootstrap methods
- ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > CreateApplicationServiceManager();
+ static ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > CreateApplicationServiceManager();
void RegisterServices( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xSMgr );
void DeregisterServices();
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 611234f3d80b..efe2038a69ec 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -320,6 +320,7 @@ namespace
CommandLineArgs& Desktop::GetCommandLineArgs()
{
+ ensureProcessServiceFactory();
return theCommandLineArgs::get();
}
@@ -707,7 +708,13 @@ void Desktop::Init()
}
}
- // We need to have service factory before going further.
+ // We need to have service factory before going further, but see fdo#37195.
+ // Doing this will mmap common.rdb, making it not overwritable on windows,
+ // so this can't happen before the synchronization above. Lets rework this
+ // so that the above is called *from* ensureProcessServiceFactory or
+ // something to enforce this gotcha
+ ensureProcessServiceFactory();
+
if( !::comphelper::getProcessServiceFactory().is())
{
OSL_FAIL("Service factory should have been crated in soffice_main().");
@@ -759,8 +766,11 @@ void Desktop::InitFinished()
// GetCommandLineArgs() requires this code to work, otherwise it will abort, and
// on Unix command line args needs to be checked before Desktop::Init()
-void Desktop::CreateProcessServiceFactory()
+void Desktop::ensureProcessServiceFactory()
{
+ if( ::comphelper::getProcessServiceFactory().is())
+ return;
+
Reference < XMultiServiceFactory > rSMgr = CreateApplicationServiceManager();
if( rSMgr.is() )
{
diff --git a/desktop/source/app/sofficemain.cxx b/desktop/source/app/sofficemain.cxx
index 1e72fa121423..14c044e82a23 100644
--- a/desktop/source/app/sofficemain.cxx
+++ b/desktop/source/app/sofficemain.cxx
@@ -49,7 +49,6 @@ extern "C" int soffice_main()
desktop::Desktop aDesktop;
// This string is used during initialization of the Gtk+ VCL module
aDesktop.SetAppName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("soffice")) );
- aDesktop.CreateProcessServiceFactory();
#ifdef UNX
// handle --version and --help already here, otherwise they would be handled
// after VCL initialization that might fail if $DISPLAY is not set