[openoffice.org/f14/master] Resolves: rhbz#660201 fix wmf text regression

[Caolan McNamara]

commit d8863e52628ffba4e361bbfacebdbd98b7670f94
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Dec 12 14:27:01 2010 +0000

    Resolves: rhbz#660201 fix wmf text regression

 ...o-32236-i115825-Regression-in-wmf-text-re.patch |   26 ++++++++++++++++++++
 openoffice.org.spec                                |    5 +++-
 2 files changed, 30 insertions(+), 1 deletions(-)
---
diff --git a/0001-Resolves-fdo-32236-i115825-Regression-in-wmf-text-re.patch b/0001-Resolves-fdo-32236-i115825-Regression-in-wmf-text-re.patch
new file mode 100644
index 0000000..fa684a1
--- /dev/null
+++ b/0001-Resolves-fdo-32236-i115825-Regression-in-wmf-text-re.patch
@@ -0,0 +1,26 @@
+From c512e7f3bc299f57dc2500c21e0f81f5a2072e80 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm at redhat.com>
+Date: Sun, 12 Dec 2010 14:08:56 +0000
+Subject: [PATCH] Resolves: fdo#32236# #i115825# Regression in wmf text rendering
+
+Regression in rendering chunks out of multipart text lines
+---
+ vcl/source/gdi/metaact.cxx |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx
+index 0968bde..fd95f70 100644
+--- a/vcl/source/gdi/metaact.cxx
++++ b/vcl/source/gdi/metaact.cxx
+@@ -1442,7 +1442,7 @@ void MetaTextArrayAction::Read( SvStream& rIStm, ImplMetaReadData* pData )
+     rIStm	>> mnLen;
+     rIStm	>> nAryLen;
+ 
+-    if ( mnIndex > mnLen )
++    if ( mnIndex + mnLen > maStr.Len() )
+     {
+         mnIndex = 0;
+         mpDXAry = 0;
+-- 
+1.7.3.2
+
diff --git a/openoffice.org.spec b/openoffice.org.spec
index 3271683..a6f6f76 100644
--- a/openoffice.org.spec
+++ b/openoffice.org.spec
@@ -148,6 +148,7 @@ Patch64: 0001-Resolves-rhbz-657628-divide-by-zero.patch
 Patch65: 0001-Resolves-rhbz-657718-Crash-in-SwObjectFormatterTxtFr.patch
 Patch66: rhbz658304.late-init-color-config.patch
 Patch67: 0001-Resolves-rhbz-659947-make-this-more-robust.patch
+Patch68: 0001-Resolves-fdo-32236-i115825-Regression-in-wmf-text-re.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -1712,6 +1713,7 @@ cp -p %{SOURCE5} external/unowinreg/unowinreg.dll
 %patch65 -p1 -b .rhbz657718-Crash-in-SwObjectFormatterTxtFr.patch
 %patch66 -p1 -b .rhbz658304.late-init-color-config.patch
 %patch67 -p1 -b .rhbz659947-make-this-more-robust.patch
+%patch68 -p1 -b .fdo-32236-i115825-Regression-in-wmf-text-re.patch
 touch scripting/source/pyprov/delzip
 touch scripting/util/provider/beanshell/delzip
 touch scripting/util/provider/javascript/delzip
@@ -3908,7 +3910,7 @@ unopkg remove --shared org.openoffice.legacy.ScriptProviderForPython.zip > /dev/
 %endif
 
 %changelog
-* Thu Dec 09 2010 Caolán McNamara <caolanm at redhat.com>- 1:3.3.0-17.3-UNBUILT
+* Sat Dec 12 2010 Caolán McNamara <caolanm at redhat.com>- 1:3.3.0-17.3-UNBUILT
 - Resolves: rhbz657718 Crash in SwObjectFormatterTxtFrm
 - Resolves: rhbz#658304 [abrt] recovery of CSV file causes crash
   (dtardon)
@@ -3917,6 +3919,7 @@ unopkg remove --shared org.openoffice.legacy.ScriptProviderForPython.zip > /dev/
   (dtardon)
 - Resolves: rhbz#661809 Thread locking for neon sessions (cups inits
   gcrypt non-threadsafely before neon can init it threadsafely)
+- Resolves: rhbz#660201 fix wmf text regression
 
 * Sat Nov 27 2010 Caolán McNamara <caolanm at redhat.com>- 1:3.3.0-17.2
 - Resolves: rhbz#657541 don't crash during processing of auto. styles