remove warnings

6 files changed, 54 insertions, 54 deletions

diff --git a/registry/source/keyimpl.cxx b/registry/source/keyimpl.cxx
index 88ab180472c7..245727201653 100644
--- a/registry/source/keyimpl.cxx
+++ b/registry/source/keyimpl.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: keyimpl.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 15:18:42 $
+ *  last change: $Author: jsc $ $Date: 2001-01-10 10:15:53 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -297,7 +297,7 @@ RegError ORegKey::closeSubKeys(RegKeyHandle* phSubKeys, sal_uInt32 nSubKeys)
 {
     RegError    _ret = REG_NO_ERROR;
 
-    for (int i=0; i < nSubKeys; i++)
+    for (sal_uInt32 i=0; i < nSubKeys; i++)
     {
         _ret = closeKey(phSubKeys[i]);
     }
@@ -505,7 +505,7 @@ RegError ORegKey::setLongListValue(const OUString& valueName, sal_Int32* pValueL
 
     sal_uInt32 offset = 4; // initial 4 Bytes fuer die Laenge des Arrays
 
-    for (int i=0; i < len; i++)
+    for (sal_uInt32 i=0; i < len; i++)
     {
         writeINT32(pBuffer+VALUE_HEADEROFFSET+offset, pValueList[i]);
         offset += 4;
@@ -552,7 +552,7 @@ RegError ORegKey::setStringListValue(const OUString& valueName, sal_Char** pValu
 
     sal_uInt32 size = 4; // 4 Bytes (sal_uInt32) fuer die Laenge
 
-    int i;
+    sal_uInt32 i;
     for (i=0; i < len; i++)
     {
         size +=  4 + strlen(pValueList[i]) + 1;
@@ -619,7 +619,7 @@ RegError ORegKey::setUnicodeListValue(const OUString& valueName, sal_Unicode** p
 
     sal_uInt32 size = 4; // 4 Bytes (sal_uInt32) fuer die Laenge
 
-    int i;
+    sal_uInt32 i;
     for (i=0; i < len; i++)
     {
         size +=  4 + ((rtl_ustr_getLength(pValueList[i]) +1) * 2);
@@ -841,7 +841,7 @@ RegError ORegKey::getLongListValue(const OUString& valueName, sal_Int32** pValue
 
     sal_uInt32 offset = 4; // initial 4 Bytes fuer die Laenge des Arrays;
 
-    for (int i=0; i < len; i++)
+    for (sal_uInt32 i=0; i < len; i++)
     {
         readINT32(pBuffer+offset, pVList[i]);
         offset += 4;
@@ -940,7 +940,7 @@ RegError ORegKey::getStringListValue(const OUString& valueName, sal_Char*** pVal
     sal_uInt32 sLen = 0;
 
     sal_Char *pValue;
-    for (int i=0; i < len; i++)
+    for (sal_uInt32 i=0; i < len; i++)
     {
         readUINT32(pBuffer+offset, sLen);
 
@@ -1046,7 +1046,7 @@ RegError ORegKey::getUnicodeListValue(const OUString& valueName, sal_Unicode***
     sal_uInt32 sLen = 0;
 
     sal_Unicode *pValue;
-    for (int i=0; i < len; i++)
+    for (sal_uInt32 i=0; i < len; i++)
     {
         readUINT32(pBuffer+offset, sLen);
 
diff --git a/registry/source/reflread.cxx b/registry/source/reflread.cxx
index f0008b86d5e6..e1bb2da127ee 100644
--- a/registry/source/reflread.cxx
+++ b/registry/source/reflread.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: reflread.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: jsc $ $Date: 2000-10-09 11:54:41 $
+ *  last change: $Author: jsc $ $Date: 2001-01-10 10:15:53 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -267,13 +267,13 @@ public:
     sal_Bool            readBOOLConstant(sal_uInt16 index);
     sal_uInt8           readBYTEConstant(sal_uInt16 index);
     sal_Int16           readINT16Constant(sal_uInt16 index);
-    sal_uInt16      readUINT16Constant(sal_uInt16 index);
+    sal_uInt16          readUINT16Constant(sal_uInt16 index);
     sal_Int32           readINT32Constant(sal_uInt16 index);
     sal_uInt32          readUINT32Constant(sal_uInt16 index);
-    float           readFloatConstant(sal_uInt16 index);
-    double          readDoubleConstant(sal_uInt16 index);
+    float               readFloatConstant(sal_uInt16 index);
+    double              readDoubleConstant(sal_uInt16 index);
     const sal_Unicode*  readStringConstant(sal_uInt16 index);
-    void            readUIK(sal_uInt16 index, RTUik* uik);
+    void                readUIK(sal_uInt16 index, RTUik* uik);
 };
 
 ConstantPool::~ConstantPool()
@@ -863,7 +863,7 @@ public:
     const sal_Char* getMethodDoku(sal_uInt16 index);
 
 private:
-    sal_uInt8 calcMethodParamIndex( const sal_uInt8 index );
+    sal_uInt16 calcMethodParamIndex( const sal_uInt16 index );
 };
 
 MethodList::~MethodList()
@@ -871,7 +871,7 @@ MethodList::~MethodList()
     if (m_pIndex) delete[] m_pIndex;
 }
 
-sal_uInt8 MethodList::calcMethodParamIndex( const sal_uInt8 index )
+sal_uInt16 MethodList::calcMethodParamIndex( const sal_uInt16 index )
 {
     return (METHOD_OFFSET_PARAM_COUNT + sizeof(sal_uInt16) + (index * m_PARAM_ENTRY_SIZE));
 }
diff --git a/registry/source/reflwrit.cxx b/registry/source/reflwrit.cxx
index f13de40e6239..98bbc5c1ca6f 100644
--- a/registry/source/reflwrit.cxx
+++ b/registry/source/reflwrit.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: reflwrit.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: jsc $ $Date: 2000-10-09 11:54:41 $
+ *  last change: $Author: jsc $ $Date: 2001-01-10 10:15:53 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -848,11 +848,11 @@ void TypeWriter::createBlop()
         delete[] m_blop;
 
     CPInfo  root(CP_TAG_INVALID, NULL);
-    sal_uInt32  cpIndexThisName = 0;
-    sal_uInt32* cpIndexSuperNames = NULL;
-    sal_uInt32  cpIndexUik = 0;
-    sal_uInt32  cpIndexDoku = 0;
-    sal_uInt32  cpIndexFileName = 0;
+    sal_uInt16  cpIndexThisName = 0;
+    sal_uInt16* cpIndexSuperNames = NULL;
+    sal_uInt16  cpIndexUik = 0;
+    sal_uInt16  cpIndexDoku = 0;
+    sal_uInt16  cpIndexFileName = 0;
     CPInfo* pInfo = NULL;
 
     sal_uInt16  entrySize = sizeof(sal_uInt16);
@@ -877,7 +877,7 @@ void TypeWriter::createBlop()
     {
         m_blopSize += m_nSuperTypes * entrySize;
 
-        cpIndexSuperNames = new sal_uInt32[m_nSuperTypes];
+        cpIndexSuperNames = new sal_uInt16[m_nSuperTypes];
 
         for (sal_uInt32 i=0; i < m_nSuperTypes; i++)
         {
@@ -990,21 +990,21 @@ void TypeWriter::createBlop()
     if (m_methodCount)
     {
         sal_uInt16* pMethodEntrySize = new sal_uInt16[m_methodCount];
-        sal_uInt32  cpIndexName = 0;
-        sal_uInt32  cpIndexReturn = 0;
-        sal_uInt32  cpIndexDoku = 0;
+        sal_uInt16  cpIndexName = 0;
+        sal_uInt16  cpIndexReturn = 0;
+        sal_uInt16  cpIndexDoku = 0;
 
         // nMethodEntries + nParamEntries
         blopMethodsSize = (2 * sizeof(sal_uInt16));
 
         for (i = 0; i < m_methodCount; i++)
         {
-            pMethodEntrySize[i] =
-                blopMethodEntrySize +                                   // header
-                sizeof(sal_uInt16) +                                    // parameterCount
-                (m_methods[i].m_paramCount * blopParamEntrySize) +      // exceptions
-                sizeof(sal_uInt16) +                                    // exceptionCount
-                (m_methods[i].m_excCount * sizeof(sal_uInt16));         // exceptions
+            pMethodEntrySize[i] = (sal_uInt16)
+                ( blopMethodEntrySize +                                 // header
+                  sizeof(sal_uInt16) +                                  // parameterCount
+                  (m_methods[i].m_paramCount * blopParamEntrySize) +    // exceptions
+                  sizeof(sal_uInt16) +                                  // exceptionCount
+                  (m_methods[i].m_excCount * sizeof(sal_uInt16)) );     // exceptions
 
             blopMethodsSize += pMethodEntrySize[i];
         }
@@ -1101,8 +1101,8 @@ void TypeWriter::createBlop()
 
     if (m_referenceCount)
     {
-        sal_uInt32 cpIndexName = 0;
-        sal_uInt32 cpIndexDoku = 0;
+        sal_uInt16 cpIndexName = 0;
+        sal_uInt16 cpIndexDoku = 0;
 
         // nReferenceEntries + n references
         blopReferenceSize = entrySize + (m_referenceCount * blopReferenceEntrySize);
diff --git a/registry/source/regimpl.cxx b/registry/source/regimpl.cxx
index af8c3809c51a..6481804555a5 100644
--- a/registry/source/regimpl.cxx
+++ b/registry/source/regimpl.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: regimpl.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 15:18:42 $
+ *  last change: $Author: jsc $ $Date: 2001-01-10 10:15:54 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1378,7 +1378,7 @@ static sal_uInt32 checkTypeReaders(RegistryTypeReader& reader1,
                                    StringSet& nameSet)
 {
     sal_uInt32 count=0;
-    sal_uInt32 i;
+    sal_uInt16 i;
     for (i=0 ; i < reader1.getFieldCount(); i++)
     {
         nameSet.insert(reader1.getFieldName(i));
@@ -1419,11 +1419,11 @@ RegError ORegistry::mergeModuleValue(OStoreStream& rTargetValue,
                                   reader.getTypeClass(),
                                   reader.getTypeName(),
                                   reader.getSuperTypeName(),
-                                  count,
+                                  (sal_uInt16)count,
                                   0,
                                   0);
 
-        int i;
+        sal_uInt16 i;
         for (i=0 ; i < reader.getFieldCount(); i++)
         {
             writer.setFieldData(index,
@@ -1782,7 +1782,7 @@ RegError ORegistry::dumpValue(const OUString& sPath, const OUString& sName, sal_
                 fprintf(stdout, "%s       Data = ", indent);
 
                 sal_Int32 longValue;
-                for (int i=0; i < len; i++)
+                for (sal_uInt32 i=0; i < len; i++)
                 {
                     readINT32(pBuffer+offset, longValue);
 
@@ -1808,7 +1808,7 @@ RegError ORegistry::dumpValue(const OUString& sPath, const OUString& sName, sal_
                 fprintf(stdout, "%s       Data = ", indent);
 
                 sal_Char *pValue;
-                for (int i=0; i < len; i++)
+                for (sal_uInt32 i=0; i < len; i++)
                 {
                     readUINT32(pBuffer+offset, sLen);
 
@@ -1840,7 +1840,7 @@ RegError ORegistry::dumpValue(const OUString& sPath, const OUString& sName, sal_
 
                 sal_Unicode *pValue;
                 OString uStr;
-                for (int i=0; i < len; i++)
+                for (sal_uInt32 i=0; i < len; i++)
                 {
                     readUINT32(pBuffer+offset, sLen);
 
diff --git a/registry/source/regkey.cxx b/registry/source/regkey.cxx
index 7da6044705a2..a8f83e980e2e 100644
--- a/registry/source/regkey.cxx
+++ b/registry/source/regkey.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: regkey.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 15:18:43 $
+ *  last change: $Author: jsc $ $Date: 2001-01-10 10:15:54 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -234,7 +234,7 @@ RegError REGISTRY_CALLTYPE closeSubKeys(RegKeyHandle* phSubKeys,
 
         pReg = ((ORegKey*)phSubKeys[0])->getRegistry();
 
-        for (int i=0; (i < nSubKeys) && (_ret == REG_NO_ERROR); i++)
+        for (sal_uInt32 i=0; (i < nSubKeys) && (_ret == REG_NO_ERROR); i++)
         {
             _ret = pReg->closeKey(phSubKeys[i]);
         }
@@ -802,7 +802,7 @@ RegError REGISTRY_CALLTYPE freeValueList(RegValueType valueType,
         case 6:
             {
                 sal_Char** pVList = (sal_Char**)pValueList;
-                for (int i=0; i < len; i++)
+                for (sal_uInt32 i=0; i < len; i++)
                 {
                     rtl_freeMemory(pVList[i]);
                 }
@@ -813,7 +813,7 @@ RegError REGISTRY_CALLTYPE freeValueList(RegValueType valueType,
         case 7:
             {
                 sal_Unicode** pVList = (sal_Unicode**)pValueList;
-                for (int i=0; i < len; i++)
+                for (sal_uInt32 i=0; i < len; i++)
                 {
                     rtl_freeMemory(pVList[i]);
                 }
@@ -980,7 +980,7 @@ RegError REGISTRY_CALLTYPE getKeyNames(RegKeyHandle hKey,
 RegError REGISTRY_CALLTYPE freeKeyNames(rtl_uString** pKeyNames,
                                           sal_uInt32 nKeys)
 {
-    for (int i=0; i <nKeys; i++)
+    for (sal_uInt32 i=0; i < nKeys; i++)
     {
         rtl_uString_release(pKeyNames[i]);
     }
diff --git a/registry/source/regmap.hxx b/registry/source/regmap.hxx
index 1bf07bb3a69a..aefc53f81477 100644
--- a/registry/source/regmap.hxx
+++ b/registry/source/regmap.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: regmap.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 15:18:43 $
+ *  last change: $Author: jsc $ $Date: 2001-01-10 10:15:54 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -86,7 +86,7 @@ class ORegKey;
 
 struct EqualString
 {
-    bool operator()(const OUString& str1, const OUString& str2) const
+    sal_Bool operator()(const OUString& str1, const OUString& str2) const
     {
         return (str1 == str2);
     }
@@ -102,7 +102,7 @@ struct HashString
 
 struct LessString
 {
-    bool operator()(const OUString& str1, const OUString& str2) const
+    sal_Bool operator()(const OUString& str1, const OUString& str2) const
     {
         return (str1 < str2);
     }