diff options
| author | Mathias Bauer <mba@openoffice.org> | 2011-02-09 09:49:44 +0100 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2011-02-09 09:49:44 +0100 |
| commit | 53b8f0865ff2e59cb71eaf4c1bdbc829238fde6f (patch) | |
| tree | 31528d76013d09428fad98a3dbc6265345dbbeb9 /sw/inc/fmtfld.hxx | |
| parent | CWS swlayoutrefactoring: conflict resolution after resync to DEV300_m96 (diff) | |
| parent | CWS gnumake3: pull in cws removetooltypes01 (diff) | |
| download | core-53b8f0865ff2e59cb71eaf4c1bdbc829238fde6f.tar.gz core-53b8f0865ff2e59cb71eaf4c1bdbc829238fde6f.zip | |
CWS swlayoutrefactoring: resync to m100
Diffstat (limited to 'sw/inc/fmtfld.hxx')
| -rw-r--r-- | sw/inc/fmtfld.hxx | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/sw/inc/fmtfld.hxx b/sw/inc/fmtfld.hxx index 52777e0b8022..a0534c01573f 100644 --- a/sw/inc/fmtfld.hxx +++ b/sw/inc/fmtfld.hxx @@ -74,7 +74,12 @@ public: virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; +<<<<<<< local virtual BOOL GetInfo( SfxPoolItem& rInfo ) const; +======= + virtual void Modify( SfxPoolItem* pOld, SfxPoolItem* pNew ); + virtual sal_Bool GetInfo( SfxPoolItem& rInfo ) const; +>>>>>>> other const SwField *GetFld() const { return pField; } SwField *GetFld() { return pField; } @@ -92,9 +97,14 @@ public: const SwTxtFld *GetTxtFld() const { return pTxtAttr; } SwTxtFld *GetTxtFld() { return pTxtAttr; } +<<<<<<< local BOOL IsFldInDoc() const; BOOL IsProtect() const; void RegisterToFieldType( SwFieldType& ); +======= + sal_Bool IsFldInDoc() const; + sal_Bool IsProtect() const; +>>>>>>> other }; class SW_DLLPUBLIC SwFmtFldHint : public SfxHint |