diff options
author | Caolán McNamara <cmc@openoffice.org> | 2010-07-30 12:58:40 +0100 |
---|---|---|
committer | Caolán McNamara <cmc@openoffice.org> | 2010-07-30 12:58:40 +0100 |
commit | af820cae74c9fc08d7da6c304aec432c23cc8811 (patch) | |
tree | f1f92e27231c9d84534b3f7a5ea67e6d6bc5e96b /svtools | |
parent | 636c3126b6146ac734953457394be84a33ec46b9 (diff) |
cmcfixes77: #i113543# automatic icons in menus entry stuck
Diffstat (limited to 'svtools')
-rw-r--r-- | svtools/source/config/menuoptions.cxx | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/svtools/source/config/menuoptions.cxx b/svtools/source/config/menuoptions.cxx index 70d9d1623ef2..2e63be347fbe 100644 --- a/svtools/source/config/menuoptions.cxx +++ b/svtools/source/config/menuoptions.cxx @@ -314,8 +314,15 @@ void SvtMenuOptions_Impl::Notify( const Sequence< OUString >& seqPropertyNames ) // We need values from ALL notified configuration keys. DBG_ASSERT( !(seqPropertyNames.getLength()!=seqValues.getLength()), "SvtMenuOptions_Impl::Notify()\nI miss some values of configuration keys!\n" ); - sal_Bool bMenuIcons = true; - sal_Bool bSystemMenuIcons = true; + sal_Bool bMenuIcons = sal_True; + sal_Bool bSystemMenuIcons = sal_True; + if (m_nMenuIcons == 2) + bMenuIcons = (sal_Bool)(Application::GetSettings().GetStyleSettings().GetUseImagesInMenus()); + else + { + bSystemMenuIcons = sal_False; + bMenuIcons = m_nMenuIcons ? sal_True : sal_False; + } // Step over list of property names and get right value from coreesponding value list to set it on internal members! sal_Int32 nCount = seqPropertyNames.getLength(); |