rpms/openoffice.org/devel openoffice.org-3.1.0.ooo102490.sw.ww8.notab_before_nocontent.patch, NONE, 1.1 openoffice.org-3.1.0.ooo102473.ww8.fix-restartlinenumbering.patch, 1.1, 1.2 openoffice.org.spec, 1.1919, 1.1920

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	openoffice.org-3.1.0.ooo102473.ww8.fix-restartlinenumbering.patch 
	openoffice.org.spec 
Added Files:
	openoffice.org-3.1.0.ooo102490.sw.ww8.notab_before_nocontent.patch 
Log Message:
add add openoffice.org-3.1.0.ooo102490.sw.ww8.notab_before_nocontent.patch

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

--- NEW FILE openoffice.org-3.1.0.ooo102490.sw.ww8.notab_before_nocontent.patch ---
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:

Index: openoffice.org-3.1.0.ooo102473.ww8.fix-restartlinenumbering.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.1.0.ooo102473.ww8.fix-restartlinenumbering.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openoffice.org-3.1.0.ooo102473.ww8.fix-restartlinenumbering.patch	3 Jun 2009 12:11:26 -0000	1.1
+++ openoffice.org-3.1.0.ooo102473.ww8.fix-restartlinenumbering.patch	4 Jun 2009 09:07:36 -0000	1.2
@@ -13,3 +13,16 @@ diff -ru sw.orig/source/filter/ww8/ww8pa
              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 );
+ }


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1919
retrieving revision 1.1920
diff -u -p -r1.1919 -r1.1920
--- openoffice.org.spec	3 Jun 2009 12:11:26 -0000	1.1919
+++ openoffice.org.spec	4 Jun 2009 09:07:36 -0000	1.1920
@@ -143,6 +143,7 @@ Patch67: openoffice.org-3.1.0.ooo101566.
 Patch68: openoffice.org-3.1.0.ooo101567.i18npool.mailocaledata.patch
 Patch69: workspace.unifypaper01.patch
 Patch70: openoffice.org-3.1.0.ooo102473.ww8.fix-restartlinenumbering.patch
+Patch71: openoffice.org-3.1.0.ooo102490.sw.ww8.notab_before_nocontent.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1645,6 +1646,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch68 -p0 -b .ooo101567.i18npool.mailocaledata.patch
 %patch69 -p1 -b .workspace.unifypaper01.patch
 %patch70 -p0 -b .ooo102473.ww8.fix-restartlinenumbering.patch
+%patch71 -p0 -b .ooo102490.sw.ww8.notab_before_nocontent.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4148,10 +4150,11 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Wed Jun 03 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-12.2
+* Thu Jun 03 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-12.2
 - Resolves: rhbz#503003 silence warnings on updates
 - Resolves: rhbz#451767 get default paper right for all territories
 - add openoffice.org-3.1.0.ooo102473.ww8.fix-restartlinenumbering.patch
+- add openoffice.org-3.1.0.ooo102490.sw.ww8.notab_before_nocontent.patch
 
 * Tue May 26 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-12.1
 - start of 3.1.1 branch