[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - sw/source

[Justin Luth]

 sw/source/filter/ww8/ww8par6.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 588d917d0af740bb75c7cf5085f0db63e35f2df0
Author: Justin Luth <justin_luth at sil.org>
Date:   Thu Dec 15 20:24:46 2016 +0300

    tdf#75856 SwTwips: replace with unambiguous sal_Int32
    
    Change-Id: Ifa59f8dad31ad0445c32ac0265dffff7c1573da4
    Reviewed-on: https://gerrit.libreoffice.org/32051
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    (cherry picked from commit 426215ca6fedd13ece07463ee95dd33bdb1a9a28)
    Reviewed-on: https://gerrit.libreoffice.org/32330
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>

diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 59112cb..68b017e 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -599,7 +599,7 @@ void wwSectionManager::SetPageULSpaceItems(SwFrameFormat &rFormat,
             else
             {
                 // #i48832# - set correct spacing between header and body.
-                const SwTwips nHdLowerSpace( std::abs(rSection.maSep.dyaTop) - rData.nSwUp - rData.nSwHLo );
+                const sal_Int32 nHdLowerSpace( std::abs(rSection.maSep.dyaTop) - rData.nSwUp - rData.nSwHLo );
                 pHdFormat->SetFormatAttr(SwFormatFrameSize(ATT_FIX_SIZE, 0, rData.nSwHLo + nHdLowerSpace));
                 aHdUL.SetLower( static_cast< sal_uInt16 >(nHdLowerSpace) );
                 pHdFormat->SetFormatAttr(SwHeaderAndFooterEatSpacingItem(