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/inc/usrfld.hxx | |
| parent | 09d6c9a395b8849e3e09c694282a1446b786bf80 (diff) | |
| parent | 42c3881914531e6d81d6fb05bdc7b308db98146c (diff) | |
CWS swlayoutrefactoring: resync to m96, no conflict resolution
Diffstat (limited to 'sw/inc/usrfld.hxx')
| -rw-r--r-- | sw/inc/usrfld.hxx | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sw/inc/usrfld.hxx b/sw/inc/usrfld.hxx index 433af9eae145..e33c753e3591 100644 --- a/sw/inc/usrfld.hxx +++ b/sw/inc/usrfld.hxx @@ -24,8 +24,8 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#ifndef _USRFLD_HXX -#define _USRFLD_HXX +#ifndef SW_USRFLD_HXX +#define SW_USRFLD_HXX #include "swdllapi.h" #include "fldbas.hxx" @@ -106,6 +106,9 @@ class SW_DLLPUBLIC SwUserField : public SwValueField { USHORT nSubType; + virtual String Expand() const; + virtual SwField* Copy() const; + public: SwUserField(SwUserFieldType*, USHORT nSub = 0, sal_uInt32 nFmt = 0); @@ -115,9 +118,7 @@ public: virtual double GetValue() const; virtual void SetValue( const double& rVal ); - virtual String Expand() const; - virtual SwField* Copy() const; - virtual String GetCntnt(BOOL bName = FALSE) const; + virtual String GetFieldName() const; // Name kann nicht geaendert werden virtual const String& GetPar1() const; @@ -129,4 +130,4 @@ public: virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhichId ); }; -#endif // _USRFLD_HXX +#endif // SW_USRFLD_HXX |