Tag: cws_src680_mysqlnative User: oj Date: 2008-06-03 11:43:43+0000 Modified: dba/dbaccess/source/core/api/SingleSelectQueryComposer.cxx dba/dbaccess/source/core/dataaccess/ModelImpl.cxx dba/dbaccess/source/filter/xml/xmlExport.cxx dba/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc dba/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx dba/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx dba/dbaccess/source/ui/dlg/DbAdminImpl.cxx dba/dbaccess/source/ui/dlg/DriverSettings.cxx dba/dbaccess/source/ui/dlg/dbadmin.cxx 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: #i20563# socket impl File Changes: Directory: /dba/dbaccess/source/core/api/ ========================================= File [changed]: SingleSelectQueryComposer.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/SingleSelectQueryComposer.cxx?r1=1.27&r2=1.27.24.1 Delta lines: +5 -4 ------------------- --- SingleSelectQueryComposer.cxx 2008-04-10 12:28:25+0000 1.27 +++ SingleSelectQueryComposer.cxx 2008-06-03 11:43:38+0000 1.27.24.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: SingleSelectQueryComposer.cxx,v $ - * $Revision: 1.27 $ + * $Revision: 1.27.24.1 $ * * This file is part of OpenOffice.org. * @@ -721,13 +721,14 @@ break; Reference< XResultSetMetaData > xResultSetMeta; + Reference< XResultSetMetaDataSupplier > xResMetaDataSup; try { xStatement.reset( Reference< XStatement >( m_xConnection->createStatement(), UNO_QUERY_THROW ) ); Reference< XPropertySet > xStatementProps( xStatement, UNO_QUERY_THROW ); try { xStatementProps->setPropertyValue( PROPERTY_ESCAPE_PROCESSING, makeAny( sal_False ) ); } catch ( const Exception& ) { DBG_UNHANDLED_EXCEPTION(); } - Reference< XResultSetMetaDataSupplier > xResMetaDataSup( xStatement->executeQuery( sSql ), UNO_QUERY_THROW ); + xResMetaDataSup.set( xStatement->executeQuery( sSql ), UNO_QUERY_THROW ); xResultSetMeta.set( xResMetaDataSup->getMetaData(), UNO_QUERY_THROW ); } catch( const Exception& ) { } @@ -735,7 +736,7 @@ if ( !xResultSetMeta.is() ) { xPreparedStatement.set( m_xConnection->prepareStatement( sSql ), UNO_QUERY_THROW ); - Reference< XResultSetMetaDataSupplier > xResMetaDataSup( xPreparedStatement, UNO_QUERY_THROW ); + xResMetaDataSup.set( xPreparedStatement, UNO_QUERY_THROW ); xResultSetMeta.set( xResMetaDataSup->getMetaData(), UNO_QUERY_THROW ); } Directory: /dba/dbaccess/source/core/dataaccess/ ================================================ File [changed]: ModelImpl.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/ModelImpl.cxx?r1=1.27&r2=1.27.14.1 Delta lines: +3 -2 ------------------- --- ModelImpl.cxx 2008-04-15 10:22:34+0000 1.27 +++ ModelImpl.cxx 2008-06-03 11:43:39+0000 1.27.14.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: ModelImpl.cxx,v $ - * $Revision: 1.27 $ + * $Revision: 1.27.14.1 $ * * This file is part of OpenOffice.org. * @@ -1042,6 +1042,7 @@ AsciiPropertyValue( "EscapeDateTime", makeAny( (sal_Bool)sal_True ) ), AsciiPropertyValue( "IgnoreCurrency", makeAny( (sal_Bool)sal_False ) ), AsciiPropertyValue( "TypeInfoSettings", makeAny( Sequence< Any >()) ), + AsciiPropertyValue( "LocalSocket", makeAny( ::rtl::OUString() ) ), AsciiPropertyValue( NULL, Any() ) }; Directory: /dba/dbaccess/source/filter/xml/ =========================================== File [changed]: xmlExport.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/filter/xml/xmlExport.cxx?r1=1.20&r2=1.20.24.1 Delta lines: +18 -2 -------------------- --- xmlExport.cxx 2008-04-10 13:29:28+0000 1.20 +++ xmlExport.cxx 2008-06-03 11:43:39+0000 1.20.24.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: xmlExport.cxx,v $ - * $Revision: 1.20 $ + * $Revision: 1.20.24.1 $ * * This file is part of OpenOffice.org. * @@ -656,6 +656,22 @@ AddAttribute(XML_NAMESPACE_DB,XML_PORT,::rtl::OUString::valueOf(nPort)); if ( sDatabaseName.Len() ) AddAttribute(XML_NAMESPACE_DB,XML_DATABASE_NAME,sDatabaseName); + + Reference< XPropertySet > xDataSourceSettings; + OSL_VERIFY( xProp->getPropertyValue( PROPERTY_SETTINGS ) >>= xDataSourceSettings ); + Reference< XPropertyState > xSettingsState( xDataSourceSettings, UNO_QUERY ); + Reference< XPropertySetInfo > xSettingsInfo; + if ( xDataSourceSettings.is() ) + xSettingsInfo = xDataSourceSettings->getPropertySetInfo(); + static const ::rtl::OUString s_sLocalSocket(RTL_CONSTASCII_USTRINGPARAM("LocalSocket")); + if ( xSettingsInfo.is() && xSettingsInfo->hasPropertyByName(s_sLocalSocket) ) + { + ::rtl::OUString sValue; + if ( ( xDataSourceSettings->getPropertyValue(s_sLocalSocket) >>= sValue ) && sValue.getLength() ) + AddAttribute(XML_NAMESPACE_DB,XML_LOCAL_SOCKET,sValue); + + } + SvXMLElementExport aServerDB(*this,XML_NAMESPACE_DB, XML_SERVER_DATABASE, sal_True, sal_True); } } Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: AutoControls_tmpl.hrc Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc?r1=1.11&r2=1.11.24.1 Delta lines: +26 -3 -------------------- --- AutoControls_tmpl.hrc 2008-04-10 14:26:41+0000 1.11 +++ AutoControls_tmpl.hrc 2008-06-03 11:43:39+0000 1.11.24.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: AutoControls_tmpl.hrc,v $ - * $Revision: 1.11 $ + * $Revision: 1.11.24.1 $ * * This file is part of OpenOffice.org. * @@ -69,6 +69,7 @@ #define FT_AUTOEXTENSIONHEADER 93 #define FT_AUTOOWNEXTENSIONAPPENDIX 94 #define FT_CHARSET 95 +#define FT_SOCKET 96 #define FL_AUTOSEPARATOR2 80 #define FL_DATACONVERT 81 @@ -92,6 +93,7 @@ #define ET_AUTOBROWSEURL 83 #define ET_AUTOJDBCDRIVERCLASS 84 #define ET_AUTOOWNEXTENSION 85 +#define ET_SOCKET 86 #define RB_AUTOACCESSCTEXTFILES 80 #define RB_AUTOACCESSCCSVFILES 81 @@ -490,12 +492,33 @@ // -------------------------------------------------------------------------------------------------- +#define AUTO_SOCKETCONTROLGROUP(AUTO_Y) \ + FixedText FT_SOCKET \ + { \ + Pos = MAP_APPFONT (START_X , AUTO_Y +2) ; \ + Size = MAP_APPFONT ( EDIT_X - START_X - UNRELATED_CONTROLS , FIXEDTEXT_HEIGHT ) ; \ + Text = "Socket" ; \ + Hide = TRUE ; \ + }; \ + \ + Edit ET_SOCKET \ + { \ + Pos = MAP_APPFONT (EDIT_X, AUTO_Y ) ; \ + Size = MAP_APPFONT ( 60, EDIT_HEIGHT ) ; \ + TabStop = TRUE ; \ + Hide = TRUE ; \ + Border = TRUE ; \ + }; + #define AUTOHELP_JDBCCONTROLGROUP(AUTO_HID) \ AUTO_HELP_NAMECONTROLGROUP(6, AUTO_HID ) \ AUTO_HOSTCONTROLGROUP(96, AUTO_HID + 1) \ AUTO_PORTCONTROLGROUP(113, AUTO_HID + 2 ) \ - AUTO_JDBCDRIVERCLASSGROUP(129, AUTO_HID + 3) + AUTO_SOCKETCONTROLGROUP(129) \ + AUTO_JDBCDRIVERCLASSGROUP(146, AUTO_HID + 3) + + // -------------------------------------------------------------------------------------------------- File [changed]: DBSetupConnectionPages.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx?r1=1.18&r2=1.18.24.1 Delta lines: +35 -7 -------------------- --- DBSetupConnectionPages.cxx 2008-04-10 14:30:54+0000 1.18 +++ DBSetupConnectionPages.cxx 2008-06-03 11:43:39+0000 1.18.24.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: DBSetupConnectionPages.cxx,v $ - * $Revision: 1.18 $ + * $Revision: 1.18.24.1 $ * * This file is part of OpenOffice.org. * @@ -96,7 +96,8 @@ #ifndef _COM_SUN_STAR_TASK_XINTERACTIONHANDLER_HPP_ #include <com/sun/star/task/XInteractionHandler.hpp> #endif - +#include <com/sun/star/sdbc/XDriverAccess.hpp> +#include "dbustrings.hrc" #ifndef SVTOOLS_FILENOTATION_HXX_ #include <svtools/filenotation.hxx> #endif @@ -138,7 +139,7 @@ namespace dbaui { //......................................................................... -// using namespace ::com::sun::star::uno; +using namespace ::com::sun::star; // using namespace ::com::sun::star::ucb; // using namespace ::com::sun::star::ui::dialogs; // using namespace ::com::sun::star::sdbc; @@ -252,7 +253,6 @@ ,m_aNFPortNumber (this, ModuleRes(NF_AUTOPORTNUMBER)) ,m_aFTDefaultPortNumber (this, ModuleRes(FT_AUTOPORTNUMBERDEFAULT)) ,m_aCBUseSSL (this, ModuleRes(CB_WIZ_USESSL)) - { SetControlFontWeight(&m_aFTHeaderText); m_aFTDefaultPortNumber.SetText(String(ModuleRes(STR_LDAP_DEFAULT))); @@ -365,6 +365,7 @@ SetControlFontWeight(&m_aFT_Headertext); m_aRB_JDBCDatabase.SetToggleHdl(LINK(this, OMySQLIntroPageSetup, OnSetupModeSelected)); + m_aRB_NATIVEDatabase.SetToggleHdl(LINK(this, OMySQLIntroPageSetup, OnSetupModeSelected)); m_aRB_JDBCDatabase.SetState(sal_True); FreeResource(); } @@ -384,9 +385,22 @@ // ----------------------------------------------------------------------- - void OMySQLIntroPageSetup::implInitControls(const SfxItemSet& /*_rSet*/, sal_Bool /*_bSaveValue*/) + void OMySQLIntroPageSetup::implInitControls(const SfxItemSet& _rSet, sal_Bool /*_bSaveValue*/) { - + DbuTypeCollectionItem* pCollectionItem = PTR_CAST(DbuTypeCollectionItem, _rSet.GetItem(DSID_TYPECOLLECTION)); + ODsnTypeCollection* pCollection = NULL; + if (pCollectionItem) + { + pCollection = pCollectionItem->getCollection(); + String sUrl = pCollection->getDatasourcePrefix(DST_MYSQL_NATIVE); + uno::Reference< sdbc::XDriverAccess > xDriverManager( m_xORB->createInstance( SERVICE_SDBC_DRIVERMANAGER ), uno::UNO_QUERY ); + if ( xDriverManager.is() && xDriverManager->getDriverByURL( sUrl ).is() ) + { + m_aRB_NATIVEDatabase.Show(); + m_aRB_JDBCDatabase.SetState(sal_False); + m_aRB_NATIVEDatabase.SetState(sal_True); + } + } } @@ -478,6 +492,8 @@ ,m_aFTPortNumber (this, ModuleRes(FT_AUTOPORTNUMBER)) ,m_aFTDefaultPortNumber (this, ModuleRes(FT_AUTOPORTNUMBERDEFAULT)) ,m_aNFPortNumber (this, ModuleRes(NF_AUTOPORTNUMBER)) + ,m_aFTSocket (this, ModuleRes(FT_SOCKET)) + ,m_aETSocket (this, ModuleRes(ET_SOCKET)) ,m_aFTDriverClass (this, ModuleRes(FT_AUTOJDBCDRIVERCLASS)) ,m_aETDriverClass (this, ModuleRes(ET_AUTOJDBCDRIVERCLASS)) ,m_aPBTestJavaDriver (this, ModuleRes(PB_AUTOTESTDRIVERCLASS)) @@ -493,6 +509,10 @@ m_aPBTestJavaDriver.Show(FALSE); m_aETDriverClass.Show(FALSE); } + + m_aFTSocket.Show(_nResId == PAGE_DBWIZARD_MYSQL_NATIVE && !m_bUseClass); + m_aETSocket.Show(_nResId == PAGE_DBWIZARD_MYSQL_NATIVE && !m_bUseClass); + m_aFTDefaultPortNumber.SetText(String(ModuleRes(_nDefaultPortResId))); String sHelpText = String(ModuleRes(_nHelpTextResId)); m_aFTHelpText.SetText(sHelpText); @@ -502,6 +522,7 @@ m_aETDatabasename.SetModifyHdl(getControlModifiedLink()); m_aETHostname.SetModifyHdl(getControlModifiedLink()); m_aNFPortNumber.SetModifyHdl(getControlModifiedLink()); + m_aETSocket.SetModifyHdl(getControlModifiedLink()); if ( m_bUseClass ) { @@ -524,6 +545,7 @@ _rControlList.push_back(new OSaveValueWrapper<Edit>(&m_aETDriverClass)); _rControlList.push_back(new OSaveValueWrapper<Edit>(&m_aETHostname)); _rControlList.push_back(new OSaveValueWrapper<NumericField>(&m_aNFPortNumber)); + _rControlList.push_back(new OSaveValueWrapper<Edit>(&m_aETSocket)); } // ----------------------------------------------------------------------- void OGeneralSpecialJDBCConnectionPageSetup::fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) @@ -533,6 +555,7 @@ _rControlList.push_back(new ODisableWrapper<FixedText>(&m_aFTHostname)); _rControlList.push_back(new ODisableWrapper<FixedText>(&m_aFTPortNumber)); _rControlList.push_back(new ODisableWrapper<FixedText>(&m_aFTDefaultPortNumber)); + _rControlList.push_back(new ODisableWrapper<FixedText>(&m_aFTSocket)); if ( m_bUseClass ) _rControlList.push_back(new ODisableWrapper<FixedText>(&m_aFTDriverClass)); } @@ -546,6 +569,7 @@ fillString(_rSet,&m_aETHostname,DSID_CONN_HOSTNAME,bChangedSomething); fillString(_rSet,&m_aETDatabasename,DSID_DATABASENAME,bChangedSomething); fillInt32(_rSet,&m_aNFPortNumber,m_nPortId,bChangedSomething ); + fillString(_rSet,&m_aETSocket,DSID_CONN_SOCKET,bChangedSomething); return bChangedSomething; } @@ -562,6 +586,7 @@ SFX_ITEMSET_GET(_rSet, pHostName, SfxStringItem, DSID_CONN_HOSTNAME, sal_True); SFX_ITEMSET_GET(_rSet, pPortNumber, SfxInt32Item, m_nPortId, sal_True); + SFX_ITEMSET_GET(_rSet, pSocket, SfxStringItem, DSID_CONN_SOCKET, sal_True); if ( bValid ) { @@ -576,6 +601,9 @@ m_aNFPortNumber.SetValue(pPortNumber->GetValue()); m_aNFPortNumber.ClearModifyFlag(); + + m_aETSocket.SetText(pSocket->GetValue()); + m_aETSocket.ClearModifyFlag(); } OGenericAdministrationPage::implInitControls(_rSet, _bSaveValue); File [changed]: DBSetupConnectionPages.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx?r1=1.8&r2=1.8.24.1 Delta lines: +5 -2 ------------------- --- DBSetupConnectionPages.hxx 2008-04-10 14:31:25+0000 1.8 +++ DBSetupConnectionPages.hxx 2008-06-03 11:43:39+0000 1.8.24.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: DBSetupConnectionPages.hxx,v $ - * $Revision: 1.8 $ + * $Revision: 1.8.24.1 $ * * This file is part of OpenOffice.org. * @@ -181,6 +181,9 @@ FixedText m_aFTPortNumber; FixedText m_aFTDefaultPortNumber; NumericField m_aNFPortNumber; + FixedText m_aFTSocket; + Edit m_aETSocket; + FixedText m_aFTDriverClass; Edit m_aETDriverClass; File [changed]: DbAdminImpl.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/DbAdminImpl.cxx?r1=1.24&r2=1.24.24.1 Delta lines: +3 -2 ------------------- --- DbAdminImpl.cxx 2008-04-10 14:32:33+0000 1.24 +++ DbAdminImpl.cxx 2008-06-03 11:43:39+0000 1.24.24.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: DbAdminImpl.cxx,v $ - * $Revision: 1.24 $ + * $Revision: 1.24.24.1 $ * * This file is part of OpenOffice.org. * @@ -237,6 +237,7 @@ m_aIndirectPropTranslator.insert(MapInt2String::value_type(DSID_SCHEMA, PROPERTY_USESCHEMAINSELECT)); m_aIndirectPropTranslator.insert(MapInt2String::value_type(DSID_INDEXAPPENDIX, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AddIndexAppendix")))); m_aIndirectPropTranslator.insert(MapInt2String::value_type(DSID_DOSLINEENDS, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PreferDosLikeLineEnds" ) ) ) ); + m_aIndirectPropTranslator.insert(MapInt2String::value_type(DSID_CONN_SOCKET, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LocalSocket" ) ) ) ); // special settings for adabas m_aIndirectPropTranslator.insert(MapInt2String::value_type(DSID_CONN_SHUTSERVICE, ::rtl::OUString::createFromAscii("ShutdownDatabase"))); File [changed]: DriverSettings.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/DriverSettings.cxx?r1=1.16&r2=1.16.24.1 Delta lines: +3 -2 ------------------- --- DriverSettings.cxx 2008-04-10 14:33:14+0000 1.16 +++ DriverSettings.cxx 2008-06-03 11:43:40+0000 1.16.24.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: DriverSettings.cxx,v $ - * $Revision: 1.16 $ + * $Revision: 1.16.24.1 $ * * This file is part of OpenOffice.org. * @@ -104,6 +104,7 @@ case DST_MYSQL_NATIVE: _out_rDetailsIds.push_back(DSID_CHARSET); + _out_rDetailsIds.push_back(DSID_CONN_SOCKET); break; case DST_MYSQL_JDBC: _out_rDetailsIds.push_back(DSID_CHARSET); File [changed]: dbadmin.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/dbadmin.cxx?r1=1.107&r2=1.107.24.1 Delta lines: +4 -2 ------------------- --- dbadmin.cxx 2008-04-10 14:44:26+0000 1.107 +++ dbadmin.cxx 2008-06-03 11:43:40+0000 1.107.24.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: dbadmin.cxx,v $ - * $Revision: 1.107 $ + * $Revision: 1.107.24.1 $ * * This file is part of OpenOffice.org. * @@ -461,6 +461,7 @@ *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); + *pCounter++ = new SfxStringItem(DSID_CONN_SOCKET, String()); // 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]: dbadmin.src Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/dbadmin.src?r1=1.159&r2=1.159.24.1 Delta lines: +13 -12 --------------------- --- dbadmin.src 2008-04-10 14:45:07+0000 1.159 +++ dbadmin.src 2008-06-03 11:43:40+0000 1.159.24.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: dbadmin.src,v $ - * $Revision: 1.159 $ + * $Revision: 1.159.24.1 $ * * This file is part of OpenOffice.org. * @@ -533,16 +533,17 @@ Hide = TRUE; AUTO_SPECIAL_JDBC( UNRELATED_CONTROLS ) + AUTO_SOCKETCONTROLGROUP(3*UNRELATED_CONTROLS + RELATED_CONTROLS + 3*FIXEDTEXT_HEIGHT) FixedText FT_JDBCDRIVERCLASS { - Pos = MAP_APPFONT ( 6 , 3*UNRELATED_CONTROLS + RELATED_CONTROLS + 3*FIXEDTEXT_HEIGHT) ; + Pos = MAP_APPFONT ( 6 , 4*UNRELATED_CONTROLS + RELATED_CONTROLS + 4*FIXEDTEXT_HEIGHT + EDIT_HEIGHT) ; Size = MAP_APPFONT ( EDIT_X - 7 , FIXEDTEXT_HEIGHT ) ; Text[ en-US ] = "MySQL JDBC d~river class"; }; Edit ET_JDBCDRIVERCLASS { - Pos = MAP_APPFONT ( EDIT_X , 3*UNRELATED_CONTROLS + RELATED_CONTROLS + 3*FIXEDTEXT_HEIGHT -1 ) ; + Pos = MAP_APPFONT ( EDIT_X , 4*UNRELATED_CONTROLS + RELATED_CONTROLS + 3*FIXEDTEXT_HEIGHT -1 + EDIT_HEIGHT) ; Size = MAP_APPFONT ( 97 , EDIT_HEIGHT ) ; TabStop = TRUE ; Border = TRUE ; @@ -550,12 +551,12 @@ PushButton PB_TESTDRIVERCLASS { TabStop = TRUE ; - Pos = MAP_APPFONT ( PAGE_X - BUTTON_WIDTH - UNRELATED_CONTROLS , 3*UNRELATED_CONTROLS + RELATED_CONTROLS + 3*FIXEDTEXT_HEIGHT -2) ; + Pos = MAP_APPFONT ( PAGE_X - BUTTON_WIDTH - UNRELATED_CONTROLS , 4*UNRELATED_CONTROLS + RELATED_CONTROLS + 3*FIXEDTEXT_HEIGHT -2 + EDIT_HEIGHT) ; Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ; Text [ en-US ] = "Test class" ; }; - AUTO_CHARSET( 4*UNRELATED_CONTROLS + RELATED_CONTROLS + 4*FIXEDTEXT_HEIGHT, PAGE_X ) + AUTO_CHARSET( 5*UNRELATED_CONTROLS + RELATED_CONTROLS + 4*FIXEDTEXT_HEIGHT+ EDIT_HEIGHT, PAGE_X ) }; TabPage PAGE_ORACLE_JDBC @@ -567,30 +568,30 @@ AUTO_SPECIAL_JDBC( UNRELATED_CONTROLS ) + AUTO_SOCKETCONTROLGROUP(3*UNRELATED_CONTROLS + RELATED_CONTROLS + 3*FIXEDTEXT_HEIGHT) + FixedText FT_JDBCDRIVERCLASS { - Pos = MAP_APPFONT ( 6 , 3*UNRELATED_CONTROLS + RELATED_CONTROLS + 3*FIXEDTEXT_HEIGHT) ; + Pos = MAP_APPFONT ( 6 , 4*UNRELATED_CONTROLS + RELATED_CONTROLS + 4*FIXEDTEXT_HEIGHT + EDIT_HEIGHT) ; Size = MAP_APPFONT ( EDIT_X - 7 , FIXEDTEXT_HEIGHT ) ; Text[ en-US ] = "Oracle JDBC d~river class"; }; - Edit ET_JDBCDRIVERCLASS { - Pos = MAP_APPFONT ( EDIT_X , 3*UNRELATED_CONTROLS + RELATED_CONTROLS + 3*FIXEDTEXT_HEIGHT -1 ) ; + Pos = MAP_APPFONT ( EDIT_X , 4*UNRELATED_CONTROLS + RELATED_CONTROLS + 3*FIXEDTEXT_HEIGHT -1 + EDIT_HEIGHT) ; Size = MAP_APPFONT ( 97 , EDIT_HEIGHT ) ; TabStop = TRUE ; Border = TRUE ; }; - PushButton PB_TESTDRIVERCLASS { TabStop = TRUE ; - Pos = MAP_APPFONT ( PAGE_X - BUTTON_WIDTH - UNRELATED_CONTROLS , 3*UNRELATED_CONTROLS + RELATED_CONTROLS + 3*FIXEDTEXT_HEIGHT - 2) ; + Pos = MAP_APPFONT ( PAGE_X - BUTTON_WIDTH - UNRELATED_CONTROLS , 4*UNRELATED_CONTROLS + RELATED_CONTROLS + 3*FIXEDTEXT_HEIGHT -2 + EDIT_HEIGHT) ; Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ; Text [ en-US ] = "Test class" ; }; - AUTO_CHARSET( 4*UNRELATED_CONTROLS + RELATED_CONTROLS + 4*FIXEDTEXT_HEIGHT, PAGE_X ) + AUTO_CHARSET( 5*UNRELATED_CONTROLS + RELATED_CONTROLS + 4*FIXEDTEXT_HEIGHT+ EDIT_HEIGHT, PAGE_X ) }; //......................................................................... File [changed]: detailpages.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/detailpages.cxx?r1=1.52&r2=1.52.24.1 Delta lines: +19 -12 --------------------- --- detailpages.cxx 2008-04-10 14:48:18+0000 1.52 +++ detailpages.cxx 2008-06-03 11:43:40+0000 1.52.24.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: detailpages.cxx,v $ - * $Revision: 1.52 $ + * $Revision: 1.52.24.1 $ * * This file is part of OpenOffice.org. * @@ -534,6 +534,8 @@ ,m_aEDHostname (this, ModuleRes(ET_HOSTNAME)) ,m_aPortNumber (this, ModuleRes(FT_PORTNUMBER)) ,m_aNFPortNumber (this, ModuleRes(NF_PORTNUMBER)) + ,m_aFTSocket (this, ModuleRes(FT_SOCKET)) + ,m_aEDSocket (this, ModuleRes(ET_SOCKET)) ,m_aFTDriverClass (this, ModuleRes(FT_JDBCDRIVERCLASS)) ,m_aEDDriverClass (this, ModuleRes(ET_JDBCDRIVERCLASS)) ,m_aTestJavaDriver (this, ModuleRes(PB_TESTDRIVERCLASS)) @@ -543,6 +545,9 @@ if ( _pDriverName != NULL ) { m_aEDDriverClass.SetModifyHdl(getControlModifiedLink()); + m_aEDDriverClass.SetModifyHdl(LINK(this, OGeneralSpecialJDBCDetailsPage, OnEditModified)); + m_aTestJavaDriver.SetClickHdl(LINK(this,OGeneralSpecialJDBCDetailsPage,OnTestJavaClickHdl)); + m_sDefaultJdbcDriverName = String::CreateFromAscii(_pDriverName); } else { @@ -552,20 +557,18 @@ m_aTestJavaDriver.Show(FALSE); } + m_aFTSocket.Show(PAGE_MYSQL_JDBC == _nResId && !m_bUseClass); + m_aEDSocket.Show(PAGE_MYSQL_JDBC == _nResId && !m_bUseClass); + m_aEDHostname.SetModifyHdl(getControlModifiedLink()); m_aNFPortNumber.SetModifyHdl(getControlModifiedLink()); - - if ( m_bUseClass ) - { - m_aEDDriverClass.SetModifyHdl(LINK(this, OGeneralSpecialJDBCDetailsPage, OnEditModified)); - m_aTestJavaDriver.SetClickHdl(LINK(this,OGeneralSpecialJDBCDetailsPage,OnTestJavaClickHdl)); - } + m_aEDSocket.SetModifyHdl(getControlModifiedLink()); // #98982# OJ m_aNFPortNumber.SetUseThousandSep(sal_False); Window* pWindows[] = { &m_aFTHostname,&m_aEDHostname, - &m_aPortNumber,&m_aNFPortNumber, + &m_aPortNumber,&m_aNFPortNumber,&m_aFTSocket,&m_aEDSocket, &m_aFTDriverClass, &m_aEDDriverClass,&m_aTestJavaDriver, m_pCharsetLabel, m_pCharset}; @@ -574,9 +577,6 @@ pWindows[i]->SetZOrder(pWindows[i-1], WINDOW_ZORDER_BEHIND); FreeResource(); - - if ( m_bUseClass ) - m_sDefaultJdbcDriverName = String::CreateFromAscii(_pDriverName); } // ----------------------------------------------------------------------- @@ -587,6 +587,7 @@ _rControlList.push_back(new OSaveValueWrapper<Edit>(&m_aEDDriverClass)); _rControlList.push_back(new OSaveValueWrapper<Edit>(&m_aEDHostname)); _rControlList.push_back(new OSaveValueWrapper<NumericField>(&m_aNFPortNumber)); + _rControlList.push_back(new OSaveValueWrapper<Edit>(&m_aEDSocket)); } // ----------------------------------------------------------------------- void OGeneralSpecialJDBCDetailsPage::fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) @@ -594,6 +595,7 @@ OCommonBehaviourTabPage::fillWindows(_rControlList); _rControlList.push_back(new ODisableWrapper<FixedText>(&m_aFTHostname)); _rControlList.push_back(new ODisableWrapper<FixedText>(&m_aPortNumber)); + _rControlList.push_back(new ODisableWrapper<FixedText>(&m_aFTSocket)); if ( m_bUseClass ) _rControlList.push_back(new ODisableWrapper<FixedText>(&m_aFTDriverClass)); _rControlList.push_back(new ODisableWrapper<FixedLine>(&m_aFL_1)); @@ -606,6 +608,7 @@ if ( m_bUseClass ) fillString(_rSet,&m_aEDDriverClass,DSID_JDBCDRIVERCLASS,bChangedSomething); fillString(_rSet,&m_aEDHostname,DSID_CONN_HOSTNAME,bChangedSomething); + fillString(_rSet,&m_aEDSocket,DSID_CONN_SOCKET,bChangedSomething); fillInt32(_rSet,&m_aNFPortNumber,m_nPortId,bChangedSomething ); return bChangedSomething; @@ -620,6 +623,7 @@ SFX_ITEMSET_GET(_rSet, pDrvItem, SfxStringItem, DSID_JDBCDRIVERCLASS, sal_True); SFX_ITEMSET_GET(_rSet, pHostName, SfxStringItem, DSID_CONN_HOSTNAME, sal_True); SFX_ITEMSET_GET(_rSet, pPortNumber, SfxInt32Item, m_nPortId, sal_True); + SFX_ITEMSET_GET(_rSet, pSocket, SfxStringItem, DSID_CONN_SOCKET, sal_True); if ( bValid ) { @@ -634,6 +638,9 @@ m_aNFPortNumber.SetValue(pPortNumber->GetValue()); m_aNFPortNumber.ClearModifyFlag(); + + m_aEDSocket.SetText(pSocket->GetValue()); + m_aEDSocket.ClearModifyFlag(); } OCommonBehaviourTabPage::implInitControls(_rSet, _bSaveValue); File [changed]: detailpages.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/detailpages.hxx?r1=1.30&r2=1.30.24.1 Delta lines: +4 -2 ------------------- --- detailpages.hxx 2008-04-10 14:48:49+0000 1.30 +++ detailpages.hxx 2008-06-03 11:43:40+0000 1.30.24.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: detailpages.hxx,v $ - * $Revision: 1.30 $ + * $Revision: 1.30.24.1 $ * * This file is part of OpenOffice.org. * @@ -238,6 +238,8 @@ Edit m_aEDHostname; FixedText m_aPortNumber; NumericField m_aNFPortNumber; + FixedText m_aFTSocket; + Edit m_aEDSocket; FixedText m_aFTDriverClass; Edit m_aEDDriverClass; File [changed]: dsitems.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/dsitems.hxx?r1=1.25&r2=1.25.24.1 Delta lines: +4 -3 ------------------- --- dsitems.hxx 2008-04-10 14:52:38+0000 1.25 +++ dsitems.hxx 2008-06-03 11:43:40+0000 1.25.24.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: dsitems.hxx,v $ - * $Revision: 1.25 $ + * $Revision: 1.25.24.1 $ * * This file is part of OpenOffice.org. * @@ -89,6 +89,7 @@ #define DSID_AS_BEFORE_CORRNAME 53 #define DSID_CHECK_REQUIRED_FIELDS 54 #define DSID_IGNORECURRENCY 55 +#define DSID_CONN_SOCKET 56 // don't forget to adjust DSID_LAST_ITEM_ID below! @@ -96,7 +97,7 @@ //= item range. Adjust this if you introduce new items above #define DSID_FIRST_ITEM_ID DSID_NAME -#define DSID_LAST_ITEM_ID DSID_IGNORECURRENCY +#define DSID_LAST_ITEM_ID DSID_CONN_SOCKET #endif // _DBAUI_DATASOURCEITEMS_HXX_ --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
