Kaydet (Commit) 55a169e5 authored tarafından Wang Lei's avatar Wang Lei

ReFix for #i119707 Cell border lost when saving and reopening the attached xls file.

Patch by: Zhang Lu
Review by: Wang Lei
üst e59f5937
...@@ -1933,8 +1933,9 @@ sal_Bool ScAttrArray::GetLastAttr( SCROW& rLastRow, SCROW nLastData ) const ...@@ -1933,8 +1933,9 @@ sal_Bool ScAttrArray::GetLastAttr( SCROW& rLastRow, SCROW nLastData ) const
while ( nStartPos > 0 && pData[nStartPos-1].nRow > nLastData && while ( nStartPos > 0 && pData[nStartPos-1].nRow > nLastData &&
!pData[nStartPos].pPattern->IsVisible() ) !pData[nStartPos].pPattern->IsVisible() )
--nStartPos; --nStartPos;
if(nStartPos == 0 && !pData[nStartPos].pPattern->IsVisible()) // add this condition for handle only default pattern in one colume
if(nStartPos >= 0 && pData[nStartPos].nRow > nLastData) rLastRow = nLastData;
else if(nStartPos >= 0 && pData[nStartPos].nRow > nLastData)
{ {
bFound = sal_True; bFound = sal_True;
rLastRow = pData[nStartPos].nRow; rLastRow = pData[nStartPos].nRow;
......
...@@ -2359,7 +2359,7 @@ XclExpCellTable::XclExpCellTable( const XclExpRoot& rRoot ) : ...@@ -2359,7 +2359,7 @@ XclExpCellTable::XclExpCellTable( const XclExpRoot& rRoot ) :
SCCOL nLastIterScCol = nMaxScCol; SCCOL nLastIterScCol = nMaxScCol;
SCROW nLastIterScRow = ulimit_cast< SCROW >( nLastUsedScRow + 128, nMaxScRow ); SCROW nLastIterScRow = ulimit_cast< SCROW >( nLastUsedScRow + 128, nMaxScRow );
// modified for 119707 by zhanglu // modified for 119707 by zhanglu
/*
SCCOL rEndColAtt = 0; SCCOL rEndColAtt = 0;
SCROW rEndRowAtt = 0; SCROW rEndRowAtt = 0;
rDoc.GetLastAttrCell( nScTab, rEndColAtt,rEndRowAtt ); // To get the real last cell's row number, which has visual data or attribute. rDoc.GetLastAttrCell( nScTab, rEndColAtt,rEndRowAtt ); // To get the real last cell's row number, which has visual data or attribute.
...@@ -2368,7 +2368,7 @@ XclExpCellTable::XclExpCellTable( const XclExpRoot& rRoot ) : ...@@ -2368,7 +2368,7 @@ XclExpCellTable::XclExpCellTable( const XclExpRoot& rRoot ) :
if (nLastIterScRow > nMaxScRow) if (nLastIterScRow > nMaxScRow)
nLastIterScRow = nMaxScRow; nLastIterScRow = nMaxScRow;
*/
// modified for 119707 end // modified for 119707 end
ScUsedAreaIterator aIt( &rDoc, nScTab, 0, 0, nLastIterScCol, nLastIterScRow ); ScUsedAreaIterator aIt( &rDoc, nScTab, 0, 0, nLastIterScCol, nLastIterScRow );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment