[Libreoffice-commits] core.git: 2 commits - svtools/source svx/source
Noel Grandin
noel.grandin at collabora.co.uk
Tue Feb 20 11:55:05 UTC 2018
svtools/source/brwbox/brwbox1.cxx | 26 +--
svtools/source/brwbox/brwbox2.cxx | 60 +++----
svtools/source/brwbox/brwhead.cxx | 2
svtools/source/brwbox/datwin.cxx | 6
svtools/source/brwbox/editbrowsebox.cxx | 14 -
svtools/source/contnr/fileview.cxx | 4
svtools/source/contnr/iconview.cxx | 30 +--
svtools/source/contnr/iconviewimpl.cxx | 8
svtools/source/contnr/imivctl1.cxx | 206 ++++++++++++------------
svtools/source/contnr/simptabl.cxx | 10 -
svtools/source/contnr/svimpbox.cxx | 96 +++++------
svtools/source/contnr/svlbitm.cxx | 6
svtools/source/contnr/svtabbx.cxx | 2
svtools/source/contnr/treelistbox.cxx | 72 ++++----
svtools/source/control/calendar.cxx | 128 +++++++--------
svtools/source/control/ctrlbox.cxx | 22 +-
svtools/source/control/headbar.cxx | 56 +++---
svtools/source/control/hyperlabel.cxx | 4
svtools/source/control/roadmap.cxx | 8
svtools/source/control/ruler.cxx | 246 ++++++++++++++---------------
svtools/source/control/scriptedtext.cxx | 12 -
svtools/source/control/scrwin.cxx | 40 ++--
svtools/source/control/tabbar.cxx | 34 ++--
svtools/source/control/toolbarmenu.cxx | 48 ++---
svtools/source/control/valueset.cxx | 132 +++++++--------
svtools/source/dialogs/roadmapwizard.cxx | 2
svtools/source/dialogs/wizdlg.cxx | 24 +-
svtools/source/graphic/grfmgr.cxx | 32 +--
svtools/source/graphic/grfmgr2.cxx | 20 +-
svtools/source/graphic/provider.cxx | 8
svtools/source/hatchwindow/ipwin.cxx | 86 +++++-----
svtools/source/misc/embedhlp.cxx | 18 +-
svtools/source/misc/imap.cxx | 4
svtools/source/misc/transfer.cxx | 8
svtools/source/table/gridtablerenderer.cxx | 20 +-
svtools/source/table/tablecontrol_impl.cxx | 46 ++---
svtools/source/table/tablegeometry.cxx | 22 +-
svtools/source/uno/treecontrolpeer.cxx | 8
svtools/source/uno/unoiface.cxx | 2
svtools/source/urlobj/inetimg.cxx | 12 -
svx/source/svdraw/svdoashp.cxx | 43 +----
41 files changed, 804 insertions(+), 823 deletions(-)
New commits:
commit 7b8a0b7c0dcf8380a6bd2d458d0e20ffc6a5d355
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Mon Feb 19 16:21:28 2018 +0200
loplugin:changetoolsgen in svtools
Change-Id: I63271ee3126368868db7e7e859aaaa76b15e559e
Reviewed-on: https://gerrit.libreoffice.org/50023
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/svtools/source/brwbox/brwbox1.cxx b/svtools/source/brwbox/brwbox1.cxx
index 519c4ccc1b07..027549077fcb 100644
--- a/svtools/source/brwbox/brwbox1.cxx
+++ b/svtools/source/brwbox/brwbox1.cxx
@@ -377,10 +377,10 @@ void BrowseBox::SetColumnPos( sal_uInt16 nColumnId, sal_uInt16 nPos )
// determine old column area
Size aDataWinSize( pDataWin->GetSizePixel() );
if ( pDataWin->pHeaderBar )
- aDataWinSize.Height() += pDataWin->pHeaderBar->GetSizePixel().Height();
+ aDataWinSize.AdjustHeight(pDataWin->pHeaderBar->GetSizePixel().Height() );
tools::Rectangle aFromRect( GetFieldRect( nColumnId) );
- aFromRect.Right() += 2*MIN_COLUMNWIDTH;
+ aFromRect.AdjustRight(2*MIN_COLUMNWIDTH );
sal_uInt16 nNextPos = nOldPos + 1;
if ( nOldPos > nPos )
@@ -402,7 +402,7 @@ void BrowseBox::SetColumnPos( sal_uInt16 nColumnId, sal_uInt16 nPos )
// determine new column area
tools::Rectangle aToRect( GetFieldRect( nColumnId ) );
- aToRect.Right() += 2*MIN_COLUMNWIDTH;
+ aToRect.AdjustRight(2*MIN_COLUMNWIDTH );
// do scroll, let redraw
if( pDataWin->GetBackground().IsScrollable() )
@@ -413,7 +413,7 @@ void BrowseBox::SetColumnPos( sal_uInt16 nColumnId, sal_uInt16 nPos )
{
long nFrozenWidth = GetFrozenWidth();
if ( aToRect.Left() < nFrozenWidth )
- aToRect.Left() = nFrozenWidth;
+ aToRect.SetLeft( nFrozenWidth );
aScrollArea = tools::Rectangle(Point(aToRect.Left(),0),
Point(aNextRect.Right(),aDataWinSize.Height()));
nScroll *= -1; // reverse direction
@@ -423,8 +423,8 @@ void BrowseBox::SetColumnPos( sal_uInt16 nColumnId, sal_uInt16 nPos )
Point(aToRect.Right(),aDataWinSize.Height()));
pDataWin->Scroll( nScroll, 0, aScrollArea );
- aToRect.Top() = 0;
- aToRect.Bottom() = aScrollArea.Bottom();
+ aToRect.SetTop( 0 );
+ aToRect.SetBottom( aScrollArea.Bottom() );
Invalidate( aToRect );
}
else
@@ -588,7 +588,7 @@ void BrowseBox::SetColumnWidth( sal_uInt16 nItemId, sal_uLong nWidth )
GetSizePixel().Width() , // the header is longer than the datawin
pDataWin->GetPosPixel().Y() - 1 );
Control::Scroll( nWidth-nOldWidth, 0, aScrRect, SCROLL_FLAGS );
- aScrRect.Bottom() = pDataWin->GetSizePixel().Height();
+ aScrRect.SetBottom( pDataWin->GetSizePixel().Height() );
pDataWin->Scroll( nWidth-nOldWidth, 0, aScrRect, SCROLL_FLAGS );
tools::Rectangle aInvRect( nX, 0, nX + std::max( nWidth, static_cast<sal_uLong>(nOldWidth) ), USHRT_MAX );
Control::Invalidate( aInvRect, InvalidateFlags::NoChildren );
@@ -875,20 +875,20 @@ long BrowseBox::ScrollColumns( long nCols )
// invalidate the area of the column which was scrolled out to the left hand side
tools::Rectangle aInvalidateRect( aScrollRect );
- aInvalidateRect.Left() = nFrozenWidth;
- aInvalidateRect.Right() = nFrozenWidth + nDelta - 1;
+ aInvalidateRect.SetLeft( nFrozenWidth );
+ aInvalidateRect.SetRight( nFrozenWidth + nDelta - 1 );
Invalidate( aInvalidateRect );
}
// scroll the data-area
- aScrollRect.Bottom() = pDataWin->GetOutputSizePixel().Height();
+ aScrollRect.SetBottom( pDataWin->GetOutputSizePixel().Height() );
// actually scroll
pDataWin->Scroll( -nDelta, 0, aScrollRect, SCROLL_FLAGS );
// invalidate the area of the column which was scrolled out to the left hand side
- aScrollRect.Left() = nFrozenWidth;
- aScrollRect.Right() = nFrozenWidth + nDelta - 1;
+ aScrollRect.SetLeft( nFrozenWidth );
+ aScrollRect.SetRight( nFrozenWidth + nDelta - 1 );
pDataWin->Invalidate( aScrollRect );
}
}
@@ -920,7 +920,7 @@ long BrowseBox::ScrollColumns( long nCols )
}
// scroll the data-area
- aScrollRect.Bottom() = pDataWin->GetOutputSizePixel().Height();
+ aScrollRect.SetBottom( pDataWin->GetOutputSizePixel().Height() );
pDataWin->Scroll( nDelta, 0, aScrollRect, SCROLL_FLAGS );
}
}
diff --git a/svtools/source/brwbox/brwbox2.cxx b/svtools/source/brwbox/brwbox2.cxx
index 99040fcb7e75..7432a57edf49 100644
--- a/svtools/source/brwbox/brwbox2.cxx
+++ b/svtools/source/brwbox/brwbox2.cxx
@@ -279,10 +279,10 @@ void BrowseBox::ToggleSelection()
tools::Rectangle aRect( GetFieldRectPixel(nCurRow,
pCols[ nColId ]->GetId(),
false ) );
- aRect.Left() -= MIN_COLUMNWIDTH;
- aRect.Right() += MIN_COLUMNWIDTH;
- aRect.Top() = 0;
- aRect.Bottom() = pDataWin->GetOutputSizePixel().Height();
+ aRect.AdjustLeft( -(MIN_COLUMNWIDTH) );
+ aRect.AdjustRight(MIN_COLUMNWIDTH );
+ aRect.SetTop( 0 );
+ aRect.SetBottom( pDataWin->GetOutputSizePixel().Height() );
pDataWin->Invalidate( aRect );
}
@@ -319,9 +319,9 @@ void BrowseBox::DrawCursor()
if ( bColumnCursor )
{
aCursor = GetFieldRectPixel( nCurRow, nCurColId, false );
- aCursor.Left() -= MIN_COLUMNWIDTH;
- aCursor.Right() += 1;
- aCursor.Bottom() += 1;
+ aCursor.AdjustLeft( -(MIN_COLUMNWIDTH) );
+ aCursor.AdjustRight(1 );
+ aCursor.AdjustBottom(1 );
}
else
aCursor = tools::Rectangle(
@@ -333,8 +333,8 @@ void BrowseBox::DrawCursor()
if ( bHLines )
{
if ( !bMultiSelection )
- --aCursor.Top();
- --aCursor.Bottom();
+ aCursor.AdjustTop( -1 );
+ aCursor.AdjustBottom( -1 );
}
if (m_aCursorColor == COL_TRANSPARENT)
@@ -520,8 +520,8 @@ void BrowseBox::Resize()
// Control-Area
tools::Rectangle aInvalidArea( GetControlArea() );
- aInvalidArea.Right() = GetOutputSizePixel().Width();
- aInvalidArea.Left() = 0;
+ aInvalidArea.SetRight( GetOutputSizePixel().Width() );
+ aInvalidArea.SetLeft( 0 );
Invalidate( aInvalidArea );
// external header-bar
@@ -690,10 +690,10 @@ void BrowseBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize,
}
// a smaller area for the content
- ++aRealPos.X();
- ++aRealPos.Y();
- aRealSize.Width() -= 2;
- aRealSize.Height() -= 2;
+ aRealPos.AdjustX( 1 );
+ aRealPos.AdjustY( 1 );
+ aRealSize.AdjustWidth( -2 );
+ aRealSize.AdjustHeight( -2 );
// let the header bar draw itself
if ( pBar )
@@ -735,8 +735,8 @@ void BrowseBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize,
pDev->Pop();
}
- aRealPos.Y() += aHeaderSize.Height();
- aRealSize.Height() -= aHeaderSize.Height();
+ aRealPos.AdjustY(aHeaderSize.Height() );
+ aRealSize.AdjustHeight( -(aHeaderSize.Height()) );
}
// draw our own content (with clipping)
@@ -807,7 +807,7 @@ void BrowseBox::ImplPaintData(OutputDevice& _rOut, const tools::Rectangle& _rRec
// redraw the invalid fields
for ( sal_uLong nRelRow = nRelTopRow;
nRelRow <= nRelBottomRow && static_cast<sal_uLong>(nTopRow)+nRelRow < static_cast<sal_uLong>(nRowCount);
- ++nRelRow, aPos.Y() += nDataRowHeigt )
+ ++nRelRow, aPos.AdjustY(nDataRowHeigt ) )
{
// get row
// check valid area, to be on the safe side:
@@ -821,7 +821,7 @@ void BrowseBox::ImplPaintData(OutputDevice& _rOut, const tools::Rectangle& _rRec
OSL_FAIL("BrowseBox::ImplPaintData: SeekRow failed");
}
_rOut.SetClipRegion();
- aPos.X() = aOverallAreaPos.X();
+ aPos.setX( aOverallAreaPos.X() );
// #73325# don't paint the row outside the painting rectangle (DG)
@@ -893,14 +893,14 @@ void BrowseBox::ImplPaintData(OutputDevice& _rOut, const tools::Rectangle& _rRec
Size aFieldSize(pCol->Width(), nDataRowHeigt);
if (aPos.X() + aFieldSize.Width() > aOverallAreaBRPos.X())
- aFieldSize.Width() = aOverallAreaBRPos.X() - aPos.X();
+ aFieldSize.setWidth( aOverallAreaBRPos.X() - aPos.X() );
if (aPos.Y() + aFieldSize.Height() > aOverallAreaBRPos.Y() + 1)
{
// for non-handle cols we don't clip vertically : we just don't draw the cell if the line isn't completely visible
if (pCol->GetId() != 0)
continue;
- aFieldSize.Height() = aOverallAreaBRPos.Y() + 1 - aPos.Y();
+ aFieldSize.setHeight( aOverallAreaBRPos.Y() + 1 - aPos.Y() );
}
vcl::Region aClipToField(tools::Rectangle(aPos, aFieldSize));
@@ -920,7 +920,7 @@ void BrowseBox::ImplPaintData(OutputDevice& _rOut, const tools::Rectangle& _rRec
}
// skip column
- aPos.X() += pCol->Width();
+ aPos.AdjustX(pCol->Width() );
}
// reset auto-highlight
@@ -949,7 +949,7 @@ void BrowseBox::ImplPaintData(OutputDevice& _rOut, const tools::Rectangle& _rRec
}
if (aPos.Y() > aOverallAreaBRPos.Y() + 1)
- aPos.Y() = aOverallAreaBRPos.Y() + 1;
+ aPos.setY( aOverallAreaBRPos.Y() + 1 );
// needed for some of the following drawing
// retouching
@@ -996,7 +996,7 @@ void BrowseBox::ImplPaintData(OutputDevice& _rOut, const tools::Rectangle& _rRec
}
// skip column
- aVertPos.X() += pCol->Width();
+ aVertPos.AdjustX(pCol->Width() );
// at end of invalid area
// invalid area is first reached when X > Right
@@ -1067,14 +1067,14 @@ void BrowseBox::UpdateScrollbars()
{
pVScroll->Hide();
Size aNewSize( aDataWinSize );
- aNewSize.Width() = GetOutputSizePixel().Width();
+ aNewSize.setWidth( GetOutputSizePixel().Width() );
aDataWinSize = aNewSize;
}
}
else if ( !pVScroll->IsVisible() )
{
Size aNewSize( aDataWinSize );
- aNewSize.Width() = GetOutputSizePixel().Width() - nCornerSize;
+ aNewSize.setWidth( GetOutputSizePixel().Width() - nCornerSize );
aDataWinSize = aNewSize;
}
@@ -1091,14 +1091,14 @@ void BrowseBox::UpdateScrollbars()
{
aHScroll->Hide();
}
- aDataWinSize.Height() = GetOutputSizePixel().Height() - GetTitleHeight();
+ aDataWinSize.setHeight( GetOutputSizePixel().Height() - GetTitleHeight() );
if ( nControlAreaWidth != USHRT_MAX )
- aDataWinSize.Height() -= nCornerSize;
+ aDataWinSize.AdjustHeight( -sal_Int32(nCornerSize) );
}
else if ( !aHScroll->IsVisible() )
{
Size aNewSize( aDataWinSize );
- aNewSize.Height() = GetOutputSizePixel().Height() - GetTitleHeight() - nCornerSize;
+ aNewSize.setHeight( GetOutputSizePixel().Height() - GetTitleHeight() - nCornerSize );
aDataWinSize = aNewSize;
}
@@ -1941,7 +1941,7 @@ tools::Rectangle BrowseBox::calcHeaderRect(bool _bIsColumnBar, bool _bOnScreen)
}
else
{
- aTopLeft.Y() = GetDataRowHeight();
+ aTopLeft.setY( GetDataRowHeight() );
nWidth = GetColumnWidth(0);
nHeight = GetWindowExtentsRelative( pParent ).GetHeight() - aTopLeft.Y() - GetControlArea().GetSize().Height();
}
diff --git a/svtools/source/brwbox/brwhead.cxx b/svtools/source/brwbox/brwhead.cxx
index f8ffa0e834e3..2f592281d45e 100644
--- a/svtools/source/brwbox/brwhead.cxx
+++ b/svtools/source/brwbox/brwhead.cxx
@@ -53,7 +53,7 @@ void BrowserHeader::Command( const CommandEvent& rCEvt )
{
Point aPos( rCEvt.GetMousePosPixel() );
if ( _pBrowseBox->IsFrozen(0) )
- aPos.X() += _pBrowseBox->GetColumnWidth(0);
+ aPos.AdjustX(_pBrowseBox->GetColumnWidth(0) );
_pBrowseBox->GetDataWindow().Command( CommandEvent(
Point( aPos.X(), aPos.Y() - GetSizePixel().Height() ),
CommandEventId::ContextMenu, rCEvt.IsMouseEvent() ) );
diff --git a/svtools/source/brwbox/datwin.cxx b/svtools/source/brwbox/datwin.cxx
index 2ca807be8276..2385b7d8b907 100644
--- a/svtools/source/brwbox/datwin.cxx
+++ b/svtools/source/brwbox/datwin.cxx
@@ -362,7 +362,7 @@ void BrowserDataWin::StartDrag( sal_Int8 _nAction, const Point& _rPosPixel )
if ( !GetParent()->bRowDividerDrag )
{
Point aEventPos( _rPosPixel );
- aEventPos.Y() += GetParent()->GetTitleHeight();
+ aEventPos.AdjustY(GetParent()->GetTitleHeight() );
GetParent()->StartDrag( _nAction, aEventPos );
}
}
@@ -394,7 +394,7 @@ void BrowserDataWin::Command( const CommandEvent& rEvt )
bInCommand = false;
}
- aEventPos.Y() += GetParent()->GetTitleHeight();
+ aEventPos.AdjustY(GetParent()->GetTitleHeight() );
CommandEvent aEvt( aEventPos, rEvt.GetCommand(),
rEvt.IsMouseEvent(), rEvt.GetEventData() );
bInCommand = true;
@@ -528,7 +528,7 @@ void BrowserDataWin::Tracking( const TrackingEvent& rTEvt )
Point aMousePos = rTEvt.GetMouseEvent().GetPosPixel();
// stop resizing at our bottom line
if ( aMousePos.Y() > GetOutputSizePixel().Height() )
- aMousePos.Y() = GetOutputSizePixel().Height();
+ aMousePos.setY( GetOutputSizePixel().Height() );
if ( rTEvt.IsTrackingEnded() )
{
diff --git a/svtools/source/brwbox/editbrowsebox.cxx b/svtools/source/brwbox/editbrowsebox.cxx
index 02f2cb83cdda..05094cc40c30 100644
--- a/svtools/source/brwbox/editbrowsebox.cxx
+++ b/svtools/source/brwbox/editbrowsebox.cxx
@@ -317,18 +317,18 @@ namespace svt
Image aImage(GetImage(eStatus));
// calc the image position
Size aImageSize(aImage.GetSizePixel());
- aImageSize.Width() = CalcZoom(aImageSize.Width());
- aImageSize.Height() = CalcZoom(aImageSize.Height());
+ aImageSize.setWidth( CalcZoom(aImageSize.Width()) );
+ aImageSize.setHeight( CalcZoom(aImageSize.Height()) );
Point aPos( rRect.TopLeft() );
if ( ( aImageSize.Width() > rRect.GetWidth() ) || ( aImageSize.Height() > rRect.GetHeight() ) )
rDev.SetClipRegion(vcl::Region(rRect));
if ( aImageSize.Width() < rRect.GetWidth() )
- aPos.X() += ( rRect.GetWidth() - aImageSize.Width() ) / 2;
+ aPos.AdjustX(( rRect.GetWidth() - aImageSize.Width() ) / 2 );
if ( aImageSize.Height() < rRect.GetHeight() )
- aPos.Y() += ( rRect.GetHeight() - aImageSize.Height() ) / 2;
+ aPos.AdjustY(( rRect.GetHeight() - aImageSize.Height() ) / 2 );
if ( IsZoom() )
rDev.DrawImage( aPos, aImageSize, aImage );
@@ -1019,8 +1019,8 @@ return;
tools::Rectangle aRect( GetFieldRectPixel(nRow, nColId, bRel));
if ((GetMode() & BrowserMode::CURSOR_WO_FOCUS) == BrowserMode::CURSOR_WO_FOCUS)
{
- aRect.Top() += 1;
- aRect.Bottom() -= 1;
+ aRect.AdjustTop(1 );
+ aRect.AdjustBottom( -1 );
}
return aRect;
}
@@ -1193,7 +1193,7 @@ return;
{
tools::Rectangle aHdlFieldRect( GetFieldRectPixel( 0, 0 ));
tools::Rectangle aInvalidRect( Point(0,0), GetOutputSizePixel() );
- aInvalidRect.Right() = aHdlFieldRect.Right();
+ aInvalidRect.SetRight( aHdlFieldRect.Right() );
Invalidate( aInvalidRect );
}
diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
index 02565a04ef84..df6ef2fda9ae 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -569,7 +569,7 @@ void ViewTabListBox_Impl::Resize()
if ( mbShowHeader )
{
aBarSize = mpHeaderBar->GetSizePixel();
- aBarSize.Width() = mbAutoResize ? aBoxSize.Width() : GetSizePixel().Width();
+ aBarSize.setWidth( mbAutoResize ? aBoxSize.Width() : GetSizePixel().Width() );
mpHeaderBar->SetSizePixel( aBarSize );
}
@@ -1299,7 +1299,7 @@ IMPL_LINK( SvtFileView, HeaderEndDrag_Impl, HeaderBar*, pBar, void )
for ( sal_uInt16 i = 1; i <= nTabs; ++i )
{
long nWidth = pBar->GetItemSize(i);
- aSize.Width() = nWidth + nTmpSize;
+ aSize.setWidth( nWidth + nTmpSize );
nTmpSize += nWidth;
mpImpl->mpView->SetTab( i, aSize.Width(), MapUnit::MapPixel );
}
diff --git a/svtools/source/contnr/iconview.cxx b/svtools/source/contnr/iconview.cxx
index 76fab5ef5159..c7f7d9181d59 100644
--- a/svtools/source/contnr/iconview.cxx
+++ b/svtools/source/contnr/iconview.cxx
@@ -50,12 +50,12 @@ void IconView::Resize()
tools::Rectangle IconView::GetFocusRect( SvTreeListEntry*, long nEntryPos )
{
Size aSize;
- aSize.Height() = nEntryHeight;
- aSize.Width() = nEntryWidth;
+ aSize.setHeight( nEntryHeight );
+ aSize.setWidth( nEntryWidth );
Point aPos;
- aPos.X() = 0;
- aPos.Y() = 0;
+ aPos.setX( 0 );
+ aPos.setY( 0 );
tools::Rectangle aRect;
@@ -63,8 +63,8 @@ tools::Rectangle IconView::GetFocusRect( SvTreeListEntry*, long nEntryPos )
if(nCols)
{
- aPos.Y() = ( nEntryPos / nCols ) * nEntryHeight;
- aPos.X() = ( nEntryPos % nCols ) * nEntryWidth;
+ aPos.setY( ( nEntryPos / nCols ) * nEntryHeight );
+ aPos.setX( ( nEntryPos % nCols ) * nEntryWidth );
}
aRect.SetPos( aPos );
@@ -132,8 +132,8 @@ void IconView::PaintEntry(SvTreeListEntry& rEntry, long nX, long nY,
Size aSize(SvLBoxItem::GetSize(pViewDataEntry, nCurItem));
- aEntryPos.X() = nX;
- aEntryPos.Y() = nY;
+ aEntryPos.setX( nX );
+ aEntryPos.setY( nY );
// set background pattern/color
@@ -192,12 +192,12 @@ void IconView::PaintEntry(SvTreeListEntry& rEntry, long nX, long nY,
}
// center vertically
- aEntryPos.Y() += (nTempEntryHeight - aSize.Height()) / 2;
+ aEntryPos.AdjustY((nTempEntryHeight - aSize.Height()) / 2 );
// draw item
pViewDataEntry->SetPaintRectangle(aRect);
- aEntryPos.Y() += 15;
+ aEntryPos.AdjustY(15 );
pItem->Paint(aEntryPos, *this, rRenderContext, pViewDataEntry, rEntry);
@@ -211,15 +211,15 @@ void IconView::PaintEntry(SvTreeListEntry& rEntry, long nX, long nY,
{
Size aSize(SvLBoxItem::GetSize(pViewDataEntry, nIconItem));
- aEntryPos.X() = nX;
- aEntryPos.Y() = nY;
+ aEntryPos.setX( nX );
+ aEntryPos.setY( nY );
// center horizontally
- aEntryPos.X() += (nTempEntryWidth - aSize.Width()) / 2;
+ aEntryPos.AdjustX((nTempEntryWidth - aSize.Width()) / 2 );
// center vertically
- aEntryPos.Y() += (nTempEntryHeight - aSize.Height()) / 2;
+ aEntryPos.AdjustY((nTempEntryHeight - aSize.Height()) / 2 );
- aEntryPos.Y() -= 10;
+ aEntryPos.AdjustY( -10 );
SvLBoxItem* pItem = &rEntry.GetItem(nIconItem);
diff --git a/svtools/source/contnr/iconviewimpl.cxx b/svtools/source/contnr/iconviewimpl.cxx
index 3b3380a7d972..f1613fe4e6bd 100644
--- a/svtools/source/contnr/iconviewimpl.cxx
+++ b/svtools/source/contnr/iconviewimpl.cxx
@@ -45,7 +45,7 @@ void IconViewImpl::CursorUp()
pView->Update();
pStartEntry = pPrevFirstToDraw;
tools::Rectangle aArea( GetVisibleArea() );
- aArea.Bottom() -= nEntryHeight;
+ aArea.AdjustBottom( -nEntryHeight );
pView->Scroll( 0, nEntryHeight, aArea, ScrollFlags::NoChildren );
pView->Update();
ShowCursor( true );
@@ -445,13 +445,13 @@ void IconViewImpl::InvalidateEntry( long nId ) const
tools::Rectangle aRect( GetVisibleArea() );
long nMaxBottom = aRect.Bottom();
- aRect.Top() = nId / pView->GetColumnsCount() * pView->GetEntryHeight();
- aRect.Bottom() = aRect.Top(); aRect.Bottom() += pView->GetEntryHeight();
+ aRect.SetTop( nId / pView->GetColumnsCount() * pView->GetEntryHeight() );
+ aRect.SetBottom( aRect.Top() ); aRect.AdjustBottom(pView->GetEntryHeight() );
if( aRect.Top() > nMaxBottom )
return;
if( aRect.Bottom() > nMaxBottom )
- aRect.Bottom() = nMaxBottom;
+ aRect.SetBottom( nMaxBottom );
pView->Invalidate( aRect );
}
diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx
index f8dbb98176e1..e97d67952430 100644
--- a/svtools/source/contnr/imivctl1.cxx
+++ b/svtools/source/contnr/imivctl1.cxx
@@ -161,7 +161,7 @@ SvxIconChoiceCtrl_Impl::SvxIconChoiceCtrl_Impl(
Size gridSize(100,70);
if(pView->GetDPIScaleFactor() > 1)
{
- gridSize.Height() *= pView->GetDPIScaleFactor();
+ gridSize.setHeight( gridSize.Height() * ( pView->GetDPIScaleFactor()) );
}
SetGrid(gridSize);
}
@@ -203,8 +203,8 @@ void SvxIconChoiceCtrl_Impl::Clear( bool bInCtor )
{
pImpCursor->Clear();
pGridMap->Clear();
- aVirtOutputSize.Width() = 0;
- aVirtOutputSize.Height() = 0;
+ aVirtOutputSize.setWidth( 0 );
+ aVirtOutputSize.setHeight( 0 );
Size aSize( pView->GetOutputSizePixel() );
nMaxVirtWidth = aSize.Width() - nVerSBarWidth;
if( nMaxVirtWidth <= 0 )
@@ -289,7 +289,7 @@ void SvxIconChoiceCtrl_Impl::InsertEntry( SvxIconChoiceCtrlEntry* pEntry, size_t
// If the UpdateMode is true, don't set all bounding rectangles to
// 'to be checked', but only the bounding rectangle of the new entry.
// Thus, don't call InvalidateBoundingRect!
- pEntry->aRect.Right() = LONG_MAX;
+ pEntry->aRect.SetRight( LONG_MAX );
if( bUpdateMode )
{
FindBoundingRect( pEntry );
@@ -427,8 +427,8 @@ void SvxIconChoiceCtrl_Impl::EntrySelected(SvxIconChoiceCtrlEntry* pEntry, bool
void SvxIconChoiceCtrl_Impl::ResetVirtSize()
{
StopEditTimer();
- aVirtOutputSize.Width() = 0;
- aVirtOutputSize.Height() = 0;
+ aVirtOutputSize.setWidth( 0 );
+ aVirtOutputSize.setHeight( 0 );
const size_t nCount = aEntries.size();
for( size_t nCur = 0; nCur < nCount; nCur++ )
{
@@ -484,11 +484,11 @@ void SvxIconChoiceCtrl_Impl::AdjustVirtSize( const tools::Rectangle& rRect )
return;
Range aRange;
- aVirtOutputSize.Width() += nWidthOffs;
+ aVirtOutputSize.AdjustWidth(nWidthOffs );
aRange.Max() = aVirtOutputSize.Width();
aHorSBar->SetRange( aRange );
- aVirtOutputSize.Height() += nHeightOffs;
+ aVirtOutputSize.AdjustHeight(nHeightOffs );
aRange.Max() = aVirtOutputSize.Height();
aVerSBar->SetRange( aRange );
@@ -1039,8 +1039,8 @@ bool SvxIconChoiceCtrl_Impl::KeyInput( const KeyEvent& rKEvt )
tools::Rectangle aRect( GetEntryBoundRect( pCursor ) );
if( aRect.Top())
{
- aRect.Bottom() -= aRect.Top();
- aRect.Top() = 0;
+ aRect.AdjustBottom( -(aRect.Top()) );
+ aRect.SetTop( 0 );
MakeVisible( aRect );
}
}
@@ -1094,8 +1094,8 @@ bool SvxIconChoiceCtrl_Impl::KeyInput( const KeyEvent& rKEvt )
tools::Rectangle aRect( GetEntryBoundRect(pCursor));
if( aRect.Left() )
{
- aRect.Right() -= aRect.Left();
- aRect.Left() = 0;
+ aRect.AdjustRight( -(aRect.Left()) );
+ aRect.SetLeft( 0 );
MakeVisible( aRect );
}
}
@@ -1211,16 +1211,16 @@ void SvxIconChoiceCtrl_Impl::PositionScrollBars( long nRealWidth, long nRealHeig
{
// horizontal scrollbar
Point aPos( 0, nRealHeight );
- aPos.Y() -= nHorSBarHeight;
+ aPos.AdjustY( -(nHorSBarHeight) );
if( aHorSBar->GetPosPixel() != aPos )
aHorSBar->SetPosPixel( aPos );
// vertical scrollbar
- aPos.X() = nRealWidth; aPos.Y() = 0;
- aPos.X() -= nVerSBarWidth;
- aPos.X()++;
- aPos.Y()--;
+ aPos.setX( nRealWidth ); aPos.setY( 0 );
+ aPos.AdjustX( -(nVerSBarWidth) );
+ aPos.AdjustX( 1 );
+ aPos.AdjustY( -1 );
if( aVerSBar->GetPosPixel() != aPos )
aVerSBar->SetPosPixel( aPos );
@@ -1300,7 +1300,7 @@ void SvxIconChoiceCtrl_Impl::AdjustScrollBars()
// size vertical scrollbar
long nThumb = aVerSBar->GetThumbPos();
Size aSize( nVerSBarWidth, nRealHeight );
- aSize.Height() += 2;
+ aSize.AdjustHeight(2 );
if( aSize != aVerSBar->GetSizePixel() )
aVerSBar->SetSizePixel( aSize );
aVerSBar->SetVisibleSize( nVisibleHeight );
@@ -1319,12 +1319,12 @@ void SvxIconChoiceCtrl_Impl::AdjustScrollBars()
// size horizontal scrollbar
nThumb = aHorSBar->GetThumbPos();
- aSize.Width() = nRealWidth;
- aSize.Height() = nHorSBarHeight;
- aSize.Width()++;
+ aSize.setWidth( nRealWidth );
+ aSize.setHeight( nHorSBarHeight );
+ aSize.AdjustWidth( 1 );
if( nResult & 0x0001 ) // vertical scrollbar?
{
- aSize.Width()++;
+ aSize.AdjustWidth( 1 );
nRealWidth++;
}
if( aSize != aHorSBar->GetSizePixel() )
@@ -1342,10 +1342,10 @@ void SvxIconChoiceCtrl_Impl::AdjustScrollBars()
aHorSBar->Hide();
}
- aOutputSize.Width() = nRealWidth;
+ aOutputSize.setWidth( nRealWidth );
if( nResult & 0x0002 ) // horizontal scrollbar ?
nRealHeight++; // because lower border is clipped
- aOutputSize.Height() = nRealHeight;
+ aOutputSize.setHeight( nRealHeight );
if( (nResult & (0x0001|0x0002)) == (0x0001|0x0002) )
aScrBarBox->Show();
@@ -1397,8 +1397,8 @@ bool SvxIconChoiceCtrl_Impl::CheckHorScrollBar()
nMostRight = nRight;
}
aHorSBar->Hide();
- aOutputSize.Height() += nHorSBarHeight;
- aVirtOutputSize.Width() = nMostRight;
+ aOutputSize.AdjustHeight(nHorSBarHeight );
+ aVirtOutputSize.setWidth( nMostRight );
aHorSBar->SetThumbPos( 0 );
Range aRange;
aRange.Max() = nMostRight - 1;
@@ -1406,7 +1406,7 @@ bool SvxIconChoiceCtrl_Impl::CheckHorScrollBar()
if( aVerSBar->IsVisible() )
{
Size aSize( aVerSBar->GetSizePixel());
- aSize.Height() += nHorSBarHeight;
+ aSize.AdjustHeight(nHorSBarHeight );
aVerSBar->SetSizePixel( aSize );
}
return true;
@@ -1435,8 +1435,8 @@ bool SvxIconChoiceCtrl_Impl::CheckVerScrollBar()
nDeepest = nBottom;
}
aVerSBar->Hide();
- aOutputSize.Width() += nVerSBarWidth;
- aVirtOutputSize.Height() = nDeepest;
+ aOutputSize.AdjustWidth(nVerSBarWidth );
+ aVirtOutputSize.setHeight( nDeepest );
aVerSBar->SetThumbPos( 0 );
Range aRange;
aRange.Max() = nDeepest - 1;
@@ -1444,7 +1444,7 @@ bool SvxIconChoiceCtrl_Impl::CheckVerScrollBar()
if( aHorSBar->IsVisible() )
{
Size aSize( aHorSBar->GetSizePixel());
- aSize.Width() += nVerSBarWidth;
+ aSize.AdjustWidth(nVerSBarWidth );
aHorSBar->SetSizePixel( aSize );
}
return true;
@@ -1570,9 +1570,9 @@ void SvxIconChoiceCtrl_Impl::PaintItem(const tools::Rectangle& rRect,
{
Point aPos(rRect.TopLeft());
if (nPaintFlags & PAINTFLAG_HOR_CENTERED)
- aPos.X() += (rRect.GetWidth() - aImageSize.Width()) / 2;
+ aPos.AdjustX((rRect.GetWidth() - aImageSize.Width()) / 2 );
if (nPaintFlags & PAINTFLAG_VER_CENTERED)
- aPos.Y() += (rRect.GetHeight() - aImageSize.Height()) / 2;
+ aPos.AdjustY((rRect.GetHeight() - aImageSize.Height()) / 2 );
SvtIconChoiceCtrl::DrawEntryImage(pEntry, aPos, rRenderContext);
}
}
@@ -1721,10 +1721,10 @@ SvxIconChoiceCtrlEntry* SvxIconChoiceCtrl_Impl::GetEntry( const Point& rDocPos,
if( bHit )
{
tools::Rectangle aRect = CalcBmpRect( pEntry );
- aRect.Top() -= 3;
- aRect.Bottom() += 3;
- aRect.Left() -= 3;
- aRect.Right() += 3;
+ aRect.AdjustTop( -3 );
+ aRect.AdjustBottom(3 );
+ aRect.AdjustLeft( -3 );
+ aRect.AdjustRight(3 );
if( aRect.IsInside( rDocPos ) )
return pEntry;
aRect = CalcTextRect( pEntry );
@@ -1749,10 +1749,10 @@ void SvxIconChoiceCtrl_Impl::MakeEntryVisible( SvxIconChoiceCtrlEntry* pEntry, b
{
tools::Rectangle aRect = CalcBmpRect( pEntry );
aRect.Union( CalcTextRect( pEntry ) );
- aRect.Top() += TBOFFS_BOUND;
- aRect.Bottom() += TBOFFS_BOUND;
- aRect.Left() += LROFFS_BOUND;
- aRect.Right() += LROFFS_BOUND;
+ aRect.AdjustTop(TBOFFS_BOUND );
+ aRect.AdjustBottom(TBOFFS_BOUND );
+ aRect.AdjustLeft(LROFFS_BOUND );
+ aRect.AdjustRight(LROFFS_BOUND );
MakeVisible( aRect );
}
}
@@ -1775,13 +1775,13 @@ tools::Rectangle SvxIconChoiceCtrl_Impl::CalcBmpRect( SvxIconChoiceCtrlEntry* pE
{
case WB_ICON:
{
- aPos.X() += ( aBound.GetWidth() - aImageSize.Width() ) / 2;
+ aPos.AdjustX(( aBound.GetWidth() - aImageSize.Width() ) / 2 );
return tools::Rectangle( aPos, aImageSize );
}
case WB_SMALLICON:
case WB_DETAILS:
- aPos.Y() += ( aBound.GetHeight() - aImageSize.Height() ) / 2;
+ aPos.AdjustY(( aBound.GetHeight() - aImageSize.Height() ) / 2 );
//TODO: determine horizontal distance to bounding rectangle
return tools::Rectangle( aPos, aImageSize );
@@ -1818,8 +1818,8 @@ tools::Rectangle SvxIconChoiceCtrl_Impl::CalcTextRect( SvxIconChoiceCtrlEntry* p
switch( nWinBits & VIEWMODE_MASK )
{
case WB_ICON:
- aPos.Y() += aImageSize.Height();
- aPos.Y() += VER_DIST_BMP_STRING;
+ aPos.AdjustY(aImageSize.Height() );
+ aPos.AdjustY(VER_DIST_BMP_STRING );
// at little more space when editing
if( bEdit )
{
@@ -1830,21 +1830,21 @@ tools::Rectangle SvxIconChoiceCtrl_Impl::CalcTextRect( SvxIconChoiceCtrlEntry* p
nMinWidth = nBoundWidth;
if( aTextSize.Width() < nMinWidth )
- aTextSize.Width() = nMinWidth;
+ aTextSize.setWidth( nMinWidth );
// when editing, overlap with the area below is allowed
Size aOptSize = aMaxTextRect.GetSize();
if( aOptSize.Height() > aTextSize.Height() )
- aTextSize.Height() = aOptSize.Height();
+ aTextSize.setHeight( aOptSize.Height() );
}
- aPos.X() += (nBoundWidth - aTextSize.Width()) / 2;
+ aPos.AdjustX((nBoundWidth - aTextSize.Width()) / 2 );
break;
case WB_SMALLICON:
case WB_DETAILS:
- aPos.X() += aImageSize.Width();
- aPos.X() += HOR_DIST_BMP_STRING;
- aPos.Y() += (nBoundHeight - aTextSize.Height()) / 2;
+ aPos.AdjustX(aImageSize.Width() );
+ aPos.AdjustX(HOR_DIST_BMP_STRING );
+ aPos.AdjustY((nBoundHeight - aTextSize.Height()) / 2 );
break;
}
return tools::Rectangle( aPos, aTextSize );
@@ -2097,10 +2097,10 @@ bool SvxIconChoiceCtrl_Impl::HandleScrollCommand( const CommandEvent& rCmd )
if( nScrollDX || nScrollDY )
{
- aVisRect.Top() -= nScrollDY;
- aVisRect.Bottom() -= nScrollDY;
- aVisRect.Left() -= nScrollDX;
- aVisRect.Right() -= nScrollDX;
+ aVisRect.AdjustTop( -nScrollDY );
+ aVisRect.AdjustBottom( -nScrollDY );
+ aVisRect.AdjustLeft( -nScrollDX );
+ aVisRect.AdjustRight( -nScrollDX );
MakeVisible( aVisRect );
return true;
}
@@ -2143,13 +2143,13 @@ void SvxIconChoiceCtrl_Impl::ToTop( SvxIconChoiceCtrlEntry* pEntry )
void SvxIconChoiceCtrl_Impl::ClipAtVirtOutRect( tools::Rectangle& rRect ) const
{
if( rRect.Bottom() >= aVirtOutputSize.Height() )
- rRect.Bottom() = aVirtOutputSize.Height() - 1;
+ rRect.SetBottom( aVirtOutputSize.Height() - 1 );
if( rRect.Right() >= aVirtOutputSize.Width() )
- rRect.Right() = aVirtOutputSize.Width() - 1;
+ rRect.SetRight( aVirtOutputSize.Width() - 1 );
if( rRect.Top() < 0 )
- rRect.Top() = 0;
+ rRect.SetTop( 0 );
if( rRect.Left() < 0 )
- rRect.Left() = 0;
+ rRect.SetLeft( 0 );
}
// rRect: area of the document (in document coordinates) that we want to make
@@ -2195,8 +2195,8 @@ void SvxIconChoiceCtrl_Impl::MakeVisible( const tools::Rectangle& rRect, bool bS
else
nDx = 0;
- aOrigin.X() += nDx;
- aOrigin.Y() += nDy;
+ aOrigin.AdjustX(nDx );
+ aOrigin.AdjustY(nDy );
aOutputArea.SetPos( aOrigin );
if( GetUpdateMode() )
{
@@ -2282,19 +2282,19 @@ void SvxIconChoiceCtrl_Impl::DeselectAllBut( SvxIconChoiceCtrlEntry const * pThi
Size SvxIconChoiceCtrl_Impl::GetMinGrid() const
{
Size aMinSize( aImageSize );
- aMinSize.Width() += 2 * LROFFS_BOUND;
- aMinSize.Height() += TBOFFS_BOUND; // single offset is enough (FileDlg)
+ aMinSize.AdjustWidth(2 * LROFFS_BOUND );
+ aMinSize.AdjustHeight(TBOFFS_BOUND ); // single offset is enough (FileDlg)
OUString const aStrDummy( "XXX" );
Size aTextSize( pView->GetTextWidth( aStrDummy ), pView->GetTextHeight() );
if( nWinBits & WB_ICON )
{
- aMinSize.Height() += VER_DIST_BMP_STRING;
- aMinSize.Height() += aTextSize.Height();
+ aMinSize.AdjustHeight(VER_DIST_BMP_STRING );
+ aMinSize.AdjustHeight(aTextSize.Height() );
}
else
{
- aMinSize.Width() += HOR_DIST_BMP_STRING;
- aMinSize.Width() += aTextSize.Width();
+ aMinSize.AdjustWidth(HOR_DIST_BMP_STRING );
+ aMinSize.AdjustWidth(aTextSize.Width() );
}
return aMinSize;
}
@@ -2304,9 +2304,9 @@ void SvxIconChoiceCtrl_Impl::SetGrid( const Size& rSize )
Size aSize( rSize );
Size aMinSize( GetMinGrid() );
if( aSize.Width() < aMinSize.Width() )
- aSize.Width() = aMinSize.Width();
+ aSize.setWidth( aMinSize.Width() );
if( aSize.Height() < aMinSize.Height() )
- aSize.Height() = aMinSize.Height();
+ aSize.setHeight( aMinSize.Height() );
nGridDX = aSize.Width();
// HACK: Detail mode is not yet fully implemented, this workaround makes it
@@ -2338,31 +2338,31 @@ tools::Rectangle SvxIconChoiceCtrl_Impl::CalcMaxTextRect( const SvxIconChoiceCtr
const_cast<SvxIconChoiceCtrlEntry*>(pEntry) ) );
if( nWinBits & WB_ICON )
{
- aBoundRect.Top() = aBmpRect.Bottom();
- aBoundRect.Top() += VER_DIST_BMP_STRING;
+ aBoundRect.SetTop( aBmpRect.Bottom() );
+ aBoundRect.AdjustTop(VER_DIST_BMP_STRING );
if( aBoundRect.Top() > aBoundRect.Bottom())
- aBoundRect.Top() = aBoundRect.Bottom();
- aBoundRect.Left() += LROFFS_BOUND;
- aBoundRect.Left()++;
- aBoundRect.Right() -= LROFFS_BOUND;
- aBoundRect.Right()--;
+ aBoundRect.SetTop( aBoundRect.Bottom() );
+ aBoundRect.AdjustLeft(LROFFS_BOUND );
+ aBoundRect.AdjustLeft( 1 );
+ aBoundRect.AdjustRight( -(LROFFS_BOUND) );
+ aBoundRect.AdjustRight( -1 );
if( aBoundRect.Left() > aBoundRect.Right())
- aBoundRect.Left() = aBoundRect.Right();
+ aBoundRect.SetLeft( aBoundRect.Right() );
if( pEntry->GetTextMode() == SvxIconChoiceCtrlTextMode::Full )
- aBoundRect.Bottom() = LONG_MAX;
+ aBoundRect.SetBottom( LONG_MAX );
}
else
{
- aBoundRect.Left() = aBmpRect.Right();
- aBoundRect.Left() += HOR_DIST_BMP_STRING;
- aBoundRect.Right() -= LROFFS_BOUND;
+ aBoundRect.SetLeft( aBmpRect.Right() );
+ aBoundRect.AdjustLeft(HOR_DIST_BMP_STRING );
+ aBoundRect.AdjustRight( -(LROFFS_BOUND) );
if( aBoundRect.Left() > aBoundRect.Right() )
- aBoundRect.Left() = aBoundRect.Right();
+ aBoundRect.SetLeft( aBoundRect.Right() );
long nHeight = aBoundRect.GetSize().Height();
nHeight = nHeight - aDefaultTextSize.Height();
nHeight /= 2;
- aBoundRect.Top() += nHeight;
- aBoundRect.Bottom() -= nHeight;
+ aBoundRect.AdjustTop(nHeight );
+ aBoundRect.AdjustBottom( -nHeight );
}
return aBoundRect;
}
@@ -2401,11 +2401,11 @@ void SvxIconChoiceCtrl_Impl::Center( SvxIconChoiceCtrlEntry* pEntry ) const
{
// center horizontally
long nBorder = pEntry->aGridRect.GetWidth() - aSize.Width();
- pEntry->aRect.Left() += nBorder / 2;
- pEntry->aRect.Right() -= nBorder / 2;
+ pEntry->aRect.AdjustLeft(nBorder / 2 );
+ pEntry->aRect.AdjustRight( -(nBorder / 2) );
}
// center vertically
- pEntry->aRect.Bottom() = pEntry->aRect.Top() + aSize.Height();
+ pEntry->aRect.SetBottom( pEntry->aRect.Top() + aSize.Height() );
}
@@ -2418,8 +2418,8 @@ void SvxIconChoiceCtrl_Impl::Scroll( long nDeltaX, long nDeltaY )
Point aOrigin( rMapMode.GetOrigin() );
// convert to document coordinate
aOrigin *= -1;
- aOrigin.Y() += nDeltaY;
- aOrigin.X() += nDeltaX;
+ aOrigin.AdjustY(nDeltaY );
+ aOrigin.AdjustX(nDeltaX );
tools::Rectangle aRect( aOrigin, aOutputSize );
MakeVisible( aRect, true/*bScrollBar*/ );
}
@@ -2448,11 +2448,11 @@ static tools::Rectangle GetHotSpot( const tools::Rectangle& rRect )
aResult.Justify();
Size aSize( rRect.GetSize() );
long nDelta = aSize.Width() / 4;
- aResult.Left() += nDelta;
- aResult.Right() -= nDelta;
+ aResult.AdjustLeft(nDelta );
+ aResult.AdjustRight( -nDelta );
nDelta = aSize.Height() / 4;
- aResult.Top() += nDelta;
- aResult.Bottom() -= nDelta;
+ aResult.AdjustTop(nDelta );
+ aResult.AdjustBottom( -nDelta );
return aResult;
}
@@ -3074,13 +3074,13 @@ void SvxIconChoiceCtrl_Impl::InitSettings()
nHorSBarHeight = nScrBarSize;
Size aSize( aHorSBar->GetSizePixel() );
- aSize.Height() = nScrBarSize;
+ aSize.setHeight( nScrBarSize );
aHorSBar->Hide();
aHorSBar->SetSizePixel( aSize );
nVerSBarWidth = nScrBarSize;
aSize = aVerSBar->GetSizePixel();
- aSize.Width() = nScrBarSize;
+ aSize.setWidth( nScrBarSize );
aVerSBar->Hide();
aVerSBar->SetSizePixel( aSize );
@@ -3226,8 +3226,8 @@ SvxIconChoiceCtrlEntry* SvxIconChoiceCtrl_Impl::FindEntryPredecessor( SvxIconCho
sal_uLong SvxIconChoiceCtrl_Impl::GetPredecessorGrid( const Point& rPos) const
{
Point aPos( rPos );
- aPos.X() -= LROFFS_WINBORDER;
- aPos.Y() -= TBOFFS_WINBORDER;
+ aPos.AdjustX( -(LROFFS_WINBORDER) );
+ aPos.AdjustY( -(TBOFFS_WINBORDER) );
long nMaxCol = aVirtOutputSize.Width() / nGridDX;
if( nMaxCol )
nMaxCol--;
@@ -3267,7 +3267,7 @@ bool SvxIconChoiceCtrl_Impl::RequestHelp( const HelpEvent& rHEvt )
return false;
tools::Rectangle aOptTextRect( aTextRect );
- aOptTextRect.Bottom() = LONG_MAX;
+ aOptTextRect.SetBottom( LONG_MAX );
DrawTextFlags nNewFlags = nCurTextDrawFlags;
nNewFlags &= ~DrawTextFlags( DrawTextFlags::Clip | DrawTextFlags::EndEllipsis );
aOptTextRect = pView->GetTextRect( aOptTextRect, aEntryText, nNewFlags );
@@ -3278,8 +3278,8 @@ bool SvxIconChoiceCtrl_Impl::RequestHelp( const HelpEvent& rHEvt )
aPt += pView->GetMapMode().GetOrigin();
aPt = pView->OutputToScreenPixel( aPt );
// subtract border of tooltip help
- aPt.Y() -= 1;
- aPt.X() -= 3;
+ aPt.AdjustY( -1 );
+ aPt.AdjustX( -3 );
aOptTextRect.SetPos( aPt );
OUString sHelpText;
if ( !sQuickHelpText.isEmpty() )
@@ -3334,10 +3334,10 @@ void SvxIconChoiceCtrl_Impl::DrawHighlightFrame(vcl::RenderContext& rRenderConte
long nBorder = 2;
if (aImageSize.Width() < 32)
nBorder = 1;
- aBmpRect.Right() += nBorder;
- aBmpRect.Left() -= nBorder;
- aBmpRect.Bottom() += nBorder;
- aBmpRect.Top() -= nBorder;
+ aBmpRect.AdjustRight(nBorder );
+ aBmpRect.AdjustLeft( -nBorder );
+ aBmpRect.AdjustBottom(nBorder );
+ aBmpRect.AdjustTop( -nBorder );
DecorationView aDecoView(&rRenderContext);
DrawHighlightFrameStyle nDecoFlags;
diff --git a/svtools/source/contnr/simptabl.cxx b/svtools/source/contnr/simptabl.cxx
index bb78c42851d9..7807f93b39ad 100644
--- a/svtools/source/contnr/simptabl.cxx
+++ b/svtools/source/contnr/simptabl.cxx
@@ -144,7 +144,7 @@ void SvSimpleTable::UpdateViewSize()
Size theWinSize=m_rParentTableContainer.GetOutputSizePixel();
Size HbSize=aHeaderBar->GetSizePixel();
- HbSize.Width()=theWinSize.Width();
+ HbSize.setWidth(theWinSize.Width() );
theWinSize.Height()-=HbSize.Height();
Point thePos(0,0);
@@ -346,8 +346,8 @@ void SvSimpleTable::HBarDrag()
{
tools::Rectangle aSizeRect(Point(0,0),
SvHeaderTabListBox::GetOutputSizePixel());
- aSizeRect.Left()=-GetXOffset()+aHeaderBar->GetDragPos();
- aSizeRect.Right()=-GetXOffset()+aHeaderBar->GetDragPos();
+ aSizeRect.SetLeft(-GetXOffset()+aHeaderBar->GetDragPos() );
+ aSizeRect.SetRight(-GetXOffset()+aHeaderBar->GetDragPos() );
ShowTracking( aSizeRect, ShowTrackFlags::Split );
}
}
@@ -391,8 +391,8 @@ IMPL_LINK( SvSimpleTable, StartDragHdl, HeaderBar*, pCtr, void)
{
tools::Rectangle aSizeRect(Point(0,0),
SvHeaderTabListBox::GetOutputSizePixel());
- aSizeRect.Left()=-GetXOffset()+aHeaderBar->GetDragPos();
- aSizeRect.Right()=-GetXOffset()+aHeaderBar->GetDragPos();
+ aSizeRect.SetLeft(-GetXOffset()+aHeaderBar->GetDragPos() );
+ aSizeRect.SetRight(-GetXOffset()+aHeaderBar->GetDragPos() );
ShowTracking( aSizeRect, ShowTrackFlags::Split );
}
}
diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx
index 88f6dc6d691e..0a229ca5e6f3 100644
--- a/svtools/source/contnr/svimpbox.cxx
+++ b/svtools/source/contnr/svimpbox.cxx
@@ -223,14 +223,14 @@ void SvImpLBox::CalcCellFocusRect( SvTreeListEntry const * pEntry, tools::Rectan
if ( nCurTabPos > FIRST_ENTRY_TAB )
{
SvLBoxItem& rItem = pCursor->GetItem( nCurTabPos );
- rRect.Left() = pView->GetTab( pCursor, &rItem )->GetPos();
+ rRect.SetLeft( pView->GetTab( pCursor, &rItem )->GetPos() );
}
if (pCursor->ItemCount() > static_cast<size_t>(nCurTabPos+1))
{
SvLBoxItem& rNextItem = pCursor->GetItem( nCurTabPos + 1 );
long nRight = pView->GetTab( pCursor, &rNextItem )->GetPos() - 1;
if ( nRight < rRect.Right() )
- rRect.Right() = nRight;
+ rRect.SetRight( nRight );
}
}
@@ -379,7 +379,7 @@ void SvImpLBox::CursorUp()
pView->Update();
pStartEntry = pPrevFirstToDraw;
tools::Rectangle aArea( GetVisibleArea() );
- aArea.Bottom() -= nEntryHeight;
+ aArea.AdjustBottom( -nEntryHeight );
pView->Scroll( 0, nEntryHeight, aArea, ScrollFlags::NoChildren );
pView->Update();
ShowCursor( true );
@@ -533,7 +533,7 @@ void SvImpLBox::InvalidateEntriesFrom( long nY ) const
if( !(nFlags & LBoxFlags::InPaint ))
{
tools::Rectangle aRect( GetVisibleArea() );
- aRect.Top() = nY;
+ aRect.SetTop( nY );
pView->Invalidate( aRect );
}
}
@@ -544,12 +544,12 @@ void SvImpLBox::InvalidateEntry( long nY ) const
{
tools::Rectangle aRect( GetVisibleArea() );
long nMaxBottom = aRect.Bottom();
- aRect.Top() = nY;
- aRect.Bottom() = nY; aRect.Bottom() += pView->GetEntryHeight();
+ aRect.SetTop( nY );
+ aRect.SetBottom( nY ); aRect.AdjustBottom(pView->GetEntryHeight() );
if( aRect.Top() > nMaxBottom )
return;
if( aRect.Bottom() > nMaxBottom )
- aRect.Bottom() = nMaxBottom;
+ aRect.SetBottom( nMaxBottom );
pView->Invalidate( aRect );
}
}
@@ -783,11 +783,11 @@ bool SvImpLBox::EntryReallyHit(SvTreeListEntry* pEntry, const Point& rPosPixel,
return true;
tools::Rectangle aRect( pView->GetFocusRect( pEntry, nLine ));
- aRect.Right() = GetOutputSize().Width() - pView->GetMapMode().GetOrigin().X();
+ aRect.SetRight( GetOutputSize().Width() - pView->GetMapMode().GetOrigin().X() );
SvLBoxContextBmp* pBmp = static_cast<SvLBoxContextBmp*>(pEntry->GetFirstItem(SvLBoxItemType::ContextBmp));
- aRect.Left() -= pBmp->GetSize(pView,pEntry).Width();
- aRect.Left() -= 4; // a little tolerance
+ aRect.AdjustLeft( -(pBmp->GetSize(pView,pEntry).Width()) );
+ aRect.AdjustLeft( -4 ); // a little tolerance
Point aPos( rPosPixel );
aPos -= pView->GetMapMode().GetOrigin();
@@ -858,9 +858,9 @@ SvTreeListEntry* SvImpLBox::MakePointVisible(const Point& rPoint)
tools::Rectangle SvImpLBox::GetClipRegionRect() const
{
Point aOrigin( pView->GetMapMode().GetOrigin() );
- aOrigin.X() *= -1; // conversion document coordinates
+ aOrigin.setX( aOrigin.X() * -1 ); // conversion document coordinates
tools::Rectangle aClipRect( aOrigin, aOutputSize );
- aClipRect.Bottom()++;
+ aClipRect.AdjustBottom( 1 );
return aClipRect;
}
@@ -1067,21 +1067,21 @@ void SvImpLBox::DrawNet(vcl::RenderContext& rRenderContext)
{
if (pView->IsExpanded(pEntry))
{
- aPos1.X() = pView->GetTabPos(pEntry, pFirstDynamicTab);
+ aPos1.setX( pView->GetTabPos(pEntry, pFirstDynamicTab) );
// if it is not a context bitmap, go a little to the right below the
// first text (node bitmap, too)
if (!pView->nContextBmpWidthMax)
- aPos1.X() += rExpandedNodeBitmap.GetSizePixel().Width() / 2;
+ aPos1.AdjustX(rExpandedNodeBitmap.GetSizePixel().Width() / 2 );
- aPos1.Y() = nY;
- aPos1.Y() += nEntryHeightDIV2;
+ aPos1.setY( nY );
+ aPos1.AdjustY(nEntryHeightDIV2 );
pChild = pView->FirstChild( pEntry );
DBG_ASSERT(pChild,"Child?");
pChild = SvTreeList::LastSibling( pChild );
nDistance = static_cast<sal_uInt16>(pView->GetVisiblePos(pChild) - pView->GetVisiblePos(pEntry));
aPos2 = aPos1;
- aPos2.Y() += nDistance * nEntryHeight;
+ aPos2.AdjustY(nDistance * nEntryHeight );
rRenderContext.DrawLine(aPos1, aPos2);
}
// visible in control?
@@ -1091,17 +1091,17 @@ void SvImpLBox::DrawNet(vcl::RenderContext& rRenderContext)
if (!pView->IsExpanded(pEntry))
{
// nope
- aPos1.X() = pView->GetTabPos(pEntry, pFirstDynamicTab);
+ aPos1.setX( pView->GetTabPos(pEntry, pFirstDynamicTab) );
// if it is not a context bitmap, go a little to the right below
// the first text (node bitmap, too)
if (!pView->nContextBmpWidthMax)
- aPos1.X() += rExpandedNodeBitmap.GetSizePixel().Width() / 2;
- aPos1.Y() = nY;
- aPos1.Y() += nEntryHeightDIV2;
- aPos2.X() = aPos1.X();
+ aPos1.AdjustX(rExpandedNodeBitmap.GetSizePixel().Width() / 2 );
+ aPos1.setY( nY );
+ aPos1.AdjustY(nEntryHeightDIV2 );
+ aPos2.setX( aPos1.X() );
}
- aPos2.Y() = aPos1.Y();
- aPos2.X() -= pView->GetIndent();
+ aPos2.setY( aPos1.Y() );
+ aPos2.AdjustX( -(pView->GetIndent()) );
rRenderContext.DrawLine(aPos1, aPos2);
}
nY += nEntryHeight;
@@ -1110,18 +1110,18 @@ void SvImpLBox::DrawNet(vcl::RenderContext& rRenderContext)
if (m_nStyle & WB_HASLINESATROOT)
{
pEntry = pView->First();
- aPos1.X() = pView->GetTabPos(pEntry, pFirstDynamicTab);
+ aPos1.setX( pView->GetTabPos(pEntry, pFirstDynamicTab) );
// if it is not a context bitmap, go a little to the right below the
// first text (node bitmap, too)
if (!pView->nContextBmpWidthMax)
- aPos1.X() += rExpandedNodeBitmap.GetSizePixel().Width() / 2;
- aPos1.X() -= pView->GetIndent();
- aPos1.Y() = GetEntryLine( pEntry );
- aPos1.Y() += nEntryHeightDIV2;
+ aPos1.AdjustX(rExpandedNodeBitmap.GetSizePixel().Width() / 2 );
+ aPos1.AdjustX( -(pView->GetIndent()) );
+ aPos1.setY( GetEntryLine( pEntry ) );
+ aPos1.AdjustY(nEntryHeightDIV2 );
pChild = SvTreeList::LastSibling( pEntry );
- aPos2.X() = aPos1.X();
- aPos2.Y() = GetEntryLine( pChild );
- aPos2.Y() += nEntryHeightDIV2;
+ aPos2.setX( aPos1.X() );
+ aPos2.setY( GetEntryLine( pChild ) );
+ aPos2.AdjustY(nEntryHeightDIV2 );
rRenderContext.DrawLine(aPos1, aPos2);
}
rRenderContext.Pop();
@@ -1135,23 +1135,23 @@ void SvImpLBox::PositionScrollBars( Size& rSize, sal_uInt16 nMask )
Size aHorSize( rSize.Width(), nHorSBarHeight );
if( nMask & 0x0001 )
- aHorSize.Width() -= nVerSBarWidth;
+ aHorSize.AdjustWidth( -(nVerSBarWidth) );
if( nMask & 0x0002 )
- aVerSize.Height() -= nHorSBarHeight;
+ aVerSize.AdjustHeight( -(nHorSBarHeight) );
- aVerSize.Height() += 2 * nOverlap;
+ aVerSize.AdjustHeight(2 * nOverlap );
Point aVerPos( rSize.Width() - aVerSize.Width() + nOverlap, -nOverlap );
aVerSBar->SetPosSizePixel( aVerPos, aVerSize );
- aHorSize.Width() += 2 * nOverlap;
+ aHorSize.AdjustWidth(2 * nOverlap );
Point aHorPos( -nOverlap, rSize.Height() - aHorSize.Height() + nOverlap );
aHorSBar->SetPosSizePixel( aHorPos, aHorSize );
if( nMask & 0x0001 )
- rSize.Width() = aVerPos.X();
+ rSize.setWidth( aVerPos.X() );
if( nMask & 0x0002 )
- rSize.Height() = aHorPos.Y();
+ rSize.setHeight( aHorPos.Y() );
if( (nMask & (0x0001|0x0002)) == (0x0001|0x0002) )
aScrBarBox->Show();
@@ -1174,7 +1174,7 @@ void SvImpLBox::AdjustScrollBars( Size& rSize )
bool bHorBar = false;
long nMaxRight = aOSize.Width(); //GetOutputSize().Width();
Point aOrigin( pView->GetMapMode().GetOrigin() );
- aOrigin.X() *= -1;
+ aOrigin.setX( aOrigin.X() * -1 );
nMaxRight += aOrigin.X() - 1;
long nVis = nMostRight - aOrigin.X();
if( (nWindowStyle & WB_HSCROLL) &&
@@ -1379,7 +1379,7 @@ void SvImpLBox::ShowVerSBar()
long nMaxRight = GetOutputSize().Width();
Point aPos( pView->GetMapMode().GetOrigin() );
- aPos.X() *= -1; // convert document coordinates
+ aPos.setX( aPos.X() * -1 ); // convert document coordinates
nMaxRight = nMaxRight + aPos.X() - 1;
if( nMaxRight < nMostRight )
{
@@ -3045,7 +3045,7 @@ void SvImpLBox::EndScroll()
tools::Rectangle SvImpLBox::GetVisibleArea() const
{
Point aPos( pView->GetMapMode().GetOrigin() );
- aPos.X() *= -1;
+ aPos.setX( aPos.X() * -1 );
tools::Rectangle aRect( aPos, aOutputSize );
return aRect;
}
@@ -3112,14 +3112,14 @@ bool SvImpLBox::RequestHelp( const HelpEvent& rHEvt )
return false;
aPos = GetEntryPosition( pEntry );
- aPos.X() = pView->GetTabPos( pEntry, pTab ); //pTab->GetPos();
+ aPos.setX( pView->GetTabPos( pEntry, pTab ) ); //pTab->GetPos();
Size aSize( pItem->GetSize( pView, pEntry ) );
SvLBoxTab* pNextTab = NextTab( pTab );
bool bItemClipped = false;
// is the item cut off by its right neighbor?
if( pNextTab && pView->GetTabPos(pEntry,pNextTab) < aPos.X()+aSize.Width() )
{
- aSize.Width() = pNextTab->GetPos() - pTab->GetPos();
+ aSize.setWidth( pNextTab->GetPos() - pTab->GetPos() );
bItemClipped = true;
}
tools::Rectangle aItemRect( aPos, aSize );
@@ -3133,11 +3133,11 @@ bool SvImpLBox::RequestHelp( const HelpEvent& rHEvt )
// aItemRect.Right() = aViewRect.Right();
Point aPt = pView->OutputToScreenPixel( aItemRect.TopLeft() );
- aItemRect.Left() = aPt.X();
- aItemRect.Top() = aPt.Y();
+ aItemRect.SetLeft( aPt.X() );
+ aItemRect.SetTop( aPt.Y() );
aPt = pView->OutputToScreenPixel( aItemRect.BottomRight() );
- aItemRect.Right() = aPt.X();
- aItemRect.Bottom() = aPt.Y();
+ aItemRect.SetRight( aPt.X() );
+ aItemRect.SetBottom( aPt.Y() );
Help::ShowQuickHelp( pView, aItemRect,
static_cast<SvLBoxString*>(pItem)->GetText(), QuickHelpFlags::Left | QuickHelpFlags::VCenter );
@@ -3200,7 +3200,7 @@ bool SvImpLBox::SetMostRight( SvTreeListEntry* pEntry )
long nMaxRight = GetOutputSize().Width();
Point aPos( pView->GetMapMode().GetOrigin() );
- aPos.X() *= -1; // conversion document coordinates
+ aPos.setX( aPos.X() * -1 ); // conversion document coordinates
nMaxRight = nMaxRight + aPos.X() - 1;
long nNextTab = nTabPos < nMaxRight ? nMaxRight : nMaxRight + 50;
diff --git a/svtools/source/contnr/svlbitm.cxx b/svtools/source/contnr/svlbitm.cxx
index 710cce12b686..c3aad1254602 100644
--- a/svtools/source/contnr/svlbitm.cxx
+++ b/svtools/source/contnr/svlbitm.cxx
@@ -194,7 +194,7 @@ void SvLBoxString::Paint(
if (rDev.TextCenterAndClipEnabled())
{
nStyle |= DrawTextFlags::PathEllipsis | DrawTextFlags::Center;
- aSize.Width() = rDev.GetEntryWidth();
+ aSize.setWidth( rDev.GetEntryWidth() );
}
rRenderContext.DrawText(tools::Rectangle(rPos, aSize), maText, nStyle);
}
@@ -338,9 +338,9 @@ void SvLBoxButton::ImplAdjustBoxSize(Size& io_rSize, ControlType i_eType, vcl::R
Size aContentSize( aNativeContent.GetSize() );
// leave a little space around the box image (looks better)
if( aContentSize.Height() + 2 > io_rSize.Height() )
- io_rSize.Height() = aContentSize.Height() + 2;
+ io_rSize.setHeight( aContentSize.Height() + 2 );
if( aContentSize.Width() + 2 > io_rSize.Width() )
- io_rSize.Width() = aContentSize.Width() + 2;
+ io_rSize.setWidth( aContentSize.Width() + 2 );
}
}
diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx
index 092725983735..21b458212319 100644
--- a/svtools/source/contnr/svtabbx.cxx
+++ b/svtools/source/contnr/svtabbx.cxx
@@ -811,7 +811,7 @@ tools::Rectangle SvHeaderTabListBox::GetFieldRectPixelAbs( sal_Int32 _nRow, sal_
Point aTopLeft = aRect.TopLeft();
DBG_ASSERT( m_pImpl->m_pHeaderBar->GetItemCount() > _nColumn, "invalid column" );
tools::Rectangle aItemRect = m_pImpl->m_pHeaderBar->GetItemRect( m_pImpl->m_pHeaderBar->GetItemId( _nColumn ) );
- aTopLeft.X() = aItemRect.Left();
+ aTopLeft.setX( aItemRect.Left() );
Size aSize = aItemRect.GetSize();
aRect = tools::Rectangle( aTopLeft, aSize );
vcl::Window* pParent = nullptr;
diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx
index 64236a8a8d45..0a68c3405e18 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -2479,8 +2479,8 @@ void SvTreeListBox::EditItemText(SvTreeListEntry* pEntry, SvLBoxString* pItem, c
Size aItemSize( pItem->GetSize(this, pEntry) );
Point aPos = GetEntryPosition( pEntry );
- aPos.Y() += ( nEntryHeight - aItemSize.Height() ) / 2;
- aPos.X() = GetTabPos( pEntry, pTab );
+ aPos.AdjustY(( nEntryHeight - aItemSize.Height() ) / 2 );
+ aPos.setX( GetTabPos( pEntry, pTab ) );
long nOutputWidth = pImpl->GetOutputSize().Width();
Size aSize( nOutputWidth - aPos.X(), aItemSize.Height() );
sal_uInt16 nPos = std::find( aTabs.begin(), aTabs.end(), pTab ) - aTabs.begin();
@@ -2489,11 +2489,11 @@ void SvTreeListBox::EditItemText(SvTreeListEntry* pEntry, SvLBoxString* pItem, c
SvLBoxTab* pRightTab = aTabs[ nPos + 1 ];
long nRight = GetTabPos( pEntry, pRightTab );
if( nRight <= nOutputWidth )
- aSize.Width() = nRight - aPos.X();
+ aSize.setWidth( nRight - aPos.X() );
}
Point aOrigin( GetMapMode().GetOrigin() );
aPos += aOrigin; // convert to win coordinates
- aSize.Width() -= aOrigin.X();
+ aSize.AdjustWidth( -(aOrigin.X()) );
tools::Rectangle aRect( aPos, aSize );
EditText( pItem->GetText(), aRect, rSelection );
}
@@ -2679,7 +2679,7 @@ void SvTreeListBox::PaintEntry1(SvTreeListEntry& rEntry, long nLine, vcl::Render
rRenderContext.SetClipRegion(vcl::Region(pImpl->GetClipRegionRect()));
Point aEntryPos(rRenderContext.GetMapMode().GetOrigin());
- aEntryPos.X() *= -1; // conversion document coordinates
+ aEntryPos.setX( aEntryPos.X() * -1 ); // conversion document coordinates
long nMaxRight = nWidth + aEntryPos.X() - 1;
Color aBackupTextColor(rRenderContext.GetTextColor());
@@ -2734,8 +2734,8 @@ void SvTreeListBox::PaintEntry1(SvTreeListEntry& rEntry, long nLine, vcl::Render
else
nX = nTabPos + pTab->CalcOffset(aSize.Width(), nNextTabPos - nTabPos);
- aEntryPos.X() = nX;
- aEntryPos.Y() = nLine;
+ aEntryPos.setX( nX );
+ aEntryPos.setY( nLine );
// set background pattern/color
@@ -2788,7 +2788,7 @@ void SvTreeListBox::PaintEntry1(SvTreeListEntry& rEntry, long nLine, vcl::Render
if (!(nTreeFlags & SvTreeFlags::USESEL))
{
// only draw the area that is used by the item
- aRectSize.Width() = aSize.Width();
+ aRectSize.setWidth( aSize.Width() );
aRect.SetPos(aEntryPos);
aRect.SetSize(aRectSize);
}
@@ -2796,24 +2796,24 @@ void SvTreeListBox::PaintEntry1(SvTreeListEntry& rEntry, long nLine, vcl::Render
{
// draw from the current to the next tab
if (nCurTab != 0)
- aRect.Left() = nTabPos;
+ aRect.SetLeft( nTabPos );
else
// if we're in the 0th tab, always draw from column 0 --
// else we get problems with centered tabs
- aRect.Left() = 0;
- aRect.Top() = nLine;
- aRect.Bottom() = nLine + nTempEntryHeight - 1;
+ aRect.SetLeft( 0 );
+ aRect.SetTop( nLine );
+ aRect.SetBottom( nLine + nTempEntryHeight - 1 );
if (pNextTab)
{
long nRight;
nRight = GetTabPos(&rEntry, pNextTab) - 1;
if (nRight > nMaxRight)
nRight = nMaxRight;
- aRect.Right() = nRight;
+ aRect.SetRight( nRight );
}
else
{
- aRect.Right() = nMaxRight;
+ aRect.SetRight( nMaxRight );
}
}
// A custom selection that starts at a tab position > 0, do not fill
@@ -2832,7 +2832,7 @@ void SvTreeListBox::PaintEntry1(SvTreeListEntry& rEntry, long nLine, vcl::Render
}
// draw item
// center vertically
- aEntryPos.Y() += (nTempEntryHeight - aSize.Height()) / 2;
+ aEntryPos.AdjustY((nTempEntryHeight - aSize.Height()) / 2 );
pViewDataEntry->SetPaintRectangle(aRect);
pItem->Paint(aEntryPos, *this, rRenderContext, pViewDataEntry, rEntry);
@@ -2842,7 +2842,7 @@ void SvTreeListBox::PaintEntry1(SvTreeListEntry& rEntry, long nLine, vcl::Render
// not at the right edge of the window!
aRect.Right() < nMaxRight)
{
- aRect.Left() = aRect.Right() - SV_TAB_BORDER;
+ aRect.SetLeft( aRect.Right() - SV_TAB_BORDER );
rRenderContext.DrawRect(aRect);
}
@@ -2887,7 +2887,7 @@ void SvTreeListBox::PaintEntry1(SvTreeListEntry& rEntry, long nLine, vcl::Render
return;
Point aPos(GetTabPos(&rEntry, pFirstDynamicTab), nLine);
- aPos.X() += pImpl->nNodeBmpTabDistance;
+ aPos.AdjustX(pImpl->nNodeBmpTabDistance );
const Image* pImg = nullptr;
@@ -2906,7 +2906,7 @@ void SvTreeListBox::PaintEntry1(SvTreeListEntry& rEntry, long nLine, vcl::Render
pImg = &pImpl->GetCollapsedNodeBmp( );
}
}
- aPos.Y() += (nTempEntryHeight - pImg->GetSizePixel().Height()) / 2;
+ aPos.AdjustY((nTempEntryHeight - pImg->GetSizePixel().Height()) / 2 );
DrawImageFlags nStyle = DrawImageFlags::NONE;
if (!IsEnabled())
@@ -2958,8 +2958,8 @@ tools::Rectangle SvTreeListBox::GetFocusRect( SvTreeListEntry* pEntry, long nLin
Size aSize;
tools::Rectangle aRect;
- aRect.Top() = nLine;
- aSize.Height() = GetEntryHeight();
+ aRect.SetTop( nLine );
+ aSize.setHeight( GetEntryHeight() );
long nRealWidth = pImpl->GetOutputSize().Width();
nRealWidth -= GetMapMode().GetOrigin().X();
@@ -2988,18 +2988,18 @@ tools::Rectangle SvTreeListBox::GetFocusRect( SvTreeListEntry* pEntry, long nLin
if( pTab && nCurTab < pEntry->ItemCount() )
{
SvLBoxItem& rItem = pEntry->GetItem( nCurTab );
- aSize.Width() = rItem.GetSize( this, pEntry ).Width();
+ aSize.setWidth( rItem.GetSize( this, pEntry ).Width() );
if( !aSize.Width() )
- aSize.Width() = 15;
+ aSize.setWidth( 15 );
long nX = nTabPos; //GetTabPos( pEntry, pTab );
// alignment
nX += pTab->CalcOffset( aSize.Width(), nNextTabPos - nTabPos );
- aRect.Left() = nX;
+ aRect.SetLeft( nX );
// make sure that first and last letter aren't cut off slightly
aRect.SetSize( aSize );
if( aRect.Left() > 0 )
- aRect.Left()--;
- aRect.Right()++;
+ aRect.AdjustLeft( -1 );
+ aRect.AdjustRight( 1 );
}
}
else
@@ -3015,34 +3015,34 @@ tools::Rectangle SvTreeListBox::GetFocusRect( SvTreeListEntry* pEntry, long nLin
if( nLastTab < aTabs.size() ) // is there another one?
pLastTab = aTabs[ nLastTab ];
- aSize.Width() = pLastTab ? pLastTab->GetPos() : 0x0fffffff;
+ aSize.setWidth( pLastTab ? pLastTab->GetPos() : 0x0fffffff );
nFocusWidth = static_cast<short>(aSize.Width());
if( pTab )
nFocusWidth = nFocusWidth - static_cast<short>(nTabPos); //pTab->GetPos();
}
else
{
- aSize.Width() = nFocusWidth;
+ aSize.setWidth( nFocusWidth );
if( pTab )
{
if( nCurTab )
- aSize.Width() += nTabPos;
+ aSize.AdjustWidth(nTabPos );
else
- aSize.Width() += pTab->GetPos(); // Tab0 always from the leftmost position
+ aSize.AdjustWidth(pTab->GetPos() ); // Tab0 always from the leftmost position
}
}
// if selection starts with 0th tab, draw from column 0 on
if( nCurTab != 0 )
{
- aRect.Left() = nTabPos;
- aSize.Width() -= nTabPos;
+ aRect.SetLeft( nTabPos );
+ aSize.AdjustWidth( -nTabPos );
}
aRect.SetSize( aSize );
}
// adjust right edge because of clipping
if( aRect.Right() >= nRealWidth )
{
- aRect.Right() = nRealWidth-1;
+ aRect.SetRight( nRealWidth-1 );
nFocusWidth = static_cast<short>(aRect.GetWidth());
}
return aRect;
@@ -3152,15 +3152,15 @@ Size SvTreeListBox::GetOptimalSize() const
std::vector<long> aWidths;
Size aRet(0, getPreferredDimensions(aWidths));
for (long aWidth : aWidths)
- aRet.Width() += aWidth;
+ aRet.AdjustWidth(aWidth );
if (GetStyle() & WB_BORDER)
{
const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
- aRet.Width() += rStyleSettings.GetBorderSize() * 2;
- aRet.Height() += rStyleSettings.GetBorderSize() * 2;
+ aRet.AdjustWidth(rStyleSettings.GetBorderSize() * 2 );
+ aRet.AdjustHeight(rStyleSettings.GetBorderSize() * 2 );
}
long nMinWidth = nMinWidthInChars * approximate_char_width();
- aRet.Width() = std::max(aRet.Width(), nMinWidth);
+ aRet.setWidth( std::max(aRet.Width(), nMinWidth) );
return aRet;
}
diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx
index 962e35ade5c1..efd07162ce05 100644
--- a/svtools/source/control/calendar.cxx
+++ b/svtools/source/control/calendar.cxx
@@ -252,14 +252,14 @@ void Calendar::ImplFormat()
// calculate spinfields
long nSpinSize = nTextHeight+TITLE_BORDERY-SPIN_OFFY;
- maPrevRect.Left() = SPIN_OFFX;
- maPrevRect.Top() = SPIN_OFFY;
- maPrevRect.Right() = maPrevRect.Left()+nSpinSize;
- maPrevRect.Bottom() = maPrevRect.Top()+nSpinSize;
- maNextRect.Left() = aOutSize.Width()-SPIN_OFFX-nSpinSize-1;
- maNextRect.Top() = SPIN_OFFY;
- maNextRect.Right() = maNextRect.Left()+nSpinSize;
- maNextRect.Bottom() = maNextRect.Top()+nSpinSize;
+ maPrevRect.SetLeft( SPIN_OFFX );
+ maPrevRect.SetTop( SPIN_OFFY );
+ maPrevRect.SetRight( maPrevRect.Left()+nSpinSize );
+ maPrevRect.SetBottom( maPrevRect.Top()+nSpinSize );
+ maNextRect.SetLeft( aOutSize.Width()-SPIN_OFFX-nSpinSize-1 );
+ maNextRect.SetTop( SPIN_OFFY );
+ maNextRect.SetRight( maNextRect.Left()+nSpinSize );
+ maNextRect.SetBottom( maNextRect.Top()+nSpinSize );
// Calculate DayOfWeekText (gets displayed in a narrow font)
maDayOfWeekText.clear();
@@ -498,8 +498,8 @@ void ImplDrawSpinArrow(vcl::RenderContext& rRenderContext, const tools::Rectangl
Size(1, 1));
if (!bPrev)
{
- aRect.Left() += nLines;
- aRect.Right() += nLines;
+ aRect.AdjustLeft(nLines );
+ aRect.AdjustRight(nLines );
}
rRenderContext.DrawRect(aRect);
@@ -507,16 +507,16 @@ void ImplDrawSpinArrow(vcl::RenderContext& rRenderContext, const tools::Rectangl
{
if (bPrev)
{
- aRect.Left()++;
- aRect.Right()++;
+ aRect.AdjustLeft( 1 );
+ aRect.AdjustRight( 1 );
}
else
{
- aRect.Left()--;
- aRect.Right()--;
+ aRect.AdjustLeft( -1 );
+ aRect.AdjustRight( -1 );
}
- aRect.Top()--;
- aRect.Bottom()++;
+ aRect.AdjustTop( -1 );
+ aRect.AdjustBottom( 1 );
rRenderContext.DrawRect(aRect);
}
}
@@ -528,16 +528,16 @@ void Calendar::ImplDrawSpin(vcl::RenderContext& rRenderContext )
rRenderContext.SetLineColor();
rRenderContext.SetFillColor(rRenderContext.GetSettings().GetStyleSettings().GetButtonTextColor());
tools::Rectangle aOutRect = maPrevRect;
- aOutRect.Left() += 3;
- aOutRect.Top() += 3;
- aOutRect.Right() -= 3;
- aOutRect.Bottom() -= 3;
+ aOutRect.AdjustLeft(3 );
+ aOutRect.AdjustTop(3 );
+ aOutRect.AdjustRight( -3 );
+ aOutRect.AdjustBottom( -3 );
ImplDrawSpinArrow(rRenderContext, aOutRect, true);
aOutRect = maNextRect;
- aOutRect.Left() += 3;
- aOutRect.Top() += 3;
- aOutRect.Right() -= 3;
- aOutRect.Bottom() -= 3;
+ aOutRect.AdjustLeft(3 );
+ aOutRect.AdjustTop(3 );
+ aOutRect.AdjustRight( -3 );
+ aOutRect.AdjustBottom( -3 );
ImplDrawSpinArrow(rRenderContext, aOutRect, false);
}
@@ -677,12 +677,12 @@ void Calendar::ImplDraw(vcl::RenderContext& rRenderContext)
Point aSepPos2(0, aTitleRect.Bottom() - TITLE_BORDERY);
for (j = 0; j < mnMonthPerLine-1; j++)
{
- aSepPos1.X() += mnMonthWidth-1;
- aSepPos2.X() = aSepPos1.X();
+ aSepPos1.AdjustX(mnMonthWidth-1 );
+ aSepPos2.setX( aSepPos1.X() );
rRenderContext.SetLineColor(rStyleSettings.GetShadowColor());
rRenderContext.DrawLine(aSepPos1, aSepPos2);
- aSepPos1.X()++;
- aSepPos2.X() = aSepPos1.X();
+ aSepPos1.AdjustX( 1 );
+ aSepPos2.setX( aSepPos1.X() );
rRenderContext.SetLineColor(rStyleSettings.GetLightColor());
rRenderContext.DrawLine(aSepPos1, aSepPos2);
}
@@ -901,8 +901,8 @@ void Calendar::ImplUpdate( bool bCalcNew )
void Calendar::ImplInvertDropPos()
{
tools::Rectangle aRect = GetDateRect( maDropDate );//this is one Pixel to width and one to height
- aRect.Bottom() = aRect.Top()+mnDayHeight-1;
- aRect.Right() = aRect.Left()+mnDayWidth-1;
+ aRect.SetBottom( aRect.Top()+mnDayHeight-1 );
+ aRect.SetRight( aRect.Left()+mnDayWidth-1 );
Invert( aRect );
}
@@ -1227,11 +1227,11 @@ void Calendar::RequestHelp( const HelpEvent& rHEvt )
{
tools::Rectangle aDateRect = GetDateRect( aDate );
Point aPt = OutputToScreenPixel( aDateRect.TopLeft() );
- aDateRect.Left() = aPt.X();
- aDateRect.Top() = aPt.Y();
+ aDateRect.SetLeft( aPt.X() );
+ aDateRect.SetTop( aPt.Y() );
aPt = OutputToScreenPixel( aDateRect.BottomRight() );
- aDateRect.Right() = aPt.X();
- aDateRect.Bottom() = aPt.Y();
+ aDateRect.SetRight( aPt.X() );
+ aDateRect.SetBottom( aPt.Y() );
if ( rHEvt.GetMode() & HelpEventMode::QUICK )
{
@@ -1469,8 +1469,8 @@ tools::Rectangle Calendar::GetDateRect( const Date& rDate ) const
aRect = GetDateRect( aDate );
nDaysOff = aDate-rDate;
nX = nDaysOff*mnDayWidth;
- aRect.Left() -= nX;
- aRect.Right() -= nX;
+ aRect.AdjustLeft( -nX );
+ aRect.AdjustRight( -nX );
return aRect;
}
else
@@ -1488,15 +1488,15 @@ tools::Rectangle Calendar::GetDateRect( const Date& rDate ) const
{
if ( aLastDate == rDate )
{
- aRect.Left() += nDayIndex*mnDayWidth;
- aRect.Right() = aRect.Left()+mnDayWidth;
+ aRect.AdjustLeft(nDayIndex*mnDayWidth );
+ aRect.SetRight( aRect.Left()+mnDayWidth );
return aRect;
}
if ( nDayIndex == 6 )
{
nDayIndex = 0;
- aRect.Top() += mnDayHeight;
- aRect.Bottom() += mnDayHeight;
+ aRect.AdjustTop(mnDayHeight );
+ aRect.AdjustBottom(mnDayHeight );
}
else
nDayIndex++;
@@ -1525,10 +1525,10 @@ tools::Rectangle Calendar::GetDateRect( const Date& rDate ) const
{
if ( nDay == rDate.GetDay() )
{
- aRect.Left() = nDayX + (nDayIndex*mnDayWidth);
- aRect.Top() = nDayY;
- aRect.Right() = aRect.Left()+mnDayWidth;
- aRect.Bottom() = aRect.Top()+mnDayHeight;
+ aRect.SetLeft( nDayX + (nDayIndex*mnDayWidth) );
+ aRect.SetTop( nDayY );
+ aRect.SetRight( aRect.Left()+mnDayWidth );
+ aRect.SetBottom( aRect.Top()+mnDayHeight );
break;
}
if ( nDayIndex == 6 )
@@ -1584,13 +1584,13 @@ Size Calendar::CalcWindowSizePixel() const
long n99TextWidth = GetTextWidth( a99Text );
long nTextHeight = GetTextHeight();
- aSize.Width() += ((n99TextWidth+DAY_OFFX)*7);
- aSize.Width() += MONTH_BORDERX*2;
+ aSize.AdjustWidth((n99TextWidth+DAY_OFFX)*7);
+ aSize.AdjustWidth(MONTH_BORDERX*2 );
- aSize.Height() = nTextHeight + TITLE_OFFY + (TITLE_BORDERY*2);
- aSize.Height() += nTextHeight + WEEKDAY_OFFY;
- aSize.Height() += ((nTextHeight+DAY_OFFY)*6);
- aSize.Height() += MONTH_OFFY;
+ aSize.setHeight( nTextHeight + TITLE_OFFY + (TITLE_BORDERY*2) );
+ aSize.AdjustHeight(nTextHeight + WEEKDAY_OFFY );
+ aSize.AdjustHeight((nTextHeight+DAY_OFFY)*6);
+ aSize.AdjustHeight(MONTH_OFFY );
return aSize;
}
@@ -1658,10 +1658,10 @@ PushButton* ImplCFieldFloatWin::EnableTodayBtn( bool bEnable )
OUString aTodayText(SvtResId(STR_SVT_CALENDAR_TODAY));
mpTodayBtn->SetText( aTodayText );
Size aSize;
- aSize.Width() = mpTodayBtn->GetCtrlTextWidth( mpTodayBtn->GetText() );
- aSize.Height() = mpTodayBtn->GetTextHeight();
- aSize.Width() += CALFIELD_EXTRA_BUTTON_WIDTH;
- aSize.Height() += CALFIELD_EXTRA_BUTTON_HEIGHT;
+ aSize.setWidth( mpTodayBtn->GetCtrlTextWidth( mpTodayBtn->GetText() ) );
+ aSize.setHeight( mpTodayBtn->GetTextHeight() );
+ aSize.AdjustWidth(CALFIELD_EXTRA_BUTTON_WIDTH );
+ aSize.AdjustHeight(CALFIELD_EXTRA_BUTTON_HEIGHT );
mpTodayBtn->SetSizePixel( aSize );
mpTodayBtn->Show();
}
@@ -1684,10 +1684,10 @@ PushButton* ImplCFieldFloatWin::EnableNoneBtn( bool bEnable )
OUString aNoneText(SvtResId(STR_SVT_CALENDAR_NONE));
mpNoneBtn->SetText( aNoneText );
Size aSize;
- aSize.Width() = mpNoneBtn->GetCtrlTextWidth( mpNoneBtn->GetText() );
- aSize.Height() = mpNoneBtn->GetTextHeight();
- aSize.Width() += CALFIELD_EXTRA_BUTTON_WIDTH;
- aSize.Height() += CALFIELD_EXTRA_BUTTON_HEIGHT;
+ aSize.setWidth( mpNoneBtn->GetCtrlTextWidth( mpNoneBtn->GetText() ) );
+ aSize.setHeight( mpNoneBtn->GetTextHeight() );
+ aSize.AdjustWidth(CALFIELD_EXTRA_BUTTON_WIDTH );
+ aSize.AdjustHeight(CALFIELD_EXTRA_BUTTON_HEIGHT );
mpNoneBtn->SetSizePixel( aSize );
mpNoneBtn->Show();
}
@@ -1710,13 +1710,13 @@ void ImplCFieldFloatWin::ArrangeButtons()
Size aTodayBtnSize = mpTodayBtn->GetSizePixel();
Size aNoneBtnSize = mpNoneBtn->GetSizePixel();
if ( aTodayBtnSize.Width() < aNoneBtnSize.Width() )
- aTodayBtnSize.Width() = aNoneBtnSize.Width();
+ aTodayBtnSize.setWidth( aNoneBtnSize.Width() );
else
- aNoneBtnSize.Width() = aTodayBtnSize.Width();
+ aNoneBtnSize.setWidth( aTodayBtnSize.Width() );
if ( aTodayBtnSize.Height() < aNoneBtnSize.Height() )
- aTodayBtnSize.Height() = aNoneBtnSize.Height();
+ aTodayBtnSize.setHeight( aNoneBtnSize.Height() );
else
- aNoneBtnSize.Height() = aTodayBtnSize.Height();
+ aNoneBtnSize.setHeight( aTodayBtnSize.Height() );
nBtnWidth = aTodayBtnSize.Width() + aNoneBtnSize.Width() + CALFIELD_SEP_X;
nBtnHeight = aTodayBtnSize.Height();
@@ -1751,7 +1751,7 @@ void ImplCFieldFloatWin::ArrangeButtons()
long nLineWidth = aOutSize.Width()-(CALFIELD_BORDERLINE_X*2);
mpFixedLine->setPosSizePixel( (aOutSize.Width()-nLineWidth)/2, aOutSize.Height()+((CALFIELD_BORDER_YTOP-2)/2),
nLineWidth, 2 );
- aOutSize.Height() += nBtnHeight + (CALFIELD_BORDER_Y*2) + CALFIELD_BORDER_YTOP;
+ aOutSize.AdjustHeight(nBtnHeight + (CALFIELD_BORDER_Y*2) + CALFIELD_BORDER_YTOP );
SetOutputSizePixel( aOutSize );
}
else
@@ -1867,7 +1867,7 @@ bool CalendarField::ShowDropDown( bool bShow )
pCalendar->SetCurDate( aDate );
Point aPos( GetParent()->OutputToScreenPixel( GetPosPixel() ) );
tools::Rectangle aRect( aPos, GetSizePixel() );
- aRect.Bottom() -= 1;
+ aRect.AdjustBottom( -1 );
mpCalendar->SetOutputSizePixel( mpCalendar->CalcWindowSizePixel() );
mpFloatWin->SetOutputSizePixel( mpCalendar->GetSizePixel() );
mpFloatWin->SetCalendar( mpCalendar );
diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index 2cceca8fd9a5..29665a781a25 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -415,10 +415,10 @@ void LineListBox::ImpGetLine( long nLine1, long nLine2, long nDistance,
//line within that
long nMinWidth = GetTextWidth("----------");
Size aSize = CalcSubEditSize();
- aSize.Width() = std::max(nMinWidth, aSize.Width());
- aSize.Width() -= aTxtSize.Width();
- aSize.Width() -= 6;
- aSize.Height() = aTxtSize.Height();
+ aSize.setWidth( std::max(nMinWidth, aSize.Width()) );
+ aSize.AdjustWidth( -(aTxtSize.Width()) );
+ aSize.AdjustWidth( -6 );
+ aSize.setHeight( aTxtSize.Height() );
// SourceUnit to Twips
if ( eSourceUnit == FUNIT_POINT )
@@ -445,7 +445,7 @@ void LineListBox::ImpGetLine( long nLine1, long nLine2, long nDistance,
}
long nVirHeight = n1+nDist+n2;
if ( nVirHeight > aSize.Height() )
- aSize.Height() = nVirHeight;
+ aSize.setHeight( nVirHeight );
// negative width should not be drawn
if ( aSize.Width() <= 0 )
return;
@@ -478,8 +478,8 @@ LineListBox::LineListBox( vcl::Window* pParent, WinBits nWinStyle ) :
aColor( COL_BLACK ),
maPaintCol( COL_BLACK )
{
- aTxtSize.Width() = GetTextWidth( " " );
- aTxtSize.Height() = GetTextHeight();
+ aTxtSize.setWidth( GetTextWidth( " " ) );
+ aTxtSize.setHeight( GetTextHeight() );
eSourceUnit = FUNIT_POINT;
aVirDev->SetLineColor();
@@ -820,8 +820,8 @@ void FontNameBox::ImplCalcUserItemSize()
if ( mbWYSIWYG && mpFontList )
{
aUserItemSz = Size(MAXPREVIEWWIDTH, GetTextHeight() );
- aUserItemSz.Height() *= 16;
- aUserItemSz.Height() /= 10;
+ aUserItemSz.setHeight( aUserItemSz.Height() * 16 );
+ aUserItemSz.setHeight( aUserItemSz.Height() / 10 );
}
SetUserItemSize( aUserItemSz );
}
@@ -845,7 +845,7 @@ namespace
break;
}
- aSize.Height() -= EXTRAFONTSIZE;
+ aSize.AdjustHeight( -(EXTRAFONTSIZE) );
rFont.SetFontSize(aSize);
rDevice.SetFont(rFont);
}
@@ -873,7 +873,7 @@ void FontNameBox::UserDraw( const UserDrawEvent& rUDEvt )
Color aTextColor = pRenderContext->GetTextColor();
vcl::Font aOldFont(pRenderContext->GetFont());
Size aSize( aOldFont.GetFontSize() );
- aSize.Height() += EXTRAFONTSIZE;
+ aSize.AdjustHeight(EXTRAFONTSIZE );
vcl::Font aFont( rFontMetric );
aFont.SetFontSize( aSize );
pRenderContext->SetFont(aFont);
diff --git a/svtools/source/control/headbar.cxx b/svtools/source/control/headbar.cxx
index db32b5009191..d2777c670e7e 100644
--- a/svtools/source/control/headbar.cxx
+++ b/svtools/source/control/headbar.cxx
@@ -144,10 +144,10 @@ long HeaderBar::ImplGetItemPos( sal_uInt16 nPos ) const
tools::Rectangle HeaderBar::ImplGetItemRect( sal_uInt16 nPos ) const
{
tools::Rectangle aRect( ImplGetItemPos( nPos ), 0, 0, mnDY-1 );
- aRect.Right() = aRect.Left() + mvItemList[ nPos ]->mnSize - 1;
+ aRect.SetRight( aRect.Left() + mvItemList[ nPos ]->mnSize - 1 );
// check for overflow on various systems
if ( aRect.Right() > 16000 )
- aRect.Right() = 16000;
+ aRect.SetRight( 16000 );
return aRect;
}
@@ -221,13 +221,13 @@ void HeaderBar::ImplInvertDrag( sal_uInt16 nStartPos, sal_uInt16 nEndPos )
if ( nEndPos > nStartPos )
{
- aStartPos.X() += 3;
- aEndPos.X() = aRect2.Right()-6;
+ aStartPos.AdjustX(3 );
+ aEndPos.setX( aRect2.Right()-6 );
}
else
{
- aStartPos.X() -= 3;
- aEndPos.X() = aRect2.Left()+6;
+ aStartPos.AdjustX( -3 );
+ aEndPos.setX( aRect2.Left()+6 );
}
SetRasterOp( RasterOp::Invert );
@@ -299,8 +299,8 @@ void HeaderBar::ImplDrawItem(vcl::RenderContext& rRenderContext, sal_uInt16 nPos
else
{
// do not draw border
- aRect.Top() += mnBorderOff1;
- aRect.Bottom() -= mnBorderOff2;
+ aRect.AdjustTop(mnBorderOff1 );
+ aRect.AdjustBottom( -(mnBorderOff2) );
// delete background
if ( !pRect )
@@ -344,7 +344,7 @@ void HeaderBar::ImplDrawItem(vcl::RenderContext& rRenderContext, sal_uInt16 nPos
Size aImageSize = pItem->maImage.GetSizePixel();
Size aTxtSize(rRenderContext.GetTextWidth(pItem->maOutText), 0);
if (!pItem->maOutText.isEmpty())
- aTxtSize.Height() = rRenderContext.GetTextHeight();
+ aTxtSize.setHeight( rRenderContext.GetTextHeight() );
long nArrowWidth = 0;
if (nBits & (HeaderBarItemBits::UPARROW | HeaderBarItemBits::DOWNARROW))
nArrowWidth = HEAD_ARROWSIZE2 + HEADERBAR_ARROWOFF;
@@ -355,8 +355,8 @@ void HeaderBar::ImplDrawItem(vcl::RenderContext& rRenderContext, sal_uInt16 nPos
nTestHeight += aTxtSize.Height();
if ((aImageSize.Width() > aRect.GetWidth()) || (nTestHeight > aRect.GetHeight()))
{
- aImageSize.Width() = 0;
- aImageSize.Height() = 0;
+ aImageSize.setWidth( 0 );
+ aImageSize.setHeight( 0 );
}
// cut text to correct length
@@ -605,14 +605,14 @@ void HeaderBar::ImplUpdate(sal_uInt16 nPos, bool bEnd)
aRect = ImplGetItemRect(nPos);
else
{
- aRect.Bottom() = mnDY - 1;
+ aRect.SetBottom( mnDY - 1 );
if (nItemCount)
- aRect.Left() = ImplGetItemRect(nItemCount - 1).Right();
+ aRect.SetLeft( ImplGetItemRect(nItemCount - 1).Right() );
}
if (bEnd)
- aRect.Right() = mnDX - 1;
- aRect.Top() += mnBorderOff1;
- aRect.Bottom() -= mnBorderOff2;
+ aRect.SetRight( mnDX - 1 );
+ aRect.AdjustTop(mnBorderOff1 );
+ aRect.AdjustBottom( -(mnBorderOff2) );
Invalidate(aRect);
}
@@ -952,11 +952,11 @@ void HeaderBar::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize,
size_t nItemCount = mvItemList.size();
for ( size_t i = 0; i < nItemCount; i++ )
{
- aItemRect.Left() = aRect.Left()+ImplGetItemPos( i );
- aItemRect.Right() = aItemRect.Left() + mvItemList[ i ]->mnSize - 1;
+ aItemRect.SetLeft( aRect.Left()+ImplGetItemPos( i ) );
+ aItemRect.SetRight( aItemRect.Left() + mvItemList[ i ]->mnSize - 1 );
// check for overflow on some systems
if ( aItemRect.Right() > 16000 )
- aItemRect.Right() = 16000;
+ aItemRect.SetRight( 16000 );
vcl::Region aRegion( aRect );
pDev->SetClipRegion( aRegion );
ImplDrawItem(*pDev, i, false, aItemRect, &aRect );
@@ -995,11 +995,11 @@ void HeaderBar::RequestHelp( const HelpEvent& rHEvt )
{
tools::Rectangle aItemRect = GetItemRect( nItemId );
Point aPt = OutputToScreenPixel( aItemRect.TopLeft() );
- aItemRect.Left() = aPt.X();
- aItemRect.Top() = aPt.Y();
+ aItemRect.SetLeft( aPt.X() );
+ aItemRect.SetTop( aPt.Y() );
aPt = OutputToScreenPixel( aItemRect.BottomRight() );
- aItemRect.Right() = aPt.X();
- aItemRect.Bottom() = aPt.Y();
+ aItemRect.SetRight( aPt.X() );
+ aItemRect.SetBottom( aPt.Y() );
OUString aStr = GetHelpText( nItemId );
if ( aStr.isEmpty() || !(rHEvt.GetMode() & HelpEventMode::BALLOON) )
@@ -1316,18 +1316,18 @@ Size HeaderBar::CalcWindowSizePixel() const
nMaxImageSize = nImageHeight;
// add width
- aSize.Width() += pItem->mnSize;
+ aSize.AdjustWidth(pItem->mnSize );
}
if ( nMaxImageSize > aSize.Height() )
- aSize.Height() = nMaxImageSize;
+ aSize.setHeight( nMaxImageSize );
// add border
if ( mbButtonStyle )
- aSize.Height() += 4;
+ aSize.AdjustHeight(4 );
else
- aSize.Height() += 2;
- aSize.Height() += mnBorderOff1+mnBorderOff2;
+ aSize.AdjustHeight(2 );
+ aSize.AdjustHeight(mnBorderOff1+mnBorderOff2 );
return aSize;
}
diff --git a/svtools/source/control/hyperlabel.cxx b/svtools/source/control/hyperlabel.cxx
index 036088385102..2cebdc20d27a 100644
--- a/svtools/source/control/hyperlabel.cxx
+++ b/svtools/source/control/hyperlabel.cxx
@@ -59,8 +59,8 @@ namespace svt
m_pImpl->m_aMinSize = FixedText::CalcMinimumSize( nMaxWidth );
// the MinimumSize is used to size the FocusRectangle
// and for the MouseMove method
- m_pImpl->m_aMinSize.Height() += 2;
- m_pImpl->m_aMinSize.Width() += 1;
+ m_pImpl->m_aMinSize.AdjustHeight(2 );
+ m_pImpl->m_aMinSize.AdjustWidth(1 );
return m_pImpl->m_aMinSize;
}
diff --git a/svtools/source/control/roadmap.cxx b/svtools/source/control/roadmap.cxx
index dfcf27a44294..bf1840702f3a 100644
--- a/svtools/source/control/roadmap.cxx
+++ b/svtools/source/control/roadmap.cxx
@@ -187,8 +187,8 @@ public:
void RoadmapImpl::initItemSize()
{
Size aLabelSize( m_rAntiImpl.GetOutputSizePixel() );
- aLabelSize.Height() = m_rAntiImpl.LogicToPixel(Size(0, LABELBASEMAPHEIGHT), MapMode(MapUnit::MapAppFont)).Height();
- aLabelSize.Width() -= m_rAntiImpl.LogicToPixel(Size(2 * ROADMAP_INDENT_X, 0), MapMode(MapUnit::MapAppFont)).Width();
+ aLabelSize.setHeight( m_rAntiImpl.LogicToPixel(Size(0, LABELBASEMAPHEIGHT), MapMode(MapUnit::MapAppFont)).Height() );
+ aLabelSize.AdjustWidth( -(m_rAntiImpl.LogicToPixel(Size(2 * ROADMAP_INDENT_X, 0), MapMode(MapUnit::MapAppFont)).Width()) );
m_aItemSizePixel = aLabelSize;
}
@@ -737,8 +737,8 @@ void RoadmapItem::SetPosition(RoadmapItem const * _pOldItem)
Size aOldSize = _pOldItem->mpDescription->GetSizePixel();
aIDPos = _pOldItem->mpID->GetPosPixel();
- aIDPos.Y() += aOldSize.Height();
- aIDPos.Y() += mpID->GetParent()->LogicToPixel( Size( 0, ROADMAP_ITEM_DISTANCE_Y ) ).Height();
+ aIDPos.AdjustY(aOldSize.Height() );
+ aIDPos.AdjustY(mpID->GetParent()->LogicToPixel( Size( 0, ROADMAP_ITEM_DISTANCE_Y ) ).Height() );
}
mpID->SetPosPixel( aIDPos );
diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx
index 2c1aa5be85ff..9e4a87d60f8f 100644
--- a/svtools/source/control/ruler.cxx
+++ b/svtools/source/control/ruler.cxx
@@ -206,9 +206,9 @@ void Ruler::ImplInit( WinBits nWinBits )
Size aDefSize;
if ( nWinBits & WB_HORZ )
- aDefSize.Height() = nDefHeight;
+ aDefSize.setHeight( nDefHeight );
else
- aDefSize.Width() = nDefHeight;
+ aDefSize.setWidth( nDefHeight );
SetOutputSizePixel( aDefSize );
SetType(WindowType::RULER);
}
@@ -340,9 +340,9 @@ void Ruler::ImplInvertLines(vcl::RenderContext& rRenderContext)
// Calculate rectangle
tools::Rectangle aRect;
if (mnWinStyle & WB_HORZ)
- aRect.Bottom() = nY;
+ aRect.SetBottom( nY );
else
- aRect.Right() = nY;
+ aRect.SetRight( nY );
// Draw lines
for (RulerLine & rLine : mpData->pLines)
@@ -352,32 +352,32 @@ void Ruler::ImplInvertLines(vcl::RenderContext& rRenderContext)
{
if (mnWinStyle & WB_HORZ )
{
- aRect.Left() = n;
- aRect.Right() = n;
+ aRect.SetLeft( n );
+ aRect.SetRight( n );
}
else
{
- aRect.Top() = n;
- aRect.Bottom() = n;
+ aRect.SetTop( n );
+ aRect.SetBottom( n );
}
tools::Rectangle aTempRect = aRect;
if (mnWinStyle & WB_HORZ)
- aTempRect.Bottom() = RULER_OFF - 1;
+ aTempRect.SetBottom( RULER_OFF - 1 );
else
- aTempRect.Right() = RULER_OFF - 1;
+ aTempRect.SetRight( RULER_OFF - 1 );
rRenderContext.Erase(aTempRect);
if (mnWinStyle & WB_HORZ)
{
- aTempRect.Bottom() = aRect.Bottom();
- aTempRect.Top() = aTempRect.Bottom() - RULER_OFF + 1;
+ aTempRect.SetBottom( aRect.Bottom() );
+ aTempRect.SetTop( aTempRect.Bottom() - RULER_OFF + 1 );
}
else
{
- aTempRect.Right() = aRect.Right();
- aTempRect.Left() = aTempRect.Right() - RULER_OFF + 1;
+ aTempRect.SetRight( aRect.Right() );
+ aTempRect.SetLeft( aTempRect.Right() - RULER_OFF + 1 );
}
rRenderContext.Erase(aTempRect);
Invert(aRect);
@@ -786,17 +786,17 @@ static void ImplCenterTabPos(Point& rPos, sal_uInt16 nTabStyle)
{
bool bRTL = 0 != (nTabStyle & RULER_TAB_RTL);
nTabStyle &= RULER_TAB_STYLE;
- rPos.Y() += ruler_tab.height/2;
+ rPos.AdjustY(ruler_tab.height/2 );
if ( (!bRTL && nTabStyle == RULER_TAB_LEFT) ||
( bRTL && nTabStyle == RULER_TAB_RIGHT) )
{
- rPos.X() -= ruler_tab.width / 2;
+ rPos.AdjustX( -(ruler_tab.width / 2) );
}
else if ( (!bRTL && nTabStyle == RULER_TAB_RIGHT) ||
( bRTL && nTabStyle == RULER_TAB_LEFT) )
{
- rPos.X() += ruler_tab.width / 2;
+ rPos.AdjustX(ruler_tab.width / 2 );
}
}
@@ -806,16 +806,16 @@ static void lcl_RotateRect_Impl(tools::Rectangle& rRect, const long nReference,
return;
tools::Rectangle aTmp(rRect);
- rRect.Top() = aTmp.Left();
- rRect.Bottom() = aTmp.Right();
- rRect.Left() = aTmp.Top();
- rRect.Right() = aTmp.Bottom();
+ rRect.SetTop( aTmp.Left() );
+ rRect.SetBottom( aTmp.Right() );
+ rRect.SetLeft( aTmp.Top() );
+ rRect.SetRight( aTmp.Bottom() );
if (bRightAligned)
{
long nRef = 2 * nReference;
- rRect.Left() = nRef - rRect.Left();
- rRect.Right() = nRef - rRect.Right();
+ rRect.SetLeft( nRef - rRect.Left() );
+ rRect.SetRight( nRef - rRect.Right() );
}
}
@@ -841,59 +841,59 @@ static void ImplDrawRulerTab(vcl::RenderContext& rRenderContext, const Point& rP
if (nTabStyle == RULER_TAB_DEFAULT)
{
- aRect1.Left() = rPos.X() - ruler_tab.dwidth2 + 1;
- aRect1.Top() = rPos.Y() - ruler_tab.dheight2 + 1;
- aRect1.Right() = rPos.X() - ruler_tab.dwidth2 + ruler_tab.dwidth + DPIOffset;
- aRect1.Bottom() = rPos.Y();
+ aRect1.SetLeft( rPos.X() - ruler_tab.dwidth2 + 1 );
+ aRect1.SetTop( rPos.Y() - ruler_tab.dheight2 + 1 );
+ aRect1.SetRight( rPos.X() - ruler_tab.dwidth2 + ruler_tab.dwidth + DPIOffset );
+ aRect1.SetBottom( rPos.Y() );
- aRect2.Left() = rPos.X() - ruler_tab.dwidth2 + ruler_tab.dwidth3;
- aRect2.Top() = rPos.Y() - ruler_tab.dheight + 1;
- aRect2.Right() = rPos.X() - ruler_tab.dwidth2 + ruler_tab.dwidth3 + ruler_tab.dwidth4 - 1;
- aRect2.Bottom() = rPos.Y();
+ aRect2.SetLeft( rPos.X() - ruler_tab.dwidth2 + ruler_tab.dwidth3 );
+ aRect2.SetTop( rPos.Y() - ruler_tab.dheight + 1 );
+ aRect2.SetRight( rPos.X() - ruler_tab.dwidth2 + ruler_tab.dwidth3 + ruler_tab.dwidth4 - 1 );
+ aRect2.SetBottom( rPos.Y() );
}
else if ((!bRTL && nTabStyle == RULER_TAB_LEFT) || (bRTL && nTabStyle == RULER_TAB_RIGHT))
{
- aRect1.Left() = rPos.X();
- aRect1.Top() = rPos.Y() - ruler_tab.height2 + 1;
- aRect1.Right() = rPos.X() + ruler_tab.width - 1;
- aRect1.Bottom() = rPos.Y();
+ aRect1.SetLeft( rPos.X() );
+ aRect1.SetTop( rPos.Y() - ruler_tab.height2 + 1 );
+ aRect1.SetRight( rPos.X() + ruler_tab.width - 1 );
+ aRect1.SetBottom( rPos.Y() );
- aRect2.Left() = rPos.X();
- aRect2.Top() = rPos.Y() - ruler_tab.height + 1;
- aRect2.Right() = rPos.X() + ruler_tab.width2 - 1;
- aRect2.Bottom() = rPos.Y();
+ aRect2.SetLeft( rPos.X() );
+ aRect2.SetTop( rPos.Y() - ruler_tab.height + 1 );
+ aRect2.SetRight( rPos.X() + ruler_tab.width2 - 1 );
+ aRect2.SetBottom( rPos.Y() );
}
else if ((!bRTL && nTabStyle == RULER_TAB_RIGHT) || (bRTL && nTabStyle == RULER_TAB_LEFT))
{
- aRect1.Left() = rPos.X() - ruler_tab.width + 1;
- aRect1.Top() = rPos.Y() - ruler_tab.height2 + 1;
- aRect1.Right() = rPos.X();
- aRect1.Bottom() = rPos.Y();
+ aRect1.SetLeft( rPos.X() - ruler_tab.width + 1 );
+ aRect1.SetTop( rPos.Y() - ruler_tab.height2 + 1 );
+ aRect1.SetRight( rPos.X() );
+ aRect1.SetBottom( rPos.Y() );
- aRect2.Left() = rPos.X() - ruler_tab.width2 + 1;
- aRect2.Top() = rPos.Y() - ruler_tab.height + 1;
- aRect2.Right() = rPos.X();
- aRect2.Bottom() = rPos.Y();
+ aRect2.SetLeft( rPos.X() - ruler_tab.width2 + 1 );
+ aRect2.SetTop( rPos.Y() - ruler_tab.height + 1 );
+ aRect2.SetRight( rPos.X() );
+ aRect2.SetBottom( rPos.Y() );
}
else
{
- aRect1.Left() = rPos.X() - ruler_tab.cwidth2 + 1;
- aRect1.Top() = rPos.Y() - ruler_tab.height2 + 1;
- aRect1.Right() = rPos.X() - ruler_tab.cwidth2 + ruler_tab.cwidth + DPIOffset;
- aRect1.Bottom() = rPos.Y();
+ aRect1.SetLeft( rPos.X() - ruler_tab.cwidth2 + 1 );
+ aRect1.SetTop( rPos.Y() - ruler_tab.height2 + 1 );
+ aRect1.SetRight( rPos.X() - ruler_tab.cwidth2 + ruler_tab.cwidth + DPIOffset );
+ aRect1.SetBottom( rPos.Y() );
- aRect2.Left() = rPos.X() - ruler_tab.cwidth2 + ruler_tab.cwidth3;
- aRect2.Top() = rPos.Y() - ruler_tab.height + 1;
- aRect2.Right() = rPos.X() - ruler_tab.cwidth2 + ruler_tab.cwidth3 + ruler_tab.cwidth4 - 1;
- aRect2.Bottom() = rPos.Y();
+ aRect2.SetLeft( rPos.X() - ruler_tab.cwidth2 + ruler_tab.cwidth3 );
+ aRect2.SetTop( rPos.Y() - ruler_tab.height + 1 );
+ aRect2.SetRight( rPos.X() - ruler_tab.cwidth2 + ruler_tab.cwidth3 + ruler_tab.cwidth4 - 1 );
+ aRect2.SetBottom( rPos.Y() );
if (nTabStyle == RULER_TAB_DECIMAL)
{
- aRect3.Left() = rPos.X() - ruler_tab.cwidth2 + ruler_tab.cwidth - 1;
- aRect3.Top() = rPos.Y() - ruler_tab.height + 1 + 1 - DPIOffset;
- aRect3.Right() = rPos.X() - ruler_tab.cwidth2 + ruler_tab.cwidth + DPIOffset;
- aRect3.Bottom() = rPos.Y() - ruler_tab.height + 1 + 2;
+ aRect3.SetLeft( rPos.X() - ruler_tab.cwidth2 + ruler_tab.cwidth - 1 );
+ aRect3.SetTop( rPos.Y() - ruler_tab.height + 1 + 1 - DPIOffset );
+ aRect3.SetRight( rPos.X() - ruler_tab.cwidth2 + ruler_tab.cwidth + DPIOffset );
+ aRect3.SetBottom( rPos.Y() - ruler_tab.height + 1 + 2 );
}
}
if (0 == (nWinBits & WB_HORZ))
@@ -1100,13 +1100,13 @@ void Ruler::ImplFormat(vcl::RenderContext const & rRenderContext)
// initialize VirtualDevice
if (mnWinStyle & WB_HORZ)
{
- aVirDevSize.Width() = mnVirWidth;
- aVirDevSize.Height() = mnVirHeight;
+ aVirDevSize.setWidth( mnVirWidth );
+ aVirDevSize.setHeight( mnVirHeight );
}
else
{
- aVirDevSize.Height() = mnVirWidth;
- aVirDevSize.Width() = mnVirHeight;
+ aVirDevSize.setHeight( mnVirWidth );
+ aVirDevSize.setWidth( mnVirHeight );
}
if (aVirDevSize != maVirDev->GetOutputSizePixel())
maVirDev->SetOutputSizePixel(aVirDevSize);
@@ -1230,10 +1230,10 @@ void Ruler::ImplInitExtraField( bool bUpdate )
// extra field evaluate
if ( mnWinStyle & WB_EXTRAFIELD )
{
- maExtraRect.Left() = RULER_OFF;
- maExtraRect.Top() = RULER_OFF;
- maExtraRect.Right() = RULER_OFF + mnVirHeight - 1;
- maExtraRect.Bottom() = RULER_OFF + mnVirHeight - 1;
+ maExtraRect.SetLeft( RULER_OFF );
+ maExtraRect.SetTop( RULER_OFF );
+ maExtraRect.SetRight( RULER_OFF + mnVirHeight - 1 );
+ maExtraRect.SetBottom( RULER_OFF + mnVirHeight - 1 );
if(mpData->bTextRTL)
{
if(mnWinStyle & WB_HORZ)
@@ -1289,16 +1289,16 @@ void Ruler::ImplDraw(vcl::RenderContext& rRenderContext)
if (mnWinStyle & WB_HORZ)
{
- aOffPos.X() = mnVirOff;
+ aOffPos.setX( mnVirOff );
if (mpData->bTextRTL)
- aVirDevSize.Width() -= maExtraRect.GetWidth();
+ aVirDevSize.AdjustWidth( -(maExtraRect.GetWidth()) );
- aOffPos.Y() = RULER_OFF;
+ aOffPos.setY( RULER_OFF );
}
else
{
- aOffPos.X() = RULER_OFF;
- aOffPos.Y() = mnVirOff;
+ aOffPos.setX( RULER_OFF );
+ aOffPos.setY( mnVirOff );
}
rRenderContext.DrawOutDev(aOffPos, aVirDevSize, Point(), aVirDevSize, *maVirDev.get());
@@ -1312,10 +1312,10 @@ void Ruler::ImplDrawExtra(vcl::RenderContext& rRenderContext)
tools::Rectangle aRect = maExtraRect;
bool bEraseRect = false;
- aRect.Left() += 2;
- aRect.Top() += 2;
- aRect.Right() -= 2;
- aRect.Bottom() -= 2;
+ aRect.AdjustLeft(2 );
+ aRect.AdjustTop(2 );
+ aRect.AdjustRight( -2 );
+ aRect.AdjustBottom( -2 );
if (mnExtraStyle & RULER_STYLE_HIGHLIGHT)
{
@@ -1350,13 +1350,13 @@ void Ruler::ImplDrawExtra(vcl::RenderContext& rRenderContext)
if (0 == (nWinBits & WB_HORZ))
{
if ((nWinBits & WB_RIGHT_ALIGNED) != 0)
- aDraw.Y() = 2 * aCenter.Y() - aDraw.Y();
+ aDraw.setY( 2 * aCenter.Y() - aDraw.Y() );
if (mpData->bTextRTL)
{
long nTemp = aDraw.X();
- aDraw.X() = aDraw.Y();
- aDraw.Y() = nTemp;
+ aDraw.setX( aDraw.Y() );
+ aDraw.setY( nTemp );
}
}
ImplDrawTab(rRenderContext, aDraw, nTabStyle);
@@ -1445,8 +1445,8 @@ bool Ruler::ImplHitTest( const Point& rPos, RulerSelection* pHitTest,
tools::Rectangle aRect;
if ( !mpData->pTabs.empty() )
{
- aRect.Bottom() = nHitBottom;
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list