[Libreoffice-commits] .: Branch 'libreoffice-3-3' - cui/source

[Petr Mladek]

 cui/source/options/optgdlg.cxx |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 26767cad1deb335b31bb21f9f8e4e1cd86701e7b
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue Nov 23 21:18:44 2010 +0100

    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

diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index f9957cd..293cfc3 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] );