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

Resolves: rhbz#761558 center-across-selection fix

Browse Source
f41
Caolán McNamara 13 years ago
parent e09904554e
commit 69cff11834
2 changed files with 44 additions and 1 deletions
Show Stats Download Patch File Download Diff File

38
0001-fdo-43308-Set-the-logic-straight-for-center-across-s.patch
Unescape View File

@ -0,0 +1,38 @@
From 17c7711948f8157478dc3abe9c52b8078fd8b5a9 Mon Sep 17 00:00:00 2001
From: Kohei Yoshida <kohei.yoshida@suse.com>
Date: Wed, 7 Dec 2011 10:38:25 -0500
Subject: [PATCH] fdo#43308: Set the logic straight for "center across
selection" setting.
Another unfortunate logic change introduced via DECLARE_LIST removal.
Reverting the logic to the original one.
---
sc/source/filter/excel/xistyle.cxx | 12 +++---------
1 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/sc/source/filter/excel/xistyle.cxx b/sc/source/filter/excel/xistyle.cxx
index d2d4467..2131095 100644
--- a/sc/source/filter/excel/xistyle.cxx
+++ b/sc/source/filter/excel/xistyle.cxx
@@ -1824,15 +1824,9 @@ void XclImpXFRangeBuffer::SetXF( const ScAddress& rScPos, sal_uInt16 nXFIndex, X
if( pXF && ((pXF->GetHorAlign() == EXC_XF_HOR_CENTER_AS) || (pXF->GetHorAlign() == EXC_XF_HOR_FILL)) )
{
// expand last merged range if this attribute is set repeatedly
- if ( !maMergeList.empty() )
- {
- ScRange* pRange = maMergeList.back();
- if( (pRange->aEnd.Row() == nScRow)
- && (pRange->aEnd.Col() + 1 == nScCol)
- && (eMode == xlXFModeBlank)
- )
- pRange->aEnd.IncCol();
- }
+ ScRange* pRange = maMergeList.empty() ? NULL : maMergeList.back();
+ if (pRange && (pRange->aEnd.Row() == nScRow) && (pRange->aEnd.Col() + 1 == nScCol) && (eMode == xlXFModeBlank))
+ pRange->aEnd.IncCol();
else if( eMode != xlXFModeBlank ) // do not merge empty cells
SetMerge( nScCol, nScRow );
}
--
1.7.6.4

7
libreoffice.spec
Unescape View File

@ -27,7 +27,7 @@ Summary: Free Software Productivity Suite
Name: libreoffice
Epoch: 1
Version: 3.4.4.2
Release: 6%{?dist}
Release: 7%{?dist}
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
URL: http://www.documentfoundation.org/develop
@ -150,6 +150,7 @@ Patch41: libreoffice-ppc64.patch
Patch42: 0001-Resolves-rhbz-751290-KDE-black-on-dark-tooltips.patch
Patch43: 0001-gtk3-fix-cairo-canvas-crash-for-non-X-or-svp-backend.patch
Patch44: 0001-Resolves-rhbz-759647-dispose-clears-mpPresTimer-befo.patch
Patch45: 0001-fdo-43308-Set-the-logic-straight-for-center-across-s.patch
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
%define instdir %{_libdir}
@ -840,6 +841,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
%patch42 -p1 -b .rhbz751290-KDE-black-on-dark-tooltips.patch
%patch43 -p1 -b .fix-cairo-canvas-crash-for-non-X-or-svp-backend.patch
%patch44 -p1 -b .rhbz759647-dispose-clears-mpPresTimer-befo.patch
%patch45 -p1 -b .fdo43308-Set-the-logic-straight-for-center-across-s.patch
# these are horribly incomplete--empty translations and copied english
# strings with spattering of translated strings
@ -2148,6 +2150,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
%endif
%changelog
* Fri Dec 09 2011 Caolán McNamara <caolanm@redhat.com> - 3.4.4.2-7
- Resolves: rhbz#761558 center-across-selection fix
* Wed Dec 07 2011 Caolán McNamara <caolanm@redhat.com> - 3.4.4.2-6
- Resolves: rhbz#759647 dispose clears mpPresTimer

Write Preview
Loading…
Cancel
Save