diff options
author | Noel Grandin <noel@peralex.com> | 2012-05-10 17:42:10 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2012-05-14 19:49:15 +0200 |
commit | b8ace0f986769cc952718ab5e262808d899d5549 (patch) | |
tree | de7a7ee9ba280585506a4429a57af862aa79c938 /sw/source/core/inc/tblrwcl.hxx | |
parent | 5031e17d4b11181be94448702b1026bd38e0b3c4 (diff) |
Convert SV_DECL_PTRARR_DEL(SwTableBoxes) to std::vector
I added a GetPos() method because quite a lot of code used that
method and the existing code is quite tied to the precise
return values of that method.
Change-Id: I9af6b923d978abe758b63d835f228495c020455a
Diffstat (limited to 'sw/source/core/inc/tblrwcl.hxx')
-rw-r--r-- | sw/source/core/inc/tblrwcl.hxx | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sw/source/core/inc/tblrwcl.hxx b/sw/source/core/inc/tblrwcl.hxx index 5623e95725c4..6f11e225282a 100644 --- a/sw/source/core/inc/tblrwcl.hxx +++ b/sw/source/core/inc/tblrwcl.hxx @@ -50,7 +50,6 @@ class SwFmtFrmSize; struct _CpyPara; struct _InsULPara; -sal_Bool lcl_BoxSetHeadCondColl( const SwTableBox*& rpBox, void* pPara ); sal_Bool lcl_LineSetHeadCondColl( const SwTableLine*& rpLine, void* pPara ); @@ -111,10 +110,10 @@ public: sal_Bool Resize( sal_uInt16 nOffset, sal_uInt16 nWidth ); }; -sal_Bool lcl_Box_CollectBox( const SwTableBox*& rpBox, void* pPara ); +void lcl_Box_CollectBox( const SwTableBox* pBox, SwCollectTblLineBoxes* pSplPara ); sal_Bool lcl_Line_CollectBox( const SwTableLine*& rpLine, void* pPara ); -sal_Bool lcl_BoxSetSplitBoxFmts( const SwTableBox*& rpBox, void* pPara ); +void lcl_BoxSetSplitBoxFmts( SwTableBox* pBox, SwCollectTblLineBoxes* pSplPara ); // This structure is needed by Undo to restore row span attributes // when a table has been splitted into two tables @@ -157,13 +156,11 @@ public: }; sal_Bool lcl_GC_Line_Border( const SwTableLine*& , void* pPara ); -sal_Bool lcl_GC_Box_Border( const SwTableBox*& , void* pPara ); sal_Bool lcl_GCBorder_ChkBoxBrd_L( const SwTableLine*& , void* pPara ); sal_Bool lcl_GCBorder_ChkBoxBrd_B( const SwTableBox*& , void* pPara ); sal_Bool lcl_GCBorder_GetLastBox_L( const SwTableLine*& , void* pPara ); -sal_Bool lcl_GCBorder_GetLastBox_B( const SwTableBox*& , void* pPara ); class SwShareBoxFmt |