diff options
author | Oliver Bolte <obo@openoffice.org> | 2004-11-15 16:24:12 +0000 |
---|---|---|
committer | Oliver Bolte <obo@openoffice.org> | 2004-11-15 16:24:12 +0000 |
commit | 1bc2a276bf59f9cbee9a6ae009e9686b98597156 (patch) | |
tree | e201fddd4ad7dc3f7e62fe686eb69dbd09f3bbc1 /svtools/source/config | |
parent | be547411219360050b0b4aab75278733026ce2bc (diff) |
INTEGRATION: CWS cd01 (1.16.162); FILE MERGED
2004/11/02 13:19:22 as 1.16.162.1: #i35118# hold some config items alive till config dies
Diffstat (limited to 'svtools/source/config')
-rw-r--r-- | svtools/source/config/useroptions.cxx | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/svtools/source/config/useroptions.cxx b/svtools/source/config/useroptions.cxx index 7a4083267712..b2a0c354d56f 100644 --- a/svtools/source/config/useroptions.cxx +++ b/svtools/source/config/useroptions.cxx @@ -2,9 +2,9 @@ * * $RCSfile: useroptions.cxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: hjs $ $Date: 2004-06-25 17:25:36 $ + * last change: $Author: obo $ $Date: 2004-11-15 17:24:12 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -88,6 +88,9 @@ #ifndef INCLUDED_RTL_INSTANCE_HXX #include <rtl/instance.hxx> #endif +#include <rtl/logfile.hxx> +#include "itemholder2.hxx" + using namespace utl; using namespace rtl; using namespace com::sun::star::uno; @@ -560,7 +563,13 @@ SvtUserOptions::SvtUserOptions() ::osl::MutexGuard aGuard( GetInitMutex() ); if ( !pOptions ) + { + RTL_LOGFILE_CONTEXT(aLog, "svtools (???) ::SvtUserOptions_Impl::ctor()"); pOptions = new SvtUserOptions_Impl; + + ItemHolder2* pHolder = ItemHolder2::getGlobalItemHolder(); + pHolder->holdConfigItem(E_USEROPTIONS); + } ++nRefCount; pImp = pOptions; StartListening( *pImp); |