diff options
| author | Noel Grandin <noel@peralex.com> | 2020-10-28 08:30:36 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-11-11 06:34:17 +0100 |
| commit | 3d90997fb6f232d8008df4d166d7b97b869c200f (patch) | |
| tree | d26a1756dac5b7b55fac0f4322fe25ea02e9017e /canvas | |
| parent | 3de38e95561ab7ca114d9f3307702ba89c4e3e9a (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 'canvas')
| -rw-r--r-- | canvas/source/directx/dx_textlayout_drawhelper.cxx | 2 | ||||
| -rw-r--r-- | canvas/source/opengl/ogl_canvashelper.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/canvas/source/directx/dx_textlayout_drawhelper.cxx b/canvas/source/directx/dx_textlayout_drawhelper.cxx index ea628079e7ff..312b72983b67 100644 --- a/canvas/source/directx/dx_textlayout_drawhelper.cxx +++ b/canvas/source/directx/dx_textlayout_drawhelper.cxx @@ -206,7 +206,7 @@ namespace dxcanvas { // create the DXArray const sal_Int32 nLen( rLogicalAdvancements.getLength() ); - std::unique_ptr<sal_Int32[]> pDXArray( new sal_Int32[nLen] ); + std::unique_ptr<::tools::Long[]> pDXArray( new ::tools::Long[nLen] ); for( sal_Int32 i=0; i<nLen; ++i ) pDXArray[i] = basegfx::fround( rLogicalAdvancements[i] ); diff --git a/canvas/source/opengl/ogl_canvashelper.cxx b/canvas/source/opengl/ogl_canvashelper.cxx index 6dcf933f0723..d64e1ba1d7f0 100644 --- a/canvas/source/opengl/ogl_canvashelper.cxx +++ b/canvas/source/opengl/ogl_canvashelper.cxx @@ -729,7 +729,7 @@ namespace oglcanvas { // create the DXArray const sal_Int32 nLen( aLogicalAdvancements.getLength() ); - std::unique_ptr<long[]> pDXArray( new long[nLen] ); + std::unique_ptr<tools::Long[]> pDXArray( new tools::Long[nLen] ); for( sal_Int32 i=0; i<nLen; ++i ) pDXArray[i] = basegfx::fround( aLogicalAdvancements[i] ); |