diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-09-01 13:39:20 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-09-01 13:44:49 +0100 |
| commit | a78a6e013b8d97891aa2b9c9a5dce64a82dc2f06 (patch) | |
| tree | 416fc58bdbbfb19456637a925b8e89a6150c548d /desktop/inc | |
| parent | afac5725dc27c54823e48c582d9f65bdcae8127f (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.
Diffstat (limited to 'desktop/inc')
| -rw-r--r-- | desktop/inc/app.hxx | 4 |
1 files changed, 2 insertions, 2 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(); |