INTEGRATION: CWS swwarnings (1.14.242); FILE MERGED

2007/09/24 07:01:06 os 1.14.242.8: RESYNC: (1.21-1.22); FILE MERGED
2007/08/20 15:17:30 tl 1.14.242.7: RESYNC: (1.18-1.21); FILE MERGED
2007/06/28 11:48:05 os 1.14.242.6: RESYNC: (1.17-1.18); FILE MERGED
2007/05/29 10:53:39 os 1.14.242.5: RESYNC: (1.15-1.17); FILE MERGED
2007/04/11 10:28:07 os 1.14.242.4: RESYNC: (1.14-1.15); FILE MERGED
Resync problems solved
2007/03/12 08:48:17 fme 1.14.242.3: #i69287# Warning free code
2007/03/05 12:43:18 tl 1.14.242.2: #i69287# warning-free code
2007/02/22 15:05:39 tl 1.14.242.1: #i69287# warning-free code

1 files changed, 9 insertions, 6 deletions

diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx
index 95250891e205..c499d0f12b6c 100644
--- a/sw/inc/swtable.hxx
+++ b/sw/inc/swtable.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: swtable.hxx,v $
  *
- *  $Revision: 1.22 $
+ *  $Revision: 1.23 $
  *
- *  last change: $Author: ihi $ $Date: 2007-08-17 13:59:29 $
+ *  last change: $Author: hr $ $Date: 2007-09-27 08:12:16 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -94,13 +94,13 @@ struct Parm;
 SV_DECL_REF( SwServerObject )
 #endif
 
-SV_DECL_PTRARR_DEL(SwTableLines, SwTableLine*, 10, 20);
-SV_DECL_PTRARR_DEL(SwTableBoxes, SwTableBox*, 25, 50);
+SV_DECL_PTRARR_DEL(SwTableLines, SwTableLine*, 10, 20)
+SV_DECL_PTRARR_DEL(SwTableBoxes, SwTableBox*, 25, 50)
 
 // speicher die Inhaltstragenden Box-Pointer zusaetzlich in einem
 // sortierten Array (fuers rechnen in der Tabelle)
 typedef SwTableBox* SwTableBoxPtr;
-SV_DECL_PTRARR_SORT( SwTableSortBoxes, SwTableBoxPtr, 25, 50 );
+SV_DECL_PTRARR_SORT( SwTableSortBoxes, SwTableBoxPtr, 25, 50 )
 typedef SwTableLine* SwTableLinePtr;
 
 class SwTable: public SwClient           //Client vom FrmFmt
@@ -131,6 +131,7 @@ protected:
     bool bDontChangeModel;  // This is set by functions (like Merge()) to forbid a laet model change
 #endif
 
+    using SwClient::IsModifyLocked;
     BOOL IsModifyLocked(){ return bModifyLocked;}
 
 public:
@@ -198,7 +199,7 @@ public:
     virtual void Modify( SfxPoolItem* pOld, SfxPoolItem* pNew );
 
     void GetTabCols( SwTabCols &rToFill, const SwTableBox *pStart,
-                     FASTBOOL bHidden = FALSE, BOOL bCurRowOnly = FALSE ) const;
+                     BOOL bHidden = FALSE, BOOL bCurRowOnly = FALSE ) const;
     void SetTabCols( const SwTabCols &rNew, const SwTabCols &rOld,
                      const SwTableBox *pStart, BOOL bCurRowOnly );
 
@@ -245,6 +246,8 @@ public:
     BOOL DeleteSel( SwDoc*, const SwSelBoxes& rBoxes, const SwSelBoxes* pMerged,
         SwUndo* pUndo, const BOOL bDelMakeFrms, const BOOL bCorrBorder );
     BOOL SplitCol( SwDoc* pDoc, const SwSelBoxes& rBoxes, USHORT nCnt=1 );
+    BOOL Merge( const SwSelBoxes& rBoxes,
+                SwTableBox* pMergeBox, SwUndoTblMerge* = 0 );
 
     void FindSuperfluousRows( SwSelBoxes& rBoxes )
         { _FindSuperfluousRows( rBoxes, 0, 0 ); }