User: ihi Date: 2007-11-21 15:05:10+0000 Modified: dba/connectivity/source/drivers/odbc/OStatement.cxx
Log: INTEGRATION: CWS dba24c (1.37.132); FILE MERGED 2007/09/27 07:51:09 fs 1.37.132.2: #i81691# forward the EscapeProcessing setting to the system driver 2007/09/27 06:30:10 fs 1.37.132.1: #i81691# properly preserve the EscapeProcessing property (even if not forwarded to the system driver) File Changes: Directory: /dba/connectivity/source/drivers/odbc/ ================================================= File [changed]: OStatement.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/odbc/OStatement.cxx?r1=1.37&r2=1.38 Delta lines: +35 -7 -------------------- --- OStatement.cxx 2006-09-17 03:07:43+0000 1.37 +++ OStatement.cxx 2007-11-21 15:05:08+0000 1.38 @@ -876,6 +876,15 @@ N3SQLSetStmtAttr(m_aStatementHandle, SQL_ATTR_CURSOR_SENSITIVITY,(SQLPOINTER)nSet,SQL_IS_UINTEGER); } //------------------------------------------------------------------------------ +void OStatement_Base::setEscapeProcessing( const sal_Bool _bEscapeProc ) +{ + OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!"); + SQLUINTEGER nEscapeProc( _bEscapeProc ? SQL_NOSCAN_OFF : SQL_NOSCAN_ON ); + SQLRETURN nRetCode = N3SQLSetStmtAttr( m_aStatementHandle, SQL_ATTR_NOSCAN, (SQLPOINTER)nEscapeProc, SQL_IS_UINTEGER ); + (void)nRetCode; +} + +//------------------------------------------------------------------------------ void OStatement_Base::setFetchDirection(sal_Int32 _par0) { OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!"); @@ -927,6 +936,15 @@ return nValue != SQL_UB_OFF; } // ------------------------------------------------------------------------- +sal_Bool OStatement_Base::getEscapeProcessing() const +{ + OSL_ENSURE( m_aStatementHandle, "StatementHandle is null!" ); + sal_uInt32 nValue = SQL_NOSCAN_OFF; + SQLRETURN nRetCode = N3SQLGetStmtAttr( m_aStatementHandle, SQL_ATTR_NOSCAN, &nValue, SQL_IS_UINTEGER, NULL ); + (void)nRetCode; + return nValue == SQL_NOSCAN_OFF; +} +// ------------------------------------------------------------------------- void OStatement_Base::setUsingBookmarks(sal_Bool _bUseBookmark) { OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!"); @@ -1008,8 +1026,10 @@ bConverted = ::comphelper::tryPropertyValue(rConvertedValue, rOldValue, rValue, isUsingBookmarks()); break; - default: - ; + case PROPERTY_ID_ESCAPEPROCESSING: + bConverted = ::comphelper::tryPropertyValue( rConvertedValue, rOldValue, rValue, getEscapeProcessing() ); + break; + } } catch(const SQLException&) @@ -1052,8 +1072,12 @@ case PROPERTY_ID_USEBOOKMARKS: setUsingBookmarks(comphelper::getBOOL(rValue)); break; + case PROPERTY_ID_ESCAPEPROCESSING: + setEscapeProcessing( ::comphelper::getBOOL( rValue ) ); + break; default: - ; + OSL_ENSURE( false, "OStatement_Base::setFastPropertyValue_NoBroadcast: what property?" ); + break; } } catch(const SQLException& ) @@ -1091,10 +1115,14 @@ rValue <<= getFetchSize(); break; case PROPERTY_ID_USEBOOKMARKS: - rValue <<= cppu::bool2any(isUsingBookmarks()); + rValue = cppu::bool2any(isUsingBookmarks()); + break; + case PROPERTY_ID_ESCAPEPROCESSING: + rValue <<= getEscapeProcessing(); break; default: - ; + OSL_ENSURE( false, "OStatement_Base::getFastPropertyValue: what property?" ); + break; } } // ------------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
