rpms/openoffice.org/devel openoffice.org-1.9.117.ooo51912.nullpointer.wizards.patch, NONE, 1.1 openoffice.org-1.9.104-use-fontconfig-everywhere.patch, 1.8, 1.9 openoffice.org.spec, 1.300, 1.301 workspace.fpicker4.patch, 1.1, NONE

[fedora-cvs-commits at redhat.com]

Author: caolanm

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

Modified Files:
	openoffice.org-1.9.104-use-fontconfig-everywhere.patch 
	openoffice.org.spec 
Added Files:
	openoffice.org-1.9.117.ooo51912.nullpointer.wizards.patch 
Removed Files:
	workspace.fpicker4.patch 
Log Message:
the hazards of hand-crafting patches

openoffice.org-1.9.117.ooo51912.nullpointer.wizards.patch:
 com/sun/star/wizards/ui/TitlesComponent.java         |    0 
 wizards/com/sun/star/wizards/ui/TitlesComponent.java |    3 ++-
 2 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE openoffice.org-1.9.117.ooo51912.nullpointer.wizards.patch ---
Index: com/sun/star/wizards/ui/TitlesComponent.java
===================================================================
RCS file: /cvs/installation/wizards/com/sun/star/wizards/ui/TitlesComponent.java,v
retrieving revision 1.4
diff -u -p -u -r1.4 TitlesComponent.java
--- openoffice.org.orig/wizards/com/sun/star/wizards/ui/TitlesComponent.java	18 Mar 2005 16:26:07 -0000	1.4
+++ openoffice.org/wizards/com/sun/star/wizards/ui/TitlesComponent.java	13 Jul 2005 18:43:21 -0000
@@ -104,7 +104,8 @@ public class TitlesComponent extends Con
 		for (int i = 0; i < super.ControlGroupVector.size(); i++){
 			ControlRow curControlRow = (ControlRow) ControlGroupVector.elementAt(i); 
 			XTextComponent xTextBox = curControlRow.xTextComponent;
-			xTextBox.addTextListener(_xTextListener);
+			if ((xTextBox != null) && (_xTextListener != null))
+				xTextBox.addTextListener(_xTextListener);
 		}
 	}
 

openoffice.org-1.9.104-use-fontconfig-everywhere.patch:
 inc/outdev.h                              |    0 
 inc/outfont.hxx                           |    0 
 inc/psprint/fontmanager.hxx               |    0 
 psprint/inc/psprint/fontmanager.hxx       |    4 
 psprint/source/fontmanager/fontcache.cxx  |    2 
 psprint/source/fontmanager/fontconfig.cxx |   20 +
 source/fontmanager/fontcache.cxx          |    0 
 source/fontmanager/fontconfig.cxx         |    0 
 source/gdi/outdev3.cxx                    |    0 
 util/makefile.mk                          |    0 
 vcl/inc/outdev.h                          |    3 
 vcl/inc/outfont.hxx                       |   15 +
 vcl/source/gdi/outdev3.cxx                |  411 +++++++++++++++++++++++-------
 vcl/util/makefile.mk                      |    2 
 14 files changed, 366 insertions(+), 91 deletions(-)

Index: openoffice.org-1.9.104-use-fontconfig-everywhere.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.104-use-fontconfig-everywhere.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- openoffice.org-1.9.104-use-fontconfig-everywhere.patch	13 Jul 2005 14:29:54 -0000	1.8
+++ openoffice.org-1.9.104-use-fontconfig-everywhere.patch	13 Jul 2005 18:54:22 -0000	1.9
@@ -76,7 +76,7 @@
  // =======================================================================
  
  DBG_NAMEEX( OutputDevice );
-@@ -2670,6 +2674,186 @@ ImplFontCache::~ImplFontCache()
+@@ -2670,6 +2674,187 @@ ImplFontCache::~ImplFontCache()
      }
  }
  
@@ -247,6 +247,7 @@
 +        if( eFileRes == FcResultMatch )
 +        {
 +            String aName( (sal_Char*)family, RTL_TEXTENCODING_UTF8 );
++            String aUserName(aName);
 +            ImplGetEnglishSearchFontName( aName );
 +            ImplFontSubstitute( aName, FONT_SUBSTITUTE_ALWAYS, pDevSpecific );
 +            pFontFamily = ImplFindBySearchName( aName );


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.300
retrieving revision 1.301
diff -u -r1.300 -r1.301
--- openoffice.org.spec	13 Jul 2005 17:24:37 -0000	1.300
+++ openoffice.org.spec	13 Jul 2005 18:54:22 -0000	1.301
@@ -130,6 +130,7 @@
 Patch61: openoffice.org-1.9.116.rh162935.gccXXXXX.weirdcrash.patch
 Patch62: openoffice.org-1.9.114.oooXXXXX.systemboost.patch
 Patch63: openoffice.org-1.9.117.rh163147.thorndale.fontconfig.patch
+Patch64: openoffice.org-1.9.117.ooo51912.nullpointer.wizards.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -773,6 +774,7 @@
 %patch61 -p1 -b .rh162935.gccXXXXX.weirdcrash.patch
 %patch62 -p1 -b .oooXXXXX.systemboost.patch
 %patch63 -p1 -b .rh163147.thorndale.fontconfig.patch
+%patch64 -p1 -b .ooo51912.nullpointer.wizards.patch
 #start ludicrous workaround
 #while we include these libs we need this, if/when we move to system
 #libxmlsec/db4 then this needs to be modified/dropped
@@ -2962,6 +2964,8 @@
 - rh#162984# fallbacks from en_AU to en_GB for wizards
 - rh#160783# set a targetname for font when it's found
 - add openoffice.org-1.9.117.rh163147.thorndale.fontconfig.patch
+- add openoffice.org-1.9.117.ooo51912.nullpointer.wizards.patch for
+  rh#161173#
 
 * Mon Jul 11 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.116-3
 - enable evo addressbook in addressbook wizard


--- workspace.fpicker4.patch DELETED ---