Tag: cws_dev300_odbmacros3 User: fs Date: 2008-07-19 21:04:30+0000 Modified: dba/dbaccess/source/ui/misc/dsmeta.cxx
Log: +AllButIgnoreCurrency 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.7&r2=1.7.2.1 Delta lines: +30 -32 --------------------- --- dsmeta.cxx 2008-04-10 16:06:46+0000 1.7 +++ dsmeta.cxx 2008-07-19 21:04:28+0000 1.7.2.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: dsmeta.cxx,v $ - * $Revision: 1.7 $ + * $Revision: 1.7.2.1 $ * * This file is part of OpenOffice.org. * @@ -67,26 +67,26 @@ bIgnoreCurrency = ( _IgnoreCur != 0 ); } - enum Special { All, None }; + enum Special { All, AllButIgnoreCurrency, None }; InitAdvanced( Special _eType ) :AdvancedSettingsSupport() { - bGeneratedValues = ( _eType == All ); - bUseSQL92NamingConstraints = ( _eType == All ); - bAppendTableAliasInSelect = ( _eType == All ); - bUseKeywordAsBeforeAlias = ( _eType == All ); - bUseBracketedOuterJoinSyntax = ( _eType == All ); - bIgnoreDriverPrivileges = ( _eType == All ); - bParameterNameSubstitution = ( _eType == All ); - bDisplayVersionColumns = ( _eType == All ); - bUseCatalogInSelect = ( _eType == All ); - bUseSchemaInSelect = ( _eType == All ); - bUseIndexDirectionKeyword = ( _eType == All ); - bUseDOSLineEnds = ( _eType == All ); - bBooleanComparisonMode = ( _eType == All ); - bFormsCheckRequiredFields = ( _eType == All ); - bIgnoreCurrency = false; // Oracle special + bGeneratedValues = ( _eType == All ) || ( _eType == AllButIgnoreCurrency ); + bUseSQL92NamingConstraints = ( _eType == All ) || ( _eType == AllButIgnoreCurrency ); + bAppendTableAliasInSelect = ( _eType == All ) || ( _eType == AllButIgnoreCurrency ); + bUseKeywordAsBeforeAlias = ( _eType == All ) || ( _eType == AllButIgnoreCurrency ); + bUseBracketedOuterJoinSyntax = ( _eType == All ) || ( _eType == AllButIgnoreCurrency ); + bIgnoreDriverPrivileges = ( _eType == All ) || ( _eType == AllButIgnoreCurrency ); + bParameterNameSubstitution = ( _eType == All ) || ( _eType == AllButIgnoreCurrency ); + bDisplayVersionColumns = ( _eType == All ) || ( _eType == AllButIgnoreCurrency ); + bUseCatalogInSelect = ( _eType == All ) || ( _eType == AllButIgnoreCurrency ); + bUseSchemaInSelect = ( _eType == All ) || ( _eType == AllButIgnoreCurrency ); + bUseIndexDirectionKeyword = ( _eType == All ) || ( _eType == AllButIgnoreCurrency ); + bUseDOSLineEnds = ( _eType == All ) || ( _eType == AllButIgnoreCurrency ); + bBooleanComparisonMode = ( _eType == All ) || ( _eType == AllButIgnoreCurrency ); + bFormsCheckRequiredFields = ( _eType == All ) || ( _eType == AllButIgnoreCurrency ); + bIgnoreCurrency = ( _eType == All ); } }; @@ -126,8 +126,8 @@ 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, 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_JDBC ] = InitAdvanced( InitAdvanced::AllButIgnoreCurrency ); + s_aSupport[ DST_ODBC ] = InitAdvanced( InitAdvanced::AllButIgnoreCurrency ); 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 ); @@ -140,18 +140,16 @@ s_aSupport[ DST_KAB ] = InitAdvanced( InitAdvanced::None ); s_aSupport[ DST_MSACCESS_2007 ] = InitAdvanced( 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 1, 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 ); - s_aSupport[ DST_USERDEFINE4 ] = InitAdvanced( InitAdvanced::All ); - s_aSupport[ DST_USERDEFINE5 ] = InitAdvanced( InitAdvanced::All ); - s_aSupport[ DST_USERDEFINE6 ] = InitAdvanced( InitAdvanced::All ); - s_aSupport[ DST_USERDEFINE7 ] = InitAdvanced( InitAdvanced::All ); - 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; + s_aSupport[ DST_USERDEFINE1 ] = InitAdvanced( InitAdvanced::AllButIgnoreCurrency ); + s_aSupport[ DST_USERDEFINE2 ] = InitAdvanced( InitAdvanced::AllButIgnoreCurrency ); + s_aSupport[ DST_USERDEFINE3 ] = InitAdvanced( InitAdvanced::AllButIgnoreCurrency ); + s_aSupport[ DST_USERDEFINE4 ] = InitAdvanced( InitAdvanced::AllButIgnoreCurrency ); + s_aSupport[ DST_USERDEFINE5 ] = InitAdvanced( InitAdvanced::AllButIgnoreCurrency ); + s_aSupport[ DST_USERDEFINE6 ] = InitAdvanced( InitAdvanced::AllButIgnoreCurrency ); + s_aSupport[ DST_USERDEFINE7 ] = InitAdvanced( InitAdvanced::AllButIgnoreCurrency ); + s_aSupport[ DST_USERDEFINE8 ] = InitAdvanced( InitAdvanced::AllButIgnoreCurrency ); + s_aSupport[ DST_USERDEFINE9 ] = InitAdvanced( InitAdvanced::AllButIgnoreCurrency ); + s_aSupport[ DST_USERDEFINE10 ] = InitAdvanced( InitAdvanced::AllButIgnoreCurrency ); } return s_aSupport[ _eType ]; } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
