From f033400bfa325f822f72f2a932c6f38fece2a190 Mon Sep 17 00:00:00 2001 From: Petr Mladek Date: Tue, 23 Nov 2010 21:18:44 +0100 Subject: 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 --- cui/source/options/optgdlg.cxx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'cui') diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index aff379aa2f46..0a8860d42674 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] ); -- cgit