diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-02-27 11:37:41 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-02-27 11:37:41 +0000 |
| commit | 59dde7bd424cd459f9651b51b62d15d80c0c5f29 (patch) | |
| tree | 230eec1d65673a7a5e09a8f4e613ab0fc9e4f875 /sc/source/filter/inc/xlformula.hxx | |
| parent | d401449e098d2a24fd39252fa75416112c1760d2 (diff) | |
INTEGRATION: CWS calcwarnings (1.9.116); FILE MERGED
2006/12/01 14:42:07 dr 1.9.116.1: #i69284# remove compiler warnings for wntmsci10
Diffstat (limited to 'sc/source/filter/inc/xlformula.hxx')
| -rw-r--r-- | sc/source/filter/inc/xlformula.hxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sc/source/filter/inc/xlformula.hxx b/sc/source/filter/inc/xlformula.hxx index 327556030a15..880e3982125b 100644 --- a/sc/source/filter/inc/xlformula.hxx +++ b/sc/source/filter/inc/xlformula.hxx @@ -4,9 +4,9 @@ * * $RCSfile: xlformula.hxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: obo $ $Date: 2006-07-10 14:04:15 $ + * last change: $Author: vg $ $Date: 2007-02-27 12:37:41 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -463,14 +463,14 @@ public: inline sal_uInt8 XclTokenArrayHelper::GetTokenId( sal_uInt8 nBaseId, sal_uInt8 nTokenClass ) { - DBG_ASSERT( !::get_flag< sal_uInt8 >( nBaseId, ~EXC_TOKID_MASK ), "XclTokenArrayHelper::GetTokenId - invalid token ID" ); - DBG_ASSERT( !::get_flag< sal_uInt8 >( nTokenClass, ~EXC_TOKCLASS_MASK ), "XclTokenArrayHelper::GetTokenId - invalid token class" ); + DBG_ASSERT( !::get_flag( nBaseId, static_cast< sal_uInt8 >( ~EXC_TOKID_MASK ) ), "XclTokenArrayHelper::GetTokenId - invalid token ID" ); + DBG_ASSERT( !::get_flag( nTokenClass, static_cast< sal_uInt8 >( ~EXC_TOKCLASS_MASK ) ), "XclTokenArrayHelper::GetTokenId - invalid token class" ); return nBaseId | nTokenClass; } inline void XclTokenArrayHelper::ChangeTokenClass( sal_uInt8& rnTokenId, sal_uInt8 nTokenClass ) { - DBG_ASSERT( !::get_flag< sal_uInt8 >( nTokenClass, ~EXC_TOKCLASS_MASK ), "XclTokenArrayHelper::ChangeTokenClass - invalid token class" ); + DBG_ASSERT( !::get_flag( nTokenClass, static_cast< sal_uInt8 >( ~EXC_TOKCLASS_MASK ) ), "XclTokenArrayHelper::ChangeTokenClass - invalid token class" ); ::set_flag( rnTokenId, EXC_TOKCLASS_MASK, false ); ::set_flag( rnTokenId, nTokenClass ); } |