diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-04-07 11:45:13 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-04-07 14:13:18 +0200 |
| commit | d36f7c5bd2115fcdd26ba8ff7b6a0446dea70bd4 (patch) | |
| tree | 5ae4b15f3302a538ac55d714ba0529ca4c1de87a /include/vcl/salgtype.hxx | |
| parent | 61d57bcebd1a246603cbcd9ad5e0a7df1a8d66cd (diff) | |
Revert "long->sal_Int32 in tools/gen.hxx"
This reverts commit 8bc951daf79decbd8a599a409c6d33c5456710e0.
As discussed at
<https://lists.freedesktop.org/archives/libreoffice/2018-April/079955.html>
"long->sal_Int32 in tools/gen.hxx", that commit caused lots of problems with
signed integer overflow, and the original plan was to redo it to consistently
use sal_Int64 instead of sal_Int32. <https://gerrit.libreoffice.org/#/c/52471/>
"sal_Int32->sal_Int64 in tools/gen.hxx" tried that. However, it failed
miserably on Windows, causing odd failures like not writing out Pictures/*.svm
streams out into .odp during CppunitTest_sd_export_ooxml2. So the next best
approach is to just revert the original commit, at least for now.
Includes revert of follow-up 8c50aff2175e85c54957d98ce32af40a3a87e168 "Fix
Library_vclplug_qt5".
Change-Id: Ia8bf34272d1ed38aac00e5d07a9d13fb03f439ae
Reviewed-on: https://gerrit.libreoffice.org/52532
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'include/vcl/salgtype.hxx')
| -rw-r--r-- | include/vcl/salgtype.hxx | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/include/vcl/salgtype.hxx b/include/vcl/salgtype.hxx index d6c8dd8e11d5..0e37300f3dbd 100644 --- a/include/vcl/salgtype.hxx +++ b/include/vcl/salgtype.hxx @@ -38,25 +38,25 @@ constexpr ::Color SALCOLOR_NONE ( 0xFF, 0xFF, 0xFF, 0xFF ); // must equal to class Point struct SalPoint { - sal_Int32 mnX; - sal_Int32 mnY; + long mnX; + long mnY; }; typedef const SalPoint* PCONSTSALPOINT; struct SalTwoRect { - sal_Int32 mnSrcX; - sal_Int32 mnSrcY; - sal_Int32 mnSrcWidth; - sal_Int32 mnSrcHeight; - sal_Int32 mnDestX; - sal_Int32 mnDestY; - sal_Int32 mnDestWidth; - sal_Int32 mnDestHeight; + long mnSrcX; + long mnSrcY; + long mnSrcWidth; + long mnSrcHeight; + long mnDestX; + long mnDestY; + long mnDestWidth; + long mnDestHeight; - SalTwoRect(sal_Int32 nSrcX, sal_Int32 nSrcY, sal_Int32 nSrcWidth, sal_Int32 nSrcHeight, - sal_Int32 nDestX, sal_Int32 nDestY, sal_Int32 nDestWidth, sal_Int32 nDestHeight) + SalTwoRect(long nSrcX, long nSrcY, long nSrcWidth, long nSrcHeight, + long nDestX, long nDestY, long nDestWidth, long nDestHeight) : mnSrcX(nSrcX), mnSrcY(nSrcY), mnSrcWidth(nSrcWidth), mnSrcHeight(nSrcHeight) , mnDestX(nDestX), mnDestY(nDestY), mnDestWidth(nDestWidth), mnDestHeight(nDestHeight) { |