diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-09-27 07:49:48 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-09-27 07:49:48 +0000 |
| commit | 2b8c83645fce8577d28e359f2b5f11b04e7db287 (patch) | |
| tree | e200f25b2efd0bc193804beff4864f01bc3a9fd9 /sw/source/core/fields/macrofld.cxx | |
| parent | 90efcc9170b999f8ca30fc70f0e8a41d4b1e54de (diff) | |
INTEGRATION: CWS swwarnings (1.10.222); FILE MERGED
2007/04/18 12:19:42 tl 1.10.222.2: #i69287# warning-free code
2007/03/09 16:20:22 ama 1.10.222.1: #i69287#: warning free code
Diffstat (limited to 'sw/source/core/fields/macrofld.cxx')
| -rw-r--r-- | sw/source/core/fields/macrofld.cxx | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/sw/source/core/fields/macrofld.cxx b/sw/source/core/fields/macrofld.cxx index 8d1a97ab2abf..dd2fe0afd13d 100644 --- a/sw/source/core/fields/macrofld.cxx +++ b/sw/source/core/fields/macrofld.cxx @@ -4,9 +4,9 @@ * * $RCSfile: macrofld.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: obo $ $Date: 2006-09-16 21:12:34 $ + * last change: $Author: hr $ $Date: 2007-09-27 08:49:48 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -87,9 +87,9 @@ SwFieldType* SwMacroFieldType::Copy() const Beschreibung: Das Macrofeld selbst --------------------------------------------------------------------*/ -SwMacroField::SwMacroField(SwMacroFieldType* pType, +SwMacroField::SwMacroField(SwMacroFieldType* pInitType, const String& rLibAndName, const String& rTxt) : - SwField(pType), aMacro(rLibAndName), aText(rTxt), bIsScriptURL(FALSE) + SwField(pInitType), aMacro(rLibAndName), aText(rTxt), bIsScriptURL(FALSE) { bIsScriptURL = isScriptURL(aMacro); } @@ -205,10 +205,9 @@ String SwMacroField::GetPar2() const /*-----------------05.03.98 13:38------------------- --------------------------------------------------*/ -BOOL SwMacroField::QueryValue( uno::Any& rAny, BYTE nMId ) const +BOOL SwMacroField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const { - nMId &= ~CONVERT_TWIPS; - switch( nMId ) + switch( nWhichId ) { case FIELD_PROP_PAR1: rAny <<= OUString(GetMacroName()); @@ -230,11 +229,10 @@ BOOL SwMacroField::QueryValue( uno::Any& rAny, BYTE nMId ) const /*-----------------05.03.98 13:38------------------- --------------------------------------------------*/ -BOOL SwMacroField::PutValue( const uno::Any& rAny, BYTE nMId ) +BOOL SwMacroField::PutValue( const uno::Any& rAny, USHORT nWhichId ) { String sTmp; - nMId &= ~CONVERT_TWIPS; - switch( nMId ) + switch( nWhichId ) { case FIELD_PROP_PAR1: CreateMacroString( aMacro, ::GetString(rAny, sTmp), GetLibName()); |