summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorJustin Luth <justin_luth@sil.org>2016-12-15 20:24:46 +0300
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2016-12-22 14:29:06 +0000
commit588d917d0af740bb75c7cf5085f0db63e35f2df0 (patch)
tree0b1b04ceaeb7a018abed31743a492eb2ff98efd9 /sw
parentd9ff86c9cf90925d0344b9572c651301847ca78c (diff)
tdf#75856 SwTwips: replace with unambiguous sal_Int32
Change-Id: Ifa59f8dad31ad0445c32ac0265dffff7c1573da4 Reviewed-on: https://gerrit.libreoffice.org/32051 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 426215ca6fedd13ece07463ee95dd33bdb1a9a28) Reviewed-on: https://gerrit.libreoffice.org/32330 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Diffstat (limited to 'sw')
-rw-r--r--sw/source/filter/ww8/ww8par6.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 59112cbb4d74..68b017e09b6d 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(