[ooo-build-commit] .: sw/source

[Caolán McNamara]

 sw/source/ui/utlui/numfmtlb.cxx |   21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

New commits:
commit ff74c1ca703a3911ca06d1f59be48e4732919264
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Sep 30 20:35:22 2010 +0100

    #i113190# bracket expression up to silence gcc warnings

diff --git a/sw/source/ui/utlui/numfmtlb.cxx b/sw/source/ui/utlui/numfmtlb.cxx
index 4bf6997..e34cc67 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);