Tag: cws_src680_dba30 User: fs Date: 06/05/19 03:45:43 Modified: /dba/dbaccess/source/core/dataaccess/ ModelImpl.cxx, ModelImpl.hxx
Log: #i10000# Linux compiler bug 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.3.2.8&r2=1.3.2.9 Delta lines: +39 -39 --------------------- --- ModelImpl.cxx 3 May 2006 15:24:02 -0000 1.3.2.8 +++ ModelImpl.cxx 19 May 2006 10:45:40 -0000 1.3.2.9 @@ -4,9 +4,9 @@ * * $RCSfile: ModelImpl.cxx,v $ * - * $Revision: 1.3.2.8 $ + * $Revision: 1.3.2.9 $ * - * last change: $Author: fs $ $Date: 2006/05/03 15:24:02 $ + * last change: $Author: fs $ $Date: 2006/05/19 10:45:40 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -954,50 +954,50 @@ static const AsciiPropertyValue aKnownSettings[] = { // known JDBC settings - { "JavaDriverClass", makeAny( ::rtl::OUString() ) }, + AsciiPropertyValue( "JavaDriverClass", makeAny( ::rtl::OUString() ) ), // known settings for file-based drivers - { "Extension", makeAny( ::rtl::OUString() ) }, - { "CharSet", makeAny( ::rtl::OUString() ) }, - { "HeaderLine", makeAny( (sal_Bool)sal_True ) }, - { "FieldDelimiter", makeAny( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "," ) ) ) }, - { "StringDelimiter", makeAny( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "\"" ) ) ) }, - { "DecimalDelimiter", makeAny( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "." ) ) ) }, - { "ThousandDelimiter", makeAny( ::rtl::OUString() ) }, - { "ShowDeleted", makeAny( (sal_Bool)sal_False ) }, + AsciiPropertyValue( "Extension", makeAny( ::rtl::OUString() ) ), + AsciiPropertyValue( "CharSet", makeAny( ::rtl::OUString() ) ), + AsciiPropertyValue( "HeaderLine", makeAny( (sal_Bool)sal_True ) ), + AsciiPropertyValue( "FieldDelimiter", makeAny( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "," ) ) ) ), + AsciiPropertyValue( "StringDelimiter", makeAny( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "\"" ) ) ) ), + AsciiPropertyValue( "DecimalDelimiter", makeAny( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "." ) ) ) ), + AsciiPropertyValue( "ThousandDelimiter", makeAny( ::rtl::OUString() ) ), + AsciiPropertyValue( "ShowDeleted", makeAny( (sal_Bool)sal_False ) ), // known ODBC settings - { "SystemDriverSettings", makeAny( ::rtl::OUString() ) }, - { "UseCatalog", makeAny( (sal_Bool)sal_False ) }, + AsciiPropertyValue( "SystemDriverSettings", makeAny( ::rtl::OUString() ) ), + AsciiPropertyValue( "UseCatalog", makeAny( (sal_Bool)sal_False ) ), // settings related to auto increment handling - { "AutoIncrementCreation", makeAny( ::rtl::OUString() ) }, - { "AutoRetrievingStatement", makeAny( ::rtl::OUString() ) }, - { "IsAutoRetrievingEnabled", makeAny( (sal_Bool)sal_False ) }, + AsciiPropertyValue( "AutoIncrementCreation", makeAny( ::rtl::OUString() ) ), + AsciiPropertyValue( "AutoRetrievingStatement", makeAny( ::rtl::OUString() ) ), + AsciiPropertyValue( "IsAutoRetrievingEnabled", makeAny( (sal_Bool)sal_False ) ), // known Adabas D driver setting - { "ShutdownDatabase", makeAny( (sal_Bool)sal_False ) }, - { "DataCacheSizeIncrement", makeAny( (sal_Int32)20 ) }, - { "DataCacheSize", makeAny( (sal_Int32)20 ) }, - { "ControlUser", makeAny( ::rtl::OUString() ) }, - { "ControlPassword", makeAny( ::rtl::OUString() ) }, + AsciiPropertyValue( "ShutdownDatabase", makeAny( (sal_Bool)sal_False ) ), + AsciiPropertyValue( "DataCacheSizeIncrement", makeAny( (sal_Int32)20 ) ), + AsciiPropertyValue( "DataCacheSize", makeAny( (sal_Int32)20 ) ), + AsciiPropertyValue( "ControlUser", makeAny( ::rtl::OUString() ) ), + AsciiPropertyValue( "ControlPassword", makeAny( ::rtl::OUString() ) ), // known LDAP driver settings - { "HostName", makeAny( ::rtl::OUString() ) }, - { "PortNumber", makeAny( (sal_Int32)389 ) }, - { "BaseDN", makeAny( ::rtl::OUString() ) }, - { "MaxRowCount", makeAny( (sal_Int32)100 ) }, + AsciiPropertyValue( "HostName", makeAny( ::rtl::OUString() ) ), + AsciiPropertyValue( "PortNumber", makeAny( (sal_Int32)389 ) ), + AsciiPropertyValue( "BaseDN", makeAny( ::rtl::OUString() ) ), + AsciiPropertyValue( "MaxRowCount", makeAny( (sal_Int32)100 ) ), // misc known driver settings - { "ParameterNameSubstitution", makeAny( (sal_Bool)sal_False ) }, - { "AddIndexAppendix", makeAny( (sal_Bool)sal_True ) }, + AsciiPropertyValue( "ParameterNameSubstitution", makeAny( (sal_Bool)sal_False ) ), + AsciiPropertyValue( "AddIndexAppendix", makeAny( (sal_Bool)sal_True ) ), // known SDB level settings - { "IgnoreDriverPrivileges", makeAny( (sal_Bool)sal_True ) }, - { "NoNameLengthLimit", makeAny( (sal_Bool)sal_False ) }, - { "AppendTableAliasName", makeAny( (sal_Bool)sal_False ) }, - { "EnableSQL92Check", makeAny( (sal_Bool)sal_False ) }, - { "BooleanComparisonMode", makeAny( (sal_Int32)0 ) }, - { "TableTypeFilterMode", makeAny( (sal_Int32)3 ) }, - { "RespectDriverResultSetType", makeAny( (sal_Bool)sal_False ) }, - { "UseSchemaInSelect", makeAny( (sal_Bool)sal_True ) }, - { "UseCatalogInSelect", makeAny( (sal_Bool)sal_True ) }, - { "EnableOuterJoinEscape", makeAny( (sal_Bool)sal_True ) }, - { "PreferDosLikeLineEnds", makeAny( (sal_Bool)sal_False ) }, - { NULL, Any() } + AsciiPropertyValue( "IgnoreDriverPrivileges", makeAny( (sal_Bool)sal_True ) ), + AsciiPropertyValue( "NoNameLengthLimit", makeAny( (sal_Bool)sal_False ) ), + AsciiPropertyValue( "AppendTableAliasName", makeAny( (sal_Bool)sal_False ) ), + AsciiPropertyValue( "EnableSQL92Check", makeAny( (sal_Bool)sal_False ) ), + AsciiPropertyValue( "BooleanComparisonMode", makeAny( (sal_Int32)0 ) ), + AsciiPropertyValue( "TableTypeFilterMode", makeAny( (sal_Int32)3 ) ), + AsciiPropertyValue( "RespectDriverResultSetType", makeAny( (sal_Bool)sal_False ) ), + AsciiPropertyValue( "UseSchemaInSelect", makeAny( (sal_Bool)sal_True ) ), + AsciiPropertyValue( "UseCatalogInSelect", makeAny( (sal_Bool)sal_True ) ), + AsciiPropertyValue( "EnableOuterJoinEscape", makeAny( (sal_Bool)sal_True ) ), + AsciiPropertyValue( "PreferDosLikeLineEnds", makeAny( (sal_Bool)sal_False ) ), + AsciiPropertyValue( NULL, Any() ) }; return aKnownSettings; } File [changed]: ModelImpl.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/ModelImpl.hxx?r1=1.3.2.6&r2=1.3.2.7 Delta lines: +13 -4 -------------------- --- ModelImpl.hxx 20 Apr 2006 06:45:08 -0000 1.3.2.6 +++ ModelImpl.hxx 19 May 2006 10:45:40 -0000 1.3.2.7 @@ -4,9 +4,9 @@ * * $RCSfile: ModelImpl.hxx,v $ * - * $Revision: 1.3.2.6 $ + * $Revision: 1.3.2.7 $ * - * last change: $Author: oj $ $Date: 2006/04/20 06:45:08 $ + * last change: $Author: fs $ $Date: 2006/05/19 10:45:40 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -171,8 +171,17 @@ struct AsciiPropertyValue { - const sal_Char* AsciiName; + // note: the canonic member order would be AsciiName / DefaultValue, but + // this crashes on unxlngi6.pro, since there's a bug which somehow results in + // getDefaultDataSourceSettings returning corrupted Any instances then. ::com::sun::star::uno::Any DefaultValue; + const sal_Char* AsciiName; + + AsciiPropertyValue( const sal_Char* _pAsciiName, const ::com::sun::star::uno::Any& _rDefaultValue ) + :AsciiName( _pAsciiName ) + ,DefaultValue( _rDefaultValue ) + { + } }; class ODatabaseContext; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
