diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-12-28 16:32:14 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-12-28 16:32:14 +0000 |
| commit | 1ed119cef9a3e6a625e18588c34ec70d2ffef269 (patch) | |
| tree | 29133f97604972f6485b067eea34e2b901f602b8 /bridges/source | |
| parent | 48f3abc10240cb82e506c8115f486dcc2cb335e3 (diff) | |
INTEGRATION: CWS pj43 (1.5.18); FILE MERGED
2005/12/06 08:46:20 kendy 1.5.18.1: #i57694#
sal_uInt32 -> sal_Size in memAlloc()
Diffstat (limited to 'bridges/source')
| -rw-r--r-- | bridges/source/remote/context/context.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/bridges/source/remote/context/context.cxx b/bridges/source/remote/context/context.cxx index 7859d8a7b874..bab58834da31 100644 --- a/bridges/source/remote/context/context.cxx +++ b/bridges/source/remote/context/context.cxx @@ -4,9 +4,9 @@ * * $RCSfile: context.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: rt $ $Date: 2005-09-07 22:39:30 $ + * last change: $Author: hr $ $Date: 2005-12-28 17:32:14 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -161,7 +161,7 @@ public: rtl_uString ** getConnectionList( sal_Int32 *pnStringCount , - void * ( SAL_CALL * memAlloc ) ( sal_uInt32 nBytesToAlloc ) ); + void * ( SAL_CALL * memAlloc ) ( sal_Size nBytesToAlloc ) ); private: ::osl::Mutex m_mutex; @@ -286,7 +286,7 @@ uno_Context *ContextAdmin::get( rtl_uString *pHost ) rtl_uString ** ContextAdmin::getConnectionList( sal_Int32 *pnStringCount , - void * ( SAL_CALL * memAlloc ) ( sal_uInt32 nBytesToAlloc ) ) + void * ( SAL_CALL * memAlloc ) ( sal_Size nBytesToAlloc ) ) { ::osl::MutexGuard guard( m_mutex ); @@ -519,7 +519,7 @@ remote_removeContextListener( remote_contextListenerFunc listener , void *pObjec extern "C" rtl_uString ** SAL_CALL remote_getContextList( sal_Int32 *pnStringCount, - void * ( SAL_CALL * memAlloc ) ( sal_uInt32 nBytesToAlloc ) ) + void * ( SAL_CALL * memAlloc ) ( sal_Size nBytesToAlloc ) ) { return ContextAdmin::getInstance()->getConnectionList( pnStringCount , memAlloc ); } |