User: hr Date: 06/06/19 20:01:46 Modified: /dba/dbaccess/source/ui/dlg/ ConnectionHelper.cxx
Log: INTEGRATION: CWS warnings01 (1.8.70); FILE MERGED 2006/05/23 23:50:34 sb 1.8.70.2: RESYNC: (1.8-1.9); FILE MERGED 2006/03/24 15:36:08 fs 1.8.70.1: #i57457# warning-free code (unxlngi6/.pro + unxsoli4.pro) 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.9&r2=1.10 Delta lines: +24 -20 --------------------- --- ConnectionHelper.cxx 4 May 2006 08:40:18 -0000 1.9 +++ ConnectionHelper.cxx 20 Jun 2006 03:01:43 -0000 1.10 @@ -148,6 +148,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 @@ -251,7 +254,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 ) @@ -336,36 +339,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; } @@ -462,7 +465,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(); @@ -486,6 +489,8 @@ break; } } + default: + break; } checkTestConnection(); @@ -891,10 +896,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]
