mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS sixtyfour01 (1.5.12); FILE MERGED

Browse Source 
2006/01/14 12:48:35 pjanik 1.5.12.1: #i57737#: 64bit fixes for module store. Patch from Jan Holesovsky (JCA).
This commit is contained in:
Kurt Zenker
2006-02-28 09:32:25 +00:00
parent bd4e0dac9a
commit 78b609d1aa
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
store/source/storlckb.cxx
View File

@@ -4,9 +4,9 @@
* *
* $RCSfile: storlckb.cxx,v $ * $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 Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * 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_ #ifndef _SAL_TYPES_H_
#include <sal/types.h> #include <sal/types.h>
@@ -93,10 +93,10 @@ using namespace store;
/* /*
* __store_convertTextToUnicode. * __store_convertTextToUnicode.
*/ */
inline sal_Int32 __store_convertTextToUnicode ( inline sal_Size __store_convertTextToUnicode (
rtl_TextToUnicodeConverter hConverter, rtl_TextToUnicodeConverter hConverter,
const sal_Char *pSrcBuffer, sal_Int32 nSrcLength, const sal_Char *pSrcBuffer, sal_Size nSrcLength,
sal_Unicode *pDstBuffer, sal_Int32 nDstLength) sal_Unicode *pDstBuffer, sal_Size nDstLength)
{ {
sal_uInt32 nCvtInfo = 0; sal_uInt32 nCvtInfo = 0;
sal_Size nCvtBytes = 0; sal_Size nCvtBytes = 0;
@@ -325,8 +325,8 @@ storeError OStoreDirectory::iterate (storeFindData &rFindData)
{ {
// Setup FindData. // Setup FindData.
sal_Char *p = m_pNode->m_aNameBlock.m_pData; sal_Char *p = m_pNode->m_aNameBlock.m_pData;
sal_Int32 n = rtl_str_getLength (p); sal_Size n = rtl_str_getLength (p);
sal_Int32 k = rFindData.m_nLength; sal_Size k = rFindData.m_nLength;
n = __store_convertTextToUnicode ( n = __store_convertTextToUnicode (
m_hTextCvt, p, n, m_hTextCvt, p, n,