diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-09-27 07:07:09 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-09-27 07:07:09 +0000 |
| commit | 5ff9f8a1cc34766ba47c8bf1529bf322b6708a3c (patch) | |
| tree | 26b8b8a65ae699e420b063ff77c489ae5e9f6a31 /sw/inc/numrule.hxx | |
| parent | eaffd95d35bfc35b884878be0f0cc23ca894612e (diff) | |
INTEGRATION: CWS swwarnings (1.29.212); FILE MERGED
2007/05/29 10:47:12 os 1.29.212.3: RESYNC: (1.29-1.30); FILE MERGED
2007/04/03 12:57:07 tl 1.29.212.2: #i69287# warning-free code
2007/03/05 12:43:17 tl 1.29.212.1: #i69287# warning-free code
Diffstat (limited to 'sw/inc/numrule.hxx')
| -rw-r--r-- | sw/inc/numrule.hxx | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/sw/inc/numrule.hxx b/sw/inc/numrule.hxx index 7b2af33e0293..727cb1f0a3e6 100644 --- a/sw/inc/numrule.hxx +++ b/sw/inc/numrule.hxx @@ -4,9 +4,9 @@ * * $RCSfile: numrule.hxx,v $ * - * $Revision: 1.30 $ + * $Revision: 1.31 $ * - * last change: $Author: rt $ $Date: 2007-04-25 08:55:49 $ + * last change: $Author: hr $ $Date: 2007-09-27 08:07:09 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -113,7 +113,10 @@ public: virtual ~SwNumFmt(); 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; } @@ -123,10 +126,10 @@ public: virtual void SetCharFmtName(const String& rSet); virtual const String& GetCharFmtName()const; - virtual void SetGraphicBrush( const SvxBrushItem* pBrushItem, const Size* pSize = 0, const SvxFrameVertOrient* pOrient = 0); + virtual void SetGraphicBrush( const SvxBrushItem* pBrushItem, const Size* pSize = 0, const sal_Int16* pOrient = 0); - virtual void SetVertOrient(SvxFrameVertOrient eSet); - virtual SvxFrameVertOrient GetVertOrient() const; + virtual void SetVertOrient(sal_Int16 eSet); + virtual sal_Int16 GetVertOrient() const; const SwFmtVertOrient* GetGraphicOrientation() const; BOOL IsEnumeration() const; // #i22362# |