[Libreoffice-commits] .: patches/dev300

[Michael Meeks]

 patches/dev300/apply                     |    4 ----
 patches/dev300/context-autocomplete.diff |   26 --------------------------
 2 files changed, 30 deletions(-)

New commits:
commit 6c43e7dbf248d10d91fb7233553c16f703e949ae
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Mon Dec 6 12:42:27 2010 +0000

    merged i#22961 into writer.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index cc49f54..544d70f 100755
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -447,10 +447,6 @@ addrbk-datasrc-ordering.diff, michael
 # Changed the default option in the Templates and Documents dialog.
 svtools-default-new-document.diff, rodo
 
-# FIX case of autocomplete foo [!] - needs re-writing to use character class ...
-# contextual autocomplete
-context-autocomplete.diff, i#22961, michael
-
 # Fix casts in db_java_wrap.c
 # db4-jni-casting.diff, rengelha - broken with 'split' ...
 
diff --git a/patches/dev300/context-autocomplete.diff b/patches/dev300/context-autocomplete.diff
deleted file mode 100644
index d54a058..0000000
--- a/patches/dev300/context-autocomplete.diff
+++ /dev/null
@@ -1,26 +0,0 @@
----
- sw/source/ui/docvw/edtwin.cxx |    8 +++++++-
- 1 files changed, 7 insertions(+), 1 deletions(-)
-
-diff --git sw/source/ui/docvw/edtwin.cxx sw/source/ui/docvw/edtwin.cxx
-index 9945b90..835c05f 100644
---- sw/source/ui/docvw/edtwin.cxx
-+++ sw/source/ui/docvw/edtwin.cxx
-@@ -5638,7 +5638,13 @@ void QuickHelpData::FillStrArr( SwWrtShell& rSh, const String& rWord )
-             if( rS.Len() > rWord.Len() )
-             {
-                 String* pNew = new String( rS );
--                if( !aArr.Insert( pNew ) )
-+                ByteString bStr(::rtl::OUStringToOString (rWord, RTL_TEXTENCODING_UTF8));
-+                if (bStr.IsLowerAscii())
-+                    pNew->ToLowerAscii();
-+                else if (bStr.IsUpperAscii())
-+                    pNew->ToUpperAscii();
-+
-+                if( !aArr.Insert(pNew  ) )
-                     delete pNew;
-             }
-             ++nStt;
--- 
-1.7.0.1
-