User: rt Date: 2008-01-30 08:31:39+0000 Modified: dba/dbaccess/source/core/dataaccess/ModelImpl.cxx
Log: INTEGRATION: CWS dba24d (1.19.54); FILE MERGED 2007/12/01 13:39:48 fs 1.19.54.4: RESYNC: (1.19-1.21); FILE MERGED 2007/11/21 20:53:47 fs 1.19.54.3: #i10000# 2007/11/21 12:37:17 oj 1.19.54.2: #i68854# impl TypeSettingInfo for Oracle 2007/11/06 09:20:13 oj 1.19.54.1: #i11746# new property IgnoreCurrency File Changes: Directory: /dba/dbaccess/source/core/dataaccess/ ================================================ File [changed]: ModelImpl.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/ModelImpl.cxx?r1=1.23&r2=1.24 Delta lines: +4 -1 ------------------- --- ModelImpl.cxx 2008-01-29 15:17:59+0000 1.23 +++ ModelImpl.cxx 2008-01-30 08:31:36+0000 1.24 @@ -393,13 +393,14 @@ try { // the set of property value types in the bag is limited: - Sequence< Type > aAllowedTypes(5); + Sequence< Type > aAllowedTypes(6); Type* pAllowedType = aAllowedTypes.getArray(); *pAllowedType++ = ::getCppuType( static_cast< sal_Bool* >( NULL ) ); *pAllowedType++ = ::getCppuType( static_cast< double* >( NULL ) ); *pAllowedType++ = ::getCppuType( static_cast< ::rtl::OUString* >( NULL ) ); *pAllowedType++ = ::getCppuType( static_cast< sal_Int32* >( NULL ) ); *pAllowedType++ = ::getCppuType( static_cast< sal_Int16* >( NULL ) ); + *pAllowedType++ = ::getCppuType( static_cast< Sequence< Any >* >( NULL ) ); Sequence< Any > aInitArgs( 2 ); aInitArgs[0] <<= NamedValue( @@ -1022,6 +1023,8 @@ AsciiPropertyValue( "FormsCheckRequiredFields", makeAny( (sal_Bool)sal_True ) ), AsciiPropertyValue( "EscapeDateTime", makeAny( (sal_Bool)sal_True ) ), AsciiPropertyValue( "IgnoreCurrency", makeAny( (sal_Bool)sal_False ) ), + AsciiPropertyValue( "TypeInfoSettings", makeAny( Sequence< Any >()) ), + AsciiPropertyValue( NULL, Any() ) }; return aKnownSettings; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
