User: obo Date: 2006/10/12 06:35:25 Modified: dba/dbaccess/source/ui/browser/formadapter.cxx
Log: INTEGRATION: CWS sb59 (1.10.30); FILE MERGED 2006/08/29 11:44:26 sb 1.10.30.1: #i67487# Made code warning-free (wntmsci10). File Changes: Directory: /dba/dbaccess/source/ui/browser/ =========================================== File [changed]: formadapter.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/browser/formadapter.cxx?r1=1.11&r2=1.12 Delta lines: +4 -3 ------------------- --- formadapter.cxx 17 Sep 2006 06:58:28 -0000 1.11 +++ formadapter.cxx 12 Oct 2006 13:35:22 -0000 1.12 @@ -1524,7 +1524,7 @@ // ::com::sun::star::container::XNameContainer // ------------------------------------------------------------------------- -void SbaXFormAdapter::implInsert(const Any& aElement, sal_uInt16 nIndex, const ::rtl::OUString* pNewElName) throw( ::com::sun::star::lang::IllegalArgumentException ) +void SbaXFormAdapter::implInsert(const Any& aElement, sal_Int32 nIndex, const ::rtl::OUString* pNewElName) throw( ::com::sun::star::lang::IllegalArgumentException ) { // extract the form component if (aElement.getValueType().getTypeClass() != TypeClass_INTERFACE) @@ -1559,7 +1559,8 @@ } // check the index - if (nIndex > m_aChildren.size()) + OSL_ASSERT(nIndex >= 0); + if (sal::static_int_cast< sal_uInt32 >(nIndex) > m_aChildren.size()) nIndex = m_aChildren.size(); DBG_ASSERT(m_aChildren.size() == m_aChildNames.size(), "SAL_CALL SbaXFormAdapter::implInsert : inconsistent container state !"); @@ -1575,7 +1576,7 @@ // notify the container listeners ::com::sun::star::container::ContainerEvent aEvt; aEvt.Source = *this; - aEvt.Accessor <<= (sal_Int32)nIndex; + aEvt.Accessor <<= nIndex; aEvt.Element <<= xElement; ::cppu::OInterfaceIteratorHelper aIt(m_aContainerListeners); while (aIt.hasMoreElements()) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
