Tag: cws_src680_oj14 User: oj Date: 2006/07/04 01:22:33 Modified: dba/dbaccess/source/ui/relationdesign/RelationTableView.cxx
Log: RESYNC: (1.20-1.22); FILE MERGED File Changes: Directory: /dba/dbaccess/source/ui/relationdesign/ ================================================== File [changed]: RelationTableView.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/relationdesign/RelationTableView.cxx?r1=1.20.4.3&r2=1.20.4.4 Delta lines: +9 -7 ------------------- --- RelationTableView.cxx 25 Apr 2006 12:51:12 -0000 1.20.4.3 +++ RelationTableView.cxx 4 Jul 2006 08:22:31 -0000 1.20.4.4 @@ -122,11 +122,13 @@ #ifndef DBACCESS_JACCESS_HXX #include "JAccess.hxx" #endif +#ifndef _UNDO_HXX +#include <svtools/undo.hxx> +#endif #ifndef _COM_SUN_STAR_ACCESSIBILITY_ACCESSIBLEEVENTID_HPP_ #include <com/sun/star/accessibility/AccessibleEventId.hpp> #endif - using namespace dbaui; using namespace ::dbtools; using namespace ::com::sun::star::uno; @@ -211,7 +213,7 @@ ::rtl::OUString strTabExistenceTest = pTabConnData->GetSourceWinName(); sal_Bool bInvalid = ::std::find(arrInvalidTables.begin(),arrInvalidTables.end(),strTabExistenceTest) != arrInvalidTables.end(); strTabExistenceTest = pTabConnData->GetDestWinName(); - bInvalid |= ::std::find(arrInvalidTables.begin(),arrInvalidTables.end(),strTabExistenceTest) != arrInvalidTables.end(); + bInvalid = bInvalid || ::std::find(arrInvalidTables.begin(),arrInvalidTables.end(),strTabExistenceTest) != arrInvalidTables.end(); if (bInvalid) { // nein -> Pech gehabt, die Connection faellt weg @@ -402,7 +404,7 @@ } //------------------------------------------------------------------------------ -::std::vector<OTableConnection*>::const_iterator ORelationTableView::RemoveConnection( OTableConnection* pConn ,sal_Bool _bDelete) +::std::vector<OTableConnection*>::const_iterator ORelationTableView::RemoveConnection( OTableConnection* pConn ,sal_Bool /*_bDelete*/) { DBG_CHKTHIS(ORelationTableView,NULL); ::std::vector<OTableConnection*>::const_iterator aNextPos = getTableConnections()->end(); @@ -424,7 +426,7 @@ } //------------------------------------------------------------------------------ -void ORelationTableView::AddTabWin(const ::rtl::OUString& _rComposedName, const ::rtl::OUString& rWinName, BOOL bNewTable) +void ORelationTableView::AddTabWin(const ::rtl::OUString& _rComposedName, const ::rtl::OUString& rWinName, BOOL /*bNewTable*/) { DBG_CHKTHIS(ORelationTableView,NULL); OSL_ENSURE(_rComposedName.getLength(),"There must be a table name supplied!"); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
