Tag: cws_src680_warnings01 User: sb Date: 06/05/12 09:25:16 Modified: /dba/dbaccess/source/core/api/ RowSet.cxx, RowSetBase.cxx, RowSetBase.hxx, table.cxx /dba/dbaccess/source/ui/dlg/ adminpages.hxx, tablespage.hxx /dba/dbaccess/source/ui/inc/ TableConnection.hxx /dba/dbaccess/source/ui/relationdesign/ RTableConnection.hxx
Log: #i53898# Made code warning-free and/or compile at all after resync to SRC680m162 (and in some cases reverted previous, problematic changes). File Changes: 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.139.26.2&r2=1.139.26.3 Delta lines: +5 -5 ------------------- --- RowSet.cxx 7 Apr 2006 20:45:00 -0000 1.139.26.2 +++ RowSet.cxx 12 May 2006 16:25:12 -0000 1.139.26.3 @@ -4,9 +4,9 @@ * * $RCSfile: RowSet.cxx,v $ * - * $Revision: 1.139.26.2 $ + * $Revision: 1.139.26.3 $ * - * last change: $Author: sb $ $Date: 2006/04/07 20:45:00 $ + * last change: $Author: sb $ $Date: 2006/05/12 16:25:12 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -2776,13 +2776,13 @@ } // ------------------------------------------------------------------------- -void SAL_CALL ORowSetClone::addRowSetListener( const Reference< XRowSetListener >& listener ) throw(RuntimeException) +void SAL_CALL ORowSetClone::addRowSetListener( const Reference< XRowSetListener >& ) throw(RuntimeException) { throwFunctionNotSupportedException( "RowSetClone::XRowSet", *this ); } // ------------------------------------------------------------------------- -void SAL_CALL ORowSetClone::removeRowSetListener( const Reference< XRowSetListener >& listener ) throw(RuntimeException) +void SAL_CALL ORowSetClone::removeRowSetListener( const Reference< XRowSetListener >& ) throw(RuntimeException) { throwFunctionNotSupportedException( "RowSetClone::XRowSet", *this ); } File [changed]: RowSetBase.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/RowSetBase.cxx?r1=1.81.6.2&r2=1.81.6.3 Delta lines: +3 -16 -------------------- --- RowSetBase.cxx 7 Apr 2006 20:45:17 -0000 1.81.6.2 +++ RowSetBase.cxx 12 May 2006 16:25:12 -0000 1.81.6.3 @@ -4,9 +4,9 @@ * * $RCSfile: RowSetBase.cxx,v $ * - * $Revision: 1.81.6.2 $ + * $Revision: 1.81.6.3 $ * - * last change: $Author: sb $ $Date: 2006/04/07 20:45:17 $ + * last change: $Author: sb $ $Date: 2006/05/12 16:25:12 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -77,9 +77,6 @@ #ifndef _DBHELPER_DBEXCEPTION_HXX_ #include <connectivity/dbexception.hxx> #endif -#ifndef _CONNECTIVITY_EMPTYMETADATA_HXX_ -#include <connectivity/emptymetadata.hxx> -#endif #ifndef _OSL_THREAD_H_ #include <osl/thread.h> #endif @@ -1228,16 +1225,6 @@ // ----------------------------------------------------------------------------- void ORowSetBase::fireRowcount() -{ -} - -// ----------------------------------------------------------------------------- -sal_Bool ORowSetBase::notifyAllListenersRowBeforeChange(::osl::ResettableMutexGuard& /*_rGuard*/,const ::com::sun::star::sdb::RowChangeEvent &/*rEvt*/) -{ - return sal_True; -} -// ----------------------------------------------------------------------------- -void ORowSetBase::notifyAllListenersRowChanged(::osl::ResettableMutexGuard& /*_rGuard*/,const ::com::sun::star::sdb::RowChangeEvent &/*rEvt*/) { } File [changed]: RowSetBase.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/RowSetBase.hxx?r1=1.32.48.2&r2=1.32.48.3 Delta lines: +3 -7 ------------------- --- RowSetBase.hxx 7 Apr 2006 20:45:24 -0000 1.32.48.2 +++ RowSetBase.hxx 12 May 2006 16:25:12 -0000 1.32.48.3 @@ -4,9 +4,9 @@ * * $RCSfile: RowSetBase.hxx,v $ * - * $Revision: 1.32.48.2 $ + * $Revision: 1.32.48.3 $ * - * last change: $Author: sb $ $Date: 2006/04/07 20:45:24 $ + * last change: $Author: sb $ $Date: 2006/05/12 16:25:12 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -166,10 +166,6 @@ // fire if rowcount changed virtual void fireRowcount(); - // fire if rowcount changed - virtual sal_Bool notifyAllListenersRowBeforeChange(::osl::ResettableMutexGuard& _rGuard,const ::com::sun::star::sdb::RowChangeEvent &rEvt); - // notify row changed - virtual void notifyAllListenersRowChanged(::osl::ResettableMutexGuard& _rGuard,const ::com::sun::star::sdb::RowChangeEvent &rEvt); // notify row changed virtual sal_Bool notifyAllListenersCursorBeforeMove(::osl::ResettableMutexGuard& _rGuard); // notify cursor moved File [changed]: table.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/table.cxx?r1=1.54.50.1&r2=1.54.50.2 Delta lines: +4 -3 ------------------- --- table.cxx 24 Mar 2006 15:35:50 -0000 1.54.50.1 +++ table.cxx 12 May 2006 16:25:13 -0000 1.54.50.2 @@ -4,9 +4,9 @@ * * $RCSfile: table.cxx,v $ * - * $Revision: 1.54.50.1 $ + * $Revision: 1.54.50.2 $ * - * last change: $Author: fs $ $Date: 2006/03/24 15:35:50 $ + * last change: $Author: sb $ $Date: 2006/05/12 16:25:13 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -376,7 +376,8 @@ void SAL_CALL ODBTable::alterColumnByName( const ::rtl::OUString& _rName, const Reference< XPropertySet >& _rxDescriptor ) throw(SQLException, NoSuchElementException, RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); - checkDisposed(OTable_Base::rBHelper.bDisposed); + checkDisposed( + connectivity::sdbcx::OTableDescriptor_BASE::rBHelper.bDisposed); if(m_pColumns->hasByName(_rName)) { ::rtl::OUString sSql = ::rtl::OUString::createFromAscii("ALTER TABLE "); Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: adminpages.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/adminpages.hxx?r1=1.29.48.1&r2=1.29.48.2 Delta lines: +3 -5 ------------------- --- adminpages.hxx 24 Mar 2006 15:36:10 -0000 1.29.48.1 +++ adminpages.hxx 12 May 2006 16:25:13 -0000 1.29.48.2 @@ -4,9 +4,9 @@ * * $RCSfile: adminpages.hxx,v $ * - * $Revision: 1.29.48.1 $ + * $Revision: 1.29.48.2 $ * - * last change: $Author: fs $ $Date: 2006/03/24 15:36:10 $ + * last change: $Author: sb $ $Date: 2006/05/12 16:25:13 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -224,6 +224,7 @@ protected: /// default implementation: call FillItemSet, call checkItems, virtual int DeactivatePage(SfxItemSet* pSet); + using SfxTabPage::DeactivatePage; /// default implementation: call implInitControls with the given item set and _bSaveValue = sal_False virtual void Reset(const SfxItemSet& _rCoreAttrs); /// default implementation: call implInitControls with the given item set and _bSaveValue = sal_True @@ -315,9 +316,6 @@ private: void postInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue); - - private: - using SfxTabPage::DeactivatePage; }; //......................................................................... File [changed]: tablespage.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/tablespage.hxx?r1=1.10.50.1&r2=1.10.50.2 Delta lines: +3 -5 ------------------- --- tablespage.hxx 24 Mar 2006 15:36:14 -0000 1.10.50.1 +++ tablespage.hxx 12 May 2006 16:25:13 -0000 1.10.50.2 @@ -4,9 +4,9 @@ * * $RCSfile: tablespage.hxx,v $ * - * $Revision: 1.10.50.1 $ + * $Revision: 1.10.50.2 $ * - * last change: $Author: fs $ $Date: 2006/03/24 15:36:14 $ + * last change: $Author: sb $ $Date: 2006/05/12 16:25:13 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -97,6 +97,7 @@ public: virtual BOOL FillItemSet(SfxItemSet& _rCoreAttrs); virtual int DeactivatePage(SfxItemSet* _pSet); + using OGenericAdministrationPage::DeactivatePage; virtual OPageSettings* createViewSettings(); virtual void fillViewSettings(OPageSettings* _pSettings); @@ -185,9 +186,6 @@ virtual void _elementRemoved( const ::com::sun::star::container::ContainerEvent& _Event ) throw(::com::sun::star::uno::RuntimeException); virtual void _elementReplaced( const ::com::sun::star::container::ContainerEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException); virtual void _disposing(const ::com::sun::star::lang::EventObject& _rSource) throw( ::com::sun::star::uno::RuntimeException); - - private: - using OGenericAdministrationPage::DeactivatePage; }; //......................................................................... Directory: /dba/dbaccess/source/ui/inc/ ======================================= File [changed]: TableConnection.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/TableConnection.hxx?r1=1.8.48.1&r2=1.8.48.2 Delta lines: +3 -6 ------------------- --- TableConnection.hxx 24 Mar 2006 15:36:16 -0000 1.8.48.1 +++ TableConnection.hxx 12 May 2006 16:25:13 -0000 1.8.48.2 @@ -4,9 +4,9 @@ * * $RCSfile: TableConnection.hxx,v $ * - * $Revision: 1.8.48.1 $ + * $Revision: 1.8.48.2 $ * - * last change: $Author: fs $ $Date: 2006/03/24 15:36:16 $ + * last change: $Author: sb $ $Date: 2006/05/12 16:25:13 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -122,11 +122,8 @@ const ::std::vector<OConnectionLine*>* GetConnLineList() const { return &m_vConnLine; } OJoinTableView* GetParent() const { return m_pParent; } virtual void Draw( const Rectangle& rRect ); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); - - private: - using Window::Invalidate; using Window::Draw; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); }; } #endif // DBAUI_TABLECONNECTION_HXX Directory: /dba/dbaccess/source/ui/relationdesign/ ================================================== File [changed]: RTableConnection.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/relationdesign/RTableConnection.hxx?r1=1.2.50.1&r2=1.2.50.2 Delta lines: +2 -4 ------------------- --- RTableConnection.hxx 24 Mar 2006 15:36:29 -0000 1.2.50.1 +++ RTableConnection.hxx 12 May 2006 16:25:14 -0000 1.2.50.2 @@ -4,9 +4,9 @@ * * $RCSfile: RTableConnection.hxx,v $ * - * $Revision: 1.2.50.1 $ + * $Revision: 1.2.50.2 $ * - * last change: $Author: fs $ $Date: 2006/03/24 15:36:29 $ + * last change: $Author: sb $ $Date: 2006/05/12 16:25:14 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -60,8 +60,6 @@ ORelationTableConnection& operator=( const ORelationTableConnection& rConn ); virtual void Draw( const Rectangle& rRect ); - - private: using OTableConnection::Draw; }; } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
