diff options
| author | Pascal Junck <pjunck@openoffice.org> | 2004-10-28 05:51:07 +0000 |
|---|---|---|
| committer | Pascal Junck <pjunck@openoffice.org> | 2004-10-28 05:51:07 +0000 |
| commit | 94f55d2e332732706f178e12037bfbab7fc38da7 (patch) | |
| tree | 9d17d31648dd9e88f5a78af43ef6d4161b17dbbd /svtools | |
| parent | 1948bd02a388e8c371bc04c018e1429e972817e4 (diff) | |
INTEGRATION: CWS dclocking (1.60.30); FILE MERGED
2004/10/25 11:39:57 dbo 1.60.30.2: #i35272# fixed Static to StaticWithINit
2004/10/11 12:55:38 dbo 1.60.30.1: #i35272# revised rtl/instance.hxx
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/numbers/zformat.cxx | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/svtools/source/numbers/zformat.cxx b/svtools/source/numbers/zformat.cxx index 1a65d5ad52d8..9239cc1b87ce 100644 --- a/svtools/source/numbers/zformat.cxx +++ b/svtools/source/numbers/zformat.cxx @@ -2,9 +2,9 @@ * * $RCSfile: zformat.cxx,v $ * - * $Revision: 1.60 $ + * $Revision: 1.61 $ * - * last change: $Author: rt $ $Date: 2004-09-08 15:22:58 $ + * last change: $Author: pjunck $ $Date: 2004-10-28 06:51:07 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -110,17 +110,14 @@ #include "zforlist.hxx" #include "numhead.hxx" -struct GregorianInit -{ - const ::rtl::OUString* operator()() - { - static ::rtl::OUString sGregorian - (RTL_CONSTASCII_USTRINGPARAM("gregorian")); - return &sGregorian; +namespace { +struct Gregorian + : public rtl::StaticWithInit<const ::rtl::OUString, Gregorian> { + const ::rtl::OUString operator () () { + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("gregorian")); } }; - -namespace { struct Gregorian : public rtl::Static<const ::rtl::OUString, Gregorian, GregorianInit> {}; } +} const double _D_MAX_U_LONG_ = (double) 0xffffffff; // 4294967295.0 const double _D_MAX_LONG_ = (double) 0x7fffffff; // 2147483647.0 |