Tag: cws_src680_dba24lms User: oj Date: 2007-11-12 15:20:51+0000 Modified: dba/dbaccess/source/ui/dlg/DbAdminImpl.cxx dba/dbaccess/source/ui/dlg/DriverSettings.cxx dba/dbaccess/source/ui/dlg/DriverSettings.hxx dba/dbaccess/source/ui/dlg/advancedsettings.cxx dba/dbaccess/source/ui/dlg/advancedsettings.hrc dba/dbaccess/source/ui/dlg/advancedsettings.hxx dba/dbaccess/source/ui/dlg/advancedsettings.src dba/dbaccess/source/ui/dlg/dbadmin.cxx dba/dbaccess/source/ui/dlg/dsitems.hxx dba/dbaccess/source/ui/inc/dsmeta.hxx dba/dbaccess/source/ui/misc/dsmeta.cxx dba/dbaccess/source/ui/misc/dsntypes.cxx
Log: #i11746# currency oracle File Changes: Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: DbAdminImpl.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/DbAdminImpl.cxx?r1=1.19&r2=1.19.4.1 Delta lines: +6 -3 ------------------- --- DbAdminImpl.cxx 2007-11-01 15:06:03+0000 1.19 +++ DbAdminImpl.cxx 2007-11-12 15:20:47+0000 1.19.4.1 @@ -4,9 +4,9 @@ * * $RCSfile: DbAdminImpl.cxx,v $ * - * $Revision: 1.19 $ + * $Revision: 1.19.4.1 $ * - * last change: $Author: hr $ $Date: 2007/11/01 15:06:03 $ + * last change: $Author: oj $ $Date: 2007/11/12 15:20:47 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -257,6 +257,9 @@ m_aIndirectPropTranslator.insert(MapInt2String::value_type(DSID_CONN_LDAP_USESSL, ::rtl::OUString::createFromAscii("UseSSL"))); m_aIndirectPropTranslator.insert(MapInt2String::value_type(DSID_DOCUMENT_URL, PROPERTY_URL)); + // oracle + m_aIndirectPropTranslator.insert(MapInt2String::value_type(DSID_IGNORECURRENCY, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IgnoreCurrency")))); + try { m_xDatabaseContext = Reference< XNameAccess >(m_xORB->createInstance(SERVICE_SDB_DATABASECONTEXT), UNO_QUERY); File [changed]: DriverSettings.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/DriverSettings.cxx?r1=1.9&r2=1.9.4.1 Delta lines: +6 -3 ------------------- --- DriverSettings.cxx 2007-11-01 15:06:40+0000 1.9 +++ DriverSettings.cxx 2007-11-12 15:20:47+0000 1.9.4.1 @@ -4,9 +4,9 @@ * * $RCSfile: DriverSettings.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.9.4.1 $ * - * last change: $Author: hr $ $Date: 2007/11/01 15:06:40 $ + * last change: $Author: oj $ $Date: 2007/11/12 15:20:47 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -145,8 +145,11 @@ break; case DST_JDBC: + _out_rDetailsIds.push_back(DSID_JDBCDRIVERCLASS); + break; case DST_ORACLE_JDBC: _out_rDetailsIds.push_back(DSID_JDBCDRIVERCLASS); + _out_rDetailsIds.push_back(DSID_IGNORECURRENCY); break; default: File [changed]: DriverSettings.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/DriverSettings.hxx?r1=1.7&r2=1.7.4.1 Delta lines: +3 -3 ------------------- --- DriverSettings.hxx 2007-11-01 15:07:02+0000 1.7 +++ DriverSettings.hxx 2007-11-12 15:20:47+0000 1.7.4.1 @@ -4,9 +4,9 @@ * * $RCSfile: DriverSettings.hxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.7.4.1 $ * - * last change: $Author: hr $ $Date: 2007/11/01 15:07:02 $ + * last change: $Author: oj $ $Date: 2007/11/12 15:20:47 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. File [changed]: advancedsettings.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/advancedsettings.cxx?r1=1.2&r2=1.2.6.1 Delta lines: +5 -2 ------------------- --- advancedsettings.cxx 2007-11-01 15:08:56+0000 1.2 +++ advancedsettings.cxx 2007-11-12 15:20:47+0000 1.2.6.1 @@ -4,9 +4,9 @@ * * $RCSfile: advancedsettings.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.2.6.1 $ * - * last change: $Author: hr $ $Date: 2007/11/01 15:08:56 $ + * last change: $Author: oj $ $Date: 2007/11/12 15:20:47 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -101,6 +101,7 @@ ,m_pIndexAppendix( NULL ) ,m_pDosLineEnds( NULL ) ,m_pCheckRequiredFields( NULL ) + ,m_pIgnoreCurrency(NULL) ,m_pBooleanComparisonModeLabel( NULL ) ,m_pBooleanComparisonMode( NULL ) ,m_aControlDependencies() @@ -184,6 +185,7 @@ DELETEZ( m_pIndexAppendix ); DELETEZ( m_pDosLineEnds ); DELETEZ( m_pCheckRequiredFields ); + DELETEZ( m_pIgnoreCurrency ); DELETEZ( m_pBooleanComparisonModeLabel ); DELETEZ( m_pBooleanComparisonMode ); } @@ -207,6 +209,7 @@ { &m_pIndexAppendix, CB_IGNOREINDEXAPPENDIX, DSID_INDEXAPPENDIX, false }, { &m_pDosLineEnds, CB_DOSLINEENDS, DSID_DOSLINEENDS, false }, { &m_pCheckRequiredFields, CB_CHECK_REQUIRED, DSID_CHECK_REQUIRED_FIELDS, false }, + { &m_pIgnoreCurrency, CB_IGNORECURRENCY, DSID_IGNORECURRENCY, false }, { NULL, 0, 0, false } }; File [changed]: advancedsettings.hrc Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/advancedsettings.hrc?r1=1.2.6.1&r2=1.2.6.2 Delta lines: +3 -2 ------------------- --- advancedsettings.hrc 2007-11-09 07:10:33+0000 1.2.6.1 +++ advancedsettings.hrc 2007-11-12 15:20:47+0000 1.2.6.2 @@ -4,9 +4,9 @@ * * $RCSfile: advancedsettings.hrc,v $ * - * $Revision: 1.2.6.1 $ + * $Revision: 1.2.6.2 $ * - * last change: $Author: oj $ $Date: 2007/11/09 07:10:33 $ + * last change: $Author: oj $ $Date: 2007/11/12 15:20:47 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -68,6 +68,7 @@ #define CB_AS_BEFORE_CORR_NAME 12 #define CB_CHECK_REQUIRED 13 #define CB_IGNORECURRENCY 14 +#define CB_IGNORECURRENCY 14 #define ET_AUTOINCREMENTVALUE 1 #define ET_RETRIEVE_AUTO 2 File [changed]: advancedsettings.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/advancedsettings.hxx?r1=1.2&r2=1.2.6.1 Delta lines: +3 -2 ------------------- --- advancedsettings.hxx 2007-11-01 15:09:28+0000 1.2 +++ advancedsettings.hxx 2007-11-12 15:20:47+0000 1.2.6.1 @@ -4,9 +4,9 @@ * * $RCSfile: advancedsettings.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.2.6.1 $ * - * last change: $Author: hr $ $Date: 2007/11/01 15:09:28 $ + * last change: $Author: oj $ $Date: 2007/11/12 15:20:47 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -77,6 +77,7 @@ CheckBox* m_pIndexAppendix; CheckBox* m_pDosLineEnds; CheckBox* m_pCheckRequiredFields; + CheckBox* m_pIgnoreCurrency; FixedText* m_pBooleanComparisonModeLabel; ListBox* m_pBooleanComparisonMode; File [changed]: advancedsettings.src Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/advancedsettings.src?r1=1.3.6.1&r2=1.3.6.2 Delta lines: +13 -2 -------------------- --- advancedsettings.src 2007-11-09 07:10:34+0000 1.3.6.1 +++ advancedsettings.src 2007-11-12 15:20:47+0000 1.3.6.2 @@ -4,9 +4,9 @@ * * $RCSfile: advancedsettings.src,v $ * - * $Revision: 1.3.6.1 $ + * $Revision: 1.3.6.2 $ * - * last change: $Author: oj $ $Date: 2007/11/09 07:10:34 $ + * last change: $Author: oj $ $Date: 2007/11/12 15:20:47 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -193,6 +193,17 @@ }; //------------------------------------------------------------------------- +#define AUTO_IGNORECURRENCY(AUTO_Y) \ + CheckBox CB_IGNORECURRENCY \ + { \ + Pos = MAP_APPFONT ( 6 , AUTO_Y ) ; \ + Size = MAP_APPFONT ( ADVANCED_PAGE_X -12 , CHECKBOX_HEIGHT ) ; \ + TabStop = TRUE ; \ + HelpId = HID_DSADMIN_IGNORECURRENCY; \ + Text [ en-US ] = "Ignore currency field information"; \ + }; + +//------------------------------------------------------------------------- #define AUTO_CHECKREQUIRED(AUTO_Y) \ CheckBox CB_CHECK_REQUIRED \ File [changed]: dbadmin.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/dbadmin.cxx?r1=1.104&r2=1.104.4.1 Delta lines: +5 -3 ------------------- --- dbadmin.cxx 2007-11-01 15:10:29+0000 1.104 +++ dbadmin.cxx 2007-11-12 15:20:47+0000 1.104.4.1 @@ -4,9 +4,9 @@ * * $RCSfile: dbadmin.cxx,v $ * - * $Revision: 1.104 $ + * $Revision: 1.104.4.1 $ * - * last change: $Author: hr $ $Date: 2007/11/01 15:10:29 $ + * last change: $Author: oj $ $Date: 2007/11/12 15:20:47 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -462,6 +462,7 @@ *pCounter++ = new SfxStringItem(DSID_DATABASENAME, String()); *pCounter++ = new SfxBoolItem(DSID_AS_BEFORE_CORRNAME, sal_True); *pCounter++ = new SfxBoolItem(DSID_CHECK_REQUIRED_FIELDS, sal_True); + *pCounter++ = new SfxBoolItem(DSID_IGNORECURRENCY, sal_False); // create the pool static SfxItemInfo __READONLY_DATA aItemInfos[DSID_LAST_ITEM_ID - DSID_FIRST_ITEM_ID + 1] = @@ -519,6 +520,7 @@ {0,0}, {0,0}, {0,0}, + {0,0}, {0,0} }; File [changed]: dsitems.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/dsitems.hxx?r1=1.23&r2=1.23.4.1 Delta lines: +5 -4 ------------------- --- dsitems.hxx 2007-11-01 15:13:04+0000 1.23 +++ dsitems.hxx 2007-11-12 15:20:48+0000 1.23.4.1 @@ -4,9 +4,9 @@ * * $RCSfile: dsitems.hxx,v $ * - * $Revision: 1.23 $ + * $Revision: 1.23.4.1 $ * - * last change: $Author: hr $ $Date: 2007/11/01 15:13:04 $ + * last change: $Author: oj $ $Date: 2007/11/12 15:20:48 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -93,6 +93,7 @@ #define DSID_DATABASENAME 52 #define DSID_AS_BEFORE_CORRNAME 53 #define DSID_CHECK_REQUIRED_FIELDS 54 +#define DSID_IGNORECURRENCY 55 // don't forget to adjust DSID_LAST_ITEM_ID below! @@ -100,7 +101,7 @@ //= item range. Adjust this if you introduce new items above #define DSID_FIRST_ITEM_ID DSID_NAME -#define DSID_LAST_ITEM_ID DSID_CHECK_REQUIRED_FIELDS +#define DSID_LAST_ITEM_ID DSID_IGNORECURRENCY #endif // _DBAUI_DATASOURCEITEMS_HXX_ 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.6.1 Delta lines: +6 -3 ------------------- --- dsmeta.hxx 2007-11-01 15:22:02+0000 1.2 +++ dsmeta.hxx 2007-11-12 15:20:48+0000 1.2.6.1 @@ -4,9 +4,9 @@ * * $RCSfile: dsmeta.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.2.6.1 $ * - * last change: $Author: hr $ $Date: 2007/11/01 15:22:02 $ + * last change: $Author: oj $ $Date: 2007/11/12 15:20:48 $ * * 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.6.1 Delta lines: +16 -12 --------------------- --- dsmeta.cxx 2007-11-01 15:24:09+0000 1.2 +++ dsmeta.cxx 2007-11-12 15:20:48+0000 1.2.6.1 @@ -4,9 +4,9 @@ * * $RCSfile: dsmeta.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.2.6.1 $ * - * last change: $Author: hr $ $Date: 2007/11/01 15:24:09 $ + * last change: $Author: oj $ $Date: 2007/11/12 15:20:48 $ * * 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 ]; } File [changed]: dsntypes.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/dsntypes.cxx?r1=1.36&r2=1.36.6.1 Delta lines: +6 -4 ------------------- --- dsntypes.cxx 2007-11-01 15:25:16+0000 1.36 +++ dsntypes.cxx 2007-11-12 15:20:48+0000 1.36.6.1 @@ -4,9 +4,9 @@ * * $RCSfile: dsntypes.cxx,v $ * - * $Revision: 1.36 $ + * $Revision: 1.36.6.1 $ * - * last change: $Author: hr $ $Date: 2007/11/01 15:25:16 $ + * last change: $Author: oj $ $Date: 2007/11/12 15:20:48 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -475,6 +475,8 @@ return DST_EVOLUTION; if (_rDsn.EqualsIgnoreCaseAscii("kab", nSeparator,_rDsn.Len() - nSeparator)) return DST_KAB; + if (_rDsn.EqualsIgnoreCaseAscii("macab", nSeparator,_rDsn.Len() - nSeparator)) + return DST_MACAB; } // find third : --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
