diff options
author | Vladimir Glazunov <vg@openoffice.org> | 2010-08-25 17:13:00 +0200 |
---|---|---|
committer | Vladimir Glazunov <vg@openoffice.org> | 2010-08-25 17:13:00 +0200 |
commit | 9b727fc028a374a76c72cbf988e86b916807f29d (patch) | |
tree | 1c6f3325be708af6bf8d164d3ebed38b41ee5d87 /svtools/source | |
parent | aa80823112616efa9d7b5cb110d2cfedddc57676 (diff) | |
parent | 840d9a7c6ad6f30cfa54958584ef808ca5f46a34 (diff) |
CWS-TOOLING: integrate CWS cmcfixes77
Diffstat (limited to 'svtools/source')
-rw-r--r-- | svtools/source/config/menuoptions.cxx | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/svtools/source/config/menuoptions.cxx b/svtools/source/config/menuoptions.cxx index 1551361f252f..e33251050b81 100644 --- a/svtools/source/config/menuoptions.cxx +++ b/svtools/source/config/menuoptions.cxx @@ -314,9 +314,16 @@ 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 bMenuSettingsChanged = false; + sal_Bool bMenuSettingsChanged = sal_False; + 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(); |