./packages/openofficeorg/3.2.1/unstable r2060: fix i#113461
------------------------------------------------------------
revno: 2060
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Wed 2010-07-28 17:27:34 +0200
message:
fix i#113461
added:
patches/fix-i113461.diff
modified:
changelog
patches/series
=== modified file 'changelog'
--- a/changelog 2010-07-27 14:45:54 +0000
+++ b/changelog 2010-07-28 15:27:34 +0000
@@ -4,6 +4,8 @@
configure.pl of the SDK to honour ure-link (closes: #588495)
* debian/patches/fix-i113084.diff; fix easy to trigger crash in macro
recorder (from upstream)
+ * debian/patches/fix-i113461.diff: do not freeze after erasing non-breaking
+ space inserted by French AutoCorrection (from upstream)
* debian/rules:
- for safety, add a build-conflicts against libhsqldb-java (>> 1.8.1~)
@@ -17,7 +19,7 @@
* debian/control.kde.in:
- remove obsolete Pre-Depends:
- -- Rene Engelhard <rene@debian.org> Tue, 27 Jul 2010 16:43:31 +0200
+ -- Rene Engelhard <rene@debian.org> Wed, 28 Jul 2010 15:48:59 +0200
openoffice.org (1:3.2.1-4) unstable; urgency=medium
=== added file 'patches/fix-i113461.diff'
--- a/patches/fix-i113461.diff 1970-01-01 00:00:00 +0000
+++ b/patches/fix-i113461.diff 2010-07-28 15:27:34 +0000
@@ -0,0 +1,62 @@
+--- /dev/null 2010-07-24 19:29:59.233238398 +0200
++++ openoffice.org-3.2.1/ooo-build-3-2-1-4/patches/dev300/editeng.dont-freeze-in-autocorr.diff 2010-07-28 15:45:05.000000000 +0200
+@@ -0,0 +1,46 @@
++# HG changeset patch
++# Parent f08e0746219b133571e5903b94a77d2fe71b7db1
++#i113461# do not freeze after erasing non-breaking space inserted by French AutoCorrection
++
++diff -r f08e0746219b -r 80209fb60358 editeng/source/misc/svxacorr.cxx
++--- svx/source/editeng/svxacorr.cxx Wed Jul 28 13:18:57 2010 +0200
+++++ svx/source/editeng/svxacorr.cxx Wed Jul 28 13:19:27 2010 +0200
++@@ -1243,27 +1243,25 @@
++ else if ( bIsNextRun && !IsAutoCorrectChar( cChar ) )
++ {
++ // Remove the NBSP if it wasn't an autocorrection
++- if ( NeedsHardspaceAutocorr( rTxt.GetChar( nInsPos - 1 ) ) &&
+++ if ( nInsPos != 0 && NeedsHardspaceAutocorr( rTxt.GetChar( nInsPos - 1 ) ) &&
++ cChar != ' ' && cChar != '\t' && cChar != CHAR_HARDBLANK )
++ {
++ // Look for the last HARD_SPACE
++ xub_StrLen nPos = nInsPos - 1;
++- bool bFound = false;
++- while ( nPos != STRING_NOTFOUND && !bFound )
+++ bool bContinue = true;
+++ while ( bContinue )
++ {
++- sal_Unicode cTmpChar = rTxt.GetChar( nPos );
+++ const sal_Unicode cTmpChar = rTxt.GetChar( nPos );
++ if ( cTmpChar == CHAR_HARDBLANK )
++- bFound = true;
++- else if ( !NeedsHardspaceAutocorr( cTmpChar ) )
++- nPos = STRING_NOTFOUND;
+++ {
+++ rDoc.Delete( nPos, nPos + 1 );
+++ nRet = AddNonBrkSpace;
+++ bContinue = false;
+++ }
+++ else if ( !NeedsHardspaceAutocorr( cTmpChar ) || nPos == 0 )
+++ bContinue = false;
++ nPos--;
++ }
++-
++- if ( bFound && nPos != STRING_NOTFOUND )
++- {
++- rDoc.Delete( nPos + 1, nPos + 2 );
++- nRet = AddNonBrkSpace;
++- }
++ }
++ }
++ }
+diff --git a/patches/dev300/apply b/patches/dev300/apply
+index 4b05b93..f74641a 100644
+--- openoffice.org-3.2.1/ooo-build-3-2-1-4/patches/dev300/apply
++++ openoffice.org-3.2.1/ooo-build-3-2-1-4/patches/dev300/apply
+@@ -2681,6 +2681,8 @@ autocorrect-accidental-caps-lock-vcl.diff
+ cws-cbosdo01.diff, cbosdo
+ # Additionnal fix which didn't go into cbosdo01 (CWS: cbosdo05)
+ remove-bad-nbsp.diff, cbosdo
++# one more fix
++editeng.dont-freeze-in-autocorr.diff, i#113461
+
+ # Fancy document modified status window
+ statusbar-fancy-modified-status-sc.diff, i#103862, kohei
=== modified file 'patches/series'
--- a/patches/series 2010-07-19 20:50:50 +0000
+++ b/patches/series 2010-07-28 15:27:34 +0000
@@ -4,3 +4,4 @@
fix-system-saxon.diff
odk-configure-honour-ure-link.diff
fix-i113084.diff
+fix-i113461.diff
Reply to: