rpms/openoffice.org/devel openoffice.org-3.0.1.ooo98909.sfx2.missingplugins.patch, NONE, 1.1 openoffice.org.spec, 1.1782, 1.1783

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.0.1.ooo98909.sfx2.missingplugins.patch 
Log Message:
Resolves: rhbz#483889 openoffice.org-3.0.1.ooo98909.sfx2.missingplugins.patch

openoffice.org-3.0.1.ooo98909.sfx2.missingplugins.patch:

--- NEW FILE openoffice.org-3.0.1.ooo98909.sfx2.missingplugins.patch ---
Index: source/doc/plugin.cxx
===================================================================
RCS file: /cvs/framework/sfx2/source/doc/plugin.cxx,v
retrieving revision 1.7
diff -u -r1.7 plugin.cxx
--- openoffice.org.orig/sfx2/source/doc/plugin.cxx	11 Apr 2008 13:11:48 -0000	1.7
+++ openoffice.org/sfx/source/doc/plugin.cxx	5 Feb 2009 16:12:28 -0000
@@ -161,7 +161,7 @@
         // we must destroy the plugin before the parent is destroyed
         xWindow->addEventListener( this );
         xFrame->setComponent( xWindow, uno::Reference < frame::XController >() );
-        return TRUE;
+        return mxPlugin.is() ? TRUE : FALSE;
     }
 
     return FALSE;


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1782
retrieving revision 1.1783
diff -u -r1.1782 -r1.1783
--- openoffice.org.spec	5 Feb 2009 09:34:57 -0000	1.1782
+++ openoffice.org.spec	5 Feb 2009 16:29:13 -0000	1.1783
@@ -138,6 +138,7 @@
 Patch67: openoffice.org-3.0.1.ooo98649.svtools.missingUI.patch
 Patch68: workspace.gcc44.patch
 Patch69: openoffice.org-3.0.1.ooo98885.sw.safeindex.patch
+Patch70: openoffice.org-3.0.1.ooo98909.sfx2.missingplugins.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -866,7 +867,7 @@
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: hunspell-he
-Requires: culmus-david-clm-fonts
+Requires: culmus-fonts
 Obsoletes: openoffice.org-i18n < 1.9.0
 Obsoletes: openoffice.org-langpack-he < 1:2.0.3
 Obsoletes: openoffice.org2-langpack-he_IL < 1:3.0.0
@@ -1602,6 +1603,7 @@
 %patch67 -p1 -b .ooo98649.svtools.missingUI.patch
 %patch68 -p1 -b .workspace.gcc44.patch
 %patch69 -p1 -b .ooo98885.sw.safeindex.patch
+%patch70 -p1 -b .ooo98909.sfx2.missingplugins.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4012,7 +4014,7 @@
 
 %files -n autocorr-eu
 %dir %{_datadir}/autocorr
-%{_datadir}/autocorr/acor_eu-*
+%{_datadir}/autocorr/acor_eu.dat
 
 %files -n autocorr-fi
 %dir %{_datadir}/autocorr
@@ -4028,7 +4030,7 @@
 
 %files -n autocorr-it
 %dir %{_datadir}/autocorr
-%{_datadir}/autocorr/acor_hu-*
+%{_datadir}/autocorr/acor_it-*
 
 %files -n autocorr-ja
 %dir %{_datadir}/autocorr
@@ -4101,6 +4103,7 @@
 %changelog
 * Thu Feb 05 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.0.1-15.7
 - Resolves: rhbz#483931 openoffice.org-3.0.1.ooo98885.sw.safeindex.patch
+- Resolves: rhbz#483889 openoffice.org-3.0.1.ooo98909.sfx2.missingplugins.patch
 - Resolves: rhbz#484055 reusable autocorrection files
 
 * Tue Feb 03 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.0.1-15.6