[openoffice.org] defuzz

[Caolan McNamara]

commit e491a2c8cd8d80de5596a934aa3add0fb66dcf89
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Aug 7 17:07:00 2010 +0100

    defuzz

 workspace.cmcfixes77.patch |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/workspace.cmcfixes77.patch b/workspace.cmcfixes77.patch
index f9527dc..6614841 100644
--- a/workspace.cmcfixes77.patch
+++ b/workspace.cmcfixes77.patch
@@ -278,9 +278,9 @@ diff -r 85e7cfbbb08a solenv/config/sooo330.ini
          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" );
+@@ -245,8 +245,15 @@
+ 	// Follow assignment use order of values in relation to our list of key names!
+ 	DBG_ASSERT( !(seqNames.getLength()!=seqValues.getLength()), "SvtMenuOptions_Impl::SvtMenuOptions_Impl()\nI miss some values of configuration keys!\n" );
  
 -    sal_Bool bMenuIcons = true;
 -    sal_Bool bSystemMenuIcons = true;
@@ -294,8 +294,8 @@ diff -r 85e7cfbbb08a solenv/config/sooo330.ini
 +        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();
+ 	// Copy values from list in right order to ouer internal member.
+ 	sal_Int32 nPropertyCount	=	seqValues.getLength()	;
 diff -r a1a3b75faa8a basebmp/test/basictest.cxx
 --- a/basebmp/test/basictest.cxx	Fri Jul 30 12:58:40 2010 +0100
 +++ b/basebmp/test/basictest.cxx	Fri Jul 30 13:40:34 2010 +0100