diff options
| author | Kohei Yoshida <kohei.yoshida@suse.com> | 2011-12-07 10:38:25 -0500 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2011-12-09 23:49:29 +0100 |
| commit | 53757e9d714d6b3cde83d5b4c390e9e2739bfb2c (patch) | |
| tree | 88632bf210889806bc22ef05ac24dd444b635b5a | |
| parent | 0bde24644b5457aa193ecc84ba37169a967de1c6 (diff) | |
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.
Signed-off-by: Eike Rathke <erack@redhat.com>
| -rw-r--r-- | 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 1f6e68089..045e753fb 100644 --- a/sc/source/filter/excel/xistyle.cxx +++ b/sc/source/filter/excel/xistyle.cxx @@ -1833,15 +1833,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 ); } |