Tag: cws_src680_qiq User: fs Date: 2006/06/27 06:00:15 Modified: dba/dbaccess/source/ui/tabledesign/TableController.cxx
Log: RESYNC: (1.103-1.104); FILE MERGED File Changes: Directory: /dba/dbaccess/source/ui/tabledesign/ =============================================== File [changed]: TableController.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/tabledesign/TableController.cxx?r1=1.103.2.5&r2=1.103.2.6 Delta lines: +9 -12 -------------------- --- TableController.cxx 19 Jun 2006 09:27:53 -0000 1.103.2.5 +++ TableController.cxx 27 Jun 2006 13:00:12 -0000 1.103.2.6 @@ -240,9 +240,9 @@ // ----------------------------------------------------------------------------- OTableController::OTableController(const Reference< XMultiServiceFactory >& _rM) : OTableController_BASE(_rM) ,m_sTypeNames(ModuleRes(STR_TABLEDESIGN_DBFIELDTYPES)) - ,m_bNew(sal_True) ,m_pTypeInfo() ,m_bAllowAutoIncrementValue(sal_False) + ,m_bNew(sal_True) { DBG_CTOR(OTableController,NULL); @@ -684,7 +684,7 @@ return sal_True; } // ----------------------------------------------------------------------------- -sal_Bool SAL_CALL OTableController::suspend(sal_Bool _bSuspend) throw( RuntimeException ) +sal_Bool SAL_CALL OTableController::suspend(sal_Bool /*_bSuspend*/) throw( RuntimeException ) { if ( getBroadcastHelper().bInDispose || getBroadcastHelper().bDisposed ) return sal_True; @@ -1018,12 +1018,12 @@ for(;pKeyBegin != pKeyEnd;++pKeyBegin) { - ::std::vector< ::boost::shared_ptr<OTableRow> >::iterator aIter = m_vRowList.begin(); - for(;aIter != m_vRowList.end();++aIter) + ::std::vector< ::boost::shared_ptr<OTableRow> >::iterator rowIter = m_vRowList.begin(); + for(;rowIter != m_vRowList.end();++rowIter) { - if((*aIter)->GetActFieldDescr()->GetName() == *pKeyBegin) + if((*rowIter)->GetActFieldDescr()->GetName() == *pKeyBegin) { - (*aIter)->SetPrimaryKey(sal_True); + (*rowIter)->SetPrimaryKey(sal_True); break; } } @@ -1100,8 +1100,6 @@ if (pFieldDesc && pFieldDesc->GetName().getLength()) { bFoundPKey |= (*aIter)->IsPrimaryKey(); - sal_uInt16 nErrorRes = sal_uInt16(-1); - sal_uInt16 nFieldPos = sal_uInt16(-1); // first check for duplicate names ::std::vector< ::boost::shared_ptr<OTableRow> >::const_iterator aIter2 = aIter+1; for(;aIter2 != m_vRowList.end();++aIter2) @@ -1382,7 +1380,6 @@ continue; } } - Reference<XDrop> xDrop(xColumns,UNO_QUERY); xDrop->dropByName(*pIter); } } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
