Tag: cws_src680_dba24d User: fs Date: 2007-11-08 14:10:59+0000 Modified: dba/dbaccess/source/core/api/SingleSelectQueryComposer.cxx dba/dbaccess/source/core/api/RowSet.cxx dba/dbaccess/source/core/api/query.cxx dba/dbaccess/source/core/api/statement.cxx dba/dbaccess/source/core/api/querydescriptor.cxx
Log: during #i81658#: string cleanup File Changes: Directory: /dba/dbaccess/source/core/api/ ========================================= File [changed]: SingleSelectQueryComposer.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/SingleSelectQueryComposer.cxx?r1=1.24&r2=1.24.26.1 Delta lines: +4 -4 ------------------- --- SingleSelectQueryComposer.cxx 2007-09-26 14:38:38+0000 1.24 +++ SingleSelectQueryComposer.cxx 2007-11-08 14:10:56+0000 1.24.26.1 @@ -4,9 +4,9 @@ * * $RCSfile: SingleSelectQueryComposer.cxx,v $ * - * $Revision: 1.24 $ + * $Revision: 1.24.26.1 $ * - * last change: $Author: hr $ $Date: 2007/09/26 14:38:38 $ + * last change: $Author: fs $ $Date: 2007/11/08 14:10:56 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -774,7 +774,7 @@ { xStatement.reset( Reference< XStatement >( m_xConnection->createStatement(), UNO_QUERY_THROW ) ); Reference< XPropertySet > xStatementProps( xStatement, UNO_QUERY_THROW ); - try { xStatementProps->setPropertyValue( PROPERTY_USE_ESCAPE_PROCESSING, makeAny( sal_False ) ); } + try { xStatementProps->setPropertyValue( PROPERTY_ESCAPE_PROCESSING, makeAny( sal_False ) ); } catch ( const Exception& ) { DBG_UNHANDLED_EXCEPTION(); } Reference< XResultSetMetaDataSupplier > xResMetaDataSup( xStatement->executeQuery( sSql ), UNO_QUERY_THROW ); xResultSetMeta.set( xResMetaDataSup->getMetaData(), UNO_QUERY_THROW ); File [changed]: RowSet.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/RowSet.cxx?r1=1.153&r2=1.153.70.1 Delta lines: +17 -17 --------------------- --- RowSet.cxx 2007-07-06 07:51:46+0000 1.153 +++ RowSet.cxx 2007-11-08 14:10:57+0000 1.153.70.1 @@ -4,9 +4,9 @@ * * $RCSfile: RowSet.cxx,v $ * - * $Revision: 1.153 $ + * $Revision: 1.153.70.1 $ * - * last change: $Author: rt $ $Date: 2007/07/06 07:51:46 $ + * last change: $Author: fs $ $Date: 2007/11/08 14:10:57 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -307,10 +307,10 @@ m_aPrematureParamValues.resize( 0 ); // sdb.RowSet Properties - registerMayBeVoidProperty(PROPERTY_ACTIVECONNECTION,PROPERTY_ID_ACTIVECONNECTION, PropertyAttribute::MAYBEVOID|PropertyAttribute::TRANSIENT|PropertyAttribute::BOUND, &m_aActiveConnection, ::getCppuType(reinterpret_cast< Reference< XConnection >* >(NULL))); + registerMayBeVoidProperty(PROPERTY_ACTIVE_CONNECTION,PROPERTY_ID_ACTIVE_CONNECTION, PropertyAttribute::MAYBEVOID|PropertyAttribute::TRANSIENT|PropertyAttribute::BOUND, &m_aActiveConnection, ::getCppuType(reinterpret_cast< Reference< XConnection >* >(NULL))); registerProperty(PROPERTY_DATASOURCENAME, PROPERTY_ID_DATASOURCENAME, PropertyAttribute::BOUND, &m_aDataSourceName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); registerProperty(PROPERTY_COMMAND, PROPERTY_ID_COMMAND, PropertyAttribute::BOUND, &m_aCommand, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); - registerProperty(PROPERTY_COMMANDTYPE, PROPERTY_ID_COMMANDTYPE, PropertyAttribute::BOUND, &m_nCommandType, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL))); + registerProperty(PROPERTY_COMMAND_TYPE, PROPERTY_ID_COMMAND_TYPE, PropertyAttribute::BOUND, &m_nCommandType, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL))); registerProperty(PROPERTY_ACTIVECOMMAND, PROPERTY_ID_ACTIVECOMMAND, nRBT, &m_aActiveCommand, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); registerProperty(PROPERTY_IGNORERESULT, PROPERTY_ID_IGNORERESULT, PropertyAttribute::BOUND, &m_bIgnoreResult, ::getBooleanCppuType()); registerProperty(PROPERTY_FILTER, PROPERTY_ID_FILTER, PropertyAttribute::BOUND, &m_aFilter, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); @@ -335,7 +335,7 @@ registerProperty(PROPERTY_URL, PROPERTY_ID_URL, 0, &m_aURL, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); registerProperty(PROPERTY_TRANSACTIONISOLATION, PROPERTY_ID_TRANSACTIONISOLATION, PropertyAttribute::TRANSIENT, &m_nTransactionIsolation,::getCppuType(reinterpret_cast< sal_Int32*>(NULL))); registerMayBeVoidProperty(PROPERTY_TYPEMAP, PROPERTY_ID_TYPEMAP, PropertyAttribute::MAYBEVOID|PropertyAttribute::TRANSIENT, &m_aTypeMap, ::getCppuType(reinterpret_cast< Reference< XNameAccess >* >(NULL))); - registerProperty(PROPERTY_USE_ESCAPE_PROCESSING,PROPERTY_ID_USE_ESCAPE_PROCESSING, PropertyAttribute::BOUND, &m_bUseEscapeProcessing,::getBooleanCppuType() ); + registerProperty(PROPERTY_ESCAPE_PROCESSING,PROPERTY_ID_ESCAPE_PROCESSING, PropertyAttribute::BOUND, &m_bUseEscapeProcessing,::getBooleanCppuType() ); registerProperty(PROPERTY_QUERYTIMEOUT, PROPERTY_ID_QUERYTIMEOUT, PropertyAttribute::TRANSIENT, &m_nQueryTimeOut, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL))); registerProperty(PROPERTY_MAXFIELDSIZE, PROPERTY_ID_MAXFIELDSIZE, PropertyAttribute::TRANSIENT, &m_nMaxFieldSize, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL))); registerProperty(PROPERTY_MAXROWS, PROPERTY_ID_MAXROWS, 0, &m_nMaxRows, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL)) ); @@ -362,7 +362,7 @@ { switch( _nHandle ) { - case PROPERTY_ID_COMMANDTYPE: + case PROPERTY_ID_COMMAND_TYPE: _rDefault <<= static_cast<sal_Int32>(CommandType::COMMAND); break; case PROPERTY_ID_IGNORERESULT: @@ -392,7 +392,7 @@ case PROPERTY_ID_FETCHSIZE: _rDefault <<= static_cast<sal_Int32>(1); break; - case PROPERTY_ID_USE_ESCAPE_PROCESSING: + case PROPERTY_ID_ESCAPE_PROCESSING: _rDefault <<= sal_True; break; } @@ -414,10 +414,10 @@ OPropertyStateContainer::setFastPropertyValue_NoBroadcast(nHandle,rValue); } - if ( ( nHandle == PROPERTY_ID_ACTIVECONNECTION ) + if ( ( nHandle == PROPERTY_ID_ACTIVE_CONNECTION ) || ( nHandle == PROPERTY_ID_DATASOURCENAME ) || ( nHandle == PROPERTY_ID_COMMAND ) - || ( nHandle == PROPERTY_ID_COMMANDTYPE ) + || ( nHandle == PROPERTY_ID_COMMAND_TYPE ) || ( nHandle == PROPERTY_ID_IGNORERESULT ) || ( nHandle == PROPERTY_ID_FILTER ) || ( nHandle == PROPERTY_ID_HAVING_CLAUSE ) @@ -434,7 +434,7 @@ switch(nHandle) { - case PROPERTY_ID_ACTIVECONNECTION: + case PROPERTY_ID_ACTIVE_CONNECTION: // the new connection { Reference< XConnection > xNewConnection(m_aActiveConnection,UNO_QUERY); @@ -451,7 +451,7 @@ Reference< XConnection > xNewConn; Any aNewConn; aNewConn <<= xNewConn; - setFastPropertyValue(PROPERTY_ID_ACTIVECONNECTION, aNewConn); + setFastPropertyValue(PROPERTY_ID_ACTIVE_CONNECTION, aNewConn); } else m_bRebuildConnOnExecute = sal_True; @@ -476,7 +476,7 @@ Reference< XConnection > xNewConn; Any aNewConn; aNewConn <<= xNewConn; - setFastPropertyValue(PROPERTY_ID_ACTIVECONNECTION, aNewConn); + setFastPropertyValue(PROPERTY_ID_ACTIVE_CONNECTION, aNewConn); } } m_bOwnConnection = sal_True; @@ -504,7 +504,7 @@ case PROPERTY_ID_PRIVILEGES: rValue <<= m_pCache->m_nPrivileges; break; - case PROPERTY_ID_ACTIVECONNECTION: + case PROPERTY_ID_ACTIVE_CONNECTION: rValue <<= m_xActiveConnection; break; case PROPERTY_ID_TYPEMAP: @@ -518,7 +518,7 @@ { switch(nHandle) { - case PROPERTY_ID_ACTIVECONNECTION: + case PROPERTY_ID_ACTIVE_CONNECTION: rValue <<= m_xActiveConnection; break; case PROPERTY_ID_TYPEMAP: @@ -732,7 +732,7 @@ m_xOldConnection = m_xActiveConnection; // for firing the PropertyChangeEvent - sal_Int32 nHandle = PROPERTY_ID_ACTIVECONNECTION; + sal_Int32 nHandle = PROPERTY_ID_ACTIVE_CONNECTION; Any aOldConnection; aOldConnection <<= m_xActiveConnection; Any aNewConnection; aNewConnection <<= _rxNewConn; @@ -2379,7 +2379,7 @@ if ( xQuery.is() ) { xQuery->getPropertyValue(PROPERTY_COMMAND) >>= sCommand; - xQuery->getPropertyValue(PROPERTY_USE_ESCAPE_PROCESSING) >>= bDoEscapeProcessing; + xQuery->getPropertyValue(PROPERTY_ESCAPE_PROCESSING) >>= bDoEscapeProcessing; ::rtl::OUString aCatalog,aSchema,aTable; xQuery->getPropertyValue(PROPERTY_UPDATE_CATALOGNAME) >>= aCatalog; File [changed]: query.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/query.cxx?r1=1.33&r2=1.33.158.1 Delta lines: +4 -4 ------------------- --- query.cxx 2006-10-18 13:26:59+0000 1.33 +++ query.cxx 2007-11-08 14:10:57+0000 1.33.158.1 @@ -4,9 +4,9 @@ * * $RCSfile: query.cxx,v $ * - * $Revision: 1.33 $ + * $Revision: 1.33.158.1 $ * - * last change: $Author: ihi $ $Date: 2006/10/18 13:26:59 $ + * last change: $Author: fs $ $Date: 2007/11/08 14:10:57 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -418,7 +418,7 @@ registerProperty(PROPERTY_COMMAND, PROPERTY_ID_COMMAND, PropertyAttribute::BOUND, &m_sCommand, ::getCppuType(&m_sCommand)); - registerProperty(PROPERTY_USE_ESCAPE_PROCESSING, PROPERTY_ID_USE_ESCAPE_PROCESSING, PropertyAttribute::BOUND, + registerProperty(PROPERTY_ESCAPE_PROCESSING, PROPERTY_ID_ESCAPE_PROCESSING, PropertyAttribute::BOUND, &m_bEscapeProcessing, ::getBooleanCppuType()); registerProperty(PROPERTY_UPDATE_TABLENAME, PROPERTY_ID_UPDATE_TABLENAME, PropertyAttribute::BOUND, File [changed]: statement.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/statement.cxx?r1=1.16&r2=1.16.106.1 Delta lines: +5 -5 ------------------- --- statement.cxx 2007-01-15 14:30:52+0000 1.16 +++ statement.cxx 2007-11-08 14:10:57+0000 1.16.106.1 @@ -4,9 +4,9 @@ * * $RCSfile: statement.cxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.16.106.1 $ * - * last change: $Author: vg $ $Date: 2007/01/15 14:30:52 $ + * last change: $Author: fs $ $Date: 2007/11/08 14:10:57 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -226,7 +226,7 @@ { BEGIN_PROPERTY_HELPER(10) DECL_PROP0(CURSORNAME, ::rtl::OUString); - DECL_PROP0_BOOL(USE_ESCAPE_PROCESSING); + DECL_PROP0_BOOL(ESCAPE_PROCESSING); DECL_PROP0(FETCHDIRECTION, sal_Int32); DECL_PROP0(FETCHSIZE, sal_Int32); DECL_PROP0(MAXFIELDSIZE, sal_Int32); @@ -553,7 +553,7 @@ try { bool bEscapeProcessing = false; - OSL_VERIFY( m_xAggregateAsSet->getPropertyValue( PROPERTY_USE_ESCAPE_PROCESSING ) >>= bEscapeProcessing ); + OSL_VERIFY( m_xAggregateAsSet->getPropertyValue( PROPERTY_ESCAPE_PROCESSING ) >>= bEscapeProcessing ); if ( !bEscapeProcessing ) return _rSQL; File [changed]: querydescriptor.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/querydescriptor.cxx?r1=1.32&r2=1.32.2.1 Delta lines: +4 -4 ------------------- --- querydescriptor.cxx 2007-11-01 15:02:17+0000 1.32 +++ querydescriptor.cxx 2007-11-08 14:10:57+0000 1.32.2.1 @@ -4,9 +4,9 @@ * * $RCSfile: querydescriptor.cxx,v $ * - * $Revision: 1.32 $ + * $Revision: 1.32.2.1 $ * - * last change: $Author: hr $ $Date: 2007/11/01 15:02:17 $ + * last change: $Author: fs $ $Date: 2007/11/08 14:10:57 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -144,7 +144,7 @@ registerProperty(PROPERTY_COMMAND, PROPERTY_ID_COMMAND, PropertyAttribute::BOUND, &m_sCommand, ::getCppuType(&m_sCommand)); - registerProperty(PROPERTY_USE_ESCAPE_PROCESSING, PROPERTY_ID_USE_ESCAPE_PROCESSING, PropertyAttribute::BOUND, + registerProperty(PROPERTY_ESCAPE_PROCESSING, PROPERTY_ID_ESCAPE_PROCESSING, PropertyAttribute::BOUND, &m_bEscapeProcessing, ::getBooleanCppuType()); registerProperty(PROPERTY_UPDATE_TABLENAME, PROPERTY_ID_UPDATE_TABLENAME, PropertyAttribute::BOUND, --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
