diff options
Diffstat (limited to 'sw/source/core/inc/cellfrm.hxx')
| -rw-r--r-- | sw/source/core/inc/cellfrm.hxx | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sw/source/core/inc/cellfrm.hxx b/sw/source/core/inc/cellfrm.hxx index 86a2c1f655e1..317e70aa22c1 100644 --- a/sw/source/core/inc/cellfrm.hxx +++ b/sw/source/core/inc/cellfrm.hxx @@ -47,9 +47,17 @@ public: SwCellFrm( const SwTableBox &, SwFrm*, bool bInsertContent = true ); ~SwCellFrm(); +<<<<<<< local virtual BOOL GetCrsrOfst( SwPosition *, Point&, SwCrsrMoveState* = 0 ) const; virtual void Paint( SwRect const&, SwPrintData const*const pPrintData = NULL ) const; virtual void CheckDirection( BOOL bVert ); +======= + virtual sal_Bool GetCrsrOfst( SwPosition *, Point&, SwCrsrMoveState* = 0 ) const; + virtual void Modify( SfxPoolItem*, SfxPoolItem* ); + virtual void Paint( SwRect const&, + SwPrintData const*const pPrintData = NULL ) const; + virtual void CheckDirection( sal_Bool bVert ); +>>>>>>> other // --> OD 2010-02-17 #i103961# virtual void Cut(); |