diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-02-28 09:32:25 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-02-28 09:32:25 +0000 |
| commit | 78b609d1aabbfdec0aa7ec5f247e92f66229fe0d (patch) | |
| tree | a0a3b57bcb5120807670a52740e9cd20ec0e042a /store | |
| parent | bd4e0dac9a2f8bf25e15d364f218453c52a4cf69 (diff) | |
INTEGRATION: CWS sixtyfour01 (1.5.12); FILE MERGED
2006/01/14 12:48:35 pjanik 1.5.12.1: #i57737#: 64bit fixes for module store. Patch from Jan Holesovsky (JCA).
Diffstat (limited to 'store')
| -rw-r--r-- | store/source/storlckb.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/store/source/storlckb.cxx b/store/source/storlckb.cxx index 9ecc30d6b197..9a94cef80999 100644 --- a/store/source/storlckb.cxx +++ b/store/source/storlckb.cxx @@ -4,9 +4,9 @@ * * $RCSfile: storlckb.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: rt $ $Date: 2005-09-08 08:46:28 $ + * last change: $Author: kz $ $Date: 2006-02-28 10:32:25 $ * * 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 _STORE_STORLCKB_CXX_ "$Revision: 1.5 $" +#define _STORE_STORLCKB_CXX_ "$Revision: 1.6 $" #ifndef _SAL_TYPES_H_ #include <sal/types.h> @@ -93,10 +93,10 @@ using namespace store; /* * __store_convertTextToUnicode. */ -inline sal_Int32 __store_convertTextToUnicode ( +inline sal_Size __store_convertTextToUnicode ( rtl_TextToUnicodeConverter hConverter, - const sal_Char *pSrcBuffer, sal_Int32 nSrcLength, - sal_Unicode *pDstBuffer, sal_Int32 nDstLength) + const sal_Char *pSrcBuffer, sal_Size nSrcLength, + sal_Unicode *pDstBuffer, sal_Size nDstLength) { sal_uInt32 nCvtInfo = 0; sal_Size nCvtBytes = 0; @@ -325,8 +325,8 @@ storeError OStoreDirectory::iterate (storeFindData &rFindData) { // Setup FindData. sal_Char *p = m_pNode->m_aNameBlock.m_pData; - sal_Int32 n = rtl_str_getLength (p); - sal_Int32 k = rFindData.m_nLength; + sal_Size n = rtl_str_getLength (p); + sal_Size k = rFindData.m_nLength; n = __store_convertTextToUnicode ( m_hTextCvt, p, n, |