accessibility/inc/helper/listboxhelper.hxx | 2
accessibility/source/standard/vclxaccessiblelistitem.cxx | 2
desktop/source/lib/init.cxx | 4 -
editeng/source/editeng/editdbg.cxx | 4 -
include/vcl/outdev.hxx | 2
lotuswordpro/source/filter/lwpdrawobj.cxx | 4 -
sc/source/ui/app/inputwin.cxx | 4 -
sc/source/ui/cctrl/tbzoomsliderctrl.cxx | 2
sd/source/ui/dlg/headerfooterdlg.cxx | 2
starmath/source/rect.cxx | 2
svtools/source/brwbox/brwbox1.cxx | 2
svtools/source/brwbox/brwbox2.cxx | 2
svtools/source/hatchwindow/ipwin.cxx | 2
svx/source/dialog/connctrl.cxx | 2
svx/source/dialog/svxbmpnumvalueset.cxx | 4 -
svx/source/stbctrls/zoomsliderctrl.cxx | 2
svx/source/unodraw/UnoGraphicExporter.cxx | 2
sw/source/uibase/docvw/AnnotationWin2.cxx | 2
vcl/source/control/combobox.cxx | 2
vcl/source/control/listbox.cxx | 2
vcl/source/gdi/pdfwriter_impl.cxx | 32 +++++++--------
vcl/source/window/menu.cxx | 2
vcl/unx/generic/print/common_gfx.cxx | 16 +++----
23 files changed, 50 insertions(+), 50 deletions(-)
New commits:
commit ddf8a2f91bb14be1b1cca2d2ea0ebd7fda5dd0fe
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Jan 27 15:03:17 2021 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Thu Jan 28 11:55:30 2021 +0100
TopLeft().Y() -> Top() etc.
TopLeft().X() -> Left()
BottomLeft().X() -> Left()
TopRight().X() -> Right()
BottomRight().X() -> Right()
TopLeft().Y() -> Top()
TopRight().Y() -> Top()
BottomLeft().Y() -> Bottom()
BottomRight().Y() -> Bottom()
Change-Id: I5050f619bf92cfc59b6f8dfe7c9f98ef1453c294
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110022
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/accessibility/inc/helper/listboxhelper.hxx
b/accessibility/inc/helper/listboxhelper.hxx
index b5e09034d01c..dfadf37aa015 100644
--- a/accessibility/inc/helper/listboxhelper.hxx
+++ b/accessibility/inc/helper/listboxhelper.hxx
@@ -51,7 +51,7 @@ public:
{
tools::Rectangle aTemp =
m_aComboListBox.GetWindowExtentsRelative(nullptr);
tools::Rectangle aRet = m_aComboListBox.GetDropDownPosSizePixel();
- aRet.Move(aTemp.TopLeft().X(),aTemp.TopLeft().Y());
+ aRet.Move(aTemp.Left(), aTemp.Top());
return aRet;
}
diff --git a/accessibility/source/standard/vclxaccessiblelistitem.cxx
b/accessibility/source/standard/vclxaccessiblelistitem.cxx
index 7f807c5e7240..872f75b40581 100644
--- a/accessibility/source/standard/vclxaccessiblelistitem.cxx
+++ b/accessibility/source/standard/vclxaccessiblelistitem.cxx
@@ -295,7 +295,7 @@ sal_Bool SAL_CALL VCLXAccessibleListItem::containsPoint(
const awt::Point& _aPoi
if (pListBoxHelper)
{
tools::Rectangle
aRect(pListBoxHelper->GetBoundingRectangle(static_cast<sal_uInt16>(m_nIndexInParent)));
- aRect.Move(-aRect.TopLeft().X(),-aRect.TopLeft().Y());
+ aRect.Move(-aRect.Left(), -aRect.Top());
bInside = aRect.IsInside( VCLPoint( _aPoint ) );
}
return bInside;
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index fbbf450b6530..0931ffda08ac 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -5303,8 +5303,8 @@ unsigned char*
doc_renderFontOrientation(SAL_UNUSED_PARAMETER LibreOfficeKitDocu
if (aRect.IsEmpty())
break;
- int nFontWidth = aRect.BottomRight().X() + 1;
- int nFontHeight = aRect.BottomRight().Y() + 1;
+ int nFontWidth = aRect.Right() + 1;
+ int nFontHeight = aRect.Bottom() + 1;
if (nFontWidth <= 0 || nFontHeight <= 0)
break;
diff --git a/editeng/source/editeng/editdbg.cxx
b/editeng/source/editeng/editdbg.cxx
index 3598036e2240..639e936a9558 100644
--- a/editeng/source/editeng/editdbg.cxx
+++ b/editeng/source/editeng/editdbg.cxx
@@ -465,10 +465,10 @@ void EditEngine::DumpData(const EditEngine* pEE, bool
bInfoBox)
fprintf( fp, "\nView %zu: Focus=%i", nView,
pV->GetWindow()->HasFocus() );
tools::Rectangle aR( pV->GetOutputArea() );
fprintf( fp, "\n OutputArea: nX=%" SAL_PRIdINT64 ", nY=%"
SAL_PRIdINT64 ", dX=%" SAL_PRIdINT64 ", dY=%" SAL_PRIdINT64 ", MapMode = %i",
- sal_Int64(aR.TopLeft().X()), sal_Int64(aR.TopLeft().Y()),
sal_Int64(aR.GetSize().Width()), sal_Int64(aR.GetSize().Height()) , int(
pV->GetWindow()->GetMapMode().GetMapUnit() ) );
+ sal_Int64(aR.Left()), sal_Int64(aR.Top()),
sal_Int64(aR.GetSize().Width()), sal_Int64(aR.GetSize().Height()) , int(
pV->GetWindow()->GetMapMode().GetMapUnit() ) );
aR = pV->GetVisArea();
fprintf( fp, "\n VisArea: nX=%" SAL_PRIdINT64 ", nY=%" SAL_PRIdINT64
", dX=%" SAL_PRIdINT64 ", dY=%" SAL_PRIdINT64,
- sal_Int64(aR.TopLeft().X()), sal_Int64(aR.TopLeft().Y()),
sal_Int64(aR.GetSize().Width()), sal_Int64(aR.GetSize().Height()) );
+ sal_Int64(aR.Left()), sal_Int64(aR.Top()),
sal_Int64(aR.GetSize().Width()), sal_Int64(aR.GetSize().Height()) );
ESelection aSel = pV->GetSelection();
fprintf( fp, "\n Selection: Start=%" SAL_PRIdINT32 ",%" SAL_PRIdINT32
", End=%" SAL_PRIdINT32 ",%" SAL_PRIdINT32, aSel.nStartPara, aSel.nStartPos,
aSel.nEndPara, aSel.nEndPos );
}
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 8c4f47b74ad4..d101b6c8c571 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -1061,7 +1061,7 @@ public:
tools::Rectangle aRect;
aDevice.GetTextBoundRect(aRect, aText);
- aDevice.SetOutputSize(Size(aRect.BottomRight().X() + 1,
aRect.BottomRight().Y() + 1));
+ aDevice.SetOutputSize(Size(aRect.Right() + 1, aRect.Bottom() + 1));
aDevice.SetBackground(Wallpaper(COL_TRANSPARENT));
aDevice.DrawText(Point(0,0), aText);
diff --git a/lotuswordpro/source/filter/lwpdrawobj.cxx
b/lotuswordpro/source/filter/lwpdrawobj.cxx
index 88f25d9a78e9..547017a68555 100644
--- a/lotuswordpro/source/filter/lwpdrawobj.cxx
+++ b/lotuswordpro/source/filter/lwpdrawobj.cxx
@@ -785,8 +785,8 @@ XFFrame* LwpDrawRectangle::CreateStandardDrawObj(const
OUString& rStyleName)
aOriginalRect = tools::Rectangle(aPt0, aPt2);
}
- fStartX = aOriginalRect.TopLeft().X();
- fStartY = aOriginalRect.TopLeft().Y();
+ fStartX = aOriginalRect.Left();
+ fStartY = aOriginalRect.Top();
fWidth = aOriginalRect.GetWidth();
fHeight = aOriginalRect.GetHeight();
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 54e4df5afecd..7b770be225f7 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -1345,7 +1345,7 @@ void ScTextWnd::SetScrollBarRange()
Size aOutputSize = rDevice.GetOutputSize();
int nUpper = GetEditEngTxtHeight();
- int nCurrentDocPos = m_xEditView->GetVisArea().TopLeft().Y();
+ int nCurrentDocPos = m_xEditView->GetVisArea().Top();
int nStepIncrement = GetTextHeight();
int nPageIncrement = aOutputSize.Height();
int nPageSize = aOutputSize.Height();
@@ -1371,7 +1371,7 @@ void ScTextWnd::DoScroll()
if (m_xEditView)
{
weld::ScrolledWindow& rVBar = mrGroupBar.GetScrollWin();
- auto currentDocPos = m_xEditView->GetVisArea().TopLeft().Y();
+ auto currentDocPos = m_xEditView->GetVisArea().Top();
auto nDiff = currentDocPos - rVBar.vadjustment_get_value();
// we expect SetScrollBarRange callback to be triggered by Scroll
// to set where we ended up
diff --git a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx
b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx
index ca7133167308..2b00ebea34d1 100644
--- a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx
+++ b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx
@@ -459,7 +459,7 @@ void ScZoomSlider::DoPaint(vcl::RenderContext&
rRenderContext)
pVDev->DrawImage(aImagePoint, mpImpl->maDecreaseButton);
// draw increase button
- aImagePoint.setX( aRect.TopLeft().X() + aSliderWindowSize.Width() -
nIncDecWidth - (nSliderXOffset - nIncDecWidth) / 2 );
+ aImagePoint.setX( aRect.Left() + aSliderWindowSize.Width() - nIncDecWidth
- (nSliderXOffset - nIncDecWidth) / 2 );
pVDev->DrawImage(aImagePoint, mpImpl->maIncreaseButton);
rRenderContext.DrawOutDev(Point(0, 0), aSliderWindowSize, Point(0, 0),
aSliderWindowSize, *pVDev);
diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx
b/sd/source/ui/dlg/headerfooterdlg.cxx
index ecd69fc1ca35..30b243c7fc5b 100644
--- a/sd/source/ui/dlg/headerfooterdlg.cxx
+++ b/sd/source/ui/dlg/headerfooterdlg.cxx
@@ -662,7 +662,7 @@ void PresLayoutPreview::Paint(vcl::RenderContext&
rRenderContext, SdrTextObj con
const double fScaleX(static_cast<double>(maOutRect.getWidth()) /
static_cast<double>(maPageSize.Width()));
const double fScaleY(static_cast<double>(maOutRect.getHeight()) /
static_cast<double>(maPageSize.Height()));
aObjectTransform.scale(fScaleX, fScaleY);
- aObjectTransform.translate(maOutRect.TopLeft().X(),
maOutRect.TopLeft().Y());
+ aObjectTransform.translate(maOutRect.Left(), maOutRect.Top());
// create geometry using unit range and object transform
basegfx::B2DPolyPolygon aGeometry(basegfx::utils::createUnitPolygon());
diff --git a/starmath/source/rect.cxx b/starmath/source/rect.cxx
index edb1e738ac59..3cc94da55a62 100644
--- a/starmath/source/rect.cxx
+++ b/starmath/source/rect.cxx
@@ -239,7 +239,7 @@ SmRect::SmRect(const OutputDevice &rDev, const SmFormat
*pFormat,
nDist = (rDev.GetFont().GetFontSize().Height()
* pFormat->GetDistance(DIS_ORNAMENTSIZE)) / 100;
- nHiAttrFence = aGlyphRect.TopLeft().Y() - 1 - nBorderWidth - nDist;
+ nHiAttrFence = aGlyphRect.Top() - 1 - nBorderWidth - nDist;
nLoAttrFence = SmFromTo(GetAlignB(), GetBottom(), 0.0);
nGlyphTop = aGlyphRect.Top() - nBorderWidth;
diff --git a/svtools/source/brwbox/brwbox1.cxx
b/svtools/source/brwbox/brwbox1.cxx
index 7fbb0d08797f..fb393cca29e2 100644
--- a/svtools/source/brwbox/brwbox1.cxx
+++ b/svtools/source/brwbox/brwbox1.cxx
@@ -2017,7 +2017,7 @@ tools::Rectangle BrowseBox::GetRowRectPixel( sal_Int32
nRow ) const
aRect = tools::Rectangle(
Point( 0, GetDataRowHeight() * (nRow-nTopRow) ),
Size( pDataWin->GetOutputSizePixel().Width(), GetDataRowHeight() ) );
- if ( aRect.TopLeft().Y() > pDataWin->GetOutputSizePixel().Height() )
+ if ( aRect.Top() > pDataWin->GetOutputSizePixel().Height() )
// row is below visible area
return aRect;
diff --git a/svtools/source/brwbox/brwbox2.cxx
b/svtools/source/brwbox/brwbox2.cxx
index 72830817e192..3ad89e4a4bbc 100644
--- a/svtools/source/brwbox/brwbox2.cxx
+++ b/svtools/source/brwbox/brwbox2.cxx
@@ -825,7 +825,7 @@ void BrowseBox::ImplPaintData(OutputDevice& _rOut, const
tools::Rectangle& _rRec
// #73325# don't paint the row outside the painting rectangle (DG)
// prepare auto-highlight
- tools::Rectangle aRowRect( Point( _rRect.TopLeft().X(), aPos.Y() ),
+ tools::Rectangle aRowRect( Point( _rRect.Left(), aPos.Y() ),
Size( _rRect.GetSize().Width(), nDataRowHeigt ) );
bool bRowSelected = !bHideSelect
diff --git a/svtools/source/hatchwindow/ipwin.cxx
b/svtools/source/hatchwindow/ipwin.cxx
index 751f3efa5e83..d2b56e5e236e 100644
--- a/svtools/source/hatchwindow/ipwin.cxx
+++ b/svtools/source/hatchwindow/ipwin.cxx
@@ -249,7 +249,7 @@ Point SvResizeHelper::GetTrackPosPixel( const
tools::Rectangle & rRect ) const
break;
case 7:
if( bRTL )
- aPos.setX( aRect.Right() + aOuter.Right() -
aOuter.TopRight().X() );
+ aPos.setX( aRect.Right() + aOuter.Right() - aOuter.Right() );
else
aPos.setX( aRect.Left() - aOuter.Left() );
break;
diff --git a/svx/source/dialog/connctrl.cxx b/svx/source/dialog/connctrl.cxx
index e3496cafed57..ecc0cc98f0cb 100644
--- a/svx/source/dialog/connctrl.cxx
+++ b/svx/source/dialog/connctrl.cxx
@@ -116,7 +116,7 @@ void SvxXConnectionPreview::AdaptSize()
// Origin
aNewPos = aDisplayMap.GetOrigin();
- aNewPos -= Point( aRect.TopLeft().X(), aRect.TopLeft().Y() );
+ aNewPos -= Point( aRect.Left(), aRect.Top() );
aDisplayMap.SetOrigin( aNewPos );
SetMapMode( aDisplayMap );
diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx
b/svx/source/dialog/svxbmpnumvalueset.cxx
index c86145630402..b848fa63672b 100644
--- a/svx/source/dialog/svxbmpnumvalueset.cxx
+++ b/svx/source/dialog/svxbmpnumvalueset.cxx
@@ -261,8 +261,8 @@ void SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt )
// has to be made again
pVDev->SetLineColor(aBackColor);
pVDev->DrawRect(aOrgRect);
- tools::Long nStartX = aOrgRect.TopLeft().X();
- tools::Long nStartY = aOrgRect.TopLeft().Y();
+ tools::Long nStartX = aOrgRect.Left();
+ tools::Long nStartY = aOrgRect.Top();
if(xFormatter.is() && aOutlineSettings.getLength() > nItemId - 1)
{
diff --git a/svx/source/stbctrls/zoomsliderctrl.cxx
b/svx/source/stbctrls/zoomsliderctrl.cxx
index 822c28ed59b5..9860edcc54d7 100644
--- a/svx/source/stbctrls/zoomsliderctrl.cxx
+++ b/svx/source/stbctrls/zoomsliderctrl.cxx
@@ -275,7 +275,7 @@ void SvxZoomSliderControl::Paint( const UserDrawEvent&
rUsrEvt )
pDev->DrawImage( aImagePoint, mxImpl->maDecreaseButton );
// draw increase button
- aImagePoint.setX( aRect.TopLeft().X() + aControlRect.GetWidth() -
mxImpl->maIncreaseButton.GetSizePixel().Width() - (nSliderXOffset -
mxImpl->maIncreaseButton.GetSizePixel().Height())/2 );
+ aImagePoint.setX( aRect.Left() + aControlRect.GetWidth() -
mxImpl->maIncreaseButton.GetSizePixel().Width() - (nSliderXOffset -
mxImpl->maIncreaseButton.GetSizePixel().Height())/2 );
pDev->DrawImage( aImagePoint, mxImpl->maIncreaseButton );
pDev->SetLineColor( aOldLineColor );
diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx
b/svx/source/unodraw/UnoGraphicExporter.cxx
index 87f2e40bfc36..e53f3a7cf0df 100644
--- a/svx/source/unodraw/UnoGraphicExporter.cxx
+++ b/svx/source/unodraw/UnoGraphicExporter.cxx
@@ -920,7 +920,7 @@ bool GraphicExporter::GetGraphic( ExportSettings const &
rSettings, Graphic& aGr
aMtf.Record( aOut );
MapMode aOutMap( aMap );
- aOutMap.SetOrigin( Point( -aBound.TopLeft().X(),
-aBound.TopLeft().Y() ) );
+ aOutMap.SetOrigin( Point( -aBound.Left(), -aBound.Top() ) );
aOut->SetRelativeMapMode( aOutMap );
sdr::contact::DisplayInfo aDisplayInfo;
diff --git a/sw/source/uibase/docvw/AnnotationWin2.cxx
b/sw/source/uibase/docvw/AnnotationWin2.cxx
index 9a067038d773..46376d0b2506 100644
--- a/sw/source/uibase/docvw/AnnotationWin2.cxx
+++ b/sw/source/uibase/docvw/AnnotationWin2.cxx
@@ -677,7 +677,7 @@ void SwAnnotationWin::SetPosAndSize()
mpSidebarTextControl->Pop();
}
- if (GetPosPixel().X() != mPosSize.TopLeft().X() ||
(std::abs(GetPosPixel().Y() - mPosSize.TopLeft().Y()) > 5) )
+ if (GetPosPixel().X() != mPosSize.Left() || (std::abs(GetPosPixel().Y() -
mPosSize.Top()) > 5) )
{
bChange = true;
SetPosPixel(mPosSize.TopLeft());
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 89bf43b075f7..c3611d499f84 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -1390,7 +1390,7 @@ tools::Rectangle ComboBox::GetBoundingRectangle(
sal_Int32 nItem ) const
{
tools::Rectangle aRect =
m_pImpl->m_pImplLB->GetMainWindow()->GetBoundingRectangle( nItem );
tools::Rectangle aOffset =
m_pImpl->m_pImplLB->GetMainWindow()->GetWindowExtentsRelative(
static_cast<vcl::Window*>(const_cast<ComboBox *>(this)) );
- aRect.Move( aOffset.TopLeft().X(), aOffset.TopLeft().Y() );
+ aRect.Move( aOffset.Left(), aOffset.Top() );
return aRect;
}
diff --git a/vcl/source/control/listbox.cxx b/vcl/source/control/listbox.cxx
index fccaf1227920..02e1986b497d 100644
--- a/vcl/source/control/listbox.cxx
+++ b/vcl/source/control/listbox.cxx
@@ -1117,7 +1117,7 @@ tools::Rectangle ListBox::GetBoundingRectangle( sal_Int32
nItem ) const
{
tools::Rectangle aRect = mpImplLB->GetMainWindow()->GetBoundingRectangle(
nItem );
tools::Rectangle aOffset =
mpImplLB->GetMainWindow()->GetWindowExtentsRelative(
static_cast<vcl::Window*>(const_cast<ListBox *>(this)) );
- aRect.Move( aOffset.TopLeft().X(), aOffset.TopLeft().Y() );
+ aRect.Move( aOffset.Left(), aOffset.Top() );
return aRect;
}
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx
b/vcl/source/gdi/pdfwriter_impl.cxx
index 405965cbacbd..967dcf62dece 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -2588,13 +2588,13 @@ sal_Int32 PDFWriterImpl::emitFontDescriptor( const
PhysicalFontFace* pFont, Font
aLine.append( "\n"
"/FontBBox[" );
// note: Top and Bottom are reversed in VCL and PDF rectangles
- aLine.append( static_cast<sal_Int32>(rInfo.m_aFontBBox.TopLeft().X()) );
+ aLine.append( static_cast<sal_Int32>(rInfo.m_aFontBBox.Left()) );
aLine.append( ' ' );
- aLine.append( static_cast<sal_Int32>(rInfo.m_aFontBBox.TopLeft().Y()) );
+ aLine.append( static_cast<sal_Int32>(rInfo.m_aFontBBox.Top()) );
aLine.append( ' ' );
- aLine.append( static_cast<sal_Int32>(rInfo.m_aFontBBox.BottomRight().X())
);
+ aLine.append( static_cast<sal_Int32>(rInfo.m_aFontBBox.Right()) );
aLine.append( ' ' );
- aLine.append(
static_cast<sal_Int32>(rInfo.m_aFontBBox.BottomRight().Y()+1) );
+ aLine.append( static_cast<sal_Int32>(rInfo.m_aFontBBox.Bottom()+1) );
aLine.append( "]/ItalicAngle " );
if( pFont->GetItalic() == ITALIC_OBLIQUE || pFont->GetItalic() ==
ITALIC_NORMAL )
aLine.append( "-30" );
@@ -7499,24 +7499,24 @@ void PDFWriterImpl::drawRectangle( const
tools::Rectangle& rRect, sal_uInt32 nHo
const sal_uInt32 kx =
static_cast<sal_uInt32>((kappa*static_cast<double>(nHorzRound))+0.5);
const sal_uInt32 ky =
static_cast<sal_uInt32>((kappa*static_cast<double>(nVertRound))+0.5);
- aPoints[1] = Point( rRect.TopLeft().X() + nHorzRound, rRect.TopLeft().Y()
);
+ aPoints[1] = Point( rRect.Left() + nHorzRound, rRect.Top() );
aPoints[0] = Point( aPoints[1].X() - kx, aPoints[1].Y() );
- aPoints[2] = Point( rRect.TopRight().X()+1 - nHorzRound, aPoints[1].Y() );
+ aPoints[2] = Point( rRect.Right()+1 - nHorzRound, aPoints[1].Y() );
aPoints[3] = Point( aPoints[2].X()+kx, aPoints[2].Y() );
- aPoints[5] = Point( rRect.TopRight().X()+1,
rRect.TopRight().Y()+nVertRound );
+ aPoints[5] = Point( rRect.Right()+1, rRect.Top()+nVertRound );
aPoints[4] = Point( aPoints[5].X(), aPoints[5].Y()-ky );
- aPoints[6] = Point( aPoints[5].X(), rRect.BottomRight().Y()+1 -
nVertRound );
+ aPoints[6] = Point( aPoints[5].X(), rRect.Bottom()+1 - nVertRound );
aPoints[7] = Point( aPoints[6].X(), aPoints[6].Y()+ky );
- aPoints[9] = Point( rRect.BottomRight().X()+1-nHorzRound,
rRect.BottomRight().Y()+1 );
+ aPoints[9] = Point( rRect.Right()+1-nHorzRound, rRect.Bottom()+1 );
aPoints[8] = Point( aPoints[9].X()+kx, aPoints[9].Y() );
- aPoints[10] = Point( rRect.BottomLeft().X() + nHorzRound, aPoints[9].Y() );
+ aPoints[10] = Point( rRect.Left() + nHorzRound, aPoints[9].Y() );
aPoints[11] = Point( aPoints[10].X()-kx, aPoints[10].Y() );
- aPoints[13] = Point( rRect.BottomLeft().X(),
rRect.BottomLeft().Y()+1-nVertRound );
+ aPoints[13] = Point( rRect.Left(), rRect.Bottom()+1-nVertRound );
aPoints[12] = Point( aPoints[13].X(), aPoints[13].Y()+ky );
- aPoints[14] = Point( rRect.TopLeft().X(), rRect.TopLeft().Y()+nVertRound );
+ aPoints[14] = Point( rRect.Left(), rRect.Top()+nVertRound );
aPoints[15] = Point( aPoints[14].X(), aPoints[14].Y()-ky );
OStringBuffer aLine( 80 );
@@ -7581,19 +7581,19 @@ void PDFWriterImpl::drawEllipse( const
tools::Rectangle& rRect )
const sal_uInt32 kx =
static_cast<sal_uInt32>((kappa*static_cast<double>(rRect.GetWidth())/2.0)+0.5);
const sal_uInt32 ky =
static_cast<sal_uInt32>((kappa*static_cast<double>(rRect.GetHeight())/2.0)+0.5);
- aPoints[1] = Point( rRect.TopLeft().X() + rRect.GetWidth()/2,
rRect.TopLeft().Y() );
+ aPoints[1] = Point( rRect.Left() + rRect.GetWidth()/2, rRect.Top() );
aPoints[0] = Point( aPoints[1].X() - kx, aPoints[1].Y() );
aPoints[2] = Point( aPoints[1].X() + kx, aPoints[1].Y() );
- aPoints[4] = Point( rRect.TopRight().X()+1, rRect.TopRight().Y() +
rRect.GetHeight()/2 );
+ aPoints[4] = Point( rRect.Right()+1, rRect.Top() + rRect.GetHeight()/2 );
aPoints[3] = Point( aPoints[4].X(), aPoints[4].Y() - ky );
aPoints[5] = Point( aPoints[4].X(), aPoints[4].Y() + ky );
- aPoints[7] = Point( rRect.BottomLeft().X() + rRect.GetWidth()/2,
rRect.BottomLeft().Y()+1 );
+ aPoints[7] = Point( rRect.Left() + rRect.GetWidth()/2, rRect.Bottom()+1 );
aPoints[6] = Point( aPoints[7].X() + kx, aPoints[7].Y() );
aPoints[8] = Point( aPoints[7].X() - kx, aPoints[7].Y() );
- aPoints[10] = Point( rRect.TopLeft().X(), rRect.TopLeft().Y() +
rRect.GetHeight()/2 );
+ aPoints[10] = Point( rRect.Left(), rRect.Top() + rRect.GetHeight()/2 );
aPoints[9] = Point( aPoints[10].X(), aPoints[10].Y() + ky );
aPoints[11] = Point( aPoints[10].X(), aPoints[10].Y() - ky );
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 06aefe570199..825616b3d0aa 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -1706,7 +1706,7 @@ void Menu::ImplPaintMenuTitle(vcl::RenderContext&
rRenderContext, const tools::R
rRenderContext.GetTextBoundRect( aTextBoundRect, aTitleText );
aTextTopLeft.AdjustX((aBgRect.getWidth() -
aTextBoundRect.GetSize().Width()) / 2 );
aTextTopLeft.AdjustY((aBgRect.GetHeight() -
aTextBoundRect.GetSize().Height()) / 2
- - aTextBoundRect.TopLeft().Y() );
+ - aTextBoundRect.Top() );
rRenderContext.DrawText(aTextTopLeft, aTitleText, 0,
aTitleText.getLength());
// Restore
diff --git a/vcl/unx/generic/print/common_gfx.cxx
b/vcl/unx/generic/print/common_gfx.cxx
index b2ea22adb927..836677d77fa3 100644
--- a/vcl/unx/generic/print/common_gfx.cxx
+++ b/vcl/unx/generic/print/common_gfx.cxx
@@ -299,14 +299,14 @@ PrinterGfx::DrawRect (const tools::Rectangle& rRectangle )
{
OStringBuffer pRect;
- psp::getValueOf (rRectangle.TopLeft().X(), pRect);
- psp::appendStr (" ", pRect);
- psp::getValueOf (rRectangle.TopLeft().Y(), pRect);
- psp::appendStr (" ", pRect);
- psp::getValueOf (rRectangle.GetWidth(), pRect);
- psp::appendStr (" ", pRect);
- psp::getValueOf (rRectangle.GetHeight(), pRect);
- psp::appendStr (" ", pRect);
+ psp::getValueOf (rRectangle.Left(), pRect);
+ psp::appendStr (" ", pRect);
+ psp::getValueOf (rRectangle.Top(), pRect);
+ psp::appendStr (" ", pRect);
+ psp::getValueOf (rRectangle.GetWidth(), pRect);
+ psp::appendStr (" ", pRect);
+ psp::getValueOf (rRectangle.GetHeight(), pRect);
+ psp::appendStr (" ", pRect);
auto const rect = pRect.makeStringAndClear();
if( maFillColor.Is() )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
