diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-10-22 14:06:33 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-10-22 14:06:33 +0000 |
| commit | 3a9acc34bc2b93a4ebd5e819c89b69ad8d6862c1 (patch) | |
| tree | edaf26623309f3ebf952b1d86783abdbfed385bd /sw/inc/numrule.hxx | |
| parent | 350917fd2575dc9247da9c31f7a4fc6fabc0a015 (diff) | |
INTEGRATION: CWS swusing (1.31.36); FILE MERGED
2007/10/10 14:14:49 tl 1.31.36.1: #i82476# make newly added 'using' declarations private
Diffstat (limited to 'sw/inc/numrule.hxx')
| -rw-r--r-- | sw/inc/numrule.hxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sw/inc/numrule.hxx b/sw/inc/numrule.hxx index 0a9e7676ba69..deec7829c617 100644 --- a/sw/inc/numrule.hxx +++ b/sw/inc/numrule.hxx @@ -4,9 +4,9 @@ * * $RCSfile: numrule.hxx,v $ * - * $Revision: 1.32 $ + * $Revision: 1.33 $ * - * last change: $Author: ihi $ $Date: 2007-10-15 17:32:27 $ + * last change: $Author: vg $ $Date: 2007-10-22 15:06:33 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -105,6 +105,9 @@ class SW_DLLPUBLIC SwNumFmt : public SvxNumberFormat, public SwClient SW_DLLPRIVATE void UpdateNumNodes( SwDoc* pDoc ); SW_DLLPRIVATE virtual void NotifyGraphicArrived(); + using SvxNumberFormat::operator ==; + using SvxNumberFormat::operator !=; + public: SwNumFmt(); SwNumFmt( const SwNumFmt& ); @@ -114,9 +117,7 @@ public: SwNumFmt& operator=( const SwNumFmt& ); - using SvxNumberFormat::operator ==; BOOL operator==( const SwNumFmt& ) const; - using SvxNumberFormat::operator !=; BOOL operator!=( const SwNumFmt& r ) const { return !(*this == r); } SwCharFmt* GetCharFmt() const { return (SwCharFmt*)pRegisteredIn; } |