[libreoffice] Resolves: rhbz#927223 syntax highlighting crash

[Caolán McNamara]

commit 49dbe3482e80dcfe710fba327e5f5a5473c81df2
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Apr 16 14:05:20 2013 +0100

    Resolves: rhbz#927223 syntax highlighting crash

 ...o-47209-and-rhbz-927223-syntax-highlighte.patch |   31 ++++++++++++++++++++
 libreoffice.spec                                   |    7 ++++-
 2 files changed, 37 insertions(+), 1 deletions(-)
---
diff --git a/0001-Resolves-fdo-47209-and-rhbz-927223-syntax-highlighte.patch b/0001-Resolves-fdo-47209-and-rhbz-927223-syntax-highlighte.patch
new file mode 100644
index 0000000..7b360e5
--- /dev/null
+++ b/0001-Resolves-fdo-47209-and-rhbz-927223-syntax-highlighte.patch
@@ -0,0 +1,31 @@
+From 02917cb57e2c2e9fcab2db8f72960023f3e4edaf Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm at redhat.com>
+Date: Tue, 16 Apr 2013 13:40:04 +0100
+Subject: [PATCH] Resolves: fdo#47209 and rhbz#927223 syntax highlighter crash
+
+when trying to parse empty lines looking for the matching
+bracket
+
+Change-Id: I3961a3d0e804d136de286e21934c6ba5ab0496cf
+---
+ svtools/source/edit/editsyntaxhighlighter.cxx | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/svtools/source/edit/editsyntaxhighlighter.cxx b/svtools/source/edit/editsyntaxhighlighter.cxx
+index 62a7a25..3f1cd8d 100644
+--- a/svtools/source/edit/editsyntaxhighlighter.cxx
++++ b/svtools/source/edit/editsyntaxhighlighter.cxx
+@@ -89,6 +89,10 @@ void MultiLineEditSyntaxHighlight::DoBracketHilight(sal_uInt16 aKey)
+                 continue;
+ 
+             String aLine( GetTextEngine()->GetText( aPara ) );
++
++            if (aLine.Len() == 0)
++                continue;
++
+             for (sal_uInt16 i = ((unsigned long)aPara==nStartPara) ? aStartPos-1 : (sal_uInt16)(aLine.Len()-1); i>0; --i)
+             {
+                 if (aLine.GetChar(i)==aChar)
+-- 
+1.8.1.2
+
diff --git a/libreoffice.spec b/libreoffice.spec
index aa89bac..8c87656 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -43,7 +43,7 @@ Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Epoch:          1
 Version:        %{libo_version}.2
-Release:        3%{?libo_prerelease}%{?dist}
+Release:        4%{?libo_prerelease}%{?dist}
 License:        (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic and MPLv2.0
 Group:          Applications/Productivity
 URL:            http://www.documentfoundation.org/develop
@@ -251,6 +251,7 @@ Patch21: 0001-Related-rhbz-902884-check-for-GetSelectedMasterPage-.patch
 Patch22: 0001-Resolves-rhbz-920697-i110881-rhbz-623191-presentatio.patch
 Patch23: 0001-rhbz-876742-speed-up-table-manipulation-in-Impress.patch
 Patch24: 0001-Resolves-rhbz-949238-div-by-zero-on-pagedown-in-0-wi.patch
+Patch25: 0001-Resolves-fdo-47209-and-rhbz-927223-syntax-highlighte.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/libreoffice
@@ -1007,6 +1008,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
 %patch22 -p1 -b .rhbz-920697-i110881-rhbz-623191-presentatio.patch
 %patch23 -p1 -b .rhbz-876742-speed-up-table-manipulation-in-Impress.patch
 %patch24 -p1 -b .rhbz-949238-div-by-zero-on-pagedown-in-0-wi.patch
+%patch25 -p1 -b .fdo-47209-and-rhbz-927223-syntax-highlighte.patch
 
 # TODO: check this
 # these are horribly incomplete--empty translations and copied english
@@ -2080,6 +2082,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %endif
 
 %changelog
+* Tue Apr 16 2013 Caolán McNamara <caolanm at redhat.com> - 1:4.0.2.2-4
+- Resolves: rhbz#927223 syntax highlighting crash
+
 * Mon Apr 08 2013 Caolán McNamara <caolanm at redhat.com> - 1:4.0.2.2-3
 - Resolves: rhbz#949238 div by zero on pagedown in 0 width panel