[Libreoffice-commits] .: 2 commits -
René Engelhard
rene at kemper.freedesktop.org
Sat Jan 1 17:21:46 PST 2011
0 files changed
New commits:
commit 94b86c17de1ffd49506f297b9e64f495cfebd4be
Merge: 07031f3... db4b977...
Author: Rene Engelhard <rene at debian.org>
Date: Sun Jan 2 01:12:51 2011 +0100
Merge remote branch 'origin/libreoffice-3-3'
commit db4b977d9694be8a8bf286626389ec2a3dfb0353
Author: Kohei Yoshida <kyoshida at novell.com>
Date: Wed Dec 22 22:52:04 2010 -0500
If the language is not specified, use the initial language. (fdo#32523)
SvNumberFormatter has many methods that take language as an argument,
with the default value of LANGUAGE_DONTKNOW. Most of those methods
default to the intialized language if the language is DONTKNOW, except
for one variant of GetStandardFormat() ! This caused the internal
language to accidentally get set to something else *permanently*.
Signed-off-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index f4e7939..56be63e 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -1384,6 +1384,9 @@ sal_uInt32 SvNumberFormatter::ImpGetDefaultFormat( short nType )
sal_uInt32 SvNumberFormatter::GetStandardFormat( short eType, LanguageType eLnge )
{
+ if (eLnge == LANGUAGE_DONTKNOW)
+ eLnge = IniLnge;
+
sal_uInt32 CLOffset = ImpGenerateCL(eLnge);
switch(eType)
{
More information about the Libreoffice-commits
mailing list