diff options
| author | Mathias Bauer <mba@openoffice.org> | 2010-12-21 20:49:11 +0100 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2010-12-21 20:49:11 +0100 |
| commit | af69eeaeae90037f27e7a8a10fce1b4899d5b305 (patch) | |
| tree | e4e2496dbd6bd7afe45d9eb3482ce02f9c291310 /sw/source/core/inc/txtfrm.hxx | |
| parent | 09d6c9a395b8849e3e09c694282a1446b786bf80 (diff) | |
| parent | 42c3881914531e6d81d6fb05bdc7b308db98146c (diff) | |
CWS swlayoutrefactoring: resync to m96, no conflict resolution
Diffstat (limited to 'sw/source/core/inc/txtfrm.hxx')
| -rw-r--r-- | sw/source/core/inc/txtfrm.hxx | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx index a371f3557985..dafdd255746e 100644 --- a/sw/source/core/inc/txtfrm.hxx +++ b/sw/source/core/inc/txtfrm.hxx @@ -24,8 +24,9 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#ifndef _TXTFRM_HXX -#define _TXTFRM_HXX +#ifndef SW_TXTFRM_HXX +#define SW_TXTFRM_HXX + #include <tools/mempool.hxx> #include <tools/string.hxx> #include "cntfrm.hxx" @@ -294,7 +295,13 @@ public: void PaintExtraData( const SwRect & rRect ) const; //Seitennummer usw. SwRect Paint(); +<<<<<<< local virtual void Paint( const SwRect &, const SwPrtOptions *pPrintData = NULL ) const; +======= + virtual void Paint( SwRect const&, + SwPrintData const*const pPrintData = NULL ) const; + virtual void Modify( SfxPoolItem*, SfxPoolItem* ); +>>>>>>> other virtual sal_Bool GetInfo( SfxPoolItem & ) const; //Layoutorientiertes Cursortravelling: Linker, rechter Rand, |