summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2004-11-15 16:23:03 +0000
committerOliver Bolte <obo@openoffice.org>2004-11-15 16:23:03 +0000
commit34473310e7d742a2c5a176491c1e06ce581b1a18 (patch)
treec68b673d19344bdc53d2063b5aa9d356dadca585
parenta67b5355012435e2dcd540302aac6e40b85d415d (diff)
INTEGRATION: CWS cd01 (1.16.172); FILE MERGED
2004/11/02 13:19:21 as 1.16.172.1: #i35118# hold some config items alive till config dies
-rw-r--r--svtools/source/config/saveopt.cxx14
1 files changed, 10 insertions, 4 deletions
diff --git a/svtools/source/config/saveopt.cxx b/svtools/source/config/saveopt.cxx
index cccbad805e64..9dbb75b99c79 100644
--- a/svtools/source/config/saveopt.cxx
+++ b/svtools/source/config/saveopt.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: saveopt.cxx,v $
*
- * $Revision: 1.16 $
+ * $Revision: 1.17 $
*
- * last change: $Author: rt $ $Date: 2004-06-16 10:09:05 $
+ * last change: $Author: obo $ $Date: 2004-11-15 17:23:03 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -79,6 +79,8 @@
#endif
#include <osl/mutex.hxx>
+#include <rtl/logfile.hxx>
+#include "itemholder1.hxx"
using namespace utl;
using namespace rtl;
@@ -734,11 +736,15 @@ SvtSaveOptions::SvtSaveOptions()
::osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() );
if ( !pOptions )
{
+ RTL_LOGFILE_CONTEXT(aLog, "svtools (???) ::SvtSaveOptions_Impl::ctor()");
pOptions = new SvtLoadSaveOptions_Impl;
pOptions->pSaveOpt = new SvtSaveOptions_Impl;
pOptions->pLoadOpt = new SvtLoadOptions_Impl;
- }
- ++nRefCount;
+
+ ItemHolder1* pHolder = ItemHolder1::getGlobalItemHolder();
+ pHolder->holdConfigItem(E_SAVEOPTIONS);
+ }
+ ++nRefCount;
pImp = pOptions;
}