Tag: cws_src680_dba24d User: oj Date: 2007-11-07 07:47:08+0000 Modified: dba/dbaccess/source/ui/dlg/DriverSettings.cxx dba/dbaccess/source/ui/dlg/advancedsettings.src
Log: merge conflicts File Changes: Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: DriverSettings.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/DriverSettings.cxx?r1=1.8.26.2&r2=1.8.26.3 Delta lines: +4 -4 ------------------- --- DriverSettings.cxx 2007-11-06 10:59:21+0000 1.8.26.2 +++ DriverSettings.cxx 2007-11-07 07:47:05+0000 1.8.26.3 @@ -4,9 +4,9 @@ * * $RCSfile: DriverSettings.cxx,v $ * - * $Revision: 1.8.26.2 $ + * $Revision: 1.8.26.3 $ * - * last change: $Author: oj $ $Date: 2007/11/06 10:59:21 $ + * last change: $Author: oj $ $Date: 2007/11/07 07:47:05 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -149,7 +149,7 @@ break; case DST_ORACLE_JDBC: _out_rDetailsIds.push_back(DSID_JDBCDRIVERCLASS); - _rDetailsIds.push_back(DSID_IGNORECURRENCY); + _out_rDetailsIds.push_back(DSID_IGNORECURRENCY); break; default: File [changed]: advancedsettings.src Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/advancedsettings.src?r1=1.3&r2=1.3.2.1 Delta lines: +16 -3 -------------------- --- advancedsettings.src 2007-11-05 11:56:35+0000 1.3 +++ advancedsettings.src 2007-11-07 07:47:05+0000 1.3.2.1 @@ -4,9 +4,9 @@ * * $RCSfile: advancedsettings.src,v $ * - * $Revision: 1.3 $ + * $Revision: 1.3.2.1 $ * - * last change: $Author: ihi $ $Date: 2007/11/05 11:56:35 $ + * last change: $Author: oj $ $Date: 2007/11/07 07:47:05 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -182,6 +182,18 @@ }; //------------------------------------------------------------------------- +#define AUTO_IGNORECURRENCY(AUTO_Y) \ + CheckBox CB_IGNORECURRENCY \ + { \ + Pos = MAP_APPFONT ( 6 , AUTO_Y ) ; \ + Size = MAP_APPFONT ( ADVANCED_PAGE_X -12 , CHECKBOX_HEIGHT ) ; \ + Group = TRUE ; \ + TabStop = TRUE ; \ + HelpId = HID_DSADMIN_IGNORECURRENCY; \ + Text [ en-US ] = "Ignore currency field information"; \ + }; + +//------------------------------------------------------------------------- #define AUTO_CHECKREQUIRED(AUTO_Y) \ CheckBox CB_CHECK_REQUIRED \ @@ -303,7 +315,8 @@ AUTO_IGNOREINDEXAPPENDIX( 10*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 9*CHECKBOX_HEIGHT + RELATED_CONTROLS ) AUTO_DOSLINEENDS( 11*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 10*CHECKBOX_HEIGHT + RELATED_CONTROLS ) AUTO_CHECKREQUIRED( 12*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 11*CHECKBOX_HEIGHT + RELATED_CONTROLS ) - AUTO_BOOLEANCOMPARISON( 13*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 12*CHECKBOX_HEIGHT + RELATED_CONTROLS + ( LISTBOX_HEIGHT - CHECKBOX_HEIGHT ) / 2 ) + AUTO_IGNORECURRENCY( 13*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 12*CHECKBOX_HEIGHT + RELATED_CONTROLS ) + AUTO_BOOLEANCOMPARISON( 14*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 13*CHECKBOX_HEIGHT + RELATED_CONTROLS + ( LISTBOX_HEIGHT - CHECKBOX_HEIGHT ) / 2 ) }; //------------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
