rpms/openoffice.org/F-12 openoffice.org-3.2.0.ooo106497.lingucomponent.langnotfound.patch, NONE, 1.1 openoffice.org.spec, 1.2025, 1.2026

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19517/F-12

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.2.0.ooo106497.lingucomponent.langnotfound.patch 
Log Message:
Resolves: ooo#106497 language marked as providing spellchecking when unavailable

openoffice.org-3.2.0.ooo106497.lingucomponent.langnotfound.patch:
 spelldsp.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE openoffice.org-3.2.0.ooo106497.lingucomponent.langnotfound.patch ---
--- linguistic/source/spelldsp.cxx.orig	2008-12-15 13:01:46.000000000 +0000
+++ linguistic/source/spelldsp.cxx	2009-10-30 15:18:38.000000000 +0000
@@ -294,7 +294,8 @@
 		return bRes;
 	
 	// search for entry with that language
-    LangSvcEntries_Spell *pEntry = aSvcMap[ nLanguage ].get();
+    SpellSvcByLangMap_t::iterator aIt(aSvcMap.find(nLanguage));
+    LangSvcEntries_Spell *pEntry = aIt != aSvcMap.end() ? aIt->second.get() : NULL;
 	
 	if (!pEntry)
 	{


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-12/openoffice.org.spec,v
retrieving revision 1.2025
retrieving revision 1.2026
diff -u -p -r1.2025 -r1.2026
--- openoffice.org.spec	28 Oct 2009 20:37:17 -0000	1.2025
+++ openoffice.org.spec	30 Oct 2009 15:23:14 -0000	1.2026
@@ -1,6 +1,6 @@
 %define oootag OOO310
 %define ooomilestone 19
-%define rh_rpm_release 14
+%define rh_rpm_release 15
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -167,6 +167,7 @@ Patch90: openoffice.org-3.2.0.ooo105988.
 Patch91: workspace.impress178.patch
 Patch92: openoffice.org-3.1.1.ooo106130.svx.removedeletedshapes.patch
 Patch93: workspace.chart41.patch
+Patch94: openoffice.org-3.2.0.ooo106497.lingucomponent.langnotfound.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1720,6 +1721,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch91 -p0 -b .workspace.impress178.patch
 %patch92 -p0 -b .ooo106130.svx.removedeletedshapes.patch
 %patch93 -p1 -b .workspace.chart41.patch
+%patch94 -p0 -b .ooo106497.lingucomponent.langnotfound.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4253,6 +4255,10 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Fri Oct 30 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-19.15-UNBUILT
+- Resolves: ooo#106497 language marked as providing spellchecking when
+  unavailable (caolanm)
+
 * Wed Oct 28 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-19.14
 - Resolves: ooo#103757 custom shape cut and paste (caolanm)
 - Resolves: rhbz#529746 crash on exit after loading .ppt (caolanm)