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/core/text/itrform2.cxx | |
| parent | Don't link Library_mysqlc against -lnsl (diff) | |
| download | core-d36f7c5bd2115fcdd26ba8ff7b6a0446dea70bd4.tar.gz core-d36f7c5bd2115fcdd26ba8ff7b6a0446dea70bd4.zip | |
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/core/text/itrform2.cxx')
| -rw-r--r-- | sw/source/core/text/itrform2.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx index bc3e03924115..7fc2ae4005df 100644 --- a/sw/source/core/text/itrform2.cxx +++ b/sw/source/core/text/itrform2.cxx @@ -1969,7 +1969,7 @@ void SwTextFormatter::CalcUnclipped( SwTwips& rTop, SwTwips& rBottom ) OSL_ENSURE( ! m_pFrame->IsVertical() || m_pFrame->IsSwapped(), "SwTextFormatter::CalcUnclipped with unswapped frame" ); - sal_Int32 nFlyAsc, nFlyDesc; + long nFlyAsc, nFlyDesc; m_pCurr->MaxAscentDescent( rTop, rBottom, nFlyAsc, nFlyDesc ); rTop = Y() + GetCurr()->GetAscent(); rBottom = rTop + nFlyDesc; @@ -1996,7 +1996,7 @@ void SwTextFormatter::UpdatePos( SwLineLayout *pCurrent, Point aStart, aTmpInf.SetIdx( nStartIdx ); aTmpInf.SetPos( aStart ); - sal_Int32 nTmpAscent, nTmpDescent, nFlyAsc, nFlyDesc; + long nTmpAscent, nTmpDescent, nFlyAsc, nFlyDesc; pCurrent->MaxAscentDescent( nTmpAscent, nTmpDescent, nFlyAsc, nFlyDesc ); const sal_uInt16 nTmpHeight = pCurrent->GetRealHeight(); @@ -2115,7 +2115,7 @@ void SwTextFormatter::AlignFlyInCntBase( long nBaseLine ) const nFlags |= AsCharFlags::Reverse; } - sal_Int32 nTmpAscent, nTmpDescent, nFlyAsc, nFlyDesc; + long nTmpAscent, nTmpDescent, nFlyAsc, nFlyDesc; while( pPos ) { @@ -2456,7 +2456,7 @@ SwFlyCntPortion *SwTextFormatter::NewFlyCntPortion( SwTextFormatInfo &rInf, // aBase.X() = Offset in the line after the current position // aBase.Y() = LineIter.Y() + Ascent of the current position - sal_Int32 nTmpAscent, nTmpDescent, nFlyAsc, nFlyDesc; + long nTmpAscent, nTmpDescent, nFlyAsc, nFlyDesc; // i#11859 - use new method <SwLineLayout::MaxAscentDescent(..)> // to change line spacing behaviour at paragraph - Compatibility to MS Word //SwLinePortion *pPos = pCurr->GetFirstPortion(); @@ -2705,7 +2705,7 @@ namespace { rThis.GetCharRect( &aRect, nReformat ); txtFormatInfo.SetMulti( bOldMulti ); - return nFormatRepaint ? std::min<sal_Int32>( aRect.Left(), nFormatRepaint ) : + return nFormatRepaint ? std::min( aRect.Left(), nFormatRepaint ) : aRect.Left(); } else |