diff options
| author | Michael Stahl <mst@openoffice.org> | 2010-10-04 17:14:34 +0200 |
|---|---|---|
| committer | Michael Stahl <mst@openoffice.org> | 2010-10-04 17:14:34 +0200 |
| commit | f7c044dd301bfdfa165714b88b1d0af067d5b193 (patch) | |
| tree | 5aaf3b473e3a2106451df9ebdc4731d9c6fec2a9 /sw/inc/reffld.hxx | |
| parent | c4443211969706af9ddf418164d9e10bbda60dc3 (diff) | |
sw34bf01: #i85766# #i112425#: prevent expansion of fields in temp documents:
SwField subclasses: make Expand()/Copy() methods private, like in SwField.
SwField+subclasses: replace method GetCntnt(BOOL) with GetFieldName().
SwTblField: refactor Expand() and GetCntnt(BOOL): create new private method.
Diffstat (limited to 'sw/inc/reffld.hxx')
| -rw-r--r-- | sw/inc/reffld.hxx | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sw/inc/reffld.hxx b/sw/inc/reffld.hxx index b2b61dff6434..44d17eb38ca8 100644 --- a/sw/inc/reffld.hxx +++ b/sw/inc/reffld.hxx @@ -24,8 +24,8 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#ifndef _REFFLD_HXX -#define _REFFLD_HXX +#ifndef SW_REFFLD_HXX +#define SW_REFFLD_HXX #include <fldbas.hxx> @@ -99,6 +99,9 @@ private: USHORT nSubType; USHORT nSeqNo; + virtual String Expand() const; + virtual SwField* Copy() const; + // --> OD 2007-08-24 #i81002# String MakeRefNumStr( const SwTxtNode& rTxtNodeOfField, const SwTxtNode& rTxtNodeOfReferencedItem, @@ -110,9 +113,7 @@ public: virtual ~SwGetRefField(); - virtual String GetCntnt(BOOL bName = FALSE) const; - virtual String Expand() const; - virtual SwField* Copy() const; + virtual String GetFieldName() const; const String& GetSetRefName() const { return sSetRefName; } @@ -158,5 +159,5 @@ public: }; -#endif // _REFFLD_HXX +#endif // SW_REFFLD_HXX |