ooo-build r15378 - in trunk: . patches/dev300

[kyoshida svn gnome org]

Author: kyoshida
Date: Thu Feb 19 21:24:04 2009
New Revision: 15378
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15378&view=rev

Log:
2009-02-19  Kohei Yoshida  <kyoshida novell com>

	* patches/dev300/layout-find-dialog-crash-fix.diff:
	* patches/dev300/apply: fixed a crasher with the find & replace dialog
	in Writer and Calc. (n#477854)


Added:
   trunk/patches/dev300/layout-find-dialog-crash-fix.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Thu Feb 19 21:24:04 2009
@@ -2221,6 +2221,9 @@
 # These merge with the layoutdialogs2 cws
 layout-disable-experimental.diff
 
+# Fix crasher with find & replace dialog
+layout-find-dialog-crash-fix.diff, n#477854, kohei
+
 [ LayoutDialogs ]
 layoutdialogs2-development.diff
 

Added: trunk/patches/dev300/layout-find-dialog-crash-fix.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/layout-find-dialog-crash-fix.diff	Thu Feb 19 21:24:04 2009
@@ -0,0 +1,24 @@
+diff --git toolkit/source/layout/vcl/wfield.cxx toolkit/source/layout/vcl/wfield.cxx
+index d9e2443..a792d47 100644
+--- toolkit/source/layout/vcl/wfield.cxx
++++ toolkit/source/layout/vcl/wfield.cxx
+@@ -358,7 +358,8 @@ public:
+     {
+         uno::Sequence< rtl::OUString> aItems( mxComboBox->getItems() );
+         rtl::OUString rKey( rStr );
+-        for (unsigned int i = 0; aItems.getLength(); i++)
++        sal_Int32 n = aItems.getLength();
++        for (unsigned int i = 0; i < n; i++)
+         {
+             if ( aItems[ i ] == rKey )
+                 return sal::static_int_cast< sal_uInt16 >( i );
+@@ -543,7 +544,8 @@ public:
+     {
+         uno::Sequence< rtl::OUString> aItems( mxListBox->getItems() );
+         rtl::OUString rKey( rStr );
+-        for (unsigned int i = 0; aItems.getLength(); i++)
++        sal_Int32 n = aItems.getLength();
++        for (unsigned int i = 0; i < n; i++)
+         {
+             if ( aItems[ i ] == rKey )
+                 return sal::static_int_cast< sal_uInt16 >( i );