rpms/openoffice.org/F-10 openoffice.org-3.1.0.ooo99526.sw.mailmergeup.outofrange.patch, NONE, 1.1 openoffice.org.spec, 1.1719, 1.1720
Caolan McNamara
caolanm at fedoraproject.org
Mon Feb 23 12:29:00 UTC 2009
- Previous message: rpms/emacs-mew/devel .cvsignore, 1.3, 1.4 emacs-mew.spec, 1.2, 1.3 sources, 1.3, 1.4
- Next message: rpms/openoffice.org/devel openoffice.org-3.1.0.ooo99526.sw.mailmergeup.outofrange.patch, NONE, 1.1 openoffice.org.spec, 1.1820, 1.1821
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3265/F-10
Modified Files:
openoffice.org.spec
Added Files:
openoffice.org-3.1.0.ooo99526.sw.mailmergeup.outofrange.patch
Log Message:
Resolves: rhbz#486807 add openoffice.org-3.1.0.ooo99526.sw.mailmergeup.outofrange.patch
openoffice.org-3.1.0.ooo99526.sw.mailmergeup.outofrange.patch:
--- NEW FILE openoffice.org-3.1.0.ooo99526.sw.mailmergeup.outofrange.patch ---
Index: source/ui/dbui/mmlayoutpage.cxx
===================================================================
RCS file: /cvs/sw/sw/source/ui/dbui/mmlayoutpage.cxx,v
retrieving revision 1.21
diff -u -r1.21 mmlayoutpage.cxx
--- sw.orig/source/ui/dbui/mmlayoutpage.cxx 6 May 2008 12:55:06 -0000 1.21
+++ sw/source/ui/dbui/mmlayoutpage.cxx 23 Feb 2009 11:51:34 -0000
@@ -804,7 +804,8 @@
{
bool bDown = pButton == &m_aDownPB;
BOOL bMoved = m_pExampleWrtShell->MoveParagraph( bDown ? 1 : -1 );
- m_pWizard->GetConfigItem().MoveGreeting(bDown ? 1 : -1 );
+ if (bMoved || bDown)
+ m_pWizard->GetConfigItem().MoveGreeting(bDown ? 1 : -1 );
if(!bMoved && bDown)
{
//insert a new paragraph before the greeting line
Index: source/core/doc/docnum.cxx
===================================================================
RCS file: /cvs/sw/sw/source/core/doc/docnum.cxx,v
retrieving revision 1.77.22.1
diff -u -r1.77.22.1 docnum.cxx
--- sw.orig/source/core/doc/docnum.cxx 14 Aug 2008 19:44:28 -0000 1.77.22.1
+++ sw/source/core/doc/docnum.cxx 23 Feb 2009 11:51:26 -0000
@@ -2073,6 +2073,10 @@
}
else
{
+ //Impossible to move to negative index
+ if (Abs(nOffset) > nStIdx)
+ return FALSE;
+
nInEndIdx = nStIdx - 1;
nStIdx += nOffset;
}
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-10/openoffice.org.spec,v
retrieving revision 1.1719
retrieving revision 1.1720
diff -u -r1.1719 -r1.1720
--- openoffice.org.spec 19 Feb 2009 16:13:31 -0000 1.1719
+++ openoffice.org.spec 23 Feb 2009 12:28:29 -0000 1.1720
@@ -141,6 +141,7 @@
Patch68: openoffice.org-3.0.1.ooo99081.vcl.dont.release.before-reuse.patch
Patch69: workspace.xmergeclean.patch
Patch70: openoffice.org-3.1.0.ooo99427.sd.ensure-icons-state.patch
+Patch71: openoffice.org-3.1.0.ooo99526.sw.mailmergeup.outofrange.patch
%define instdir %{_libdir}
%define baseinstdir %{instdir}/openoffice.org
@@ -1406,6 +1407,7 @@
%patch68 -p1 -b .ooo99081.vcl.dont.release.before-reuse.patch
%patch69 -p1 -b .workspace.xmergeclean.patch
%patch70 -p1 -b .ooo99427.sd.ensure-icons-state.patch
+%patch71 -p1 -b .ooo99526.sw.mailmergeup.outofrange.patch
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3772,13 +3774,14 @@
unopkg list --shared > /dev/null 2>&1 || :
%changelog
-* Thu Feb 19 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.0.1-15.3
+* Mon Feb 23 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.0.1-15.3
- Resolves: rhbz#483223 openoffice.org-3.0.1.ooo98649.svtools.missingUI.patch
- Resolves: rhbz#483931 openoffice.org-3.0.1.ooo98885.sw.safeindex.patch
- Resolves: rhbz#484604 crash in glyph substitution
- add workspace.xmergeclean.patch to ensure xmerge functions with all
jaxp implementations
- Resolves: rhbz#486362 add openoffice.org-3.1.0.ooo99427.sd.ensure-icons-state.patch
+- Resolves: rhbz#486807 add openoffice.org-3.1.0.ooo99526.sw.mailmergeup.outofrange.patch
* Tue Jan 20 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.0.1-15.2
- Resolves: rhbz#479624 add
- Previous message: rpms/emacs-mew/devel .cvsignore, 1.3, 1.4 emacs-mew.spec, 1.2, 1.3 sources, 1.3, 1.4
- Next message: rpms/openoffice.org/devel openoffice.org-3.1.0.ooo99526.sw.mailmergeup.outofrange.patch, NONE, 1.1 openoffice.org.spec, 1.1820, 1.1821
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list