Tag: cws_src680_warningfixes02 User: sb Date: 2006/06/30 04:53:13 Modified: dba/dbaccess/source/core/api/RowSetBase.cxx dba/dbaccess/source/core/api/RowSetCache.cxx dba/dbaccess/source/core/api/column.cxx dba/dbaccess/source/core/dataaccess/definitioncontainer.cxx dba/dbaccess/source/core/dataaccess/documentcontainer.cxx dba/dbaccess/source/filter/migration/cfgimport.cxx dba/dbaccess/source/filter/xml/dbloader2.cxx dba/dbaccess/source/filter/xml/xmlExport.cxx dba/dbaccess/source/filter/xml/xmlfilter.cxx dba/dbaccess/source/ui/app/AppController.cxx dba/dbaccess/source/ui/app/AppControllerGen.cxx dba/dbaccess/source/ui/browser/dbloader.cxx dba/dbaccess/source/ui/control/dbtreelistbox.cxx dba/dbaccess/source/ui/misc/TableCopyHelper.cxx dba/dbaccess/source/ui/misc/WCopyTable.cxx dba/dbaccess/source/ui/misc/WNameMatch.cxx dba/dbaccess/source/ui/querydesign/JoinController.cxx dba/dbaccess/source/ui/querydesign/QueryDesignView.cxx dba/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx dba/dbaccess/source/ui/querydesign/TableWindow.cxx dba/dbaccess/source/ui/querydesign/querycontroller.cxx dba/dbaccess/source/ui/tabledesign/TableController.cxx
Log: #i66577# Made the code compile (warning-free) on a unxlngi6.pro GCC 4.1.1 Linux box. File Changes: Directory: /dba/dbaccess/source/core/api/ ========================================= File [changed]: RowSetBase.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/RowSetBase.cxx?r1=1.86&r2=1.86.6.1 Delta lines: +11 -11 --------------------- --- RowSetBase.cxx 20 Jun 2006 02:36:00 -0000 1.86 +++ RowSetBase.cxx 30 Jun 2006 11:53:04 -0000 1.86.6.1 @@ -4,9 +4,9 @@ * * $RCSfile: RowSetBase.cxx,v $ * - * $Revision: 1.86 $ + * $Revision: 1.86.6.1 $ * - * last change: $Author: hr $ $Date: 2006/06/20 02:36:00 $ + * last change: $Author: sb $ $Date: 2006/06/30 11:53:04 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -468,8 +468,8 @@ checkCache(); - sal_Bool bRet; - if(bRet = notifyAllListenersCursorBeforeMove(aGuard)) + sal_Bool bRet = notifyAllListenersCursorBeforeMove(aGuard); + if(bRet) { // check if we are inserting a row sal_Bool bWasNew = m_pCache->m_bNew || rowDeleted(); @@ -510,8 +510,8 @@ checkPositioningAllowed(); - sal_Bool bRet; - if(bRet = notifyAllListenersCursorBeforeMove(aGuard)) + sal_Bool bRet = notifyAllListenersCursorBeforeMove(aGuard); + if(bRet) { // check if we are inserting a row sal_Bool bWasNew = m_pCache->m_bNew || rowDeleted(); @@ -613,8 +613,8 @@ ::osl::ResettableMutexGuard aGuard( *m_pMutex ); checkCache(); - sal_Bool bRet; - if(bRet = notifyAllListenersCursorBeforeMove(aGuard)) + sal_Bool bRet = notifyAllListenersCursorBeforeMove(aGuard); + if(bRet) { // check if we are inserting a row sal_Bool bWasNew = m_pCache->m_bNew || rowDeleted(); @@ -819,8 +819,8 @@ ::osl::ResettableMutexGuard aGuard( *m_pMutex ); checkPositioningAllowed(); - sal_Bool bRet; - if(bRet = notifyAllListenersCursorBeforeMove(aGuard) ) + sal_Bool bRet = notifyAllListenersCursorBeforeMove(aGuard); + if(bRet) { // check if we are inserting a row sal_Bool bWasNew = m_pCache->m_bNew || rowDeleted(); File [changed]: RowSetCache.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/RowSetCache.cxx?r1=1.85&r2=1.85.4.1 Delta lines: +11 -12 --------------------- --- RowSetCache.cxx 20 Jun 2006 02:36:29 -0000 1.85 +++ RowSetCache.cxx 30 Jun 2006 11:53:04 -0000 1.85.4.1 @@ -4,9 +4,9 @@ * * $RCSfile: RowSetCache.cxx,v $ * - * $Revision: 1.85 $ + * $Revision: 1.85.4.1 $ * - * last change: $Author: hr $ $Date: 2006/06/20 02:36:29 $ + * last change: $Author: sb $ $Date: 2006/06/30 11:53:04 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -513,8 +513,8 @@ sal_Bool ORowSetCache::moveRelativeToBookmark( const Any& bookmark, sal_Int32 rows ) { - sal_Bool bRet; - if(bRet = moveToBookmark(bookmark)) + sal_Bool bRet = moveToBookmark(bookmark); + if(bRet) { m_nPosition = m_pCacheSet->getRow() + rows; absolute(m_nPosition); @@ -854,7 +854,7 @@ ORowSetMatrix::iterator aIter = m_pMatrix->begin(); for(sal_Int32 i=0;i<m_nFetchSize;++i,++aIter) { - if(bCheck = m_pCacheSet->next()) + if((bCheck = m_pCacheSet->next())) { if(!aIter->isValid()) *aIter = new ORowSetValueVector(m_xMetaData->getColumnCount()); @@ -877,8 +877,8 @@ m_aMatrixIter = calcPosition(); if(!m_aMatrixIter->isValid()) { - sal_Bool bOk; - if(bOk = m_pCacheSet->absolute(m_nPosition)) + sal_Bool bOk = m_pCacheSet->absolute(m_nPosition); + if(bOk) { *m_aMatrixIter = new ORowSetValueVector(m_xMetaData->getColumnCount()); m_pCacheSet->fillValueRow(*m_aMatrixIter,m_nPosition); @@ -965,7 +965,7 @@ bCheck = m_pCacheSet->absolute(m_nStartPos); for(; !aIter->isValid() && bCheck;++aIter) { - if(bCheck = m_pCacheSet->next()) // resultset stands on right position + if((bCheck = m_pCacheSet->next())) // resultset stands on right position { *aIter = new ORowSetValueVector(m_xMetaData->getColumnCount()); m_pCacheSet->fillValueRow(*aIter,++nPos); @@ -1194,10 +1194,9 @@ if ( !m_bNew || !m_aInsertRow->isValid() ) throw SQLException(DBACORE_RESSTRING(RID_STR_NO_MOVETOINSERTROW_CALLED),NULL,SQLSTATE_GENERAL,1000,Any() ); - sal_Bool bRet; m_pCacheSet->insertRow(*m_aInsertRow,m_aUpdateTable); - - if ( bRet = rowInserted() ) + sal_Bool bRet = rowInserted(); + if ( bRet ) { ++m_nRowCount; Any aBookmark = (*(*m_aInsertRow))[0].makeAny(); File [changed]: column.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/column.cxx?r1=1.50&r2=1.50.4.1 Delta lines: +4 -4 ------------------- --- column.cxx 20 Jun 2006 02:38:33 -0000 1.50 +++ column.cxx 30 Jun 2006 11:53:05 -0000 1.50.4.1 @@ -4,9 +4,9 @@ * * $RCSfile: column.cxx,v $ * - * $Revision: 1.50 $ + * $Revision: 1.50.4.1 $ * - * last change: $Author: hr $ $Date: 2006/06/20 02:38:33 $ + * last change: $Author: sb $ $Date: 2006/06/30 11:53:05 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -431,7 +431,7 @@ ::getCppuType(static_cast< ::rtl::OUString* >(NULL))); break; case PROPERTY_ID_CONTROLDEFAULT: - if ( bModified = !::comphelper::compare(rValue,m_aControlDefault) ) + if ( (bModified = !::comphelper::compare(rValue,m_aControlDefault)) ) { rConvertedValue = rValue; rOldValue = m_aControlDefault; Directory: /dba/dbaccess/source/core/dataaccess/ ================================================ File [changed]: definitioncontainer.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/definitioncontainer.cxx?r1=1.21&r2=1.21.32.1 Delta lines: +4 -4 ------------------- --- definitioncontainer.cxx 4 May 2006 08:38:06 -0000 1.21 +++ definitioncontainer.cxx 30 Jun 2006 11:53:05 -0000 1.21.32.1 @@ -4,9 +4,9 @@ * * $RCSfile: definitioncontainer.cxx,v $ * - * $Revision: 1.21 $ + * $Revision: 1.21.32.1 $ * - * last change: $Author: rt $ $Date: 2006/05/04 08:38:06 $ + * last change: $Author: sb $ $Date: 2006/06/30 11:53:05 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -567,7 +567,7 @@ ODefinitionContainer_Impl::Documents::iterator aFind = pItem->m_aDocumentMap.find(_sName); if ( aFind == pItem->m_aDocumentMap.end() ) { - if ( bRet = xUnoTunnel.is() ) + if ( (bRet = xUnoTunnel.is()) ) { pContent = reinterpret_cast<OContentHelper*>(xUnoTunnel->getSomething(OContentHelper::getUnoTunnelImplementationId())); TContentPtr pImpl = pContent->getImpl(); File [changed]: documentcontainer.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/documentcontainer.cxx?r1=1.18&r2=1.18.4.1 Delta lines: +4 -4 ------------------- --- documentcontainer.cxx 20 Jun 2006 02:45:09 -0000 1.18 +++ documentcontainer.cxx 30 Jun 2006 11:53:05 -0000 1.18.4.1 @@ -4,9 +4,9 @@ * * $RCSfile: documentcontainer.cxx,v $ * - * $Revision: 1.18 $ + * $Revision: 1.18.4.1 $ * - * last change: $Author: hr $ $Date: 2006/06/20 02:45:09 $ + * last change: $Author: sb $ $Date: 2006/06/30 11:53:05 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -449,7 +449,7 @@ { sName = _sName.getToken(0,'/',nIndex); _xNameContainer.set(_rRet,UNO_QUERY); - if ( bRet = _xNameContainer.is() ) + if ( (bRet = _xNameContainer.is()) ) { bRet = _xNameContainer->hasByName(sName); _sSimpleName = sName; Directory: /dba/dbaccess/source/filter/migration/ ================================================= File [changed]: cfgimport.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/filter/migration/cfgimport.cxx?r1=1.11&r2=1.11.6.1 Delta lines: +12 -12 --------------------- --- cfgimport.cxx 20 Jun 2006 02:48:36 -0000 1.11 +++ cfgimport.cxx 30 Jun 2006 11:53:06 -0000 1.11.6.1 @@ -4,9 +4,9 @@ * * $RCSfile: cfgimport.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.11.6.1 $ * - * last change: $Author: hr $ $Date: 2006/06/20 02:48:36 $ + * last change: $Author: sb $ $Date: 2006/06/30 11:53:06 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1042,9 +1042,9 @@ else if ( aName == CONFIGKEY_DEFSET_FONT_NAME ) sProp = PROPERTY_FONTNAME; else if ( aName == CONFIGKEY_DEFSET_ORDER ) sProp = PROPERTY_ORDER; else if ( aName == CONFIGKEY_DEFSET_APPLYFILTER ) sProp = PROPERTY_APPLYFILTER; - else if ( m_bPropertyMayBeVoid = (aName == CONFIGKEY_DEFSET_ROW_HEIGHT) ) sProp = PROPERTY_ROW_HEIGHT; - else if ( m_bPropertyMayBeVoid = (aName == CONFIGKEY_DEFSET_TEXTCOLOR) ) sProp = PROPERTY_TEXTCOLOR; - else if ( m_bPropertyMayBeVoid = (aName == CONFIGKEY_DEFSET_FONT_UNDERLINECOLOR) ) sProp = PROPERTY_TEXTLINECOLOR; + else if ( (m_bPropertyMayBeVoid = (aName == CONFIGKEY_DEFSET_ROW_HEIGHT)) ) sProp = PROPERTY_ROW_HEIGHT; + else if ( (m_bPropertyMayBeVoid = (aName == CONFIGKEY_DEFSET_TEXTCOLOR)) ) sProp = PROPERTY_TEXTCOLOR; + else if ( (m_bPropertyMayBeVoid = (aName == CONFIGKEY_DEFSET_FONT_UNDERLINECOLOR)) ) sProp = PROPERTY_TEXTLINECOLOR; else if ( aName == CONFIGKEY_DEFSET_FONT_CHARACTEREMPHASIS ) sProp = PROPERTY_TEXTEMPHASIS; else if ( aName == CONFIGKEY_DEFSET_FONT_CHARACTERRELIEF ) sProp = PROPERTY_TEXTRELIEF; // font @@ -1080,13 +1080,13 @@ { ::rtl::OUString sProp; m_bPropertyMayBeVoid = sal_False; - if ( m_bPropertyMayBeVoid = (aName == CONFIGKEY_COLUMN_ALIGNMENT) ) sProp = PROPERTY_ALIGN; - else if ( m_bPropertyMayBeVoid = (aName == CONFIGKEY_COLUMN_WIDTH) ) sProp = PROPERTY_WIDTH; - else if ( m_bPropertyMayBeVoid = (aName == CONFIGKEY_COLUMN_RELPOSITION) ) sProp = PROPERTY_RELATIVEPOSITION; + if ( (m_bPropertyMayBeVoid = (aName == CONFIGKEY_COLUMN_ALIGNMENT)) ) sProp = PROPERTY_ALIGN; + else if ( (m_bPropertyMayBeVoid = (aName == CONFIGKEY_COLUMN_WIDTH)) ) sProp = PROPERTY_WIDTH; + else if ( (m_bPropertyMayBeVoid = (aName == CONFIGKEY_COLUMN_RELPOSITION)) ) sProp = PROPERTY_RELATIVEPOSITION; else if ( aName == CONFIGKEY_COLUMN_HIDDEN ) sProp = PROPERTY_HIDDEN; - else if ( m_bPropertyMayBeVoid = (aName == CONFIGKEY_COLUMN_HELPTEXT) ) sProp = PROPERTY_HELPTEXT; - else if ( m_bPropertyMayBeVoid = (aName == CONFIGKEY_COLUMN_CONTROLDEFAULT) ) sProp = PROPERTY_CONTROLDEFAULT; - else if ( m_bPropertyMayBeVoid = (aName == CONFIGKEY_COLUMN_NUMBERFORMAT) ) sProp = PROPERTY_NUMBERFORMAT; + else if ( (m_bPropertyMayBeVoid = (aName == CONFIGKEY_COLUMN_HELPTEXT)) ) sProp = PROPERTY_HELPTEXT; + else if ( (m_bPropertyMayBeVoid = (aName == CONFIGKEY_COLUMN_CONTROLDEFAULT)) ) sProp = PROPERTY_CONTROLDEFAULT; + else if ( (m_bPropertyMayBeVoid = (aName == CONFIGKEY_COLUMN_NUMBERFORMAT)) ) sProp = PROPERTY_NUMBERFORMAT; if ( sProp.getLength() ) 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.6.1 Delta lines: +4 -4 ------------------- --- dbloader2.cxx 20 Jun 2006 02:49:03 -0000 1.20 +++ dbloader2.cxx 30 Jun 2006 11:53:06 -0000 1.20.6.1 @@ -4,9 +4,9 @@ * * $RCSfile: dbloader2.cxx,v $ * - * $Revision: 1.20 $ + * $Revision: 1.20.6.1 $ * - * last change: $Author: hr $ $Date: 2006/06/20 02:49:03 $ + * last change: $Author: sb $ $Date: 2006/06/30 11:53:06 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -571,7 +571,7 @@ { xController.set(m_xServiceFactory->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbu.OApplicationController"))),UNO_QUERY); - if ( bSuccess = xController.is() ) + if ( (bSuccess = xController.is()) ) { xController->attachModel(xModel); xModel->setCurrentController(xController); File [changed]: xmlExport.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/filter/xml/xmlExport.cxx?r1=1.9&r2=1.9.6.1 Delta lines: +5 -5 ------------------- --- xmlExport.cxx 20 Jun 2006 02:50:59 -0000 1.9 +++ xmlExport.cxx 30 Jun 2006 11:53:06 -0000 1.9.6.1 @@ -4,9 +4,9 @@ * * $RCSfile: xmlExport.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.9.6.1 $ * - * last change: $Author: hr $ $Date: 2006/06/20 02:50:59 $ + * last change: $Author: sb $ $Date: 2006/06/30 11:53:06 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -593,8 +593,8 @@ Reference<XPropertySet> xProp(getDataSource()); ::rtl::OUString sValue; xProp->getPropertyValue(PROPERTY_USER) >>= sValue; - sal_Bool bAddLogin = sal_False; - if ( bAddLogin = sValue.getLength() > 0 ) + sal_Bool bAddLogin = sValue.getLength() > 0; + if ( bAddLogin ) AddAttribute(XML_NAMESPACE_DB, XML_USER_NAME,sValue); sal_Bool bValue = sal_False; if ( xProp->getPropertyValue(PROPERTY_ISPASSWORDREQUIRED) >>= bValue ) File [changed]: xmlfilter.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/filter/xml/xmlfilter.cxx?r1=1.12&r2=1.12.6.1 Delta lines: +5 -5 ------------------- --- xmlfilter.cxx 20 Jun 2006 02:52:57 -0000 1.12 +++ xmlfilter.cxx 30 Jun 2006 11:53:06 -0000 1.12.6.1 @@ -4,9 +4,9 @@ * * $RCSfile: xmlfilter.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.12.6.1 $ * - * last change: $Author: hr $ $Date: 2006/06/20 02:52:57 $ + * last change: $Author: sb $ $Date: 2006/06/30 11:53:06 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -362,8 +362,8 @@ } - sal_Bool bRet; - if ( bRet = (sFileName.getLength() != 0) ) + sal_Bool bRet = (sFileName.getLength() != 0); + if ( bRet ) { Reference<XComponent> xCom(GetModel(),UNO_QUERY); Directory: /dba/dbaccess/source/ui/app/ ======================================= File [changed]: AppController.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppController.cxx?r1=1.30&r2=1.30.4.1 Delta lines: +10 -10 --------------------- --- AppController.cxx 20 Jun 2006 02:53:25 -0000 1.30 +++ AppController.cxx 30 Jun 2006 11:53:07 -0000 1.30.4.1 @@ -4,9 +4,9 @@ * * $RCSfile: AppController.cxx,v $ * - * $Revision: 1.30 $ + * $Revision: 1.30.4.1 $ * - * last change: $Author: hr $ $Date: 2006/06/20 02:53:25 $ + * last change: $Author: sb $ $Date: 2006/06/30 11:53:07 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -766,21 +766,21 @@ aReturn.bEnabled = getContainer()->getElementType() == E_TABLE && isConnected(); break; case SID_DB_APP_DSPROPS: - if ( aReturn.bEnabled = m_xDataSource.is() ) + if ( (aReturn.bEnabled = m_xDataSource.is()) ) { DATASOURCE_TYPE eType = m_aTypeCollection.getType(::comphelper::getString(m_xDataSource->getPropertyValue(PROPERTY_URL))); aReturn.bEnabled = DST_EMBEDDED != eType && DST_MOZILLA != eType && DST_EVOLUTION != eType && DST_KAB != eType && DST_OUTLOOK != eType && DST_OUTLOOKEXP != eType; } break; case SID_DB_APP_DSCONNECTION_TYPE: - if ( aReturn.bEnabled = !isDataSourceReadOnly() && m_xDataSource.is() ) + if ( (aReturn.bEnabled = !isDataSourceReadOnly() && m_xDataSource.is()) ) { DATASOURCE_TYPE eType = m_aTypeCollection.getType(::comphelper::getString(m_xDataSource->getPropertyValue(PROPERTY_URL))); aReturn.bEnabled = DST_EMBEDDED != eType; } break; case SID_DB_APP_DSADVANCED_SETTINGS: - if ( aReturn.bEnabled = m_xDataSource.is() ) + if ( (aReturn.bEnabled = m_xDataSource.is()) ) { DATASOURCE_TYPE eType = m_aTypeCollection.getType(::comphelper::getString(m_xDataSource->getPropertyValue(PROPERTY_URL))); aReturn.bEnabled = DST_EMBEDDED != eType && DST_LDAP != eType && DST_CALC != eType && DST_MOZILLA != eType && DST_THUNDERBIRD != eType && DST_EVOLUTION != eType && DST_KAB != eType && DST_OUTLOOK != eType && DST_OUTLOOKEXP != eType; @@ -831,7 +831,7 @@ aReturn.bEnabled = sal_False; break; case SID_DB_APP_STATUS_TYPE: - if ( aReturn.bEnabled = m_xDataSource.is() ) + if ( (aReturn.bEnabled = m_xDataSource.is()) ) { DATASOURCE_TYPE eType = m_aTypeCollection.getType(::comphelper::getString(m_xDataSource->getPropertyValue(PROPERTY_URL))); ::rtl::OUString sDSTypeName = m_aTypeCollection.getTypeDisplayName(eType); @@ -839,7 +839,7 @@ } break; case SID_DB_APP_STATUS_DBNAME: - if ( aReturn.bEnabled = m_xDataSource.is() ) + if ( (aReturn.bEnabled = m_xDataSource.is()) ) { ::rtl::OUString sTemp; m_xDataSource->getPropertyValue(PROPERTY_URL) >>= sTemp; @@ -875,11 +875,11 @@ } break; case SID_DB_APP_STATUS_USERNAME: - if ( aReturn.bEnabled = m_xDataSource.is() ) + if ( (aReturn.bEnabled = m_xDataSource.is()) ) aReturn.aState = m_xDataSource->getPropertyValue(PROPERTY_USER); break; case SID_DB_APP_STATUS_HOSTNAME: - if ( aReturn.bEnabled = m_xDataSource.is() ) + if ( (aReturn.bEnabled = m_xDataSource.is()) ) { ::rtl::OUString sTemp; m_xDataSource->getPropertyValue(PROPERTY_URL) >>= sTemp; File [changed]: AppControllerGen.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppControllerGen.cxx?r1=1.18&r2=1.18.4.1 Delta lines: +4 -4 ------------------- --- AppControllerGen.cxx 20 Jun 2006 02:53:53 -0000 1.18 +++ AppControllerGen.cxx 30 Jun 2006 11:53:07 -0000 1.18.4.1 @@ -4,9 +4,9 @@ * * $RCSfile: AppControllerGen.cxx,v $ * - * $Revision: 1.18 $ + * $Revision: 1.18.4.1 $ * - * last change: $Author: hr $ $Date: 2006/06/20 02:53:53 $ + * last change: $Author: sb $ $Date: 2006/06/30 11:53:07 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -579,7 +579,7 @@ try { Reference< XNameAccess > xContainer = const_cast<OApplicationController*>(this)->getElements(eType); - if ( bEnabled = (xContainer.is() && xContainer->hasByName(*aList.begin())) ) + if ( (bEnabled = (xContainer.is() && xContainer->hasByName(*aList.begin()))) ) bEnabled = Reference<XRename>(xContainer->getByName(*aList.begin()),UNO_QUERY).is(); } catch(Exception&) Directory: /dba/dbaccess/source/ui/browser/ =========================================== File [changed]: dbloader.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/browser/dbloader.cxx?r1=1.25&r2=1.25.6.1 Delta lines: +9 -9 ------------------- --- dbloader.cxx 20 Jun 2006 02:56:42 -0000 1.25 +++ dbloader.cxx 30 Jun 2006 11:53:08 -0000 1.25.6.1 @@ -4,9 +4,9 @@ * * $RCSfile: dbloader.cxx,v $ * - * $Revision: 1.25 $ + * $Revision: 1.25.6.1 $ * - * last change: $Author: hr $ $Date: 2006/06/20 02:56:42 $ + * last change: $Author: sb $ $Date: 2006/06/30 11:53:08 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -234,22 +234,22 @@ // ich benutze nicht maURL, sondern rURL, denn zwischen dem Constructor und diesem Load hier kann sich die ::com::sun::star::util::URL des Objektes // schon geaendert haben (zum Beispiel durch Umbenennen) Reference< XController > xController; - sal_Bool bSuccess = sal_True; sal_Bool bAttachModel = sal_False; if(aParser.GetMainURL(INetURLObject::DECODE_TO_IURI) == URL_COMPONENT_FORMGRIDVIEW) xController.set(m_xServiceFactory->createInstance(::rtl::OUString::createFromAscii("org.openoffice.comp.dbu.OFormGridView")),UNO_QUERY); else if(aParser.GetMainURL(INetURLObject::DECODE_TO_IURI) == URL_COMPONENT_DATASOURCEBROWSER )// construct the control xController.set(m_xServiceFactory->createInstance(::rtl::OUString::createFromAscii("org.openoffice.comp.dbu.ODatasourceBrowser")),UNO_QUERY); - else if ( bAttachModel = (aParser.GetMainURL(INetURLObject::DECODE_TO_IURI) == URL_COMPONENT_QUERYDESIGN) )// construct the control + else if ( (bAttachModel = (aParser.GetMainURL(INetURLObject::DECODE_TO_IURI) == URL_COMPONENT_QUERYDESIGN)) )// construct the control xController.set(m_xServiceFactory->createInstance(::rtl::OUString::createFromAscii("org.openoffice.comp.dbu.OQueryDesign")),UNO_QUERY); - else if ( bAttachModel = (aParser.GetMainURL(INetURLObject::DECODE_TO_IURI) == URL_COMPONENT_TABLEDESIGN) ) // construct the control + else if ( (bAttachModel = (aParser.GetMainURL(INetURLObject::DECODE_TO_IURI) == URL_COMPONENT_TABLEDESIGN)) ) // construct the control xController.set(m_xServiceFactory->createInstance(::rtl::OUString::createFromAscii("org.openoffice.comp.dbu.OTableDesign")),UNO_QUERY); - else if ( bAttachModel = (aParser.GetMainURL(INetURLObject::DECODE_TO_IURI) == URL_COMPONENT_RELATIONDESIGN) )// construct the control + else if ( (bAttachModel = (aParser.GetMainURL(INetURLObject::DECODE_TO_IURI) == URL_COMPONENT_RELATIONDESIGN)) )// construct the control xController.set(m_xServiceFactory->createInstance(::rtl::OUString::createFromAscii("org.openoffice.comp.dbu.ORelationDesign")),UNO_QUERY); else OSL_ENSURE(0,"wrong dispatch url!"); - if(bSuccess = xController.is()) + sal_Bool bSuccess = xController.is(); + if(bSuccess) { Reference<XModel> xModel; if ( bAttachModel ) @@ -286,7 +286,7 @@ } } } - if ( bSuccess = ( xModel.is() && xModel->getURL().getLength() != 0) ) + if ( (bSuccess = ( xModel.is() && xModel->getURL().getLength() != 0)) ) { try { Directory: /dba/dbaccess/source/ui/control/ =========================================== File [changed]: dbtreelistbox.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/control/dbtreelistbox.cxx?r1=1.10&r2=1.10.6.1 Delta lines: +7 -7 ------------------- --- dbtreelistbox.cxx 20 Jun 2006 03:00:10 -0000 1.10 +++ dbtreelistbox.cxx 30 Jun 2006 11:53:08 -0000 1.10.6.1 @@ -4,9 +4,9 @@ * * $RCSfile: dbtreelistbox.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.10.6.1 $ * - * last change: $Author: hr $ $Date: 2006/06/20 03:00:10 $ + * last change: $Author: sb $ $Date: 2006/06/30 11:53:08 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -423,19 +423,19 @@ switch(eFunc) { case KEYFUNC_CUT: - if ( bHandled = (m_aCutHandler.IsSet() && m_pSelectedEntry) ) + if ( (bHandled = (m_aCutHandler.IsSet() && m_pSelectedEntry)) ) m_aCutHandler.Call(m_pSelectedEntry); break; case KEYFUNC_COPY: - if ( bHandled = (m_aCopyHandler.IsSet() && m_pSelectedEntry) ) + if ( (bHandled = (m_aCopyHandler.IsSet() && m_pSelectedEntry)) ) m_aCopyHandler.Call(m_pSelectedEntry); break; case KEYFUNC_PASTE: - if ( bHandled = (m_aPasteHandler.IsSet() && m_pSelectedEntry) ) + if ( (bHandled = (m_aPasteHandler.IsSet() && m_pSelectedEntry)) ) m_aPasteHandler.Call(m_pSelectedEntry); break; case KEYFUNC_DELETE: - if ( bHandled = (m_aDeleteHandler.IsSet() && m_pSelectedEntry) ) + if ( (bHandled = (m_aDeleteHandler.IsSet() && m_pSelectedEntry)) ) m_aDeleteHandler.Call(m_pSelectedEntry); break; default: Directory: /dba/dbaccess/source/ui/misc/ ======================================== File [changed]: TableCopyHelper.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/TableCopyHelper.cxx?r1=1.7&r2=1.7.4.1 Delta lines: +5 -5 ------------------- --- TableCopyHelper.cxx 20 Jun 2006 03:20:36 -0000 1.7 +++ TableCopyHelper.cxx 30 Jun 2006 11:53:08 -0000 1.7.4.1 @@ -4,9 +4,9 @@ * * $RCSfile: TableCopyHelper.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.7.4.1 $ * - * last change: $Author: hr $ $Date: 2006/06/20 03:20:36 $ + * last change: $Author: sb $ $Date: 2006/06/30 11:53:08 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -503,7 +503,7 @@ Reference<XConnection> xSrcConnection; Reference<XResultSet> xSrcRs; // the source resultset may be empty Sequence< Any > aSelection; - sal_Bool bBookmarkSelection; + sal_Bool bBookmarkSelection = false; ::rtl::OUString sCommand, sSrcDataSourceName = _rPasteData.getDataSource(); @@ -777,7 +777,7 @@ _rAsyncDrop.bHtml = bHtml; _rAsyncDrop.bError = !copyTagTable(_rAsyncDrop,sal_True,_xConnection); - if ( bRet = (!_rAsyncDrop.bError && _rAsyncDrop.aHtmlRtfStorage.Is()) ) + if ( (bRet = (!_rAsyncDrop.bError && _rAsyncDrop.aHtmlRtfStorage.Is())) ) { // now we need to copy the stream ::utl::TempFile aTmp; File [changed]: WCopyTable.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/WCopyTable.cxx?r1=1.45&r2=1.45.4.1 Delta lines: +6 -6 ------------------- --- WCopyTable.cxx 20 Jun 2006 03:22:00 -0000 1.45 +++ WCopyTable.cxx 30 Jun 2006 11:53:09 -0000 1.45.4.1 @@ -4,9 +4,9 @@ * * $RCSfile: WCopyTable.cxx,v $ * - * $Revision: 1.45 $ + * $Revision: 1.45.4.1 $ * - * last change: $Author: hr $ $Date: 2006/06/20 03:22:00 $ + * last change: $Author: sb $ $Date: 2006/06/30 11:53:09 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -273,7 +273,7 @@ { DBG_DTOR(OCopyTableWizard,NULL); TabPage *pPage=0; - while(pPage = GetPage(0)) + while((pPage = GetPage(0))) { RemovePage( pPage ); delete pPage; @@ -426,8 +426,8 @@ case WIZARD_DEF_DATA: case WIZARD_DEF: { - sal_Bool bOnFirstPage; - if ( bOnFirstPage = (GetCurLevel() == 0) ) + sal_Bool bOnFirstPage = GetCurLevel() == 0; + if ( bOnFirstPage ) { // we came from the first page so we have to clear // all column information already collected File [changed]: WNameMatch.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/WNameMatch.cxx?r1=1.17&r2=1.17.6.1 Delta lines: +7 -7 ------------------- --- WNameMatch.cxx 20 Jun 2006 03:22:22 -0000 1.17 +++ WNameMatch.cxx 30 Jun 2006 11:53:09 -0000 1.17.6.1 @@ -4,9 +4,9 @@ * * $RCSfile: WNameMatch.cxx,v $ * - * $Revision: 1.17 $ + * $Revision: 1.17.6.1 $ * - * last change: $Author: hr $ $Date: 2006/06/20 03:22:22 $ + * last change: $Author: sb $ $Date: 2006/06/30 11:53:09 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -233,8 +233,8 @@ // ----------------------------------------------------------------------- IMPL_LINK( OWizNameMatching, ButtonClickHdl, Button *, pButton ) { - SvLBoxEntry* pEntry = NULL; - if(pEntry = m_CTRL_LEFT.FirstSelected()) + SvLBoxEntry* pEntry = m_CTRL_LEFT.FirstSelected(); + if(pEntry) { sal_Int32 nPos = m_CTRL_LEFT.GetModel()->GetAbsPos(pEntry); if(pButton == &m_ibColumn_up && nPos) @@ -264,8 +264,8 @@ //------------------------------------------------------------------------------ IMPL_LINK( OWizNameMatching, RightButtonClickHdl, Button *, pButton ) { - SvLBoxEntry* pEntry = NULL; - if(pEntry = m_CTRL_RIGHT.FirstSelected()) + SvLBoxEntry* pEntry = m_CTRL_RIGHT.FirstSelected(); + if(pEntry) { sal_Int32 nPos = m_CTRL_RIGHT.GetModel()->GetAbsPos(pEntry); if(pButton == &m_ibColumn_up_right && nPos) Directory: /dba/dbaccess/source/ui/querydesign/ =============================================== File [changed]: JoinController.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/querydesign/JoinController.cxx?r1=1.38&r2=1.38.4.1 Delta lines: +5 -5 ------------------- --- JoinController.cxx 20 Jun 2006 03:25:26 -0000 1.38 +++ JoinController.cxx 30 Jun 2006 11:53:09 -0000 1.38.4.1 @@ -4,9 +4,9 @@ * * $RCSfile: JoinController.cxx,v $ * - * $Revision: 1.38 $ + * $Revision: 1.38.4.1 $ * - * last change: $Author: hr $ $Date: 2006/06/20 03:25:26 $ + * last change: $Author: sb $ $Date: 2006/06/30 11:53:09 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -244,7 +244,7 @@ aReturn.bEnabled = isConnected() && isModified(); break; case ID_BROWSER_ADDTABLE: - if (aReturn.bEnabled = getView() && const_cast< OJoinController* >( this )->getJoinView()->getTableView()->IsAddAllowed()) + if ((aReturn.bEnabled = getView() && const_cast< OJoinController* >( this )->getJoinView()->getTableView()->IsAddAllowed())) aReturn.aState = ::cppu::bool2any(m_pAddTabDlg && m_pAddTabDlg->IsVisible()); else aReturn.aState = ::cppu::bool2any(sal_False); @@ -427,7 +427,7 @@ } else if ( pIter->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( "ShowAll" ) ) ) { - sal_Bool bShowAll; + sal_Bool bShowAll = false; pIter->Value >>= bShowAll; pData->ShowAll(bShowAll); } File [changed]: QueryDesignView.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/querydesign/QueryDesignView.cxx?r1=1.79&r2=1.79.4.1 Delta lines: +4 -4 ------------------- --- QueryDesignView.cxx 20 Jun 2006 03:26:39 -0000 1.79 +++ QueryDesignView.cxx 30 Jun 2006 11:53:09 -0000 1.79.4.1 @@ -4,9 +4,9 @@ * * $RCSfile: QueryDesignView.cxx,v $ * - * $Revision: 1.79 $ + * $Revision: 1.79.4.1 $ * - * last change: $Author: hr $ $Date: 2006/06/20 03:26:39 $ + * last change: $Author: sb $ $Date: 2006/06/30 11:53:09 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -746,7 +746,7 @@ { OQueryTableWindow* pTabWin = static_cast<OQueryTableWindow*>(tableIter->second); - if ( bFound = pTabWin->ExistsField( rFieldName, aInfo ) ) + if ( (bFound = pTabWin->ExistsField( rFieldName, aInfo )) ) { rFieldName = aInfo->GetField(); } File [changed]: SelectionBrowseBox.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx?r1=1.67&r2=1.67.4.1 Delta lines: +5 -5 ------------------- --- SelectionBrowseBox.cxx 20 Jun 2006 03:27:27 -0000 1.67 +++ SelectionBrowseBox.cxx 30 Jun 2006 11:53:09 -0000 1.67.4.1 @@ -4,9 +4,9 @@ * * $RCSfile: SelectionBrowseBox.cxx,v $ * - * $Revision: 1.67 $ + * $Revision: 1.67.4.1 $ * - * last change: $Author: hr $ $Date: 2006/06/20 03:27:27 $ + * last change: $Author: sb $ $Date: 2006/06/30 11:53:09 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -2737,8 +2737,8 @@ else { // nur COUNT(*) erlaubt - sal_Bool bCountRemoved = sal_False; - if ( bCountRemoved = !isFieldNameAsterix(_pEntry->GetField()) ) + sal_Bool bCountRemoved = !isFieldNameAsterix(_pEntry->GetField()); + if ( bCountRemoved ) m_pFunctionCell->RemoveEntry(1); if ( !bCountRemoved && m_pFunctionCell->GetEntryCount() < 2) File [changed]: TableWindow.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/querydesign/TableWindow.cxx?r1=1.31&r2=1.31.4.1 Delta lines: +4 -4 ------------------- --- TableWindow.cxx 20 Jun 2006 03:28:47 -0000 1.31 +++ TableWindow.cxx 30 Jun 2006 11:53:10 -0000 1.31.4.1 @@ -4,9 +4,9 @@ * * $RCSfile: TableWindow.cxx,v $ * - * $Revision: 1.31 $ + * $Revision: 1.31.4.1 $ * - * last change: $Author: hr $ $Date: 2006/06/20 03:28:47 $ + * last change: $Author: sb $ $Date: 2006/06/30 11:53:10 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -407,7 +407,7 @@ // die Felder in die ListBox eintragen clearListBox(); - if (bInit = FillListBox()) + if ((bInit = FillListBox())) m_pListBox->SelectAll(FALSE); } } File [changed]: querycontroller.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/querydesign/querycontroller.cxx?r1=1.104&r2=1.104.4.1 Delta lines: +4 -4 ------------------- --- querycontroller.cxx 20 Jun 2006 03:29:57 -0000 1.104 +++ querycontroller.cxx 30 Jun 2006 11:53:10 -0000 1.104.4.1 @@ -4,9 +4,9 @@ * * $RCSfile: querycontroller.cxx,v $ * - * $Revision: 1.104 $ + * $Revision: 1.104.4.1 $ * - * last change: $Author: hr $ $Date: 2006/06/20 03:29:57 $ + * last change: $Author: sb $ $Date: 2006/06/30 11:53:10 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1298,7 +1298,7 @@ aDefaultName, _bSaveAs ? SAD_OVERWRITE : SAD_DEFAULT); - if(bRet = (aDlg.Execute() == RET_OK)) + if((bRet = (aDlg.Execute() == RET_OK))) { m_sName = aDlg.getName(); if(m_bCreateView) 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.104&r2=1.104.4.1 Delta lines: +5 -5 ------------------- --- TableController.cxx 20 Jun 2006 03:32:34 -0000 1.104 +++ TableController.cxx 30 Jun 2006 11:53:10 -0000 1.104.4.1 @@ -4,9 +4,9 @@ * * $RCSfile: TableController.cxx,v $ * - * $Revision: 1.104 $ + * $Revision: 1.104.4.1 $ * - * last change: $Author: hr $ $Date: 2006/06/20 03:32:34 $ + * last change: $Author: sb $ $Date: 2006/06/30 11:53:10 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -964,7 +964,7 @@ sal_Int32 nFormatKey = 0; sal_Int32 nAlign = 0; - sal_Bool bIsAutoIncrement,bIsCurrency; + sal_Bool bIsAutoIncrement = false, bIsCurrency = false; ::rtl::OUString sName,sDescription,sTypeName; Any aControlDefault; @@ -1215,7 +1215,7 @@ OSL_ENSURE(xColumn.is(),"Column is null!"); sal_Int32 nType,nPrecision,nScale,nNullable,nFormatKey=0,nAlignment=0; - sal_Bool bAutoIncrement; + sal_Bool bAutoIncrement = false; ::rtl::OUString sDescription, sTypeName; Any aControlDefault; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
