User: hr Date: 06/06/19 20:34:27 Modified: /dba/dbaccess/source/ui/uno/ ColumnModel.cxx
Log: INTEGRATION: CWS warnings01 (1.5.50); FILE MERGED 2006/06/14 10:29:56 fs 1.5.50.2: removed useless include 2006/03/24 15:36:32 fs 1.5.50.1: #i57457# warning-free code (unxlngi6/.pro + unxsoli4.pro) File Changes: Directory: /dba/dbaccess/source/ui/uno/ ======================================= File [changed]: ColumnModel.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/uno/ColumnModel.cxx?r1=1.5&r2=1.6 Delta lines: +20 -20 --------------------- --- ColumnModel.cxx 8 Sep 2005 16:46:54 -0000 1.5 +++ ColumnModel.cxx 20 Jun 2006 03:34:24 -0000 1.6 @@ -42,6 +42,9 @@ #ifndef _COM_SUN_STAR_AWT_FONTEMPHASISMARK_HPP_ #include <com/sun/star/awt/FontEmphasisMark.hpp> #endif +#ifndef _COM_SUN_STAR_BEANS_PROPERTYATTRIBUTE_HPP_ +#include <com/sun/star/beans/PropertyAttribute.hpp> +#endif #ifndef _CPPUHELPER_QUERYINTERFACE_HXX_ #include <cppuhelper/queryinterface.hxx> @@ -61,9 +64,6 @@ #ifndef _COMPHELPER_PROPERTY_HXX_ #include <comphelper/property.hxx> #endif -#ifndef _CONNECTIVITY_SDBCX_COLUMN_HXX_ -#include <connectivity/sdbcx/VColumn.hxx> -#endif extern "C" void SAL_CALL createRegistryInfo_OColumnControlModel() { @@ -87,26 +87,26 @@ DBG_NAME(OColumnControlModel) //------------------------------------------------------------------ OColumnControlModel::OColumnControlModel(const Reference<XMultiServiceFactory>& _rxFactory) - :OColumnControlModel_BASE(m_aMutex) - ,OPropertyContainer(m_aBHelper) + :OPropertyContainer(m_aBHelper) + ,OColumnControlModel_BASE(m_aMutex) + ,m_xORB(_rxFactory) ,m_sDefaultControl(SERVICE_CONTROLDEFAULT) + ,m_bEnable(sal_True) ,m_nBorder(0) ,m_nWidth(50) - ,m_bEnable(sal_True) - ,m_xORB(_rxFactory) { DBG_CTOR(OColumnControlModel,NULL); registerProperties(); } // ----------------------------------------------------------------------------- OColumnControlModel::OColumnControlModel(const OColumnControlModel* _pSource,const Reference<XMultiServiceFactory>& _rxFactory) - :OColumnControlModel_BASE(m_aMutex) - ,OPropertyContainer(m_aBHelper) + :OPropertyContainer(m_aBHelper) + ,OColumnControlModel_BASE(m_aMutex) + ,m_xORB(_rxFactory) ,m_sDefaultControl(_pSource->m_sDefaultControl) - ,m_nBorder(_pSource->m_nBorder) - ,m_bEnable(_pSource->m_bEnable) ,m_aTabStop(_pSource->m_aTabStop) - ,m_xORB(_rxFactory) + ,m_bEnable(_pSource->m_bEnable) + ,m_nBorder(_pSource->m_nBorder) ,m_nWidth(50) { DBG_CTOR(OColumnControlModel,NULL); @@ -176,13 +176,13 @@ return ::rtl::OUString(); } //------------------------------------------------------------------------------ -void OColumnControlModel::write(const Reference<XObjectOutputStream>& _rxOutStream) throw ( ::com::sun::star::io::IOException, RuntimeException) +void OColumnControlModel::write(const Reference<XObjectOutputStream>& /*_rxOutStream*/) throw ( ::com::sun::star::io::IOException, RuntimeException) { // TODO } //------------------------------------------------------------------------------ -void OColumnControlModel::read(const Reference<XObjectInputStream>& _rxInStream) throw ( ::com::sun::star::io::IOException, RuntimeException) +void OColumnControlModel::read(const Reference<XObjectInputStream>& /*_rxInStream*/) throw ( ::com::sun::star::io::IOException, RuntimeException) { // TODO } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
