From 7e89e2827489d0b3bbd488f6c9e5a9e7e404d732 Mon Sep 17 00:00:00 2001
From: Matteo Casalin <matteo.casalin@yahoo.com>
Date: Sun, 4 Oct 2015 11:34:57 +0200
Subject: sal_uIntPtr to sal_uInt64, sal_uLong to sal_Size for streams

Change-Id: I062f1f6c5b20ca47734a9a3cd1a229d51763a206
---
 oox/qa/unit/vba_compression.cxx | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'oox')

diff --git a/oox/qa/unit/vba_compression.cxx b/oox/qa/unit/vba_compression.cxx
index f31dc3b7730e..ff50f07fc019 100644
--- a/oox/qa/unit/vba_compression.cxx
+++ b/oox/qa/unit/vba_compression.cxx
@@ -96,9 +96,9 @@ void TestVbaCompression::testSimple1()
     const sal_uInt8* pReferenceData = static_cast<const sal_uInt8*>( aReferenceMemoryStream.GetData() );
     const sal_uInt8* pData = static_cast<const sal_uInt8*>( aOutputMemoryStream.GetData() );
 
-    size_t nSize = std::min(aReferenceMemoryStream.GetSize(),
+    const sal_uInt64 nSize = std::min(aReferenceMemoryStream.GetSize(),
             aOutputMemoryStream.GetSize());
-    for (size_t i = 0; i < nSize; ++i)
+    for (sal_uInt64 i = 0; i < nSize; ++i)
     {
         CPPUNIT_ASSERT_EQUAL((int)pReferenceData[i], (int)pData[i]);
     }
@@ -118,9 +118,9 @@ void TestVbaCompression::testSimple2()
     const sal_uInt8* pReferenceData = static_cast<const sal_uInt8*>( aReferenceMemoryStream.GetData() );
     const sal_uInt8* pData = static_cast<const sal_uInt8*>( aOutputMemoryStream.GetData() );
 
-    size_t nSize = std::min(aReferenceMemoryStream.GetSize(),
+    const sal_uInt64 nSize = std::min(aReferenceMemoryStream.GetSize(),
             aOutputMemoryStream.GetSize());
-    for (size_t i = 0; i < nSize; ++i)
+    for (sal_uInt64 i = 0; i < nSize; ++i)
     {
         CPPUNIT_ASSERT_EQUAL((int)pReferenceData[i], (int)pData[i]);
     }
@@ -140,9 +140,9 @@ void TestVbaCompression::testSimple3()
     const sal_uInt8* pReferenceData = static_cast<const sal_uInt8*>( aReferenceMemoryStream.GetData()  );
     const sal_uInt8* pData = static_cast<const sal_uInt8*>( aOutputMemoryStream.GetData() );
 
-    size_t nSize = std::min(aReferenceMemoryStream.GetSize(),
+    const sal_uInt64 nSize = std::min(aReferenceMemoryStream.GetSize(),
             aOutputMemoryStream.GetSize());
-    for (size_t i = 0; i < nSize; ++i)
+    for (sal_uInt64 i = 0; i < nSize; ++i)
     {
         CPPUNIT_ASSERT_EQUAL((int)pReferenceData[i], (int)pData[i]);
     }
@@ -162,9 +162,9 @@ void TestVbaCompression::testComplex1()
     const sal_uInt8* pReferenceData = static_cast<const sal_uInt8*>( aReferenceMemoryStream.GetData() );
     const sal_uInt8* pData = static_cast<const sal_uInt8*>( aOutputMemoryStream.GetData() );
 
-    size_t nSize = std::min(aReferenceMemoryStream.GetSize(),
+    const sal_uInt64 nSize = std::min(aReferenceMemoryStream.GetSize(),
             aOutputMemoryStream.GetSize());
-    for (size_t i = 0; i < nSize; ++i)
+    for (sal_uInt64 i = 0; i < nSize; ++i)
     {
         CPPUNIT_ASSERT_EQUAL((int)pReferenceData[i], (int)pData[i]);
     }
@@ -184,9 +184,9 @@ void TestVbaCompression::testSpec321()
     const sal_uInt8* pReferenceData = static_cast<const sal_uInt8*>( aReferenceMemoryStream.GetData() );
     const sal_uInt8* pData = static_cast<const sal_uInt8*>( aOutputMemoryStream.GetData() );
 
-    size_t nSize = std::min(aReferenceMemoryStream.GetSize(),
+    const sal_uInt64 nSize = std::min(aReferenceMemoryStream.GetSize(),
             aOutputMemoryStream.GetSize());
-    for (size_t i = 0; i < nSize; ++i)
+    for (sal_uInt64 i = 0; i < nSize; ++i)
     {
         CPPUNIT_ASSERT_EQUAL((int)pReferenceData[i], (int)pData[i]);
     }
@@ -206,9 +206,9 @@ void TestVbaCompression::testSpec322()
     const sal_uInt8* pReferenceData = static_cast<const sal_uInt8*>( aReferenceMemoryStream.GetData() );
     const sal_uInt8* pData = static_cast<const sal_uInt8*>( aOutputMemoryStream.GetData() );
 
-    size_t nSize = std::min(aReferenceMemoryStream.GetSize(),
+    const sal_uInt64 nSize = std::min(aReferenceMemoryStream.GetSize(),
             aOutputMemoryStream.GetSize());
-    for (size_t i = 0; i < nSize; ++i)
+    for (sal_uInt64 i = 0; i < nSize; ++i)
     {
         CPPUNIT_ASSERT_EQUAL((int)pReferenceData[i], (int)pData[i]);
     }
@@ -228,9 +228,9 @@ void TestVbaCompression::testSpec323()
     const sal_uInt8* pReferenceData = static_cast<const sal_uInt8*>( aReferenceMemoryStream.GetData() );
     const sal_uInt8* pData = static_cast<const sal_uInt8*>( aOutputMemoryStream.GetData() );
 
-    size_t nSize = std::min(aReferenceMemoryStream.GetSize(),
+    const sal_uInt64 nSize = std::min(aReferenceMemoryStream.GetSize(),
             aOutputMemoryStream.GetSize());
-    for (size_t i = 0; i < nSize; ++i)
+    for (sal_uInt64 i = 0; i < nSize; ++i)
     {
         CPPUNIT_ASSERT_EQUAL((int)pReferenceData[i], (int)pData[i]);
     }
-- 
cgit