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 /cppcanvas/source | |
| 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 'cppcanvas/source')
| -rw-r--r-- | cppcanvas/source/mtfrenderer/implrenderer.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx index 01d479a27449..806353dbe543 100644 --- a/cppcanvas/source/mtfrenderer/implrenderer.cxx +++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx @@ -1564,8 +1564,8 @@ namespace cppcanvas // least one dimension // Remark the 1L cannot be replaced, that would cause max to compare long/int - const Size aMtfSizePix( std::max<sal_Int32>( aMtfSizePixPre.Width(), 1 ), - std::max<sal_Int32>( aMtfSizePixPre.Height(), 1 ) ); + const Size aMtfSizePix( std::max( aMtfSizePixPre.Width(), 1L ), + std::max( aMtfSizePixPre.Height(), 1L ) ); // Setup local transform, such that the // metafile renders itself into the given @@ -2878,8 +2878,8 @@ namespace cppcanvas // #i44110# correct null-sized output - there are shapes // which have zero size in at least one dimension // Remark the 1L cannot be replaced, that would cause max to compare long/int - const Size aMtfSizePix( std::max<sal_Int32>( aMtfSizePixPre.Width(), 1 ), - std::max<sal_Int32>( aMtfSizePixPre.Height(), 1 ) ); + const Size aMtfSizePix( std::max( aMtfSizePixPre.Width(), 1L ), + std::max( aMtfSizePixPre.Height(), 1L ) ); sal_Int32 nCurrActions(0); ActionFactoryParameters aParms(aStateStack, |