[openoffice.org/f14/master] Resolves: ooo#113543 show menus in icons stuck

[Caolan McNamara]

commit fc7e17a48135ee4f9c6338980acdd3d1a3b65e7e
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jul 30 13:04:27 2010 +0100

    Resolves: ooo#113543 show menus in icons stuck

 workspace.cmcfixes77.patch |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)
---
diff --git a/workspace.cmcfixes77.patch b/workspace.cmcfixes77.patch
index c11154b..518cd15 100644
--- a/workspace.cmcfixes77.patch
+++ b/workspace.cmcfixes77.patch
@@ -276,3 +276,23 @@ diff -r 85e7cfbbb08a solenv/config/sooo330.ini
      {
  #ifdef WIN32
          dynamic_cast<GraphiteWinFont&>(mrRealFont).UniqueCacheInfo(stuFace, fBold, fItalic);
+--- a/svtools/source/config/menuoptions.cxx	2010-07-30 12:52:42.000000000 +0100
++++ b/svtools/source/config/menuoptions.cxx	2010-07-30 12:52:53.000000000 +0100
+@@ -320,8 +320,15 @@
+ 	// 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();