diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-06-04 10:06:09 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-06-04 10:06:09 +0000 |
| commit | 46615b6e5c54c29b64021da31aed267cf194ea02 (patch) | |
| tree | c90b1c93560420a9b4ab9426f7d8173d26c33232 /sc/source | |
| parent | b3efcfd02c85b1eb979fd6f530f4ec3f2773b218 (diff) | |
INTEGRATION: CWS rowlimit (1.13.202); FILE MERGED
2004/03/19 13:47:36 er 1.13.202.4: #i1967# type correctness
2004/03/15 17:24:32 er 1.13.202.3: RESYNC: (1.13-1.14); FILE MERGED
2004/03/02 18:25:16 jmarmion 1.13.202.2: #i1967# step 5 changes
2004/01/19 14:49:48 jmarmion 1.13.202.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short.
Diffstat (limited to 'sc/source')
| -rw-r--r-- | sc/source/filter/xcl97/XclExpChangeTrack.cxx | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/sc/source/filter/xcl97/XclExpChangeTrack.cxx b/sc/source/filter/xcl97/XclExpChangeTrack.cxx index cd03479e31e4..d2ba9a8f1284 100644 --- a/sc/source/filter/xcl97/XclExpChangeTrack.cxx +++ b/sc/source/filter/xcl97/XclExpChangeTrack.cxx @@ -2,9 +2,9 @@ * * $RCSfile: XclExpChangeTrack.cxx,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: rt $ $Date: 2004-03-02 09:47:18 $ + * last change: $Author: obo $ $Date: 2004-06-04 11:06:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -904,12 +904,12 @@ XclExpChTrInsert::XclExpChTrInsert( if( nOpCode & EXC_CHTR_OP_COLFLAG ) { aRange.aStart.SetRow( 0 ); - aRange.aEnd.SetRow( rRootData.nRowMax ); + aRange.aEnd.SetRow( static_cast<SCROW>(rRootData.nRowMax) ); } else { aRange.aStart.SetCol( 0 ); - aRange.aEnd.SetCol( rRootData.nColMax ); + aRange.aEnd.SetCol( static_cast<SCCOL>(rRootData.nColMax) ); } if( nOpCode & EXC_CHTR_OP_DELFLAG ) @@ -961,7 +961,7 @@ XclExpChTrInsertTab::XclExpChTrInsertTab( const XclExpChTrTabIdBuffer& rTabIdBuffer ) : XclExpChTrAction( rAction, rRootData, rTabIdBuffer, EXC_CHTR_OP_INSTAB ), ExcRoot( &rRootData ), - nTab( (sal_uInt16) rAction.GetBigRange().aStart.Tab() ) + nTab( (SCTAB) rAction.GetBigRange().aStart.Tab() ) { nLength = 0x0000021C; bForceInfo = sal_True; @@ -1006,12 +1006,12 @@ XclExpChTrMoveRange::XclExpChTrMoveRange( aSourceRange = aDestRange; sal_Int32 nDCols, nDRows, nDTabs; rAction.GetDelta( nDCols, nDRows, nDTabs ); - aSourceRange.aStart.IncRow( (USHORT) -nDRows ); - aSourceRange.aStart.IncCol( (USHORT) -nDCols ); - aSourceRange.aStart.IncTab( (USHORT) -nDTabs ); - aSourceRange.aEnd.IncRow( (USHORT) -nDRows ); - aSourceRange.aEnd.IncCol( (USHORT) -nDCols ); - aSourceRange.aEnd.IncTab( (USHORT) -nDTabs ); + aSourceRange.aStart.IncRow( (SCROW) -nDRows ); + aSourceRange.aStart.IncCol( (SCCOL) -nDCols ); + aSourceRange.aStart.IncTab( (SCTAB) -nDTabs ); + aSourceRange.aEnd.IncRow( (SCROW) -nDRows ); + aSourceRange.aEnd.IncCol( (SCCOL) -nDCols ); + aSourceRange.aEnd.IncTab( (SCTAB) -nDTabs ); AddDependentContents( rAction, rRootData, rChangeTrack ); } @@ -1145,7 +1145,7 @@ XclExpChangeTrack::XclExpChangeTrack( RootData* pRootData ) : { if( pScAction->GetType() == SC_CAT_INSERT_TABS ) { - sal_uInt16 nScTab = (sal_uInt16) pScAction->GetBigRange().aStart.Tab(); + SCTAB nScTab = static_cast< SCTAB >( pScAction->GetBigRange().aStart.Tab() ); pTabIdBuffer->InitFill( pExcRoot->pER->GetTabInfo().GetXclTab( nScTab ) ); } } @@ -1216,7 +1216,7 @@ sal_Bool XclExpChangeTrack::CreateTempChangeTrack() return sal_False; // adjust table count - USHORT nOrigCount = pExcRoot->pDoc->GetTableCount(); + SCTAB nOrigCount = pExcRoot->pDoc->GetTableCount(); String sTabName; for( sal_Int32 nIndex = 0; nIndex < nOrigCount; nIndex++ ) { |