Tag: cws_src680_warnings01 User: sb Date: 06/04/07 13:23:45 Modified: /dba/connectivity/source/drivers/mozab/mozillasrc/ MNSMozabProxy.cxx
Log: RESYNC: (1.5-1.6); FILE MERGED 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.4.30.4&r2=1.4.30.5 Delta lines: +6 -2 ------------------- --- MNSMozabProxy.cxx 25 Jan 2006 20:58:36 -0000 1.4.30.4 +++ MNSMozabProxy.cxx 7 Apr 2006 20:23:42 -0000 1.4.30.5 @@ -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 @@ -124,7 +128,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) { @@ -158,7 +162,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]
