Tag: cws_src680_qiq User: fs Date: 2006/06/30 06:27:56 Modified: dba/dbaccess/source/core/dataaccess/ModelImpl.cxx dba/dbaccess/source/core/dataaccess/ModelImpl.hxx dba/dbaccess/source/core/dataaccess/documentcontainer.cxx dba/dbaccess/source/core/dataaccess/documentdefinition.cxx
Log: warning-free code File Changes: Directory: /dba/dbaccess/source/core/dataaccess/ ================================================ File [changed]: ModelImpl.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/ModelImpl.cxx?r1=1.13&r2=1.13.2.1 Delta lines: +8 -3 ------------------- --- ModelImpl.cxx 20 Jun 2006 02:43:12 -0000 1.13 +++ ModelImpl.cxx 30 Jun 2006 13:27:52 -0000 1.13.2.1 @@ -4,9 +4,9 @@ * * $RCSfile: ModelImpl.cxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.13.2.1 $ * - * last change: $Author: hr $ $Date: 2006/06/20 02:43:12 $ + * last change: $Author: fs $ $Date: 2006/06/30 13:27:52 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -906,6 +906,11 @@ ModelDependentComponent::ModelDependentComponent( const ::rtl::Reference< ODatabaseModelImpl >& _model ) :m_pImpl( _model ) ,m_xMutex( _model->getSharedMutex() ) +{ +} + +// ----------------------------------------------------------------------------- +ModelDependentComponent::~ModelDependentComponent() { } File [changed]: ModelImpl.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/ModelImpl.hxx?r1=1.11&r2=1.11.24.1 Delta lines: +5 -6 ------------------- --- ModelImpl.hxx 29 Mar 2006 12:32:55 -0000 1.11 +++ ModelImpl.hxx 30 Jun 2006 13:27:52 -0000 1.11.24.1 @@ -4,9 +4,9 @@ * * $RCSfile: ModelImpl.hxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.11.24.1 $ * - * last change: $Author: obo $ $Date: 2006/03/29 12:32:55 $ + * last change: $Author: fs $ $Date: 2006/06/30 13:27:52 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -320,7 +320,7 @@ const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel>& _xModel = ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel>() ); - ~ODatabaseModelImpl(); + virtual ~ODatabaseModelImpl(); ODatabaseModelImpl( const ::rtl::OUString& _rRegistrationName @@ -445,8 +445,6 @@ /** @see osl_decrementInterlockedCount. */ virtual oslInterlockedCount SAL_CALL release(); - - }; /** a small base class for UNO components whose functionality depends on a ODatabaseModelImpl @@ -459,6 +457,7 @@ protected: ModelDependentComponent( const ::rtl::Reference< ODatabaseModelImpl >& _model ); + virtual ~ModelDependentComponent(); /** returns the component itself */ File [changed]: documentcontainer.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/documentcontainer.cxx?r1=1.17.52.5&r2=1.17.52.6 Delta lines: +12 -6 -------------------- --- documentcontainer.cxx 27 Jun 2006 12:02:12 -0000 1.17.52.5 +++ documentcontainer.cxx 30 Jun 2006 13:27:52 -0000 1.17.52.6 @@ -4,9 +4,9 @@ * * $RCSfile: documentcontainer.cxx,v $ * - * $Revision: 1.17.52.5 $ + * $Revision: 1.17.52.6 $ * - * last change: $Author: fs $ $Date: 2006/06/27 12:02:12 $ + * last change: $Author: fs $ $Date: 2006/06/30 13:27:52 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -355,8 +355,13 @@ aArgument.Value <<= xObjectToCopy; aArguments[2] <<= aArgument; - ::rtl::OUString sServiceName = - (Reference<XNameAccess>(xObjectToCopy,UNO_QUERY).is() ? (m_bFormsContainer ? SERVICE_NAME_FORM_COLLECTION : SERVICE_NAME_REPORT_COLLECTION) : SERVICE_SDB_DOCUMENTDEFINITION); + ::rtl::OUString sServiceName; + if ( Reference< XNameAccess >( xObjectToCopy, UNO_QUERY ).is() ) + if ( m_bFormsContainer ) + sServiceName = SERVICE_NAME_FORM_COLLECTION; + else sServiceName = SERVICE_NAME_REPORT_COLLECTION; + else + sServiceName = SERVICE_SDB_DOCUMENTDEFINITION; Reference<XContent > xNew(xORB->createInstanceWithArguments(sServiceName,aArguments),UNO_QUERY); Reference<XNameContainer> xNameContainer(xContent,UNO_QUERY); @@ -472,7 +477,8 @@ { sName = _sName.getToken(0,'/',nIndex); _xNameContainer.set(_rRet,UNO_QUERY); - if ( bRet = _xNameContainer.is() ) + bRet = _xNameContainer.is(); + if ( bRet ) { bRet = _xNameContainer->hasByName(sName); _sSimpleName = sName; File [changed]: documentdefinition.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/documentdefinition.cxx?r1=1.36&r2=1.36.2.1 Delta lines: +7 -7 ------------------- --- documentdefinition.cxx 20 Jun 2006 02:45:23 -0000 1.36 +++ documentdefinition.cxx 30 Jun 2006 13:27:53 -0000 1.36.2.1 @@ -4,9 +4,9 @@ * * $RCSfile: documentdefinition.cxx,v $ * - * $Revision: 1.36 $ + * $Revision: 1.36.2.1 $ * - * last change: $Author: hr $ $Date: 2006/06/20 02:45:23 $ + * last change: $Author: fs $ $Date: 2006/06/30 13:27:53 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -486,10 +486,10 @@ aResult[1] = static_cast<sal_Int8>(( n1 << 8 ) >> 24); aResult[2] = static_cast<sal_Int8>(( n1 << 16 ) >> 24); aResult[3] = static_cast<sal_Int8>(( n1 << 24 ) >> 24); - aResult[4] = n2 >> 8; - aResult[5] = ( n2 << 8 ) >> 8; - aResult[6] = n3 >> 8; - aResult[7] = ( n3 << 8 ) >> 8; + aResult[4] = (sal_Int8)(n2 >> 8); + aResult[5] = (sal_Int8)(( n2 << 8 ) >> 8); + aResult[6] = (sal_Int8)(n3 >> 8); + aResult[7] = (sal_Int8)(( n3 << 8 ) >> 8); aResult[8] = b8; aResult[9] = b9; aResult[10] = b10; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
