Tag: cws_src680_oj14 User: oj Date: 2006/07/11 03:57:59 Modified: dba/dbaccess/inc/genericcontroller.hxx dba/dbaccess/source/core/api/RowSet.cxx dba/dbaccess/source/core/dataaccess/databasedocument.cxx dba/dbaccess/source/core/misc/PropertyForward.cxx dba/dbaccess/source/filter/xml/dbloader2.cxx dba/dbaccess/source/ui/misc/linkeddocuments.cxx
Log: conflicts and warnings removed File Changes: Directory: /dba/dbaccess/inc/ ============================= File [changed]: genericcontroller.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/inc/genericcontroller.hxx?r1=1.1.2.3&r2=1.1.2.4 Delta lines: +4 -6 ------------------- --- genericcontroller.hxx 4 Jul 2006 07:18:40 -0000 1.1.2.3 +++ genericcontroller.hxx 11 Jul 2006 10:57:54 -0000 1.1.2.4 @@ -4,9 +4,9 @@ * * $RCSfile: genericcontroller.hxx,v $ * - * $Revision: 1.1.2.3 $ + * $Revision: 1.1.2.4 $ * - * last change: $Author: oj $ $Date: 2006/07/04 07:18:40 $ + * last change: $Author: oj $ $Date: 2006/07/11 10:57:54 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -382,13 +382,11 @@ // if xListener is NULL the change will be forwarded to all listeners to the given ::com::sun::star::util::URL // if _bForceBroadcast is sal_True, the current feature state is broadcasted no matter if it is the same as the cached state - virtual void InvalidateFeature(const ::rtl::OUString& rURLPath, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListen -er > & xListener = NULL, sal_Bool _bForceBroadcast = sal_False); + virtual void InvalidateFeature(const ::rtl::OUString& rURLPath, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xListener = NULL, sal_Bool _bForceBroadcast = sal_False); // if there is an ::com::sun::star::util::URL translation for the id ('handle') the preceding InvalidateFeature is used. // if there is a toolbar slot with the given id it is updated (the new state is determined via GetState) // if _bForceBroadcast is sal_True, the current feature state is broadcasted no matter if it is the same as the cached state - virtual void InvalidateFeature(sal_uInt16 nId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xListener -= NULL, sal_Bool _bForceBroadcast = sal_False); + virtual void InvalidateFeature(sal_uInt16 nId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xListener = NULL, sal_Bool _bForceBroadcast = sal_False); /** InvalidateAll invalidates all features currently known */ Directory: /dba/dbaccess/source/core/api/ ========================================= File [changed]: RowSet.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/RowSet.cxx?r1=1.137.4.4&r2=1.137.4.5 Delta lines: +4 -4 ------------------- --- RowSet.cxx 4 Jul 2006 07:25:24 -0000 1.137.4.4 +++ RowSet.cxx 11 Jul 2006 10:57:55 -0000 1.137.4.5 @@ -4,9 +4,9 @@ * * $RCSfile: RowSet.cxx,v $ * - * $Revision: 1.137.4.4 $ + * $Revision: 1.137.4.5 $ * - * last change: $Author: oj $ $Date: 2006/07/04 07:25:24 $ + * last change: $Author: oj $ $Date: 2006/07/11 10:57:55 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -2131,7 +2131,7 @@ Reference< XPropertySet > xTable; try { - ::cppu::extractInterface(xTable,_rxRetTables->getByName(m_aCommand)); + _rxRetTables->getByName(m_aCommand) >>= xTable; } catch(const WrappedTargetException& e) { Directory: /dba/dbaccess/source/core/dataaccess/ ================================================ File [changed]: databasedocument.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/databasedocument.cxx?r1=1.22.4.4&r2=1.22.4.5 Delta lines: +4 -4 ------------------- --- databasedocument.cxx 4 Jul 2006 07:34:00 -0000 1.22.4.4 +++ databasedocument.cxx 11 Jul 2006 10:57:55 -0000 1.22.4.5 @@ -4,9 +4,9 @@ * * $RCSfile: databasedocument.cxx,v $ * - * $Revision: 1.22.4.4 $ + * $Revision: 1.22.4.5 $ * - * last change: $Author: oj $ $Date: 2006/07/04 07:34:00 $ + * last change: $Author: oj $ $Date: 2006/07/11 10:57:55 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -344,7 +344,7 @@ ModelMethodGuard aGuard( *this ); OSL_ENSURE(m_pImpl.is(),"Impl is NULL"); - m_pImpl->m_aControllers.erase(::std::find(m_pImpl->m_aControllers.begin(),m_pImpl->m_aControllers.end(),_xController),m_pImpl->m_aControllers.end()); + m_pImpl->m_aControllers.erase(::std::find(m_pImpl->m_aControllers.begin(),m_pImpl->m_aControllers.end(),_xController)); if ( m_pImpl->m_xCurrentController == _xController ) m_pImpl->m_xCurrentController = NULL; Directory: /dba/dbaccess/source/core/misc/ ========================================== File [changed]: PropertyForward.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/misc/PropertyForward.cxx?r1=1.6&r2=1.6.6.1 Delta lines: +12 -12 --------------------- --- PropertyForward.cxx 20 Jun 2006 02:48:09 -0000 1.6 +++ PropertyForward.cxx 11 Jul 2006 10:57:55 -0000 1.6.6.1 @@ -4,9 +4,9 @@ * * $RCSfile: PropertyForward.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.6.6.1 $ * - * last change: $Author: hr $ $Date: 2006/06/20 02:48:09 $ + * last change: $Author: oj $ $Date: 2006/07/11 10:57:55 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. Directory: /dba/dbaccess/source/filter/xml/ =========================================== File [changed]: dbloader2.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/filter/xml/dbloader2.cxx?r1=1.20&r2=1.20.8.1 Delta lines: +5 -5 ------------------- --- dbloader2.cxx 20 Jun 2006 02:49:03 -0000 1.20 +++ dbloader2.cxx 11 Jul 2006 10:57:56 -0000 1.20.8.1 @@ -4,9 +4,9 @@ * * $RCSfile: dbloader2.cxx,v $ * - * $Revision: 1.20 $ + * $Revision: 1.20.8.1 $ * - * last change: $Author: hr $ $Date: 2006/06/20 02:49:03 $ + * last change: $Author: oj $ $Date: 2006/07/11 10:57:56 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. Directory: /dba/dbaccess/source/ui/misc/ ======================================== File [changed]: linkeddocuments.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/linkeddocuments.cxx?r1=1.17.4.4&r2=1.17.4.5 Delta lines: +4 -4 ------------------- --- linkeddocuments.cxx 4 Jul 2006 08:15:14 -0000 1.17.4.4 +++ linkeddocuments.cxx 11 Jul 2006 10:57:56 -0000 1.17.4.5 @@ -4,9 +4,9 @@ * * $RCSfile: linkeddocuments.cxx,v $ * - * $Revision: 1.17.4.4 $ + * $Revision: 1.17.4.5 $ * - * last change: $Author: oj $ $Date: 2006/07/04 08:15:14 $ + * last change: $Author: oj $ $Date: 2006/07/11 10:57:56 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -410,7 +410,7 @@ } } } - catch(const Exception&) + catch(const Exception& e) { OSL_ENSURE(sal_False, "OLinkedDocumentsAccess::newForm: caught an exception while loading the object!"); } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
