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/fldbas.hxx | |
| parent | 09d6c9a395b8849e3e09c694282a1446b786bf80 (diff) | |
| parent | 42c3881914531e6d81d6fb05bdc7b308db98146c (diff) | |
CWS swlayoutrefactoring: resync to m96, no conflict resolution
Diffstat (limited to 'sw/inc/fldbas.hxx')
| -rw-r--r-- | sw/inc/fldbas.hxx | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/sw/inc/fldbas.hxx b/sw/inc/fldbas.hxx index 8a36e1de6ec8..60c55abbffbd 100644 --- a/sw/inc/fldbas.hxx +++ b/sw/inc/fldbas.hxx @@ -24,10 +24,8 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#ifndef _FLDBAS_HXX -#define _FLDBAS_HXX - -#ifndef FIELDIDS_ONLY // SWG-Testreader!! +#ifndef SW_FLDBAS_HXX +#define SW_FLDBAS_HXX #include <i18npool/lang.h> #include <tools/debug.hxx> @@ -40,7 +38,6 @@ class SwDoc; class SvStringsDtor; class SvNumberFormatter; -#endif // FIELDIDS_ONLY /*-------------------------------------------------------------------- Beschreibung: die ID's fuer die Feldtypen @@ -236,8 +233,6 @@ enum SwDateTimeSubType TIMEFLD = 4 }; -#ifndef FIELDIDS_ONLY // SWG-Testreader!! - extern USHORT __FAR_DATA aTypeTab[]; @@ -331,13 +326,16 @@ public: virtual SwFieldType* ChgTyp( SwFieldType* ); /** expand the field. - @param bInClipboard field is in clipboard document? + @param bCached return cached field value. + @remark most callers should use the cached field value. + this is because various fields need special handing + (ChangeExpansion()) to return correct values, and only + SwTxtFormatter::NewFldPortion() sets things up properly. @return the generated text (suitable for display) */ - String ExpandField(bool const bInClipboard) const; + String ExpandField(bool const bCached) const; - // liefert den Namen oder den Inhalt - virtual String GetCntnt(BOOL bName = FALSE) const; + virtual String GetFieldName() const; SwField * CopyField() const; @@ -461,5 +459,4 @@ public: String GetExpandedFormula() const; }; -#endif // FIELDIDS_ONLY -#endif // _FLDBAS_HXX +#endif // SW_FLDBAS_HXX |