Tag: cws_src680_dba24d User: oj Date: 2007-11-07 08:29:37+0000 Modified: dba/dbaccess/source/ui/inc/dsmeta.hxx dba/dbaccess/source/ui/misc/dsmeta.cxx
Log: merge conflicts File Changes: Directory: /dba/dbaccess/source/ui/inc/ ======================================= File [changed]: dsmeta.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/dsmeta.hxx?r1=1.2&r2=1.2.2.1 Delta lines: +6 -3 ------------------- --- dsmeta.hxx 2007-11-01 15:22:02+0000 1.2 +++ dsmeta.hxx 2007-11-07 08:29:34+0000 1.2.2.1 @@ -4,9 +4,9 @@ * * $RCSfile: dsmeta.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.2.2.1 $ * - * last change: $Author: hr $ $Date: 2007/11/01 15:22:02 $ + * last change: $Author: oj $ $Date: 2007/11/07 08:29:34 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -115,6 +115,7 @@ bool bUseDOSLineEnds; bool bBooleanComparisonMode; bool bFormsCheckRequiredFields; + bool bIgnoreCurrency; // Note: If you extend this list, you need to adjust the ctor (of course) // and (maybe) the implementation of supportsAnySpecialSetting @@ -133,6 +134,7 @@ ,bUseDOSLineEnds ( true ) ,bBooleanComparisonMode ( true ) ,bFormsCheckRequiredFields ( true ) + ,bIgnoreCurrency ( false ) { } @@ -157,7 +159,8 @@ || ( bUseIndexDirectionKeyword == true ) || ( bUseDOSLineEnds == true ) || ( bBooleanComparisonMode == true ) - || ( bFormsCheckRequiredFields == true ); + || ( bFormsCheckRequiredFields == true ) + || ( bIgnoreCurrency == true ); } //........................................................................ 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.2.2.1 Delta lines: +16 -12 --------------------- --- dsmeta.cxx 2007-11-01 15:24:09+0000 1.2 +++ dsmeta.cxx 2007-11-07 08:29:34+0000 1.2.2.1 @@ -4,9 +4,9 @@ * * $RCSfile: dsmeta.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.2.2.1 $ * - * last change: $Author: hr $ $Date: 2007/11/01 15:24:09 $ + * last change: $Author: oj $ $Date: 2007/11/07 08:29:34 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -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_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( InitAdvanced::All ); - s_aSupport[ DST_ADABAS ] = InitAdvanced( 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 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 ); @@ -151,6 +153,8 @@ s_aSupport[ DST_USERDEFINE8 ] = InitAdvanced( InitAdvanced::All ); s_aSupport[ DST_USERDEFINE9 ] = InitAdvanced( InitAdvanced::All ); s_aSupport[ DST_USERDEFINE10 ] = InitAdvanced( InitAdvanced::All ); + + s_aSupport[ DST_ORACLE_JDBC ].bIgnoreCurrency = true; } return s_aSupport[ _eType ]; } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
