diff options
| author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2004-06-25 16:14:59 +0000 |
|---|---|---|
| committer | Hans-Joachim Lankenau <hjs@openoffice.org> | 2004-06-25 16:14:59 +0000 |
| commit | ddf10f346487b1c670750d9879c5c03ee7715f1c (patch) | |
| tree | 7ee3e281491454e8d9b282e77e8e5199986125b3 /sal | |
| parent | 6e393c83b0c9ddc95d4b0d91207483f2592a8179 (diff) | |
INTEGRATION: CWS tune04 (1.5.274); FILE MERGED
2004/06/14 09:56:25 cmc 1.5.274.1: #i29636# turn global objects into local static data
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/rtl/source/cmdargs.cxx | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sal/rtl/source/cmdargs.cxx b/sal/rtl/source/cmdargs.cxx index b99ac081a676..5e7446e86bd6 100644 --- a/sal/rtl/source/cmdargs.cxx +++ b/sal/rtl/source/cmdargs.cxx @@ -2,9 +2,9 @@ * * $RCSfile: cmdargs.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: mhu $ $Date: 2002-07-23 12:41:07 $ + * last change: $Author: hjs $ $Date: 2004-06-25 17:14:59 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -82,12 +82,10 @@ rtl_CmdArgs_ArgHolder::~rtl_CmdArgs_ArgHolder() g_ppCommandArgs = 0; } -static rtl_CmdArgs_ArgHolder MyHolder; - static void impl_rtl_initCommandArgs() { osl::MutexGuard guard( osl::Mutex::getGlobalMutex() ); - + static rtl_CmdArgs_ArgHolder MyHolder; if (!g_ppCommandArgs) { sal_Int32 i, n = osl_getCommandArgCount(); |