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/inetfld.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/inetfld.hxx')
-rw-r--r-- | sw/inc/inetfld.hxx | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sw/inc/inetfld.hxx b/sw/inc/inetfld.hxx index 2bb3c6f9c880..de3f81c49e31 100644 --- a/sw/inc/inetfld.hxx +++ b/sw/inc/inetfld.hxx @@ -24,8 +24,8 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#ifndef _INETFLD_HXX -#define _INETFLD_HXX +#ifndef SW_INETFLD_HXX +#define SW_INETFLD_HXX #include "fldbas.hxx" @@ -69,15 +69,16 @@ class SwINetField : public SwField String sText; SvxMacroTableDtor* pMacroTbl; + virtual String Expand() const; + virtual SwField* Copy() const; + public: // Direkte Eingabe alten Wert loeschen SwINetField( SwINetFieldType* pTyp, USHORT nFmt, const String& rURL, const String& rText ); virtual ~SwINetField(); - virtual String GetCntnt(BOOL bName = FALSE) const; - virtual String Expand() const; - virtual SwField* Copy() const; + virtual String GetFieldName() const; // URL virtual const String& GetPar1() const; @@ -105,5 +106,5 @@ public: }; -#endif // _INETFLD_HXX +#endif // SW_INETFLD_HXX |