rpms/openoffice.org/devel openoffice.org.spec, 1.1154, 1.1155 pseudoworkspace.valgrind1.patch, 1.16, 1.17

[fedora-cvs-commits at redhat.com]

Author: caolanm

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

Modified Files:
	openoffice.org.spec pseudoworkspace.valgrind1.patch 
Log Message:
extra valgrind fixes


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1154
retrieving revision 1.1155
diff -u -r1.1154 -r1.1155
--- openoffice.org.spec	5 Apr 2007 10:48:25 -0000	1.1154
+++ openoffice.org.spec	5 Apr 2007 14:32:28 -0000	1.1155
@@ -2633,6 +2633,7 @@
   working notdef glyph
 - remove openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
   gcc 4.1.2-8 should allow our java components to work again.
+- add a handful of valgrind fixes
 
 * Tue Mar 27 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.0-14.3
 - Resolves: rhbz#233944 openoffice.org-2.2.0.ooo75790.sc.pa-IN.translate.patch

pseudoworkspace.valgrind1.patch:
 bf_sfx2/source/explorer/sfx2_nochaos.cxx           |    0 
 binfilter/bf_sfx2/source/explorer/sfx2_nochaos.cxx |    4 ++--
 inc/viewfrm.hxx                                    |    0 
 sfx2/inc/viewfrm.hxx                               |    8 ++++++++
 source/core/txtnode/swfont.cxx                     |    0 
 source/core/txtnode/thints.cxx                     |    0 
 source/dialog/numpages.cxx                         |    0 
 source/msfilter/msdffimp.cxx                       |    0 
 svx/source/dialog/numpages.cxx                     |    1 +
 svx/source/msfilter/msdffimp.cxx                   |    2 +-
 sw/source/core/txtnode/swfont.cxx                  |    2 +-
 sw/source/core/txtnode/thints.cxx                  |    2 +-
 12 files changed, 14 insertions(+), 5 deletions(-)

Index: pseudoworkspace.valgrind1.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/pseudoworkspace.valgrind1.patch,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- pseudoworkspace.valgrind1.patch	30 Jan 2007 15:28:02 -0000	1.16
+++ pseudoworkspace.valgrind1.patch	5 Apr 2007 14:32:28 -0000	1.17
@@ -47,3 +47,57 @@
      SwUnderlineFont* pUnderFnt = 0;
  
      if( rInf.GetUnderFnt() )
+Index: inc/viewfrm.hxx
+===================================================================
+RCS file: /cvs/framework/sfx2/inc/viewfrm.hxx,v
+retrieving revision 1.24
+diff -u -r1.24 viewfrm.hxx
+--- openoffice.org.orig/sfx2/inc/viewfrm.hxx	12 Dec 2006 19:28:13 -0000	1.24
++++ openoffice.org/sfx2/inc/viewfrm.hxx	5 Apr 2007 10:42:26 -0000
+@@ -109,6 +109,14 @@
+ 			}
+ 	BOOL    operator != ( const SvBorder & rObj ) const
+ 			{ return !(*this == rObj); }
++	SvBorder & operator = ( const SvBorder & rBorder )
++			{
++				Left()   = rBorder.Left();
++				Top()    = rBorder.Top();
++				Right()  = rBorder.Right();
++				Bottom() = rBorder.Bottom();
++				return *this;
++			}
+ 	SvBorder & operator += ( const SvBorder & rBorder )
+ 			{
+ 				Left()   += rBorder.Left();
+Index: source/msfilter/msdffimp.cxx
+===================================================================
+RCS file: /cvs/graphics/svx/source/msfilter/msdffimp.cxx,v
+retrieving revision 1.144.42.3
+diff -u -r1.144.42.3 msdffimp.cxx
+--- openoffice.org.orig/svx/source/msfilter/msdffimp.cxx	19 Jan 2007 16:46:49 -0000	1.144.42.3
++++ openoffice.org/svx/source/msfilter/msdffimp.cxx	5 Apr 2007 13:57:43 -0000
+@@ -6969,7 +6969,7 @@
+ 
+ 	// nachschauen, ob es sich auch wirklich um ein BLIP handelt
+ 	UINT32 nLength;
+-	USHORT nInst, nFbt;
++	USHORT nInst, nFbt(0);
+ 	BYTE   nVer;
+ 	if( ReadCommonRecordHeader( rBLIPStream, nVer, nInst, nFbt, nLength) && ( 0xF018 <= nFbt ) && ( 0xF117 >= nFbt ) )
+ 	{
+Index: source/core/txtnode/thints.cxx
+===================================================================
+RCS file: /cvs/sw/sw/source/core/txtnode/thints.cxx,v
+retrieving revision 1.43.36.6
+diff -u -r1.43.36.6 thints.cxx
+--- openoffice.org.orig/sw/source/core/txtnode/thints.cxx	20 Mar 2007 12:48:03 -0000	1.43.36.6
++++ openoffice.org/sw/source/core/txtnode/thints.cxx	5 Apr 2007 14:25:12 -0000
+@@ -2138,7 +2138,7 @@
+ 
+         BuildPortions( rNode, *pHint, nMode );
+ 
+-        if ( nHtStart < *pHtEnd ) // skip merging for 0-length attributes
++        if ( nHtStart < nHintEnd ) // skip merging for 0-length attributes
+             MergePortions( rNode );
+     }
+     else