summaryrefslogtreecommitdiff
path: root/svtools/source/control
diff options
context:
space:
mode:
authorRüdiger Timm <rt@openoffice.org>2004-12-03 13:28:21 +0000
committerRüdiger Timm <rt@openoffice.org>2004-12-03 13:28:21 +0000
commite9a70bae9b2caf4fa3bb6d38f1624dd84182803c (patch)
tree5eb929b394d6d6e480ef48aad734e129062bea7a /svtools/source/control
parent6a677f97100f478ac95a5fd993fa2a1733afaf83 (diff)
INTEGRATION: CWS miscbeta2 (1.28.220); FILE MERGED
2004/12/02 15:45:47 fs 1.28.220.1: #i38306# hold SvtSysLocale alive as long as we need references to its members
Diffstat (limited to 'svtools/source/control')
-rw-r--r--svtools/source/control/fmtfield.cxx10
1 files changed, 6 insertions, 4 deletions
diff --git a/svtools/source/control/fmtfield.cxx b/svtools/source/control/fmtfield.cxx
index 2038d1b12477..f855064b2e1a 100644
--- a/svtools/source/control/fmtfield.cxx
+++ b/svtools/source/control/fmtfield.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: fmtfield.cxx,v $
*
- * $Revision: 1.28 $
+ * $Revision: 1.29 $
*
- * last change: $Author: rt $ $Date: 2004-06-16 10:11:58 $
+ * last change: $Author: rt $ $Date: 2004-12-03 14:28:21 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -374,7 +374,8 @@ SvNumberFormatter* FormattedField::StaticFormatter::GetFormatter()
if (!s_cFormatter)
{
// get the Office's UI locale
- const Locale& rSysLocale = SvtSysLocale().GetLocaleData().getLocale();
+ SvtSysLocale aSysLocale;
+ const Locale& rSysLocale = aSysLocale.GetLocaleData().getLocale();
// translate
LanguageType eSysLanguage = ConvertIsoNamesToLanguage( rSysLocale.Language, rSysLocale.Country );
s_cFormatter = new SvNumberFormatter(
@@ -697,7 +698,8 @@ void FormattedField::SetFormatter(SvNumberFormatter* pFormatter, BOOL bResetForm
if ( m_pFormatter )
{
// get the Office's UI locale
- const Locale& rSysLocale = SvtSysLocale().GetLocaleData().getLocale();
+ SvtSysLocale aSysLocale;
+ const Locale& rSysLocale = aSysLocale.GetLocaleData().getLocale();
// translate
LanguageType eSysLanguage = ConvertIsoNamesToLanguage( rSysLocale.Language, rSysLocale.Country );
// get the standard numeric format for this language