Attachment #18419 for issue #35582

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

Lines 1322-1327 Link Here

(-)/home/sragavan/cvs/bk/ooo-build/build/OOO_1_1_2/sc/source/core/data/column.cxx (+7 lines)
1322	for (i = 0; i < nCount; i++)	1322	for (i = 0; i < nCount; i++)
1323	if ((pItems[i].nRow >= nRow1) && (pItems[i].nRow <= nRow2))	1323	if ((pItems[i].nRow >= nRow1) && (pItems[i].nRow <= nRow2))
1324	{	1324	{
		1325
		1326	if ( pDocument->RowFiltered( pItems[i].nRow , nTab))
		1327	continue;
1325	if (!nBlockCount)	1328	if (!nBlockCount)
1326	nStartIndex = i;	1329	nStartIndex = i;
1327	nEndIndex = i;	1330	nEndIndex = i;
Lines 1342-1348 Link Here
1342	{	1345	{
1343	rColumn.Resize( rColumn.GetCellCount() + nBlockCount );	1346	rColumn.Resize( rColumn.GetCellCount() + nBlockCount );
1344	for (i = nStartIndex; i <= nEndIndex; i++)	1347	for (i = nStartIndex; i <= nEndIndex; i++)
		1348	{
		1349	if ( pDocument->RowFiltered( pItems[i].nRow , nTab))
		1350	continue;
1345	rColumn.Append(pItems[i].nRow, pItems[i].pCell->Clone(rColumn.pDocument));	1351	rColumn.Append(pItems[i].nRow, pItems[i].pCell->Clone(rColumn.pDocument));
		1352	}
1346	}	1353	}
1347	}	1354	}
1348		1355

Lines 398-403 Link Here

(-)/home/sragavan/cvs/bk/ooo-build/build/OOO_1_1_2/sc/source/core/data/column3.cxx (+21 lines)
398	BOOL bSimple = ((nDelFlag & IDF_CONTENTS) == IDF_CONTENTS);	398	BOOL bSimple = ((nDelFlag & IDF_CONTENTS) == IDF_CONTENTS);
399	USHORT i;	399	USHORT i;
400		400
		401	/*
		402	*If we are deleting a range that has filtered column, let it not be simple
		403	*/
		404
		405	if (bSimple)
		406	{
		407	for (i = nStartIndex; i <= nEndIndex && bSimple; i++)
		408	if ( pDocument->RowFiltered(pItems[i].nRow, nTab))
		409	bSimple = FALSE;
		410	}
		411
401	// Notiz-Zeichenobjekte	412	// Notiz-Zeichenobjekte
402	if (nDelFlag & IDF_NOTE)	413	if (nDelFlag & IDF_NOTE)
403	{	414	{
Lines 452-457 Link Here
452	BOOL bDelete = FALSE;	463	BOOL bDelete = FALSE;
453	ScBaseCell* pOldCell = pItems[j].pCell;	464	ScBaseCell* pOldCell = pItems[j].pCell;
454	CellType eCellType = pOldCell->GetCellType();	465	CellType eCellType = pOldCell->GetCellType();
		466
		467	/*
		468	* If the rows are filtered continue instead deleting.
		469	*/
		470	if ( pDocument->RowFiltered( pItems[j].nRow, nTab))
		471	{
		472	++j;
		473	continue;
		474	}
		475
455	switch ( eCellType )	476	switch ( eCellType )
456	{	477	{
457	case CELLTYPE_VALUE:	478	case CELLTYPE_VALUE:

Lines 508-513 Link Here

(-)/home/sragavan/cvs/bk/ooo-build/build/OOO_1_1_2/sc/inc/document.hxx (+11 lines)
508	long GetWeightedCount() const; // Formeln und Edit staerker gewichtet	508	long GetWeightedCount() const; // Formeln und Edit staerker gewichtet
509	ULONG GetCodeCount() const; // RPN-Code in Formeln	509	ULONG GetCodeCount() const; // RPN-Code in Formeln
510	DECL_LINK( GetUserDefinedColor, USHORT * );	510	DECL_LINK( GetUserDefinedColor, USHORT * );
		511	BOOL RowFiltered( USHORT nRow, USHORT nTab ) const; // FillInfo
		512	BOOL ColFiltered( USHORT nCol, USHORT nTab ) const; // FillInfo
511	// Numberformatter	513	// Numberformatter
512		514
513	public:	515	public:
Lines 1698-1703 Link Here
1698	return ( pTab[nTab]->pRowFlags[nRow] & CR_HIDDEN ) != 0;	1700	return ( pTab[nTab]->pRowFlags[nRow] & CR_HIDDEN ) != 0;
1699	}	1701	}
1700		1702
		1703	inline BOOL ScDocument::ColFiltered( USHORT nCol, USHORT nTab ) const
		1704	{
		1705	return ( pTab[nTab]->pColFlags[nCol] & CR_FILTERED) != 0;
		1706	}
		1707
		1708	inline BOOL ScDocument::RowFiltered( USHORT nRow, USHORT nTab ) const
		1709	{
		1710	return ( pTab[nTab]->pRowFlags[nRow] & CR_FILTERED) != 0;
		1711	}
1701		1712
1702		1713
1703	#endif	1714	#endif

Return to issue 35582