diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-05-31 10:45:50 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-05-31 10:45:50 +0200 |
| commit | ca39c0ee5fb571693f96fe32f55b814d74e5b756 (patch) | |
| tree | 61059dca291da35c9eac7e275d0866598eeff2ee /configmgr | |
| parent | 9e1f58bf469984c19cd60031074eb60da56453a2 (diff) | |
| parent | d974d2ada8a61acf48fb0a9e3e4fa4744016dcda (diff) | |
Merge commit 'libreoffice-3.4.0.2'
Conflicts:
basic/source/app/app.cxx
basic/source/runtime/iosys.cxx
desktop/unx/source/start.c
sfx2/source/appl/appdata.cxx
sfx2/source/appl/appinit.cxx
sfx2/source/inc/appdata.hxx
svx/AllLangResTarget_svx.mk
sysui/desktop/productversion.mk
sysui/desktop/share/makefile.mk
Diffstat (limited to 'configmgr')
| -rw-r--r-- | configmgr/source/components.cxx | 5 | ||||
| -rw-r--r-- | configmgr/source/rootaccess.cxx | 9 |
2 files changed, 14 insertions, 0 deletions
diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx index 3896fbee4cdc..8760946020f5 100644 --- a/configmgr/source/components.cxx +++ b/configmgr/source/components.cxx @@ -510,12 +510,16 @@ css::beans::Optional< css::uno::Any > Components::getExternalValue( return value; } +int tempHACK = 0; + Components::Components( css::uno::Reference< css::uno::XComponentContext > const & context): context_(context) { lock_ = lock(); + tempHACK = 1; + OSL_ASSERT(context.is()); RTL_LOGFILE_TRACE_AUTHOR("configmgr", "sb", "begin parsing"); parseXcsXcuLayer( @@ -594,6 +598,7 @@ Components::Components( Components::~Components() { flushModifications(); + tempHACK = 0; } void Components::parseFileLeniently( diff --git a/configmgr/source/rootaccess.cxx b/configmgr/source/rootaccess.cxx index ef5982e3a56d..90e5675b35a3 100644 --- a/configmgr/source/rootaccess.cxx +++ b/configmgr/source/rootaccess.cxx @@ -284,6 +284,8 @@ void RootAccess::removeChangesListener( } } +extern int tempHACK; + void RootAccess::commitChanges() throw (css::lang::WrappedTargetException, css::uno::RuntimeException) { @@ -291,6 +293,13 @@ void RootAccess::commitChanges() Broadcaster bc; { osl::MutexGuard g(*lock_); + + // OSL_ENSURE(tempHACK, "fucktastic!, seriously busted lifecycles\n"); + if (!tempHACK) + { + return; + } + checkLocalizedPropertyAccess(); int finalizedLayer; Modifications globalMods; |