diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 23:52:00 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 23:52:00 +0000 |
| commit | c7d8ee15a2b8dc3a11120e0dc821cfefa093ccb2 (patch) | |
| tree | e7b1fb711e62a328038ffb5bac254b11fbc40d76 /hwpfilter/source/attributes.cxx | |
| parent | 0a7643a129ade2849ccf3873b3dc8e8a67e768f4 (diff) | |
INTEGRATION: CWS warnings01 (1.2.4); FILE MERGED
2006/02/10 14:25:07 os 1.2.4.4: #i59838# warnings removed
2005/11/09 18:13:10 pl 1.2.4.3: #i53898# removed warnings
2005/10/13 09:53:15 os 1.2.4.2: #i53898# warnings removed
2005/10/04 07:23:33 sb 1.2.4.1: #i53898# Merged in lost 1.1.32.1.
Diffstat (limited to 'hwpfilter/source/attributes.cxx')
| -rw-r--r-- | hwpfilter/source/attributes.cxx | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/hwpfilter/source/attributes.cxx b/hwpfilter/source/attributes.cxx index c06258d80110..89cebf7ca7e3 100644 --- a/hwpfilter/source/attributes.cxx +++ b/hwpfilter/source/attributes.cxx @@ -4,9 +4,9 @@ * * $RCSfile: attributes.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: rt $ $Date: 2005-09-07 16:28:25 $ + * last change: $Author: hr $ $Date: 2006-06-20 00:52:00 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -47,11 +47,11 @@ struct TagAttribute { TagAttribute(){} - TagAttribute( const OUString &sName, const OUString &sType , const OUString &sValue ) + TagAttribute( const OUString &rName, const OUString &rType , const OUString &rValue ) { - this->sName = sName; - this->sType = sType; - this->sValue = sValue; + sName = rName; + sType = rType; + sValue = rValue; } OUString sName; @@ -71,11 +71,12 @@ struct AttributeListImpl_impl sal_Int16 SAL_CALL AttributeListImpl::getLength(void) throw (RuntimeException) { - return m_pImpl->vecAttribute.size(); + return (sal_Int16)m_pImpl->vecAttribute.size(); } -AttributeListImpl::AttributeListImpl( const AttributeListImpl &r ) +AttributeListImpl::AttributeListImpl( const AttributeListImpl &r ) : +cppu::WeakImplHelper1<com::sun::star::xml::sax::XAttributeList>( r ) { m_pImpl = new AttributeListImpl_impl; *m_pImpl = *(r.m_pImpl); @@ -84,7 +85,8 @@ AttributeListImpl::AttributeListImpl( const AttributeListImpl &r ) OUString AttributeListImpl::getNameByIndex(sal_Int16 i) throw (RuntimeException) { - if( i < m_pImpl->vecAttribute.size() ) + sal_uInt32 i2 = sal::static_int_cast<sal_Int16>(i); + if( i >= 0 && i2 < m_pImpl->vecAttribute.size() ) { return m_pImpl->vecAttribute[i].sName; } @@ -94,7 +96,8 @@ OUString AttributeListImpl::getNameByIndex(sal_Int16 i) throw (RuntimeException) OUString AttributeListImpl::getTypeByIndex(sal_Int16 i) throw (RuntimeException) { - if( i < m_pImpl->vecAttribute.size() ) + sal_uInt32 i2 = sal::static_int_cast<sal_Int16>(i); + if( i >= 0 && i2 < m_pImpl->vecAttribute.size() ) { return m_pImpl->vecAttribute[i].sType; } @@ -104,7 +107,8 @@ OUString AttributeListImpl::getTypeByIndex(sal_Int16 i) throw (RuntimeException) OUString AttributeListImpl::getValueByIndex(sal_Int16 i) throw (RuntimeException) { - if( i < m_pImpl->vecAttribute.size() ) + sal_uInt32 i2 = sal::static_int_cast<sal_Int16>(i); + if( i >= 0 && i2 < m_pImpl->vecAttribute.size() ) { return m_pImpl->vecAttribute[i].sValue; } |