Tag: cws_src680_dba24d User: oj Date: 2007-11-07 07:55:14+0000 Modified: dba/dbaccess/source/ui/dlg/advancedsettings.cxx dba/dbaccess/source/ui/dlg/advancedsettings.hxx
Log: merge conflicts File Changes: Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: advancedsettings.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/advancedsettings.cxx?r1=1.2&r2=1.2.2.1 Delta lines: +5 -2 ------------------- --- advancedsettings.cxx 2007-11-01 15:08:56+0000 1.2 +++ advancedsettings.cxx 2007-11-07 07:55:12+0000 1.2.2.1 @@ -4,9 +4,9 @@ * * $RCSfile: advancedsettings.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.2.2.1 $ * - * last change: $Author: hr $ $Date: 2007/11/01 15:08:56 $ + * last change: $Author: oj $ $Date: 2007/11/07 07:55:12 $ * * 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.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/advancedsettings.hxx?r1=1.2&r2=1.2.2.1 Delta lines: +3 -2 ------------------- --- advancedsettings.hxx 2007-11-01 15:09:28+0000 1.2 +++ advancedsettings.hxx 2007-11-07 07:55:12+0000 1.2.2.1 @@ -4,9 +4,9 @@ * * $RCSfile: advancedsettings.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.2.2.1 $ * - * last change: $Author: hr $ $Date: 2007/11/01 15:09:28 $ + * last change: $Author: oj $ $Date: 2007/11/07 07:55:12 $ * * 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; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
