diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2012-05-22 10:27:01 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2012-05-22 10:27:46 +0100 |
| commit | 4bfa267abd2404d6b04677551e173c3e3dc6173a (patch) | |
| tree | dfa340f9709bc59b4c56469dc54de35293cddc4a /vcl/source/app/settings.cxx | |
| parent | e623ee66dfde0d5a2705e222aaa7ce580e409506 (diff) | |
vcl: cleanup default icon-set logic making broadway default to tango
Change-Id: Ic982570a88a7f35c3b5a55a722ee759a37e1a64f
Diffstat (limited to 'vcl/source/app/settings.cxx')
| -rw-r--r-- | vcl/source/app/settings.cxx | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx index 651fbdb30636..3f953ff36f9f 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) ) |