rpms/openoffice.org/devel openoffice.org-3.2.0.ooo106497.lingucomponent.langnotfound.patch, NONE, 1.1 openoffice.org.spec, 1.2055, 1.2056

[Caolan McNamara]

Author: caolanm

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

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 ---
diff -r 3ee4cb3a17dd linguistic/source/spelldsp.cxx
--- a/linguistic/source/spelldsp.cxx	Fri Oct 30 09:44:02 2009 +0000
+++ b/linguistic/source/spelldsp.cxx	Fri Oct 30 15:11:13 2009 +0000
@@ -330,7 +330,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/devel/openoffice.org.spec,v
retrieving revision 1.2055
retrieving revision 1.2056
diff -u -p -r1.2055 -r1.2056
--- openoffice.org.spec	30 Oct 2009 12:23:52 -0000	1.2055
+++ openoffice.org.spec	30 Oct 2009 15:23:15 -0000	1.2056
@@ -1,6 +1,6 @@
 %define oootag OOO320
 %define ooomilestone 3
-%define rh_rpm_release 1
+%define rh_rpm_release 2
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -121,6 +121,7 @@ Patch47: openoffice.org-3.2.0.ooo106032.
 Patch48: workspace.impress180.patch
 Patch49: workspace.gsminhibit.patch
 Patch50: workspace.vcl107.patch
+Patch51: 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}
@@ -1631,6 +1632,7 @@ cat %{PATCH10} >> svtools/source/dialogs
 %patch48 -p0 -b .workspace.impress180.patch
 %patch49 -p1 -b .workspace.gsminhibit.patch
 %patch50 -p1 -b .workspace.vcl107.patch
+%patch51 -p1 -b .ooo106497.lingucomponent.langnotfound.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4131,6 +4133,10 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Fri Oct 30 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-3.2.UNBUILT
+- Resolves: ooo#106497 language marked as providing spellchecking when
+  unavailable (caolanm)
+
 * Fri Oct 30 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-3.1
 - Resolves: rhbz#531732 crash in about dialog with unfinished
   accelerator sequence