rpms/openoffice.org/devel openoffice.org-2.0.2.ooo63155.sfx2.badscript.patch, NONE, 1.1 openoffice.org.spec, 1.639, 1.640

[fedora-cvs-commits at redhat.com]

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24545

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.2.ooo63155.sfx2.badscript.patch 
Log Message:
fix for rh#185390#

openoffice.org-2.0.2.ooo63155.sfx2.badscript.patch:
 sfx2/source/dialog/cfg.cxx |    2 +-
 source/dialog/cfg.cxx      |    0 
 2 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE openoffice.org-2.0.2.ooo63155.sfx2.badscript.patch ---
Index: source/dialog/cfg.cxx
===================================================================
RCS file: /cvs/framework/sfx2/source/dialog/cfg.cxx,v
retrieving revision 1.53
diff -u -p -u -r1.53 cfg.cxx
--- openoffice.org.orig/sfx2/source/dialog/cfg.cxx	7 Sep 2005 18:12:28 -0000	1.53
+++ openoffice.org/sfx2/source/dialog/cfg.cxx	14 Mar 2006 10:50:22 -0000
@@ -1746,7 +1746,7 @@ void SfxConfigGroupListBox_Impl::Request
 									bDisplay=FALSE;
 								}
 							}
-							if (children[n]->getType() != browse::BrowseNodeTypes::SCRIPT  && bDisplay )
+							if ( children[n].is() && children[n]->getType() != browse::BrowseNodeTypes::SCRIPT && bDisplay )
 							{
 
 								/*


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.639
retrieving revision 1.640
diff -u -r1.639 -r1.640
--- openoffice.org.spec	13 Mar 2006 12:40:43 -0000	1.639
+++ openoffice.org.spec	14 Mar 2006 10:37:25 -0000	1.640
@@ -204,6 +204,7 @@
 Patch34: openoffice.org-2.0.2-ooo61841.vcl.honourfontconfigoverrides.patch
 Patch35: openoffice.org-2.0.2.ooo62030.solenv._version.patch
 Patch36: openoffice.org-2.0.2.oooXXXXX.config_office.noppds.patch
+Patch37: openoffice.org-2.0.2.ooo63155.sfx2.badscript.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -861,6 +862,7 @@
 %patch34 -p1 -b .ooo61841.vcl.honourfontconfigoverrides.patch
 %patch35 -p1 -b .ooo62030.solenv._version.patch
 %patch36 -p1 -b .oooXXXXX.config_office.noppds.patch
+%patch37 -p1 -b .ooo63155.sfx2.badscript.patch
 
 %if %{includingexternals}
 #start ludicrous workaround
@@ -3349,6 +3351,7 @@
 - ooo#59997# replacement opens___.ttf updated
 - drop integrated openoffice.org-2.0.0.ooo56651.sw.rtfcrash.patch
 - drop integrated openoffice.org-1.9.114.ooo51718.rpath.patch
+- add openoffice.org-2.0.2.ooo63155.sfx2.badscript.patch for rh#185390#
 
 * Fri Mar 10 2006 Bill Nottingham <notting at redhat.com> - 1:2.0.2-5.2
 - rebuild for PPC TLS issue (#184446)