diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 03:10:51 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 03:10:51 +0000 |
| commit | d38e6cd08f7e5b4e879674a4015cb4cb9e82b36e (patch) | |
| tree | 204319f0b6410899008253f6783c8b791ce79b2b /rdbmaker | |
| parent | d3e6146e6384724d567abb5b5d7e37c537c0caac (diff) | |
INTEGRATION: CWS warnings01 (1.6.34); FILE MERGED
2005/11/29 12:25:06 sb 1.6.34.3: #i53898# Made code warning-free.
2005/09/23 00:26:45 sb 1.6.34.2: RESYNC: (1.6-1.7); FILE MERGED
2005/09/01 07:48:39 sb 1.6.34.1: #i53898# Made code warning-free.
Diffstat (limited to 'rdbmaker')
| -rw-r--r-- | rdbmaker/source/rdbmaker/typeblop.cxx | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/rdbmaker/source/rdbmaker/typeblop.cxx b/rdbmaker/source/rdbmaker/typeblop.cxx index 0f1a34d8b8f7..2cf7e8211c0f 100644 --- a/rdbmaker/source/rdbmaker/typeblop.cxx +++ b/rdbmaker/source/rdbmaker/typeblop.cxx @@ -4,9 +4,9 @@ * * $RCSfile: typeblop.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: rt $ $Date: 2005-09-09 05:07:16 $ + * last change: $Author: hr $ $Date: 2006-06-20 04:10:51 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -173,6 +173,9 @@ void writeConstantData( RegistryTypeWriter& rWriter, sal_uInt16 fieldIndex, constValue.m_value.aString = ((OUString*)aConstantAny.getValue())->getStr(); } break; + default: + OSL_ASSERT(false); + break; } rWriter.setFieldData(fieldIndex, uConstName, uConstTypeName, OUString(), @@ -457,7 +460,7 @@ sal_uInt32 SAL_CALL getTypeBlop(const sal_Char* pTypeName, sal_uInt8** pBlop) { attrAccess = RT_ACCESS_READWRITE; } - writer.setFieldData(memberTypes[i]->getPosition() - inheritedMemberCount, + writer.setFieldData(sal::static_int_cast< sal_uInt16 >(memberTypes[i]->getPosition() - inheritedMemberCount), memberTypes[i]->getMemberName(), xAttr->getType()->getName().replace('.', '/'), OUString(), OUString(), attrAccess); @@ -562,6 +565,9 @@ sal_uInt32 SAL_CALL getTypeBlop(const sal_Char* pTypeName, sal_uInt8** pBlop) rtl_copyMemory(*pBlop, writer.getBlop(), length); } break; + default: + OSL_ASSERT(false); + break; } } |