2000-09-18 23:16:46 +00:00
|
|
|
/*************************************************************************
|
|
|
|
*
|
|
|
|
* $RCSfile: table2.cxx,v $
|
|
|
|
*
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
* $Revision: 1.27 $
|
2000-09-18 23:16:46 +00:00
|
|
|
*
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
* last change: $Author: obo $ $Date: 2004-06-04 10:28:24 $
|
2000-09-18 23:16:46 +00:00
|
|
|
*
|
|
|
|
* The Contents of this file are made available subject to the terms of
|
|
|
|
* either of the following licenses
|
|
|
|
*
|
|
|
|
* - GNU Lesser General Public License Version 2.1
|
|
|
|
* - Sun Industry Standards Source License Version 1.1
|
|
|
|
*
|
|
|
|
* Sun Microsystems Inc., October, 2000
|
|
|
|
*
|
|
|
|
* GNU Lesser General Public License Version 2.1
|
|
|
|
* =============================================
|
|
|
|
* Copyright 2000 by Sun Microsystems, Inc.
|
|
|
|
* 901 San Antonio Road, Palo Alto, CA 94303, USA
|
|
|
|
*
|
|
|
|
* This library is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
|
|
* License version 2.1, as published by the Free Software Foundation.
|
|
|
|
*
|
|
|
|
* This library is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
* Lesser General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
|
|
* License along with this library; if not, write to the Free Software
|
|
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
|
|
|
|
* MA 02111-1307 USA
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* Sun Industry Standards Source License Version 1.1
|
|
|
|
* =================================================
|
|
|
|
* The contents of this file are subject to the Sun Industry Standards
|
|
|
|
* Source License Version 1.1 (the "License"); You may not use this file
|
|
|
|
* except in compliance with the License. You may obtain a copy of the
|
|
|
|
* License at http://www.openoffice.org/license.html.
|
|
|
|
*
|
|
|
|
* Software provided under this License is provided on an "AS IS" basis,
|
|
|
|
* WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
|
|
|
|
* WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
|
|
|
|
* MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
|
|
|
|
* See the License for the specific provisions governing your rights and
|
|
|
|
* obligations concerning the Software.
|
|
|
|
*
|
|
|
|
* The Initial Developer of the Original Code is: Sun Microsystems, Inc.
|
|
|
|
*
|
|
|
|
* Copyright: 2000 by Sun Microsystems, Inc.
|
|
|
|
*
|
|
|
|
* All Rights Reserved.
|
|
|
|
*
|
|
|
|
* Contributor(s): _______________________________________
|
|
|
|
*
|
|
|
|
*
|
|
|
|
************************************************************************/
|
|
|
|
|
|
|
|
#ifdef PCH
|
|
|
|
#include "core_pch.hxx"
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#pragma hdrstop
|
|
|
|
|
|
|
|
// INCLUDE ---------------------------------------------------------------
|
|
|
|
|
|
|
|
#include "scitems.hxx"
|
|
|
|
#include <svx/boxitem.hxx>
|
|
|
|
#include <tools/urlobj.hxx>
|
|
|
|
#include <svtools/poolcach.hxx>
|
|
|
|
#include <unotools/charclass.hxx>
|
|
|
|
#include <math.h>
|
2001-02-22 17:13:02 +00:00
|
|
|
#ifndef _SVTOOLS_PASSWORDHELPER_HXX
|
|
|
|
#include <svtools/PasswordHelper.hxx>
|
|
|
|
#endif
|
2001-07-11 14:22:13 +00:00
|
|
|
#ifndef _UNOTOOLS_TRANSLITERATIONWRAPPER_HXX
|
|
|
|
#include <unotools/transliterationwrapper.hxx>
|
|
|
|
#endif
|
2000-09-18 23:16:46 +00:00
|
|
|
|
|
|
|
#include "patattr.hxx"
|
|
|
|
#include "docpool.hxx"
|
|
|
|
#include "cell.hxx"
|
|
|
|
#include "document.hxx"
|
|
|
|
#include "drwlayer.hxx"
|
|
|
|
#include "olinetab.hxx"
|
|
|
|
#include "rechead.hxx"
|
|
|
|
#include "stlpool.hxx"
|
|
|
|
#include "attarray.hxx" // Iterator
|
|
|
|
#include "markdata.hxx"
|
|
|
|
#include "progress.hxx"
|
|
|
|
#include "dociter.hxx"
|
|
|
|
#include "conditio.hxx"
|
|
|
|
#include "chartlis.hxx"
|
|
|
|
#include "globstr.hrc"
|
|
|
|
|
|
|
|
// STATIC DATA -----------------------------------------------------------
|
|
|
|
|
|
|
|
void lcl_LoadRange( SvStream& rStream, ScRange** ppRange );
|
2003-12-01 08:50:42 +00:00
|
|
|
void lcl_SaveRange( SvStream& rStream, const ScRange* pRange );
|
2000-09-18 23:16:46 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
BOOL ScTable::SetOutlineTable( const ScOutlineTable* pNewOutline )
|
|
|
|
{
|
|
|
|
USHORT nOldSizeX = 0;
|
|
|
|
USHORT nOldSizeY = 0;
|
|
|
|
USHORT nNewSizeX = 0;
|
|
|
|
USHORT nNewSizeY = 0;
|
|
|
|
|
|
|
|
if (pOutlineTable)
|
|
|
|
{
|
|
|
|
nOldSizeX = pOutlineTable->GetColArray()->GetDepth();
|
|
|
|
nOldSizeY = pOutlineTable->GetRowArray()->GetDepth();
|
|
|
|
delete pOutlineTable;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (pNewOutline)
|
|
|
|
{
|
|
|
|
pOutlineTable = new ScOutlineTable( *pNewOutline );
|
|
|
|
nNewSizeX = pOutlineTable->GetColArray()->GetDepth();
|
|
|
|
nNewSizeY = pOutlineTable->GetRowArray()->GetDepth();
|
|
|
|
}
|
|
|
|
else
|
|
|
|
pOutlineTable = NULL;
|
|
|
|
|
|
|
|
return ( nNewSizeX != nOldSizeX || nNewSizeY != nOldSizeY ); // Groesse geaendert ?
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void ScTable::StartOutlineTable()
|
|
|
|
{
|
|
|
|
if (!pOutlineTable)
|
|
|
|
pOutlineTable = new ScOutlineTable;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
BOOL ScTable::TestInsertRow( SCCOL nStartCol, SCCOL nEndCol, SCSIZE nSize )
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
|
|
|
BOOL bTest = TRUE;
|
|
|
|
|
|
|
|
if ( nStartCol==0 && nEndCol==MAXCOL && pOutlineTable )
|
|
|
|
bTest = pOutlineTable->TestInsertRow(nSize);
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
for (SCCOL i=nStartCol; (i<=nEndCol) && bTest; i++)
|
2000-09-18 23:16:46 +00:00
|
|
|
bTest = aCol[i].TestInsertRow( nSize );
|
|
|
|
|
|
|
|
return bTest;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
void ScTable::InsertRow( SCCOL nStartCol, SCCOL nEndCol, SCROW nStartRow, SCSIZE nSize )
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
SCROW i;
|
2000-09-18 23:16:46 +00:00
|
|
|
nRecalcLvl++;
|
|
|
|
if (nStartCol==0 && nEndCol==MAXCOL)
|
|
|
|
{
|
|
|
|
if (pRowHeight && pRowFlags)
|
|
|
|
{
|
2002-11-27 20:35:19 +00:00
|
|
|
memmove( &pRowHeight[nStartRow+nSize], &pRowHeight[nStartRow],
|
|
|
|
(MAXROW - nStartRow + 1 - nSize) * sizeof(pRowHeight[0]) );
|
|
|
|
memmove( &pRowFlags[nStartRow+nSize], &pRowFlags[nStartRow],
|
|
|
|
(MAXROW - nStartRow + 1 - nSize) * sizeof(pRowFlags[0]) );
|
2000-09-18 23:16:46 +00:00
|
|
|
|
|
|
|
// #67451# copy row height from row above
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
SCROW nSourceRow = ( nStartRow > 0 ) ? ( nStartRow - 1 ) : 0;
|
2000-09-18 23:16:46 +00:00
|
|
|
BYTE nNewFlags = pRowFlags[nSourceRow] & CR_MANUALSIZE;
|
|
|
|
USHORT nNewHeight = pRowHeight[nSourceRow];
|
|
|
|
for (i=nStartRow; i<nStartRow+nSize; i++)
|
|
|
|
{
|
|
|
|
pRowHeight[i] = nNewHeight;
|
|
|
|
pRowFlags[i] = nNewFlags;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (pOutlineTable)
|
|
|
|
pOutlineTable->InsertRow( nStartRow, nSize );
|
|
|
|
}
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
for (SCCOL j=nStartCol; j<=nEndCol; j++)
|
|
|
|
aCol[j].InsertRow( nStartRow, nSize );
|
2000-09-18 23:16:46 +00:00
|
|
|
if( !--nRecalcLvl )
|
|
|
|
SetDrawPageSize();
|
|
|
|
}
|
|
|
|
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
void ScTable::DeleteRow( SCCOL nStartCol, SCCOL nEndCol, SCROW nStartRow, SCSIZE nSize,
|
2000-09-18 23:16:46 +00:00
|
|
|
BOOL* pUndoOutline )
|
|
|
|
{
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
SCROW i;
|
2000-09-18 23:16:46 +00:00
|
|
|
nRecalcLvl++;
|
|
|
|
if (nStartCol==0 && nEndCol==MAXCOL)
|
|
|
|
{
|
|
|
|
if (pRowHeight && pRowFlags)
|
2002-11-27 20:35:19 +00:00
|
|
|
{
|
|
|
|
memmove( &pRowHeight[nStartRow], &pRowHeight[nStartRow+nSize],
|
|
|
|
(MAXROW - nStartRow + 1 - nSize) * sizeof(pRowHeight[0]) );
|
|
|
|
memmove( &pRowFlags[nStartRow], &pRowFlags[nStartRow+nSize],
|
|
|
|
(MAXROW - nStartRow + 1 - nSize) * sizeof(pRowFlags[0]) );
|
|
|
|
}
|
2000-09-18 23:16:46 +00:00
|
|
|
if (pOutlineTable)
|
|
|
|
if (pOutlineTable->DeleteRow( nStartRow, nSize ))
|
|
|
|
if (pUndoOutline)
|
|
|
|
*pUndoOutline = TRUE;
|
|
|
|
}
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
for (SCCOL j=nStartCol; j<=nEndCol; j++)
|
|
|
|
aCol[j].DeleteRow( nStartRow, nSize );
|
2000-09-18 23:16:46 +00:00
|
|
|
if( !--nRecalcLvl )
|
|
|
|
SetDrawPageSize();
|
|
|
|
}
|
|
|
|
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
BOOL ScTable::TestInsertCol( SCROW nStartRow, SCROW nEndRow, SCSIZE nSize )
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
|
|
|
BOOL bTest = TRUE;
|
|
|
|
|
|
|
|
if ( nStartRow==0 && nEndRow==MAXROW && pOutlineTable )
|
|
|
|
bTest = pOutlineTable->TestInsertCol(nSize);
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
if ( nSize > static_cast<SCSIZE>(MAXCOL) )
|
2000-09-18 23:16:46 +00:00
|
|
|
bTest = FALSE;
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
for (SCCOL i=MAXCOL; (i+static_cast<SCCOL>(nSize)>MAXCOL) && bTest; i--)
|
2000-09-18 23:16:46 +00:00
|
|
|
bTest = aCol[i].TestInsertCol(nStartRow, nEndRow);
|
|
|
|
|
|
|
|
return bTest;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
void ScTable::InsertCol( SCCOL nStartCol, SCROW nStartRow, SCROW nEndRow, SCSIZE nSize )
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
|
|
|
nRecalcLvl++;
|
|
|
|
if (nStartRow==0 && nEndRow==MAXROW)
|
|
|
|
{
|
|
|
|
if (pColWidth && pColFlags)
|
2002-11-27 20:35:19 +00:00
|
|
|
{
|
|
|
|
memmove( &pColWidth[nStartCol+nSize], &pColWidth[nStartCol],
|
|
|
|
(MAXCOL - nStartCol + 1 - nSize) * sizeof(pColWidth[0]) );
|
|
|
|
memmove( &pColFlags[nStartCol+nSize], &pColFlags[nStartCol],
|
|
|
|
(MAXCOL - nStartCol + 1 - nSize) * sizeof(pColFlags[0]) );
|
|
|
|
}
|
2000-09-18 23:16:46 +00:00
|
|
|
if (pOutlineTable)
|
|
|
|
pOutlineTable->InsertCol( nStartCol, nSize );
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if ((nStartRow == 0) && (nEndRow == MAXROW))
|
|
|
|
{
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
for (SCSIZE i=0; i < nSize; i++)
|
|
|
|
for (SCCOL nCol = MAXCOL; nCol > nStartCol; nCol--)
|
2000-09-18 23:16:46 +00:00
|
|
|
aCol[nCol].SwapCol(aCol[nCol-1]);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
for (SCSIZE i=0; static_cast<SCCOL>(i+nSize)+nStartCol <= MAXCOL; i++)
|
2000-09-18 23:16:46 +00:00
|
|
|
aCol[MAXCOL - nSize - i].MoveTo(nStartRow, nEndRow, aCol[MAXCOL - i]);
|
|
|
|
}
|
|
|
|
|
2002-11-07 12:06:40 +00:00
|
|
|
if (nStartCol>0) // copy old attributes
|
|
|
|
{
|
|
|
|
USHORT nWhichArray[2];
|
|
|
|
nWhichArray[0] = ATTR_MERGE;
|
|
|
|
nWhichArray[1] = 0;
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
for (SCSIZE i=0; i<nSize; i++)
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
|
|
|
aCol[nStartCol-1].CopyToColumn( nStartRow, nEndRow, IDF_ATTRIB,
|
|
|
|
FALSE, aCol[nStartCol+i] );
|
|
|
|
aCol[nStartCol+i].RemoveFlags( nStartRow, nEndRow,
|
|
|
|
SC_MF_HOR | SC_MF_VER | SC_MF_AUTO );
|
2002-11-07 12:06:40 +00:00
|
|
|
aCol[nStartCol+i].ClearItems( nStartRow, nEndRow, nWhichArray );
|
2000-09-18 23:16:46 +00:00
|
|
|
}
|
2002-11-07 12:06:40 +00:00
|
|
|
}
|
2000-09-18 23:16:46 +00:00
|
|
|
if( !--nRecalcLvl )
|
|
|
|
SetDrawPageSize();
|
|
|
|
}
|
|
|
|
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
void ScTable::DeleteCol( SCCOL nStartCol, SCROW nStartRow, SCROW nEndRow, SCSIZE nSize,
|
2000-09-18 23:16:46 +00:00
|
|
|
BOOL* pUndoOutline )
|
|
|
|
{
|
|
|
|
nRecalcLvl++;
|
|
|
|
if (nStartRow==0 && nEndRow==MAXROW)
|
|
|
|
{
|
|
|
|
if (pColWidth && pColFlags)
|
2002-11-27 20:35:19 +00:00
|
|
|
{
|
|
|
|
memmove( &pColWidth[nStartCol], &pColWidth[nStartCol+nSize],
|
|
|
|
(MAXCOL - nStartCol + 1 - nSize) * sizeof(pColWidth[0]) );
|
|
|
|
memmove( &pColFlags[nStartCol], &pColFlags[nStartCol+nSize],
|
|
|
|
(MAXCOL - nStartCol + 1 - nSize) * sizeof(pColFlags[0]) );
|
|
|
|
}
|
2000-09-18 23:16:46 +00:00
|
|
|
if (pOutlineTable)
|
|
|
|
if (pOutlineTable->DeleteCol( nStartCol, nSize ))
|
|
|
|
if (pUndoOutline)
|
|
|
|
*pUndoOutline = TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
for (SCSIZE i = 0; i < nSize; i++)
|
2000-09-18 23:16:46 +00:00
|
|
|
aCol[nStartCol + i].DeleteArea(nStartRow, nEndRow, IDF_ALL);
|
|
|
|
|
|
|
|
if ((nStartRow == 0) && (nEndRow == MAXROW))
|
|
|
|
{
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
for (SCSIZE i=0; i < nSize; i++)
|
|
|
|
for (SCCOL nCol = nStartCol; nCol < MAXCOL; nCol++)
|
2000-09-18 23:16:46 +00:00
|
|
|
aCol[nCol].SwapCol(aCol[nCol+1]);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
for (SCSIZE i=0; static_cast<SCCOL>(i+nSize)+nStartCol <= MAXCOL; i++)
|
2000-09-18 23:16:46 +00:00
|
|
|
aCol[nStartCol + nSize + i].MoveTo(nStartRow, nEndRow, aCol[nStartCol + i]);
|
|
|
|
}
|
|
|
|
if( !--nRecalcLvl )
|
|
|
|
SetDrawPageSize();
|
|
|
|
}
|
|
|
|
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
void ScTable::DeleteArea(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, USHORT nDelFlag)
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
|
|
|
if (nCol2 > MAXCOL) nCol2 = MAXCOL;
|
|
|
|
if (nRow2 > MAXROW) nRow2 = MAXROW;
|
|
|
|
if (ValidColRow(nCol1, nRow1) && ValidColRow(nCol2, nRow2))
|
|
|
|
{
|
|
|
|
// nRecalcLvl++;
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
for (SCCOL i = nCol1; i <= nCol2; i++)
|
2000-09-18 23:16:46 +00:00
|
|
|
aCol[i].DeleteArea(nRow1, nRow2, nDelFlag);
|
|
|
|
|
|
|
|
//
|
|
|
|
// Zellschutz auf geschuetzter Tabelle nicht setzen
|
|
|
|
//
|
|
|
|
|
|
|
|
if ( bProtected && (nDelFlag & IDF_ATTRIB) )
|
|
|
|
{
|
|
|
|
ScPatternAttr aPattern(pDocument->GetPool());
|
|
|
|
aPattern.GetItemSet().Put( ScProtectionAttr( FALSE ) );
|
|
|
|
ApplyPatternArea( nCol1, nRow1, nCol2, nRow2, aPattern );
|
|
|
|
}
|
|
|
|
|
|
|
|
/* if( !--nRecalcLvl )
|
|
|
|
SetDrawPageSize();
|
|
|
|
*/
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void ScTable::DeleteSelection( USHORT nDelFlag, const ScMarkData& rMark )
|
|
|
|
{
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
for (SCCOL i=0; i<=MAXCOL; i++)
|
2000-09-18 23:16:46 +00:00
|
|
|
aCol[i].DeleteSelection( nDelFlag, rMark );
|
|
|
|
|
|
|
|
//
|
|
|
|
// Zellschutz auf geschuetzter Tabelle nicht setzen
|
|
|
|
//
|
|
|
|
|
|
|
|
if ( bProtected && (nDelFlag & IDF_ATTRIB) )
|
|
|
|
{
|
|
|
|
ScDocumentPool* pPool = pDocument->GetPool();
|
|
|
|
SfxItemSet aSet( *pPool, ATTR_PATTERN_START, ATTR_PATTERN_END );
|
|
|
|
aSet.Put( ScProtectionAttr( FALSE ) );
|
|
|
|
SfxItemPoolCache aCache( pPool, &aSet );
|
|
|
|
ApplySelectionCache( &aCache, rMark );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// pTable = Clipboard
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
void ScTable::CopyToClip(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
|
2000-09-18 23:16:46 +00:00
|
|
|
ScTable* pTable, BOOL bKeepScenarioFlags)
|
|
|
|
{
|
|
|
|
if (ValidColRow(nCol1, nRow1) && ValidColRow(nCol2, nRow2))
|
|
|
|
{
|
|
|
|
// Inhalte kopieren
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
SCCOL i;
|
2000-09-18 23:16:46 +00:00
|
|
|
|
2003-12-01 16:50:34 +00:00
|
|
|
for ( i = nCol1; i <= nCol2; i++)
|
2000-09-18 23:16:46 +00:00
|
|
|
aCol[i].CopyToClip(nRow1, nRow2, pTable->aCol[i], bKeepScenarioFlags);
|
|
|
|
|
2001-10-18 19:31:07 +00:00
|
|
|
// copy widths/heights, and only "hidden", "filtered" and "manual" flags
|
2002-07-15 13:34:55 +00:00
|
|
|
// also for all preceding columns/rows, to have valid positions for drawing objects
|
2000-09-18 23:16:46 +00:00
|
|
|
|
|
|
|
if (pColFlags && pTable->pColFlags && pColWidth && pTable->pColWidth)
|
2002-07-15 13:34:55 +00:00
|
|
|
for (i=0; i<=nCol2; i++)
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
|
|
|
pTable->pColFlags[i] = pColFlags[i] & CR_HIDDEN;
|
|
|
|
pTable->pColWidth[i] = pColWidth[i];
|
|
|
|
}
|
|
|
|
|
|
|
|
if (pRowFlags && pTable->pRowFlags && pRowHeight && pTable->pRowHeight)
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
for (SCROW j=0; j<=nRow2; j++)
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
pTable->pRowFlags[j] = pRowFlags[j] & (CR_HIDDEN | CR_FILTERED | CR_MANUALSIZE);
|
|
|
|
pTable->pRowHeight[j] = pRowHeight[j];
|
2000-09-18 23:16:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// ggf. Formeln durch Werte ersetzen
|
|
|
|
|
|
|
|
if (bProtected)
|
|
|
|
for (i = nCol1; i <= nCol2; i++)
|
|
|
|
pTable->aCol[i].RemoveProtected(nRow1, nRow2);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
void ScTable::CopyFromClip(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
|
|
|
|
SCsCOL nDx, SCsROW nDy, USHORT nInsFlag,
|
2002-10-10 15:56:51 +00:00
|
|
|
BOOL bAsLink, BOOL bSkipAttrForEmpty, ScTable* pTable)
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
SCCOL i;
|
2003-12-01 16:50:34 +00:00
|
|
|
|
2000-09-18 23:16:46 +00:00
|
|
|
if (nCol2 > MAXCOL) nCol2 = MAXCOL;
|
|
|
|
if (nRow2 > MAXROW) nRow2 = MAXROW;
|
|
|
|
if (ValidColRow(nCol1, nRow1) && ValidColRow(nCol2, nRow2))
|
|
|
|
{
|
|
|
|
nRecalcLvl++;
|
2003-12-01 16:50:34 +00:00
|
|
|
for ( i = nCol1; i <= nCol2; i++)
|
2002-10-10 15:56:51 +00:00
|
|
|
aCol[i].CopyFromClip(nRow1, nRow2, nDy, nInsFlag, bAsLink, bSkipAttrForEmpty, pTable->aCol[i - nDx]);
|
2000-09-18 23:16:46 +00:00
|
|
|
|
|
|
|
if ((nInsFlag & IDF_ATTRIB) != 0)
|
|
|
|
{
|
|
|
|
if (nRow1==0 && nRow2==MAXROW && pColWidth && pTable->pColWidth)
|
|
|
|
for (i=nCol1; i<=nCol2; i++)
|
|
|
|
pColWidth[i] = pTable->pColWidth[i-nDx];
|
|
|
|
|
|
|
|
if (nCol1==0 && nCol2==MAXCOL && pRowHeight && pTable->pRowHeight &&
|
|
|
|
pRowFlags && pTable->pRowFlags)
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
for (SCROW j=nRow1; j<=nRow2; j++)
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
pRowHeight[j] = pTable->pRowHeight[j-nDy];
|
2000-09-18 23:16:46 +00:00
|
|
|
// CR_MANUALSIZE Bit muss mitkopiert werden, sonst macht pRowHeight keinen Sinn
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
if ( pTable->pRowFlags[j-nDy] & CR_MANUALSIZE )
|
|
|
|
pRowFlags[j] |= CR_MANUALSIZE;
|
2000-09-18 23:16:46 +00:00
|
|
|
else
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
pRowFlags[j] &= ~CR_MANUALSIZE;
|
2000-09-18 23:16:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
//
|
|
|
|
// Zellschutz auf geschuetzter Tabelle nicht setzen
|
|
|
|
//
|
|
|
|
|
|
|
|
if ( bProtected && (nInsFlag & IDF_ATTRIB) )
|
|
|
|
{
|
|
|
|
ScPatternAttr aPattern(pDocument->GetPool());
|
|
|
|
aPattern.GetItemSet().Put( ScProtectionAttr( FALSE ) );
|
|
|
|
ApplyPatternArea( nCol1, nRow1, nCol2, nRow2, aPattern );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if( !--nRecalcLvl )
|
|
|
|
SetDrawPageSize();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
void ScTable::MixData( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
|
2000-09-18 23:16:46 +00:00
|
|
|
USHORT nFunction, BOOL bSkipEmpty, ScTable* pSrcTab )
|
|
|
|
{
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
for (SCCOL i=nCol1; i<=nCol2; i++)
|
2000-09-18 23:16:46 +00:00
|
|
|
aCol[i].MixData( nRow1, nRow2, nFunction, bSkipEmpty, pSrcTab->aCol[i] );
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// Markierung von diesem Dokument
|
|
|
|
void ScTable::MixMarked( const ScMarkData& rMark, USHORT nFunction,
|
|
|
|
BOOL bSkipEmpty, ScTable* pSrcTab )
|
|
|
|
{
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
for (SCCOL i=0; i<=MAXCOL; i++)
|
2000-09-18 23:16:46 +00:00
|
|
|
aCol[i].MixMarked( rMark, nFunction, bSkipEmpty, pSrcTab->aCol[i] );
|
|
|
|
}
|
|
|
|
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
void ScTable::TransposeClip( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
|
2000-09-18 23:16:46 +00:00
|
|
|
ScTable* pTransClip, USHORT nFlags, BOOL bAsLink )
|
|
|
|
{
|
|
|
|
BOOL bWasCut = pDocument->IsCutMode();
|
|
|
|
|
|
|
|
ScDocument* pDestDoc = pTransClip->pDocument;
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
for (SCCOL nCol=nCol1; nCol<=nCol2; nCol++)
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
SCROW nRow;
|
2000-09-18 23:16:46 +00:00
|
|
|
ScBaseCell* pCell;
|
|
|
|
|
|
|
|
if ( bAsLink && nFlags == IDF_ALL )
|
|
|
|
{
|
|
|
|
// #68989# with IDF_ALL, also create links (formulas) for empty cells
|
|
|
|
|
|
|
|
for ( nRow=nRow1; nRow<=nRow2; nRow++ )
|
|
|
|
{
|
|
|
|
// create simple formula, as in ScColumn::CreateRefCell
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
ScAddress aDestPos( static_cast<SCCOL>(nRow-nRow1), static_cast<SCROW>(nCol-nCol1), pTransClip->nTab );
|
2000-09-18 23:16:46 +00:00
|
|
|
SingleRefData aRef;
|
|
|
|
aRef.nCol = nCol;
|
|
|
|
aRef.nRow = nRow;
|
|
|
|
aRef.nTab = nTab;
|
|
|
|
aRef.InitFlags(); // -> all absolute
|
|
|
|
aRef.SetFlag3D(TRUE);
|
|
|
|
aRef.CalcRelFromAbs( aDestPos );
|
|
|
|
ScTokenArray aArr;
|
|
|
|
aArr.AddSingleReference( aRef );
|
|
|
|
|
|
|
|
ScBaseCell* pNew = new ScFormulaCell( pDestDoc, aDestPos, &aArr );
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
pTransClip->PutCell( static_cast<SCCOL>(nRow-nRow1), static_cast<SCROW>(nCol-nCol1), pNew );
|
2000-09-18 23:16:46 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
ScColumnIterator aIter( &aCol[nCol], nRow1, nRow2 );
|
|
|
|
while (aIter.Next( nRow, pCell ))
|
|
|
|
{
|
|
|
|
ScBaseCell* pNew;
|
|
|
|
if ( bAsLink ) // Referenz erzeugen ?
|
|
|
|
{
|
|
|
|
pNew = aCol[nCol].CreateRefCell( pDestDoc,
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
ScAddress( static_cast<SCCOL>(nRow-nRow1), static_cast<SCROW>(nCol-nCol1), pTransClip->nTab ),
|
2000-09-18 23:16:46 +00:00
|
|
|
aIter.GetIndex(), nFlags );
|
|
|
|
}
|
|
|
|
else // kopieren
|
|
|
|
{
|
|
|
|
if (pCell->GetCellType() == CELLTYPE_FORMULA)
|
|
|
|
{
|
|
|
|
pNew = ((ScFormulaCell*)pCell)->Clone( pDestDoc,
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
ScAddress( static_cast<SCCOL>(nRow-nRow1),
|
|
|
|
static_cast<SCROW>(nCol-nCol1), nTab));
|
2000-09-18 23:16:46 +00:00
|
|
|
|
|
|
|
// Referenzen drehen
|
|
|
|
// bei Cut werden Referenzen spaeter per UpdateTranspose angepasst
|
|
|
|
|
|
|
|
if (!bWasCut)
|
|
|
|
((ScFormulaCell*)pNew)->TransposeReference();
|
|
|
|
}
|
|
|
|
else
|
|
|
|
pNew = pCell->Clone( pDestDoc );
|
|
|
|
}
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
pTransClip->PutCell( static_cast<SCCOL>(nRow-nRow1), static_cast<SCROW>(nCol-nCol1), pNew );
|
2000-09-18 23:16:46 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Attribute
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
SCROW nAttrRow1;
|
|
|
|
SCROW nAttrRow2;
|
2000-09-18 23:16:46 +00:00
|
|
|
const ScPatternAttr* pPattern;
|
|
|
|
ScAttrIterator* pAttrIter = aCol[nCol].CreateAttrIterator( nRow1, nRow2 );
|
|
|
|
while ( (pPattern = pAttrIter->Next( nAttrRow1, nAttrRow2 )) != 0 )
|
|
|
|
{
|
|
|
|
if ( !IsDefaultItem( pPattern ) )
|
|
|
|
{
|
2001-02-07 10:33:16 +00:00
|
|
|
const SfxItemSet& rSet = pPattern->GetItemSet();
|
|
|
|
if ( rSet.GetItemState( ATTR_MERGE, FALSE ) == SFX_ITEM_DEFAULT &&
|
|
|
|
rSet.GetItemState( ATTR_MERGE_FLAG, FALSE ) == SFX_ITEM_DEFAULT &&
|
|
|
|
rSet.GetItemState( ATTR_BORDER, FALSE ) == SFX_ITEM_DEFAULT )
|
|
|
|
{
|
|
|
|
// no borders or merge items involved - use pattern as-is
|
|
|
|
for (nRow = nAttrRow1; nRow<=nAttrRow2; nRow++)
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
pTransClip->SetPattern( static_cast<SCCOL>(nRow-nRow1), static_cast<SCROW>(nCol-nCol1), *pPattern, TRUE );
|
2001-02-07 10:33:16 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// transpose borders and merge values, remove merge flags (refreshed after pasting)
|
|
|
|
ScPatternAttr aNewPattern( *pPattern );
|
|
|
|
SfxItemSet& rNewSet = aNewPattern.GetItemSet();
|
|
|
|
|
|
|
|
const SvxBoxItem& rOldBox = (const SvxBoxItem&)rSet.Get(ATTR_BORDER);
|
|
|
|
if ( rOldBox.GetTop() || rOldBox.GetBottom() || rOldBox.GetLeft() || rOldBox.GetRight() )
|
|
|
|
{
|
|
|
|
SvxBoxItem aNew( ATTR_BORDER );
|
|
|
|
aNew.SetLine( rOldBox.GetLine( BOX_LINE_TOP ), BOX_LINE_LEFT );
|
|
|
|
aNew.SetLine( rOldBox.GetLine( BOX_LINE_LEFT ), BOX_LINE_TOP );
|
|
|
|
aNew.SetLine( rOldBox.GetLine( BOX_LINE_BOTTOM ), BOX_LINE_RIGHT );
|
|
|
|
aNew.SetLine( rOldBox.GetLine( BOX_LINE_RIGHT ), BOX_LINE_BOTTOM );
|
|
|
|
aNew.SetDistance( rOldBox.GetDistance( BOX_LINE_TOP ), BOX_LINE_LEFT );
|
|
|
|
aNew.SetDistance( rOldBox.GetDistance( BOX_LINE_LEFT ), BOX_LINE_TOP );
|
|
|
|
aNew.SetDistance( rOldBox.GetDistance( BOX_LINE_BOTTOM ), BOX_LINE_RIGHT );
|
|
|
|
aNew.SetDistance( rOldBox.GetDistance( BOX_LINE_RIGHT ), BOX_LINE_BOTTOM );
|
|
|
|
rNewSet.Put( aNew );
|
|
|
|
}
|
|
|
|
|
|
|
|
const ScMergeAttr& rOldMerge = (const ScMergeAttr&)rSet.Get(ATTR_MERGE);
|
|
|
|
if (rOldMerge.IsMerged())
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
rNewSet.Put( ScMergeAttr( Min(
|
|
|
|
static_cast<SCsCOL>(rOldMerge.GetRowMerge()),
|
|
|
|
static_cast<SCsCOL>(MAXCOL+1 - (nAttrRow2-nRow1))),
|
|
|
|
Min(
|
|
|
|
static_cast<SCsROW>(rOldMerge.GetColMerge()),
|
|
|
|
static_cast<SCsROW>(MAXROW+1 - (nCol-nCol1)))));
|
2001-02-07 10:33:16 +00:00
|
|
|
const ScMergeFlagAttr& rOldFlag = (const ScMergeFlagAttr&)rSet.Get(ATTR_MERGE_FLAG);
|
|
|
|
if (rOldFlag.IsOverlapped())
|
|
|
|
{
|
|
|
|
INT16 nNewFlags = rOldFlag.GetValue() & ~( SC_MF_HOR | SC_MF_VER );
|
|
|
|
if ( nNewFlags )
|
|
|
|
rNewSet.Put( ScMergeFlagAttr( nNewFlags ) );
|
|
|
|
else
|
|
|
|
rNewSet.ClearItem( ATTR_MERGE_FLAG );
|
|
|
|
}
|
|
|
|
|
|
|
|
for (nRow = nAttrRow1; nRow<=nAttrRow2; nRow++)
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
pTransClip->SetPattern( static_cast<SCCOL>(nRow-nRow1),
|
|
|
|
static_cast<SCROW>(nCol-nCol1), aNewPattern, TRUE);
|
2001-02-07 10:33:16 +00:00
|
|
|
}
|
2000-09-18 23:16:46 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
delete pAttrIter;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void ScTable::StartAllListeners()
|
|
|
|
{
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
for (SCCOL i=0; i<=MAXCOL; i++)
|
2000-09-18 23:16:46 +00:00
|
|
|
aCol[i].StartAllListeners();
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2001-10-18 08:03:25 +00:00
|
|
|
void ScTable::StartNameListeners( BOOL bOnlyRelNames )
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
for (SCCOL i=0; i<=MAXCOL; i++)
|
2001-10-18 08:03:25 +00:00
|
|
|
aCol[i].StartNameListeners( bOnlyRelNames );
|
2000-09-18 23:16:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
void ScTable::BroadcastInArea( SCCOL nCol1, SCROW nRow1,
|
|
|
|
SCCOL nCol2, SCROW nRow2 )
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
|
|
|
if (nCol2 > MAXCOL) nCol2 = MAXCOL;
|
|
|
|
if (nRow2 > MAXROW) nRow2 = MAXROW;
|
|
|
|
if (ValidColRow(nCol1, nRow1) && ValidColRow(nCol2, nRow2))
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
for (SCCOL i = nCol1; i <= nCol2; i++)
|
2000-09-18 23:16:46 +00:00
|
|
|
aCol[i].BroadcastInArea( nRow1, nRow2 );
|
|
|
|
}
|
|
|
|
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
void ScTable::StartListeningInArea( SCCOL nCol1, SCROW nRow1,
|
|
|
|
SCCOL nCol2, SCROW nRow2 )
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
|
|
|
if (nCol2 > MAXCOL) nCol2 = MAXCOL;
|
|
|
|
if (nRow2 > MAXROW) nRow2 = MAXROW;
|
|
|
|
if (ValidColRow(nCol1, nRow1) && ValidColRow(nCol2, nRow2))
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
for (SCCOL i = nCol1; i <= nCol2; i++)
|
2000-09-18 23:16:46 +00:00
|
|
|
aCol[i].StartListeningInArea( nRow1, nRow2 );
|
|
|
|
}
|
|
|
|
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
void ScTable::CopyToTable(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
|
2000-09-18 23:16:46 +00:00
|
|
|
USHORT nFlags, BOOL bMarked, ScTable* pDestTab,
|
|
|
|
const ScMarkData* pMarkData,
|
|
|
|
BOOL bAsLink, BOOL bColRowFlags)
|
|
|
|
{
|
|
|
|
if (ValidColRow(nCol1, nRow1) && ValidColRow(nCol2, nRow2))
|
|
|
|
{
|
|
|
|
if (nFlags)
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
for (SCCOL i = nCol1; i <= nCol2; i++)
|
2000-09-18 23:16:46 +00:00
|
|
|
aCol[i].CopyToColumn(nRow1, nRow2, nFlags, bMarked,
|
|
|
|
pDestTab->aCol[i], pMarkData, bAsLink);
|
|
|
|
|
|
|
|
if (bColRowFlags) // Spaltenbreiten/Zeilenhoehen/Flags
|
|
|
|
{
|
|
|
|
// Charts muessen beim Ein-/Ausblenden angepasst werden
|
|
|
|
ScChartListenerCollection* pCharts = pDestTab->pDocument->GetChartListenerCollection();
|
|
|
|
if ( pCharts && !pCharts->GetCount() )
|
|
|
|
pCharts = NULL;
|
|
|
|
|
|
|
|
if (nRow1==0 && nRow2==MAXROW && pColWidth && pDestTab->pColWidth)
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
for (SCCOL i=nCol1; i<=nCol2; i++)
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
|
|
|
BOOL bChange = pCharts &&
|
|
|
|
( pDestTab->pColFlags[i] & CR_HIDDEN ) != ( pColFlags[i] & CR_HIDDEN );
|
|
|
|
pDestTab->pColWidth[i] = pColWidth[i];
|
|
|
|
pDestTab->pColFlags[i] = pColFlags[i];
|
|
|
|
//! Aenderungen zusammenfassen?
|
|
|
|
if (bChange)
|
|
|
|
pCharts->SetRangeDirty(ScRange( i, 0, nTab, i, MAXROW, nTab ));
|
|
|
|
}
|
|
|
|
|
|
|
|
if (nCol1==0 && nCol2==MAXCOL && pRowHeight && pDestTab->pRowHeight)
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
for (SCROW i=nRow1; i<=nRow2; i++)
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
|
|
|
BOOL bChange = pCharts &&
|
|
|
|
( pDestTab->pRowFlags[i] & CR_HIDDEN ) != ( pRowFlags[i] & CR_HIDDEN );
|
|
|
|
pDestTab->pRowHeight[i] = pRowHeight[i];
|
|
|
|
pDestTab->pRowFlags[i] = pRowFlags[i];
|
|
|
|
//! Aenderungen zusammenfassen?
|
|
|
|
if (bChange)
|
|
|
|
pCharts->SetRangeDirty(ScRange( 0, i, nTab, MAXCOL, i, nTab ));
|
|
|
|
}
|
|
|
|
|
|
|
|
pDestTab->SetOutlineTable( pOutlineTable ); // auch nur wenn bColRowFlags
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
void ScTable::UndoToTable(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
|
2000-09-18 23:16:46 +00:00
|
|
|
USHORT nFlags, BOOL bMarked, ScTable* pDestTab,
|
|
|
|
const ScMarkData* pMarkData)
|
|
|
|
{
|
|
|
|
if (ValidColRow(nCol1, nRow1) && ValidColRow(nCol2, nRow2))
|
|
|
|
{
|
|
|
|
BOOL bWidth = (nRow1==0 && nRow2==MAXROW && pColWidth && pDestTab->pColWidth);
|
|
|
|
BOOL bHeight = (nCol1==0 && nCol2==MAXCOL && pRowHeight && pDestTab->pRowHeight);
|
|
|
|
|
|
|
|
if (bWidth||bHeight)
|
|
|
|
nRecalcLvl++;
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
for ( SCCOL i = 0; i <= MAXCOL; i++)
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
|
|
|
if ( i >= nCol1 && i <= nCol2 )
|
|
|
|
aCol[i].UndoToColumn(nRow1, nRow2, nFlags, bMarked, pDestTab->aCol[i],
|
|
|
|
pMarkData);
|
|
|
|
else
|
|
|
|
aCol[i].CopyToColumn(0, MAXROW, IDF_FORMULA, FALSE, pDestTab->aCol[i]);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (bWidth||bHeight)
|
|
|
|
{
|
|
|
|
if (bWidth)
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
for (SCCOL i=nCol1; i<=nCol2; i++)
|
2000-09-18 23:16:46 +00:00
|
|
|
pDestTab->pColWidth[i] = pColWidth[i];
|
|
|
|
if (bHeight)
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
for (SCROW j=nRow1; j<=nRow2; j++)
|
|
|
|
pDestTab->pRowHeight[j] = pRowHeight[j];
|
2000-09-18 23:16:46 +00:00
|
|
|
if( !--nRecalcLvl )
|
|
|
|
SetDrawPageSize();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void ScTable::CopyUpdated( const ScTable* pPosTab, ScTable* pDestTab ) const
|
|
|
|
{
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
for (SCCOL i=0; i<=MAXCOL; i++)
|
2000-09-18 23:16:46 +00:00
|
|
|
aCol[i].CopyUpdated( pPosTab->aCol[i], pDestTab->aCol[i] );
|
|
|
|
}
|
|
|
|
|
|
|
|
void ScTable::CopyScenarioTo( ScTable* pDestTab ) const
|
|
|
|
{
|
|
|
|
DBG_ASSERT( bScenario, "bScenario == FALSE" );
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
for (SCCOL i=0; i<=MAXCOL; i++)
|
2000-09-18 23:16:46 +00:00
|
|
|
aCol[i].CopyScenarioTo( pDestTab->aCol[i] );
|
|
|
|
}
|
|
|
|
|
|
|
|
void ScTable::CopyScenarioFrom( const ScTable* pSrcTab )
|
|
|
|
{
|
|
|
|
DBG_ASSERT( bScenario, "bScenario == FALSE" );
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
for (SCCOL i=0; i<=MAXCOL; i++)
|
2000-09-18 23:16:46 +00:00
|
|
|
aCol[i].CopyScenarioFrom( pSrcTab->aCol[i] );
|
|
|
|
}
|
|
|
|
|
|
|
|
void ScTable::MarkScenarioIn( ScMarkData& rDestMark, USHORT nNeededBits ) const
|
|
|
|
{
|
|
|
|
DBG_ASSERT( bScenario, "bScenario == FALSE" );
|
|
|
|
|
|
|
|
if ( ( nScenarioFlags & nNeededBits ) != nNeededBits ) // alle Bits gesetzt?
|
|
|
|
return;
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
for (SCCOL i=0; i<=MAXCOL; i++)
|
2000-09-18 23:16:46 +00:00
|
|
|
aCol[i].MarkScenarioIn( rDestMark );
|
|
|
|
}
|
|
|
|
|
|
|
|
BOOL ScTable::HasScenarioRange( const ScRange& rRange ) const
|
|
|
|
{
|
|
|
|
DBG_ASSERT( bScenario, "bScenario == FALSE" );
|
|
|
|
|
|
|
|
// ScMarkData aMark;
|
|
|
|
// MarkScenarioIn( aMark, 0 ); //! Bits als Parameter von HasScenarioRange?
|
|
|
|
// return aMark.IsAllMarked( rRange );
|
|
|
|
|
|
|
|
ScRange aTabRange = rRange;
|
|
|
|
aTabRange.aStart.SetTab( nTab );
|
|
|
|
aTabRange.aEnd.SetTab( nTab );
|
|
|
|
|
|
|
|
const ScRangeList* pList = GetScenarioRanges();
|
|
|
|
// return ( pList && pList->Find( aTabRange ) );
|
|
|
|
|
|
|
|
if (pList)
|
|
|
|
{
|
|
|
|
ULONG nCount = pList->Count();
|
|
|
|
for ( ULONG j = 0; j < nCount; j++ )
|
|
|
|
{
|
|
|
|
ScRange* pR = pList->GetObject( j );
|
|
|
|
if ( pR->Intersects( aTabRange ) )
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
void ScTable::InvalidateScenarioRanges()
|
|
|
|
{
|
|
|
|
delete pScenarioRanges;
|
|
|
|
pScenarioRanges = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
const ScRangeList* ScTable::GetScenarioRanges() const
|
|
|
|
{
|
|
|
|
DBG_ASSERT( bScenario, "bScenario == FALSE" );
|
|
|
|
|
|
|
|
if (!pScenarioRanges)
|
|
|
|
{
|
|
|
|
((ScTable*)this)->pScenarioRanges = new ScRangeList;
|
|
|
|
ScMarkData aMark;
|
|
|
|
MarkScenarioIn( aMark, 0 ); // immer
|
|
|
|
aMark.FillRangeListWithMarks( pScenarioRanges, FALSE );
|
|
|
|
}
|
|
|
|
return pScenarioRanges;
|
|
|
|
}
|
|
|
|
|
|
|
|
BOOL ScTable::TestCopyScenarioTo( const ScTable* pDestTab ) const
|
|
|
|
{
|
|
|
|
DBG_ASSERT( bScenario, "bScenario == FALSE" );
|
|
|
|
|
|
|
|
if (!pDestTab->IsProtected())
|
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
BOOL bOk = TRUE;
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
for (SCCOL i=0; i<=MAXCOL && bOk; i++)
|
2000-09-18 23:16:46 +00:00
|
|
|
bOk = aCol[i].TestCopyScenarioTo( pDestTab->aCol[i] );
|
|
|
|
return bOk;
|
|
|
|
}
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
void ScTable::PutCell( SCCOL nCol, SCROW nRow, ScBaseCell* pCell )
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
|
|
|
if (ValidColRow(nCol,nRow))
|
|
|
|
{
|
|
|
|
if (pCell)
|
|
|
|
aCol[nCol].Insert( nRow, pCell );
|
|
|
|
else
|
|
|
|
aCol[nCol].Delete( nRow );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
void ScTable::PutCell( SCCOL nCol, SCROW nRow, ULONG nFormatIndex, ScBaseCell* pCell )
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
|
|
|
if (ValidColRow(nCol,nRow))
|
|
|
|
{
|
|
|
|
if (pCell)
|
|
|
|
aCol[nCol].Insert( nRow, nFormatIndex, pCell );
|
|
|
|
else
|
|
|
|
aCol[nCol].Delete( nRow );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void ScTable::PutCell( const ScAddress& rPos, ScBaseCell* pCell )
|
|
|
|
{
|
|
|
|
if (pCell)
|
|
|
|
aCol[rPos.Col()].Insert( rPos.Row(), pCell );
|
|
|
|
else
|
|
|
|
aCol[rPos.Col()].Delete( rPos.Row() );
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void ScTable::PutCell( const ScAddress& rPos, ULONG nFormatIndex, ScBaseCell* pCell )
|
|
|
|
{
|
|
|
|
if (pCell)
|
|
|
|
aCol[rPos.Col()].Insert( rPos.Row(), nFormatIndex, pCell );
|
|
|
|
else
|
|
|
|
aCol[rPos.Col()].Delete( rPos.Row() );
|
|
|
|
}
|
|
|
|
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
BOOL ScTable::SetString( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rString )
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
|
|
|
if (ValidColRow(nCol,nRow))
|
|
|
|
return aCol[nCol].SetString( nRow, nTab, rString );
|
|
|
|
else
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
void ScTable::SetValue( SCCOL nCol, SCROW nRow, const double& rVal )
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
|
|
|
if (ValidColRow(nCol, nRow))
|
|
|
|
aCol[nCol].SetValue( nRow, rVal );
|
|
|
|
}
|
|
|
|
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
void ScTable::SetNote( SCCOL nCol, SCROW nRow, const ScPostIt& rNote)
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
|
|
|
if (ValidColRow(nCol, nRow))
|
|
|
|
aCol[nCol].SetNote(nRow, rNote);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
void ScTable::GetString( SCCOL nCol, SCROW nRow, String& rString )
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
|
|
|
if (ValidColRow(nCol,nRow))
|
|
|
|
aCol[nCol].GetString( nRow, rString );
|
|
|
|
else
|
|
|
|
rString.Erase();
|
|
|
|
}
|
|
|
|
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
void ScTable::GetInputString( SCCOL nCol, SCROW nRow, String& rString )
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
|
|
|
if (ValidColRow(nCol,nRow))
|
|
|
|
aCol[nCol].GetInputString( nRow, rString );
|
|
|
|
else
|
|
|
|
rString.Erase();
|
|
|
|
}
|
|
|
|
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
double ScTable::GetValue( SCCOL nCol, SCROW nRow )
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
|
|
|
if (ValidColRow( nCol, nRow ))
|
|
|
|
return aCol[nCol].GetValue( nRow );
|
|
|
|
return 0.0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
void ScTable::GetFormula( SCCOL nCol, SCROW nRow, String& rFormula,
|
2000-09-18 23:16:46 +00:00
|
|
|
BOOL bAsciiExport )
|
|
|
|
{
|
|
|
|
if (ValidColRow(nCol,nRow))
|
|
|
|
aCol[nCol].GetFormula( nRow, rFormula, bAsciiExport );
|
|
|
|
else
|
|
|
|
rFormula.Erase();
|
|
|
|
}
|
|
|
|
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
BOOL ScTable::GetNote( SCCOL nCol, SCROW nRow, ScPostIt& rNote)
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
|
|
|
BOOL bHasNote = FALSE;
|
|
|
|
|
|
|
|
if (ValidColRow(nCol,nRow))
|
|
|
|
bHasNote = aCol[nCol].GetNote( nRow, rNote );
|
|
|
|
else
|
|
|
|
rNote.Clear();
|
|
|
|
|
|
|
|
return bHasNote;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
CellType ScTable::GetCellType( SCCOL nCol, SCROW nRow ) const
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
|
|
|
if (ValidColRow( nCol, nRow ))
|
|
|
|
return aCol[nCol].GetCellType( nRow );
|
|
|
|
return CELLTYPE_NONE;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
ScBaseCell* ScTable::GetCell( SCCOL nCol, SCROW nRow ) const
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
|
|
|
if (ValidColRow( nCol, nRow ))
|
|
|
|
return aCol[nCol].GetCell( nRow );
|
|
|
|
|
|
|
|
DBG_ERROR("GetCell ausserhalb");
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
void ScTable::GetLastDataPos(SCCOL& rCol, SCROW& rRow) const
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
|
|
|
rCol = MAXCOL;
|
|
|
|
rRow = 0;
|
|
|
|
while (aCol[rCol].IsEmptyData() && (rCol > 0))
|
|
|
|
rCol--;
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
SCCOL nCol = rCol;
|
|
|
|
while ((SCsCOL)nCol >= 0)
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
|
|
|
rRow = Max(rRow, aCol[nCol].GetLastDataPos());
|
|
|
|
nCol--;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
BOOL ScTable::HasData( SCCOL nCol, SCROW nRow )
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
|
|
|
if (ValidColRow(nCol,nRow))
|
|
|
|
return aCol[nCol].HasDataAt( nRow );
|
|
|
|
else
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
BOOL ScTable::HasStringData( SCCOL nCol, SCROW nRow )
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
|
|
|
if (ValidColRow(nCol,nRow))
|
|
|
|
return aCol[nCol].HasStringData( nRow );
|
|
|
|
else
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
BOOL ScTable::HasValueData( SCCOL nCol, SCROW nRow )
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
|
|
|
if (ValidColRow(nCol,nRow))
|
|
|
|
return aCol[nCol].HasValueData( nRow );
|
|
|
|
else
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
BOOL ScTable::HasStringCells( SCCOL nStartCol, SCROW nStartRow,
|
|
|
|
SCCOL nEndCol, SCROW nEndRow ) const
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
if ( ValidCol(nEndCol) )
|
|
|
|
for ( SCCOL nCol=nStartCol; nCol<=nEndCol; nCol++ )
|
2000-09-18 23:16:46 +00:00
|
|
|
if (aCol[nCol].HasStringCells(nStartRow, nEndRow))
|
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
USHORT ScTable::GetErrCode( SCCOL nCol, SCROW nRow ) const
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
|
|
|
if (ValidColRow( nCol, nRow ))
|
|
|
|
return aCol[nCol].GetErrCode( nRow );
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void ScTable::SetDirtyVar()
|
|
|
|
{
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
for (SCCOL i=0; i<=MAXCOL; i++)
|
2000-09-18 23:16:46 +00:00
|
|
|
aCol[i].SetDirtyVar();
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void ScTable::SetDirty()
|
|
|
|
{
|
|
|
|
BOOL bOldAutoCalc = pDocument->GetAutoCalc();
|
|
|
|
pDocument->SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
for (SCCOL i=0; i<=MAXCOL; i++)
|
2000-09-18 23:16:46 +00:00
|
|
|
aCol[i].SetDirty();
|
|
|
|
pDocument->SetAutoCalc( bOldAutoCalc );
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void ScTable::SetDirty( const ScRange& rRange )
|
|
|
|
{
|
|
|
|
BOOL bOldAutoCalc = pDocument->GetAutoCalc();
|
|
|
|
pDocument->SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
SCCOL nCol2 = rRange.aEnd.Col();
|
|
|
|
for (SCCOL i=rRange.aStart.Col(); i<=nCol2; i++)
|
2000-09-18 23:16:46 +00:00
|
|
|
aCol[i].SetDirty( rRange );
|
|
|
|
pDocument->SetAutoCalc( bOldAutoCalc );
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2001-02-13 18:01:55 +00:00
|
|
|
void ScTable::SetTableOpDirty( const ScRange& rRange )
|
|
|
|
{
|
|
|
|
BOOL bOldAutoCalc = pDocument->GetAutoCalc();
|
|
|
|
pDocument->SetAutoCalc( FALSE ); // no multiple recalculation
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
SCCOL nCol2 = rRange.aEnd.Col();
|
|
|
|
for (SCCOL i=rRange.aStart.Col(); i<=nCol2; i++)
|
2001-02-13 18:01:55 +00:00
|
|
|
aCol[i].SetTableOpDirty( rRange );
|
|
|
|
pDocument->SetAutoCalc( bOldAutoCalc );
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2000-09-18 23:16:46 +00:00
|
|
|
void ScTable::SetDirtyAfterLoad()
|
|
|
|
{
|
|
|
|
BOOL bOldAutoCalc = pDocument->GetAutoCalc();
|
|
|
|
pDocument->SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
for (SCCOL i=0; i<=MAXCOL; i++)
|
2000-09-18 23:16:46 +00:00
|
|
|
aCol[i].SetDirtyAfterLoad();
|
|
|
|
pDocument->SetAutoCalc( bOldAutoCalc );
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void ScTable::SetRelNameDirty()
|
|
|
|
{
|
|
|
|
BOOL bOldAutoCalc = pDocument->GetAutoCalc();
|
|
|
|
pDocument->SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
for (SCCOL i=0; i<=MAXCOL; i++)
|
2000-09-18 23:16:46 +00:00
|
|
|
aCol[i].SetRelNameDirty();
|
|
|
|
pDocument->SetAutoCalc( bOldAutoCalc );
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void ScTable::CalcAll()
|
|
|
|
{
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
for (SCCOL i=0; i<=MAXCOL; i++) aCol[i].CalcAll();
|
2000-09-18 23:16:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void ScTable::CompileAll()
|
|
|
|
{
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
for (SCCOL i=0; i <= MAXCOL; i++) aCol[i].CompileAll();
|
2000-09-18 23:16:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2002-10-01 16:18:23 +00:00
|
|
|
void ScTable::CompileXML( ScProgress& rProgress )
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
for (SCCOL i=0; i <= MAXCOL; i++)
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
2002-10-01 16:18:23 +00:00
|
|
|
aCol[i].CompileXML( rProgress );
|
2000-09-18 23:16:46 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void ScTable::CalcAfterLoad()
|
|
|
|
{
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
for (SCCOL i=0; i <= MAXCOL; i++) aCol[i].CalcAfterLoad();
|
2000-09-18 23:16:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void ScTable::ResetChanged( const ScRange& rRange )
|
|
|
|
{
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
SCCOL nStartCol = rRange.aStart.Col();
|
|
|
|
SCROW nStartRow = rRange.aStart.Row();
|
|
|
|
SCCOL nEndCol = rRange.aEnd.Col();
|
|
|
|
SCROW nEndRow = rRange.aEnd.Row();
|
2000-09-18 23:16:46 +00:00
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
for (SCCOL nCol=nStartCol; nCol<=nEndCol; nCol++)
|
2000-09-18 23:16:46 +00:00
|
|
|
aCol[nCol].ResetChanged(nStartRow, nEndRow);
|
|
|
|
}
|
|
|
|
|
|
|
|
// Attribute
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
const SfxPoolItem* ScTable::GetAttr( SCCOL nCol, SCROW nRow, USHORT nWhich ) const
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
|
|
|
if (ValidColRow(nCol,nRow))
|
|
|
|
return aCol[nCol].GetAttr( nRow, nWhich );
|
|
|
|
else
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
ULONG ScTable::GetNumberFormat( SCCOL nCol, SCROW nRow ) const
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
|
|
|
if (ValidColRow(nCol,nRow))
|
|
|
|
return aCol[nCol].GetNumberFormat( nRow );
|
|
|
|
else
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
const ScPatternAttr* ScTable::GetPattern( SCCOL nCol, SCROW nRow ) const
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
|
|
|
if (ValidColRow(nCol,nRow))
|
|
|
|
return aCol[nCol].GetPattern( nRow );
|
|
|
|
else
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
BOOL ScTable::HasAttrib( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, USHORT nMask ) const
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
|
|
|
BOOL bFound=FALSE;
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
for (SCCOL i=nCol1; i<=nCol2 && !bFound; i++)
|
2000-09-18 23:16:46 +00:00
|
|
|
bFound |= aCol[i].HasAttrib( nRow1, nRow2, nMask );
|
|
|
|
return bFound;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
BOOL ScTable::HasLines( const ScRange& rRange, Rectangle& rSizes ) const
|
|
|
|
{
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
SCCOL nCol1 = rRange.aStart.Col();
|
|
|
|
SCROW nRow1 = rRange.aStart.Row();
|
|
|
|
SCCOL nCol2 = rRange.aEnd.Col();
|
|
|
|
SCROW nRow2 = rRange.aEnd.Row();
|
2000-09-18 23:16:46 +00:00
|
|
|
PutInOrder( nCol1, nCol2 );
|
|
|
|
PutInOrder( nRow1, nRow2 );
|
|
|
|
|
|
|
|
BOOL bFound = FALSE;
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
for (SCCOL i=nCol1; i<=nCol2; i++)
|
2000-09-18 23:16:46 +00:00
|
|
|
if (aCol[i].HasLines( nRow1, nRow2, rSizes, (i==nCol1), (i==nCol2) ))
|
|
|
|
bFound = TRUE;
|
|
|
|
|
|
|
|
return bFound;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
BOOL ScTable::HasAttribSelection( const ScMarkData& rMark, USHORT nMask ) const
|
|
|
|
{
|
|
|
|
BOOL bFound=FALSE;
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
for (SCCOL i=0; i<=MAXCOL && !bFound; i++)
|
2000-09-18 23:16:46 +00:00
|
|
|
bFound |= aCol[i].HasAttribSelection( rMark, nMask );
|
|
|
|
return bFound;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
BOOL ScTable::ExtendMerge( SCCOL nStartCol, SCROW nStartRow,
|
|
|
|
SCCOL& rEndCol, SCROW& rEndRow,
|
2000-09-18 23:16:46 +00:00
|
|
|
BOOL bRefresh, BOOL bAttrs )
|
|
|
|
{
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
if (!(ValidCol(nStartCol) && ValidCol(rEndCol)))
|
|
|
|
{
|
|
|
|
DBG_ERRORFILE("ScTable::ExtendMerge: invalid column number");
|
|
|
|
return FALSE;
|
|
|
|
}
|
2000-09-18 23:16:46 +00:00
|
|
|
BOOL bFound=FALSE;
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
SCCOL nOldEndX = rEndCol;
|
|
|
|
SCROW nOldEndY = rEndRow;
|
|
|
|
for (SCCOL i=nStartCol; i<=nOldEndX; i++)
|
2000-09-18 23:16:46 +00:00
|
|
|
bFound |= aCol[i].ExtendMerge( i, nStartRow, nOldEndY, rEndCol, rEndRow, bRefresh, bAttrs );
|
|
|
|
return bFound;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
BOOL ScTable::IsBlockEmpty( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ) const
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
if (!(ValidCol(nCol1) && ValidCol(nCol2)))
|
|
|
|
{
|
|
|
|
DBG_ERRORFILE("ScTable::IsBlockEmpty: invalid column number");
|
|
|
|
return FALSE;
|
|
|
|
}
|
2000-09-18 23:16:46 +00:00
|
|
|
BOOL bEmpty = TRUE;
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
for (SCCOL i=nCol1; i<=nCol2 && bEmpty; i++)
|
2000-09-18 23:16:46 +00:00
|
|
|
bEmpty = aCol[i].IsEmptyBlock( nRow1, nRow2 );
|
|
|
|
return bEmpty;
|
|
|
|
}
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
SCSIZE ScTable::FillMaxRot( RowInfo* pRowInfo, SCSIZE nArrCount, SCCOL nX1, SCCOL nX2,
|
|
|
|
SCCOL nCol, SCROW nAttrRow1, SCROW nAttrRow2, SCSIZE nArrY,
|
2000-09-18 23:16:46 +00:00
|
|
|
const ScPatternAttr* pPattern, const SfxItemSet* pCondSet ) const
|
|
|
|
{
|
|
|
|
// Rueckgabe = neues nArrY
|
|
|
|
|
|
|
|
BYTE nRotDir = pPattern->GetRotateDir( pCondSet );
|
|
|
|
if ( nRotDir != SC_ROTDIR_NONE )
|
|
|
|
{
|
|
|
|
BOOL bHit = TRUE;
|
2004-02-03 11:20:54 +00:00
|
|
|
if ( nCol+1 < nX1 ) // column to the left
|
2000-09-18 23:16:46 +00:00
|
|
|
bHit = ( nRotDir != SC_ROTDIR_LEFT );
|
2004-02-03 11:20:54 +00:00
|
|
|
else if ( nCol > nX2+1 ) // column to the right
|
|
|
|
bHit = ( nRotDir != SC_ROTDIR_RIGHT ); // SC_ROTDIR_STANDARD may now also be extended to the left
|
2000-09-18 23:16:46 +00:00
|
|
|
|
|
|
|
if ( bHit )
|
|
|
|
{
|
|
|
|
double nFactor = 0.0;
|
|
|
|
if ( nCol > nX2+1 )
|
|
|
|
{
|
|
|
|
long nRotVal = ((const SfxInt32Item&) pPattern->
|
|
|
|
GetItem( ATTR_ROTATE_VALUE, pCondSet )).GetValue();
|
|
|
|
double nRealOrient = nRotVal * F_PI18000; // 1/100 Grad
|
|
|
|
double nCos = cos( nRealOrient );
|
|
|
|
double nSin = sin( nRealOrient );
|
|
|
|
//! begrenzen !!!
|
|
|
|
//! zusaetzlich Faktor fuer unterschiedliche PPT X/Y !!!
|
|
|
|
|
|
|
|
// bei SC_ROTDIR_LEFT kommt immer ein negativer Wert heraus,
|
|
|
|
// wenn der Modus beruecksichtigt wird
|
|
|
|
nFactor = -fabs( nCos / nSin );
|
|
|
|
}
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
for ( SCROW nRow = nAttrRow1; nRow <= nAttrRow2; nRow++ )
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
|
|
|
if ( !(pRowFlags[nRow] & CR_HIDDEN) )
|
|
|
|
{
|
|
|
|
BOOL bHitOne = TRUE;
|
|
|
|
if ( nCol > nX2+1 )
|
|
|
|
{
|
|
|
|
// reicht die gedrehte Zelle bis in den sichtbaren Bereich?
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
SCCOL nTouchedCol = nCol;
|
2000-09-18 23:16:46 +00:00
|
|
|
long nWidth = (long) ( pRowHeight[nRow] * nFactor );
|
|
|
|
DBG_ASSERT(nWidth <= 0, "Richtung falsch");
|
|
|
|
while ( nWidth < 0 && nTouchedCol > 0 )
|
|
|
|
{
|
|
|
|
--nTouchedCol;
|
|
|
|
nWidth += GetColWidth( nTouchedCol );
|
|
|
|
}
|
|
|
|
if ( nTouchedCol > nX2 )
|
|
|
|
bHitOne = FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (bHitOne)
|
|
|
|
{
|
|
|
|
while ( nArrY<nArrCount && pRowInfo[nArrY].nRowNo < nRow )
|
|
|
|
++nArrY;
|
|
|
|
if ( nArrY<nArrCount && pRowInfo[nArrY].nRowNo == nRow )
|
|
|
|
pRowInfo[nArrY].nRotMaxCol = nCol;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return nArrY;
|
|
|
|
}
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
void ScTable::FindMaxRotCol( RowInfo* pRowInfo, SCSIZE nArrCount, SCCOL nX1, SCCOL nX2 ) const
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
|
|
|
if ( !pColWidth || !pRowHeight || !pColFlags || !pRowFlags )
|
|
|
|
{
|
|
|
|
DBG_ERROR( "Spalten-/Zeileninfo fehlt" );
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
// nRotMaxCol ist auf SC_ROTMAX_NONE initialisiert, nRowNo ist schon gesetzt
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
SCROW nY1 = pRowInfo[0].nRowNo;
|
|
|
|
SCROW nY2 = pRowInfo[nArrCount-1].nRowNo;
|
2000-09-18 23:16:46 +00:00
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
for (SCCOL nCol=0; nCol<=MAXCOL; nCol++)
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
|
|
|
if ( !(pColFlags[nCol] & CR_HIDDEN) )
|
|
|
|
{
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
SCSIZE nArrY = 0;
|
2000-09-18 23:16:46 +00:00
|
|
|
ScDocAttrIterator aIter( pDocument, nTab, nCol, nY1, nCol, nY2 );
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
SCCOL nAttrCol;
|
|
|
|
SCROW nAttrRow1, nAttrRow2;
|
2000-09-18 23:16:46 +00:00
|
|
|
const ScPatternAttr* pPattern = aIter.GetNext( nAttrCol, nAttrRow1, nAttrRow2 );
|
|
|
|
while ( pPattern )
|
|
|
|
{
|
|
|
|
const SfxPoolItem* pCondItem;
|
|
|
|
if ( pPattern->GetItemSet().GetItemState( ATTR_CONDITIONAL, TRUE, &pCondItem )
|
|
|
|
== SFX_ITEM_SET )
|
|
|
|
{
|
|
|
|
// alle Formate durchgehen, damit die Zellen nicht einzeln
|
|
|
|
// angeschaut werden muessen
|
|
|
|
|
|
|
|
ULONG nIndex = ((const SfxUInt32Item*)pCondItem)->GetValue();
|
|
|
|
ScConditionalFormatList* pList = pDocument->GetCondFormList();
|
|
|
|
ScStyleSheetPool* pStylePool = pDocument->GetStyleSheetPool();
|
2001-05-31 18:08:27 +00:00
|
|
|
if (pList && pStylePool && nIndex)
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
|
|
|
const ScConditionalFormat* pFormat = pList->GetFormat(nIndex);
|
|
|
|
if ( pFormat )
|
|
|
|
{
|
|
|
|
USHORT nEntryCount = pFormat->Count();
|
|
|
|
for (USHORT nEntry=0; nEntry<nEntryCount; nEntry++)
|
|
|
|
{
|
|
|
|
String aName = pFormat->GetEntry(nEntry)->GetStyle();
|
|
|
|
if (aName.Len())
|
|
|
|
{
|
|
|
|
SfxStyleSheetBase* pStyleSheet =
|
|
|
|
pStylePool->Find( aName, SFX_STYLE_FAMILY_PARA );
|
|
|
|
if ( pStyleSheet )
|
|
|
|
{
|
|
|
|
FillMaxRot( pRowInfo, nArrCount, nX1, nX2,
|
|
|
|
nCol, nAttrRow1, nAttrRow2,
|
|
|
|
nArrY, pPattern, &pStyleSheet->GetItemSet() );
|
|
|
|
// nArrY nicht veraendern
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
nArrY = FillMaxRot( pRowInfo, nArrCount, nX1, nX2,
|
|
|
|
nCol, nAttrRow1, nAttrRow2,
|
|
|
|
nArrY, pPattern, NULL );
|
|
|
|
|
|
|
|
pPattern = aIter.GetNext( nAttrCol, nAttrRow1, nAttrRow2 );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
BOOL ScTable::HasBlockMatrixFragment( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ) const
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
|
|
|
// nix:0, mitte:1, unten:2, links:4, oben:8, rechts:16, offen:32
|
|
|
|
USHORT nEdges;
|
|
|
|
|
|
|
|
if ( nCol1 == nCol2 )
|
|
|
|
{ // linke und rechte Spalte
|
|
|
|
const USHORT n = 4 | 16;
|
|
|
|
nEdges = aCol[nCol1].GetBlockMatrixEdges( nRow1, nRow2, n );
|
|
|
|
// nicht (4 und 16) oder 1 oder 32
|
|
|
|
if ( nEdges && (((nEdges & n) != n) || (nEdges & 33)) )
|
|
|
|
return TRUE; // linke oder rechte Kante fehlt oder offen
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{ // linke Spalte
|
|
|
|
nEdges = aCol[nCol1].GetBlockMatrixEdges( nRow1, nRow2, 4 );
|
|
|
|
// nicht 4 oder 1 oder 32
|
|
|
|
if ( nEdges && (((nEdges & 4) != 4) || (nEdges & 33)) )
|
|
|
|
return TRUE; // linke Kante fehlt oder offen
|
|
|
|
// rechte Spalte
|
|
|
|
nEdges = aCol[nCol2].GetBlockMatrixEdges( nRow1, nRow2, 16 );
|
|
|
|
// nicht 16 oder 1 oder 32
|
|
|
|
if ( nEdges && (((nEdges & 16) != 16) || (nEdges & 33)) )
|
|
|
|
return TRUE; // rechte Kante fehlt oder offen
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( nRow1 == nRow2 )
|
|
|
|
{ // obere und untere Zeile
|
|
|
|
BOOL bOpen = FALSE;
|
|
|
|
const USHORT n = 2 | 8;
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
for ( SCCOL i=nCol1; i<=nCol2; i++)
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
|
|
|
nEdges = aCol[i].GetBlockMatrixEdges( nRow1, nRow1, n );
|
|
|
|
if ( nEdges )
|
|
|
|
{
|
|
|
|
if ( (nEdges & n) != n )
|
|
|
|
return TRUE; // obere oder untere Kante fehlt
|
|
|
|
if ( nEdges & 4 )
|
|
|
|
bOpen = TRUE; // linke Kante oeffnet, weitersehen
|
|
|
|
else if ( !bOpen )
|
|
|
|
return TRUE; // es gibt was, was nicht geoeffnet wurde
|
|
|
|
if ( nEdges & 16 )
|
|
|
|
bOpen = FALSE; // rechte Kante schliesst
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if ( bOpen )
|
|
|
|
return TRUE; // es geht noch weiter
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
USHORT j, n;
|
|
|
|
SCROW nR;
|
2000-09-18 23:16:46 +00:00
|
|
|
// erst obere Zeile, dann untere Zeile
|
|
|
|
for ( j=0, nR=nRow1, n=8; j<2; j++, nR=nRow2, n=2 )
|
|
|
|
{
|
|
|
|
BOOL bOpen = FALSE;
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
for ( SCCOL i=nCol1; i<=nCol2; i++)
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
|
|
|
nEdges = aCol[i].GetBlockMatrixEdges( nR, nR, n );
|
|
|
|
if ( nEdges )
|
|
|
|
{
|
|
|
|
// in oberere Zeile keine obere Kante bzw.
|
|
|
|
// in unterer Zeile keine untere Kante
|
|
|
|
if ( (nEdges & n) != n )
|
|
|
|
return TRUE;
|
|
|
|
if ( nEdges & 4 )
|
|
|
|
bOpen = TRUE; // linke Kante oeffnet, weitersehen
|
|
|
|
else if ( !bOpen )
|
|
|
|
return TRUE; // es gibt was, was nicht geoeffnet wurde
|
|
|
|
if ( nEdges & 16 )
|
|
|
|
bOpen = FALSE; // rechte Kante schliesst
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if ( bOpen )
|
|
|
|
return TRUE; // es geht noch weiter
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
BOOL ScTable::HasSelectionMatrixFragment( const ScMarkData& rMark ) const
|
|
|
|
{
|
|
|
|
BOOL bFound=FALSE;
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
for (SCCOL i=0; i<=MAXCOL && !bFound; i++)
|
2000-09-18 23:16:46 +00:00
|
|
|
bFound |= aCol[i].HasSelectionMatrixFragment(rMark);
|
|
|
|
return bFound;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
BOOL ScTable::IsBlockEditable( SCCOL nCol1, SCROW nRow1, SCCOL nCol2,
|
|
|
|
SCROW nRow2, BOOL* pOnlyNotBecauseOfMatrix /* = NULL */ ) const
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
2004-03-19 15:08:00 +00:00
|
|
|
BOOL bIsEditable = TRUE;
|
2000-09-18 23:16:46 +00:00
|
|
|
if ( nLockCount )
|
|
|
|
bIsEditable = FALSE;
|
2004-03-19 15:08:00 +00:00
|
|
|
else if ( bProtected && !pDocument->IsScenario(nTab) )
|
|
|
|
{
|
|
|
|
if((bIsEditable = !HasAttrib( nCol1, nRow1, nCol2, nRow2, HASATTR_PROTECTED )))
|
|
|
|
{
|
|
|
|
// If Sheet is protected and cells are not protected then
|
|
|
|
// check the active scenario protect flag if this range is
|
|
|
|
// on the active scenario range. Note the 'copy back' must also
|
|
|
|
// be set to apply protection.
|
|
|
|
USHORT nScenTab = nTab+1;
|
|
|
|
while(pDocument->IsScenario(nScenTab))
|
|
|
|
{
|
|
|
|
ScRange aEditRange(nCol1, nRow1, nScenTab, nCol2, nRow2, nScenTab);
|
|
|
|
if(pDocument->IsActiveScenario(nScenTab) && pDocument->HasScenarioRange(nScenTab, aEditRange))
|
|
|
|
{
|
|
|
|
USHORT nFlags;
|
|
|
|
pDocument->GetScenarioFlags(nScenTab,nFlags);
|
|
|
|
bIsEditable = !((nFlags & SC_SCENARIO_PROTECT) && (nFlags & SC_SCENARIO_TWOWAY));
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
nScenTab++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (pDocument->IsScenario(nTab))
|
|
|
|
{
|
|
|
|
// Determine if the preceding sheet is protected
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
SCTAB nActualTab = nTab;
|
2004-03-19 15:08:00 +00:00
|
|
|
do
|
|
|
|
{
|
|
|
|
nActualTab--;
|
|
|
|
}
|
|
|
|
while(pDocument->IsScenario(nActualTab));
|
|
|
|
|
|
|
|
if(pDocument->IsTabProtected(nActualTab))
|
|
|
|
{
|
|
|
|
ScRange aEditRange(nCol1, nRow1, nTab, nCol2, nRow2, nTab);
|
|
|
|
if(pDocument->HasScenarioRange(nTab, aEditRange))
|
|
|
|
{
|
|
|
|
USHORT nFlags;
|
|
|
|
pDocument->GetScenarioFlags(nTab,nFlags);
|
|
|
|
bIsEditable = !(nFlags & SC_SCENARIO_PROTECT);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2000-09-18 23:16:46 +00:00
|
|
|
if ( bIsEditable )
|
|
|
|
{
|
|
|
|
if ( HasBlockMatrixFragment( nCol1, nRow1, nCol2, nRow2 ) )
|
|
|
|
{
|
|
|
|
bIsEditable = FALSE;
|
|
|
|
if ( pOnlyNotBecauseOfMatrix )
|
|
|
|
*pOnlyNotBecauseOfMatrix = TRUE;
|
|
|
|
}
|
|
|
|
else if ( pOnlyNotBecauseOfMatrix )
|
|
|
|
*pOnlyNotBecauseOfMatrix = FALSE;
|
|
|
|
}
|
|
|
|
else if ( pOnlyNotBecauseOfMatrix )
|
|
|
|
*pOnlyNotBecauseOfMatrix = FALSE;
|
|
|
|
return bIsEditable;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
BOOL ScTable::IsSelectionEditable( const ScMarkData& rMark,
|
|
|
|
BOOL* pOnlyNotBecauseOfMatrix /* = NULL */ ) const
|
|
|
|
{
|
2004-03-19 15:08:00 +00:00
|
|
|
BOOL bIsEditable = TRUE;
|
2000-09-18 23:16:46 +00:00
|
|
|
if ( nLockCount )
|
|
|
|
bIsEditable = FALSE;
|
2004-03-19 15:08:00 +00:00
|
|
|
else if ( bProtected && !pDocument->IsScenario(nTab))
|
|
|
|
{
|
|
|
|
if((bIsEditable = !HasAttribSelection( rMark, HASATTR_PROTECTED )))
|
|
|
|
{
|
|
|
|
// If Sheet is protected and cells are not protected then
|
|
|
|
// check the active scenario protect flag if this area is
|
|
|
|
// in the active scenario range.
|
|
|
|
ScRangeList aRanges;
|
|
|
|
rMark.FillRangeListWithMarks( &aRanges, FALSE );
|
|
|
|
ULONG nRangeCount = aRanges.Count();
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
SCTAB nScenTab = nTab+1;
|
2004-03-19 15:08:00 +00:00
|
|
|
while(pDocument->IsScenario(nScenTab) && bIsEditable)
|
|
|
|
{
|
|
|
|
if(pDocument->IsActiveScenario(nScenTab))
|
|
|
|
{
|
|
|
|
for (ULONG i=0; i<nRangeCount && bIsEditable; i++)
|
|
|
|
{
|
|
|
|
ScRange aRange = *aRanges.GetObject(i);
|
|
|
|
if(pDocument->HasScenarioRange(nScenTab, aRange))
|
|
|
|
{
|
|
|
|
USHORT nFlags;
|
|
|
|
pDocument->GetScenarioFlags(nScenTab,nFlags);
|
|
|
|
bIsEditable = !((nFlags & SC_SCENARIO_PROTECT) && (nFlags & SC_SCENARIO_TWOWAY));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
nScenTab++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (pDocument->IsScenario(nTab))
|
|
|
|
{
|
|
|
|
// Determine if the preceding sheet is protected
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
SCTAB nActualTab = nTab;
|
2004-03-19 15:08:00 +00:00
|
|
|
do
|
|
|
|
{
|
|
|
|
nActualTab--;
|
|
|
|
}
|
|
|
|
while(pDocument->IsScenario(nActualTab));
|
|
|
|
|
|
|
|
if(pDocument->IsTabProtected(nActualTab))
|
|
|
|
{
|
|
|
|
ScRangeList aRanges;
|
|
|
|
rMark.FillRangeListWithMarks( &aRanges, FALSE );
|
|
|
|
ULONG nRangeCount = aRanges.Count();
|
|
|
|
for (ULONG i=0; i<nRangeCount && bIsEditable; i++)
|
|
|
|
{
|
|
|
|
ScRange aRange = *aRanges.GetObject(i);
|
|
|
|
if(pDocument->HasScenarioRange(nTab, aRange))
|
|
|
|
{
|
|
|
|
USHORT nFlags;
|
|
|
|
pDocument->GetScenarioFlags(nTab,nFlags);
|
|
|
|
bIsEditable = !(nFlags & SC_SCENARIO_PROTECT);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2000-09-18 23:16:46 +00:00
|
|
|
if ( bIsEditable )
|
|
|
|
{
|
|
|
|
if ( HasSelectionMatrixFragment( rMark ) )
|
|
|
|
{
|
|
|
|
bIsEditable = FALSE;
|
|
|
|
if ( pOnlyNotBecauseOfMatrix )
|
|
|
|
*pOnlyNotBecauseOfMatrix = TRUE;
|
|
|
|
}
|
|
|
|
else if ( pOnlyNotBecauseOfMatrix )
|
|
|
|
*pOnlyNotBecauseOfMatrix = FALSE;
|
|
|
|
}
|
|
|
|
else if ( pOnlyNotBecauseOfMatrix )
|
|
|
|
*pOnlyNotBecauseOfMatrix = FALSE;
|
|
|
|
return bIsEditable;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void ScTable::LockTable()
|
|
|
|
{
|
|
|
|
++nLockCount;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void ScTable::UnlockTable()
|
|
|
|
{
|
|
|
|
if (nLockCount)
|
|
|
|
--nLockCount;
|
|
|
|
else
|
|
|
|
DBG_ERROR("UnlockTable ohne LockTable");
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void ScTable::MergeSelectionPattern( SfxItemSet** ppSet, const ScMarkData& rMark, BOOL bDeep ) const
|
|
|
|
{
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
for (SCCOL i=0; i<=MAXCOL; i++)
|
2000-09-18 23:16:46 +00:00
|
|
|
aCol[i].MergeSelectionPattern( ppSet, rMark, bDeep );
|
|
|
|
}
|
|
|
|
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
void ScTable::MergePatternArea( SfxItemSet** ppSet, SCCOL nCol1, SCROW nRow1,
|
|
|
|
SCCOL nCol2, SCROW nRow2, BOOL bDeep ) const
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
for (SCCOL i=nCol1; i<=nCol2; i++)
|
2000-09-18 23:16:46 +00:00
|
|
|
aCol[i].MergePatternArea( ppSet, nRow1, nRow2, bDeep );
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void ScTable::MergeBlockFrame( SvxBoxItem* pLineOuter, SvxBoxInfoItem* pLineInner, ScLineFlags& rFlags,
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow ) const
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
|
|
|
if (ValidColRow(nStartCol, nStartRow) && ValidColRow(nEndCol, nEndRow))
|
|
|
|
{
|
|
|
|
PutInOrder(nStartCol, nEndCol);
|
|
|
|
PutInOrder(nStartRow, nEndRow);
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
for (SCCOL i=nStartCol; i<=nEndCol; i++)
|
2000-09-18 23:16:46 +00:00
|
|
|
aCol[i].MergeBlockFrame( pLineOuter, pLineInner, rFlags,
|
|
|
|
nStartRow, nEndRow, (i==nStartCol), nEndCol-i );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void ScTable::ApplyBlockFrame( const SvxBoxItem* pLineOuter, const SvxBoxInfoItem* pLineInner,
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow )
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
|
|
|
if (ValidColRow(nStartCol, nStartRow) && ValidColRow(nEndCol, nEndRow))
|
|
|
|
{
|
|
|
|
PutInOrder(nStartCol, nEndCol);
|
|
|
|
PutInOrder(nStartRow, nEndRow);
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
for (SCCOL i=nStartCol; i<=nEndCol; i++)
|
2000-09-18 23:16:46 +00:00
|
|
|
aCol[i].ApplyBlockFrame( pLineOuter, pLineInner,
|
|
|
|
nStartRow, nEndRow, (i==nStartCol), nEndCol-i );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
void ScTable::ApplyPattern( SCCOL nCol, SCROW nRow, const ScPatternAttr& rAttr )
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
|
|
|
if (ValidColRow(nCol,nRow))
|
|
|
|
aCol[nCol].ApplyPattern( nRow, rAttr );
|
|
|
|
}
|
|
|
|
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
void ScTable::ApplyPatternArea( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow,
|
2000-09-18 23:16:46 +00:00
|
|
|
const ScPatternAttr& rAttr )
|
|
|
|
{
|
|
|
|
if (ValidColRow(nStartCol, nStartRow) && ValidColRow(nEndCol, nEndRow))
|
|
|
|
{
|
|
|
|
PutInOrder(nStartCol, nEndCol);
|
|
|
|
PutInOrder(nStartRow, nEndRow);
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
for (SCCOL i = nStartCol; i <= nEndCol; i++)
|
2000-09-18 23:16:46 +00:00
|
|
|
aCol[i].ApplyPatternArea(nStartRow, nEndRow, rAttr);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void ScTable::ApplyPatternIfNumberformatIncompatible( const ScRange& rRange,
|
|
|
|
const ScPatternAttr& rPattern, short nNewType )
|
|
|
|
{
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
SCCOL nEndCol = rRange.aEnd.Col();
|
|
|
|
for ( SCCOL nCol = rRange.aStart.Col(); nCol <= nEndCol; nCol++ )
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
|
|
|
aCol[nCol].ApplyPatternIfNumberformatIncompatible( rRange, rPattern, nNewType );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
void ScTable::ApplyStyle( SCCOL nCol, SCROW nRow, const ScStyleSheet& rStyle )
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
|
|
|
if (ValidColRow(nCol,nRow))
|
|
|
|
aCol[nCol].ApplyStyle( nRow, rStyle );
|
|
|
|
}
|
|
|
|
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
void ScTable::ApplyStyleArea( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, const ScStyleSheet& rStyle )
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
|
|
|
if (ValidColRow(nStartCol, nStartRow) && ValidColRow(nEndCol, nEndRow))
|
|
|
|
{
|
|
|
|
PutInOrder(nStartCol, nEndCol);
|
|
|
|
PutInOrder(nStartRow, nEndRow);
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
for (SCCOL i = nStartCol; i <= nEndCol; i++)
|
2000-09-18 23:16:46 +00:00
|
|
|
aCol[i].ApplyStyleArea(nStartRow, nEndRow, rStyle);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void ScTable::ApplySelectionStyle(const ScStyleSheet& rStyle, const ScMarkData& rMark)
|
|
|
|
{
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
for (SCCOL i=0; i<=MAXCOL; i++)
|
2000-09-18 23:16:46 +00:00
|
|
|
aCol[i].ApplySelectionStyle( rStyle, rMark );
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void ScTable::ApplySelectionLineStyle( const ScMarkData& rMark,
|
|
|
|
const SvxBorderLine* pLine, BOOL bColorOnly )
|
|
|
|
{
|
|
|
|
if ( bColorOnly && !pLine )
|
|
|
|
return;
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
for (SCCOL i=0; i<=MAXCOL; i++)
|
2000-09-18 23:16:46 +00:00
|
|
|
aCol[i].ApplySelectionLineStyle( rMark, pLine, bColorOnly );
|
|
|
|
}
|
|
|
|
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
const ScStyleSheet* ScTable::GetStyle( SCCOL nCol, SCROW nRow ) const
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
|
|
|
if (ValidColRow(nCol, nRow))
|
|
|
|
return aCol[nCol].GetStyle(nRow);
|
|
|
|
else
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
const ScStyleSheet* ScTable::GetSelectionStyle( const ScMarkData& rMark, BOOL& rFound ) const
|
|
|
|
{
|
|
|
|
rFound = FALSE;
|
|
|
|
|
|
|
|
BOOL bEqual = TRUE;
|
|
|
|
BOOL bColFound;
|
|
|
|
|
|
|
|
const ScStyleSheet* pStyle = NULL;
|
|
|
|
const ScStyleSheet* pNewStyle;
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
for (SCCOL i=0; i<=MAXCOL && bEqual; i++)
|
2000-09-18 23:16:46 +00:00
|
|
|
if (rMark.HasMultiMarks(i))
|
|
|
|
{
|
|
|
|
pNewStyle = aCol[i].GetSelectionStyle( rMark, bColFound );
|
|
|
|
if (bColFound)
|
|
|
|
{
|
|
|
|
rFound = TRUE;
|
|
|
|
if ( !pNewStyle || ( pStyle && pNewStyle != pStyle ) )
|
|
|
|
bEqual = FALSE; // unterschiedliche
|
|
|
|
pStyle = pNewStyle;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return bEqual ? pStyle : NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
const ScStyleSheet* ScTable::GetAreaStyle( BOOL& rFound, SCCOL nCol1, SCROW nRow1,
|
|
|
|
SCCOL nCol2, SCROW nRow2 ) const
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
|
|
|
rFound = FALSE;
|
|
|
|
|
|
|
|
BOOL bEqual = TRUE;
|
|
|
|
BOOL bColFound;
|
|
|
|
|
|
|
|
const ScStyleSheet* pStyle = NULL;
|
|
|
|
const ScStyleSheet* pNewStyle;
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
for (SCCOL i=nCol1; i<=nCol2 && bEqual; i++)
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
|
|
|
pNewStyle = aCol[i].GetAreaStyle(bColFound, nRow1, nRow2);
|
|
|
|
if (bColFound)
|
|
|
|
{
|
|
|
|
rFound = TRUE;
|
|
|
|
if ( !pNewStyle || ( pStyle && pNewStyle != pStyle ) )
|
|
|
|
bEqual = FALSE; // unterschiedliche
|
|
|
|
pStyle = pNewStyle;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return bEqual ? pStyle : NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2002-12-05 15:09:00 +00:00
|
|
|
BOOL ScTable::IsStyleSheetUsed( const ScStyleSheet& rStyle, BOOL bGatherAllStyles ) const
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
|
|
|
BOOL bIsUsed = FALSE;
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
for ( SCCOL i=0; i<=MAXCOL; i++ )
|
2002-12-05 15:09:00 +00:00
|
|
|
{
|
|
|
|
if ( aCol[i].IsStyleSheetUsed( rStyle, bGatherAllStyles ) )
|
|
|
|
{
|
|
|
|
if ( !bGatherAllStyles )
|
|
|
|
return TRUE;
|
|
|
|
bIsUsed = TRUE;
|
|
|
|
}
|
|
|
|
}
|
2000-09-18 23:16:46 +00:00
|
|
|
|
|
|
|
return bIsUsed;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void ScTable::StyleSheetChanged( const SfxStyleSheetBase* pStyleSheet, BOOL bRemoved,
|
|
|
|
OutputDevice* pDev,
|
|
|
|
double nPPTX, double nPPTY,
|
|
|
|
const Fraction& rZoomX, const Fraction& rZoomY )
|
|
|
|
{
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
BOOL* pUsed = new BOOL[MAXROWCOUNT];
|
|
|
|
memset( pUsed, 0, sizeof(BOOL) * (MAXROWCOUNT) );
|
2000-09-18 23:16:46 +00:00
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
SCCOL nCol;
|
2000-09-18 23:16:46 +00:00
|
|
|
for (nCol=0; nCol<=MAXCOL; nCol++)
|
|
|
|
aCol[nCol].FindStyleSheet( pStyleSheet, pUsed, bRemoved );
|
|
|
|
|
|
|
|
BOOL bFound = FALSE;
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
SCROW nStart, nEnd;
|
|
|
|
for (SCROW i=0; i<=MAXROW; i++)
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
|
|
|
if (pUsed[i])
|
|
|
|
{
|
|
|
|
if (!bFound)
|
|
|
|
{
|
|
|
|
nStart = i;
|
|
|
|
bFound = TRUE;
|
|
|
|
}
|
|
|
|
nEnd = i;
|
|
|
|
}
|
|
|
|
else if (bFound)
|
|
|
|
{
|
|
|
|
SetOptimalHeight( nStart, nEnd, 0, pDev, nPPTX, nPPTY, rZoomX, rZoomY, FALSE );
|
|
|
|
bFound = FALSE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (bFound)
|
|
|
|
SetOptimalHeight( nStart, nEnd, 0, pDev, nPPTX, nPPTY, rZoomX, rZoomY, FALSE );
|
|
|
|
|
|
|
|
delete[] pUsed;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
BOOL ScTable::ApplyFlags( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow,
|
2000-09-18 23:16:46 +00:00
|
|
|
INT16 nFlags )
|
|
|
|
{
|
|
|
|
BOOL bChanged = FALSE;
|
|
|
|
if (ValidColRow(nStartCol, nStartRow) && ValidColRow(nEndCol, nEndRow))
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
for (SCCOL i = nStartCol; i <= nEndCol; i++)
|
2000-09-18 23:16:46 +00:00
|
|
|
bChanged |= aCol[i].ApplyFlags(nStartRow, nEndRow, nFlags);
|
|
|
|
return bChanged;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
BOOL ScTable::RemoveFlags( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow,
|
2000-09-18 23:16:46 +00:00
|
|
|
INT16 nFlags )
|
|
|
|
{
|
|
|
|
BOOL bChanged = FALSE;
|
|
|
|
if (ValidColRow(nStartCol, nStartRow) && ValidColRow(nEndCol, nEndRow))
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
for (SCCOL i = nStartCol; i <= nEndCol; i++)
|
2000-09-18 23:16:46 +00:00
|
|
|
bChanged |= aCol[i].RemoveFlags(nStartRow, nEndRow, nFlags);
|
|
|
|
return bChanged;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
void ScTable::SetPattern( SCCOL nCol, SCROW nRow, const ScPatternAttr& rAttr, BOOL bPutToPool )
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
|
|
|
if (ValidColRow(nCol,nRow))
|
|
|
|
aCol[nCol].SetPattern( nRow, rAttr, bPutToPool );
|
|
|
|
}
|
|
|
|
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
void ScTable::ApplyAttr( SCCOL nCol, SCROW nRow, const SfxPoolItem& rAttr )
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
|
|
|
if (ValidColRow(nCol,nRow))
|
|
|
|
aCol[nCol].ApplyAttr( nRow, rAttr );
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void ScTable::ApplySelectionCache( SfxItemPoolCache* pCache, const ScMarkData& rMark )
|
|
|
|
{
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
for (SCCOL i=0; i<=MAXCOL; i++)
|
2000-09-18 23:16:46 +00:00
|
|
|
aCol[i].ApplySelectionCache( pCache, rMark );
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void ScTable::ChangeSelectionIndent( BOOL bIncrement, const ScMarkData& rMark )
|
|
|
|
{
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
for (SCCOL i=0; i<=MAXCOL; i++)
|
2000-09-18 23:16:46 +00:00
|
|
|
aCol[i].ChangeSelectionIndent( bIncrement, rMark );
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void ScTable::ClearSelectionItems( const USHORT* pWhich, const ScMarkData& rMark )
|
|
|
|
{
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
for (SCCOL i=0; i<=MAXCOL; i++)
|
2000-09-18 23:16:46 +00:00
|
|
|
aCol[i].ClearSelectionItems( pWhich, rMark );
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// Spaltenbreiten / Zeilenhoehen
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
void ScTable::SetColWidth( SCCOL nCol, USHORT nNewWidth )
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
|
|
|
if (VALIDCOL(nCol) && pColWidth)
|
|
|
|
{
|
|
|
|
if (!nNewWidth)
|
|
|
|
{
|
|
|
|
// DBG_ERROR("Spaltenbreite 0 in SetColWidth");
|
|
|
|
nNewWidth = STD_COL_WIDTH;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( nNewWidth != pColWidth[nCol] )
|
|
|
|
{
|
|
|
|
nRecalcLvl++;
|
|
|
|
ScDrawLayer* pDrawLayer = pDocument->GetDrawLayer();
|
|
|
|
if (pDrawLayer)
|
|
|
|
pDrawLayer->WidthChanged( nTab, nCol, ((long) nNewWidth) - (long) pColWidth[nCol] );
|
|
|
|
pColWidth[nCol] = nNewWidth;
|
|
|
|
if( !--nRecalcLvl )
|
|
|
|
SetDrawPageSize();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
DBG_ERROR("Falsche Spaltennummer oder keine Breiten");
|
|
|
|
}
|
|
|
|
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
void ScTable::SetRowHeight( SCROW nRow, USHORT nNewHeight )
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
|
|
|
if (VALIDROW(nRow) && pRowHeight)
|
|
|
|
{
|
|
|
|
if (!nNewHeight)
|
|
|
|
{
|
|
|
|
DBG_ERROR("Zeilenhoehe 0 in SetRowHeight");
|
|
|
|
nNewHeight = ScGlobal::nStdRowHeight;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( nNewHeight != pRowHeight[nRow] )
|
|
|
|
{
|
|
|
|
nRecalcLvl++;
|
|
|
|
ScDrawLayer* pDrawLayer = pDocument->GetDrawLayer();
|
|
|
|
if (pDrawLayer)
|
|
|
|
pDrawLayer->HeightChanged( nTab, nRow, ((long) nNewHeight) - (long) pRowHeight[nRow] );
|
|
|
|
pRowHeight[nRow] = nNewHeight;
|
|
|
|
if( !--nRecalcLvl )
|
|
|
|
SetDrawPageSize();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
DBG_ERROR("Falsche Zeilennummer oder keine Hoehen");
|
|
|
|
}
|
|
|
|
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
BOOL ScTable::SetRowHeightRange( SCROW nStartRow, SCROW nEndRow, USHORT nNewHeight,
|
2000-09-18 23:16:46 +00:00
|
|
|
double nPPTX,double nPPTY )
|
|
|
|
{
|
|
|
|
BOOL bChanged = FALSE;
|
|
|
|
if (VALIDROW(nStartRow) && VALIDROW(nEndRow) && pRowHeight)
|
|
|
|
{
|
|
|
|
nRecalcLvl++;
|
|
|
|
if (!nNewHeight)
|
|
|
|
{
|
|
|
|
DBG_ERROR("Zeilenhoehe 0 in SetRowHeight");
|
|
|
|
nNewHeight = ScGlobal::nStdRowHeight;
|
|
|
|
}
|
|
|
|
|
|
|
|
long nNewPix = (long) ( nNewHeight * nPPTY );
|
|
|
|
|
|
|
|
BOOL bSingle = FALSE;
|
|
|
|
ScDrawLayer* pDrawLayer = pDocument->GetDrawLayer();
|
|
|
|
if (pDrawLayer)
|
|
|
|
if (pDrawLayer->HasObjectsInRows( nTab, nStartRow, nEndRow ))
|
|
|
|
bSingle = TRUE;
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
SCROW nRow;
|
2000-09-18 23:16:46 +00:00
|
|
|
if (bSingle)
|
|
|
|
{
|
|
|
|
BOOL bDiff = FALSE;
|
|
|
|
for (nRow=nStartRow; nRow<=nEndRow && !bDiff; nRow++)
|
|
|
|
bDiff = ( pRowHeight[nRow] != nNewHeight );
|
|
|
|
if (!bDiff)
|
|
|
|
bSingle = FALSE;
|
|
|
|
}
|
|
|
|
if (bSingle)
|
|
|
|
{
|
|
|
|
if (nEndRow-nStartRow < 20)
|
|
|
|
for (nRow=nStartRow; nRow<=nEndRow; nRow++)
|
|
|
|
{
|
|
|
|
if (!bChanged)
|
|
|
|
if ( pRowHeight[nRow] != nNewHeight )
|
|
|
|
bChanged = ( nNewPix != (long) ( pRowHeight[nRow] * nPPTY ) );
|
|
|
|
SetRowHeight( nRow, nNewHeight );
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
SCROW nMid = (nStartRow+nEndRow) / 2;
|
2000-09-18 23:16:46 +00:00
|
|
|
if (SetRowHeightRange( nStartRow, nMid, nNewHeight, 1.0, 1.0 ))
|
|
|
|
bChanged = TRUE;
|
|
|
|
if (SetRowHeightRange( nMid+1, nEndRow, nNewHeight, 1.0, 1.0 ))
|
|
|
|
bChanged = TRUE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (pDrawLayer)
|
|
|
|
{
|
|
|
|
long nHeightDif = 0;
|
|
|
|
for (nRow=nStartRow; nRow<=nEndRow; nRow++)
|
|
|
|
nHeightDif += ((long) nNewHeight) - (long) pRowHeight[nRow];
|
|
|
|
pDrawLayer->HeightChanged( nTab, nEndRow, nHeightDif );
|
|
|
|
}
|
|
|
|
for (nRow=nStartRow; nRow<=nEndRow; nRow++)
|
|
|
|
{
|
|
|
|
if (!bChanged)
|
|
|
|
if ( pRowHeight[nRow] != nNewHeight )
|
|
|
|
bChanged = ( nNewPix != (long) ( pRowHeight[nRow] * nPPTY ) );
|
|
|
|
pRowHeight[nRow] = nNewHeight;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if( !--nRecalcLvl )
|
|
|
|
SetDrawPageSize();
|
|
|
|
}
|
|
|
|
else
|
|
|
|
DBG_ERROR("Falsche Zeilennummer oder keine Hoehen");
|
|
|
|
|
|
|
|
return bChanged;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
void ScTable::SetManualHeight( SCROW nStartRow, SCROW nEndRow, BOOL bManual )
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
|
|
|
if (VALIDROW(nStartRow) && VALIDROW(nEndRow) && pRowFlags)
|
|
|
|
{
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
SCROW nRow;
|
2000-09-18 23:16:46 +00:00
|
|
|
if (bManual)
|
|
|
|
for (nRow=nStartRow; nRow<=nEndRow; nRow++)
|
|
|
|
pRowFlags[nRow] |= CR_MANUALSIZE;
|
|
|
|
else
|
|
|
|
for (nRow=nStartRow; nRow<=nEndRow; nRow++)
|
|
|
|
pRowFlags[nRow] &= ~CR_MANUALSIZE;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
DBG_ERROR("Falsche Zeilennummer oder keine Zeilenflags");
|
|
|
|
}
|
|
|
|
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
USHORT ScTable::GetColWidth( SCCOL nCol ) const
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
|
|
|
DBG_ASSERT(VALIDCOL(nCol),"Falsche Spaltennummer");
|
|
|
|
|
|
|
|
if (VALIDCOL(nCol) && pColFlags && pColWidth)
|
|
|
|
{
|
|
|
|
if ( pColFlags[nCol] & CR_HIDDEN )
|
|
|
|
return 0;
|
|
|
|
else
|
|
|
|
return pColWidth[nCol];
|
|
|
|
}
|
|
|
|
else
|
|
|
|
return (USHORT) STD_COL_WIDTH;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
USHORT ScTable::GetOriginalWidth( SCCOL nCol ) const // immer die eingestellte
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
|
|
|
DBG_ASSERT(VALIDCOL(nCol),"Falsche Spaltennummer");
|
|
|
|
|
|
|
|
if (VALIDCOL(nCol) && pColWidth)
|
|
|
|
return pColWidth[nCol];
|
|
|
|
else
|
|
|
|
return (USHORT) STD_COL_WIDTH;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
USHORT ScTable::GetCommonWidth( SCCOL nEndCol ) const
|
2001-08-02 17:16:22 +00:00
|
|
|
{
|
|
|
|
// get the width that is used in the largest continuous column range (up to nEndCol)
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
if ( !ValidCol(nEndCol) )
|
2001-08-02 17:16:22 +00:00
|
|
|
{
|
|
|
|
DBG_ERROR("wrong column");
|
|
|
|
nEndCol = MAXCOL;
|
|
|
|
}
|
|
|
|
|
|
|
|
USHORT nMaxWidth = 0;
|
|
|
|
USHORT nMaxCount = 0;
|
|
|
|
USHORT nRangeStart = 0;
|
|
|
|
while ( nRangeStart <= nEndCol )
|
|
|
|
{
|
|
|
|
// skip hidden columns
|
|
|
|
while ( nRangeStart <= nEndCol && (pColFlags[nRangeStart] & CR_HIDDEN) )
|
|
|
|
++nRangeStart;
|
|
|
|
if ( nRangeStart <= nEndCol )
|
|
|
|
{
|
|
|
|
USHORT nThisCount = 0;
|
|
|
|
USHORT nThisWidth = pColWidth[nRangeStart];
|
|
|
|
USHORT nRangeEnd = nRangeStart;
|
|
|
|
while ( nRangeEnd <= nEndCol && pColWidth[nRangeEnd] == nThisWidth )
|
|
|
|
{
|
|
|
|
++nThisCount;
|
|
|
|
++nRangeEnd;
|
|
|
|
|
|
|
|
// skip hidden columns
|
|
|
|
while ( nRangeEnd <= nEndCol && (pColFlags[nRangeEnd] & CR_HIDDEN) )
|
|
|
|
++nRangeEnd;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( nThisCount > nMaxCount )
|
|
|
|
{
|
|
|
|
nMaxCount = nThisCount;
|
|
|
|
nMaxWidth = nThisWidth;
|
|
|
|
}
|
|
|
|
|
|
|
|
nRangeStart = nRangeEnd; // next range
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return nMaxWidth;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
USHORT ScTable::GetRowHeight( SCROW nRow ) const
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
|
|
|
DBG_ASSERT(VALIDROW(nRow),"Falsche Zeilennummer");
|
|
|
|
|
|
|
|
if (VALIDROW(nRow) && pRowFlags && pRowHeight)
|
|
|
|
{
|
|
|
|
if ( pRowFlags[nRow] & CR_HIDDEN )
|
|
|
|
return 0;
|
|
|
|
else
|
|
|
|
return pRowHeight[nRow];
|
|
|
|
}
|
|
|
|
else
|
|
|
|
return (USHORT) ScGlobal::nStdRowHeight;
|
|
|
|
}
|
|
|
|
|
2001-03-23 08:49:34 +00:00
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
USHORT ScTable::GetOriginalHeight( SCROW nRow ) const // non-0 even if hidden
|
2001-03-23 08:49:34 +00:00
|
|
|
{
|
|
|
|
DBG_ASSERT(VALIDROW(nRow),"wrong row number");
|
|
|
|
|
|
|
|
if (VALIDROW(nRow) && pRowHeight)
|
|
|
|
return pRowHeight[nRow];
|
|
|
|
else
|
|
|
|
return (USHORT) ScGlobal::nStdRowHeight;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2000-09-18 23:16:46 +00:00
|
|
|
// Spalten-/Zeilen-Flags
|
|
|
|
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
SCROW ScTable::GetHiddenRowCount( SCROW nRow ) const
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
SCROW nEndRow = nRow;
|
2000-09-18 23:16:46 +00:00
|
|
|
if ( pRowFlags )
|
|
|
|
{
|
|
|
|
while ( nEndRow <= MAXROW && ( pRowFlags[nEndRow] & CR_HIDDEN ) )
|
|
|
|
++nEndRow;
|
|
|
|
}
|
|
|
|
return nEndRow - nRow;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
//! ShowRows / DBShowRows zusammenfassen
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
void ScTable::ShowCol(SCCOL nCol, BOOL bShow)
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
|
|
|
if (VALIDCOL(nCol) && pColFlags)
|
|
|
|
{
|
|
|
|
BOOL bWasVis = ( pColFlags[nCol] & CR_HIDDEN ) == 0;
|
|
|
|
if (bWasVis != bShow)
|
|
|
|
{
|
|
|
|
nRecalcLvl++;
|
|
|
|
ScDrawLayer* pDrawLayer = pDocument->GetDrawLayer();
|
|
|
|
if (pDrawLayer)
|
|
|
|
{
|
|
|
|
if (bShow)
|
|
|
|
pDrawLayer->WidthChanged( nTab, nCol, (long) pColWidth[nCol] );
|
|
|
|
else
|
|
|
|
pDrawLayer->WidthChanged( nTab, nCol, -(long) pColWidth[nCol] );
|
|
|
|
}
|
|
|
|
|
|
|
|
if (bShow)
|
|
|
|
pColFlags[nCol] &= ~CR_HIDDEN;
|
|
|
|
else
|
|
|
|
pColFlags[nCol] |= CR_HIDDEN;
|
|
|
|
if( !--nRecalcLvl )
|
|
|
|
SetDrawPageSize();
|
|
|
|
|
|
|
|
ScChartListenerCollection* pCharts = pDocument->GetChartListenerCollection();
|
|
|
|
if ( pCharts && pCharts->GetCount() )
|
|
|
|
pCharts->SetRangeDirty(ScRange( nCol, 0, nTab, nCol, MAXROW, nTab ));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
DBG_ERROR("Falsche Spaltennummer oder keine Flags");
|
|
|
|
}
|
|
|
|
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
void ScTable::ShowRow(SCROW nRow, BOOL bShow)
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
|
|
|
if (VALIDROW(nRow) && pRowFlags)
|
|
|
|
{
|
|
|
|
BOOL bWasVis = ( pRowFlags[nRow] & CR_HIDDEN ) == 0;
|
|
|
|
if (bWasVis != bShow)
|
|
|
|
{
|
|
|
|
nRecalcLvl++;
|
|
|
|
ScDrawLayer* pDrawLayer = pDocument->GetDrawLayer();
|
|
|
|
if (pDrawLayer)
|
|
|
|
{
|
|
|
|
if (bShow)
|
|
|
|
pDrawLayer->HeightChanged( nTab, nRow, (long) pRowHeight[nRow] );
|
|
|
|
else
|
|
|
|
pDrawLayer->HeightChanged( nTab, nRow, -(long) pRowHeight[nRow] );
|
|
|
|
}
|
|
|
|
|
|
|
|
if (bShow)
|
|
|
|
pRowFlags[nRow] &= ~(CR_HIDDEN | CR_FILTERED);
|
|
|
|
else
|
|
|
|
pRowFlags[nRow] |= CR_HIDDEN;
|
|
|
|
if( !--nRecalcLvl )
|
|
|
|
SetDrawPageSize();
|
|
|
|
|
|
|
|
ScChartListenerCollection* pCharts = pDocument->GetChartListenerCollection();
|
|
|
|
if ( pCharts && pCharts->GetCount() )
|
|
|
|
pCharts->SetRangeDirty(ScRange( 0, nRow, nTab, MAXCOL, nRow, nTab ));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
DBG_ERROR("Falsche Zeilennummer oder keine Flags");
|
|
|
|
}
|
|
|
|
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
void ScTable::DBShowRow(SCROW nRow, BOOL bShow)
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
|
|
|
if (VALIDROW(nRow) && pRowFlags)
|
|
|
|
{
|
|
|
|
BOOL bWasVis = ( pRowFlags[nRow] & CR_HIDDEN ) == 0;
|
|
|
|
nRecalcLvl++;
|
|
|
|
if (bWasVis != bShow)
|
|
|
|
{
|
|
|
|
ScDrawLayer* pDrawLayer = pDocument->GetDrawLayer();
|
|
|
|
if (pDrawLayer)
|
|
|
|
{
|
|
|
|
if (bShow)
|
|
|
|
pDrawLayer->HeightChanged( nTab, nRow, (long) pRowHeight[nRow] );
|
|
|
|
else
|
|
|
|
pDrawLayer->HeightChanged( nTab, nRow, -(long) pRowHeight[nRow] );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Filter-Flag immer setzen, auch wenn Hidden unveraendert
|
|
|
|
if (bShow)
|
|
|
|
pRowFlags[nRow] &= ~(CR_HIDDEN | CR_FILTERED);
|
|
|
|
else
|
|
|
|
pRowFlags[nRow] |= (CR_HIDDEN | CR_FILTERED);
|
|
|
|
if( !--nRecalcLvl )
|
|
|
|
SetDrawPageSize();
|
|
|
|
|
|
|
|
if (bWasVis != bShow)
|
|
|
|
{
|
|
|
|
ScChartListenerCollection* pCharts = pDocument->GetChartListenerCollection();
|
|
|
|
if ( pCharts && pCharts->GetCount() )
|
|
|
|
pCharts->SetRangeDirty(ScRange( 0, nRow, nTab, MAXCOL, nRow, nTab ));
|
2003-04-08 15:20:02 +00:00
|
|
|
|
|
|
|
if (pOutlineTable)
|
|
|
|
UpdateOutlineRow( nRow, nRow, bShow );
|
2000-09-18 23:16:46 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
DBG_ERROR("Falsche Zeilennummer oder keine Flags");
|
|
|
|
}
|
|
|
|
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
void ScTable::DBShowRows(SCROW nRow1, SCROW nRow2, BOOL bShow)
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
SCROW i;
|
|
|
|
SCROW nStartRow = nRow1;
|
2000-09-18 23:16:46 +00:00
|
|
|
nRecalcLvl++;
|
|
|
|
while (nStartRow <= nRow2)
|
|
|
|
{
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
SCROW nEndRow = nStartRow;
|
2000-09-18 23:16:46 +00:00
|
|
|
BYTE nOldFlag = pRowFlags[nStartRow] & CR_HIDDEN;
|
|
|
|
while ( nEndRow < nRow2 && (pRowFlags[nEndRow+1] & CR_HIDDEN) == nOldFlag )
|
|
|
|
++nEndRow;
|
|
|
|
|
|
|
|
BOOL bWasVis = ( nOldFlag == 0 );
|
|
|
|
BOOL bChanged = ( bWasVis != bShow );
|
|
|
|
if ( bChanged )
|
|
|
|
{
|
|
|
|
ScDrawLayer* pDrawLayer = pDocument->GetDrawLayer();
|
|
|
|
if (pDrawLayer)
|
|
|
|
{
|
|
|
|
long nHeight = 0;
|
|
|
|
for (i=nStartRow; i<=nEndRow; i++)
|
|
|
|
nHeight += pRowHeight[i];
|
|
|
|
|
|
|
|
if (bShow)
|
|
|
|
pDrawLayer->HeightChanged( nTab, nStartRow, nHeight );
|
|
|
|
else
|
|
|
|
pDrawLayer->HeightChanged( nTab, nStartRow, -nHeight );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (bShow)
|
|
|
|
for (i=nStartRow; i<=nEndRow; i++)
|
|
|
|
pRowFlags[i] &= ~(CR_HIDDEN | CR_FILTERED);
|
|
|
|
else
|
|
|
|
for (i=nStartRow; i<=nEndRow; i++)
|
|
|
|
pRowFlags[i] |= (CR_HIDDEN | CR_FILTERED);
|
|
|
|
|
|
|
|
if ( bChanged )
|
|
|
|
{
|
|
|
|
ScChartListenerCollection* pCharts = pDocument->GetChartListenerCollection();
|
|
|
|
if ( pCharts && pCharts->GetCount() )
|
|
|
|
pCharts->SetRangeDirty(ScRange( 0, nStartRow, nTab, MAXCOL, nEndRow, nTab ));
|
|
|
|
}
|
|
|
|
|
|
|
|
nStartRow = nEndRow + 1;
|
|
|
|
}
|
2003-04-08 15:20:02 +00:00
|
|
|
|
|
|
|
// #i12341# For Show/Hide rows, the outlines are updated separately from the outside.
|
|
|
|
// For filtering, the changes aren't visible to the caller, so UpdateOutlineRow has
|
|
|
|
// to be done here.
|
|
|
|
if (pOutlineTable)
|
|
|
|
UpdateOutlineRow( nRow1, nRow2, bShow );
|
|
|
|
|
2000-09-18 23:16:46 +00:00
|
|
|
if( !--nRecalcLvl )
|
|
|
|
SetDrawPageSize();
|
|
|
|
}
|
|
|
|
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
void ScTable::ShowRows(SCROW nRow1, SCROW nRow2, BOOL bShow)
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
SCROW i;
|
|
|
|
SCROW nStartRow = nRow1;
|
2000-09-18 23:16:46 +00:00
|
|
|
nRecalcLvl++;
|
|
|
|
while (nStartRow <= nRow2)
|
|
|
|
{
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
SCROW nEndRow = nStartRow;
|
2000-09-18 23:16:46 +00:00
|
|
|
BYTE nOldFlag = pRowFlags[nStartRow] & CR_HIDDEN;
|
|
|
|
while ( nEndRow < nRow2 && (pRowFlags[nEndRow+1] & CR_HIDDEN) == nOldFlag )
|
|
|
|
++nEndRow;
|
|
|
|
|
|
|
|
BOOL bWasVis = ( nOldFlag == 0 );
|
|
|
|
BOOL bChanged = ( bWasVis != bShow );
|
|
|
|
if ( bChanged )
|
|
|
|
{
|
|
|
|
ScDrawLayer* pDrawLayer = pDocument->GetDrawLayer();
|
|
|
|
if (pDrawLayer)
|
|
|
|
{
|
|
|
|
long nHeight = 0;
|
|
|
|
for (i=nStartRow; i<=nEndRow; i++)
|
|
|
|
nHeight += pRowHeight[i];
|
|
|
|
|
|
|
|
if (bShow)
|
|
|
|
pDrawLayer->HeightChanged( nTab, nStartRow, nHeight );
|
|
|
|
else
|
|
|
|
pDrawLayer->HeightChanged( nTab, nStartRow, -nHeight );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (bShow)
|
|
|
|
for (i=nStartRow; i<=nEndRow; i++)
|
|
|
|
pRowFlags[i] &= ~(CR_HIDDEN | CR_FILTERED);
|
|
|
|
else
|
|
|
|
for (i=nStartRow; i<=nEndRow; i++)
|
|
|
|
pRowFlags[i] |= CR_HIDDEN;
|
|
|
|
|
|
|
|
if ( bChanged )
|
|
|
|
{
|
|
|
|
ScChartListenerCollection* pCharts = pDocument->GetChartListenerCollection();
|
|
|
|
if ( pCharts && pCharts->GetCount() )
|
|
|
|
pCharts->SetRangeDirty(ScRange( 0, nStartRow, nTab, MAXCOL, nEndRow, nTab ));
|
|
|
|
}
|
|
|
|
|
|
|
|
nStartRow = nEndRow + 1;
|
|
|
|
}
|
|
|
|
if( !--nRecalcLvl )
|
|
|
|
SetDrawPageSize();
|
|
|
|
}
|
|
|
|
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
BOOL ScTable::IsFiltered(SCROW nRow) const
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
|
|
|
if (VALIDROW(nRow) && pRowFlags)
|
|
|
|
return ( pRowFlags[nRow] & CR_FILTERED ) != 0;
|
|
|
|
|
|
|
|
DBG_ERROR("Falsche Zeilennummer oder keine Flags");
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
void ScTable::SetColFlags( SCCOL nCol, BYTE nNewFlags )
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
|
|
|
if (VALIDCOL(nCol) && pColFlags)
|
|
|
|
pColFlags[nCol] = nNewFlags;
|
|
|
|
else
|
|
|
|
DBG_ERROR("Falsche Spaltennummer oder keine Flags");
|
|
|
|
}
|
|
|
|
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
void ScTable::SetRowFlags( SCROW nRow, BYTE nNewFlags )
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
|
|
|
if (VALIDROW(nRow) && pRowFlags)
|
|
|
|
pRowFlags[nRow] = nNewFlags;
|
|
|
|
else
|
|
|
|
DBG_ERROR("Falsche Zeilennummer oder keine Flags");
|
|
|
|
}
|
|
|
|
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
BYTE ScTable::GetColFlags( SCCOL nCol ) const
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
|
|
|
if (VALIDCOL(nCol) && pColFlags)
|
|
|
|
return pColFlags[nCol];
|
|
|
|
else
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
BYTE ScTable::GetRowFlags( SCROW nRow ) const
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
|
|
|
if (VALIDROW(nRow) && pRowFlags)
|
|
|
|
return pRowFlags[nRow];
|
|
|
|
else
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
SCCOL ScTable::GetLastFlaggedCol() const
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
|
|
|
if ( !pColFlags )
|
|
|
|
return 0;
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
SCCOL nLastFound = 0;
|
|
|
|
for (SCCOL nCol = 1; nCol <= MAXCOL; nCol++)
|
2001-10-26 15:44:01 +00:00
|
|
|
if (pColFlags[nCol] & ~CR_PAGEBREAK)
|
2000-09-18 23:16:46 +00:00
|
|
|
nLastFound = nCol;
|
|
|
|
|
|
|
|
return nLastFound;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
SCROW ScTable::GetLastFlaggedRow() const
|
2001-10-26 15:44:01 +00:00
|
|
|
{
|
|
|
|
if ( !pRowFlags )
|
|
|
|
return 0;
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
SCROW nLastFound = 0;
|
|
|
|
for (SCROW nRow = 1; nRow <= MAXROW; nRow++)
|
2001-10-26 15:44:01 +00:00
|
|
|
if (pRowFlags[nRow] & ~CR_PAGEBREAK)
|
|
|
|
nLastFound = nRow;
|
|
|
|
|
|
|
|
return nLastFound;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
SCCOL ScTable::GetLastChangedCol() const
|
2001-10-26 15:44:01 +00:00
|
|
|
{
|
|
|
|
if ( !pColFlags )
|
|
|
|
return 0;
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
SCCOL nLastFound = 0;
|
|
|
|
for (SCCOL nCol = 1; nCol <= MAXCOL; nCol++)
|
2001-10-26 15:44:01 +00:00
|
|
|
if ((pColFlags[nCol] & ~CR_PAGEBREAK) || (pColWidth[nCol] != STD_COL_WIDTH))
|
|
|
|
nLastFound = nCol;
|
|
|
|
|
|
|
|
return nLastFound;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
SCROW ScTable::GetLastChangedRow() const
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
|
|
|
if ( !pRowFlags )
|
|
|
|
return 0;
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
SCROW nLastFound = 0;
|
|
|
|
for (SCROW nRow = 1; nRow <= MAXROW; nRow++)
|
2000-09-18 23:16:46 +00:00
|
|
|
if ((pRowFlags[nRow] & ~CR_PAGEBREAK) || (pRowHeight[nRow] != ScGlobal::nStdRowHeight))
|
|
|
|
nLastFound = nRow;
|
|
|
|
|
|
|
|
return nLastFound;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
BOOL ScTable::UpdateOutlineCol( SCCOL nStartCol, SCCOL nEndCol, BOOL bShow )
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
|
|
|
if (pOutlineTable && pColFlags)
|
|
|
|
return pOutlineTable->GetColArray()->ManualAction( nStartCol, nEndCol, bShow, pColFlags );
|
|
|
|
else
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
BOOL ScTable::UpdateOutlineRow( SCROW nStartRow, SCROW nEndRow, BOOL bShow )
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
|
|
|
if (pOutlineTable && pRowFlags)
|
|
|
|
return pOutlineTable->GetRowArray()->ManualAction( nStartRow, nEndRow, bShow, pRowFlags );
|
|
|
|
else
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
void ScTable::ExtendHidden( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2 )
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
|
|
|
if (pColFlags)
|
|
|
|
{
|
|
|
|
while ( rX1>0 ? (pColFlags[rX1-1] & CR_HIDDEN) : FALSE )
|
|
|
|
--rX1;
|
|
|
|
while ( rX2<MAXCOL ? (pColFlags[rX2+1] & CR_HIDDEN) : FALSE )
|
|
|
|
++rX2;
|
|
|
|
}
|
|
|
|
if (pRowFlags)
|
|
|
|
{
|
|
|
|
while ( rY1>0 ? (pRowFlags[rY1-1] & CR_HIDDEN) : FALSE )
|
|
|
|
--rY1;
|
|
|
|
while ( rY2<MAXROW ? (pRowFlags[rY2+1] & CR_HIDDEN) : FALSE )
|
|
|
|
++rY2;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
void ScTable::StripHidden( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2 )
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
|
|
|
if (pColFlags)
|
|
|
|
{
|
|
|
|
while ( rX2>rX1 && (pColFlags[rX2] & CR_HIDDEN) )
|
|
|
|
--rX2;
|
|
|
|
while ( rX2>rX1 && (pColFlags[rX1] & CR_HIDDEN) )
|
|
|
|
++rX1;
|
|
|
|
}
|
|
|
|
if (pRowFlags)
|
|
|
|
{
|
|
|
|
while ( rY2>rY1 && (pRowFlags[rY2] & CR_HIDDEN) )
|
|
|
|
--rY2;
|
|
|
|
while ( rY2>rY1 && (pRowFlags[rY1] & CR_HIDDEN) )
|
|
|
|
++rY1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// Auto-Outline
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
template< typename T >
|
|
|
|
short DiffSign( T a, T b )
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
|
|
|
return (a<b) ? -1 :
|
|
|
|
(a>b) ? 1 : 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
void ScTable::DoAutoOutline( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow )
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
|
|
|
BOOL bSizeChanged = FALSE;
|
|
|
|
BOOL bMissed = FALSE;
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
SCCOL nCol;
|
|
|
|
SCROW nRow;
|
|
|
|
SCROW i;
|
2000-09-18 23:16:46 +00:00
|
|
|
BOOL bFound;
|
|
|
|
ScOutlineArray* pArray;
|
|
|
|
ScBaseCell* pCell;
|
|
|
|
ScRange aRef;
|
|
|
|
/* ScPatternAttr aBoldPattern( pDocument->GetPool() ); //! spezielle Format-Vorlage
|
|
|
|
aBoldPattern.GetItemSet().Put( SvxWeightItem( WEIGHT_BOLD ) );
|
|
|
|
*/
|
|
|
|
|
|
|
|
StartOutlineTable();
|
|
|
|
|
|
|
|
// Zeilen
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
SCROW nCount = nEndRow-nStartRow+1;
|
2000-09-18 23:16:46 +00:00
|
|
|
BOOL* pUsed = new BOOL[nCount];
|
|
|
|
for (i=0; i<nCount; i++)
|
|
|
|
pUsed[i] = FALSE;
|
|
|
|
for (nCol=nStartCol; nCol<=nEndCol; nCol++)
|
|
|
|
if (!aCol[nCol].IsEmptyData())
|
|
|
|
aCol[nCol].FindUsed( nStartRow, nEndRow, pUsed );
|
|
|
|
|
|
|
|
pArray = pOutlineTable->GetRowArray();
|
|
|
|
for (nRow=nStartRow; nRow<=nEndRow; nRow++)
|
|
|
|
if (pUsed[nRow-nStartRow])
|
|
|
|
{
|
|
|
|
bFound = FALSE;
|
|
|
|
for (nCol=nStartCol; nCol<=nEndCol && !bFound; nCol++)
|
|
|
|
if (!aCol[nCol].IsEmptyData())
|
|
|
|
{
|
|
|
|
pCell = aCol[nCol].GetCell( nRow );
|
|
|
|
if (pCell)
|
|
|
|
if ( pCell->GetCellType() == CELLTYPE_FORMULA )
|
|
|
|
if (((ScFormulaCell*)pCell)->HasOneReference( aRef ))
|
|
|
|
if ( aRef.aStart.Col() == nCol && aRef.aEnd.Col() == nCol &&
|
|
|
|
aRef.aStart.Tab() == nTab && aRef.aEnd.Tab() == nTab &&
|
|
|
|
DiffSign( aRef.aStart.Row(), nRow ) ==
|
|
|
|
DiffSign( aRef.aEnd.Row(), nRow ) )
|
|
|
|
{
|
|
|
|
if (pArray->Insert( aRef.aStart.Row(), aRef.aEnd.Row(), bSizeChanged ))
|
|
|
|
{
|
|
|
|
// ApplyPatternArea( nStartCol, nRow, nEndCol, nRow, aBoldPattern );
|
|
|
|
bFound = TRUE;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
bMissed = TRUE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
delete[] pUsed;
|
|
|
|
|
|
|
|
// Spalten
|
|
|
|
|
|
|
|
pArray = pOutlineTable->GetColArray();
|
|
|
|
for (nCol=nStartCol; nCol<=nEndCol; nCol++)
|
|
|
|
{
|
|
|
|
if (!aCol[nCol].IsEmptyData())
|
|
|
|
{
|
|
|
|
bFound = FALSE;
|
|
|
|
ScColumnIterator aIter( &aCol[nCol], nStartRow, nEndRow );
|
|
|
|
while ( aIter.Next( nRow, pCell ) && !bFound )
|
|
|
|
{
|
|
|
|
if ( pCell->GetCellType() == CELLTYPE_FORMULA )
|
|
|
|
if (((ScFormulaCell*)pCell)->HasOneReference( aRef ))
|
|
|
|
if ( aRef.aStart.Row() == nRow && aRef.aEnd.Row() == nRow &&
|
|
|
|
aRef.aStart.Tab() == nTab && aRef.aEnd.Tab() == nTab &&
|
|
|
|
DiffSign( aRef.aStart.Col(), nCol ) ==
|
|
|
|
DiffSign( aRef.aEnd.Col(), nCol ) )
|
|
|
|
{
|
|
|
|
if (pArray->Insert( aRef.aStart.Col(), aRef.aEnd.Col(), bSizeChanged ))
|
|
|
|
{
|
|
|
|
// ApplyPatternArea( nCol, nStartRow, nCol, nEndRow, aBoldPattern );
|
|
|
|
bFound = TRUE;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
bMissed = TRUE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//
|
|
|
|
// Datei-Operationen
|
|
|
|
//
|
|
|
|
|
|
|
|
// Laden
|
|
|
|
|
|
|
|
BOOL ScTable::Load( SvStream& rStream, USHORT nVersion, ScProgress* pProgress )
|
|
|
|
{
|
|
|
|
ScReadHeader aHdr( rStream );
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
#if SC_ROWLIMIT_STREAM_ACCESS
|
|
|
|
#error address types changed!
|
2000-09-18 23:16:46 +00:00
|
|
|
USHORT i;
|
|
|
|
|
|
|
|
while (aHdr.BytesLeft() && rStream.GetError() == SVSTREAM_OK)
|
|
|
|
{
|
|
|
|
USHORT nID;
|
|
|
|
rStream >> nID;
|
|
|
|
switch (nID)
|
|
|
|
{
|
|
|
|
case SCID_COLUMNS: // Spalten (Daten)
|
|
|
|
{
|
|
|
|
ScMultipleReadHeader aColHdr( rStream );
|
|
|
|
if( nVersion >= SC_DATABYTES )
|
|
|
|
while( aColHdr.BytesLeft() )
|
|
|
|
{
|
|
|
|
BYTE nCol;
|
|
|
|
rStream >> nCol;
|
|
|
|
aCol[ nCol ].Load(rStream, aColHdr);
|
|
|
|
if (pProgress)
|
|
|
|
pProgress->SetState( rStream.Tell() );
|
|
|
|
}
|
|
|
|
else
|
|
|
|
for (i=0; i<=MAXCOL; i++)
|
|
|
|
{
|
|
|
|
aCol[i].Load(rStream, aColHdr);
|
|
|
|
if (pProgress)
|
|
|
|
pProgress->SetState( rStream.Tell() );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case SCID_COLROWFLAGS: // Spalten-/Zeilenflags
|
|
|
|
{
|
|
|
|
ScReadHeader aFlagsHdr( rStream );
|
|
|
|
|
|
|
|
BYTE nFlags;
|
|
|
|
USHORT nVal;
|
|
|
|
short nRep;
|
|
|
|
|
|
|
|
i=0;
|
|
|
|
while (i<=MAXCOL)
|
|
|
|
{
|
|
|
|
rStream >> nRep;
|
|
|
|
rStream >> nVal;
|
|
|
|
while (nRep-- && i<=MAXCOL)
|
|
|
|
pColWidth[i++] = nVal;
|
|
|
|
}
|
|
|
|
DBG_ASSERT(nRep==-1, "Fehler bei Spaltenbreiten");
|
|
|
|
i=0;
|
|
|
|
while (i<=MAXCOL)
|
|
|
|
{
|
|
|
|
rStream >> nRep;
|
|
|
|
rStream >> nFlags;
|
|
|
|
while (nRep-- && i<=MAXCOL)
|
|
|
|
pColFlags[i++] = nFlags;
|
|
|
|
}
|
|
|
|
DBG_ASSERT(nRep==-1, "Fehler bei Spaltenflags");
|
|
|
|
if (pProgress)
|
|
|
|
pProgress->SetState( rStream.Tell() );
|
|
|
|
|
|
|
|
// aus der Datei immer soviele Zeilen laden, wie gespeichert wurden
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
SCROW nSrcMaxRow = pDocument->GetSrcMaxRow();
|
2000-09-18 23:16:46 +00:00
|
|
|
|
|
|
|
i=0;
|
|
|
|
while (i<=nSrcMaxRow) // nSrcMaxRow und MAXROW evtl. unterschiedlich
|
|
|
|
{
|
|
|
|
rStream >> nRep;
|
|
|
|
rStream >> nVal;
|
|
|
|
while (nRep--)
|
|
|
|
{
|
|
|
|
if (i<=MAXROW)
|
|
|
|
pRowHeight[i] = nVal;
|
|
|
|
++i;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
DBG_ASSERT(i==nSrcMaxRow+1, "Fehler bei Zeilenhoehen");
|
|
|
|
if (pProgress)
|
|
|
|
pProgress->SetState( rStream.Tell() );
|
|
|
|
i=0;
|
|
|
|
while (i<=nSrcMaxRow) // nSrcMaxRow und MAXROW evtl. unterschiedlich
|
|
|
|
{
|
|
|
|
rStream >> nRep;
|
|
|
|
rStream >> nFlags;
|
|
|
|
while (nRep--)
|
|
|
|
{
|
|
|
|
if (i<=MAXROW)
|
|
|
|
pRowFlags[i] = nFlags;
|
|
|
|
++i;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
DBG_ASSERT(i==nSrcMaxRow+1, "Fehler bei Zeilenflags");
|
|
|
|
if (pProgress)
|
|
|
|
pProgress->SetState( rStream.Tell() );
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case SCID_TABOPTIONS: // einzelne Einstellungen
|
|
|
|
{
|
|
|
|
ScReadHeader aFlagsHdr( rStream );
|
|
|
|
|
|
|
|
rStream.ReadByteString( aName, rStream.GetStreamCharSet() );
|
|
|
|
|
|
|
|
rStream >> bScenario;
|
|
|
|
rStream.ReadByteString( aComment, rStream.GetStreamCharSet() );
|
|
|
|
|
|
|
|
rStream >> bProtected;
|
2001-02-22 17:13:02 +00:00
|
|
|
String aPass;
|
|
|
|
rStream.ReadByteString( aPass, rStream.GetStreamCharSet() );
|
|
|
|
if (aPass.Len())
|
|
|
|
SvPasswordHelper::GetHashPassword(aProtectPass, aPass);
|
2000-09-18 23:16:46 +00:00
|
|
|
|
|
|
|
BOOL bOutline;
|
|
|
|
rStream >> bOutline;
|
|
|
|
if (bOutline)
|
|
|
|
{
|
|
|
|
StartOutlineTable();
|
|
|
|
pOutlineTable->Load( rStream );
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( aFlagsHdr.BytesLeft() )
|
|
|
|
{
|
|
|
|
SfxStyleSheetBasePool* pStylePool =
|
|
|
|
pDocument->GetStyleSheetPool();
|
|
|
|
|
|
|
|
rStream.ReadByteString( aPageStyle, rStream.GetStreamCharSet() );
|
|
|
|
|
|
|
|
if ( !pStylePool->Find( aPageStyle, SFX_STYLE_FAMILY_PAGE ) )
|
|
|
|
{
|
|
|
|
DBG_TRACE( "PageStyle not found. Using Standard." );
|
|
|
|
aPageStyle = ScGlobal::GetRscString(STR_STYLENAME_STANDARD);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( aFlagsHdr.BytesLeft() )
|
|
|
|
{
|
|
|
|
BOOL bOneRange; // einzelner Druckbereich ?
|
|
|
|
rStream >> bOneRange;
|
|
|
|
if ( bOneRange )
|
|
|
|
{
|
|
|
|
ScRange aRange;
|
|
|
|
rStream >> aRange;
|
2003-12-01 08:50:42 +00:00
|
|
|
SetPrintRange( aRange );
|
2000-09-18 23:16:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
lcl_LoadRange( rStream, &pRepeatColRange );
|
|
|
|
lcl_LoadRange( rStream, &pRepeatRowRange );
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( aFlagsHdr.BytesLeft() )
|
|
|
|
rStream >> bVisible;
|
|
|
|
|
|
|
|
if ( aFlagsHdr.BytesLeft() ) // Druckbereiche ab Version 314c
|
|
|
|
{
|
|
|
|
USHORT nNewCount;
|
|
|
|
rStream >> nNewCount;
|
|
|
|
if ( nNewCount )
|
|
|
|
{
|
|
|
|
ScRange aTmp;
|
2003-12-01 08:50:42 +00:00
|
|
|
ClearPrintRanges();
|
2000-09-18 23:16:46 +00:00
|
|
|
for (i=0; i<nNewCount; i++)
|
|
|
|
{
|
|
|
|
rStream >> aTmp;
|
2003-12-01 08:50:42 +00:00
|
|
|
AddPrintRange( aTmp );
|
2000-09-18 23:16:46 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( aFlagsHdr.BytesLeft() ) // erweiterte Szenario-Flags ab 5.0
|
|
|
|
{
|
|
|
|
rStream >> aScenarioColor;
|
|
|
|
rStream >> nScenarioFlags;
|
|
|
|
rStream >> bActiveScenario;
|
|
|
|
}
|
|
|
|
else if ( bScenario )
|
|
|
|
{
|
|
|
|
// Default fuer Szenarien aus alten Dateien??
|
|
|
|
// Wenn die alten Szenarien wirklich benutzt wurden,
|
|
|
|
// wuerde der Rahmen wahrscheinlich stoeren.
|
|
|
|
|
|
|
|
nScenarioFlags = SC_SCENARIO_COPYALL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (pProgress)
|
|
|
|
pProgress->SetState( rStream.Tell() );
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case SCID_TABLINK: // Verknuepfung
|
|
|
|
{
|
|
|
|
ScReadHeader aLinkHdr( rStream );
|
|
|
|
|
|
|
|
rStream >> nLinkMode;
|
|
|
|
rStream.ReadByteString( aLinkDoc, rStream.GetStreamCharSet() );
|
|
|
|
aLinkDoc = INetURLObject::RelToAbs( aLinkDoc );
|
|
|
|
rStream.ReadByteString( aLinkFlt, rStream.GetStreamCharSet() );
|
|
|
|
rStream.ReadByteString( aLinkTab, rStream.GetStreamCharSet() );
|
|
|
|
|
|
|
|
BOOL bRelURL;
|
|
|
|
if ( aLinkHdr.BytesLeft() )
|
|
|
|
rStream >> bRelURL;
|
|
|
|
else
|
|
|
|
bRelURL = FALSE;
|
|
|
|
// externer Tabellenname relativ zu absolut
|
|
|
|
if ( nLinkMode == SC_LINK_VALUE && bRelURL )
|
|
|
|
aName = ScGlobal::GetDocTabName( aLinkDoc, aLinkTab );
|
|
|
|
|
|
|
|
if ( aLinkHdr.BytesLeft() ) // ab 336 auch Filter-Optionen
|
|
|
|
rStream.ReadByteString( aLinkOpt, rStream.GetStreamCharSet() );
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
{
|
|
|
|
DBG_ERROR("unbekannter Sub-Record in ScTable::Load");
|
|
|
|
ScReadHeader aDummyHeader( rStream );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Neuberechnungen
|
|
|
|
|
|
|
|
ScDrawLayer* pDrawLayer = pDocument->GetDrawLayer();
|
|
|
|
if (pDrawLayer)
|
|
|
|
pDrawLayer->ScRenamePage( nTab, aName );
|
|
|
|
|
|
|
|
return TRUE;
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
#else
|
|
|
|
return FALSE;
|
|
|
|
#endif // SC_ROWLIMIT_STREAM_ACCESS
|
2000-09-18 23:16:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Speichern
|
|
|
|
|
|
|
|
|
|
|
|
void lcl_SaveValue( SvStream& rStream, USHORT* pValue, USHORT nEnd )
|
|
|
|
{
|
|
|
|
USHORT nPos = 0;
|
|
|
|
while (nPos<=nEnd)
|
|
|
|
{
|
|
|
|
USHORT nVal = pValue[nPos];
|
|
|
|
USHORT nNextPos = nPos+1;
|
|
|
|
while (nNextPos<=nEnd && pValue[nNextPos]==nVal)
|
|
|
|
++nNextPos;
|
|
|
|
rStream << (USHORT)( nNextPos - nPos );
|
|
|
|
rStream << nVal;
|
|
|
|
nPos = nNextPos;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void lcl_SaveFlags( SvStream& rStream, BYTE* pValue, USHORT nEnd )
|
|
|
|
{
|
|
|
|
USHORT nPos = 0;
|
|
|
|
while (nPos<=nEnd)
|
|
|
|
{
|
|
|
|
BYTE nVal = pValue[nPos] & CR_SAVEMASK;
|
|
|
|
USHORT nNextPos = nPos+1;
|
|
|
|
while (nNextPos<=nEnd && (pValue[nNextPos] & CR_SAVEMASK)==nVal)
|
|
|
|
++nNextPos;
|
|
|
|
rStream << (USHORT)( nNextPos - nPos );
|
|
|
|
rStream << nVal;
|
|
|
|
nPos = nNextPos;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void lcl_LoadRange( SvStream& rStream, ScRange** ppRange )
|
|
|
|
{
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
#if SC_ROWLIMIT_STREAM_ACCESS
|
|
|
|
#error address types changed!
|
2000-09-18 23:16:46 +00:00
|
|
|
BOOL bIsSet = FALSE;
|
|
|
|
|
|
|
|
rStream >> bIsSet;
|
|
|
|
|
|
|
|
if ( bIsSet )
|
|
|
|
{
|
|
|
|
*ppRange = new ScRange;
|
|
|
|
rStream >> **ppRange;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
*ppRange = NULL;
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
#else
|
|
|
|
*ppRange = NULL;
|
|
|
|
#endif // SC_ROWLIMIT_STREAM_ACCESS
|
2000-09-18 23:16:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2003-12-01 08:50:42 +00:00
|
|
|
void lcl_SaveRange( SvStream& rStream, const ScRange* pRange )
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
#if SC_ROWLIMIT_STREAM_ACCESS
|
|
|
|
#error address types changed!
|
2000-09-18 23:16:46 +00:00
|
|
|
if ( pRange )
|
|
|
|
{
|
|
|
|
rStream << (BOOL)TRUE;
|
|
|
|
rStream << *pRange;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
rStream << (BOOL)FALSE;
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
#endif // SC_ROWLIMIT_STREAM_ACCESS
|
2000-09-18 23:16:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
BOOL ScTable::Save( SvStream& rStream, long& rSavedDocCells, ScProgress* pProgress ) const
|
|
|
|
{
|
|
|
|
ScWriteHeader aHdr( rStream );
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
#if SC_ROWLIMIT_STREAM_ACCESS
|
|
|
|
#error address types changed!
|
2000-09-18 23:16:46 +00:00
|
|
|
USHORT i;
|
|
|
|
|
|
|
|
// Spalten (Daten)
|
|
|
|
|
|
|
|
{
|
|
|
|
rStream << (USHORT) SCID_COLUMNS;
|
|
|
|
ScMultipleWriteHeader aColHdr( rStream );
|
|
|
|
|
|
|
|
for (i=0; i<=MAXCOL; i++)
|
|
|
|
{
|
|
|
|
const ScColumn* pCol = &aCol[ i ];
|
|
|
|
if( !pCol->IsEmptyData() || pCol->NoteCount() || !pCol->IsEmptyAttr())
|
|
|
|
{
|
|
|
|
rStream << (BYTE) i;
|
|
|
|
aCol[i].Save(rStream, aColHdr);
|
|
|
|
rSavedDocCells += aCol[i].GetWeightedCount();
|
|
|
|
if (pProgress)
|
|
|
|
pProgress->SetState( rSavedDocCells );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Spalten-/Zeilenflags
|
|
|
|
|
|
|
|
{
|
|
|
|
rStream << (USHORT) SCID_COLROWFLAGS;
|
|
|
|
ScWriteHeader aFlagsHdr( rStream );
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
SCROW nSaveMaxRow = pDocument->GetSrcMaxRow();
|
2000-09-18 23:16:46 +00:00
|
|
|
|
|
|
|
lcl_SaveValue( rStream, pColWidth, MAXCOL );
|
|
|
|
lcl_SaveFlags( rStream, pColFlags, MAXCOL );
|
|
|
|
lcl_SaveValue( rStream, pRowHeight,nSaveMaxRow );
|
|
|
|
lcl_SaveFlags( rStream, pRowFlags, nSaveMaxRow );
|
|
|
|
|
|
|
|
// wenn dabei weniger Zeilenhoehen als vorhanden gespeichert wurden,
|
|
|
|
// gibt das noch keine Warnung wegen Datenverlust.
|
|
|
|
}
|
|
|
|
|
|
|
|
BOOL bRelURL = FALSE;
|
|
|
|
String aLinkDocSaveName( aLinkDoc );
|
|
|
|
String aSaveName( aName );
|
|
|
|
if ( nLinkMode )
|
|
|
|
{
|
|
|
|
aLinkDocSaveName = INetURLObject::AbsToRel( aLinkDocSaveName );
|
|
|
|
aLinkDocSaveName = INetURLObject::decode( aLinkDocSaveName,
|
|
|
|
INET_HEX_ESCAPE, INetURLObject::DECODE_UNAMBIGUOUS );
|
2001-08-06 09:21:02 +00:00
|
|
|
if ( ScGlobal::pTransliteration->isEqual( aLinkDocSaveName,
|
2000-09-18 23:16:46 +00:00
|
|
|
INetURLObject::decode( aLinkDoc, INET_HEX_ESCAPE,
|
2001-08-06 09:21:02 +00:00
|
|
|
INetURLObject::DECODE_UNAMBIGUOUS ) ) )
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
|
|
|
aSaveName = INetURLObject::decode( aSaveName,
|
|
|
|
INET_HEX_ESCAPE, INetURLObject::DECODE_UNAMBIGUOUS );
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
bRelURL = TRUE;
|
|
|
|
// Reference to external sheet, only the sheet name is stored
|
|
|
|
// instead of the absolute DocTabName, will be reconcatenated upon
|
|
|
|
// load time.
|
|
|
|
if ( nLinkMode == SC_LINK_VALUE )
|
|
|
|
aSaveName = aLinkTab;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// einzelne Einstellungen
|
|
|
|
|
|
|
|
{
|
|
|
|
rStream << (USHORT) SCID_TABOPTIONS;
|
|
|
|
ScWriteHeader aFlagsHdr( rStream );
|
|
|
|
|
|
|
|
rStream.WriteByteString( aSaveName, rStream.GetStreamCharSet() );
|
|
|
|
|
|
|
|
rStream << bScenario;
|
|
|
|
rStream.WriteByteString( aComment, rStream.GetStreamCharSet() );
|
|
|
|
|
|
|
|
rStream << bProtected;
|
2001-02-22 17:13:02 +00:00
|
|
|
String aPass;
|
|
|
|
//rStream.WriteByteString( aProtectPass, rStream.GetStreamCharSet() );
|
|
|
|
rStream.WriteByteString( aPass, rStream.GetStreamCharSet() );
|
2000-09-18 23:16:46 +00:00
|
|
|
|
|
|
|
BOOL bOutline = ( pOutlineTable != NULL );
|
|
|
|
rStream << bOutline;
|
|
|
|
if (bOutline)
|
|
|
|
pOutlineTable->Store( rStream );
|
|
|
|
|
|
|
|
rStream.WriteByteString( aPageStyle, rStream.GetStreamCharSet() );
|
|
|
|
|
2003-12-01 08:50:42 +00:00
|
|
|
if ( GetPrintRangeCount() == 1 ) // kompatibel zu alten Versionen
|
|
|
|
lcl_SaveRange( rStream, &aPrintRanges[0] ); // (nur wenn genau ein Bereich)
|
2000-09-18 23:16:46 +00:00
|
|
|
else
|
|
|
|
lcl_SaveRange( rStream, NULL );
|
|
|
|
lcl_SaveRange( rStream, pRepeatColRange );
|
|
|
|
lcl_SaveRange( rStream, pRepeatRowRange );
|
|
|
|
|
|
|
|
rStream << bVisible;
|
|
|
|
|
2003-12-01 08:50:42 +00:00
|
|
|
if ( GetPrintRangeCount() > 1 ) // einzelner Bereich schon oben
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
2003-12-01 08:50:42 +00:00
|
|
|
rStream << GetPrintRangeCount(); // ab Version 314c
|
|
|
|
if ( GetPrintRangeCount() > 1 )
|
|
|
|
for ( i=0; i<GetPrintRangeCount(); i++)
|
|
|
|
rStream << aPrintRanges[i];
|
2000-09-18 23:16:46 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
rStream << (USHORT) 0;
|
|
|
|
|
|
|
|
if( rStream.GetVersion() > SOFFICE_FILEFORMAT_40 ) // erweiterte Szenario-Flags ab 5.0
|
|
|
|
{
|
|
|
|
rStream << aScenarioColor;
|
|
|
|
rStream << nScenarioFlags;
|
|
|
|
rStream << bActiveScenario;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Verknuepfung
|
|
|
|
|
|
|
|
if (nLinkMode)
|
|
|
|
{
|
|
|
|
rStream << (USHORT) SCID_TABLINK;
|
|
|
|
ScWriteHeader aLinkHdr( rStream );
|
|
|
|
|
|
|
|
// Hack, um verknuepfte Tabellen mit der 3.1 laden zu koennen (#35242#)
|
|
|
|
// bei 3.1 Export Filter von "StarCalc 4.0" auf "StarCalc 3.0" umsetzen
|
|
|
|
// (4.0 Dateien koennen vom Calc 3.1 gelesen werden)
|
|
|
|
String aSaveFlt = aLinkFlt;
|
|
|
|
if ( rStream.GetVersion() == SOFFICE_FILEFORMAT_31 && aSaveFlt.EqualsAscii("StarCalc 4.0") )
|
|
|
|
aSaveFlt.AssignAscii(RTL_CONSTASCII_STRINGPARAM("StarCalc 3.0"));
|
|
|
|
|
|
|
|
rStream << nLinkMode;
|
|
|
|
rStream.WriteByteString( aLinkDocSaveName, rStream.GetStreamCharSet() );
|
|
|
|
rStream.WriteByteString( aSaveFlt, rStream.GetStreamCharSet() );
|
|
|
|
rStream.WriteByteString( aLinkTab, rStream.GetStreamCharSet() );
|
|
|
|
rStream << bRelURL;
|
|
|
|
rStream.WriteByteString( aLinkOpt, rStream.GetStreamCharSet() );
|
|
|
|
}
|
|
|
|
|
|
|
|
return TRUE;
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
#else
|
|
|
|
return FALSE;
|
|
|
|
#endif // SC_ROWLIMIT_STREAM_ACCESS
|
2000-09-18 23:16:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// CopyData - fuer Query in anderen Bereich
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
void ScTable::CopyData( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow,
|
|
|
|
SCCOL nDestCol, SCROW nDestRow, SCTAB nDestTab )
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
|
|
|
//! wenn fuer mehrere Zeilen benutzt, nach Spalten optimieren!
|
|
|
|
|
|
|
|
ScAddress aSrc( nStartCol, nStartRow, nTab );
|
|
|
|
ScAddress aDest( nDestCol, nDestRow, nDestTab );
|
|
|
|
ScRange aRange( aSrc, aDest );
|
|
|
|
BOOL bThisTab = ( nDestTab == nTab );
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
SCROW nDestY = nDestRow;
|
|
|
|
for (SCROW nRow=nStartRow; nRow<=nEndRow; nRow++)
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
|
|
|
aSrc.SetRow( nRow );
|
|
|
|
aDest.SetRow( nDestY );
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
SCCOL nDestX = nDestCol;
|
|
|
|
for (SCCOL nCol=nStartCol; nCol<=nEndCol; nCol++)
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
|
|
|
aSrc.SetCol( nCol );
|
|
|
|
aDest.SetCol( nDestX );
|
|
|
|
ScBaseCell* pCell = GetCell( nCol, nRow );
|
|
|
|
if (pCell)
|
|
|
|
{
|
|
|
|
pCell = pCell->Clone(pDocument);
|
|
|
|
if (pCell->GetCellType() == CELLTYPE_FORMULA)
|
|
|
|
{
|
|
|
|
((ScFormulaCell*)pCell)->UpdateReference( URM_COPY, aRange,
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
((SCsCOL) nDestCol) - ((SCsCOL) nStartCol),
|
|
|
|
((SCsROW) nDestRow) - ((SCsROW) nStartRow),
|
|
|
|
((SCsTAB) nDestTab) - ((SCsTAB) nTab) );
|
2000-09-18 23:16:46 +00:00
|
|
|
((ScFormulaCell*)pCell)->aPos = aDest;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (bThisTab)
|
|
|
|
{
|
|
|
|
PutCell( nDestX, nDestY, pCell );
|
|
|
|
SetPattern( nDestX, nDestY, *GetPattern( nCol, nRow ), TRUE );
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
pDocument->PutCell( aDest, pCell );
|
|
|
|
pDocument->SetPattern( aDest, *GetPattern( nCol, nRow ), TRUE );
|
|
|
|
}
|
|
|
|
|
|
|
|
++nDestX;
|
|
|
|
}
|
|
|
|
++nDestY;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
BOOL ScTable::RefVisible(ScFormulaCell* pCell)
|
|
|
|
{
|
|
|
|
ScRange aRef;
|
|
|
|
|
|
|
|
if (pCell->HasOneReference(aRef))
|
|
|
|
{
|
|
|
|
if (aRef.aStart.Col()==aRef.aEnd.Col() && aRef.aStart.Tab()==aRef.aEnd.Tab() && pRowFlags)
|
|
|
|
{
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
for (SCROW nRow=aRef.aStart.Row(); nRow<=aRef.aEnd.Row(); nRow++)
|
2000-09-18 23:16:46 +00:00
|
|
|
if ( (pRowFlags[nRow] & CR_FILTERED) == 0 )
|
|
|
|
return TRUE; // Teil sichtbar
|
|
|
|
return FALSE; // alles unsichtbar
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return TRUE; // irgendwie anders
|
|
|
|
}
|
|
|
|
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
void ScTable::GetUpperCellString(SCCOL nCol, SCROW nRow, String& rStr)
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
|
|
|
GetInputString(nCol, nRow, rStr);
|
|
|
|
rStr.EraseTrailingChars();
|
|
|
|
rStr.EraseLeadingChars();
|
|
|
|
ScGlobal::pCharClass->toUpper(rStr);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// Berechnen der Groesse der Tabelle und setzen der Groesse an der DrawPage
|
|
|
|
|
|
|
|
void ScTable::SetDrawPageSize()
|
|
|
|
{
|
|
|
|
ScDrawLayer* pDrawLayer = pDocument->GetDrawLayer();
|
|
|
|
if( pDrawLayer )
|
|
|
|
{
|
|
|
|
ULONG x = GetColOffset( MAXCOL + 1 );
|
|
|
|
ULONG y = GetRowOffset( MAXROW + 1 );
|
|
|
|
x = (ULONG) ((double) x * HMM_PER_TWIPS);
|
|
|
|
y = (ULONG) ((double) y * HMM_PER_TWIPS);
|
2004-02-03 11:20:54 +00:00
|
|
|
|
|
|
|
if ( IsLayoutRTL() ) // IsNegativePage
|
|
|
|
x = -x;
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
pDrawLayer->SetPageSize( static_cast<sal_uInt16>(nTab), Size( x, y ) );
|
2000-09-18 23:16:46 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
ULONG ScTable::GetRowOffset( SCROW nRow ) const
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
|
|
|
ULONG n = 0;
|
|
|
|
if ( pRowFlags && pRowHeight )
|
|
|
|
{
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
SCROW i;
|
2000-09-18 23:16:46 +00:00
|
|
|
BYTE* pFlags = pRowFlags;
|
|
|
|
USHORT* pHeight = pRowHeight;
|
|
|
|
for( i = 0; i < nRow; i++, pFlags++, pHeight++ )
|
|
|
|
if( !( *pFlags & CR_HIDDEN ) )
|
|
|
|
n += *pHeight;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
DBG_ERROR("GetRowOffset: Daten fehlen");
|
|
|
|
return n;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
ULONG ScTable::GetColOffset( SCCOL nCol ) const
|
2000-09-18 23:16:46 +00:00
|
|
|
{
|
|
|
|
ULONG n = 0;
|
|
|
|
if ( pColFlags && pColWidth )
|
|
|
|
{
|
INTEGRATION: CWS rowlimit (1.24.16); FILE MERGED
2004/05/27 18:44:57 er 1.24.16.12: #i1967# ExtendMerge, IsBlockEmpty: check for valid column numbers
2004/05/06 16:01:06 er 1.24.16.11: #i1967# type correctness
2004/04/29 16:23:15 er 1.24.16.10: RESYNC: (1.25-1.26); FILE MERGED
2004/03/25 21:35:53 er 1.24.16.9: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/18 18:29:37 er 1.24.16.8: #i1967# type correctness
2004/03/11 12:07:43 er 1.24.16.7: #i1967# type correctness
2004/03/07 11:32:52 jmarmion 1.24.16.6: #i1967# step 5 changes
2004/02/13 11:33:17 er 1.24.16.5: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/02/11 14:08:59 er 1.24.16.4: RESYNC: (1.24-1.25); FILE MERGED
2004/01/16 17:42:44 er 1.24.16.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:31 er 1.24.16.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/09 20:51:37 er 1.24.16.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT
2004-06-04 09:28:24 +00:00
|
|
|
SCCOL i;
|
2000-09-18 23:16:46 +00:00
|
|
|
BYTE* pFlags = pColFlags;
|
|
|
|
USHORT* pWidth = pColWidth;
|
|
|
|
for( i = 0; i < nCol; i++, pFlags++, pWidth++ )
|
|
|
|
if( !( *pFlags & CR_HIDDEN ) )
|
|
|
|
n += *pWidth;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
DBG_ERROR("GetColumnOffset: Daten fehlen");
|
|
|
|
return n;
|
|
|
|
}
|
|
|
|
|