[libreoffice/f16] Resolves: rhbz#761558 center-across-selection fix

[Caolán McNamara]

commit 3b54f03ed1ce83c914f79661b127a45259e9c9d1
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Dec 9 12:11:53 2011 +0000

    Resolves: rhbz#761558 center-across-selection fix

 ...et-the-logic-straight-for-center-across-s.patch |   38 ++++++++++++++++++++
 libreoffice.spec                                   |    5 ++-
 2 files changed, 42 insertions(+), 1 deletions(-)
---
diff --git a/0001-fdo-43308-Set-the-logic-straight-for-center-across-s.patch b/0001-fdo-43308-Set-the-logic-straight-for-center-across-s.patch
new file mode 100644
index 0000000..ada6b94
--- /dev/null
+++ b/0001-fdo-43308-Set-the-logic-straight-for-center-across-s.patch
@@ -0,0 +1,38 @@
+From 17c7711948f8157478dc3abe9c52b8078fd8b5a9 Mon Sep 17 00:00:00 2001
+From: Kohei Yoshida <kohei.yoshida at 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
+
diff --git a/libreoffice.spec b/libreoffice.spec
index ff650bd..d32352e 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -128,6 +128,7 @@ Patch29: 0001-fix-horizontal-scrollbars-with-KDE-oxygen-style-bnc-.patch
 Patch30: 0001-Resolves-rhbz-751290-KDE-black-on-dark-tooltips.patch
 Patch31: 0001-gtk3-fix-cairo-canvas-crash-for-non-X-or-svp-backend.patch
 Patch32: 0001-Resolves-rhbz-759647-dispose-clears-mpPresTimer-befo.patch
+Patch33: 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}
@@ -804,6 +805,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
 %patch30 -p1 -b .rhbz751290-KDE-black-on-dark-tooltips.patch
 %patch31 -p1 -b .gtk3-fix-cairo-canvas-crash-for-non-X-or-svp-backend.patch
 %patch32 -p1 -b .rhbz759647-dispose-clears-mpPresTimer-befo.patch
+%patch33 -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
@@ -2115,8 +2117,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %endif
 
 %changelog
-* Wed Dec 07 2011 Caolán McNamara <caolanm at redhat.com>  3.4.4.2-5.UNBUILT
+* Fri Dec 09 2011 Caolán McNamara <caolanm at redhat.com> - 3.4.4.2-5
 - Resolves: rhbz#759647 dispose clears mpPresTimer
+- Resolves: rhbz#761558 center-across-selection fix
 
 * Wed Nov 30 2011 Caolán McNamara <caolanm at redhat.com> - 3.4.4.2-4
 - Resolves: rhbz#757653 fix headless crash with cairo canvas