summaryrefslogtreecommitdiff
path: root/sw/source/ui/utlui/numfmtlb.cxx
diff options
context:
space:
mode:
authorMathias Bauer <mba@openoffice.org>2010-10-09 18:56:58 +0200
committerMathias Bauer <mba@openoffice.org>2010-10-09 18:56:58 +0200
commit1339b1bed6080ab87df2227f9c91d2d355228a44 (patch)
tree1faf813cf7de36752febad488ec0361b1dbc7f83 /sw/source/ui/utlui/numfmtlb.cxx
parenteaa4e44cfee19f81a3a3d41982263a3f09e23f06 (diff)
parent90a45727e45941abef69c1827a646cf64bb70d96 (diff)
CWS changehid: resync to m89
Diffstat (limited to 'sw/source/ui/utlui/numfmtlb.cxx')
-rw-r--r--sw/source/ui/utlui/numfmtlb.cxx21
1 files changed, 15 insertions, 6 deletions
diff --git a/sw/source/ui/utlui/numfmtlb.cxx b/sw/source/ui/utlui/numfmtlb.cxx
index baf059c51c32..b059c12a4a50 100644
--- a/sw/source/ui/utlui/numfmtlb.cxx
+++ b/sw/source/ui/utlui/numfmtlb.cxx
@@ -368,13 +368,22 @@ void NumFormatListBox::SetDefFormat(const ULONG nDefFmt)
ULONG nShortDateFormatForLanguage = pFormatter->GetFormatForLanguageIfBuiltIn(nSysShortDateFmt, LANGUAGE_SYSTEM );
ULONG nLongDateFormatForLanguage = pFormatter->GetFormatForLanguageIfBuiltIn(nSysLongDateFmt, LANGUAGE_SYSTEM );
- if(nDefFmt == nSysNumFmt||
- nDefFmt == nSysShortDateFmt||
- nDefFmt == nSysLongDateFmt||
- bSysLang && (nDefFmt == nNumFormatForLanguage ||
- nDefFmt == nShortDateFormatForLanguage ||
- nDefFmt == nLongDateFormatForLanguage ))
+ if (
+ nDefFmt == nSysNumFmt ||
+ nDefFmt == nSysShortDateFmt ||
+ nDefFmt == nSysLongDateFmt ||
+ (
+ bSysLang &&
+ (
+ nDefFmt == nNumFormatForLanguage ||
+ nDefFmt == nShortDateFormatForLanguage ||
+ nDefFmt == nLongDateFormatForLanguage
+ )
+ )
+ )
+ {
sValue += String(SW_RES(RID_STR_SYSTEM));
+ }
nPos = InsertEntry(sValue, nPos); // Als ersten numerischen Eintrag einfuegen
SetEntryData(nPos, (void*)nDefFmt);