diff options
| author | Petr Mladek <pmladek@suse.cz> | 2010-11-23 21:18:44 +0100 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2010-11-23 21:18:44 +0100 |
| commit | 26767cad1deb335b31bb21f9f8e4e1cd86701e7b (patch) | |
| tree | 2861437eb1993c7adad94e06bb4191c9afe39849 | |
| parent | 9f7852a1b7182060f77210d70a6fd46f7a0d949c (diff) | |
show the really used default icon theme in options (bnc#603169)
check also the icon theme prefered by the native widget plugin
backport from ooo-build-3-2-1
| -rw-r--r-- | cui/source/options/optgdlg.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index f9957cdd4..293cfc3a1 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -845,7 +845,11 @@ OfaViewTabPage::OfaViewTabPage(Window* pParent, const SfxItemSet& rSet ) : aAutoStr += ::rtl::OUString::createFromAscii( " (" ); - ULONG nAutoStyle = aStyleSettings.GetAutoSymbolsStyle(); + // prefer the icon style set by the desktop native widgets modules + ULONG nAutoStyle = aStyleSettings.GetPreferredSymbolsStyle(); + // fallback to the statically defined values + if ( nAutoStyle == STYLE_SYMBOLS_AUTO || !aIconStyleItemId[nAutoStyle] ) + nAutoStyle = aStyleSettings.GetAutoSymbolsStyle(); if ( aIconStyleItemId[nAutoStyle] ) aAutoStr += aIconStyleLB.GetEntry( aIconStyleItemId[nAutoStyle] ); |