diff options
| author | Matteo Casalin <matteo.casalin@yahoo.com> | 2015-10-04 11:34:57 +0200 |
|---|---|---|
| committer | Matteo Casalin <matteo.casalin@yahoo.com> | 2015-10-27 13:59:09 +0100 |
| commit | 7e89e2827489d0b3bbd488f6c9e5a9e7e404d732 (patch) | |
| tree | ca34b4ec312dffbe8e71a8106a4c3d21478d64a1 /tools | |
| parent | 99628775132143936fcd00ca9e18a853616418e4 (diff) | |
sal_uIntPtr to sal_uInt64, sal_uLong to sal_Size for streams
Change-Id: I062f1f6c5b20ca47734a9a3cd1a229d51763a206
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qa/cppunit/test_urlobj.cxx | 12 | ||||
| -rw-r--r-- | tools/source/stream/stream.cxx | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/tools/qa/cppunit/test_urlobj.cxx b/tools/qa/cppunit/test_urlobj.cxx index 0c01830fc30b..d0cab0abc03f 100644 --- a/tools/qa/cppunit/test_urlobj.cxx +++ b/tools/qa/cppunit/test_urlobj.cxx @@ -255,14 +255,14 @@ namespace tools_urlobj CPPUNIT_ASSERT(!url.HasError()); strm = url.getData(); CPPUNIT_ASSERT(strm != 0); - CPPUNIT_ASSERT_EQUAL(sal_uIntPtr(0), strm->GetSize()); + CPPUNIT_ASSERT_EQUAL(sal_uInt64(0), strm->GetSize()); strm.reset(); url = INetURLObject("data:,,%C3%A4%90"); CPPUNIT_ASSERT(!url.HasError()); strm = url.getData(); CPPUNIT_ASSERT(strm != 0); - CPPUNIT_ASSERT_EQUAL(sal_uIntPtr(4), strm->GetSize()); + CPPUNIT_ASSERT_EQUAL(sal_uInt64(4), strm->GetSize()); buf = static_cast<unsigned char const *>(strm->GetData()); CPPUNIT_ASSERT_EQUAL(0x2C, int(buf[0])); CPPUNIT_ASSERT_EQUAL(0xC3, int(buf[1])); @@ -279,21 +279,21 @@ namespace tools_urlobj CPPUNIT_ASSERT(!url.HasError()); strm = url.getData(); CPPUNIT_ASSERT(strm != 0); - CPPUNIT_ASSERT_EQUAL(sal_uIntPtr(0), strm->GetSize()); + CPPUNIT_ASSERT_EQUAL(sal_uInt64(0), strm->GetSize()); strm.reset(); url = INetURLObject("data:;bAsE64,"); CPPUNIT_ASSERT(!url.HasError()); strm = url.getData(); CPPUNIT_ASSERT(strm != 0); - CPPUNIT_ASSERT_EQUAL(sal_uIntPtr(0), strm->GetSize()); + CPPUNIT_ASSERT_EQUAL(sal_uInt64(0), strm->GetSize()); strm.reset(); url = INetURLObject("data:;base64,YWJjCg=="); CPPUNIT_ASSERT(!url.HasError()); strm = url.getData(); CPPUNIT_ASSERT(strm != 0); - CPPUNIT_ASSERT_EQUAL(sal_uIntPtr(4), strm->GetSize()); + CPPUNIT_ASSERT_EQUAL(sal_uInt64(4), strm->GetSize()); buf = static_cast<unsigned char const *>(strm->GetData()); CPPUNIT_ASSERT_EQUAL(0x61, int(buf[0])); CPPUNIT_ASSERT_EQUAL(0x62, int(buf[1])); @@ -315,7 +315,7 @@ namespace tools_urlobj CPPUNIT_ASSERT(!url.HasError()); strm = url.getData(); CPPUNIT_ASSERT(strm != 0); - CPPUNIT_ASSERT_EQUAL(sal_uIntPtr(4), strm->GetSize()); + CPPUNIT_ASSERT_EQUAL(sal_uInt64(4), strm->GetSize()); buf = static_cast<unsigned char const *>(strm->GetData()); CPPUNIT_ASSERT_EQUAL(0x59, int(buf[0])); CPPUNIT_ASSERT_EQUAL(0x51, int(buf[1])); diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx index da91a21a6b82..e1c5b174e007 100644 --- a/tools/source/stream/stream.cxx +++ b/tools/source/stream/stream.cxx @@ -1718,7 +1718,7 @@ const void* SvMemoryStream::GetBuffer() return GetData(); } -sal_uIntPtr SvMemoryStream::GetSize() +sal_uInt64 SvMemoryStream::GetSize() { Flush(); sal_uInt64 const nTemp = Tell(); |