INTEGRATION: CWS dialogdiet01 (1.1.1.1.628); FILE MERGED

2004/03/26 09:12:05 mwu 1.1.1.1.628.1: sw model converted. 20040326

1 files changed, 60 insertions, 59 deletions

diff --git a/sw/source/ui/inc/tabledlg.hxx b/sw/source/ui/inc/tabledlg.hxx
index bcc4ace8bb0e..e682f494ecfb 100644
--- a/sw/source/ui/inc/tabledlg.hxx
+++ b/sw/source/ui/inc/tabledlg.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tabledlg.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:42 $
+ *  last change: $Author: hr $ $Date: 2004-05-10 16:31:35 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -65,8 +65,9 @@
 #include <sfx2/tabdlg.hxx>
 #endif
 
-#include "swtypes.hxx"
 
+#include "swtypes.hxx"
+#include "swtablerep.hxx" //CHINA001
 class SwWrtShell;
 class SwTabCols;
 struct TColumn;
@@ -88,61 +89,61 @@ public:
                     const SfxItemSet* pItemSet, SwWrtShell* pSh );
 };
 
-class SwTableRep
-{
-    TColumn*    pTColumns;
-
-    SwTwips     nTblWidth;
-    SwTwips     nSpace;
-    SwTwips     nLeftSpace;
-    SwTwips     nRightSpace;
-    USHORT      nAlign;
-    USHORT      nColCount;
-    USHORT      nAllCols;
-    USHORT      nWidthPercent;
-    BOOL        bComplex : 1;
-    BOOL        bLineSelected : 1;
-    BOOL        bWidthChanged : 1;
-    BOOL        bColsChanged : 1;
-
-public:
-    SwTableRep( const SwTabCols& rTabCol, BOOL bComplex );
-    ~SwTableRep();
-
-    BOOL        FillTabCols( SwTabCols& rTabCol ) const;
-
-    SwTwips     GetLeftSpace() const            {return nLeftSpace;}
-    void        SetLeftSpace(SwTwips nSet)      {nLeftSpace = nSet;}
-
-    SwTwips     GetRightSpace() const           {return nRightSpace;}
-    void        SetRightSpace(SwTwips nSet)     {nRightSpace = nSet;}
-
-    SwTwips     GetWidth() const                {return nTblWidth;}
-    void        SetWidth(SwTwips nSet)          {nTblWidth = nSet;}
-
-    USHORT      GetWidthPercent() const         {return nWidthPercent;}
-    void        SetWidthPercent(USHORT nSet)    {nWidthPercent = nSet;}
-
-    USHORT      GetAlign() const                {return nAlign;}
-    void        SetAlign(USHORT nSet)           {nAlign = nSet;}
-
-    BOOL        IsComplex() const               {return bComplex;}
-    USHORT      GetColCount() const             {return nColCount;}
-    USHORT      GetAllColCount() const          {return nAllCols;}
-
-    BOOL        HasColsChanged() const          {return bColsChanged;}
-    void        SetColsChanged()                {bColsChanged = TRUE;}
-
-    BOOL        HasWidthChanged() const         {return bWidthChanged;}
-    void        SetWidthChanged()               {bWidthChanged  = TRUE;}
-
-    BOOL        IsLineSelected() const          {return bLineSelected;}
-    void        SetLineSelected(BOOL bSet)      {bLineSelected = bSet;}
-
-    SwTwips     GetSpace() const                { return nSpace;}
-    void        SetSpace(SwTwips nSet)          {nSpace = nSet;}
-
-    TColumn*    GetColumns() const              {return pTColumns;}
-};
+//CHINA001 class SwTableRep
+//CHINA001 {
+//CHINA001 TColumn*     pTColumns;
+//CHINA001
+//CHINA001 SwTwips      nTblWidth;
+//CHINA001 SwTwips      nSpace;
+//CHINA001 SwTwips      nLeftSpace;
+//CHINA001 SwTwips  nRightSpace;
+//CHINA001 USHORT       nAlign;
+//CHINA001 USHORT       nColCount;
+//CHINA001 USHORT       nAllCols;
+//CHINA001 USHORT       nWidthPercent;
+//CHINA001 BOOL         bComplex : 1;
+//CHINA001 BOOL         bLineSelected : 1;
+//CHINA001 BOOL     bWidthChanged : 1;
+//CHINA001 BOOL     bColsChanged : 1;
+//CHINA001
+//CHINA001 public:
+//CHINA001 SwTableRep( const SwTabCols& rTabCol, BOOL bComplex );
+//CHINA001 ~SwTableRep();
+//CHINA001
+//CHINA001 BOOL     FillTabCols( SwTabCols& rTabCol ) const;
+//CHINA001
+//CHINA001 SwTwips  GetLeftSpace() const            {return nLeftSpace;}
+//CHINA001 void         SetLeftSpace(SwTwips nSet)      {nLeftSpace = nSet;}
+//CHINA001
+//CHINA001 SwTwips      GetRightSpace() const           {return nRightSpace;}
+//CHINA001 void         SetRightSpace(SwTwips nSet)     {nRightSpace = nSet;}
+//CHINA001
+//CHINA001 SwTwips      GetWidth() const                {return nTblWidth;}
+//CHINA001 void         SetWidth(SwTwips nSet)          {nTblWidth = nSet;}
+//CHINA001
+//CHINA001 USHORT       GetWidthPercent() const         {return nWidthPercent;}
+//CHINA001 void         SetWidthPercent(USHORT nSet)    {nWidthPercent = nSet;}
+//CHINA001
+//CHINA001 USHORT       GetAlign() const                {return nAlign;}
+//CHINA001 void         SetAlign(USHORT nSet)           {nAlign = nSet;}
+//CHINA001
+//CHINA001 BOOL     IsComplex() const               {return bComplex;}
+//CHINA001 USHORT       GetColCount() const             {return nColCount;}
+//CHINA001 USHORT       GetAllColCount() const          {return nAllCols;}
+//CHINA001
+//CHINA001 BOOL     HasColsChanged() const          {return bColsChanged;}
+//CHINA001 void     SetColsChanged()                {bColsChanged = TRUE;}
+//CHINA001
+//CHINA001 BOOL     HasWidthChanged() const         {return bWidthChanged;}
+//CHINA001 void         SetWidthChanged()               {bWidthChanged  = TRUE;}
+//CHINA001
+//CHINA001 BOOL         IsLineSelected() const          {return bLineSelected;}
+//CHINA001 void     SetLineSelected(BOOL bSet)      {bLineSelected = bSet;}
+//CHINA001
+//CHINA001 SwTwips      GetSpace() const                { return nSpace;}
+//CHINA001 void         SetSpace(SwTwips nSet)          {nSpace = nSet;}
+//CHINA001
+//CHINA001 TColumn*     GetColumns() const              {return pTColumns;}
+//CHINA001 };
 
 #endif