rpms/libreoffice
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix regression in SvGlobalName operator

Browse Source
This commit is contained in:
Caolán McNamara 2011-07-12 11:51:18 +01:00
parent d6875cceb6
commit 60cff80657
2 changed files with 45 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
0001-fix-regression-in-SvGlobalName-operator.patch Normal file
View File

@ -0,0 +1,39 @@
From a935029385159ee137418730363257599f67e5d6 Mon Sep 17 00:00:00 2001
From: Radek Doulik <rodo@novell.com>
Date: Mon, 11 Jul 2011 20:36:47 +0200
Subject: [PATCH] fix regression in SvGlobalName::operator <
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- it was comparing wrong parts and ommiting part of ID's, resulting
in wrong results and thus ::std::map didn't work well with default
less compare function of it's keys
- fixes fdo#32709
(cherry picked from commit 345dc7961bc142f167a1b8e5f43f4439e8234f06)
Signed-off-by: Caolán McNamara <caolanm@redhat.com>
---
tools/source/ref/globname.cxx | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/source/ref/globname.cxx b/tools/source/ref/globname.cxx
index 7a7f5c5..c78aeb5 100644
--- a/tools/source/ref/globname.cxx
+++ b/tools/source/ref/globname.cxx
@@ -208,10 +208,10 @@ BOOL SvGlobalName::operator < ( const SvGlobalName & rObj ) const
else if( Data2_a == Data2_b )
{
sal_uInt32 Data1_a;
- memcpy(&Data1_a, pImp->szData+4, sizeof(sal_uInt32));
+ memcpy(&Data1_a, pImp->szData, sizeof(sal_uInt32));
sal_uInt32 Data1_b;
- memcpy(&Data1_b, rObj.pImp->szData+4, sizeof(sal_uInt32));
+ memcpy(&Data1_b, rObj.pImp->szData, sizeof(sal_uInt32));
return Data1_a < Data1_b;
}
--
1.7.6

7
libreoffice.spec
View File

@ -27,7 +27,7 @@ Summary: Free Software Productivity Suite
Name: libreoffice Name: libreoffice
Epoch: 1 Epoch: 1
Version: 3.4.1.3 Version: 3.4.1.3
Release: 2%{?dist} Release: 3%{?dist}
License: LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and (CDDL or GPLv2) and Public Domain License: LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and (CDDL or GPLv2) and Public Domain
Group: Applications/Productivity Group: Applications/Productivity
URL: http://www.documentfoundation.org/develop URL: http://www.documentfoundation.org/develop
@ -115,6 +115,7 @@ Patch20: 0001-Related-rhbz-711087-band-aid.patch
Patch21: 0001-rhbz-667082-do-not-crash-importing-section-containin.patch Patch21: 0001-rhbz-667082-do-not-crash-importing-section-containin.patch
Patch22: 0001-bad-merge-fix-to-enable-extensions-to-build-again.patch Patch22: 0001-bad-merge-fix-to-enable-extensions-to-build-again.patch
Patch23: 0001-Related-rhbz-718976-crash-in-SwTxtSizeInfo-GetMultiC.patch Patch23: 0001-Related-rhbz-718976-crash-in-SwTxtSizeInfo-GetMultiC.patch
Patch24: 0001-fix-regression-in-SvGlobalName-operator.patch
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
%define instdir %{_libdir} %define instdir %{_libdir}
@ -740,6 +741,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
%patch21 -p1 -b .rhbz667082-do-not-crash-importing-section-containin.patch %patch21 -p1 -b .rhbz667082-do-not-crash-importing-section-containin.patch
%patch22 -p1 -b .bad-merge-fix-to-enable-extensions-to-build-again.patch %patch22 -p1 -b .bad-merge-fix-to-enable-extensions-to-build-again.patch
%patch23 -p1 -b .rhbz718976-crash-in-SwTxtSizeInfo-GetMultiC.patch %patch23 -p1 -b .rhbz718976-crash-in-SwTxtSizeInfo-GetMultiC.patch
%patch24 -p1 -b .fix-regression-in-SvGlobalName-operator.patch
# these are horribly incomplete--empty translations and copied english # these are horribly incomplete--empty translations and copied english
# strings with spattering of translated strings # strings with spattering of translated strings
@ -2024,6 +2026,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
%{basisinstdir}/program/kde-open-url %{basisinstdir}/program/kde-open-url
%changelog %changelog
* Tue Jul 12 2011 Caolán McNamara <caolanm@redhat.com> - 3.4.1.3-3
- fix regression in SvGlobalName operator
* Tue Jul 05 2011 Caolán McNamara <caolanm@redhat.com> - 3.4.1.3-2 * Tue Jul 05 2011 Caolán McNamara <caolanm@redhat.com> - 3.4.1.3-2
- Related: rhbz#718976 crash in SwTxtSizeInfo::GetMultiCreator - Related: rhbz#718976 crash in SwTxtSizeInfo::GetMultiCreator