INTEGRATION: CWS warnings01 (1.3.4); FILE MERGED

2006/02/10 14:25:14 os 1.3.4.3: #i59838# warnings removed
2005/10/13 09:53:19 os 1.3.4.2: #i53898# warnings removed
2005/10/04 08:25:17 sb 1.3.4.1: #i53898# Merged in lost 1.2.8.1.

1 files changed, 10 insertions, 11 deletions

diff --git a/hwpfilter/source/hwpfile.cpp b/hwpfilter/source/hwpfile.cpp
index 161d83988fa4..ceaa6a1810ec 100644
--- a/hwpfilter/source/hwpfile.cpp
+++ b/hwpfilter/source/hwpfile.cpp
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: hwpfile.cpp,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-07 16:40:49 $
+ *  last change: $Author: hr $ $Date: 2006-06-20 00:55:03 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -33,8 +33,6 @@
  *
  ************************************************************************/
 
-/* $Id: hwpfile.cpp,v 1.3 2005-09-07 16:40:49 rt Exp $ */
-
 #include "precompile.h"
 
 #include <stdio.h>
@@ -165,7 +163,7 @@ int HWPFile::Open(HStream & stream)
 {
     HStreamIODev *hstreamio;
 
-    if (!(hstreamio = new HStreamIODev(stream)))
+    if (0 == (hstreamio = new HStreamIODev(stream)))
     {
         printf(" hstreamio is not instanciate \n");
         return SetState(errno);
@@ -394,11 +392,11 @@ bool HWPFile::TagsRead(void)
                      ReadBlock(_hwpInfo.back_info.reserved1, 8);
                      _hwpInfo.back_info.luminance = Read4b();
                      _hwpInfo.back_info.contrast = Read4b();
-                     _hwpInfo.back_info.effect = Read1b();
+                     _hwpInfo.back_info.effect = sal::static_int_cast<char>(Read1b());
                      ReadBlock(_hwpInfo.back_info.reserved2, 7);
                      ReadBlock(_hwpInfo.back_info.filename, 260);
                      ReadBlock(_hwpInfo.back_info.color, 3);
-                     unsigned short nFlag = Read2b();
+                     unsigned short nFlag = sal::static_int_cast<unsigned short>(Read2b());
                      _hwpInfo.back_info.flag = nFlag >> 8 ;
                      int nRange = Read4b();
                      _hwpInfo.back_info.range = nRange >> 24;
@@ -427,7 +425,7 @@ bool HWPFile::TagsRead(void)
                 SkipBlock(size);
         }
     }
-    return false;
+//    return false;
 }
 
 
@@ -473,7 +471,8 @@ ColumnDef *HWPFile::GetColumnDef(int num)
 int HWPFile::GetPageMasterNum(int page)
 {
     LinkedListIterator<ColumnInfo> it(&columnlist);
-    ColumnInfo *prev = 0;
+    //os: unused
+    //ColumnInfo *prev = 0;
     ColumnInfo *now = 0;
     int i;
 
@@ -602,7 +601,7 @@ void HWPFile::AddParaShape(ParaShape * pshape)
           }
     }
     if( nscount )
-        pshape->tabs[MAXTABS-1].type = nscount;
+        pshape->tabs[MAXTABS-1].type = sal::static_int_cast<char>(nscount);
      int value = compareParaShape(pshape);
     if( value == 0 || nscount )
     {
@@ -644,7 +643,7 @@ void HWPFile::SetColumnDef(ColumnDef *coldef)
 
 void HWPFile::AddDateFormat(DateCode * hbox)
 {
-    hbox->key = ++datecodecount;
+    hbox->key = sal::static_int_cast<char>(++datecodecount);
     datecodes.insert(hbox, -1);
 }