[ooo-build-commit] patches/dev300

[Tor Lillqvist]

 patches/dev300/apply                             |    3 --
 patches/dev300/layout-find-dialog-crash-fix.diff |   24 -----------------------
 2 files changed, 27 deletions(-)

New commits:
commit 61c8af7f84f6945d9ee51af3586d6422e1d78ce2
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Aug 13 12:58:53 2009 +0300

    layout-find-dialog-crash-fix.diff is not needed
    
    * patches/dev300/apply: Drop it.
    * patches/dev300/layout-find-dialog-crash-fix.diff: Delete. Upstream
      has fixed it in a similar way.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 0b5f727..43e3ba0 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2338,9 +2338,6 @@ toolkit-layout-gcc-4.3.2-hack.diff, pmladek
 # 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
-
 layout-accessibility-dispose-only-once.diff, n#500267, janneke
 
 [ LayoutDialogs ]
diff --git a/patches/dev300/layout-find-dialog-crash-fix.diff b/patches/dev300/layout-find-dialog-crash-fix.diff
deleted file mode 100644
index 547bcb8..0000000
--- a/patches/dev300/layout-find-dialog-crash-fix.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-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 );