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 /sw/source/uibase/ribbar | |
| 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 'sw/source/uibase/ribbar')
| -rw-r--r-- | sw/source/uibase/ribbar/drawbase.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/uibase/ribbar/drawbase.cxx b/sw/source/uibase/ribbar/drawbase.cxx index f3d69e8b99a7..bb5fd3b9a5e9 100644 --- a/sw/source/uibase/ribbar/drawbase.cxx +++ b/sw/source/uibase/ribbar/drawbase.cxx @@ -189,7 +189,7 @@ bool SwDrawBase::MouseButtonDown(const MouseEvent& rMEvt) { bool bUnlockView = !m_pSh->IsViewLocked(); m_pSh->LockView( true ); //lock visible section - m_pSh->SelectObj(Point(SAL_MAX_INT32, SAL_MAX_INT32)); // deselect all + m_pSh->SelectObj(Point(LONG_MAX, LONG_MAX)); // deselect all if( bUnlockView ) m_pSh->LockView( false ); } @@ -375,7 +375,7 @@ bool SwDrawBase::MouseButtonUp(const MouseEvent& rMEvt) if (aPnt == m_aStartPos) { if (!m_pSh->IsObjSelectable(aPnt)) - m_pSh->SelectObj(Point(SAL_MAX_INT32, SAL_MAX_INT32)); + m_pSh->SelectObj(Point(LONG_MAX, LONG_MAX)); else if (!bReturn) { if (!rMEvt.IsShift()) |