rpms/openoffice.org/devel openoffice.org-3.1.0.ooo102473.ww8.fix-restartlinenumbering.patch, NONE, 1.1 openoffice.org.spec, 1.1918, 1.1919

[Caolan McNamara]

Author: caolanm

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

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

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

--- NEW FILE openoffice.org-3.1.0.ooo102473.ww8.fix-restartlinenumbering.patch ---
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);


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1918
retrieving revision 1.1919
diff -u -p -r1.1918 -r1.1919
--- openoffice.org.spec	29 May 2009 14:44:24 -0000	1.1918
+++ openoffice.org.spec	3 Jun 2009 12:11:26 -0000	1.1919
@@ -142,6 +142,7 @@ Patch66: openoffice.org-3.1.0.ooo100469.
 Patch67: openoffice.org-3.1.0.ooo101566.svtools.nodefaultwmfwidth.patch
 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
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1643,6 +1644,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch67 -p0 -b .ooo101566.svtools.nodefaultwmfwidth.patch
 %patch68 -p0 -b .ooo101567.i18npool.mailocaledata.patch
 %patch69 -p1 -b .workspace.unifypaper01.patch
+%patch70 -p0 -b .ooo102473.ww8.fix-restartlinenumbering.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4146,9 +4148,10 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Fri May 29 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-12.2
+* Wed 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
 
 * Tue May 26 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-12.1
 - start of 3.1.1 branch