Skip to content

C
core
Kaydet (Commit) 4c82b221 authored tarafından Stephan Bergmann's avatar Stephan Bergmann
Dosyalara gözat
Seçenekler

No apparent reason to limit nTextOffset to sal_uInt16 instead of long 

Change-Id: Idbd4e4aae63441537aff243d852272739b73f78e
üst 59256848
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
cui/source/tabpages/numpages.cxx
Dosyayı görüntüle @ 4c82b221
......@@ -2506,13 +2506,13 @@ void SvxNumberingPreview::Paint(vcl::RenderContext& rRenderContext, const ::tool
}
nXStart /= 2;
nXStart += 2;
sal_uInt16 nTextOffset = 2 * nXStep;
long nTextOffset = 2 * nXStep;
if (SVX_NUM_BITMAP == (rFmt.GetNumberingType()&(~LINK_TOKEN)))
{
if (rFmt.IsShowSymbol())
{
sal_uInt16 nYMiddle = nYStart + ( nFontHeight / 2 );
nTextOffset = static_cast<sal_uInt16>(lcl_DrawGraphic(pVDev.get(), rFmt, nXStart, nYMiddle, nWidthRelation));
nTextOffset = lcl_DrawGraphic(pVDev.get(), rFmt, nXStart, nYMiddle, nWidthRelation);
nTextOffset = nTextOffset + nXStep;
}
}
......@@ -2520,7 +2520,7 @@ void SvxNumberingPreview::Paint(vcl::RenderContext& rRenderContext, const ::tool
{
if (rFmt.IsShowSymbol())
{
nTextOffset = static_cast<sal_uInt16>(lcl_DrawBullet(pVDev.get(), rFmt, nXStart, nYStart, aStdFont.GetFontSize()));
nTextOffset = lcl_DrawBullet(pVDev.get(), rFmt, nXStart, nYStart, aStdFont.GetFontSize());
nTextOffset = nTextOffset + nXStep;
}
}
......@@ -2540,7 +2540,7 @@ void SvxNumberingPreview::Paint(vcl::RenderContext& rRenderContext, const ::tool
OUString aText(pActNum->MakeNumString(aNum));
pVDev->DrawText(Point(nXStart, nYStart), aText);
pVDev->SetFont(aStdFont);
nTextOffset = static_cast<sal_uInt16>(pVDev->GetTextWidth(aText));
nTextOffset = pVDev->GetTextWidth(aText);
nTextOffset = nTextOffset + nXStep;
nPreNum++;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment