From af63fbbfa59b7f9a22c55aade2c7e3d95952bbe2 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 29 Nov 2013 11:54:27 +0200 Subject: [PATCH] convert xub_StrLen->sal_Int32 in unotools Change-Id: If00ae920eb74dfe67a8654bb092879997f37ccc1 --- unotools/source/i18n/localedatawrapper.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/unotools/source/i18n/localedatawrapper.cxx b/unotools/source/i18n/localedatawrapper.cxx index c9fcf63b72a1..1ff373c66f0a 100644 --- a/unotools/source/i18n/localedatawrapper.cxx +++ b/unotools/source/i18n/localedatawrapper.cxx @@ -1209,7 +1209,7 @@ inline sal_Unicode* ImplAddString( sal_Unicode* pBuf, sal_Unicode c ) } -inline sal_Unicode* ImplAddString( sal_Unicode* pBuf, const sal_Unicode* pCopyBuf, xub_StrLen nLen ) +inline sal_Unicode* ImplAddString( sal_Unicode* pBuf, const sal_Unicode* pCopyBuf, sal_Int32 nLen ) { memcpy( pBuf, pCopyBuf, nLen * sizeof(sal_Unicode) ); return pBuf + nLen; @@ -1560,7 +1560,7 @@ OUString LocaleDataWrapper::getCurr( sal_Int64 nNumber, sal_uInt16 nDecimals, // convert number sal_Unicode* pEndNumBuf = ImplAddFormatNum( pNumBuffer, nNumber, nDecimals, bUseThousandSep, sal_True ); - xub_StrLen nNumLen = (xub_StrLen)(sal_uLong)(pEndNumBuf-pNumBuffer); + sal_Int32 nNumLen = (sal_Int32)(sal_uLong)(pEndNumBuf-pNumBuffer); // replace zeros with zero character if ( (cZeroChar != '0') && nDecimals /* && IsNumTrailingZeros() */ )