diff options
| -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 ); } |