Tag: cws_src680_dba24d User: oj Date: 2007-11-06 09:21:03+0000 Modified: dba/dbaccess/source/ui/dlg/AdvancedPageDlg.cxx 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/dbadmin.cxx dba/dbaccess/source/ui/dlg/dbadmin.hrc dba/dbaccess/source/ui/dlg/dbadmin.src dba/dbaccess/source/ui/dlg/detailpages.cxx dba/dbaccess/source/ui/dlg/detailpages.hxx dba/dbaccess/source/ui/dlg/dsitems.hxx
Log: #i11746# new property IgnoreCurrency File Changes: Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: AdvancedPageDlg.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/AdvancedPageDlg.cxx?r1=1.14&r2=1.14.26.1 Delta lines: +8 -5 ------------------- --- AdvancedPageDlg.cxx 2007-09-13 17:58:06+0000 1.14 +++ AdvancedPageDlg.cxx 2007-11-06 09:21:00+0000 1.14.26.1 @@ -4,9 +4,9 @@ * * $RCSfile: AdvancedPageDlg.cxx,v $ * - * $Revision: 1.14 $ + * $Revision: 1.14.26.1 $ * - * last change: $Author: ihi $ $Date: 2007/09/13 17:58:06 $ + * last change: $Author: oj $ $Date: 2007/11/06 09:21:00 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -147,9 +147,12 @@ case DST_OUTLOOKEXP: break; + case DST_ORACLE_JDBC: + AddTabPage( PAGE_GENERATED_VALUES, String( ModuleRes( STR_GENERATED_VALUE ) ), ODriversSettings::CreateGeneratedValuesPage, NULL ); + AddTabPage( PAGE_DS_ORACLE_ADVANCED_SETTINGS, String( ModuleRes( STR_DS_BEHAVIOUR ) ), ODriversSettings::CreateOracleSettingsPage, NULL ); + break; case DST_ODBC: case DST_JDBC: - case DST_ORACLE_JDBC: case DST_USERDEFINE1: /// first user defined driver case DST_USERDEFINE2: case DST_USERDEFINE3: File [changed]: DbAdminImpl.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/DbAdminImpl.cxx?r1=1.18&r2=1.18.70.1 Delta lines: +6 -3 ------------------- --- DbAdminImpl.cxx 2007-07-06 08:11:06+0000 1.18 +++ DbAdminImpl.cxx 2007-11-06 09:21:00+0000 1.18.70.1 @@ -4,9 +4,9 @@ * * $RCSfile: DbAdminImpl.cxx,v $ * - * $Revision: 1.18 $ + * $Revision: 1.18.70.1 $ * - * last change: $Author: rt $ $Date: 2007/07/06 08:11:06 $ + * last change: $Author: oj $ $Date: 2007/11/06 09:21:00 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -256,6 +256,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.8&r2=1.8.26.1 Delta lines: +4 -4 ------------------- --- DriverSettings.cxx 2007-09-13 17:58:30+0000 1.8 +++ DriverSettings.cxx 2007-11-06 09:21:00+0000 1.8.26.1 @@ -4,9 +4,9 @@ * * $RCSfile: DriverSettings.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.8.26.1 $ * - * last change: $Author: ihi $ $Date: 2007/09/13 17:58:30 $ + * last change: $Author: oj $ $Date: 2007/11/06 09:21:00 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -206,7 +206,7 @@ _rDetailsIds.push_back(DSID_AS_BEFORE_CORRNAME); _rDetailsIds.push_back(DSID_BOOLEANCOMPARISON); _rDetailsIds.push_back(DSID_INDEXAPPENDIX); - _rDetailsIds.push_back(DSID_DOSLINEENDS); + _rDetailsIds.push_back(DSID_IGNORECURRENCY); break; case DST_USERDEFINE1: /// first user defined driver File [changed]: DriverSettings.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/DriverSettings.hxx?r1=1.6&r2=1.6.128.1 Delta lines: +6 -3 ------------------- --- DriverSettings.hxx 2006-12-13 16:49:04+0000 1.6 +++ DriverSettings.hxx 2007-11-06 09:21:00+0000 1.6.128.1 @@ -4,9 +4,9 @@ * * $RCSfile: DriverSettings.hxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.6.128.1 $ * - * last change: $Author: kz $ $Date: 2006/12/13 16:49:04 $ + * last change: $Author: oj $ $Date: 2007/11/06 09:21:00 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -164,6 +164,9 @@ /// creates a common page with all supported advanced attributes static SfxTabPage* CreateFullSettingsPage( Window* _pParent, const SfxItemSet& _rAttrSet ); + + /// creates a Oracle page with all supported advanced attributes + static SfxTabPage* CreateOracleSettingsPage( Window* _pParent, const SfxItemSet& _rAttrSet ); }; } File [changed]: dbadmin.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/dbadmin.cxx?r1=1.103&r2=1.103.70.1 Delta lines: +5 -3 ------------------- --- dbadmin.cxx 2007-07-06 08:13:45+0000 1.103 +++ dbadmin.cxx 2007-11-06 09:21:00+0000 1.103.70.1 @@ -4,9 +4,9 @@ * * $RCSfile: dbadmin.cxx,v $ * - * $Revision: 1.103 $ + * $Revision: 1.103.70.1 $ * - * last change: $Author: rt $ $Date: 2007/07/06 08:13:45 $ + * last change: $Author: oj $ $Date: 2007/11/06 09:21:00 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -464,6 +464,7 @@ *pCounter++ = new SfxBoolItem(DSID_DOSLINEENDS, sal_False); *pCounter++ = new SfxStringItem(DSID_DATABASENAME, String()); *pCounter++ = new SfxBoolItem(DSID_AS_BEFORE_CORRNAME, 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] = @@ -520,6 +521,7 @@ {0,0}, {0,0}, {0,0}, + {0,0}, {0,0} }; File [changed]: dbadmin.hrc Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/dbadmin.hrc?r1=1.34&r2=1.34.128.1 Delta lines: +4 -3 ------------------- --- dbadmin.hrc 2006-12-13 16:49:37+0000 1.34 +++ dbadmin.hrc 2007-11-06 09:21:00+0000 1.34.128.1 @@ -4,9 +4,9 @@ * * $RCSfile: dbadmin.hrc,v $ * - * $Revision: 1.34 $ + * $Revision: 1.34.128.1 $ * - * last change: $Author: kz $ $Date: 2006/12/13 16:49:37 $ + * last change: $Author: oj $ $Date: 2007/11/06 09:21:00 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -127,6 +127,7 @@ #define CB_USESSL 16 #define CB_DOSLINEENDS 22 #define CB_AS_BEFORE_CORR_NAME 23 +#define CB_IGNORECURRENCY 24 #define FL_SEPARATOR1 1 File [changed]: dbadmin.src Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/dbadmin.src?r1=1.156&r2=1.156.88.1 Delta lines: +35 -4 -------------------- --- dbadmin.src 2007-04-24 16:09:26+0000 1.156 +++ dbadmin.src 2007-11-06 09:21:00+0000 1.156.88.1 @@ -4,9 +4,9 @@ * * $RCSfile: dbadmin.src,v $ * - * $Revision: 1.156 $ + * $Revision: 1.156.88.1 $ * - * last change: $Author: rt $ $Date: 2007/04/24 16:09:26 $ + * last change: $Author: oj $ $Date: 2007/11/06 09:21:00 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -151,7 +151,17 @@ HelpId = HID_DSADMIN_DOSLINEENDS; \ Text [ en-US ] = "End text lines with CR+LF"; \ }; - +//------------------------------------------------------------------------- +#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"; \ + }; //------------------------------------------------------------------------- @@ -755,6 +765,27 @@ AUTO_DOSLINEENDS( 11*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 10*CHECKBOX_HEIGHT + RELATED_CONTROLS ) AUTO_BOOLEANCOMPARISON( 12*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 11*CHECKBOX_HEIGHT + RELATED_CONTROLS + ( LISTBOX_HEIGHT - CHECKBOX_HEIGHT ) / 2 ) }; +//......................................................................... +TabPage PAGE_DS_ORACLE_ADVANCED_SETTINGS +{ + SVLook = TRUE ; + Pos = MAP_APPFONT ( 0 , 0 ) ; + Size = MAP_APPFONT ( ADVANCED_PAGE_X , ADVANCED_PAGE_Y ) ; + Hide = TRUE; + AUTO_DATAHANDLING( RELATED_CONTROLS ) + AUTO_SQL92CHECK( 1*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + RELATED_CONTROLS ) + AUTO_APPENDTABLEALIAS( 2*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 1*CHECKBOX_HEIGHT + RELATED_CONTROLS ) + AUTO_AS_BEFORE_CORR_NAME( 3*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 2*CHECKBOX_HEIGHT + RELATED_CONTROLS ) + AUTO_ENABLEOUTERJOIN( 4*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 3*CHECKBOX_HEIGHT + RELATED_CONTROLS ) + AUTO_IGNOREDRIVER_PRIV( 5*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 4*CHECKBOX_HEIGHT + RELATED_CONTROLS ) + AUTO_PARAMETERNAMESUBST( 6*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 5*CHECKBOX_HEIGHT + RELATED_CONTROLS ) + AUTO_SUPPRESVERSIONCOLUMN( 7*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 6*CHECKBOX_HEIGHT + RELATED_CONTROLS ) + AUTO_CATALOG( 8*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 7*CHECKBOX_HEIGHT + RELATED_CONTROLS ) + AUTO_SCHEMA( 9*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 8*CHECKBOX_HEIGHT + RELATED_CONTROLS ) + AUTO_IGNOREINDEXAPPENDIX( 10*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 9*CHECKBOX_HEIGHT + RELATED_CONTROLS ) + AUTO_IGNORECURRENCY( 11*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 10*CHECKBOX_HEIGHT + RELATED_CONTROLS ) + AUTO_BOOLEANCOMPARISON( 12*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 11*CHECKBOX_HEIGHT + RELATED_CONTROLS + ( LISTBOX_HEIGHT - CHECKBOX_HEIGHT ) / 2 ) +}; //......................................................................... File [changed]: detailpages.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/detailpages.cxx?r1=1.47&r2=1.47.70.1 Delta lines: +42 -4 -------------------- --- detailpages.cxx 2007-07-06 08:15:11+0000 1.47 +++ detailpages.cxx 2007-11-06 09:21:01+0000 1.47.70.1 @@ -4,9 +4,9 @@ * * $RCSfile: detailpages.cxx,v $ * - * $Revision: 1.47 $ + * $Revision: 1.47.70.1 $ * - * last change: $Author: rt $ $Date: 2007/07/06 08:15:11 $ + * last change: $Author: oj $ $Date: 2007/11/06 09:21:01 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -137,6 +137,7 @@ ,m_pSchema(NULL) ,m_pIndexAppendix(NULL) ,m_pDosLineEnds(NULL) + ,m_pIgnoreCurrency(NULL) ,m_pBooleanComprisonModeLabel(NULL) ,m_pBooleanComprisonMode(NULL) ,m_pAutoFixedLine(NULL) @@ -267,6 +268,13 @@ m_pDosLineEnds->SetClickHdl(getControlModifiedLink()); } + if ( (m_nControlFlags & CBTP_USE_IGNORECURRENCY) == CBTP_USE_IGNORECURRENCY ) + { + createBehaviourFixedLine(); + m_pIgnoreCurrency = new CheckBox(this, ModuleRes(CB_IGNORECURRENCY)); + m_pIgnoreCurrency->SetClickHdl(getControlModifiedLink()); + } + if ( (m_nControlFlags & CBTP_USE_BOOLEANCOMPARISON) == CBTP_USE_BOOLEANCOMPARISON ) { m_pBooleanComprisonModeLabel = new FixedText(this, ModuleRes(FT_BOOLEANCOMPARISON)); @@ -281,7 +289,7 @@ m_pIsSQL92Check,m_pAppendTableAlias,m_pAsBeforeCorrelationName, m_pIgnoreDriverPrivileges,m_pParameterSubstitution ,m_pSuppressVersionColumn ,m_pEnableOuterJoin,m_pBooleanComprisonModeLabel,m_pBooleanComprisonMode - ,m_pCatalog,m_pSchema,m_pIndexAppendix,m_pDosLineEnds}; + ,m_pCatalog,m_pSchema,m_pIndexAppendix,m_pDosLineEnds,m_pIgnoreCurrency}; sal_Int32 nCount = sizeof(pWindows) / sizeof(pWindows[0]); for (sal_Int32 i=1; i < nCount; ++i) @@ -326,6 +334,7 @@ DELETEZ(m_pSchema); DELETEZ(m_pIndexAppendix); DELETEZ(m_pDosLineEnds); + DELETEZ(m_pIgnoreCurrency); DELETEZ(m_pBooleanComprisonModeLabel); DELETEZ(m_pBooleanComprisonMode); @@ -433,6 +442,9 @@ if ( (m_nControlFlags & CBTP_USE_DOSLINEENDS) == CBTP_USE_DOSLINEENDS ) _rControlList.push_back(new OSaveValueWrapper<CheckBox>(m_pDosLineEnds)); + if ( (m_nControlFlags & CBTP_USE_IGNORECURRENCY) == CBTP_USE_IGNORECURRENCY ) + _rControlList.push_back(new OSaveValueWrapper<CheckBox>(m_pIgnoreCurrency)); + if ((m_nControlFlags & CBTP_USE_CHARSET) == CBTP_USE_CHARSET) _rControlList.push_back(new OSaveValueWrapper<ListBox>(m_pCharset)); @@ -465,6 +477,7 @@ SFX_ITEMSET_GET(_rSet, pCatalog, SfxBoolItem, DSID_CATALOG, sal_True); SFX_ITEMSET_GET(_rSet, pIndexAppendix, SfxBoolItem, DSID_INDEXAPPENDIX, sal_True); SFX_ITEMSET_GET(_rSet, pDosLineEnds, SfxBoolItem, DSID_DOSLINEENDS, sal_True); + SFX_ITEMSET_GET(_rSet, pIgnoreCurrency, SfxBoolItem, DSID_IGNORECURRENCY, sal_True); // forward the values to the controls if (bValid) @@ -534,6 +547,9 @@ if ( (m_nControlFlags & CBTP_USE_DOSLINEENDS) == CBTP_USE_DOSLINEENDS ) m_pDosLineEnds->Check(pDosLineEnds->GetValue()); + if ( (m_nControlFlags & CBTP_USE_IGNORECURRENCY) == CBTP_USE_IGNORECURRENCY ) + m_pIgnoreCurrency->Check(pIgnoreCurrency->GetValue()); + if ( (m_nControlFlags & CBTP_USE_BOOLEANCOMPARISON) == CBTP_USE_BOOLEANCOMPARISON ) m_pBooleanComprisonMode->SelectEntryPos(static_cast<USHORT>(pBooleanComparison->GetValue())); @@ -626,6 +642,9 @@ if ( (m_nControlFlags & CBTP_USE_DOSLINEENDS) == CBTP_USE_DOSLINEENDS ) fillBool(_rSet,m_pDosLineEnds,DSID_DOSLINEENDS,bChangedSomething); + if ( (m_nControlFlags & CBTP_USE_IGNORECURRENCY) == CBTP_USE_IGNORECURRENCY ) + fillBool(_rSet,m_pIgnoreCurrency,DSID_IGNORECURRENCY,bChangedSomething); + if ( (m_nControlFlags & CBTP_USE_BOOLEANCOMPARISON) == CBTP_USE_BOOLEANCOMPARISON ) { if ( m_pBooleanComprisonMode->GetSelectEntryPos() != m_pBooleanComprisonMode->GetSavedValue() ) @@ -1503,6 +1522,25 @@ | CBTP_USE_INDEXAPPENDIX); } //------------------------------------------------------------------------ + SfxTabPage* ODriversSettings::CreateOracleSettingsPage( Window* _pParent, const SfxItemSet& _rAttrSet ) + { + return new OCommonBehaviourTabPage(_pParent + , PAGE_DS_ORACLE_ADVANCED_SETTINGS + , _rAttrSet + , CBTP_USE_SQL92CHECK + | CBTP_USE_APPENDTABLEALIAS + | CBTP_AS_BEFORE_CORRELATION_NAME + | CBTP_USE_ENABLEOUTERJOIN + | CBTP_USE_PARAMETERNAMESUBST + | CBTP_USE_IGNOREDRIVER_PRIV + | CBTP_USE_SUPPRESS_VERSION_COLUMN + | CBTP_USE_BOOLEANCOMPARISON + | CBTP_USE_CATALOG + | CBTP_USE_SCHEMA + | CBTP_USE_INDEXAPPENDIX + | CBTP_USE_IGNORECURRENCY); + } + //------------------------------------------------------------------------ //......................................................................... } // namespace dbaui //......................................................................... File [changed]: detailpages.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/detailpages.hxx?r1=1.26&r2=1.26.88.1 Delta lines: +5 -3 ------------------- --- detailpages.hxx 2007-05-10 10:25:36+0000 1.26 +++ detailpages.hxx 2007-11-06 09:21:01+0000 1.26.88.1 @@ -4,9 +4,9 @@ * * $RCSfile: detailpages.hxx,v $ * - * $Revision: 1.26 $ + * $Revision: 1.26.88.1 $ * - * last change: $Author: kz $ $Date: 2007/05/10 10:25:36 $ + * last change: $Author: oj $ $Date: 2007/11/06 09:21:01 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -87,6 +87,7 @@ #define CBTP_USE_INDEXAPPENDIX 0x00010000 #define CBTP_USE_DOSLINEENDS 0x00020000 #define CBTP_AS_BEFORE_CORRELATION_NAME 0x00040000 + #define CBTP_USE_IGNORECURRENCY 0x00100000 /** eases the implementation of tab pages handling user/password and/or character set and/or generic options input @@ -117,6 +118,7 @@ CheckBox* m_pSchema; CheckBox* m_pIndexAppendix; CheckBox* m_pDosLineEnds; + CheckBox* m_pIgnoreCurrency; FixedText* m_pBooleanComprisonModeLabel; ListBox* m_pBooleanComprisonMode; File [changed]: dsitems.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/dsitems.hxx?r1=1.22&r2=1.22.128.1 Delta lines: +5 -4 ------------------- --- dsitems.hxx 2006-12-13 16:51:20+0000 1.22 +++ dsitems.hxx 2007-11-06 09:21:01+0000 1.22.128.1 @@ -4,9 +4,9 @@ * * $RCSfile: dsitems.hxx,v $ * - * $Revision: 1.22 $ + * $Revision: 1.22.128.1 $ * - * last change: $Author: kz $ $Date: 2006/12/13 16:51:20 $ + * last change: $Author: oj $ $Date: 2007/11/06 09:21:01 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -92,13 +92,14 @@ #define DSID_DOSLINEENDS 51 #define DSID_DATABASENAME 52 #define DSID_AS_BEFORE_CORRNAME 53 +#define DSID_IGNORECURRENCY 54 //======================================================================== //= item range. Adjust this if you introduce new items above #define DSID_FIRST_ITEM_ID DSID_NAME -#define DSID_LAST_ITEM_ID DSID_AS_BEFORE_CORRNAME +#define DSID_LAST_ITEM_ID DSID_IGNORECURRENCY #endif // _DBAUI_DATASOURCEITEMS_HXX_ --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
