diff options
Diffstat (limited to 'sc/source/filter/excel/xistyle.cxx')
-rw-r--r-- | sc/source/filter/excel/xistyle.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sc/source/filter/excel/xistyle.cxx b/sc/source/filter/excel/xistyle.cxx index 1059f886d38b..75100c81b557 100644 --- a/sc/source/filter/excel/xistyle.cxx +++ b/sc/source/filter/excel/xistyle.cxx @@ -1905,11 +1905,11 @@ 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 - ScRange* pRange = maMergeList.empty() ? nullptr : maMergeList.back(); + ScRange* pRange = maMergeList.empty() ? nullptr : &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 - maMergeList.Append( ScRange( nScCol, nScRow, 0 ) ); + maMergeList.push_back( ScRange( nScCol, nScRow, 0 ) ); } } } @@ -1970,7 +1970,7 @@ void XclImpXFRangeBuffer::SetHyperlink( const XclRange& rXclRange, const OUStrin void XclImpXFRangeBuffer::SetMerge( SCCOL nScCol1, SCROW nScRow1, SCCOL nScCol2, SCROW nScRow2 ) { if( (nScCol1 < nScCol2) || (nScRow1 < nScRow2) ) - maMergeList.Append( ScRange( nScCol1, nScRow1, 0, nScCol2, nScRow2, 0 ) ); + maMergeList.push_back( ScRange( nScCol1, nScRow1, 0, nScCol2, nScRow2, 0 ) ); } void XclImpXFRangeBuffer::Finalize() @@ -2029,17 +2029,17 @@ void XclImpXFRangeBuffer::Finalize() // apply cell merging for ( size_t i = 0, nRange = maMergeList.size(); i < nRange; ++i ) { - const ScRange* pRange = maMergeList[ i ]; - const ScAddress& rStart = pRange->aStart; - const ScAddress& rEnd = pRange->aEnd; + const ScRange & rRange = maMergeList[ i ]; + const ScAddress& rStart = rRange.aStart; + const ScAddress& rEnd = rRange.aEnd; bool bMultiCol = rStart.Col() != rEnd.Col(); bool bMultiRow = rStart.Row() != rEnd.Row(); // set correct right border if( bMultiCol ) - SetBorderLine( *pRange, nScTab, SvxBoxItemLine::RIGHT ); + SetBorderLine( rRange, nScTab, SvxBoxItemLine::RIGHT ); // set correct lower border if( bMultiRow ) - SetBorderLine( *pRange, nScTab, SvxBoxItemLine::BOTTOM ); + SetBorderLine( rRange, nScTab, SvxBoxItemLine::BOTTOM ); // do merge if( bMultiCol || bMultiRow ) rDoc.getDoc().DoMerge( nScTab, rStart.Col(), rStart.Row(), rEnd.Col(), rEnd.Row() ); |