[openoffice.org] sync

[Caolan McNamara]

commit 4c0401217bdd212d3b3050ad162cbc9108898a23
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jul 30 13:05:47 2010 +0100

    sync

 sources                    |    2 +-
 workspace.cmcfixes77.patch |   31 +++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletions(-)
---
diff --git a/sources b/sources
index e080254..3aed17f 100644
--- a/sources
+++ b/sources
@@ -15,4 +15,4 @@ b54bcc9fdb23389e961b281508d9110c  documentation.openoffice.org-templates.tar.gz
 f0cda31fe18bf9289629a321663031b8  redhat-templates.tar.gz
 20613b42d66eadc11c719374355f745c  redhat-langpacks.tar.gz
 011e6e849144d5ca35299f015073652b  redhat-registry.tar.gz
-6b4ea7772528eb78fdc1ff338f9cb626  OOO330_m2.tar.bz2
+a028fa864c151f0d1755e4fe9c489319  OOO330_m2.tar.bz2
diff --git a/workspace.cmcfixes77.patch b/workspace.cmcfixes77.patch
index 34af232..518cd15 100644
--- a/workspace.cmcfixes77.patch
+++ b/workspace.cmcfixes77.patch
@@ -265,3 +265,34 @@ diff -r 85e7cfbbb08a solenv/config/sooo330.ini
  else
      AC_MSG_RESULT([internal])
      SYSTEM_LUCENE=NO
+--- a/vcl/source/glyphs/graphite_layout.cxx	2010-07-30 10:08:56.000000000 +0100
++++ b/vcl/source/glyphs/graphite_layout.cxx	2010-07-30 10:10:10.000000000 +0100
+@@ -659,7 +659,7 @@
+         return hash;
+     };
+ protected:
+-    virtual void UniqueCacheInfo(std::wstring & stuFace, bool & fBold, bool & fItalic)
++    virtual void UniqueCacheInfo(ext_std::wstring & stuFace, bool & fBold, bool & fItalic)
+     {
+ #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();