INTEGRATION: CWS rowlimit (1.8.312); FILE MERGED

2004/03/03 21:36:18 er 1.8.312.5: #i1967# type correctness
2004/02/26 19:16:36 jmarmion 1.8.312.4: #i1967# setp 5 changes.
2004/02/16 17:26:34 er 1.8.312.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/13 20:04:30 er 1.8.312.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2003/11/28 19:48:00 er 1.8.312.1: #i1967# move ScAddress, ScRange from global.hxx to address.hxx

1 files changed, 26 insertions, 18 deletions

diff --git a/sc/source/ui/inc/prevloc.hxx b/sc/source/ui/inc/prevloc.hxx
index e732246370c1..51fd3c77ea03 100644
--- a/sc/source/ui/inc/prevloc.hxx
+++ b/sc/source/ui/inc/prevloc.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: prevloc.hxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: sab $ $Date: 2002-05-24 14:56:03 $
+ *  last change: $Author: obo $ $Date: 2004-06-04 11:38:35 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,6 +62,10 @@
 #ifndef SC_PREVLOC_HXX
 #define SC_PREVLOC_HXX
 
+#ifndef SC_ADDRESS_HXX
+#include "address.hxx"
+#endif
+
 #ifndef _LIST_HXX
 #include <tools/list.hxx>
 #endif
@@ -70,6 +74,10 @@
 #include <vcl/mapmod.hxx>
 #endif
 
+#ifndef _SAL_TYPES_H_
+#include <sal/types.h>
+#endif
+
 
 #define SC_PREVIEW_MAXRANGES    4
 #define SC_PREVIEW_RANGE_EDGE   0
@@ -88,11 +96,11 @@ class ScDocument;
 struct ScPreviewColRowInfo
 {
     BOOL    bIsHeader;
-    USHORT  nDocIndex;
+    SCCOLROW    nDocIndex;
     long    nPixelStart;
     long    nPixelEnd;
 
-    void Set( BOOL bHeader, USHORT nIndex, long nStart, long nEnd )
+    void Set( BOOL bHeader, SCCOLROW nIndex, long nStart, long nEnd )
     {
         bIsHeader   = bHeader;
         nDocIndex   = nIndex;
@@ -103,9 +111,9 @@ struct ScPreviewColRowInfo
 
 class ScPreviewTableInfo
 {
-    USHORT                  nTab;
-    USHORT                  nCols;
-    USHORT                  nRows;
+    SCTAB                   nTab;
+    SCCOL                   nCols;
+    SCROW                   nRows;
     ScPreviewColRowInfo*    pColInfo;
     ScPreviewColRowInfo*    pRowInfo;
 
@@ -113,15 +121,15 @@ public:
             ScPreviewTableInfo();
             ~ScPreviewTableInfo();
 
-    USHORT                      GetTab() const      { return nTab; }
-    USHORT                      GetCols() const     { return nCols; }
-    USHORT                      GetRows() const     { return nRows; }
+    SCTAB                       GetTab() const      { return nTab; }
+    SCCOL                       GetCols() const     { return nCols; }
+    SCROW                       GetRows() const     { return nRows; }
     const ScPreviewColRowInfo*  GetColInfo() const  { return pColInfo; }
     const ScPreviewColRowInfo*  GetRowInfo() const  { return pRowInfo; }
 
-    void    SetTab( USHORT nNewTab );
-    void    SetColInfo( USHORT nCount, ScPreviewColRowInfo* pNewInfo );
-    void    SetRowInfo( USHORT nCount, ScPreviewColRowInfo* pNewInfo );
+    void    SetTab( SCTAB nNewTab );
+    void    SetColInfo( SCCOL nCount, ScPreviewColRowInfo* pNewInfo );
+    void    SetRowInfo( SCROW nCount, ScPreviewColRowInfo* pNewInfo );
     void    LimitToArea( const Rectangle& rPixelArea );
 };
 
@@ -135,7 +143,7 @@ class ScPreviewLocationData
     Rectangle   aDrawRectangle[SC_PREVIEW_MAXRANGES];
         sal_uInt8       aDrawRangeId[SC_PREVIEW_MAXRANGES];
     USHORT      nDrawRanges;
-    USHORT      nPrintTab;
+    SCTAB       nPrintTab;
     List        aEntries;
 
     ScAddress   GetCellFromRange( const Size& rOffsetPixel, const ScRange& rRange ) const;
@@ -146,17 +154,17 @@ public:
             ~ScPreviewLocationData();
 
     void    SetCellMapMode( const MapMode& rMapMode );
-    void    SetPrintTab( USHORT nNew );
+    void    SetPrintTab( SCTAB nNew );
     void    Clear();
     void    AddCellRange( const Rectangle& rRect, const ScRange& rRange, BOOL bRepCol, BOOL bRepRow,
                             const MapMode& rDrawMap );
-    void    AddColHeaders( const Rectangle& rRect, USHORT nStartCol, USHORT nEndCol, BOOL bRepCol );
-    void    AddRowHeaders( const Rectangle& rRect, USHORT nStartRow, USHORT nEndRow, BOOL bRepRow );
+    void    AddColHeaders( const Rectangle& rRect, SCCOL nStartCol, SCCOL nEndCol, BOOL bRepCol );
+    void    AddRowHeaders( const Rectangle& rRect, SCROW nStartRow, SCROW nEndRow, BOOL bRepRow );
     void    AddHeaderFooter( const Rectangle& rRect, BOOL bHeader, BOOL bLeft );
     void    AddNoteMark( const Rectangle& rRect, const ScAddress& rPos );
     void    AddNoteText( const Rectangle& rRect, const ScAddress& rPos );
 
-    USHORT  GetPrintTab() const     { return nPrintTab; }
+    SCTAB   GetPrintTab() const     { return nPrintTab; }
 
     //  Get info on visible columns/rows in the visible area
     void    GetTableInfo( const Rectangle& rVisiblePixel, ScPreviewTableInfo& rInfo ) const;