diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-01-30 17:17:18 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-01-30 21:13:50 +0100 |
| commit | 5925684856efcc16d7d8a284c236d43ae21599f8 (patch) | |
| tree | 20cd37258d3e944d921435c4a8bebcbda914857b /cui | |
| parent | 26138fa6815b840462983a818ce4232b287142bb (diff) | |
No apparent reason to limit nBulletWidth to sal_uInt16 instead of long
Change-Id: I7ce0705e9edd5cff4e6c6977909d7e903f6e1765
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/tabpages/numpages.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index 8cff042ae4e5..efbdbb233499 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -2388,15 +2388,15 @@ void SvxNumberingPreview::Paint(vcl::RenderContext& rRenderContext, const ::tool } } - sal_uInt16 nBulletWidth = 0; + long nBulletWidth = 0; if (SVX_NUM_BITMAP == (rFmt.GetNumberingType() &(~LINK_TOKEN))) { sal_uInt16 nYMiddle = nYStart + ( nFontHeight / 2 ); - nBulletWidth = rFmt.IsShowSymbol() ? static_cast<sal_uInt16>(lcl_DrawGraphic(pVDev.get(), rFmt, nNumberXPos, nYMiddle, nWidthRelation)) : 0; + nBulletWidth = rFmt.IsShowSymbol() ? lcl_DrawGraphic(pVDev.get(), rFmt, nNumberXPos, nYMiddle, nWidthRelation) : 0; } else if (SVX_NUM_CHAR_SPECIAL == rFmt.GetNumberingType()) { - nBulletWidth = rFmt.IsShowSymbol() ? static_cast<sal_uInt16>(lcl_DrawBullet(pVDev.get(), rFmt, nNumberXPos, nYStart, aStdFont.GetFontSize())) : 0; + nBulletWidth = rFmt.IsShowSymbol() ? lcl_DrawBullet(pVDev.get(), rFmt, nNumberXPos, nYStart, aStdFont.GetFontSize()) : 0; } else { @@ -2416,7 +2416,7 @@ void SvxNumberingPreview::Paint(vcl::RenderContext& rRenderContext, const ::tool pVDev->SetFont(aColorFont); pVDev->DrawText(Point(nNumberXPos, nYStart), aText); pVDev->SetFont(aSaveFont); - nBulletWidth = sal_uInt16(pVDev->GetTextWidth(aText)); + nBulletWidth = pVDev->GetTextWidth(aText); nPreNum++; } if (rFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_ALIGNMENT && @@ -2425,7 +2425,7 @@ void SvxNumberingPreview::Paint(vcl::RenderContext& rRenderContext, const ::tool pVDev->SetFont(aStdFont); OUString aText(' '); pVDev->DrawText( Point(nNumberXPos, nYStart), aText ); - nBulletWidth = nBulletWidth + static_cast<sal_uInt16>(pVDev->GetTextWidth(aText)); + nBulletWidth = nBulletWidth + pVDev->GetTextWidth(aText); } sal_uInt16 nTextXPos( 0 ); |