From 9b0198b2442bc749491d0f1e5e2c811346e5d568 Mon Sep 17 00:00:00 2001
From: Michael Meeks <michael.meeks@suse.com>
Date: Fri, 21 Sep 2012 13:09:29 +0100
Subject: package: convert internal ZIP handling data-types to 64bit

Prepare for a ZIP64 implementation.
Audit all "Size" property fetches through Anys.
Audit all uses of nSize, nCompressedSize, nOffset through the code.
Add FIXME64: comments to all points requiring future work.
---
 package/qa/ofopxmlstorages/TestHelper.java | 4 ++--
 package/qa/storages/TestHelper.java        | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'package/qa')

diff --git a/package/qa/ofopxmlstorages/TestHelper.java b/package/qa/ofopxmlstorages/TestHelper.java
index fa2baf48b261..d3cdb109eac9 100644
--- a/package/qa/ofopxmlstorages/TestHelper.java
+++ b/package/qa/ofopxmlstorages/TestHelper.java
@@ -99,7 +99,7 @@ public class TestHelper  {
         // check size property of the stream
         try
         {
-            int nSize = AnyConverter.toInt( xPropSet.getPropertyValue( "Size" ) );
+            long nSize = AnyConverter.toLong( xPropSet.getPropertyValue( "Size" ) );
             if ( nSize != pBytes.length )
             {
                 Error( "The 'Size' property of substream '" + sStreamName + "' contains wrong value!" );
@@ -466,7 +466,7 @@ public class TestHelper  {
             {
                 // get "MediaType" and "Size" properties and control there values
                 String sPropMediaType = AnyConverter.toString( xPropSet.getPropertyValue( "MediaType" ) );
-                int nPropSize = AnyConverter.toInt( xPropSet.getPropertyValue( "Size" ) );
+                long nPropSize = AnyConverter.toLong( xPropSet.getPropertyValue( "Size" ) );
 
                 bOk = true;
                 if ( !sPropMediaType.equals( sMediaType ) )
diff --git a/package/qa/storages/TestHelper.java b/package/qa/storages/TestHelper.java
index a58425c03b47..82494c89bf87 100644
--- a/package/qa/storages/TestHelper.java
+++ b/package/qa/storages/TestHelper.java
@@ -98,7 +98,7 @@ public class TestHelper  {
         // check size property of the stream
         try
         {
-            int nSize = AnyConverter.toInt( xPropSet.getPropertyValue( "Size" ) );
+            long nSize = AnyConverter.toLong( xPropSet.getPropertyValue( "Size" ) );
             if ( nSize != pBytes.length )
             {
                 Error( "The 'Size' property of substream '" + sStreamName + "' contains wrong value!" );
@@ -188,7 +188,7 @@ public class TestHelper  {
         // check size property of the stream
         try
         {
-            int nSize = AnyConverter.toInt( xPropSet.getPropertyValue( "Size" ) );
+            long nSize = AnyConverter.toLong( xPropSet.getPropertyValue( "Size" ) );
             if ( nSize != pBytes.length )
             {
                 Error( "The 'Size' property of substream '" + sStreamName + "' contains wrong value!" );
@@ -825,7 +825,7 @@ public class TestHelper  {
             {
                 // get "MediaType" and "Size" properties and control there values
                 String sPropMediaType = AnyConverter.toString( xPropSet.getPropertyValue( "MediaType" ) );
-                int nPropSize = AnyConverter.toInt( xPropSet.getPropertyValue( "Size" ) );
+                long nPropSize = AnyConverter.toLong( xPropSet.getPropertyValue( "Size" ) );
                 boolean bPropCompress = AnyConverter.toBoolean( xPropSet.getPropertyValue( "Compressed" ) );
 
                 bOk = true;
-- 
cgit