User: ihi Date: 2007-11-27 12:13:31+0000 Modified: dba/dbaccess/source/ui/misc/dsmeta.cxx
Log: INTEGRATION: CWS dba24lms (1.2.6); FILE MERGED 2007/11/14 14:06:39 oj 1.2.6.3: #i11746# revert DSL_DOSLINEENDS removeable 2007/11/14 12:39:35 oj 1.2.6.2: #i11746# insert Ignore Currency 2007/11/12 15:20:48 oj 1.2.6.1: #i11746# currency oracle File Changes: Directory: /dba/dbaccess/source/ui/misc/ ======================================== File [changed]: dsmeta.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/dsmeta.cxx?r1=1.2&r2=1.3 Delta lines: +16 -14 --------------------- --- dsmeta.cxx 2007-11-01 15:24:09+0000 1.2 +++ dsmeta.cxx 2007-11-27 12:13:29+0000 1.3 @@ -52,7 +52,7 @@ { // strange ctor, but makes instantiating this class more readable (see below) InitAdvanced( short _Generated, short _SQL, short _Append, short _As, short _Outer, short _Priv, short _Param, - short _Version, short _Catalog, short _Schema, short _Index, short _DOS, short _Required, short _Bool ) + short _Version, short _Catalog, short _Schema, short _Index, short _DOS, short _Required, short _Bool,short _IgnoreCur ) :AdvancedSettingsSupport() { bGeneratedValues = ( _Generated != 0 ); @@ -69,6 +69,7 @@ bUseDOSLineEnds = ( _DOS != 0 ); bBooleanComparisonMode = ( _Bool != 0 ); bFormsCheckRequiredFields = ( _Required != 0 ); + bIgnoreCurrency = ( _IgnoreCur != 0 ); } enum Special { All, None }; @@ -90,6 +91,7 @@ bUseDOSLineEnds = ( _eType == All ); bBooleanComparisonMode = ( _eType == All ); bFormsCheckRequiredFields = ( _eType == All ); + bIgnoreCurrency = false; // Oracle special } }; @@ -120,17 +122,17 @@ static AdvancedSupport s_aSupport; if ( s_aSupport.empty() ) { - s_aSupport[ DST_MSACCESS ] = InitAdvanced( 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1 ); - s_aSupport[ DST_MYSQL_ODBC ] = InitAdvanced( 0, 0, 1, 0, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1 ); - s_aSupport[ DST_MYSQL_JDBC ] = InitAdvanced( 0, 0, 1, 0, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1 ); - s_aSupport[ DST_ORACLE_JDBC ] = InitAdvanced( InitAdvanced::All ); - s_aSupport[ DST_ADABAS ] = InitAdvanced( 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 1 ); + s_aSupport[ DST_MSACCESS ] = InitAdvanced( 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0 ); + s_aSupport[ DST_MYSQL_ODBC ] = InitAdvanced( 0, 0, 1, 0, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0 ); + s_aSupport[ DST_MYSQL_JDBC ] = InitAdvanced( 0, 0, 1, 0, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0 ); + s_aSupport[ DST_ORACLE_JDBC ] = InitAdvanced( 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ); + s_aSupport[ DST_ADABAS ] = InitAdvanced( 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 1, 0 ); s_aSupport[ DST_CALC ] = InitAdvanced( InitAdvanced::None ); - s_aSupport[ DST_DBASE ] = InitAdvanced( 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 ); - s_aSupport[ DST_FLAT ] = InitAdvanced( 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ); + s_aSupport[ DST_DBASE ] = InitAdvanced( 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0 ); + s_aSupport[ DST_FLAT ] = InitAdvanced( 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ); s_aSupport[ DST_JDBC ] = InitAdvanced( InitAdvanced::All ); s_aSupport[ DST_ODBC ] = InitAdvanced( InitAdvanced::All ); - s_aSupport[ DST_ADO ] = InitAdvanced( 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1 ); + s_aSupport[ DST_ADO ] = InitAdvanced( 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 0 ); s_aSupport[ DST_MOZILLA ] = InitAdvanced( InitAdvanced::None ); s_aSupport[ DST_THUNDERBIRD ] = InitAdvanced( InitAdvanced::None ); s_aSupport[ DST_LDAP ] = InitAdvanced( InitAdvanced::None ); @@ -140,7 +142,7 @@ s_aSupport[ DST_EVOLUTION_GROUPWISE ] = InitAdvanced( InitAdvanced::None ); s_aSupport[ DST_EVOLUTION_LDAP ] = InitAdvanced( InitAdvanced::None ); s_aSupport[ DST_KAB ] = InitAdvanced( InitAdvanced::None ); - s_aSupport[ DST_EMBEDDED_HSQLDB ] = InitAdvanced( 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0 ); + s_aSupport[ DST_EMBEDDED_HSQLDB ] = InitAdvanced( 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0 ); s_aSupport[ DST_USERDEFINE1 ] = InitAdvanced( InitAdvanced::All ); s_aSupport[ DST_USERDEFINE2 ] = InitAdvanced( InitAdvanced::All ); s_aSupport[ DST_USERDEFINE3 ] = InitAdvanced( InitAdvanced::All ); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
