svn commit: r1407366 - in /incubator/ooo/trunk/main/sc/source: core/data/attarray.cxx filter/excel/xetable.cxx

[leiw]

Author: leiw
Date: Fri Nov  9 07:08:19 2012
New Revision: 1407366

URL: http://svn.apache.org/viewvc?rev=1407366&view=rev
Log:
ReFix for #i119707 Cell border lost when saving and reopening the attached xls 
file. 

          Patch by: Zhang Lu
          Review by: Wang Lei

Modified:
    incubator/ooo/trunk/main/sc/source/core/data/attarray.cxx
    incubator/ooo/trunk/main/sc/source/filter/excel/xetable.cxx

Modified: incubator/ooo/trunk/main/sc/source/core/data/attarray.cxx
URL: 
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sc/source/core/data/attarray.cxx?rev=1407366&r1=1407365&r2=1407366&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sc/source/core/data/attarray.cxx (original)
+++ incubator/ooo/trunk/main/sc/source/core/data/attarray.cxx Fri Nov  9 
07:08:19 2012
@@ -1933,8 +1933,9 @@ sal_Bool ScAttrArray::GetLastAttr( SCROW
     while ( nStartPos > 0 && pData[nStartPos-1].nRow > nLastData &&
             !pData[nStartPos].pPattern->IsVisible() )
         --nStartPos;
-       
-       if(nStartPos >= 0 && pData[nStartPos].nRow > nLastData)
+       if(nStartPos == 0 && !pData[nStartPos].pPattern->IsVisible()) // add 
this condition for handle only default pattern in one colume
+               rLastRow = nLastData;
+       else if(nStartPos >= 0 && pData[nStartPos].nRow > nLastData)
        {
                bFound = sal_True;
                rLastRow = pData[nStartPos].nRow;

Modified: incubator/ooo/trunk/main/sc/source/filter/excel/xetable.cxx
URL: 
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sc/source/filter/excel/xetable.cxx?rev=1407366&r1=1407365&r2=1407366&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sc/source/filter/excel/xetable.cxx (original)
+++ incubator/ooo/trunk/main/sc/source/filter/excel/xetable.cxx Fri Nov  9 
07:08:19 2012
@@ -2359,7 +2359,7 @@ XclExpCellTable::XclExpCellTable( const 
     SCCOL nLastIterScCol = nMaxScCol;
     SCROW nLastIterScRow = ulimit_cast< SCROW >( nLastUsedScRow + 128, 
nMaxScRow );
        // modified for 119707 by zhanglu
-       /*
+       
        SCCOL rEndColAtt = 0;
        SCROW rEndRowAtt = 0;
        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 
 
        if (nLastIterScRow > nMaxScRow)
                nLastIterScRow = nMaxScRow;
-               */
+
        // modified for 119707 end
     ScUsedAreaIterator aIt( &rDoc, nScTab, 0, 0, nLastIterScCol, 
nLastIterScRow );