INTEGRATION: CWS rowlimit (1.15.56); FILE MERGED

2004/03/15 17:40:36 er 1.15.56.5: RESYNC: (1.15-1.16); FILE MERGED
2004/02/27 15:58:23 jmarmion 1.15.56.4: #i1967# step 5 changes.
2004/01/16 17:39:45 er 1.15.56.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:14:57 er 1.15.56.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2003/11/28 19:47:19 er 1.15.56.1: #i1967# move ScAddress, ScRange from global.hxx to address.hxx

1 files changed, 20 insertions, 20 deletions

diff --git a/sc/inc/docuno.hxx b/sc/inc/docuno.hxx
index 84e657db3bb5..24411e2c64f1 100644
--- a/sc/inc/docuno.hxx
+++ b/sc/inc/docuno.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: docuno.hxx,v $
  *
- *  $Revision: 1.16 $
+ *  $Revision: 1.17 $
  *
- *  last change: $Author: rt $ $Date: 2004-02-11 09:56:00 $
+ *  last change: $Author: obo $ $Date: 2004-06-04 10:07:39 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,8 +62,8 @@
 #ifndef SC_DOCUNO_HXX
 #define SC_DOCUNO_HXX
 
-#ifndef SC_SCGLOB_HXX
-#include "global.hxx"           // ScRange, ScAddress
+#ifndef SC_ADDRESS_HXX
+#include "address.hxx"
 #endif
 
 #ifndef _SFX_OBJUNO_HXX
@@ -209,7 +209,7 @@ public:
     BOOL                    IsEmbedded() const;
     double                  GetOutputFactor() const;
 
-    BOOL                    AdjustRowHeight( USHORT nStartRow, USHORT nEndRow, USHORT nTab );
+    BOOL                    AdjustRowHeight( SCROW nStartRow, SCROW nEndRow, SCTAB nTab );
 
     void                    BeforeXMLLoading();
     void                    AfterXMLLoading(sal_Bool bRet);
@@ -530,16 +530,16 @@ class ScTableColumnsObj : public cppu::WeakImplHelper5<
 {
 private:
     ScDocShell*             pDocShell;
-    USHORT                  nTab;
-    USHORT                  nStartCol;
-    USHORT                  nEndCol;
+    SCTAB                   nTab;
+    SCCOL                   nStartCol;
+    SCCOL                   nEndCol;
 
     ScTableColumnObj*       GetObjectByIndex_Impl(USHORT nIndex) const;
     ScTableColumnObj*       GetObjectByName_Impl(const ::rtl::OUString& aName) const;
 
 public:
-                            ScTableColumnsObj(ScDocShell* pDocSh, USHORT nT,
-                                                USHORT nSC, USHORT nEC);
+                            ScTableColumnsObj(ScDocShell* pDocSh, SCTAB nT,
+                                                SCCOL nSC, SCCOL nEC);
     virtual                 ~ScTableColumnsObj();
 
     virtual void            Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
@@ -636,15 +636,15 @@ class ScTableRowsObj : public cppu::WeakImplHelper4<
 {
 private:
     ScDocShell*             pDocShell;
-    USHORT                  nTab;
-    USHORT                  nStartRow;
-    USHORT                  nEndRow;
+    SCTAB                   nTab;
+    SCROW                   nStartRow;
+    SCROW                   nEndRow;
 
     ScTableRowObj*          GetObjectByIndex_Impl(USHORT nIndex) const;
 
 public:
-                            ScTableRowsObj(ScDocShell* pDocSh, USHORT nT,
-                                                USHORT nSR, USHORT nER);
+                            ScTableRowsObj(ScDocShell* pDocSh, SCTAB nT,
+                                                SCROW nSR, SCROW nER);
     virtual                 ~ScTableRowsObj();
 
     virtual void            Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
@@ -795,13 +795,13 @@ class ScAnnotationsObj : public cppu::WeakImplHelper3<
 {
 private:
     ScDocShell*             pDocShell;
-    USHORT                  nTab;           // Collection haengt am Sheet
+    SCTAB                   nTab;           // Collection haengt am Sheet
 
     BOOL                    GetAddressByIndex_Impl( ULONG nIndex, ScAddress& rPos ) const;
     ScAnnotationObj*        GetObjectByIndex_Impl(USHORT nIndex) const;
 
 public:
-                            ScAnnotationsObj(ScDocShell* pDocSh, USHORT nT);
+                            ScAnnotationsObj(ScDocShell* pDocSh, SCTAB nT);
     virtual                 ~ScAnnotationsObj();
 
     virtual void            Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
@@ -848,14 +848,14 @@ class ScScenariosObj : public cppu::WeakImplHelper4<
 {
 private:
     ScDocShell*             pDocShell;
-    USHORT                  nTab;
+    SCTAB                   nTab;
 
-    BOOL                    GetScenarioIndex_Impl( const ::rtl::OUString& rName, USHORT& rIndex );
+    BOOL                    GetScenarioIndex_Impl( const ::rtl::OUString& rName, SCTAB& rIndex );
     ScTableSheetObj*        GetObjectByIndex_Impl(USHORT nIndex);
     ScTableSheetObj*        GetObjectByName_Impl(const ::rtl::OUString& aName);
 
 public:
-                            ScScenariosObj(ScDocShell* pDocSh, USHORT nT);
+                            ScScenariosObj(ScDocShell* pDocSh, SCTAB nT);
     virtual                 ~ScScenariosObj();
 
     virtual void            Notify( SfxBroadcaster& rBC, const SfxHint& rHint );