[Libreoffice-commits] .: sc/source
Kohei Yoshida
kohei at kemper.freedesktop.org
Wed Dec 7 07:41:52 PST 2011
sc/source/filter/excel/xistyle.cxx | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
New commits:
commit 17c7711948f8157478dc3abe9c52b8078fd8b5a9
Author: Kohei Yoshida <kohei.yoshida at suse.com>
Date: Wed Dec 7 10:38:25 2011 -0500
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.
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 );
}
More information about the Libreoffice-commits
mailing list