From b647996a9babbee7b33cf45192e57df6a124628b Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Wed, 14 Sep 2016 17:01:50 +0200 Subject: replace sal_Size with std::size_t (or sal_uInt64 for SvStream pos) ... except in include/rtl, include/sal, include/uno, where sal_Size is retained for compatibility, and where callers of rtl functions pass in pointers that are incompatible on MSVC. Change-Id: I8344453780689f5120ba0870e44965b6d292450c --- linguistic/source/dicimp.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'linguistic') diff --git a/linguistic/source/dicimp.cxx b/linguistic/source/dicimp.cxx index 0b9fdce21925..eac56461579c 100644 --- a/linguistic/source/dicimp.cxx +++ b/linguistic/source/dicimp.cxx @@ -94,8 +94,8 @@ sal_Int16 ReadDicVersion( SvStreamPtr &rpStream, sal_uInt16 &nLng, bool &bNeg ) if (!rpStream.get() || rpStream->GetError()) return -1; - sal_Size nSniffPos = rpStream->Tell(); - static sal_Size nVerOOo7Len = sal::static_int_cast< sal_Size >(strlen( pVerOOo7 )); + sal_uInt64 const nSniffPos = rpStream->Tell(); + static std::size_t nVerOOo7Len = sal::static_int_cast< std::size_t >(strlen( pVerOOo7 )); pMagicHeader[ nVerOOo7Len ] = '\0'; if ((rpStream->ReadBytes(static_cast(pMagicHeader), nVerOOo7Len) == nVerOOo7Len) && !strcmp(pMagicHeader, pVerOOo7)) -- cgit