rpms/openoffice.org/devel openoffice.org-3.0.1.ooo96970.pluginfixups.patch, 1.1, 1.2 openoffice.org.spec, 1.1715, 1.1716 workspace.hb12.patch, 1.1, 1.2 workspace.swffixes.patch, 1.1, NONE

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	openoffice.org-3.0.1.ooo96970.pluginfixups.patch 
	openoffice.org.spec workspace.hb12.patch 
Removed Files:
	workspace.swffixes.patch 
Log Message:
next version

openoffice.org-3.0.1.ooo96970.pluginfixups.patch:

Index: openoffice.org-3.0.1.ooo96970.pluginfixups.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.0.1.ooo96970.pluginfixups.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-3.0.1.ooo96970.pluginfixups.patch	6 Dec 2008 16:33:38 -0000	1.1
+++ openoffice.org-3.0.1.ooo96970.pluginfixups.patch	9 Dec 2008 12:00:14 -0000	1.2
@@ -73,15 +73,6 @@
  				  NULL );
  
  	if( ! pMes )
-@@ -686,7 +690,7 @@
-                     {
-                         medDebug( 1, "creating gtk plug and socket\n" );
-                         
--                        pInst->pGtkWindow = gtk_plug_new((GdkNativeWindow)pWindow->window);
-+                        pInst->pGtkWindow = gtk_plug_new((GdkNativeWindow)(sal_uIntPtr)pWindow->window);
-                         gtk_widget_show( pInst->pGtkWindow );
-                         pInst->pGtkWidget = gtk_socket_new();
-                         gtk_widget_show( pInst->pGtkWidget );
 diff -ru extensions/source/plugin/unx/nppapi.cxx extensions/source/plugin/unx/nppapi.cxx
 --- openoffice.org.orig/extensions/source/plugin/unx/nppapi.cxx	2008-12-05 15:47:49.000000000 +0000
 +++ openoffice.org/extensions/source/plugin/unx/nppapi.cxx	2008-12-05 17:04:37.000000000 +0000


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1715
retrieving revision 1.1716
diff -u -r1.1715 -r1.1716
--- openoffice.org.spec	9 Dec 2008 09:58:37 -0000	1.1715
+++ openoffice.org.spec	9 Dec 2008 12:00:14 -0000	1.1716
@@ -127,8 +127,7 @@
 Patch54: openoffice.org-3.0.0.ooo96279.swext.mediawiki.proxies.patch
 Patch55: openoffice.org-3.0.0.ooo96391.sw.prefsalwaysmodified.patch
 Patch56: workspace.tkr16.patch
-Patch57: workspace.swffixes.patch
-Patch58: openoffice.org-3.0.1.ooo96970.pluginfixups.patch
+Patch57: openoffice.org-3.0.1.ooo96970.pluginfixups.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1380,8 +1379,7 @@
 %patch54 -p1 -b .ooo96279.swext.mediawiki.proxies.patch
 %patch55 -p1 -b .ooo96391.sw.prefsalwaysmodified.patch
 %patch56 -p1 -b .workspace.tkr16.patch
-%patch57 -p1 -b .workspace.swffixes.patch
-%patch58 -p1 -b .ooo96970.pluginfixups.patch
+%patch57 -p1 -b .ooo96970.pluginfixups.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3755,6 +3753,7 @@
   workspace.impressfontsize.patch
 - rename openoffice.org-3.0.1.ooo96906.ucb.symlinks.and.size.patch to
   upstream workspace.tkr16.patch
+- drop integrated workspace.swffixes.patch
 
 * Sat Dec 06 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.1-12.3
 - rebuild for python

workspace.hb12.patch:

Index: workspace.hb12.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.hb12.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- workspace.hb12.patch	5 Dec 2008 13:39:43 -0000	1.1
+++ workspace.hb12.patch	9 Dec 2008 12:00:14 -0000	1.2
@@ -1,23 +1,3 @@
-Index: source/filter/ww8/wrtw8nds.cxx
-===================================================================
-RCS file: /cvs/sw/sw/source/filter/ww8/wrtw8nds.cxx,v
-retrieving revision 1.109
-diff -u -r1.109 wrtw8nds.cxx
---- openoffice.org.orig/sw/source/filter/ww8/wrtw8nds.cxx	8 Jul 2008 08:29:15 -0000	1.109
-+++ openoffice.org/sw/source/filter/ww8/wrtw8nds.cxx	28 Oct 2008 09:47:19 -0000
-@@ -2239,6 +2239,12 @@
-         {
-             ASSERT( nColCnt < rCols.Count(), "Leaving table" );
- 
-+            if (nColCnt >= rCols.Count())
-+            {
-+                //Doomage, row wider than table
-+                break;
-+            }
-+
-             SwWriteTableCell* pCell = rCells[nBox];
-             const bool bProcessCoveredCell = bNewTableModel && 0 == pCell->GetRowSpan();
- 
 Index: source/filter/ww8/writerwordglue.cxx
 ===================================================================
 RCS file: /cvs/sw/sw/source/filter/ww8/writerwordglue.cxx,v


--- workspace.swffixes.patch DELETED ---