User: obo Date: 06/03/29 04:19:00 Modified: /dba/connectivity/source/drivers/mozab/mozillasrc/ MNSMozabProxy.cxx
Log: INTEGRATION: CWS dba203a (1.5.42); FILE MERGED 2006/03/17 15:37:58 fs 1.5.42.1: #i60163# localized error messages File Changes: Directory: /dba/connectivity/source/drivers/mozab/mozillasrc/ ============================================================= File [changed]: MNSMozabProxy.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx?r1=1.5&r2=1.6 Delta lines: +6 -2 ------------------- --- MNSMozabProxy.cxx 21 Dec 2005 13:18:04 -0000 1.5 +++ MNSMozabProxy.cxx 29 Mar 2006 12:18:58 -0000 1.6 @@ -36,6 +36,10 @@ #include "MNSMozabProxy.hxx" #endif +#ifndef CONNECTIVITY_SHARED_RES_HRC +#include "conn_shared_res.hrc" +#endif + #ifndef _CONNECTIVITY_MAB_DATABASEMETADATAHELPER_HXX_ #include "MDatabaseMetaDataHelper.hxx" #endif @@ -122,7 +126,7 @@ extern nsresult getTableStringsProxied(const sal_Char* sAbURI, sal_Int32 *nDirectoryType,MNameMapper *nmap, ::std::vector< ::rtl::OUString >* _rStrings, ::std::vector< ::rtl::OUString >* _rTypes, - rtl::OUString * sError); + sal_Int32* pErrorId ); ::com::sun::star::mozilla::MozillaProductType SAL_CALL MNSMozabProxy::getProductType( ) throw (::com::sun::star::uno::RuntimeException) { @@ -156,7 +160,7 @@ (MNameMapper *)m_Args->arg3, (::std::vector< ::rtl::OUString >*)m_Args->arg4, (::std::vector< ::rtl::OUString >*)m_Args->arg5, - (rtl::OUString *)m_Args->arg6); + (sal_Int32 *)m_Args->arg6); break; case ProxiedFunc::FUNC_EXECUTE_QUERY: if (m_Args->arg1 && m_Args->arg2) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
