diff options
Diffstat (limited to 'vcl/source/control/fixed.cxx')
| -rw-r--r-- | vcl/source/control/fixed.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx index 91e001ac9bc9..51688a092564 100644 --- a/vcl/source/control/fixed.cxx +++ b/vcl/source/control/fixed.cxx @@ -46,8 +46,8 @@ constexpr auto FIXEDIMAGE_VIEW_STYLE = WB_3DLOOK | static Point ImplCalcPos( WinBits nStyle, const Point& rPos, const Size& rObjSize, const Size& rWinSize ) { - long nX; - long nY; + tools::Long nX; + tools::Long nY; if ( nStyle & WB_LEFT ) nX = 0; @@ -296,7 +296,7 @@ void FixedText::DataChanged( const DataChangedEvent& rDCEvt ) } } -Size FixedText::getTextDimensions(Control const *pControl, const OUString &rTxt, long nMaxWidth) +Size FixedText::getTextDimensions(Control const *pControl, const OUString &rTxt, tools::Long nMaxWidth) { DrawTextFlags nStyle = ImplGetTextStyle( pControl->GetStyle() ); if ( !( pControl->GetStyle() & WB_NOLABEL ) ) @@ -306,7 +306,7 @@ Size FixedText::getTextDimensions(Control const *pControl, const OUString &rTxt, rTxt, nStyle).GetSize(); } -Size FixedText::CalcMinimumTextSize( Control const *pControl, long nMaxWidth ) +Size FixedText::CalcMinimumTextSize( Control const *pControl, tools::Long nMaxWidth ) { Size aSize = getTextDimensions(pControl, pControl->GetText(), nMaxWidth); @@ -322,7 +322,7 @@ Size FixedText::CalcMinimumTextSize( Control const *pControl, long nMaxWidth ) return aSize; } -Size FixedText::CalcMinimumSize( long nMaxWidth ) const +Size FixedText::CalcMinimumSize( tools::Long nMaxWidth ) const { return CalcWindowSize( CalcMinimumTextSize ( this, nMaxWidth ) ); } @@ -493,18 +493,18 @@ void FixedLine::ImplDraw(vcl::RenderContext& rRenderContext) { if (nWinStyle & WB_VERT) { - long nX = (aOutSize.Width() - 1) / 2; + tools::Long nX = (aOutSize.Width() - 1) / 2; aDecoView.DrawSeparator(Point(nX, 0), Point(nX, aOutSize.Height() - 1)); } else { - long nY = (aOutSize.Height() - 1) / 2; + tools::Long nY = (aOutSize.Height() - 1) / 2; aDecoView.DrawSeparator(Point(0, nY), Point(aOutSize.Width() - 1, nY), false); } } else if (nWinStyle & WB_VERT) { - long nWidth = rRenderContext.GetTextWidth(aText); + tools::Long nWidth = rRenderContext.GetTextWidth(aText); rRenderContext.Push(PushFlags::FONT); vcl::Font aFont(rRenderContext.GetFont()); aFont.SetOrientation(900); @@ -540,7 +540,7 @@ void FixedLine::ImplDraw(vcl::RenderContext& rRenderContext) aRect = DrawControlText(*this, aRect, aText, nStyle, nullptr, nullptr); - long nTop = aRect.Top() + ((aRect.GetHeight() - 1) / 2); + tools::Long nTop = aRect.Top() + ((aRect.GetHeight() - 1) / 2); aDecoView.DrawSeparator(Point(aRect.Right() + FIXEDLINE_TEXT_BORDER, nTop), Point(aOutSize.Width() - 1, nTop), false); if (aRect.Left() > FIXEDLINE_TEXT_BORDER) aDecoView.DrawSeparator(Point(0, nTop), Point(aRect.Left() - FIXEDLINE_TEXT_BORDER, nTop), false); |