diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-10-22 14:07:32 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-10-22 14:07:32 +0000 |
| commit | 5a2f386789157cda6768e7cb11e455a61dae42b5 (patch) | |
| tree | bb40c725e0be89d241102bff385c530e3833444c /sw/inc/ftninfo.hxx | |
| parent | 3185537650d9cdc4cef061085a38e9028d2d20ab (diff) | |
INTEGRATION: CWS swusing (1.6.38); FILE MERGED
2007/10/10 14:14:49 tl 1.6.38.1: #i82476# make newly added 'using' declarations private
Diffstat (limited to 'sw/inc/ftninfo.hxx')
| -rw-r--r-- | sw/inc/ftninfo.hxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sw/inc/ftninfo.hxx b/sw/inc/ftninfo.hxx index d81750771125..da0579b9015d 100644 --- a/sw/inc/ftninfo.hxx +++ b/sw/inc/ftninfo.hxx @@ -4,9 +4,9 @@ * * $RCSfile: ftninfo.hxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: hr $ $Date: 2007-09-27 08:03:59 $ + * last change: $Author: vg $ $Date: 2007-10-22 15:05:47 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -105,6 +105,8 @@ enum SwFtnNum class SW_DLLPUBLIC SwFtnInfo: public SwEndNoteInfo { + using SwEndNoteInfo::operator ==; + public: String aQuoVadis; String aErgoSum; @@ -114,7 +116,6 @@ public: SwFtnInfo& operator=(const SwFtnInfo&); - using SwEndNoteInfo::operator ==; BOOL operator==( const SwFtnInfo &rInf ) const; SwFtnInfo(SwTxtFmtColl* pTxtColl = 0); |