diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-09-27 09:01:57 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-09-27 09:01:57 +0000 |
| commit | 56ff48c30469777b2df33dfbfd37b7e8229be108 (patch) | |
| tree | fa74ccdfda0f8e033bbe918b8c69efcdf3a845a3 /sw/source/filter/ww8/wrtw8num.cxx | |
| parent | 146ce8f71d9fd5b65ed7ea09151124c577c8054d (diff) | |
INTEGRATION: CWS swwarnings (1.38.222); FILE MERGED
2007/08/20 15:47:06 tl 1.38.222.3: RESYNC: (1.39-1.40); FILE MERGED
2007/06/28 11:56:04 os 1.38.222.2: RESYNC: (1.38-1.39); FILE MERGED
2007/04/03 13:00:51 tl 1.38.222.1: #i69287# warning-free code
Diffstat (limited to 'sw/source/filter/ww8/wrtw8num.cxx')
| -rw-r--r-- | sw/source/filter/ww8/wrtw8num.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sw/source/filter/ww8/wrtw8num.cxx b/sw/source/filter/ww8/wrtw8num.cxx index 9c3719a7d943..1c00c5f08391 100644 --- a/sw/source/filter/ww8/wrtw8num.cxx +++ b/sw/source/filter/ww8/wrtw8num.cxx @@ -4,9 +4,9 @@ * * $RCSfile: wrtw8num.cxx,v $ * - * $Revision: 1.40 $ + * $Revision: 1.41 $ * - * last change: $Author: rt $ $Date: 2007-07-25 14:36:30 $ + * last change: $Author: hr $ $Date: 2007-09-27 10:01:57 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -110,7 +110,7 @@ USHORT SwWW8Writer::DupNumRuleWithLvlStart(const SwNumRule *pRule,BYTE nLvl, SwNumRule* pMyNumRule = new SwNumRule(pDoc->GetUniqueNumRuleName(&sPrefix)); pUsedNumTbl->Insert( pMyNumRule, pUsedNumTbl->Count() ); - for (int i=0;i<MAXLEVEL;i++) + for (USHORT i=0;i<MAXLEVEL;i++) { const SwNumFmt& rSubRule = pRule->Get(i); pMyNumRule->Set( i, rSubRule ); @@ -240,8 +240,8 @@ void SwWW8Writer::OutListTab() { const SwNumRule& rRule = *pUsedNumTbl->GetObject( n ); BYTE nLvl, nFlags, nAlign; - BYTE nLevels = rRule.IsContinusNum() ? - WW8ListManager::nMinLevel : WW8ListManager::nMaxLevel; + BYTE nLevels = static_cast< BYTE >(rRule.IsContinusNum() ? + WW8ListManager::nMinLevel : WW8ListManager::nMaxLevel); for( nLvl = 0; nLvl < nLevels; ++nLvl ) { // write the static data of the SwNumFmt of this level @@ -592,7 +592,7 @@ void SwWW8Writer::BuildAnlvBulletBase(WW8_ANLV& rAnlv, BYTE*& rpCh, if ( (eChrSet == RTL_TEXTENCODING_SYMBOL) && (cChar >= 0xF000) && ( cChar <= 0xF0FF) ) { - *rpCh = cChar - 0xF000; + *rpCh = static_cast< BYTE >(cChar - 0xF000); } else *rpCh = ByteString::ConvertFromUnicode(cChar, eChrSet); @@ -673,7 +673,7 @@ static void SwWw8_InsertAnlText( const String& rStr, BYTE*& rpCh, nb = (BYTE)nCnt; memcpy( rpCh, aO.GetData(), nCnt ); rpCh += nCnt; - rCharLen -= nCnt; + rCharLen = rCharLen - nCnt; } ByteToSVBT8( nb, r8Len ); } @@ -779,7 +779,7 @@ bool SwWW8Writer::Out_SwNum(const SwTxtNode* pNd) return false; } - BYTE nSwLevel = nLevel; + BYTE nSwLevel = static_cast< BYTE >(nLevel); const SwNumRule* pRul = pNd->GetNumRule(); if( !pRul || nSwLevel == WW8ListManager::nMaxLevel) |