diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-09-27 07:17:08 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-09-27 07:17:08 +0000 |
| commit | c258e24f0448a93aa68f1cebca39612d21c322e0 (patch) | |
| tree | 41f5cfc55f9f4f7c2d5a8d4c30decab3b7b67a65 /sw/inc/usrfld.hxx | |
| parent | 329a91a45304bd3acf347eacb54f54a8a02f33a6 (diff) | |
INTEGRATION: CWS swwarnings (1.5.592); FILE MERGED
2007/05/29 10:59:56 os 1.5.592.3: RESYNC: (1.5-1.6); FILE MERGED
2007/04/18 14:44:49 tl 1.5.592.2: #i69287# warning-free code
2007/03/12 12:40:30 ama 1.5.592.1: i69287#: warning free code
Diffstat (limited to 'sw/inc/usrfld.hxx')
| -rw-r--r-- | sw/inc/usrfld.hxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sw/inc/usrfld.hxx b/sw/inc/usrfld.hxx index f6d2824fd28d..311e7043c6d9 100644 --- a/sw/inc/usrfld.hxx +++ b/sw/inc/usrfld.hxx @@ -4,9 +4,9 @@ * * $RCSfile: usrfld.hxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: rt $ $Date: 2007-04-25 08:58:06 $ + * last change: $Author: hr $ $Date: 2007-09-27 08:17:08 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -86,8 +86,8 @@ public: BOOL IsDeleted() const { return bDeleted; } void SetDeleted( BOOL b ) { bDeleted = b; } - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, BYTE nMId ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, BYTE nMId ); + virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nMId ) const; + virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nMId ); }; inline BOOL SwUserFieldType::IsValid() const @@ -108,7 +108,7 @@ inline USHORT SwUserFieldType::GetType() const inline void SwUserFieldType::SetType(USHORT nSub) { nType = nSub; - EnableFormat(!(nSub & GSE_STRING)); + EnableFormat(!(nSub & nsSwGetSetExpType::GSE_STRING)); } /*-------------------------------------------------------------------- @@ -138,8 +138,8 @@ public: // Inhalt virtual String GetPar2() const; virtual void SetPar2(const String& rStr); - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, BYTE nMId ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, BYTE nMId ); + virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhichId ) const; + virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhichId ); }; #endif // _USRFLD_HXX |