Attachment #79667 for issue #119707

View | Details | Raw Unified | Return to issue 119707
Collapse All | Expand All

Lines 166-171 Link Here

(-)sc/inc/attarray.hxx (+4 lines)
166		166
167	sal_Bool GetFirstVisibleAttr( SCROW& rFirstRow ) const;	167	sal_Bool GetFirstVisibleAttr( SCROW& rFirstRow ) const;
168	sal_Bool GetLastVisibleAttr( SCROW& rLastRow, SCROW nLastData ) const;	168	sal_Bool GetLastVisibleAttr( SCROW& rLastRow, SCROW nLastData ) const;
		169	/*
		170	Get the last cell's row number , which have visual atribute or visual data in attribute list
		171	*/
		172	sal_Bool GetLastAttr( SCROW& rLastRow, SCROW nLastData ) const;
169	sal_Bool HasVisibleAttrIn( SCROW nStartRow, SCROW nEndRow ) const;	173	sal_Bool HasVisibleAttrIn( SCROW nStartRow, SCROW nEndRow ) const;
170	sal_Bool IsVisibleEqual( const ScAttrArray& rOther,	174	sal_Bool IsVisibleEqual( const ScAttrArray& rOther,
171	SCROW nStartRow, SCROW nEndRow ) const;	175	SCROW nStartRow, SCROW nEndRow ) const;

Lines 171-176 Link Here

(-)sc/inc/column.hxx (+4 lines)
171		171
172	sal_Bool GetFirstVisibleAttr( SCROW& rFirstRow ) const;	172	sal_Bool GetFirstVisibleAttr( SCROW& rFirstRow ) const;
173	sal_Bool GetLastVisibleAttr( SCROW& rLastRow ) const;	173	sal_Bool GetLastVisibleAttr( SCROW& rLastRow ) const;
		174	/*
		175	Get the last cell's row number , which have visual atribute or visual data in a column
		176	*/
		177	sal_Bool GetLastAttr( SCROW& rLastRow ) const;
174	sal_Bool HasVisibleAttrIn( SCROW nStartRow, SCROW nEndRow ) const;	178	sal_Bool HasVisibleAttrIn( SCROW nStartRow, SCROW nEndRow ) const;
175	sal_Bool IsVisibleAttrEqual( const ScColumn& rCol, SCROW nStartRow = 0,	179	sal_Bool IsVisibleAttrEqual( const ScColumn& rCol, SCROW nStartRow = 0,
176	SCROW nEndRow = MAXROW ) const;	180	SCROW nEndRow = MAXROW ) const;

Lines 956-961 Link Here

(-)sc/inc/document.hxx (+4 lines)
956	SCROW& rEndRow, sal_Bool bNotes = sal_True ) const;	956	SCROW& rEndRow, sal_Bool bNotes = sal_True ) const;
957	void InvalidateTableArea();	957	void InvalidateTableArea();
958		958
		959	/*
		960	Get the last cell's row number , which have visual atribute or visual data in specific table
		961	*/
		962	SC_DLLPUBLIC void GetLastAttrCell( SCTAB nTab, SCCOL& rEndCol, SCROW& rEndRow ) const;
959		963
960	SC_DLLPUBLIC sal_Bool GetDataStart( SCTAB nTab, SCCOL& rStartCol, SCROW& rStartRow ) const;	964	SC_DLLPUBLIC sal_Bool GetDataStart( SCTAB nTab, SCCOL& rStartCol, SCROW& rStartRow ) const;
961		965

Lines 418-423 Link Here

(-)sc/inc/table.hxx (+4 lines)
418	sal_Bool GetPrintAreaVer( SCCOL nStartCol, SCCOL nEndCol,	418	sal_Bool GetPrintAreaVer( SCCOL nStartCol, SCCOL nEndCol,
419	SCROW& rEndRow, sal_Bool bNotes ) const;	419	SCROW& rEndRow, sal_Bool bNotes ) const;
420		420
		421	/*
		422	Get the last cell's postion, which has visual attribute or data and has max row number among all columns.
		423	*/
		424	void GetLastAttrCell( SCCOL& rEndCol, SCROW& rEndRow ) const;
421	sal_Bool GetDataStart( SCCOL& rStartCol, SCROW& rStartRow ) const;	425	sal_Bool GetDataStart( SCCOL& rStartCol, SCROW& rStartRow ) const;
422		426
423	void ExtendPrintArea( OutputDevice* pDev,	427	void ExtendPrintArea( OutputDevice* pDev,




    return bFound;
}

sal_Bool ScAttrArray::GetLastAttr( SCROW& rLastRow, SCROW nLastData ) const
{
    if ( nLastData == MAXROW )
    {
        rLastRow = MAXROW;
        return sal_True;
    }
	sal_Bool bFound = sal_False;
    SCSIZE nEndPos = nCount - 1;
    SCSIZE nStartPos = nEndPos;
    while ( nStartPos > 0 && pData[nStartPos-1].nRow > nLastData &&
            !pData[nStartPos].pPattern->IsVisible() )
        --nStartPos;
	
	if(nStartPos >= 0 && pData[nStartPos].nRow > nLastData)
	{
		bFound = sal_True;
		rLastRow = pData[nStartPos].nRow;
	}
	else
		rLastRow = nLastData;
    return bFound;
}


sal_Bool ScAttrArray::HasVisibleAttrIn( SCROW nStartRow, SCROW nEndRow ) const
{
	SCSIZE nIndex;




        return sal_False;
}

sal_Bool ScColumn::GetLastAttr( SCROW& rLastRow ) const
{
    if ( pAttrArray )
    {
        // Row of last cell is needed, always including notes, 0 if none.
        SCROW nLastData = GetLastVisDataPos( sal_True );
        return pAttrArray->GetLastAttr( rLastRow, nLastData );
    }
    else
    {
        return sal_False;
    }
}
sal_Bool ScColumn::HasVisibleAttrIn( SCROW nStartRow, SCROW nEndRow ) const
{
	if (pAttrArray)

Lines 417-422 Link Here

(-)sc/source/core/data/documen4.cxx (+8 lines)
417	}	417	}
418	}	418	}
419		419
		420	void ScDocument::GetLastAttrCell( SCTAB nTab, SCCOL& rEndCol, SCROW& rEndRow ) const
		421	{
		422	if ( ValidTab( nTab ) && pTab[nTab] )
		423	{
		424	pTab[nTab]->GetLastAttrCell( rEndCol, rEndRow );
		425	}
		426	}
		427
420	sal_Int32 ScDocument::GetMaxStringLen( SCTAB nTab, SCCOL nCol,	428	sal_Int32 ScDocument::GetMaxStringLen( SCTAB nTab, SCCOL nCol,
421	SCROW nRowStart, SCROW nRowEnd, CharSet eCharSet ) const	429	SCROW nRowStart, SCROW nRowEnd, CharSet eCharSet ) const
422	{	430	{




	return bRet;
}

void ScTable::GetLastAttrCell( SCCOL& rEndCol, SCROW& rEndRow ) const
{
	SCCOL nMaxX = 0;
	SCROW nMaxY = 0;
	SCCOL i;
	for ( i = 0; i <= MAXCOL; i++ )
	{
		SCROW nLastRow;
		aCol[i].GetLastAttr( nLastRow );
		if ( nLastRow > nMaxY && nLastRow > 0 && nLastRow <= MAXROW )
		{
			nMaxY = nLastRow;
			nMaxX = i;
		}
	}
	rEndCol = nMaxX;
	rEndRow = nMaxY;
}
/*		vorher:

	sal_Bool bFound = sal_False;




    // range for cell iterator
    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.
	if( rEndRowAtt > nLastIterScRow )
		nLastIterScRow = rEndRowAtt;

	if (nLastIterScRow > nMaxScRow)
		nLastIterScRow = nMaxScRow;
	// modified for 119707 end
    ScUsedAreaIterator aIt( &rDoc, nScTab, 0, 0, nLastIterScCol, nLastIterScRow );

    // activate the correct segment and sub segment at the progress bar

Return to issue 119707

Lines 1920-1926 Link Here

(-)sc/source/core/data/attarray.cxx (+24 lines)
1920	return bFound;	1920	return bFound;
1921	}	1921	}
1922		1922
		1923	sal_Bool ScAttrArray::GetLastAttr( SCROW& rLastRow, SCROW nLastData ) const
		1924	{
		1925	if ( nLastData == MAXROW )
		1926	{
		1927	rLastRow = MAXROW;
		1928	return sal_True;
		1929	}
		1930	sal_Bool bFound = sal_False;
		1931	SCSIZE nEndPos = nCount - 1;
		1932	SCSIZE nStartPos = nEndPos;
		1933	while ( nStartPos > 0 && pData[nStartPos-1].nRow > nLastData &&
		1934	!pData[nStartPos].pPattern->IsVisible() )
		1935	--nStartPos;
		1936
		1937	if(nStartPos >= 0 && pData[nStartPos].nRow > nLastData)
		1938	{
		1939	bFound = sal_True;
		1940	rLastRow = pData[nStartPos].nRow;
		1941	}
		1942	else
		1943	rLastRow = nLastData;
		1944	return bFound;
		1945	}
1923		1946
		1947
1924	sal_Bool ScAttrArray::HasVisibleAttrIn( SCROW nStartRow, SCROW nEndRow ) const	1948	sal_Bool ScAttrArray::HasVisibleAttrIn( SCROW nStartRow, SCROW nEndRow ) const
1925	{	1949	{
1926	SCSIZE nIndex;	1950	SCSIZE nIndex;

Lines 1564-1569 Link Here

(-)sc/source/core/data/column2.cxx (+13 lines)
1564	return sal_False;	1564	return sal_False;
1565	}	1565	}
1566		1566
		1567	sal_Bool ScColumn::GetLastAttr( SCROW& rLastRow ) const
		1568	{
		1569	if ( pAttrArray )
		1570	{
		1571	// Row of last cell is needed, always including notes, 0 if none.
		1572	SCROW nLastData = GetLastVisDataPos( sal_True );
		1573	return pAttrArray->GetLastAttr( rLastRow, nLastData );
		1574	}
		1575	else
		1576	{
		1577	return sal_False;
		1578	}
		1579	}
1567	sal_Bool ScColumn::HasVisibleAttrIn( SCROW nStartRow, SCROW nEndRow ) const	1580	sal_Bool ScColumn::HasVisibleAttrIn( SCROW nStartRow, SCROW nEndRow ) const
1568	{	1581	{
1569	if (pAttrArray)	1582	if (pAttrArray)

Lines 432-437 Link Here

(-)sc/source/core/data/table1.cxx (+18 lines)
432	return bRet;	432	return bRet;
433	}	433	}
434		434
		435	void ScTable::GetLastAttrCell( SCCOL& rEndCol, SCROW& rEndRow ) const
		436	{
		437	SCCOL nMaxX = 0;
		438	SCROW nMaxY = 0;
		439	SCCOL i;
		440	for ( i = 0; i <= MAXCOL; i++ )
		441	{
		442	SCROW nLastRow;
		443	aCol[i].GetLastAttr( nLastRow );
		444	if ( nLastRow > nMaxY && nLastRow > 0 && nLastRow <= MAXROW )
		445	{
		446	nMaxY = nLastRow;
		447	nMaxX = i;
		448	}
		449	}
		450	rEndCol = nMaxX;
		451	rEndRow = nMaxY;
		452	}
435	/* vorher:	453	/* vorher:
436		454
437	sal_Bool bFound = sal_False;	455	sal_Bool bFound = sal_False;

Lines 2358-2363 Link Here

(-)sc/source/filter/excel/xetable.cxx (+10 lines)
2358	// range for cell iterator	2358	// range for cell iterator
2359	SCCOL nLastIterScCol = nMaxScCol;	2359	SCCOL nLastIterScCol = nMaxScCol;
2360	SCROW nLastIterScRow = ulimit_cast< SCROW >( nLastUsedScRow + 128, nMaxScRow );	2360	SCROW nLastIterScRow = ulimit_cast< SCROW >( nLastUsedScRow + 128, nMaxScRow );
		2361	// modified for 119707 by zhanglu
		2362	SCCOL rEndColAtt = 0;
		2363	SCROW rEndRowAtt = 0;
		2364	rDoc.GetLastAttrCell( nScTab, rEndColAtt,rEndRowAtt ); // To get the real last cell's row number, which has visual data or attribute.
		2365	if( rEndRowAtt > nLastIterScRow )
		2366	nLastIterScRow = rEndRowAtt;
		2367
		2368	if (nLastIterScRow > nMaxScRow)
		2369	nLastIterScRow = nMaxScRow;
		2370	// modified for 119707 end
2361	ScUsedAreaIterator aIt( &rDoc, nScTab, 0, 0, nLastIterScCol, nLastIterScRow );	2371	ScUsedAreaIterator aIt( &rDoc, nScTab, 0, 0, nLastIterScCol, nLastIterScRow );
2362		2372
2363	// activate the correct segment and sub segment at the progress bar	2373	// activate the correct segment and sub segment at the progress bar