rpms/openoffice.org/devel openoffice.org.spec, 1.1943, 1.1944 workspace.hb32bugs01.patch, 1.1, 1.2 openoffice.org-3.1.0.ooo102473.ww8.fix-restartlinenumbering.patch, 1.2, NONE openoffice.org-3.1.0.ooo102490.sw.ww8.notab_before_nocontent.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-serv28699

Modified Files:
	openoffice.org.spec workspace.hb32bugs01.patch 
Removed Files:
	openoffice.org-3.1.0.ooo102473.ww8.fix-restartlinenumbering.patch 
	openoffice.org-3.1.0.ooo102490.sw.ww8.notab_before_nocontent.patch 
Log Message:
merge patches into accepted workspace


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1943
retrieving revision 1.1944
diff -u -p -r1.1943 -r1.1944
--- openoffice.org.spec	16 Jun 2009 11:47:35 -0000	1.1943
+++ openoffice.org.spec	16 Jun 2009 11:54:12 -0000	1.1944
@@ -143,14 +143,12 @@ Patch65: openoffice.org-3.1.0.ooo100469.
 Patch66: openoffice.org-3.1.0.ooo101566.svtools.nodefaultwmfwidth.patch
 Patch67: openoffice.org-3.1.0.ooo101567.i18npool.mailocaledata.patch
 Patch68: workspace.unifypaper01.patch
-Patch69: openoffice.org-3.1.0.ooo102473.ww8.fix-restartlinenumbering.patch
-Patch70: openoffice.org-3.1.0.ooo102490.sw.ww8.notab_before_nocontent.patch
-Patch71: openoffice.org-3.1.0.ooo102061.sc.cellanchoring.patch
-Patch72: openoffice.org-3.1.0.ooo102142.sd.resleak.patch
-Patch73: workspace.calc51.patch
-Patch74: openoffice.org-3.1.1-ooo102679.sdext.buildfix.patch
-Patch75: openoffice.org-2.0.0.ooo46270.svx.search-dialog.no-find-all-in-draw.patch
-Patch76: openoffice.org-3.1.1-rh505574.gccXXXX.patch
+Patch69: openoffice.org-3.1.0.ooo102061.sc.cellanchoring.patch
+Patch70: openoffice.org-3.1.0.ooo102142.sd.resleak.patch
+Patch71: workspace.calc51.patch
+Patch72: openoffice.org-3.1.1-ooo102679.sdext.buildfix.patch
+Patch73: openoffice.org-2.0.0.ooo46270.svx.search-dialog.no-find-all-in-draw.patch
+Patch74: openoffice.org-3.1.1-rh505574.gccXXXX.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1651,14 +1649,12 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch66 -p0 -b .ooo101566.svtools.nodefaultwmfwidth.patch
 %patch67 -p0 -b .ooo101567.i18npool.mailocaledata.patch
 %patch68 -p1
-%patch69 -p0 -b .ooo102473.ww8.fix-restartlinenumbering.patch
-%patch70 -p0 -b .ooo102490.sw.ww8.notab_before_nocontent.patch
-%patch71 -p0 -b .ooo102061.sc.cellanchoring.patch
-%patch72 -p0 -b .ooo102142.sd.resleak.patch
-%patch73 -p0 -b .workspace.calc51.patch
-%patch74 -p0 -b .ooo102679.sdext.buildfix.patch
-%patch75 -p0 -b .ooo46270.svx.search-dialog.no-find-all-in-draw.patch
-%patch76 -p0 -b .rh505574.gccXXXX.patch
+%patch69 -p0 -b .ooo102061.sc.cellanchoring.patch
+%patch70 -p0 -b .ooo102142.sd.resleak.patch
+%patch71 -p0 -b .workspace.calc51.patch
+%patch72 -p0 -b .ooo102679.sdext.buildfix.patch
+%patch73 -p0 -b .ooo46270.svx.search-dialog.no-find-all-in-draw.patch
+%patch74 -p0 -b .rh505574.gccXXXX.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`

workspace.hb32bugs01.patch:

Index: workspace.hb32bugs01.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.hb32bugs01.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- workspace.hb32bugs01.patch	16 Jun 2009 08:58:29 -0000	1.1
+++ workspace.hb32bugs01.patch	16 Jun 2009 11:54:12 -0000	1.2
@@ -26,3 +26,51 @@ diff -u -r1.35 rtfitem.cxx
                                  {
                                      nToken = GetNextToken();
                                      DBG_ASSERT( nToken == BRACERIGHT, 
+diff -ru sw.orig/source/filter/ww8/ww8par6.cxx sw/source/filter/ww8/ww8par6.cxx
+--- sw.orig/source/filter/ww8/ww8par6.cxx	2009-06-03 12:33:28.000000000 +0100
++++ sw/source/filter/ww8/ww8par6.cxx	2009-06-03 13:02:09.000000000 +0100
+@@ -778,6 +778,11 @@
+            )
+         {
+             SwFmtLineNumber aLN;
++            if (const SwFmtLineNumber* pLN
++                = (const SwFmtLineNumber*)GetFmtAttr(RES_LINENUMBER))
++            {
++                aLN.SetCountLines( pLN->IsCount() );
++            }
+             aLN.SetStartValue(1 + rSection.maSep.lnnMin);
+             NewAttr(aLN);
+             pCtrlStck->SetAttr(*pPaM->GetPoint(), RES_LINENUMBER);
+@@ -3878,6 +3883,12 @@
+         return;
+     }
+     SwFmtLineNumber aLN;
++    if (const SwFmtLineNumber* pLN
++        = (const SwFmtLineNumber*)GetFmtAttr(RES_LINENUMBER))
++    {
++        aLN.SetStartValue( pLN->GetStartValue() );
++    }
++
+     aLN.SetCountLines( pData && (0 == *pData) );
+     NewAttr( aLN );
+ }
+diff -ru ww8/wrtw8num.cxx ww8/wrtw8num.cxx
+--- sw.orig/source/filter/ww8/wrtw8num.cxx	2009-06-03 15:34:09.000000000 +0100
++++ sw/source/filter/ww8/wrtw8num.cxx	2009-06-04 09:32:06.000000000 +0100
+@@ -247,12 +247,14 @@
+                 {
+                     case SvxNumberFormat::LISTTAB:
+                     {
+-                        nFlags = 0;
++			// 0 (tab) unless there would be no content before the tab, in which case 2 (nothing)
++			nFlags = (SVX_NUM_NUMBER_NONE != rFmt.GetNumberingType()) ? 0 : 2;
+                     }
+                     break;
+                     case SvxNumberFormat::SPACE:
+                     {
+-                        nFlags = 1;
++			// 1 (space) unless there would be no content before the space in which case 2 (nothing)
++			nFlags = (SVX_NUM_NUMBER_NONE != rFmt.GetNumberingType()) ? 1 : 2;
+                     }
+                     break;
+                     case SvxNumberFormat::NOTHING:


--- openoffice.org-3.1.0.ooo102473.ww8.fix-restartlinenumbering.patch DELETED ---


--- openoffice.org-3.1.0.ooo102490.sw.ww8.notab_before_nocontent.patch DELETED ---