Tag: cws_src680_oj14 User: oj Date: 2006/07/04 00:48:48 Modified: dba/dbaccess/source/ui/browser/formadapter.cxx
Log: RESYNC: (1.9-1.10); FILE MERGED 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.9.4.3&r2=1.9.4.4 Delta lines: +20 -27 --------------------- --- formadapter.cxx 25 Apr 2006 13:01:29 -0000 1.9.4.3 +++ formadapter.cxx 4 Jul 2006 07:48:45 -0000 1.9.4.4 @@ -76,7 +76,7 @@ //================================================================== //------------------------------------------------------------------ -Reference< XInterface > SbaXFormAdapter_CreateInstance(const Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory) +Reference< XInterface > SbaXFormAdapter_CreateInstance(const Reference< ::com::sun::star::lang::XMultiServiceFactory>& /*_rxFactory*/) { return *(new SbaXFormAdapter()); } @@ -89,10 +89,10 @@ ,m_aErrorListeners(*this, m_aMutex) ,m_aParameterListeners(*this, m_aMutex) ,m_aSubmitListeners(*this, m_aMutex) - ,m_aPropertiesChangeListeners(*this, m_aMutex) + ,m_aResetListeners(*this, m_aMutex) ,m_aPropertyChangeListeners(*this, m_aMutex) ,m_aVetoablePropertyChangeListeners(*this, m_aMutex) - ,m_aResetListeners(*this, m_aMutex) + ,m_aPropertiesChangeListeners(*this, m_aMutex) ,m_aDisposeListeners(m_aMutex) ,m_aContainerListeners(m_aMutex) ,m_nNamePropHandle(-1) @@ -486,11 +486,11 @@ return sal_False; } // ------------------------------------------------------------------------- -sal_Int32 SAL_CALL SbaXFormAdapter::compareBookmarks(const Any& first, const Any& second) throw( ::com::sun::star::sdbc::SQLException, RuntimeException ) +sal_Int32 SAL_CALL SbaXFormAdapter::compareBookmarks(const Any& _first, const Any& _second) throw( ::com::sun::star::sdbc::SQLException, RuntimeException ) { Reference< ::com::sun::star::sdbcx::XRowLocate > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) - return xIface->compareBookmarks(first, second); + return xIface->compareBookmarks(_first, _second); return 0; } @@ -1112,13 +1112,13 @@ } // ------------------------------------------------------------------------- -void SAL_CALL SbaXFormAdapter::setGroupControl(sal_Bool GroupControl) throw( RuntimeException ) +void SAL_CALL SbaXFormAdapter::setGroupControl(sal_Bool /*GroupControl*/) throw( RuntimeException ) { DBG_ERROR("SAL_CALL SbaXFormAdapter::setGroupControl : not supported !"); } // ------------------------------------------------------------------------- -void SAL_CALL SbaXFormAdapter::setControlModels(const Sequence< Reference< ::com::sun::star::awt::XControlModel > >& Controls) throw( RuntimeException ) +void SAL_CALL SbaXFormAdapter::setControlModels(const Sequence< Reference< ::com::sun::star::awt::XControlModel > >& /*Controls*/) throw( RuntimeException ) { DBG_ERROR("SAL_CALL SbaXFormAdapter::setControlModels : not supported !"); } @@ -1131,7 +1131,7 @@ } // ------------------------------------------------------------------------- -void SAL_CALL SbaXFormAdapter::setGroup(const Sequence< Reference< ::com::sun::star::awt::XControlModel > >& _rGroup, const ::rtl::OUString& GroupName) throw( RuntimeException ) +void SAL_CALL SbaXFormAdapter::setGroup(const Sequence< Reference< ::com::sun::star::awt::XControlModel > >& /*_rGroup*/, const ::rtl::OUString& /*GroupName*/) throw( RuntimeException ) { DBG_ERROR("SAL_CALL SbaXFormAdapter::setGroup : not supported !"); } @@ -1144,13 +1144,13 @@ } // ------------------------------------------------------------------------- -void SAL_CALL SbaXFormAdapter::getGroup(sal_Int32 nGroup, Sequence< Reference< ::com::sun::star::awt::XControlModel > >& _rGroup, ::rtl::OUString& Name) throw( RuntimeException ) +void SAL_CALL SbaXFormAdapter::getGroup(sal_Int32 /*nGroup*/, Sequence< Reference< ::com::sun::star::awt::XControlModel > >& /*_rGroup*/, ::rtl::OUString& /*Name*/) throw( RuntimeException ) { DBG_ERROR("SAL_CALL SbaXFormAdapter::getGroup : not supported !"); } // ------------------------------------------------------------------------- -void SAL_CALL SbaXFormAdapter::getGroupByName(const ::rtl::OUString& Name, Sequence< Reference< ::com::sun::star::awt::XControlModel > >& _rGroup) throw( RuntimeException ) +void SAL_CALL SbaXFormAdapter::getGroupByName(const ::rtl::OUString& /*Name*/, Sequence< Reference< ::com::sun::star::awt::XControlModel > >& /*_rGroup*/) throw( RuntimeException ) { DBG_ERROR("SAL_CALL SbaXFormAdapter::getGroupByName : not supported !"); } @@ -1356,7 +1356,7 @@ } // ------------------------------------------------------------------------- -void SAL_CALL SbaXFormAdapter::addPropertiesChangeListener(const Sequence< ::rtl::OUString>& aPropertyNames, const Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener) throw( RuntimeException ) +void SAL_CALL SbaXFormAdapter::addPropertiesChangeListener(const Sequence< ::rtl::OUString>& /*aPropertyNames*/, const Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener) throw( RuntimeException ) { // we completely ignore the property names, _all_ changes of _all_ properties will be forwarded to _all_ listeners m_aPropertiesChangeListeners.addInterface(xListener); @@ -1662,20 +1662,16 @@ // ------------------------------------------------------------------------- void SAL_CALL SbaXFormAdapter::insertByIndex(sal_Int32 _rIndex, const Any& Element) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, RuntimeException ) { - if ((_rIndex < 0) || (_rIndex >= m_aChildren.size())) - { + if ( ( _rIndex < 0 ) || ( (size_t)_rIndex >= m_aChildren.size() ) ) throw ::com::sun::star::lang::IndexOutOfBoundsException(); - } implInsert(Element, _rIndex); } // ------------------------------------------------------------------------- void SAL_CALL SbaXFormAdapter::removeByIndex(sal_Int32 _rIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, RuntimeException ) { - if ((_rIndex < 0) || (_rIndex >= m_aChildren.size())) - { + if ( ( _rIndex < 0 ) || ( (size_t)_rIndex >= m_aChildren.size() ) ) throw ::com::sun::star::lang::IndexOutOfBoundsException(); - } Reference< ::com::sun::star::form::XFormComponent > xAffected = *(m_aChildren.begin() + _rIndex); @@ -1704,10 +1700,8 @@ // ------------------------------------------------------------------------- void SAL_CALL SbaXFormAdapter::replaceByIndex(sal_Int32 _rIndex, const Any& Element) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, RuntimeException ) { - if ((_rIndex < 0) || (_rIndex >= m_aChildren.size())) - { + if ( ( _rIndex < 0 ) || ( (size_t)_rIndex >= m_aChildren.size() ) ) throw ::com::sun::star::lang::IndexOutOfBoundsException(); - } // extract the form component if (Element.getValueType().getTypeClass() != TypeClass_INTERFACE) @@ -1775,10 +1769,9 @@ // ------------------------------------------------------------------------- Any SAL_CALL SbaXFormAdapter::getByIndex(sal_Int32 _rIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, RuntimeException ) { - if ((_rIndex < 0) || (_rIndex >= m_aChildren.size())) - { + if ( ( _rIndex < 0 ) || ( (size_t)_rIndex >= m_aChildren.size() ) ) throw ::com::sun::star::lang::IndexOutOfBoundsException(); - } + Reference< ::com::sun::star::form::XFormComponent > xElement = *(m_aChildren.begin() + _rIndex); return makeAny(xElement); } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
