Tag: cws_src680_dba24 User: oj Date: 05/02/04 03:06:28 Modified: /dba/dbaccess/source/ui/dlg/ DBSetupConnectionPages.hxx, DBSetupConnectionPages.cxx
Log: #i41980# fix ldap url File Changes: Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: DBSetupConnectionPages.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx?r1=1.2&r2=1.2.48.1 Delta lines: +3 -4 ------------------- --- DBSetupConnectionPages.hxx 27 Oct 2004 12:59:22 -0000 1.2 +++ DBSetupConnectionPages.hxx 4 Feb 2005 11:06:25 -0000 1.2.48.1 @@ -102,7 +102,6 @@ class OSpreadSheetConnectionPageSetup : public OConnectionTabPageSetup { public: - virtual BOOL FillItemSet ( SfxItemSet& _rCoreAttrs ); static OGenericAdministrationPage* CreateSpreadSheetTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); OSpreadSheetConnectionPageSetup(Window* pParent, const SfxItemSet& _rCoreAttrs); File [changed]: DBSetupConnectionPages.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx?r1=1.2.48.1&r2=1.2.48.2 Delta lines: +17 -18 --------------------- --- DBSetupConnectionPages.cxx 1 Feb 2005 06:27:25 -0000 1.2.48.1 +++ DBSetupConnectionPages.cxx 4 Feb 2005 11:06:25 -0000 1.2.48.2 @@ -313,7 +313,22 @@ sal_Bool bChangedSomething = sal_False; fillString(_rSet,&m_aETBaseDN,DSID_CONN_LDAP_BASEDN, bChangedSomething); fillInt32(_rSet,&m_aNFPortNumber,DSID_CONN_LDAP_PORTNUMBER,bChangedSomething); - fillString(_rSet,&m_aETHostServer, DSID_CONNECTURL, bChangedSomething); + + if ( m_aETHostServer.GetText() != m_aETHostServer.GetSavedValue() ) + { + DbuTypeCollectionItem* pCollectionItem = PTR_CAST(DbuTypeCollectionItem, _rSet.GetItem(DSID_TYPECOLLECTION)); + ODsnTypeCollection* pCollection = NULL; + if (pCollectionItem) + pCollection = pCollectionItem->getCollection(); + DBG_ASSERT(pCollection, "OLDAPConnectionPageSetup::FillItemSet : really need a DSN type collection !"); + + String sUrl = pCollection->getDatasourcePrefix(DST_LDAP); + sUrl += m_aETHostServer.GetText(); + _rSet.Put(SfxStringItem(DSID_CONNECTURL, sUrl)); + bChangedSomething = sal_True; + } + + // fillString(_rSet,&m_aETHostServer, DSID_CONNECTURL, bChangedSomething); fillBool(_rSet,&m_aCBUseSSL,DSID_CONN_LDAP_USESSL,bChangedSomething); return bChangedSomething; } @@ -416,18 +431,7 @@ BOOL OMySQLIntroPageSetup::FillItemSet(SfxItemSet& _rSet) { - ODsnTypeCollection*pCollection = NULL; - sal_Bool bChangedSomething = sal_False; - DbuTypeCollectionItem* pCollectionItem = PTR_CAST(DbuTypeCollectionItem, _rSet.GetItem(DSID_TYPECOLLECTION)); - if (pCollectionItem) - ODsnTypeCollection*pCollection = pCollectionItem->getCollection(); - DBG_ASSERT(pCollection, "OMySQLIntroPageSetup::FillItemSet : really need a DSN type collection !"); - - if (getMySQLMode() == 1) - _rSet.Put(SfxStringItem(DSID_CONNECTURL, pCollection->getDatasourcePrefix(DST_MYSQL_JDBC))); - else - _rSet.Put(SfxStringItem(DSID_CONNECTURL, pCollection->getDatasourcePrefix(DST_MYSQL_ODBC))); - bChangedSomething = sal_True; //????? + OSL_ENSURE(sal_False,"Who called me?! Please ask oj for more information."); return sal_True; } @@ -764,11 +768,6 @@ } // ----------------------------------------------------------------------- - sal_Bool OSpreadSheetConnectionPageSetup::FillItemSet( SfxItemSet& _rSet ) - { - sal_Bool bChangedSomething = OConnectionTabPageSetup::FillItemSet(_rSet); - return bChangedSomething; - } OGenericAdministrationPage* OAuthentificationPageSetup::CreateAuthentificationTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
