INTEGRATION: CWS rowlimit (1.1.1.1.346); FILE MERGED

2004/03/03 21:27:25 er 1.1.1.1.346.2: #i1967# type correctness
2004/01/13 20:04:47 er 1.1.1.1.346.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short

1 files changed, 23 insertions, 23 deletions

diff --git a/sc/source/ui/inc/undocell.hxx b/sc/source/ui/inc/undocell.hxx
index 4b1ba3d524b0..3af1a1f163fb 100644
--- a/sc/source/ui/inc/undocell.hxx
+++ b/sc/source/ui/inc/undocell.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: undocell.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:45:02 $
+ *  last change: $Author: obo $ $Date: 2004-06-04 11:44:22 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -82,7 +82,7 @@ class ScUndoCursorAttr: public ScSimpleUndo
 public:
                     TYPEINFO();
                     ScUndoCursorAttr( ScDocShell* pNewDocShell,
-                            USHORT nNewCol, USHORT nNewRow, USHORT nNewTab,
+                            SCCOL nNewCol, SCROW nNewRow, SCTAB nNewTab,
                             const ScPatternAttr* pOldPat, const ScPatternAttr* pNewPat,
                             const ScPatternAttr* pApplyPat, BOOL bAutomatic );
     virtual         ~ScUndoCursorAttr();
@@ -95,9 +95,9 @@ public:
     virtual String  GetComment() const;
 
 private:
-    USHORT          nCol;
-    USHORT          nRow;
-    USHORT          nTab;
+    SCCOL           nCol;
+    SCROW           nRow;
+    SCTAB           nTab;
     ScPatternAttr*  pOldPattern;
     ScPatternAttr*  pNewPattern;
     ScPatternAttr*  pApplyPattern;
@@ -112,8 +112,8 @@ class ScUndoEnterData: public ScSimpleUndo
 public:
                     TYPEINFO();
                     ScUndoEnterData( ScDocShell* pNewDocShell,
-                            USHORT nNewCol, USHORT nNewRow, USHORT nNewTab,
-                            USHORT nNewCount, USHORT* pNewTabs,
+                            SCCOL nNewCol, SCROW nNewRow, SCTAB nNewTab,
+                            SCTAB nNewCount, SCTAB* pNewTabs,
                             ScBaseCell** ppOldData, BOOL* pHasForm, ULONG* pOldForm,
                             const String& rNewStr, EditTextObject* pObj = NULL );
     virtual         ~ScUndoEnterData();
@@ -127,16 +127,16 @@ public:
 
 private:
     String          aNewString;
-    USHORT*         pTabs;
+    SCTAB*          pTabs;
     ScBaseCell**    ppOldCells;
     BOOL*           pHasFormat;
     ULONG*          pOldFormats;
     EditTextObject* pNewEditData;
     ULONG           nEndChangeAction;
-    USHORT          nCol;
-    USHORT          nRow;
-    USHORT          nTab;
-    USHORT          nCount;             //  markierte Tabellen
+    SCCOL           nCol;
+    SCROW           nRow;
+    SCTAB           nTab;
+    SCTAB           nCount;             //  markierte Tabellen
 
     void            DoChange() const;
     void            SetChangeTrack();
@@ -202,7 +202,7 @@ class ScUndoPageBreak: public ScSimpleUndo
 public:
                     TYPEINFO();
                     ScUndoPageBreak( ScDocShell* pNewDocShell,
-                            USHORT nNewCol, USHORT nNewRow, USHORT nNewTab,
+                            SCCOL nNewCol, SCROW nNewRow, SCTAB nNewTab,
                             BOOL bNewColumn, BOOL bNewInsert );
     virtual         ~ScUndoPageBreak();
 
@@ -214,9 +214,9 @@ public:
     virtual String  GetComment() const;
 
 private:
-    USHORT          nCol;
-    USHORT          nRow;
-    USHORT          nTab;
+    SCCOL           nCol;
+    SCROW           nRow;
+    SCTAB           nTab;
     BOOL            bColumn;        // Spalten- oder Zeilenumbruch
     BOOL            bInsert;        // Einfuegen oder Loeschen
 
@@ -227,7 +227,7 @@ class ScUndoPrintZoom: public ScSimpleUndo
 {
 public:
                     TYPEINFO();
-                    ScUndoPrintZoom( ScDocShell* pNewDocShell, USHORT nT,
+                    ScUndoPrintZoom( ScDocShell* pNewDocShell, SCTAB nT,
                                     USHORT nOS, USHORT nOP, USHORT nNS, USHORT nNP );
     virtual         ~ScUndoPrintZoom();
 
@@ -239,7 +239,7 @@ public:
     virtual String  GetComment() const;
 
 private:
-    USHORT          nTab;
+    SCTAB           nTab;
     USHORT          nOldScale;
     USHORT          nOldPages;
     USHORT          nNewScale;
@@ -253,7 +253,7 @@ class ScUndoThesaurus: public ScSimpleUndo
 public:
                     TYPEINFO();
                     ScUndoThesaurus( ScDocShell* pNewDocShell,
-                            USHORT nNewCol, USHORT nNewRow, USHORT nNewTab,
+                            SCCOL nNewCol, SCROW nNewRow, SCTAB nNewTab,
                             const String& rNewUndoStr, const EditTextObject* pUndoTObj,
                             const String& rNewRedoStr, const EditTextObject* pRedoTObj);
     virtual         ~ScUndoThesaurus();
@@ -266,9 +266,9 @@ public:
     virtual String  GetComment() const;
 
 private:
-    USHORT          nCol;
-    USHORT          nRow;
-    USHORT          nTab;
+    SCCOL           nCol;
+    SCROW           nRow;
+    SCTAB           nTab;
     String          aUndoStr;           // Daten bei StringZelle
     EditTextObject* pUndoTObject;       //       bei EditZelle
     String          aRedoStr;