diff options
| author | Andreas Schlüns <as@openoffice.org> | 2004-12-07 12:37:37 +0000 |
|---|---|---|
| committer | Andreas Schlüns <as@openoffice.org> | 2004-12-07 12:37:37 +0000 |
| commit | 025b8ff8582fb1ea8647579949dfc5f9936ca72a (patch) | |
| tree | b3617214de1521795aa225942ec855da62f253f7 /framework | |
| parent | afab325177493b4ebca3870c456fcdb1ff5eed6b (diff) | |
#i38373#, #i38471#, #i38386# forget document storages only ...
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/accelerators/presethandler.cxx | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/framework/source/accelerators/presethandler.cxx b/framework/source/accelerators/presethandler.cxx index 0a2233718c8b..17201fb9f570 100644 --- a/framework/source/accelerators/presethandler.cxx +++ b/framework/source/accelerators/presethandler.cxx @@ -2,9 +2,9 @@ * * $RCSfile: presethandler.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: as $ $Date: 2004-12-07 13:18:16 $ + * last change: $Author: as $ $Date: 2004-12-07 13:37:37 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -211,7 +211,11 @@ PresetHandler::PresetHandler(const PresetHandler& rCopy) //----------------------------------------------- PresetHandler::~PresetHandler() { - forgetCachedStorages(); + m_xWorkingStorageShare.clear(); + m_xWorkingStorageUser.clear(); + m_aSharedStorages->m_lStoragesUser.forgetCachedStorages(); + m_aSharedStorages->m_lStoragesShare.forgetCachedStorages(); + m_lDocumentStorages.forgetCachedStorages(); } //----------------------------------------------- @@ -220,11 +224,11 @@ void PresetHandler::forgetCachedStorages() // SAFE -> ---------------------------------- WriteGuard aWriteLock(m_aLock); - m_xWorkingStorageShare.clear(); - m_xWorkingStorageUser.clear(); - - m_aSharedStorages->m_lStoragesUser.forgetCachedStorages(); - m_aSharedStorages->m_lStoragesShare.forgetCachedStorages(); + if (m_eConfigType == E_DOCUMENT) + { + m_xWorkingStorageShare.clear(); + m_xWorkingStorageUser.clear(); + } m_lDocumentStorages.forgetCachedStorages(); |