diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-03-29 11:18:58 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-03-29 11:18:58 +0000 |
| commit | e1749236c34afb29f6b7264dad4c5043436e1420 (patch) | |
| tree | 6a0b9f1b0f4cbb5c9697f00cdbefe04584fc190a | |
| parent | ea2d11b2a552abaf2368d3dfc8152962736324a7 (diff) | |
INTEGRATION: CWS dba203a (1.5.42); FILE MERGED
2006/03/17 15:37:58 fs 1.5.42.1: #i60163# localized error messages
| -rw-r--r-- | connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx index 7235a167c8..bbaddaaaa1 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx @@ -4,9 +4,9 @@ * * $RCSfile: MNSMozabProxy.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: obo $ $Date: 2005-12-21 13:18:04 $ + * last change: $Author: obo $ $Date: 2006-03-29 12:18:58 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -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 @@ sal_Int32 MNSMozabProxy::StartProxy(RunArgs * args,::com::sun::star::mozilla::Mo 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 @@ sal_Int32 SAL_CALL MNSMozabProxy::run( ) throw (::com::sun::star::uno::RuntimeE (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) |