diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-02-28 09:33:20 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-02-28 09:33:20 +0000 |
| commit | 6dcc275f9c2403c77376312451b78777e193e9e1 (patch) | |
| tree | 8e232b74ffa9c6a38397f2c222c5cfaec208321c /store/workben | |
| parent | 0f94eb516a52b88e59283f2a661da1a4dd6c5118 (diff) | |
INTEGRATION: CWS sixtyfour01 (1.5.14); FILE MERGED
2006/01/14 12:48:38 pjanik 1.5.14.1: #i57737#: 64bit fixes for module store. Patch from Jan Holesovsky (JCA).
Diffstat (limited to 'store/workben')
| -rw-r--r-- | store/workben/t_base.cxx | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/store/workben/t_base.cxx b/store/workben/t_base.cxx index 38fced6a710b..998c4da75e62 100644 --- a/store/workben/t_base.cxx +++ b/store/workben/t_base.cxx @@ -4,9 +4,9 @@ * * $RCSfile: t_base.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: rt $ $Date: 2005-09-08 08:49:39 $ + * last change: $Author: kz $ $Date: 2006-02-28 10:33:20 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -33,7 +33,7 @@ * ************************************************************************/ -#define _T_BASE_CXX "$Revision: 1.5 $" +#define _T_BASE_CXX "$Revision: 1.6 $" #ifndef _SAL_TYPES_H_ #include <sal/types.h> @@ -346,13 +346,13 @@ static storeError __store_namei ( return eErrCode; } -static sal_Int32 __store_convertTextToUnicode ( +static sal_Size __store_convertTextToUnicode ( rtl_TextToUnicodeConverter hConvert, - const sal_Char *pszText, sal_Int32 nTextLen, - sal_Unicode *pBuffer, sal_Int32 nBuffer) + const sal_Char *pszText, sal_Size nTextLen, + sal_Unicode *pBuffer, sal_Size nBuffer) { sal_uInt32 nInfo = 0; - sal_uInt32 nSrcLen = 0; + sal_Size nSrcLen = 0; sal_Int32 nDstLen = rtl_convertTextToUnicode ( hConvert, 0, @@ -435,6 +435,7 @@ static void __store_testUnicode (const sal_Char *pszFilename) *======================================================================*/ int SAL_CALL main (int argc, char **argv) { + OSL_PRECOND(argc > 1, "t_base: error: insufficient number of arguments."); if (argc < 2) return 0; |