vcl/win/dtrans/DOTransferable.cxx | 2 +-
vcl/win/dtrans/TxtCnvtHlp.cxx | 4 ++--
vcl/win/dtrans/TxtCnvtHlp.hxx | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit adcddde9a99e77f9209cc5e2186cb9268990e34a
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Fri Mar 5 14:48:01 2021 +0100
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Sat Mar 6 08:02:31 2021 +0100
Use int where API expects int
Change-Id: Icda2aeeccb6196191b0b4af4b86f3d094e598cb0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111930
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/vcl/win/dtrans/DOTransferable.cxx
b/vcl/win/dtrans/DOTransferable.cxx
index 7a911a0fa567..029a21402bac 100644
--- a/vcl/win/dtrans/DOTransferable.cxx
+++ b/vcl/win/dtrans/DOTransferable.cxx
@@ -536,7 +536,7 @@ OUString CDOTransferable::synthesizeUnicodeText( )
// convert the text
MultiByteToWideCharEx( cpForTxtCnvt,
reinterpret_cast<char*>( aTextSequence.getArray( )
),
- sal::static_int_cast<sal_uInt32>(-1), // Huh ?
+ -1,
stgTransferHelper,
false);
diff --git a/vcl/win/dtrans/TxtCnvtHlp.cxx b/vcl/win/dtrans/TxtCnvtHlp.cxx
index a0c09a1badf5..d7ab386fc1fc 100644
--- a/vcl/win/dtrans/TxtCnvtHlp.cxx
+++ b/vcl/win/dtrans/TxtCnvtHlp.cxx
@@ -58,7 +58,7 @@ static int CalcBuffSizeForTextConversion( UINT code_page,
LPCWSTR lpWideCharStri
int MultiByteToWideCharEx( UINT cp_src,
LPCSTR lpMultiByteString,
- sal_uInt32 lenStr,
+ int lenStr,
CStgTransferHelper& refDTransHelper,
BOOL bEnsureTrailingZero )
{
@@ -92,7 +92,7 @@ int MultiByteToWideCharEx( UINT cp_src,
int WideCharToMultiByteEx( UINT cp_dest,
LPCWSTR lpWideCharString,
- sal_uInt32 lenStr,
+ int lenStr,
CStgTransferHelper& refDTransHelper,
BOOL bEnsureTrailingZero )
{
diff --git a/vcl/win/dtrans/TxtCnvtHlp.hxx b/vcl/win/dtrans/TxtCnvtHlp.hxx
index 70bd4e32ab67..5294879337d0 100644
--- a/vcl/win/dtrans/TxtCnvtHlp.hxx
+++ b/vcl/win/dtrans/TxtCnvtHlp.hxx
@@ -28,13 +28,13 @@
int MultiByteToWideCharEx( UINT cp_src,
LPCSTR lpMultiByteString,
- sal_uInt32 lenStr,
+ int lenStr,
CStgTransferHelper& refDTransHelper,
BOOL bEnsureTrailingZero = TRUE );
int WideCharToMultiByteEx( UINT cp_dest,
LPCWSTR lpWideCharString,
- sal_uInt32 lenStr,
+ int lenStr,
CStgTransferHelper& refDTransHelper,
BOOL bEnsureTrailingZero = TRUE );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
