Tag: cws_src680_oj14 User: oj Date: 2006/07/04 00:53:46 Modified: dba/dbaccess/source/ui/dlg/ConnectionHelper.cxx
Log: RESYNC: (1.8-1.10); FILE MERGED File Changes: Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: ConnectionHelper.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/ConnectionHelper.cxx?r1=1.8.4.3&r2=1.8.4.4 Delta lines: +29 -25 --------------------- --- ConnectionHelper.cxx 25 Apr 2006 13:02:49 -0000 1.8.4.3 +++ ConnectionHelper.cxx 4 Jul 2006 07:53:44 -0000 1.8.4.4 @@ -145,6 +145,9 @@ #ifndef _URLOBJ_HXX #include <tools/urlobj.hxx> #endif +#ifndef TOOLS_DIAGNOSE_EX_H +#include <tools/diagnose_ex.h> +#endif #ifndef _SFX_DOCFILT_HACK_HXX #include <sfx2/docfilt.hxx> #endif @@ -226,7 +229,7 @@ m_aET_Connection.ShowPrefix(DST_JDBC == m_eType ); m_aPB_Connection.Show(sal_True); - OLocalResourceAccess aLocRes( PAGE_CONNECTION, RSC_TABPAGE ); + LocalResourceAccess aLocRes( PAGE_CONNECTION, RSC_TABPAGE ); m_aPB_Connection.Show(bEnableBrowseButton); @@ -248,7 +251,7 @@ // ----------------------------------------------------------------------- - IMPL_LINK(OConnectionHelper, OnBrowseConnections, PushButton*, _pButton) + IMPL_LINK(OConnectionHelper, OnBrowseConnections, PushButton*, /*_pButton*/) { OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF"); switch ( m_eType ) @@ -333,36 +336,36 @@ // collect the names of the installed databases StringBag aInstalledDBs; ::rtl::OUString sAdabasConfigDir,sAdabasWorkDir,sRootDir; - ::rtl::OUString sTemp(RTL_CONSTASCII_USTRINGPARAM("DBWORK")); + ::rtl::OUString sEnvVarName(RTL_CONSTASCII_USTRINGPARAM("DBWORK")); rtl_uString* pDbVar = NULL; - if(osl_getEnvironment(sTemp.pData,&pDbVar) == osl_Process_E_None && pDbVar) + if(osl_getEnvironment(sEnvVarName.pData,&pDbVar) == osl_Process_E_None && pDbVar) { sAdabasWorkDir = pDbVar; - String sTemp; - sal_Bool bOk = utl::LocalFileHelper::ConvertPhysicalNameToURL(sAdabasWorkDir,sTemp); - sAdabasWorkDir = sTemp; + String sURL; + utl::LocalFileHelper::ConvertPhysicalNameToURL(sAdabasWorkDir,sURL); + sAdabasWorkDir = sURL; rtl_uString_release(pDbVar); pDbVar = NULL; } - sTemp = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DBCONFIG")); - if(osl_getEnvironment(sTemp.pData,&pDbVar) == osl_Process_E_None && pDbVar) + sEnvVarName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DBCONFIG")); + if(osl_getEnvironment(sEnvVarName.pData,&pDbVar) == osl_Process_E_None && pDbVar) { sAdabasConfigDir = pDbVar; - String sTemp; - sal_Bool bOk = utl::LocalFileHelper::ConvertPhysicalNameToURL(sAdabasConfigDir,sTemp); - sAdabasConfigDir = sTemp; + String sURL; + utl::LocalFileHelper::ConvertPhysicalNameToURL(sAdabasConfigDir,sURL); + sAdabasConfigDir = sURL; rtl_uString_release(pDbVar); pDbVar = NULL; } - sTemp = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DBROOT")); - if(osl_getEnvironment(sTemp.pData,&pDbVar) == osl_Process_E_None && pDbVar) + sEnvVarName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DBROOT")); + if(osl_getEnvironment(sEnvVarName.pData,&pDbVar) == osl_Process_E_None && pDbVar) { sRootDir = pDbVar; - String sTemp; - sal_Bool bOk = utl::LocalFileHelper::ConvertPhysicalNameToURL(sRootDir,sTemp); - sRootDir = sTemp; + String sURL; + utl::LocalFileHelper::ConvertPhysicalNameToURL(sRootDir,sURL); + sRootDir = sURL; rtl_uString_release(pDbVar); pDbVar = NULL; } @@ -398,7 +401,7 @@ } else { - OLocalResourceAccess aLocRes( PAGE_CONNECTION, RSC_TABPAGE ); + LocalResourceAccess aLocRes( PAGE_CONNECTION, RSC_TABPAGE ); String sError = String(ResId(STR_NO_ADABASE_DATASOURCES)); ErrorBox aBox(this, WB_OK, sError); aBox.Execute(); @@ -459,7 +462,7 @@ // collect all Mozilla Profiles ::com::sun::star::uno::Sequence< ::rtl::OUString > list; - sal_Int32 length = xMozillaBootstrap->getProfileList(profileType,list); + xMozillaBootstrap->getProfileList( profileType, list ); const ::rtl::OUString * pArray = list.getConstArray(); sal_Int32 count = list.getLength(); @@ -483,6 +486,8 @@ break; } } + default: + break; } checkTestConnection(); @@ -888,10 +893,9 @@ return sal_False; } } - catch (const Exception& e) + catch ( const Exception& ) { - OSL_ENSURE( sal_False, "" ); - e; // make compiler happy + DBG_UNHANDLED_EXCEPTION(); return sal_False; } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
