summaryrefslogtreecommitdiff
path: root/writerperfect/source
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2020-10-28 08:30:36 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2020-11-11 06:34:17 +0100
commit3d90997fb6f232d8008df4d166d7b97b869c200f (patch)
treed26a1756dac5b7b55fac0f4322fe25ea02e9017e /writerperfect/source
parent3de38e95561ab7ca114d9f3307702ba89c4e3e9a (diff)
make tools::Long 64-bit on Windows platform
This is only for the 64-bit windows platform. I don't see the point in messing with the 32-bit platforms, they are (a) become more and more rare (b) unlikely to even have enough available process memory to load extremely large calc spreadsheets The primary problem we are addressing here is bringing Windows-64bit up to same capability as Linux-64bit when it comes to handling very large spreadsheets, which is caused by things like tools::Rectangle using "long", which means that all the work done to make Libreoffice on 64-bit Linux capable of loading large spreadsheets is useless on Windows, where long is 32-bit. The operator<< for tools::Rectangle needs to be inside the tools namespace because of an interaction with the cppunit printing template stuff that I don't understand. SalPoint changed to use sal_Int32, since it needs to be the same definition as the Windows POINT structure. Change-Id: Iab6f1af88847b6c8d46995e8ceda3f82b6722ff7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104913 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'writerperfect/source')
-rw-r--r--writerperfect/source/calc/MSWorksCalcImportFilter.cxx4
-rw-r--r--writerperfect/source/common/DirectoryStream.cxx4
-rw-r--r--writerperfect/source/common/WPXSvInputStream.cxx4
3 files changed, 6 insertions, 6 deletions
diff --git a/writerperfect/source/calc/MSWorksCalcImportFilter.cxx b/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
index 6cf948e371ce..83035d8b9926 100644
--- a/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
+++ b/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
@@ -89,11 +89,11 @@ public:
*/
const unsigned char* read(unsigned long, unsigned long&) override { return nullptr; }
//! returns actual offset position
- tools::Long tell() override { return 0; }
+ long tell() override { return 0; }
/*! \brief seeks to an offset position, from actual, beginning or ending position
* \return 0 if ok
*/
- int seek(tools::Long, librevenge::RVNG_SEEK_TYPE) override { return 1; }
+ int seek(long, librevenge::RVNG_SEEK_TYPE) override { return 1; }
//! returns true if we are at the end of the section/file
bool isEnd() override { return true; }
diff --git a/writerperfect/source/common/DirectoryStream.cxx b/writerperfect/source/common/DirectoryStream.cxx
index eb275abec5e5..19ec454b293e 100644
--- a/writerperfect/source/common/DirectoryStream.cxx
+++ b/writerperfect/source/common/DirectoryStream.cxx
@@ -211,9 +211,9 @@ const unsigned char* DirectoryStream::read(unsigned long, unsigned long& nNumByt
return nullptr;
}
-int DirectoryStream::seek(tools::Long, librevenge::RVNG_SEEK_TYPE) { return -1; }
+int DirectoryStream::seek(long, librevenge::RVNG_SEEK_TYPE) { return -1; }
-tools::Long DirectoryStream::tell() { return 0; }
+long DirectoryStream::tell() { return 0; }
bool DirectoryStream::isEnd() { return true; }
}
diff --git a/writerperfect/source/common/WPXSvInputStream.cxx b/writerperfect/source/common/WPXSvInputStream.cxx
index 40c50df8de5c..ce5ff2956966 100644
--- a/writerperfect/source/common/WPXSvInputStream.cxx
+++ b/writerperfect/source/common/WPXSvInputStream.cxx
@@ -882,14 +882,14 @@ const unsigned char* WPXSvInputStream::read(unsigned long numBytes, unsigned lon
return mpImpl->mpReadBuffer;
}
-tools::Long WPXSvInputStream::tell()
+long WPXSvInputStream::tell()
{
tools::Long retVal = mpImpl->tell();
return retVal - static_cast<tools::Long>(mpImpl->mnReadBufferLength)
+ static_cast<tools::Long>(mpImpl->mnReadBufferPos);
}
-int WPXSvInputStream::seek(tools::Long offset, librevenge::RVNG_SEEK_TYPE seekType)
+int WPXSvInputStream::seek(long offset, librevenge::RVNG_SEEK_TYPE seekType)
{
sal_Int64 tmpOffset = offset;
if (seekType == librevenge::RVNG_SEEK_CUR)