[Libreoffice-commits] .: vcl/source

[Michael Meeks]

 vcl/source/app/settings.cxx |   20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

New commits:
commit 4bfa267abd2404d6b04677551e173c3e3dc6173a
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Tue May 22 10:27:01 2012 +0100

    vcl: cleanup default icon-set logic making broadway default to tango
    
    Change-Id: Ic982570a88a7f35c3b5a55a722ee759a37e1a64f

diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 651fbdb..3f953ff 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -612,17 +612,15 @@ sal_uLong StyleSettings::GetCurrentSymbolsStyle() const
 sal_uLong StyleSettings::GetAutoSymbolsStyle() const
 {
     rtl::OUString const & env = Application::GetDesktopEnvironment();
-    sal_uLong nRet =
-        ( env.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("gnome")) ||
-          env.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("windows")) )
-        ? STYLE_SYMBOLS_TANGO
-        : env.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("tde"))
-        ? STYLE_SYMBOLS_CRYSTAL
-        : env.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("kde"))
-        ? STYLE_SYMBOLS_CRYSTAL
-        : env.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("kde4"))
-        ? STYLE_SYMBOLS_OXYGEN
-        : STYLE_SYMBOLS_DEFAULT;
+
+    sal_uLong nRet;
+    if ( env.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("tde")) ||
+         env.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("kde")) )
+        nRet = STYLE_SYMBOLS_CRYSTAL;
+    else if ( env.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("kde4")) )
+        nRet = STYLE_SYMBOLS_OXYGEN;
+    else
+        nRet = STYLE_SYMBOLS_TANGO;
 
     // falback to any existing style
     if ( ! CheckSymbolStyle (nRet) )