rpms/openoffice.org/devel openoffice.org.spec, 1.2266, 1.2267 workspace.sw33bf06.patch, 1.1, 1.2

Fri Jul 2 14:54:46 UTC 2010

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv22877

Modified Files:
	openoffice.org.spec workspace.sw33bf06.patch 
Log Message:
merge fixes to accepted workspace


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2266
retrieving revision 1.2267
diff -u -p -r1.2266 -r1.2267

--- openoffice.org.spec	1 Jul 2010 19:23:20 -0000	1.2266
+++ openoffice.org.spec	2 Jul 2010 14:54:45 -0000	1.2267
@@ -138,21 +138,20 @@ Patch67: openoffice.org-3.3.0.ooo111699.
 Patch68: openoffice.org-3.3.0.ooo111758.sd.xerror.patch
 Patch69: workspace.extras330.patch
 Patch70: openoffice.org-3.2.0.ooo111741.extras.malformed-xml-file.patch
-Patch71: openoffice.org-3.2.0.ooo111886.sw.layout.workaround.patch
-Patch72: workspace.cmcfixes64.patch
-Patch73: workspace.cmcfixes75.patch
-Patch74: workspace.writerfilter08.patch
-Patch75: openoffice.org-3.3.0.ooo112059.sw.avoid-null-ptr-deref.patch
-Patch76: workspace.os140.patch
-Patch77: workspace.vcl112.patch
-Patch78: openoffice.org-3.3.0.ooo107490.cppu.lifecycle.patch
-Patch79: openoffice.org-3.3.0.ooo100686.wizards.types.not.mediatypes.patch
-Patch80: workspace.vcl113.patch
-Patch81: workspace.tl81.patch
-Patch82: openoffice.org-3.3.0.ooo112384.sw.export.doc.styledoesntexist.patch
-Patch83: workspace.gtkfpicker9.patch
-Patch84: workspace.gtk3.patch
-Patch85: workspace.sw33bf06.patch
+Patch71: workspace.cmcfixes64.patch
+Patch72: workspace.cmcfixes75.patch
+Patch73: workspace.writerfilter08.patch
+Patch74: openoffice.org-3.3.0.ooo112059.sw.avoid-null-ptr-deref.patch
+Patch75: workspace.os140.patch
+Patch76: workspace.vcl112.patch
+Patch77: openoffice.org-3.3.0.ooo107490.cppu.lifecycle.patch
+Patch78: openoffice.org-3.3.0.ooo100686.wizards.types.not.mediatypes.patch
+Patch79: workspace.vcl113.patch
+Patch80: workspace.tl81.patch
+Patch81: openoffice.org-3.3.0.ooo112384.sw.export.doc.styledoesntexist.patch
+Patch82: workspace.gtkfpicker9.patch
+Patch83: workspace.gtk3.patch
+Patch84: workspace.sw33bf06.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -1704,21 +1703,20 @@ cp -p %{SOURCE5} external/unowinreg/unow
 %patch68 -p0 -b .ooo111758.sd.xerror.patch
 %patch69 -p1 -b .workspace.extras330.patch
 %patch70 -p1 -b .ooo111741.extras.malformed-xml-file.patch
-%patch71 -p0 -b .ooo111886.sw.layout.workaround.patch
-%patch72 -p1 -b .workspace.cmcfixes64.patch
-%patch73 -p1 -b .workspace.cmcfixes75.patch
-%patch74 -p0 -b .workspace.writerfilter08.patch
-%patch75 -p1 -b .ooo112059.sw.avoid-null-ptr-deref.patch
-%patch76 -p1 -b .workspace.os140.patch
-%patch77 -p1 -b .workspace.vcl112.patch
-%patch78 -p0 -b .ooo107490.cppu.lifecycle.patch
-%patch79 -p0 -b .ooo100686.wizards.types.not.mediatypes.patch
-%patch80 -p0 -b .workspace.vcl113.patch
-%patch81 -p0 -b .workspace.tl81.patch
-%patch82 -p0 -b .ooo112384.sw.export.doc.styledoesntexist.patch
-%patch83 -p0 -b .workspace.gtkfpicker9.patch
-%patch84 -p0 -b .workspace.gtk3.patch
-%patch85 -p0 -b .workspace.sw33bf06.patch
+%patch71 -p1 -b .workspace.cmcfixes64.patch
+%patch72 -p1 -b .workspace.cmcfixes75.patch
+%patch73 -p0 -b .workspace.writerfilter08.patch
+%patch74 -p1 -b .ooo112059.sw.avoid-null-ptr-deref.patch
+%patch75 -p1 -b .workspace.os140.patch
+%patch76 -p1 -b .workspace.vcl112.patch
+%patch77 -p0 -b .ooo107490.cppu.lifecycle.patch
+%patch78 -p0 -b .ooo100686.wizards.types.not.mediatypes.patch
+%patch79 -p0 -b .workspace.vcl113.patch
+%patch80 -p0 -b .workspace.tl81.patch
+%patch81 -p0 -b .ooo112384.sw.export.doc.styledoesntexist.patch
+%patch82 -p0 -b .workspace.gtkfpicker9.patch
+%patch83 -p0 -b .workspace.gtk3.patch
+%patch84 -p0 -b .workspace.sw33bf06.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`

workspace.sw33bf06.patch:
 core/objectpositioning/tocntntanchoredobjectposition.cxx |    8 +++++---
 core/text/txttab.cxx                                     |    4 ++++
 filter/rtf/rtftbl.cxx                                    |    6 +++++-
 3 files changed, 14 insertions(+), 4 deletions(-)

Index: workspace.sw33bf06.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.sw33bf06.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- workspace.sw33bf06.patch	1 Jul 2010 16:58:02 -0000	1.1
+++ workspace.sw33bf06.patch	2 Jul 2010 14:54:46 -0000	1.2
@@ -1,5 +1,5 @@
 diff -ru sw.orig/source/core/text/txttab.cxx sw/source/core/text/txttab.cxx
---- sw.orig/source/core/text/txttab.cxx	2010-06-18 15:03:06.000000000 +0100
+--- sw/source/core/text/txttab.cxx	2010-06-18 15:03:06.000000000 +0100
 +++ sw/source/core/text/txttab.cxx	2010-06-18 15:30:19.000000000 +0100
 @@ -194,6 +194,10 @@
              if ( nCount < 0 )
@@ -32,3 +32,21 @@ diff -r 23574dd1e2de sw/source/filter/rt
  			break;
  
  		case RTF_CELLX:
+diff -r 431f4f0e437c sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx
+--- sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx	Tue Jun 08 12:04:44 2010 +0200
++++ sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx	Fri Jul 02 10:28:20 2010 +0200
+@@ -213,9 +213,11 @@ void SwToCntntAnchoredObjectPosition::Ca
+                    !GetAnchoredObj().GetLastCharRect().Width() ) ||
+                  !GetAnchoredObj().GetLastTopOfLine() )
+             {
+-                // --> OD 2004-07-15 #117380# - suppress check for paragraph
+-                // portion information by passing <false> as first parameter
+-                GetAnchoredObj().CheckCharRectAndTopOfLine( false );
++                // --> OD 2010-07-02 #i111886#
++                // Check existence of paragraph portion information in order
++                // to avoid formatting which could cause deletion of follow frames.
++                GetAnchoredObj().CheckCharRectAndTopOfLine();
++                // <--
+                 // OD 2005-01-12 - Due to table break algorithm the character
+                 // rectangle can have no height. Thus, check also the width
+                 if ( ( !GetAnchoredObj().GetLastCharRect().Height() &&

