------------------------------------------------------------
revno: 2057
committer: Rene Engelhard <r...@debian.org>
branch nick: debian
timestamp: Mon 2010-07-19 22:50:50 +0200
message:
fix i113084
added:
patches/fix-i113084.diff
modified:
changelog
patches/series
=== modified file 'changelog'
--- a/changelog 2010-07-14 15:36:55 +0000
+++ b/changelog 2010-07-19 20:50:50 +0000
@@ -2,6 +2,8 @@
* debian/patches/odk-configure-honour-ure-link.diff: fix the (unneeded)
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/rules:
- for safety, add a build-conflicts against libhsqldb-java (>> 1.8.1~)
@@ -13,7 +15,7 @@
* debian/control.in:
- make new -common Breaks: older openoffice.org-core (closes: #587750)
- -- Rene Engelhard <r...@debian.org> Wed, 14 Jul 2010 17:27:59 +0200
+ -- Rene Engelhard <r...@debian.org> Mon, 19 Jul 2010 22:49:46 +0200
openoffice.org (1:3.2.1-4) unstable; urgency=medium
=== added file 'patches/fix-i113084.diff'
--- a/patches/fix-i113084.diff 1970-01-01 00:00:00 +0000
+++ b/patches/fix-i113084.diff 2010-07-19 20:50:50 +0000
@@ -0,0 +1,13 @@
+diff --git a/patches/dev300/remove-bad-nbsp.diff
b/patches/dev300/remove-bad-nbsp.diff
+index 0e1eb5e..346fcd7 100644
+--- openoffice.org-3.2.1/ooo-build-3-2-1-4/patches/dev300/remove-bad-nbsp.diff
++++ openoffice.org-3.2.1/ooo-build-3-2-1-4/patches/dev300/remove-bad-nbsp.diff
+@@ -160,7 +160,7 @@ index 3adca95..f64da7d 100644
+
+ BOOL bIsAutoCorrectChar =
SvxAutoCorrect::IsAutoCorrectChar( aCh );
+ - if( !aKeyEvent.GetRepeat() && pACorr && bIsAutoCorrectChar &&
+-+ BOOL bRunNext = pACorr->HasRunNext();
+++ BOOL bRunNext = pACorr && pACorr->HasRunNext();
+ + if( !aKeyEvent.GetRepeat() && pACorr && ( bIsAutoCorrectChar
|| bRunNext ) &&
+ pACfg->IsAutoFmtByInput() &&
+ (( pACorr->IsAutoCorrFlag( ChgWeightUnderl ) &&
=== modified file 'patches/series'
--- a/patches/series 2010-07-09 18:37:34 +0000
+++ b/patches/series 2010-07-19 20:50:50 +0000
@@ -3,3 +3,4 @@
installer-globals-max-1-regcomp.diff
fix-system-saxon.diff
odk-configure-honour-ure-link.diff
+fix-i113084.diff
