diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-02-27 10:53:56 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-02-27 10:53:56 +0000 |
| commit | f33dffa46152624744bdee37cbfe60c2ba178d09 (patch) | |
| tree | b73c5658723eb0d426d0febfdf4a5c0d75937cc6 /sc/inc/compiler.hxx | |
| parent | d5a54ff324ed2be0e50a7031155ef72532144535 (diff) | |
INTEGRATION: CWS calcwarnings (1.27.46); FILE MERGED
2007/02/19 15:46:32 nn 1.27.46.3: RESYNC: (1.27-1.28); FILE MERGED
2006/12/06 13:34:12 nn 1.27.46.2: #i69284# warning-free: core, unxlngi6
2006/11/28 13:24:32 nn 1.27.46.1: #i69284# warning-free: core, wntmsci10
Diffstat (limited to 'sc/inc/compiler.hxx')
| -rw-r--r-- | sc/inc/compiler.hxx | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx index 1e6b157a866b..620173ae758e 100644 --- a/sc/inc/compiler.hxx +++ b/sc/inc/compiler.hxx @@ -4,9 +4,9 @@ * * $RCSfile: compiler.hxx,v $ * - * $Revision: 1.28 $ + * $Revision: 1.29 $ * - * last change: $Author: obo $ $Date: 2007-01-22 11:57:34 $ + * last change: $Author: vg $ $Date: 2007-02-27 11:53:56 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -151,6 +151,7 @@ struct ScRawToken // Friends that use a temporary ScRawToken on the stack (and therefor need // the private dtor) and know what they're doing.. friend class ScTokenArray; + friend USHORT lcl_ScRawTokenOffset(); private: SC_TOKEN_FIX_MEMBERS public: @@ -234,7 +235,7 @@ public: Convention( ScAddress::Convention eConvP ); - ~Convention(); + virtual ~Convention(); virtual void MakeRefStr( rtl::OUStringBuffer& rBuffer, const ScCompiler& rCompiler, @@ -399,7 +400,8 @@ public: { sal_Unicode c = rStr.GetChar( nPos ); return c < 128 ? - ((pConventions[eConv]->mpCharTable[ UINT8(c) ] & SC_COMPILER_C_CHAR_WORD) == SC_COMPILER_C_CHAR_WORD) : + static_cast<BOOL>( + (pConventions[eConv]->mpCharTable[ UINT8(c) ] & SC_COMPILER_C_CHAR_WORD) == SC_COMPILER_C_CHAR_WORD) : ScGlobal::pCharClass->isLetterNumeric( rStr, nPos ); } @@ -410,7 +412,8 @@ public: { sal_Unicode c = rStr.GetChar( nPos ); return c < 128 ? - ((pConventions[eConv]->mpCharTable[ UINT8(c) ] & SC_COMPILER_C_WORD) == SC_COMPILER_C_WORD) : + static_cast<BOOL>( + (pConventions[eConv]->mpCharTable[ UINT8(c) ] & SC_COMPILER_C_WORD) == SC_COMPILER_C_WORD) : ScGlobal::pCharClass->isLetterNumeric( rStr, nPos ); } |