User: ihi Date: 2006/08/24 03:55:00 Modified: dba/dbaccess/source/core/api/RowSetBase.cxx
Log: INTEGRATION: CWS sb56 (1.86.4); FILE MERGED 2006/07/25 08:40:10 sb 1.86.4.2: RESYNC: (1.86-1.87); FILE MERGED 2006/07/07 09:05:49 sb 1.86.4.1: #i67105# Made code compile (warning-free) with debug=x. 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.89&r2=1.90 Delta lines: +8 -4 ------------------- --- RowSetBase.cxx 15 Aug 2006 10:41:56 -0000 1.89 +++ RowSetBase.cxx 24 Aug 2006 10:54:58 -0000 1.90 @@ -282,8 +282,10 @@ if ( bValidCurrentRow ) { #if OSL_DEBUG_LEVEL > 0 - ORowSetMatrix::iterator aCacheEnd = m_pCache->getEnd(); - ORowSetMatrix::iterator aCurrentRow = m_aCurrentRow; + ORowSetMatrix::iterator aCacheEnd; + ORowSetMatrix::iterator aCurrentRow; + aCacheEnd = m_pCache->getEnd(); + aCurrentRow = m_aCurrentRow; ORowSetCacheMap::iterator aCacheIter = m_aCurrentRow.getIter(); sal_Int32 n = aCacheIter->first; n = n; @@ -1231,8 +1233,10 @@ DBG_TRACE2("DBACCESS ORowSetBase::firePropertyChange() Clone = %i ID = %i\n",m_bClone,osl_getThreadIdentifier(NULL)); OSL_ENSURE(m_pColumns,"Columns can not be NULL here!"); #if OSL_DEBUG_LEVEL > 1 - sal_Bool bNull = m_aCurrentRow.isNull(); (void)bNull; - ORowSetMatrix::iterator atest = m_aCurrentRow; + sal_Bool bNull; + ORowSetMatrix::iterator atest; + bNull = m_aCurrentRow.isNull(); + atest = m_aCurrentRow; #endif sal_Int32 i=0; try --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
