[Libreoffice-commits] .: 3 commits - cui/source

[Caolán McNamara]

 cui/source/inc/cuires.hrc      |    3 ---
 cui/source/inc/numfmt.hxx      |    7 +++++--
 cui/source/options/optgdlg.cxx |   23 ++++++++++++++++-------
 3 files changed, 21 insertions(+), 12 deletions(-)

New commits:
commit baae1f2478f664054a264573bad0c8337f7f7d74
Author: Kenneth Venken <kenneth.venken at gmail.com>
Date:   Mon Oct 18 13:15:39 2010 +0100

    WaE, fix this warning

diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 1ef3e3d..5ab6305 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -845,7 +845,7 @@ OfaViewTabPage::OfaViewTabPage(Window* pParent, const SfxItemSet& rSet ) :
                 aIconStyleLB.RemoveEntry( nItem );
                 aIconStyleItemId[n] = 0;
             }
-        }        
+        }
     }
 
     // add real theme name to 'auto' theme, e.g. 'auto' => 'auto (classic)'
@@ -858,7 +858,7 @@ OfaViewTabPage::OfaViewTabPage(Window* pParent, const SfxItemSet& rSet ) :
         ULONG nAutoStyle = aStyleSettings.GetAutoSymbolsStyle();
         if ( aIconStyleItemId[nAutoStyle] )
             aAutoStr += aIconStyleLB.GetEntry( aIconStyleItemId[nAutoStyle] );
-  
+
         aIconStyleLB.RemoveEntry( 0 );
         aIconStyleLB.InsertEntry( aAutoStr += ::rtl::OUString::createFromAscii( ")" ), 0 );
         // separate auto and other icon themes
@@ -1512,9 +1512,18 @@ BOOL OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet )
     pLangConfig->aLanguageOptions.BlockBroadcasts( TRUE );
     pLangConfig->aLinguConfig.BlockBroadcasts( TRUE );
 
-    if(aCTLSupportCB.IsChecked() &&
-            (aCTLSupportCB.GetSavedValue() != aCTLSupportCB.IsChecked()) ||
-            (aComplexLanguageLB.GetSavedValue() != aComplexLanguageLB.GetSelectEntryPos()))
+    /*
+     * Sequence checking only matters when CTL support is enabled.
+     *
+     * So we only need to check for sequence checking if
+     * a) previously it was unchecked and is now checked or
+     * b) it was already checked but the CTL language has changed
+     */
+    if (
+         aCTLSupportCB.IsChecked() &&
+         (aCTLSupportCB.GetSavedValue() != STATE_CHECK ||
+         aComplexLanguageLB.GetSavedValue() != aComplexLanguageLB.GetSelectEntryPos())
+       )
     {
         //sequence checking has to be switched on depending on the selected CTL language
         LanguageType eCTLLang = aComplexLanguageLB.GetSelectLanguage();
@@ -1610,7 +1619,7 @@ BOOL OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet )
     if(aDecimalSeparatorCB.GetSavedValue() != aDecimalSeparatorCB.IsChecked())
         pLangConfig->aSysLocaleOptions.SetDecimalSeparatorAsLocale(aDecimalSeparatorCB.IsChecked());
 
-    // Configured currency, for example, USD-en-US or EUR-de-DE, or empty for locale default. 
+    // Configured currency, for example, USD-en-US or EUR-de-DE, or empty for locale default.
     OUString sOldCurr = pLangConfig->aSysLocaleOptions.GetCurrencyConfigString();
     USHORT nCurrPos = aCurrencyLB.GetSelectEntryPos();
     const NfCurrencyEntry* pCurr = (const NfCurrencyEntry*)
commit 36417ce675abc0f6e032adfbf0444ba383d5a145
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Oct 18 12:37:40 2010 +0100

    WaE remove annoying warning

diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx
index b5638c5..8b4cfe4 100644
--- a/cui/source/inc/numfmt.hxx
+++ b/cui/source/inc/numfmt.hxx
@@ -87,8 +87,11 @@ class SvxNumberFormatTabPage : public SfxTabPage
 public:
     ~SvxNumberFormatTabPage();
 
-#undef SfxTabPage
-#define SfxTabPage ::SfxTabPage
+#if ENABLE_LAYOUT
+#  undef SfxTabPage
+#  define SfxTabPage ::SfxTabPage
+#endif
+
     static SfxTabPage*		Create( Window* pParent,
                                     const SfxItemSet& rAttrSet );
     static USHORT*			GetRanges();
commit c7338392fbb10cc74bc8175cc997f8fc0668be6f
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Oct 18 12:10:54 2010 +0100

    WaE remove this duplicate define

diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc
index 494c944..eb5c21f 100755
--- a/cui/source/inc/cuires.hrc
+++ b/cui/source/inc/cuires.hrc
@@ -34,9 +34,6 @@
 
 // Resource-Id's ------------------------------------------------------------
 
-// Bitte FIRSTFREE pflegen!!! (gilt nicht f"ur Strings)
-#define RID_SVX_FIRSTFREE                   305
-
 // Gallery
 #define RID_CUI_GALLERY_START               (RID_SVX_START + 360)
 #define RID_CUI_GALLERY_END                 (RID_SVX_START + 410)