diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-06-04 10:49:52 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-06-04 10:49:52 +0000 |
| commit | 26ae5b74482b25231bb089dfdf75d184f878c637 (patch) | |
| tree | f683183ce01b4f347847152bb6ae9ef17b5858eb /sc/source/ui/optdlg | |
| parent | 25aad982e5a34daa84e436d33ffd2f56b953760e (diff) | |
INTEGRATION: CWS rowlimit (1.2.302); FILE MERGED
2004/02/11 13:52:21 er 1.2.302.3: RESYNC: (1.2-1.3); FILE MERGED
2004/02/04 11:28:22 er 1.2.302.2: #i1967# replace ScTripel,ScRefTripel with ScAddress,ScRefAddress; get rid of some warnings
2004/01/14 17:44:59 er 1.2.302.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
Diffstat (limited to 'sc/source/ui/optdlg')
| -rw-r--r-- | sc/source/ui/optdlg/tpusrlst.cxx | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx index 43e5aabacb5b..dd9da4128bfa 100644 --- a/sc/source/ui/optdlg/tpusrlst.cxx +++ b/sc/source/ui/optdlg/tpusrlst.cxx @@ -2,9 +2,9 @@ * * $RCSfile: tpusrlst.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: hr $ $Date: 2004-05-10 16:04:37 $ + * last change: $Author: obo $ $Date: 2004-06-04 11:49:52 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -175,12 +175,12 @@ void ScTpUserLists::Init() if ( pViewSh ) { - USHORT nStartTab = 0; - USHORT nEndTab = 0; - USHORT nStartCol = 0; - USHORT nStartRow = 0; - USHORT nEndCol = 0; - USHORT nEndRow = 0; + SCTAB nStartTab = 0; + SCTAB nEndTab = 0; + SCCOL nStartCol = 0; + SCROW nStartRow = 0; + SCCOL nEndCol = 0; + SCROW nEndRow = 0; pViewData = pViewSh->GetViewData(); pDoc = pViewData->GetDocument(); @@ -456,18 +456,18 @@ void ScTpUserLists::AddNewList( const String& rEntriesStr ) // ----------------------------------------------------------------------- -void ScTpUserLists::CopyListFromArea( const ScRefTripel& rStartPos, - const ScRefTripel& rEndPos ) +void ScTpUserLists::CopyListFromArea( const ScRefAddress& rStartPos, + const ScRefAddress& rEndPos ) { if ( bCopyDone ) return; //---------------------------------------------------------- - USHORT nTab = rStartPos.GetTab(); - USHORT nStartCol = rStartPos.GetCol(); - USHORT nStartRow = rStartPos.GetRow(); - USHORT nEndCol = rEndPos.GetCol(); - USHORT nEndRow = rEndPos.GetRow(); + SCTAB nTab = rStartPos.Tab(); + SCCOL nStartCol = rStartPos.Col(); + SCROW nStartRow = rStartPos.Row(); + SCCOL nEndCol = rEndPos.Col(); + SCROW nEndRow = rEndPos.Row(); USHORT nCellDir = SCRET_COLS; BOOL bValueIgnored = FALSE; @@ -494,9 +494,9 @@ void ScTpUserLists::CopyListFromArea( const ScRefTripel& rStartPos, if ( nCellDir == SCRET_COLS ) { - for ( USHORT col=nStartCol; col<=nEndCol; col++ ) + for ( SCCOL col=nStartCol; col<=nEndCol; col++ ) { - for ( USHORT row=nStartRow; row<=nEndRow; row++ ) + for ( SCROW row=nStartRow; row<=nEndRow; row++ ) { if ( pDoc->HasStringData( col, row, nTab ) ) { @@ -518,9 +518,9 @@ void ScTpUserLists::CopyListFromArea( const ScRefTripel& rStartPos, } else { - for ( USHORT row=nStartRow; row<=nEndRow; row++ ) + for ( SCROW row=nStartRow; row<=nEndRow; row++ ) { - for ( USHORT col=nStartCol; col<=nEndCol; col++ ) + for ( SCCOL col=nStartCol; col<=nEndCol; col++ ) { if ( pDoc->HasStringData( col, row, nTab ) ) { @@ -775,8 +775,8 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, PushButton*, pBtn ) //----------------------------------------------------------- - ScRefTripel theStartPos; - ScRefTripel theEndPos; + ScRefAddress theStartPos; + ScRefAddress theEndPos; String theAreaStr( aEdCopyFrom.GetText() ); BOOL bAreaOk = FALSE; |