MWS_SRX644: migrate branch mws_srx644 -> HEAD

1 files changed, 20 insertions, 14 deletions

diff --git a/sw/inc/tblsel.hxx b/sw/inc/tblsel.hxx
index 8db60a499baa..c5901e1cbc27 100644
--- a/sw/inc/tblsel.hxx
+++ b/sw/inc/tblsel.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tblsel.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: jp $ $Date: 2002-03-21 12:57:09 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:38:43 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -206,22 +206,10 @@ class _FndBox
     SwTableLine *pLineBefore;   //Zum Loeschen/Restaurieren des Layouts.
     SwTableLine *pLineBehind;
 
-    static void AddToFndBox( _FndBox*& rpParent, const SwTableBox& rBox );
-    static void AppendLine( _FndBox& rBox, const SwTableLine& rLine );
-    static void AppendBox( _FndLine& rLine, const SwTableBox& rBox );
-    static void AddSelLine( _FndBox& rBox, const SwTableLine& rLine,
-                                SwSelBoxes& rBoxes );
-    static void AddSelBox( _FndLine& rLine, const SwTableBox& rBox,
-                                SwSelBoxes& rBoxes );
 public:
     _FndBox( SwTableBox* pB, _FndLine* pFL ) :
         pBox(pB), pUpper(pFL), pLineBefore( 0 ), pLineBehind( 0 ) {}
 
-    // fill with the structure from the selection (the selboxes)
-    _FndBox( const SwSelBoxes& rBoxes );
-    // fill with the structure from the TableLine
-    _FndBox( const SwTableLine& rLine );
-
     const _FndLines&    GetLines() const    { return aLines; }
         _FndLines&      GetLines()          { return aLines; }
     const SwTableBox*   GetBox() const      { return pBox; }
@@ -262,4 +250,22 @@ public:
 };
 
 
+struct _FndPara
+{
+    _FndBox* pFndBox;
+    _FndLine* pFndLine;
+    const SwSelBoxes& rBoxes;
+
+    _FndPara( const SwSelBoxes& rBxs, _FndBox* pFB )
+        : rBoxes( rBxs ), pFndBox( pFB ) {}
+    _FndPara( const _FndPara& rPara, _FndBox* pFB )
+        : rBoxes(rPara.rBoxes), pFndLine(rPara.pFndLine), pFndBox(pFB) {}
+    _FndPara( const _FndPara& rPara, _FndLine* pFL )
+        : rBoxes(rPara.rBoxes), pFndLine(pFL), pFndBox(rPara.pFndBox) {}
+};
+
+BOOL _FndBoxCopyCol( const SwTableBox*& rpBox, void* pPara );
+BOOL _FndLineCopyCol( const SwTableLine*& rpLine, void* pPara );
+
+
 #endif  //  _TBLSEL_HXX