[Libreoffice-commits] core.git: sd/source
Noel Grandin
noel.grandin at collabora.co.uk
Thu Feb 15 06:28:41 UTC 2018
sd/source/core/drawdoc2.cxx | 2
sd/source/core/sdpage.cxx | 110 +++++-----
sd/source/filter/eppt/epptso.cxx | 4
sd/source/filter/eppt/pptx-epptbase.cxx | 4
sd/source/filter/eppt/pptx-text.cxx | 4
sd/source/filter/grf/sdgrffilter.cxx | 16 -
sd/source/filter/html/buttonset.cxx | 8
sd/source/filter/html/htmlattr.cxx | 2
sd/source/filter/html/htmlex.cxx | 24 +-
sd/source/ui/animations/CustomAnimationList.cxx | 30 +-
sd/source/ui/annotations/annotationmanager.cxx | 8
sd/source/ui/annotations/annotationtag.cxx | 4
sd/source/ui/controller/displaymodecontroller.cxx | 12 -
sd/source/ui/controller/slidelayoutcontroller.cxx | 12 -
sd/source/ui/dlg/PhotoAlbumDialog.cxx | 8
sd/source/ui/dlg/RemoteDialogClientBox.cxx | 20 -
sd/source/ui/dlg/animobjs.cxx | 76 +++---
sd/source/ui/dlg/headerfooterdlg.cxx | 8
sd/source/ui/dlg/vectdlg.cxx | 12 -
sd/source/ui/docshell/docshel2.cxx | 4
sd/source/ui/docshell/sdclient.cxx | 8
sd/source/ui/func/fudraw.cxx | 8
sd/source/ui/func/fuinsert.cxx | 16 -
sd/source/ui/func/fuinsfil.cxx | 8
sd/source/ui/func/fusel.cxx | 8
sd/source/ui/func/fusnapln.cxx | 4
sd/source/ui/func/futext.cxx | 4
sd/source/ui/func/fuzoom.cxx | 16 -
sd/source/ui/sidebar/LayoutMenu.cxx | 8
sd/source/ui/sidebar/MasterPageContainer.cxx | 8
sd/source/ui/slideshow/slideshowimpl.cxx | 4
sd/source/ui/slideshow/slideshowviewimpl.cxx | 12 -
sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx | 4
sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx | 24 +-
sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx | 8
sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx | 8
sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx | 4
sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx | 4
sd/source/ui/slidesorter/view/SlsLayouter.cxx | 16 -
sd/source/ui/table/TableDesignPane.cxx | 6
sd/source/ui/table/tablefunction.cxx | 4
sd/source/ui/view/DocumentRenderer.cxx | 30 +-
sd/source/ui/view/ViewShellBase.cxx | 4
sd/source/ui/view/drviews1.cxx | 4
sd/source/ui/view/drviews2.cxx | 10
sd/source/ui/view/drviews3.cxx | 18 -
sd/source/ui/view/drviews4.cxx | 8
sd/source/ui/view/drviews5.cxx | 2
sd/source/ui/view/drviews8.cxx | 12 -
sd/source/ui/view/drviews9.cxx | 12 -
sd/source/ui/view/drviewsa.cxx | 32 +-
sd/source/ui/view/drviewse.cxx | 40 +--
sd/source/ui/view/drviewsh.cxx | 16 -
sd/source/ui/view/frmview.cxx | 18 -
sd/source/ui/view/grviewsh.cxx | 4
sd/source/ui/view/outlnvsh.cxx | 2
sd/source/ui/view/outlview.cxx | 24 +-
sd/source/ui/view/sdview3.cxx | 64 ++---
sd/source/ui/view/sdview4.cxx | 8
sd/source/ui/view/sdwindow.cxx | 48 ++--
sd/source/ui/view/viewoverlaymanager.cxx | 4
sd/source/ui/view/viewshe2.cxx | 4
sd/source/ui/view/viewshel.cxx | 4
63 files changed, 459 insertions(+), 459 deletions(-)
New commits:
commit 0d9f3f7628f88fa66aaeea1f7148db620e17e728
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Wed Feb 14 12:48:06 2018 +0200
loplugin:changetoolsgen in sd
Change-Id: I41c5510f95167fe028f219fb593f12b75709bd65
Reviewed-on: https://gerrit.libreoffice.org/49726
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx
index 3f632f5880f6..3da22f3dfb3b 100644
--- a/sd/source/core/drawdoc2.cxx
+++ b/sd/source/core/drawdoc2.cxx
@@ -1057,7 +1057,7 @@ IMapObject* SdDrawDocument::GetHitIMapObject( SdrObject const * pObj,
// Undo mirroring
if ( pGeoData->bMirrored )
- aRelPoint.X() = rRect.Right() + rRect.Left() - aRelPoint.X();
+ aRelPoint.setX( rRect.Right() + rRect.Left() - aRelPoint.X() );
// Undo shearing
if ( rGeo.nShearAngle )
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index c61e44f9ce7e..6e4c3dffbfee 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -997,14 +997,14 @@ SdrObject* SdPage::CreateDefaultPresObj(PresObjKind eObjKind)
Point aPos ( nLftBorder, nUppBorder );
Size aSize ( GetSize() );
- aSize.Width() -= nLftBorder + GetRightBorder();
- aSize.Height() -= nUppBorder + GetLowerBorder();
+ aSize.setWidth( aSize.Width() - nLftBorder + GetRightBorder() );
+ aSize.setHeight( aSize.Height() - nUppBorder + GetLowerBorder() );
getPresObjProp( *this, sObjKind, sPageKind, propvalue);
- aPos.X() += long( aSize.Width() * propvalue[2] );
- aPos.Y() += long( aSize.Height() * propvalue[3] );
- aSize.Width() = long( aSize.Width() * propvalue[1] );
- aSize.Height() = long( aSize.Height() * propvalue[0] );
+ aPos.setX( aPos.X() + long( aSize.Width() * propvalue[2] ) );
+ aPos.setY( aPos.Y() + long( aSize.Height() * propvalue[3] ) );
+ aSize.setWidth( long( aSize.Width() * propvalue[1] ) );
+ aSize.setHeight( long( aSize.Height() * propvalue[0] ) );
if(eObjKind == PRESOBJ_HEADER )
{
@@ -1021,8 +1021,8 @@ SdrObject* SdPage::CreateDefaultPresObj(PresObjKind eObjKind)
{
// create header&footer objects for handout and notes master
Size aPageSize ( GetSize() );
- aPageSize.Width() -= GetLeftBorder() + GetRightBorder();
- aPageSize.Height() -= GetUpperBorder() + GetLowerBorder();
+ aPageSize.setWidth( aPageSize.Width() - GetLeftBorder() + GetRightBorder() );
+ aPageSize.setHeight( aPageSize.Height() - GetUpperBorder() + GetLowerBorder() );
Point aPosition ( GetLeftBorder(), GetUpperBorder() );
@@ -1032,13 +1032,13 @@ SdrObject* SdPage::CreateDefaultPresObj(PresObjKind eObjKind)
Size aSize( NOTES_HEADER_FOOTER_WIDTH, NOTES_HEADER_FOOTER_HEIGHT );
Point aPos ( 0 ,0 );
if( propvalue[2] == 0 )
- aPos.X() = aPosition.X();
+ aPos.setX( aPosition.X() );
else
- aPos.X() = aPosition.X() + long( aPageSize.Width() - NOTES_HEADER_FOOTER_WIDTH );
+ aPos.setX( aPosition.X() + long( aPageSize.Width() - NOTES_HEADER_FOOTER_WIDTH ) );
if( propvalue[3] == 0 )
- aPos.Y() = aPosition.Y();
+ aPos.setY( aPosition.Y() );
else
- aPos.Y() = aPosition.Y() + long( aPageSize.Height() - NOTES_HEADER_FOOTER_HEIGHT );
+ aPos.setY( aPosition.Y() + long( aPageSize.Height() - NOTES_HEADER_FOOTER_HEIGHT ) );
::tools::Rectangle aRect( aPos, aSize );
return CreatePresObj( eObjKind, false, aRect );
@@ -1089,28 +1089,28 @@ void SdPage::DestroyDefaultPresObj(PresObjKind eObjKind)
******************************************************************/
Point aTitlePos ( GetLeftBorder(), GetUpperBorder() );
Size aTitleSize ( GetSize() );
- aTitleSize.Width() -= GetLeftBorder() + GetRightBorder();
- aTitleSize.Height() -= GetUpperBorder() + GetLowerBorder();
+ aTitleSize.setWidth( aTitleSize.Width() - GetLeftBorder() + GetRightBorder() );
+ aTitleSize.setHeight( aTitleSize.Height() - GetUpperBorder() + GetLowerBorder() );
const char* sPageKind = PageKindVector[mePageKind];
if (mePageKind == PageKind::Standard)
{
getPresObjProp( *this , "PRESOBJ_TITLE" ,sPageKind, propvalue);
- aTitlePos.X() += long( aTitleSize.Width() * propvalue[2] );
- aTitlePos.Y() += long( aTitleSize.Height() * propvalue[3] );
- aTitleSize.Width() = long( aTitleSize.Width() * propvalue[1] );
- aTitleSize.Height() = long( aTitleSize.Height() * propvalue[0] );
+ aTitlePos.setX( aTitlePos.X() + long( aTitleSize.Width() * propvalue[2] ) );
+ aTitlePos.setY( aTitlePos.Y() + long( aTitleSize.Height() * propvalue[3] ) );
+ aTitleSize.setWidth( long( aTitleSize.Width() * propvalue[1] ) );
+ aTitleSize.setHeight( long( aTitleSize.Height() * propvalue[0] ) );
}
else if (mePageKind == PageKind::Notes)
{
Point aPos = aTitlePos;
getPresObjProp( *this, "PRESOBJ_TITLE" ,sPageKind, propvalue);
- aPos.X() += long( aTitleSize.Width() * propvalue[2] );
- aPos.Y() += long( aTitleSize.Height() * propvalue[3] );
+ aPos.setX( aPos.X() + long( aTitleSize.Width() * propvalue[2] ) );
+ aPos.setY( aPos.Y() + long( aTitleSize.Height() * propvalue[3] ) );
// limit height
- aTitleSize.Height() = long( aTitleSize.Height() * propvalue[0] );
- aTitleSize.Width() = long( aTitleSize.Width() * propvalue[1] );
+ aTitleSize.setHeight( long( aTitleSize.Height() * propvalue[0] ) );
+ aTitleSize.setWidth( long( aTitleSize.Width() * propvalue[1] ) );
Size aPartArea = aTitleSize;
Size aSize;
@@ -1138,11 +1138,11 @@ void SdPage::DestroyDefaultPresObj(PresObjKind eObjKind)
if ( fH > fV )
fH = fV;
- aSize.Width() = static_cast<long>(fH * pRefPage->GetWidth());
- aSize.Height() = static_cast<long>(fH * pRefPage->GetHeight());
+ aSize.setWidth( static_cast<long>(fH * pRefPage->GetWidth()) );
+ aSize.setHeight( static_cast<long>(fH * pRefPage->GetHeight()) );
- aPos.X() += (aPartArea.Width() - aSize.Width()) / 2;
- aPos.Y() += (aPartArea.Height()- aSize.Height())/ 2;
+ aPos.setX( aPos.X() + (aPartArea.Width() - aSize.Width()) / 2 );
+ aPos.setY( aPos.Y() + (aPartArea.Height()- aSize.Height())/ 2 );
}
aTitlePos = aPos;
@@ -1172,27 +1172,27 @@ void SdPage::DestroyDefaultPresObj(PresObjKind eObjKind)
Point aLayoutPos ( GetLeftBorder(), GetUpperBorder() );
Size aLayoutSize ( GetSize() );
- aLayoutSize.Width() -= GetLeftBorder() + GetRightBorder();
- aLayoutSize.Height() -= GetUpperBorder() + GetLowerBorder();
+ aLayoutSize.setWidth( aLayoutSize.Width() - GetLeftBorder() + GetRightBorder() );
+ aLayoutSize.setHeight( aLayoutSize.Height() - GetUpperBorder() + GetLowerBorder() );
const char* sPageKind = PageKindVector[mePageKind];
if (mePageKind == PageKind::Standard)
{
getPresObjProp( *this ,"PRESOBJ_OUTLINE", sPageKind, propvalue);
- aLayoutPos.X() += long( aLayoutSize.Width() * propvalue[2] );
- aLayoutPos.Y() += long( aLayoutSize.Height() * propvalue[3] );
- aLayoutSize.Width() = long( aLayoutSize.Width() * propvalue[1] );
- aLayoutSize.Height() = long( aLayoutSize.Height() * propvalue[0] );
+ aLayoutPos.setX( aLayoutPos.X() + long( aLayoutSize.Width() * propvalue[2] ) );
+ aLayoutPos.setY( aLayoutPos.Y() + long( aLayoutSize.Height() * propvalue[3] ) );
+ aLayoutSize.setWidth( long( aLayoutSize.Width() * propvalue[1] ) );
+ aLayoutSize.setHeight( long( aLayoutSize.Height() * propvalue[0] ) );
aLayoutRect.SetPos(aLayoutPos);
aLayoutRect.SetSize(aLayoutSize);
}
else if (mePageKind == PageKind::Notes)
{
getPresObjProp( *this, "PRESOBJ_NOTES", sPageKind, propvalue);
- aLayoutPos.X() += long( aLayoutSize.Width() * propvalue[2] );
- aLayoutPos.Y() += long( aLayoutSize.Height() * propvalue[3] );
- aLayoutSize.Width() = long( aLayoutSize.Width() * propvalue[1] );
- aLayoutSize.Height() = long( aLayoutSize.Height() * propvalue[0] );
+ aLayoutPos.setX( aLayoutPos.X() + long( aLayoutSize.Width() * propvalue[2] ) );
+ aLayoutPos.setY( aLayoutPos.Y() + long( aLayoutSize.Height() * propvalue[3] ) );
+ aLayoutSize.setWidth( long( aLayoutSize.Width() * propvalue[1] ) );
+ aLayoutSize.setHeight( long( aLayoutSize.Height() * propvalue[0] ) );
aLayoutRect.SetPos(aLayoutPos);
aLayoutRect.SetSize(aLayoutSize);
}
@@ -1419,8 +1419,8 @@ static void CalcAutoLayoutRectangles( SdPage const & rPage,::tools::Rectangle* r
if(count == 0)
{
Size aSize ( aTitleRect.GetSize() );
- aSize.Height() = basegfx::fround(aSize.Height() * propvalue[0]);
- aSize.Width() = basegfx::fround(aSize.Width() * propvalue[1]);
+ aSize.setHeight( basegfx::fround(aSize.Height() * propvalue[0]) );
+ aSize.setWidth( basegfx::fround(aSize.Width() * propvalue[1]) );
Point aPos( basegfx::fround(aTitlePos.X() +(aSize.Width() * propvalue[2])),
basegfx::fround(aTitlePos.Y() + (aSize.Height() * propvalue[3])) );
rRectangle[count] = ::tools::Rectangle(aPos, aSize);
@@ -1856,11 +1856,11 @@ void SdPage::ScaleObjects(const Size& rNewPageSize, const ::tools::Rectangle& rN
// -> use up to date values
if (aNewPageSize.Width() < 0)
{
- aNewPageSize.Width() = GetWidth();
+ aNewPageSize.setWidth( GetWidth() );
}
if (aNewPageSize.Height() < 0)
{
- aNewPageSize.Height() = GetHeight();
+ aNewPageSize.setHeight( GetHeight() );
}
if (nLeft < 0)
{
@@ -1885,8 +1885,8 @@ void SdPage::ScaleObjects(const Size& rNewPageSize, const ::tools::Rectangle& rN
if (mbScaleObjects)
{
- aBackgroundSize.Width() -= nLeft + nRight;
- aBackgroundSize.Height() -= nUpper + nLower;
+ aBackgroundSize.setWidth( aBackgroundSize.Width() - nLeft + nRight );
+ aBackgroundSize.setHeight( aBackgroundSize.Height() - nUpper + nLower );
aBorderRect.SetSize(aBackgroundSize);
aNewPageSize = aBackgroundSize;
}
@@ -2082,8 +2082,8 @@ void SdPage::ScaleObjects(const Size& rNewPageSize, const ::tools::Rectangle& rN
// corrected scaling; only distances may be scaled
// use aTopLeft as original TopLeft
- aNewPos.X() = long((aTopLeft.X() - GetLeftBorder()) * static_cast<double>(aFractX)) + nLeft;
- aNewPos.Y() = long((aTopLeft.Y() - GetUpperBorder()) * static_cast<double>(aFractY)) + nUpper;
+ aNewPos.setX( long((aTopLeft.X() - GetLeftBorder()) * static_cast<double>(aFractX)) + nLeft );
+ aNewPos.setY( long((aTopLeft.Y() - GetUpperBorder()) * static_cast<double>(aFractY)) + nUpper );
Size aVec(aNewPos.X() - aTopLeft.X(), aNewPos.Y() - aTopLeft.Y());
@@ -2985,8 +2985,8 @@ void SdPage::CalculateHandoutAreas( SdDrawDocument& rModel, AutoLayout eLayout,
long nX = nGapW + nLeftBorder;
long nY = nGapH + nTopBorder;
- aArea.Width() -= nGapW * 2 + nLeftBorder + nRightBorder;
- aArea.Height() -= nGapH * 2 + nTopBorder + nBottomBorder;
+ aArea.setWidth( aArea.Width() - nGapW * 2 + nLeftBorder + nRightBorder );
+ aArea.setHeight( aArea.Height() - nGapH * 2 + nTopBorder + nBottomBorder );
const bool bLandscape = aArea.Width() > aArea.Height();
@@ -3060,8 +3060,8 @@ void SdPage::CalculateHandoutAreas( SdDrawDocument& rModel, AutoLayout eLayout,
rAreas.resize(static_cast<size_t>(nColCnt) * nRowCnt);
Size aPartArea, aSize;
- aPartArea.Width() = ((aArea.Width() - ((nColCnt-1) * nGapW) ) / nColCnt);
- aPartArea.Height() = ((aArea.Height() - ((nRowCnt-1) * nGapH) ) / nRowCnt);
+ aPartArea.setWidth( (aArea.Width() - ((nColCnt-1) * nGapW) ) / nColCnt );
+ aPartArea.setHeight( (aArea.Height() - ((nRowCnt-1) * nGapH) ) / nRowCnt );
SdrPage* pFirstPage = rModel.GetMasterSdPage(0, PageKind::Standard);
if (pFirstPage && pFirstPage->GetWidth() && pFirstPage->GetHeight())
@@ -3069,16 +3069,16 @@ void SdPage::CalculateHandoutAreas( SdDrawDocument& rModel, AutoLayout eLayout,
// scale actual size into handout rect
double fScale = static_cast<double>(aPartArea.Width()) / static_cast<double>(pFirstPage->GetWidth());
- aSize.Height() = static_cast<long>(fScale * pFirstPage->GetHeight() );
+ aSize.setHeight( static_cast<long>(fScale * pFirstPage->GetHeight() ) );
if( aSize.Height() > aPartArea.Height() )
{
fScale = static_cast<double>(aPartArea.Height()) / static_cast<double>(pFirstPage->GetHeight());
- aSize.Height() = aPartArea.Height();
- aSize.Width() = static_cast<long>(fScale * pFirstPage->GetWidth());
+ aSize.setHeight( aPartArea.Height() );
+ aSize.setWidth( static_cast<long>(fScale * pFirstPage->GetWidth()) );
}
else
{
- aSize.Width() = aPartArea.Width();
+ aSize.setWidth( aPartArea.Width() );
}
nX += (aPartArea.Width() - aSize.Width()) / 2;
@@ -3099,14 +3099,14 @@ void SdPage::CalculateHandoutAreas( SdDrawDocument& rModel, AutoLayout eLayout,
for(sal_uInt16 nRow = 0; nRow < nRowCnt; nRow++)
{
- aPos.X() = nStartX;
+ aPos.setX( nStartX );
for(sal_uInt16 nCol = 0; nCol < nColCnt; nCol++)
{
rAreas[*pOffsets++] = ::tools::Rectangle(aPos, aSize);
- aPos.X() += nOffsetX;
+ aPos.setX( aPos.X() + nOffsetX );
}
- aPos.Y() += nOffsetY;
+ aPos.setY( aPos.Y() + nOffsetY );
}
}
}
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index 89080a1a8db4..de02cd1eb5c4 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -3093,7 +3093,7 @@ void PPTWriter::ImplCreateTable( uno::Reference< drawing::XShape > const & rXSha
aColumns.emplace_back( nPosition, aM.Width );
nPosition += aM.Width;
if ( x == nColumnCount - 1 && nPosition != maRect.Right() )
- maRect.Right() = nPosition;
+ maRect.SetRight( nPosition );
}
nPosition = aPosition.Y;
@@ -3106,7 +3106,7 @@ void PPTWriter::ImplCreateTable( uno::Reference< drawing::XShape > const & rXSha
aRows.emplace_back( nPosition, aM.Height );
nPosition += aM.Height;
if ( y == nRowCount - 1 && nPosition != maRect.Bottom())
- maRect.Bottom() = nPosition;
+ maRect.SetBottom( nPosition );
}
std::unique_ptr<ContainerGuard> xSpgrContainer(new ContainerGuard(mpPptEscherEx, ESCHER_SpgrContainer));
std::unique_ptr<ContainerGuard> xSpContainer(new ContainerGuard(mpPptEscherEx, ESCHER_SpContainer));
diff --git a/sd/source/filter/eppt/pptx-epptbase.cxx b/sd/source/filter/eppt/pptx-epptbase.cxx
index 3e83cdab9a5e..2b8018ef35c6 100644
--- a/sd/source/filter/eppt/pptx-epptbase.cxx
+++ b/sd/source/filter/eppt/pptx-epptbase.cxx
@@ -669,9 +669,9 @@ awt::Size PPTWriterBase::MapSize( const awt::Size& rSize )
Size aRetSize( OutputDevice::LogicToLogic( Size( rSize.Width, rSize.Height ), maMapModeSrc, maMapModeDest ) );
if ( !aRetSize.Width() )
- aRetSize.Width()++;
+ aRetSize.setWidth( ++aRetSize.Width() );
if ( !aRetSize.Height() )
- aRetSize.Height()++;
+ aRetSize.setHeight( ++aRetSize.Height() );
return awt::Size( aRetSize.Width(), aRetSize.Height() );
}
diff --git a/sd/source/filter/eppt/pptx-text.cxx b/sd/source/filter/eppt/pptx-text.cxx
index ba9097d5bf39..2f80dbd7f7de 100644
--- a/sd/source/filter/eppt/pptx-text.cxx
+++ b/sd/source/filter/eppt/pptx-text.cxx
@@ -850,8 +850,8 @@ void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider* pBuProv, sal_Int1
if (auto aSize = o3tl::tryAccess<css::awt::Size>(pPropValue[i].Value))
{
// don't cast awt::Size to Size as on 64-bits they are not the same.
- aBuGraSize.Width() = aSize->Width;
- aBuGraSize.Height() = aSize->Height;
+ aBuGraSize.setWidth( aSize->Width );
+ aBuGraSize.setHeight( aSize->Height );
}
}
else if ( aPropName == "StartWith" )
diff --git a/sd/source/filter/grf/sdgrffilter.cxx b/sd/source/filter/grf/sdgrffilter.cxx
index c99b3d201496..f9cd9cda06fc 100644
--- a/sd/source/filter/grf/sdgrffilter.cxx
+++ b/sd/source/filter/grf/sdgrffilter.cxx
@@ -178,8 +178,8 @@ bool SdGRFFilter::Import()
Size aGrfSize( OutputDevice::LogicToLogic( aGraphic.GetPrefSize(),
aGraphic.GetPrefMapMode(), MapMode(MapUnit::Map100thMM)));
- aPagSize.Width() -= pPage->GetLeftBorder() + pPage->GetRightBorder();
- aPagSize.Height() -= pPage->GetUpperBorder() + pPage->GetLowerBorder();
+ aPagSize.setWidth( aPagSize.Width() - pPage->GetLeftBorder() + pPage->GetRightBorder() );
+ aPagSize.setHeight( aPagSize.Height() - pPage->GetUpperBorder() + pPage->GetLowerBorder() );
// scale to fit page
if ( ( ( aGrfSize.Height() > aPagSize.Height() ) || ( aGrfSize.Width() > aPagSize.Width() ) ) &&
@@ -191,19 +191,19 @@ bool SdGRFFilter::Import()
// adjust graphic to page size (scales)
if( fGrfWH < fWinWH )
{
- aGrfSize.Width() = static_cast<long>( aPagSize.Height() * fGrfWH );
- aGrfSize.Height() = aPagSize.Height();
+ aGrfSize.setWidth( static_cast<long>( aPagSize.Height() * fGrfWH ) );
+ aGrfSize.setHeight( aPagSize.Height() );
}
else if( fGrfWH > 0.F )
{
- aGrfSize.Width() = aPagSize.Width();
- aGrfSize.Height()= static_cast<long>( aPagSize.Width() / fGrfWH );
+ aGrfSize.setWidth( aPagSize.Width() );
+ aGrfSize.setHeight( static_cast<long>( aPagSize.Width() / fGrfWH ) );
}
}
// set output rectangle for graphic
- aPos.X() = ( ( aPagSize.Width() - aGrfSize.Width() ) >> 1 ) + pPage->GetLeftBorder();
- aPos.Y() = ( ( aPagSize.Height() - aGrfSize.Height() ) >> 1 ) + pPage->GetUpperBorder();
+ aPos.setX( ( ( aPagSize.Width() - aGrfSize.Width() ) >> 1 ) + pPage->GetLeftBorder() );
+ aPos.setY( ( ( aPagSize.Height() - aGrfSize.Height() ) >> 1 ) + pPage->GetUpperBorder() );
pPage->InsertObject( new SdrGrafObj( aGraphic, ::tools::Rectangle( aPos, aGrfSize ) ) );
bRet = true;
diff --git a/sd/source/filter/html/buttonset.cxx b/sd/source/filter/html/buttonset.cxx
index 8650bc480f33..56e0e70cebfe 100644
--- a/sd/source/filter/html/buttonset.cxx
+++ b/sd/source/filter/html/buttonset.cxx
@@ -210,13 +210,13 @@ bool ButtonSetImpl::getPreview( int nSet, const std::vector< OUString >& rButton
aGraphics.push_back(aGraphic);
Size aGraphicSize( aGraphic.GetSizePixel( pDev ) );
- aSize.Width() += aGraphicSize.Width();
+ aSize.setWidth( aSize.Width() + aGraphicSize.Width() );
if( aSize.Height() < aGraphicSize.Height() )
- aSize.Height() = aGraphicSize.Height();
+ aSize.setHeight( aGraphicSize.Height() );
if( aIter != rButtons.end() )
- aSize.Width() += 3;
+ aSize.setWidth( aSize.Width() + 3 );
}
pDev->SetOutputSizePixel( aSize );
@@ -230,7 +230,7 @@ bool ButtonSetImpl::getPreview( int nSet, const std::vector< OUString >& rButton
aGraphic.Draw( pDev, aPos );
- aPos.X() += aGraphic.GetSizePixel().Width() + 3;
+ aPos.setX( aPos.X() + aGraphic.GetSizePixel().Width() + 3 );
}
rImage = Image( pDev->GetBitmapEx( Point(), aSize ) );
diff --git a/sd/source/filter/html/htmlattr.cxx b/sd/source/filter/html/htmlattr.cxx
index 5ac6e737ae5f..0e675fa8fd23 100644
--- a/sd/source/filter/html/htmlattr.cxx
+++ b/sd/source/filter/html/htmlattr.cxx
@@ -46,7 +46,7 @@ void SdHtmlAttrPreview::Paint(vcl::RenderContext& rRenderContext, const ::tools:
rRenderContext.SetFillColor();
int nHeight = (aTextRect.Bottom() - aTextRect.Top()) >> 2;
- aTextRect.Bottom() = nHeight + aTextRect.Top();
+ aTextRect.SetBottom( nHeight + aTextRect.Top() );
rRenderContext.SetTextColor(m_aTextColor);
rRenderContext.DrawText(aTextRect, SdResId(STR_HTMLATTR_TEXT), DrawTextFlags::Center | DrawTextFlags::VCenter);
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index 31cde572bdbe..97e84651351c 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -1697,10 +1697,10 @@ bool HtmlExport::CreateHtmlForPresPages()
aRect.Move(-pPage->GetLeftBorder(), -pPage->GetUpperBorder());
double fLogicToPixel = static_cast<double>(mnWidthPixel) / nPageWidth;
- aRect.Left() = static_cast<long>(aRect.Left() * fLogicToPixel);
- aRect.Top() = static_cast<long>(aRect.Top() * fLogicToPixel);
- aRect.Right() = static_cast<long>(aRect.Right() * fLogicToPixel);
- aRect.Bottom() = static_cast<long>(aRect.Bottom() * fLogicToPixel);
+ aRect.SetLeft( static_cast<long>(aRect.Left() * fLogicToPixel) );
+ aRect.SetTop( static_cast<long>(aRect.Top() * fLogicToPixel) );
+ aRect.SetRight( static_cast<long>(aRect.Right() * fLogicToPixel) );
+ aRect.SetBottom( static_cast<long>(aRect.Bottom() * fLogicToPixel) );
long nRadius = aRect.GetWidth() / 2;
/**
@@ -1746,10 +1746,10 @@ bool HtmlExport::CreateHtmlForPresPages()
// conversion into pixel coordinates
aArea.Move(aLogPos.X() - pPage->GetLeftBorder(),
aLogPos.Y() - pPage->GetUpperBorder());
- aArea.Left() = static_cast<long>(aArea.Left() * fLogicToPixel);
- aArea.Top() = static_cast<long>(aArea.Top() * fLogicToPixel);
- aArea.Right() = static_cast<long>(aArea.Right() * fLogicToPixel);
- aArea.Bottom() = static_cast<long>(aArea.Bottom() * fLogicToPixel);
+ aArea.SetLeft( static_cast<long>(aArea.Left() * fLogicToPixel) );
+ aArea.SetTop( static_cast<long>(aArea.Top() * fLogicToPixel) );
+ aArea.SetRight( static_cast<long>(aArea.Right() * fLogicToPixel) );
+ aArea.SetBottom( static_cast<long>(aArea.Bottom() * fLogicToPixel) );
aStr.append(CreateHTMLRectArea(aArea, aURL));
}
@@ -1761,8 +1761,8 @@ bool HtmlExport::CreateHtmlForPresPages()
GetCenter(false));
aCenter += Point(aLogPos.X() - pPage->GetLeftBorder(),
aLogPos.Y() - pPage->GetUpperBorder());
- aCenter.X() = static_cast<long>(aCenter.X() * fLogicToPixel);
- aCenter.Y() = static_cast<long>(aCenter.Y() * fLogicToPixel);
+ aCenter.setX( static_cast<long>(aCenter.X() * fLogicToPixel) );
+ aCenter.setY( static_cast<long>(aCenter.Y() * fLogicToPixel) );
sal_uLong nCircleRadius = static_cast<IMapCircleObject*>(pArea)->
GetRadius(false);
@@ -2805,8 +2805,8 @@ OUString HtmlExport::CreateHTMLPolygonArea( const ::basegfx::B2DPolyPolygon& rPo
// origin of ordinates
aPnt.Move(aShift.Width(), aShift.Height());
- aPnt.X() = static_cast<long>(aPnt.X() * fFactor);
- aPnt.Y() = static_cast<long>(aPnt.Y() * fFactor);
+ aPnt.setX( static_cast<long>(aPnt.X() * fFactor) );
+ aPnt.setY( static_cast<long>(aPnt.Y() * fFactor) );
aStr.append(OUString::number(aPnt.X()) + "," + OUString::number(aPnt.Y()));
if (nPoint < nNoOfPoints - 1)
diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx
index b55f53e54022..d1fcaecd3659 100644
--- a/sd/source/ui/animations/CustomAnimationList.cxx
+++ b/sd/source/ui/animations/CustomAnimationList.cxx
@@ -250,7 +250,7 @@ void CustomAnimationListEntryItem::InitViewData( SvTreeListBox* pView, SvTreeLis
Size aSize( width, pView->GetTextHeight() );
if( aSize.Height() < nItemMinHeight )
- aSize.Height() = nItemMinHeight;
+ aSize.setHeight( nItemMinHeight );
pViewData->maSize = aSize;
}
@@ -277,12 +277,12 @@ void CustomAnimationListEntryItem::Paint(const Point& rPos, SvTreeListBox& rDev,
//FIXME With previous image not defined in CustomAnimation.src
}
- aPos.X() += nIconWidth;
+ aPos.setX( aPos.X() + nIconWidth );
rRenderContext.DrawText(aPos, rRenderContext.GetEllipsisString(msDescription, rDev.GetOutputSizePixel().Width() - aPos.X()));
- aPos.Y() += nIconWidth;
+ aPos.setY( aPos.Y() + nIconWidth );
OUString sImage;
switch (mpEffect->getPresetClass())
@@ -318,12 +318,12 @@ void CustomAnimationListEntryItem::Paint(const Point& rPos, SvTreeListBox& rDev,
BitmapEx aBitmap(sImage);
Image aImage(aBitmap);
Point aImagePos(aPos);
- aImagePos.Y() += (aSize.Height()/2 - aImage.GetSizePixel().Height()) >> 1;
+ aImagePos.setY( aImagePos.Y() + ((aSize.Height()/2 - aImage.GetSizePixel().Height()) >> 1) );
rRenderContext.DrawImage(aImagePos, aImage);
}
- aPos.X() += nIconWidth;
- aPos.Y() += (aSize.Height()/2 - rDev.GetTextHeight()) >> 1;
+ aPos.setX( aPos.X() + nIconWidth );
+ aPos.setY( aPos.Y() + ((aSize.Height()/2 - rDev.GetTextHeight()) >> 1) );
rRenderContext.DrawText(aPos, rRenderContext.GetEllipsisString(msEffectName, rDev.GetOutputSizePixel().Width() - aPos.X()));
}
@@ -386,7 +386,7 @@ void CustomAnimationTriggerEntryItem::InitViewData( SvTreeListBox* pView, SvTree
Size aSize(pView->GetTextWidth( msDescription ) + 2 * nIconWidth, pView->GetTextHeight() );
if( aSize.Height() < nIconWidth )
- aSize.Height() = nIconWidth;
+ aSize.setHeight( nIconWidth );
pViewData->maSize = aSize;
}
@@ -419,10 +419,10 @@ void CustomAnimationTriggerEntryItem::Paint(const Point& rPos, SvTreeListBox& rD
int nVertBorder = ((aSize.Height() - rDev.GetTextHeight()) >> 1);
int nHorzBorder = rRenderContext.LogicToPixel(Size(3, 3), MapMode(MapUnit::MapAppFont)).Width();
- aOutRect.Left() += nHorzBorder;
- aOutRect.Right() -= nHorzBorder;
- aOutRect.Top() += nVertBorder;
- aOutRect.Bottom() -= nVertBorder;
+ aOutRect.SetLeft( aOutRect.Left() + nHorzBorder );
+ aOutRect.SetRight( aOutRect.Right() - nHorzBorder );
+ aOutRect.SetTop( aOutRect.Top() + nVertBorder );
+ aOutRect.SetBottom( aOutRect.Bottom() - nVertBorder );
rRenderContext.DrawText(aOutRect, rRenderContext.GetEllipsisString(msDescription, aOutRect.GetWidth()));
rRenderContext.Pop();
@@ -950,10 +950,10 @@ void CustomAnimationList::Paint(vcl::RenderContext& rRenderContext, const ::tool
::tools::Rectangle aRect(Point(0,0), GetOutputSizePixel());
- aRect.Left() += aOffset.X();
- aRect.Top() += aOffset.Y();
- aRect.Right() -= aOffset.X();
- aRect.Bottom() -= aOffset.Y();
+ aRect.SetLeft( aRect.Left() + aOffset.X() );
+ aRect.SetTop( aRect.Top() + aOffset.Y() );
+ aRect.SetRight( aRect.Right() - aOffset.X() );
+ aRect.SetBottom( aRect.Bottom() - aOffset.Y() );
rRenderContext.DrawText(aRect, SdResId(STR_CUSTOMANIMATION_LIST_HELPTEXT),
DrawTextFlags::MultiLine | DrawTextFlags::WordBreak | DrawTextFlags::Center | DrawTextFlags::VCenter );
diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx
index c47c123eae25..c727d8b8d1ad 100644
--- a/sd/source/ui/annotations/annotationmanager.cxx
+++ b/sd/source/ui/annotations/annotationmanager.cxx
@@ -459,10 +459,10 @@ void AnnotationManagerImpl::InsertAnnotation(const OUString& rText)
for( AnnotationVector::iterator iter = aAnnotations.begin(); iter != aAnnotations.end(); ++iter )
{
RealPoint2D aPoint( (*iter)->getPosition() );
- aTagRect.Left() = sal::static_int_cast< long >( aPoint.X * 100.0 );
- aTagRect.Top() = sal::static_int_cast< long >( aPoint.Y * 100.0 );
- aTagRect.Right() = aTagRect.Left() + width - 1;
- aTagRect.Bottom() = aTagRect.Top() + height - 1;
+ aTagRect.SetLeft( sal::static_int_cast< long >( aPoint.X * 100.0 ) );
+ aTagRect.SetTop( sal::static_int_cast< long >( aPoint.Y * 100.0 ) );
+ aTagRect.SetRight( aTagRect.Left() + width - 1 );
+ aTagRect.SetBottom( aTagRect.Top() + height - 1 );
if( aNewRect.IsOver( aTagRect ) )
{
diff --git a/sd/source/ui/annotations/annotationtag.cxx b/sd/source/ui/annotations/annotationtag.cxx
index 87acb02941b9..6f8eab0d3b58 100644
--- a/sd/source/ui/annotations/annotationtag.cxx
+++ b/sd/source/ui/annotations/annotationtag.cxx
@@ -568,8 +568,8 @@ void AnnotationTag::OpenPopup( bool bEdit )
RealPoint2D aPosition( mxAnnotation->getPosition() );
Point aPos( pWindow->OutputToScreenPixel( pWindow->LogicToPixel( Point( static_cast<long>(aPosition.X * 100.0), static_cast<long>(aPosition.Y * 100.0) ) ) ) );
- aPos.X() += 4; // magic!
- aPos.Y() += 1;
+ aPos.setX( aPos.X() + 4 ); // magic!
+ aPos.setY( aPos.Y() + 1 );
::tools::Rectangle aRect( aPos, maSize );
diff --git a/sd/source/ui/controller/displaymodecontroller.cxx b/sd/source/ui/controller/displaymodecontroller.cxx
index 7555d0d48e4b..b7ace9c85632 100644
--- a/sd/source/ui/controller/displaymodecontroller.cxx
+++ b/sd/source/ui/controller/displaymodecontroller.cxx
@@ -124,8 +124,8 @@ static void fillLayoutValueSet( ValueSet* pValue, const snewfoil_value_info* pIn
pValue->InsertItem(pInfo->mnId, Image(aBmp), aText);
- aLayoutItemSize.Width() = std::max( aLayoutItemSize.Width(), aBmp.GetSizePixel().Width() );
- aLayoutItemSize.Height() = std::max( aLayoutItemSize.Height(), aBmp.GetSizePixel().Height() );
+ aLayoutItemSize.setWidth( std::max( aLayoutItemSize.Width(), aBmp.GetSizePixel().Width() ) );
+ aLayoutItemSize.setHeight( std::max( aLayoutItemSize.Height(), aBmp.GetSizePixel().Height() ) );
}
aLayoutItemSize = pValue->CalcItemSizePixel( aLayoutItemSize );
@@ -153,8 +153,8 @@ DisplayModeToolbarMenu::DisplayModeToolbarMenu( DisplayModeController& rControll
fillLayoutValueSet( mpDisplayModeSet1, &editmodes[0] );
Size aSize( mpDisplayModeSet1->GetOutputSizePixel() );
- aSize.Width() += (mpDisplayModeSet1->GetColCount() + 1) * LAYOUT_BORDER_PIX;
- aSize.Height() += (mpDisplayModeSet1->GetLineCount() +1) * LAYOUT_BORDER_PIX;
+ aSize.setWidth( aSize.Width() + (mpDisplayModeSet1->GetColCount() + 1) * LAYOUT_BORDER_PIX );
+ aSize.setHeight( aSize.Height() + (mpDisplayModeSet1->GetLineCount() +1) * LAYOUT_BORDER_PIX );
mpDisplayModeSet1->SetOutputSizePixel( aSize );
appendEntry( -1, aTitle1 );
@@ -168,8 +168,8 @@ DisplayModeToolbarMenu::DisplayModeToolbarMenu( DisplayModeController& rControll
fillLayoutValueSet( mpDisplayModeSet2, &mastermodes[0] );
aSize = mpDisplayModeSet2->GetOutputSizePixel();
- aSize.Width() += (mpDisplayModeSet2->GetColCount() + 1) * LAYOUT_BORDER_PIX;
- aSize.Height() += (mpDisplayModeSet2->GetLineCount() + 1) * LAYOUT_BORDER_PIX;
+ aSize.setWidth( aSize.Width() + (mpDisplayModeSet2->GetColCount() + 1) * LAYOUT_BORDER_PIX );
+ aSize.setHeight( aSize.Height() + (mpDisplayModeSet2->GetLineCount() + 1) * LAYOUT_BORDER_PIX );
mpDisplayModeSet2->SetOutputSizePixel( aSize );
appendEntry( -1, aTitle2 );
diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx
index 5c50b910f14b..0d9beec89730 100644
--- a/sd/source/ui/controller/slidelayoutcontroller.cxx
+++ b/sd/source/ui/controller/slidelayoutcontroller.cxx
@@ -140,8 +140,8 @@ static void fillLayoutValueSet( ValueSet* pValue, const snewfoil_value_info_layo
pValue->InsertItem(static_cast<sal_uInt16>(pInfo->maAutoLayout)+1,
Image(aBmp), aText);
- aLayoutItemSize.Width() = std::max( aLayoutItemSize.Width(), aBmp.GetSizePixel().Width() );
- aLayoutItemSize.Height() = std::max( aLayoutItemSize.Height(), aBmp.GetSizePixel().Height() );
+ aLayoutItemSize.setWidth( std::max( aLayoutItemSize.Width(), aBmp.GetSizePixel().Width() ) );
+ aLayoutItemSize.setHeight( std::max( aLayoutItemSize.Height(), aBmp.GetSizePixel().Height() ) );
}
aLayoutItemSize = pValue->CalcItemSizePixel( aLayoutItemSize );
@@ -197,8 +197,8 @@ LayoutToolbarMenu::LayoutToolbarMenu( SlideLayoutController& rController, vcl::W
fillLayoutValueSet( mpLayoutSet1, pInfo );
Size aSize( mpLayoutSet1->GetOutputSizePixel() );
- aSize.Width() += (mpLayoutSet1->GetColCount() + 1) * LAYOUT_BORDER_PIX;
- aSize.Height() += (mpLayoutSet1->GetLineCount() +1) * LAYOUT_BORDER_PIX;
+ aSize.setWidth( aSize.Width() + (mpLayoutSet1->GetColCount() + 1) * LAYOUT_BORDER_PIX );
+ aSize.setHeight( aSize.Height() + (mpLayoutSet1->GetLineCount() +1) * LAYOUT_BORDER_PIX );
mpLayoutSet1->SetOutputSizePixel( aSize );
if( bVerticalEnabled && (eMode == DrawViewMode_DRAW) )
@@ -217,8 +217,8 @@ LayoutToolbarMenu::LayoutToolbarMenu( SlideLayoutController& rController, vcl::W
fillLayoutValueSet( mpLayoutSet2, &v_standard[0] );
aSize = mpLayoutSet2->GetOutputSizePixel();
- aSize.Width() += (mpLayoutSet2->GetColCount() + 1) * LAYOUT_BORDER_PIX;
- aSize.Height() += (mpLayoutSet2->GetLineCount() + 1) * LAYOUT_BORDER_PIX;
+ aSize.setWidth( aSize.Width() + (mpLayoutSet2->GetColCount() + 1) * LAYOUT_BORDER_PIX );
+ aSize.setHeight( aSize.Height() + (mpLayoutSet2->GetLineCount() + 1) * LAYOUT_BORDER_PIX );
mpLayoutSet2->SetOutputSizePixel( aSize );
appendEntry( -1, aTitle2 );
diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
index ef8dca5ea873..18978ee448c8 100644
--- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx
+++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
@@ -750,10 +750,10 @@ void SdPhotoAlbumDialog::createCaption(const awt::Size& aPageSize )
Point CapPos;
Size CapSize;
- CapSize.Width() = aPageSize.Width;
- CapSize.Height() = aPageSize.Height/6;
- CapPos.X() = 0;
- CapPos.Y() = aPageSize.Height - CapSize.Height();
+ CapSize.setWidth( aPageSize.Width );
+ CapSize.setHeight( aPageSize.Height/6 );
+ CapPos.setX( 0 );
+ CapPos.setY( aPageSize.Height - CapSize.Height() );
SdPage* pSlide = pDoc->GetSdPage( pDoc->GetSdPageCount(PageKind::Standard)-1, PageKind::Standard );
// try to get existing PresObj
diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.cxx b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
index df6c64af704d..79561e267895 100644
--- a/sd/source/ui/dlg/RemoteDialogClientBox.cxx
+++ b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
@@ -150,7 +150,7 @@ void ClientBox::CalcActiveHeight()
// Text entry height
Size aSize = GetOutputSizePixel();
if ( m_bHasScrollBar )
- aSize.Width() -= m_aScrollBar->GetSizePixel().Width();
+ aSize.setWidth( aSize.Width() - m_aScrollBar->GetSizePixel().Width() );
aSize.Width() -= ICON_OFFSET;
@@ -171,16 +171,16 @@ void ClientBox::CalcActiveHeight()
Size aSize( GetOutputSizePixel() );
if ( m_bHasScrollBar )
- aSize.Width() -= m_aScrollBar->GetSizePixel().Width();
+ aSize.setWidth( aSize.Width() - m_aScrollBar->GetSizePixel().Width() );
if ( m_vEntries[ nPos ]->m_bActive )
- aSize.Height() = m_nActiveHeight;
+ aSize.setHeight( m_nActiveHeight );
else
- aSize.Height() = m_nStdHeight;
+ aSize.setHeight( m_nStdHeight );
Point aPos( 0, -m_nTopIndex + nPos * m_nStdHeight );
if ( m_bHasActive && ( nPos < m_nActive ) )
- aPos.Y() += m_nActiveHeight - m_nStdHeight;
+ aPos.setY( aPos.Y() + m_nActiveHeight - m_nStdHeight );
return ::tools::Rectangle( aPos, aSize );
}
@@ -321,7 +321,7 @@ void ClientBox::DrawRow(vcl::RenderContext& rRenderContext, const ::tools::Recta
SetFont(aStdFont);
- aPos.Y() += aTextHeight;
+ aPos.setY( aPos.Y() + aTextHeight );
if (rEntry->m_bActive)
{
OUString sPinText(SdResId(STR_ENTER_PIN));
@@ -479,17 +479,17 @@ void ClientBox::Paint(vcl::RenderContext& rRenderContext, const ::tools::Rectang
Size aSize(GetOutputSizePixel());
if (m_bHasScrollBar)
- aSize.Width() -= m_aScrollBar->GetSizePixel().Width();
+ aSize.setWidth( aSize.Width() - m_aScrollBar->GetSizePixel().Width() );
const ::osl::MutexGuard aGuard(m_entriesMutex);
typedef std::vector< TClientBoxEntry >::iterator ITER;
for (ITER iIndex = m_vEntries.begin(); iIndex < m_vEntries.end(); ++iIndex)
{
- aSize.Height() = (*iIndex)->m_bActive ? m_nActiveHeight : m_nStdHeight;
+ aSize.setHeight( (*iIndex)->m_bActive ? m_nActiveHeight : m_nStdHeight );
::tools::Rectangle aEntryRect(aStart, aSize);
DrawRow(rRenderContext, aEntryRect, *iIndex);
- aStart.Y() += aSize.Height();
+ aStart.setY( aStart.Y() + aSize.Height() );
}
}
@@ -688,7 +688,7 @@ void ClientBox::DoScroll( long nDelta )
Point aNewSBPt( m_aScrollBar->GetPosPixel() );
::tools::Rectangle aScrRect( Point(), GetOutputSizePixel() );
- aScrRect.Right() -= m_aScrollBar->GetSizePixel().Width();
+ aScrRect.SetRight( aScrRect.Right() - m_aScrollBar->GetSizePixel().Width() );
Scroll( 0, -nDelta, aScrRect );
m_aScrollBar->SetPosPixel( aNewSBPt );
diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx
index 7fa8374a8ba2..2572268b243a 100644
--- a/sd/source/ui/dlg/animobjs.cxx
+++ b/sd/source/ui/dlg/animobjs.cxx
@@ -85,13 +85,13 @@ void SdDisplay::Paint( vcl::RenderContext& /*rRenderContext*/, const ::tools::Re
Point aPt;
Size aSize = GetOutputSize();
Size aBmpSize = aBitmapEx.GetBitmap().GetSizePixel();
- aBmpSize.Width() = static_cast<long>( static_cast<double>(aBmpSize.Width()) * static_cast<double>(aScale) );
- aBmpSize.Height() = static_cast<long>( static_cast<double>(aBmpSize.Height()) * static_cast<double>(aScale) );
+ aBmpSize.setWidth( static_cast<long>( static_cast<double>(aBmpSize.Width()) * static_cast<double>(aScale) ) );
+ aBmpSize.setHeight( static_cast<long>( static_cast<double>(aBmpSize.Height()) * static_cast<double>(aScale) ) );
if( aBmpSize.Width() < aSize.Width() )
- aPt.X() = ( aSize.Width() - aBmpSize.Width() ) / 2;
+ aPt.setX( ( aSize.Width() - aBmpSize.Width() ) / 2 );
if( aBmpSize.Height() < aSize.Height() )
- aPt.Y() = ( aSize.Height() - aBmpSize.Height() ) / 2;
+ aPt.setY( ( aSize.Height() - aBmpSize.Height() ) / 2 );
aBitmapEx.Draw( this, aPt, aBmpSize );
}
@@ -653,12 +653,12 @@ Fraction AnimationWindow::GetScale()
{
BitmapEx *const pBitmap = m_FrameList[i].first;
Size aTempSize( pBitmap->GetBitmap().GetSizePixel() );
- aBmpSize.Width() = std::max( aBmpSize.Width(), aTempSize.Width() );
- aBmpSize.Height() = std::max( aBmpSize.Height(), aTempSize.Height() );
+ aBmpSize.setWidth( std::max( aBmpSize.Width(), aTempSize.Width() ) );
+ aBmpSize.setHeight( std::max( aBmpSize.Height(), aTempSize.Height() ) );
}
- aBmpSize.Width() += 10;
- aBmpSize.Height() += 10;
+ aBmpSize.setWidth( aBmpSize.Width() + 10 );
+ aBmpSize.setHeight( aBmpSize.Height() + 10 );
Size aDisplaySize(m_pCtlDisplay->GetOutputSize());
@@ -909,11 +909,11 @@ void AnimationWindow::CreateAnimObj (::sd::View& rView )
else
aTmpSizeLog = OutputDevice::LogicToLogic( aGraphic.GetPrefSize(), aGraphic.GetPrefMapMode(), aMap100 );
- aMaxSizeLog.Width() = std::max( aMaxSizeLog.Width(), aTmpSizeLog.Width() );
- aMaxSizeLog.Height() = std::max( aMaxSizeLog.Height(), aTmpSizeLog.Height() );
+ aMaxSizeLog.setWidth( std::max( aMaxSizeLog.Width(), aTmpSizeLog.Width() ) );
+ aMaxSizeLog.setHeight( std::max( aMaxSizeLog.Height(), aTmpSizeLog.Height() ) );
- aMaxSizePix.Width() = std::max( aMaxSizePix.Width(), aTmpSizePix.Width() );
- aMaxSizePix.Height() = std::max( aMaxSizePix.Height(), aTmpSizePix.Height() );
+ aMaxSizePix.setWidth( std::max( aMaxSizePix.Width(), aTmpSizePix.Width() ) );
+ aMaxSizePix.setHeight( std::max( aMaxSizePix.Height(), aTmpSizePix.Height() ) );
}
SdrPageView* pPV = rView.GetSdrPageView();
@@ -941,39 +941,39 @@ void AnimationWindow::CreateAnimObj (::sd::View& rView )
break;
case BA_LEFT:
- aPt.Y() = (aMaxSizePix.Height() - aBitmapSize.Height()) >> 1;
+ aPt.setY( (aMaxSizePix.Height() - aBitmapSize.Height()) >> 1 );
break;
case BA_LEFT_DOWN:
- aPt.Y() = aMaxSizePix.Height() - aBitmapSize.Height();
+ aPt.setY( aMaxSizePix.Height() - aBitmapSize.Height() );
break;
case BA_UP:
- aPt.X() = (aMaxSizePix.Width() - aBitmapSize.Width()) >> 1;
+ aPt.setX( (aMaxSizePix.Width() - aBitmapSize.Width()) >> 1 );
break;
case BA_CENTER:
- aPt.X() = (aMaxSizePix.Width() - aBitmapSize.Width()) >> 1;
- aPt.Y() = (aMaxSizePix.Height() - aBitmapSize.Height()) >> 1;
+ aPt.setX( (aMaxSizePix.Width() - aBitmapSize.Width()) >> 1 );
+ aPt.setY( (aMaxSizePix.Height() - aBitmapSize.Height()) >> 1 );
break;
case BA_DOWN:
- aPt.X() = (aMaxSizePix.Width() - aBitmapSize.Width()) >> 1;
- aPt.Y() = aMaxSizePix.Height() - aBitmapSize.Height();
+ aPt.setX( (aMaxSizePix.Width() - aBitmapSize.Width()) >> 1 );
+ aPt.setY( aMaxSizePix.Height() - aBitmapSize.Height() );
break;
case BA_RIGHT_UP:
- aPt.X() = aMaxSizePix.Width() - aBitmapSize.Width();
+ aPt.setX( aMaxSizePix.Width() - aBitmapSize.Width() );
break;
case BA_RIGHT:
- aPt.X() = aMaxSizePix.Width() - aBitmapSize.Width();
- aPt.Y() = (aMaxSizePix.Height() - aBitmapSize.Height()) >> 1;
+ aPt.setX( aMaxSizePix.Width() - aBitmapSize.Width() );
+ aPt.setY( (aMaxSizePix.Height() - aBitmapSize.Height()) >> 1 );
break;
case BA_RIGHT_DOWN:
- aPt.X() = aMaxSizePix.Width() - aBitmapSize.Width();
- aPt.Y() = aMaxSizePix.Height() - aBitmapSize.Height();
+ aPt.setX( aMaxSizePix.Width() - aBitmapSize.Width() );
+ aPt.setY( aMaxSizePix.Height() - aBitmapSize.Height() );
break;
}
@@ -1022,39 +1022,39 @@ void AnimationWindow::CreateAnimObj (::sd::View& rView )
break;
case BA_LEFT:
- aOffset.Height() = (aMaxSizeLog.Height() - aRect.GetHeight()) / 2;
+ aOffset.setHeight( (aMaxSizeLog.Height() - aRect.GetHeight()) / 2 );
break;
case BA_LEFT_DOWN:
- aOffset.Height() = aMaxSizeLog.Height() - aRect.GetHeight();
+ aOffset.setHeight( aMaxSizeLog.Height() - aRect.GetHeight() );
break;
case BA_UP:
- aOffset.Width() = (aMaxSizeLog.Width() - aRect.GetWidth()) / 2;
+ aOffset.setWidth( (aMaxSizeLog.Width() - aRect.GetWidth()) / 2 );
break;
case BA_CENTER:
- aOffset.Width() = (aMaxSizeLog.Width() - aRect.GetWidth()) / 2;
- aOffset.Height() = (aMaxSizeLog.Height() - aRect.GetHeight()) / 2;
+ aOffset.setWidth( (aMaxSizeLog.Width() - aRect.GetWidth()) / 2 );
+ aOffset.setHeight( (aMaxSizeLog.Height() - aRect.GetHeight()) / 2 );
break;
case BA_DOWN:
- aOffset.Width() = (aMaxSizeLog.Width() - aRect.GetWidth()) / 2;
- aOffset.Height() = aMaxSizeLog.Height() - aRect.GetHeight();
+ aOffset.setWidth( (aMaxSizeLog.Width() - aRect.GetWidth()) / 2 );
+ aOffset.setHeight( aMaxSizeLog.Height() - aRect.GetHeight() );
break;
case BA_RIGHT_UP:
- aOffset.Width() = aMaxSizeLog.Width() - aRect.GetWidth();
+ aOffset.setWidth( aMaxSizeLog.Width() - aRect.GetWidth() );
break;
case BA_RIGHT:
- aOffset.Width() = aMaxSizeLog.Width() - aRect.GetWidth();
- aOffset.Height() = (aMaxSizeLog.Height() - aRect.GetHeight()) / 2;
+ aOffset.setWidth( aMaxSizeLog.Width() - aRect.GetWidth() );
+ aOffset.setHeight( (aMaxSizeLog.Height() - aRect.GetHeight()) / 2 );
break;
case BA_RIGHT_DOWN:
- aOffset.Width() = aMaxSizeLog.Width() - aRect.GetWidth();
- aOffset.Height() = aMaxSizeLog.Height() - aRect.GetHeight();
+ aOffset.setWidth( aMaxSizeLog.Width() - aRect.GetWidth() );
+ aOffset.setHeight( aMaxSizeLog.Height() - aRect.GetHeight() );
break;
}
@@ -1087,8 +1087,8 @@ void AnimationWindow::CreateAnimObj (::sd::View& rView )
// until now the top left corner of the group is in the window center;
// correct the position by half of the size of the group
aTemp = aMaxSizeLog;
- aTemp.Height() = - aTemp.Height() / 2;
- aTemp.Width() = - aTemp.Width() / 2;
+ aTemp.setHeight( - aTemp.Height() / 2 );
+ aTemp.setWidth( - aTemp.Width() / 2 );
pGroup->NbcMove(aTemp);
// #i42894# create needed SMIL stuff and move child objects to page directly (see
diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx b/sd/source/ui/dlg/headerfooterdlg.cxx
index 970a9a2e1ce3..4260572f7264 100644
--- a/sd/source/ui/dlg/headerfooterdlg.cxx
+++ b/sd/source/ui/dlg/headerfooterdlg.cxx
@@ -781,10 +781,10 @@ void PresLayoutPreview::Paint(vcl::RenderContext& rRenderContext, const ::tools:
nWidth = maPageSize.Height() == 0 ? 0 : long( static_cast<double>(nHeight * maPageSize.Width()) / static_cast<double>(maPageSize.Height()) );
}
- maOutRect.Left() += (maOutRect.GetWidth() - nWidth) >> 1;
- maOutRect.Right() = maOutRect.Left() + nWidth - 1;
- maOutRect.Top() += (maOutRect.GetHeight() - nHeight) >> 1;
- maOutRect.Bottom() = maOutRect.Top() + nHeight - 1;
+ maOutRect.SetLeft( maOutRect.Left() + ((maOutRect.GetWidth() - nWidth) >> 1) );
+ maOutRect.SetRight( maOutRect.Left() + nWidth - 1 );
+ maOutRect.SetTop( maOutRect.Top() + ((maOutRect.GetHeight() - nHeight) >> 1) );
+ maOutRect.SetBottom( maOutRect.Top() + nHeight - 1 );
// draw decoration frame
DecorationView aDecoView(&rRenderContext);
diff --git a/sd/source/ui/dlg/vectdlg.cxx b/sd/source/ui/dlg/vectdlg.cxx
index 3b76955bb26d..d0baacc0e926 100644
--- a/sd/source/ui/dlg/vectdlg.cxx
+++ b/sd/source/ui/dlg/vectdlg.cxx
@@ -102,13 +102,13 @@ void SdVectorizeDlg::dispose()
if( fGrfWH < fWinWH )
{
- aBmpSize.Width() = static_cast<long>( rDispSize.Height() * fGrfWH );
- aBmpSize.Height()= rDispSize.Height();
+ aBmpSize.setWidth( static_cast<long>( rDispSize.Height() * fGrfWH ) );
+ aBmpSize.setHeight( rDispSize.Height() );
}
else
{
- aBmpSize.Width() = rDispSize.Width();
- aBmpSize.Height()= static_cast<long>( rDispSize.Width() / fGrfWH);
+ aBmpSize.setWidth( rDispSize.Width() );
+ aBmpSize.setHeight( static_cast<long>( rDispSize.Width() / fGrfWH) );
}
const Point aBmpPos( ( rDispSize.Width() - aBmpSize.Width() ) >> 1,
@@ -250,10 +250,10 @@ void SdVectorizeDlg::AddTile( BitmapReadAccess const * pRAcc, GDIMetaFile& rMtf,
aRect = PixelToLogic( aRect, rMtf.GetPrefMapMode() );
if( aRect.Right() > ( rMaxSize.Width() - 1 ) )
- aRect.Right() = rMaxSize.Width() - 1;
+ aRect.SetRight( rMaxSize.Width() - 1 );
if( aRect.Bottom() > ( rMaxSize.Height() - 1 ) )
- aRect.Bottom() = rMaxSize.Height() - 1;
+ aRect.SetBottom( rMaxSize.Height() - 1 );
rMtf.AddAction( new MetaLineColorAction( aColor, true ) );
rMtf.AddAction( new MetaFillColorAction( aColor, true ) );
diff --git a/sd/source/ui/docshell/docshel2.cxx b/sd/source/ui/docshell/docshel2.cxx
index 1e02c6e8e4d7..e9c09b70b722 100644
--- a/sd/source/ui/docshell/docshel2.cxx
+++ b/sd/source/ui/docshell/docshel2.cxx
@@ -103,8 +103,8 @@ void DrawDocShell::Draw(OutputDevice* pOut, const JobSetup&, sal_uInt16 nAspect)
{
MapMode aMapMode = aOldMapMode;
Point aOrigin = aMapMode.GetOrigin();
- aOrigin.X() += 1;
- aOrigin.Y() += 1;
+ aOrigin.setX( aOrigin.X() + 1 );
+ aOrigin.setY( aOrigin.Y() + 1 );
aMapMode.SetOrigin(aOrigin);
pOut->SetMapMode(aMapMode);
}
diff --git a/sd/source/ui/docshell/sdclient.cxx b/sd/source/ui/docshell/sdclient.cxx
index f184f8fc422f..e5a4e97278cd 100644
--- a/sd/source/ui/docshell/sdclient.cxx
+++ b/sd/source/ui/docshell/sdclient.cxx
@@ -88,10 +88,10 @@ void Client::RequestNewObjectArea( ::tools::Rectangle& aObjRect )
Point aWorkAreaTL = aWorkArea.TopLeft();
Point aWorkAreaBR = aWorkArea.BottomRight();
- aPos.X() = std::max(aPos.X(), aWorkAreaTL.X());
- aPos.X() = std::min(aPos.X(), aWorkAreaBR.X()-aSize.Width());
- aPos.Y() = std::max(aPos.Y(), aWorkAreaTL.Y());
- aPos.Y() = std::min(aPos.Y(), aWorkAreaBR.Y()-aSize.Height());
+ aPos.setX( std::max(aPos.X(), aWorkAreaTL.X()) );
+ aPos.setX( std::min(aPos.X(), aWorkAreaBR.X()-aSize.Width()) );
+ aPos.setY( std::max(aPos.Y(), aWorkAreaTL.Y()) );
+ aPos.setY( std::min(aPos.Y(), aWorkAreaBR.Y()-aSize.Height()) );
aObjRect.SetPos(aPos);
}
diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx
index a6e35ef27be3..082bacbbd982 100644
--- a/sd/source/ui/func/fudraw.cxx
+++ b/sd/source/ui/func/fudraw.cxx
@@ -599,10 +599,10 @@ bool FuDraw::SetPointer(SdrObject* pObj, const Point& rPos)
Point aHitPosT(rPos);
Point aHitPosB(rPos);
- aHitPosR.X() += n2HitLog;
- aHitPosL.X() -= n2HitLog;
- aHitPosT.Y() += n2HitLog;
- aHitPosB.Y() -= n2HitLog;
+ aHitPosR.setX( aHitPosR.X() + n2HitLog );
+ aHitPosL.setX( aHitPosL.X() - n2HitLog );
+ aHitPosT.setY( aHitPosT.Y() + n2HitLog );
+ aHitPosB.setY( aHitPosB.Y() - n2HitLog );
if ( !pObj->IsClosedObj() ||
( SdrObjectPrimitiveHit(*pObj, aHitPosR, nHitLog, *mpView->GetSdrPageView(), pVisiLayer, false) &&
diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx
index e0ad64bd7169..8a63c098f0f0 100644
--- a/sd/source/ui/func/fuinsert.cxx
+++ b/sd/source/ui/func/fuinsert.cxx
@@ -368,8 +368,8 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq )
if (aSize.Height() == 0 || aSize.Width() == 0)
{
// rectangle with balanced edge ratio
- aSize.Width() = 14100;
- aSize.Height() = 10000;
+ aSize.setWidth( 14100 );
+ aSize.setHeight( 10000 );
Size aTmp = OutputDevice::LogicToLogic(aSize, MapMode(MapUnit::Map100thMM), MapMode(aUnit));
aSz.Width = aTmp.Width();
aSz.Height = aTmp.Height();
@@ -384,8 +384,8 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq )
::tools::Rectangle aWinRect(aPos, mpWindow->GetOutputSizePixel() );
aPos = aWinRect.Center();
aPos = mpWindow->PixelToLogic(aPos);
- aPos.X() -= aSize.Width() / 2;
- aPos.Y() -= aSize.Height() / 2;
+ aPos.setX( aPos.X() - aSize.Width() / 2 );
+ aPos.setY( aPos.Y() - aSize.Height() / 2 );
aRect = ::tools::Rectangle(aPos, aSize);
}
@@ -544,8 +544,8 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq )
if (aSize.Height() == 0 || aSize.Width() == 0)
{
// rectangle with balanced edge ratio
- aSize.Width() = 14100;
- aSize.Height() = 10000;
+ aSize.setWidth( 14100 );
+ aSize.setHeight( 10000 );
Size aTmp = OutputDevice::LogicToLogic(aSize, MapMode(MapUnit::Map100thMM), MapMode(aMapUnit));
aSz.Width = aTmp.Width();
aSz.Height = aTmp.Height();
@@ -747,8 +747,8 @@ void FuInsertAVMedia::DoExecute( SfxRequest& rReq )
if( mpWindow )
{
aPos = mpWindow->PixelToLogic( ::tools::Rectangle( aPos, mpWindow->GetOutputSizePixel() ).Center() );
- aPos.X() -= aSize.Width() >> 1;
- aPos.Y() -= aSize.Height() >> 1;
+ aPos.setX( aPos.X() - (aSize.Width() >> 1) );
+ aPos.setY( aPos.Y() - (aSize.Height() >> 1) );
}
mpView->InsertMediaURL( aURL, nAction, aPos, aSize, bLink ) ;
diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx
index 9c0fd2c6d172..b3f3d4ec158f 100644
--- a/sd/source/ui/func/fuinsfil.cxx
+++ b/sd/source/ui/func/fuinsfil.cxx
@@ -516,15 +516,15 @@ void FuInsertFile::InsTextOrRTFinDrMode(SfxMedium* pMedium)
limit object size if necessary */
Size aSize(pOutliner->CalcTextSize());
Size aMaxSize = mpDoc->GetMaxObjSize();
- aSize.Height() = std::min(aSize.Height(), aMaxSize.Height());
- aSize.Width() = std::min(aSize.Width(), aMaxSize.Width());
+ aSize.setHeight( std::min(aSize.Height(), aMaxSize.Height()) );
+ aSize.setWidth( std::min(aSize.Width(), aMaxSize.Width()) );
aSize = mpWindow->LogicToPixel(aSize);
// put it at the center of the window
Size aTemp(mpWindow->GetOutputSizePixel());
Point aPos(aTemp.Width() / 2, aTemp.Height() / 2);
- aPos.X() -= aSize.Width() / 2;
- aPos.Y() -= aSize.Height() / 2;
+ aPos.setX( aPos.X() - aSize.Width() / 2 );
+ aPos.setY( aPos.Y() - aSize.Height() / 2 );
aSize = mpWindow->PixelToLogic(aSize);
aPos = mpWindow->PixelToLogic(aPos);
pTO->SetLogicRect(::tools::Rectangle(aPos, aSize));
diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx
index 9fbca6fa8be8..29e578c7ffa2 100644
--- a/sd/source/ui/func/fusel.cxx
+++ b/sd/source/ui/func/fusel.cxx
@@ -1220,10 +1220,10 @@ bool FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos)
Point aHitPosT(rPos);
Point aHitPosB(rPos);
- aHitPosR.X() += n2HitLog;
- aHitPosL.X() -= n2HitLog;
- aHitPosT.Y() += n2HitLog;
- aHitPosB.Y() -= n2HitLog;
+ aHitPosR.setX( aHitPosR.X() + n2HitLog );
+ aHitPosL.setX( aHitPosL.X() - n2HitLog );
+ aHitPosT.setY( aHitPosT.Y() + n2HitLog );
+ aHitPosB.setY( aHitPosB.Y() - n2HitLog );
if ( !bClosed ||
!bFilled ||
diff --git a/sd/source/ui/func/fusnapln.cxx b/sd/source/ui/func/fusnapln.cxx
index 96e135e9299b..b0b38e48c5a3 100644
--- a/sd/source/ui/func/fusnapln.cxx
+++ b/sd/source/ui/func/fusnapln.cxx
@@ -163,8 +163,8 @@ void FuSnapLine::DoExecute( SfxRequest& rReq )
}
Point aHlpPos;
- aHlpPos.X() = static_cast<const SfxInt32Item&>( pArgs->Get(ATTR_SNAPLINE_X)).GetValue();
- aHlpPos.Y() = static_cast<const SfxInt32Item&>( pArgs->Get(ATTR_SNAPLINE_Y)).GetValue();
+ aHlpPos.setX( static_cast<const SfxInt32Item&>( pArgs->Get(ATTR_SNAPLINE_X)).GetValue() );
+ aHlpPos.setY( static_cast<const SfxInt32Item&>( pArgs->Get(ATTR_SNAPLINE_Y)).GetValue() );
pPV->PagePosToLogic(aHlpPos);
if ( bCreateNew )
diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx
index 19c0ce638516..9108f5709c2a 100644
--- a/sd/source/ui/func/futext.cxx
+++ b/sd/source/ui/func/futext.cxx
@@ -784,8 +784,8 @@ bool FuText::MouseButtonUp(const MouseEvent& rMEvt)
if (bSnapEnabled)
mpView->SetSnapEnabled(false);
- aPnt.X() += nDrgLog + nDrgLog;
- aPnt.Y() += nDrgLog + nDrgLog;
+ aPnt.setX( aPnt.X() + nDrgLog + nDrgLog );
+ aPnt.setY( aPnt.Y() + nDrgLog + nDrgLog );
mpView->MovAction(aPnt);
mxTextObj.reset( dynamic_cast< SdrTextObj* >( mpView->GetCreateObj() ) );
diff --git a/sd/source/ui/func/fuzoom.cxx b/sd/source/ui/func/fuzoom.cxx
index a739f2ec12c0..b059d2e2dba5 100644
--- a/sd/source/ui/func/fuzoom.cxx
+++ b/sd/source/ui/func/fuzoom.cxx
@@ -117,8 +117,8 @@ bool FuZoom::MouseMove(const MouseEvent& rMEvt)
{
Size aWorkSize = mpView->GetWorkArea().GetSize();
Size aPageSize = mpView->GetSdrPageView()->GetPage()->GetSize();
- aScroll.X() /= aWorkSize.Width() / aPageSize.Width();
- aScroll.Y() /= aWorkSize.Height() / aPageSize.Height();
+ aScroll.setX( aScroll.X() / aWorkSize.Width() / aPageSize.Width() );
+ aScroll.setY( aScroll.Y() / aWorkSize.Height() / aPageSize.Height() );
mpViewShell->Scroll(aScroll.X(), aScroll.Y());
aBeginPosPix = aPosPix;
}
@@ -163,16 +163,16 @@ bool FuZoom::MouseButtonUp(const MouseEvent& rMEvt)
Size aSize = mpWindow->PixelToLogic(mpWindow->GetOutputSizePixel());
if ( rMEvt.IsMod1() )
{
- aSize.Width() *= 2;
- aSize.Height() *= 2;
+ aSize.setWidth( aSize.Width() * 2 );
+ aSize.setHeight( aSize.Height() * 2 );
}
else
{
- aSize.Width() /= 2;
- aSize.Height() /= 2;
+ aSize.setWidth( aSize.Width() / 2 );
+ aSize.setHeight( aSize.Height() / 2 );
}
- aPos.X() -= aSize.Width() / 2;
- aPos.Y() -= aSize.Height() / 2;
+ aPos.setX( aPos.X() - aSize.Width() / 2 );
+ aPos.setY( aPos.Y() - aSize.Height() / 2 );
aZoomRect.SetPos(aPos);
aZoomRect.SetSize(aSize);
}
diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx
index 50acfad99a25..23cbdbf1624a 100644
--- a/sd/source/ui/sidebar/LayoutMenu.cxx
+++ b/sd/source/ui/sidebar/LayoutMenu.cxx
@@ -238,8 +238,8 @@ ui::LayoutSize LayoutMenu::GetHeightForWidth (const sal_Int32 nWidth)
Size aItemSize = CalcItemSizePixel (aImage.GetSizePixel());
if (nWidth>0 && aItemSize.Width()>0)
{
- aItemSize.Width() += 8;
- aItemSize.Height() += 8;
+ aItemSize.setWidth( aItemSize.Width() + 8 );
+ aItemSize.setHeight( aItemSize.Height() + 8 );
int nColumnCount = nWidth / aItemSize.Width();
if (nColumnCount <= 0)
nColumnCount = 1;
@@ -263,8 +263,8 @@ void LayoutMenu::Resize()
Image aImage = GetItemImage(GetItemId(0));
Size aItemSize = CalcItemSizePixel (
aImage.GetSizePixel());
- aItemSize.Width() += 8;
- aItemSize.Height() += 8;
+ aItemSize.setWidth( aItemSize.Width() + 8 );
+ aItemSize.setHeight( aItemSize.Height() + 8 );
int nColumnCount = aWindowSize.Width() / aItemSize.Width();
if (nColumnCount < 1)
nColumnCount = 1;
diff --git a/sd/source/ui/sidebar/MasterPageContainer.cxx b/sd/source/ui/sidebar/MasterPageContainer.cxx
index 48deb2505e4e..2beabbe98cdc 100644
--- a/sd/source/ui/sidebar/MasterPageContainer.cxx
+++ b/sd/source/ui/sidebar/MasterPageContainer.cxx
@@ -582,8 +582,8 @@ void MasterPageContainer::Implementation::UpdatePreviewSizePixel()
break;
}
- maSmallPreviewSizePixel.Width() = SMALL_PREVIEW_WIDTH;
- maLargePreviewSizePixel.Width() = LARGE_PREVIEW_WIDTH;
+ maSmallPreviewSizePixel.setWidth( SMALL_PREVIEW_WIDTH );
+ maLargePreviewSizePixel.setWidth( LARGE_PREVIEW_WIDTH );
int nNewSmallHeight ((maSmallPreviewSizePixel.Width()-2) * nHeight / nWidth + 2);
int nNewLargeHeight ((maLargePreviewSizePixel.Width()-2) * nHeight / nWidth + 2);
@@ -591,8 +591,8 @@ void MasterPageContainer::Implementation::UpdatePreviewSizePixel()
if (nNewSmallHeight!=maSmallPreviewSizePixel.Height()
|| nNewLargeHeight!=maLargePreviewSizePixel.Height())
{
- maSmallPreviewSizePixel.Height() = nNewSmallHeight;
- maLargePreviewSizePixel.Height() = nNewLargeHeight;
+ maSmallPreviewSizePixel.setHeight( nNewSmallHeight );
+ maLargePreviewSizePixel.setHeight( nNewLargeHeight );
FireContainerChange(
MasterPageContainerChangeEvent::EventType::SIZE_CHANGED,
NIL_TOKEN);
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index 7983130d1783..790e157c0ad7 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -785,8 +785,8 @@ bool SlideshowImpl::startPreview(
::tools::Rectangle aContentRect (mpViewShell->GetViewShellBase().getClientRectangle());
if (AllSettings::GetLayoutRTL())
{
- aContentRect.Left() = aContentRect.Right();
- aContentRect.Right() += aContentRect.Right();
+ aContentRect.SetLeft( aContentRect.Right() );
+ aContentRect.SetRight( aContentRect.Right() + aContentRect.Right() );
}
maPresSize = aContentRect.GetSize();
mpShowWindow->SetPosPixel( aContentRect.TopLeft() );
diff --git a/sd/source/ui/slideshow/slideshowviewimpl.cxx b/sd/source/ui/slideshow/slideshowviewimpl.cxx
index 881ad6ed4613..2cf4a60e4c4a 100644
--- a/sd/source/ui/slideshow/slideshowviewimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowviewimpl.cxx
@@ -329,8 +329,8 @@ geometry::AffineMatrix2D SAL_CALL SlideShowView::getTransformation( )
if( meAnimationMode != ANIMATIONMODE_SHOW )
{
- aOutputSize.Width() = static_cast<long>( aOutputSize.Width() / 1.03 );
- aOutputSize.Height() = static_cast<long>( aOutputSize.Height() / 1.03 );
+ aOutputSize.setWidth( static_cast<long>( aOutputSize.Width() / 1.03 ) );
+ aOutputSize.setHeight( static_cast<long>( aOutputSize.Height() / 1.03 ) );
}
SdPage* pP = mpDoc->GetSdPage( 0, PageKind::Standard );
@@ -341,11 +341,11 @@ geometry::AffineMatrix2D SAL_CALL SlideShowView::getTransformation( )
if( page_ratio > output_ratio )
{
- aOutputSize.Height() = ( aOutputSize.Width() * aPageSize.Height() ) / aPageSize.Width();
+ aOutputSize.setHeight( ( aOutputSize.Width() * aPageSize.Height() ) / aPageSize.Width() );
}
else if( page_ratio < output_ratio )
{
- aOutputSize.Width() = ( aOutputSize.Height() * aPageSize.Width() ) / aPageSize.Height();
+ aOutputSize.setWidth( ( aOutputSize.Height() * aPageSize.Width() ) / aPageSize.Height() );
}
Point aOutputOffset( ( aWindowSize.Width() - aOutputSize.Width() ) >> 1,
@@ -354,8 +354,8 @@ geometry::AffineMatrix2D SAL_CALL SlideShowView::getTransformation( )
// Reduce available width by one, as the slides might actually
// render one pixel wider and higher as aPageSize below specifies
// (when shapes of page size have visible border lines)
- aOutputSize.Width() --;
- aOutputSize.Height() --;
+ aOutputSize.setWidth( --aOutputSize.Width() );
+ aOutputSize.setHeight( --aOutputSize.Height() );
// Record mTranslationOffset
mTranslationOffset.Height = aOutputOffset.Y();
diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx b/sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx
index 645cd170c0ad..377b0932438c 100644
--- a/sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx
@@ -56,8 +56,8 @@ Bitmap BitmapFactory::CreateBitmap (
{
// Supersampling factor
int aSuperSamplingFactor = 2;
- aSize.Width() *= aSuperSamplingFactor;
- aSize.Height() *= aSuperSamplingFactor;
+ aSize.setWidth( aSize.Width() * aSuperSamplingFactor );
+ aSize.setHeight( aSize.Height() * aSuperSamplingFactor );
}
Bitmap aPreview (maRenderer.RenderPage (
diff --git a/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx b/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx
index ebc6a5c2b109..57cfef617d8f 100644
--- a/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx
@@ -337,9 +337,9 @@ void ScrollBarManager::SetWindowOrigin (
// Adapt the remaining space accordingly.
::tools::Rectangle aRemainingSpace (rAvailableArea);
if (bShowVertical)
- aRemainingSpace.Right() -= mpVerticalScrollBar->GetSizePixel().Width();
+ aRemainingSpace.SetRight( aRemainingSpace.Right() - mpVerticalScrollBar->GetSizePixel().Width() );
if (bShowHorizontal)
- aRemainingSpace.Bottom() -= mpHorizontalScrollBar->GetSizePixel().Height();
+ aRemainingSpace.SetBottom( aRemainingSpace.Bottom() - mpHorizontalScrollBar->GetSizePixel().Height() );
return aRemainingSpace;
}
@@ -355,9 +355,9 @@ bool ScrollBarManager::TestScrollBarVisibilities (
// visible in this combination.
Size aBrowserSize (rAvailableArea.GetSize());
if (bHorizontalScrollBarVisible)
- aBrowserSize.Height() -= mpHorizontalScrollBar->GetSizePixel().Height();
+ aBrowserSize.setHeight( aBrowserSize.Height() - mpHorizontalScrollBar->GetSizePixel().Height() );
if (bVerticalScrollBarVisible)
- aBrowserSize.Width() -= mpVerticalScrollBar->GetSizePixel().Width();
+ aBrowserSize.setWidth( aBrowserSize.Width() - mpVerticalScrollBar->GetSizePixel().Width() );
// Tell the view to rearrange its page objects and check whether the
// page objects can be shown without clipping.
@@ -560,9 +560,9 @@ void ScrollBarManager::Scroll(
// Calculate estimate of new location.
if (bIsVertical)
- aNewTopLeft.Y() += nDistance * rLayouter.GetPageObjectSize().Height();
+ aNewTopLeft.setY( aNewTopLeft.Y() + nDistance * rLayouter.GetPageObjectSize().Height() );
else
- aNewTopLeft.X() += nDistance * rLayouter.GetPageObjectSize().Width();
+ aNewTopLeft.setX( aNewTopLeft.X() + nDistance * rLayouter.GetPageObjectSize().Width() );
// Adapt location to show whole slides.
if (bIsVertical)
@@ -571,15 +571,15 @@ void ScrollBarManager::Scroll(
const sal_Int32 nIndex (rLayouter.GetIndexAtPoint(
Point(aNewTopLeft.X(), aNewTopLeft.Y()+mpVerticalScrollBar->GetVisibleSize()),
true));
- aNewTopLeft.Y() = rLayouter.GetPageObjectBox(nIndex,true).Bottom()
- - mpVerticalScrollBar->GetVisibleSize();
+ aNewTopLeft.setY( rLayouter.GetPageObjectBox(nIndex,true).Bottom()
+ - mpVerticalScrollBar->GetVisibleSize() );
}
else
{
const sal_Int32 nIndex (rLayouter.GetIndexAtPoint(
Point(aNewTopLeft.X(), aNewTopLeft.Y()),
true));
- aNewTopLeft.Y() = rLayouter.GetPageObjectBox(nIndex,true).Top();
+ aNewTopLeft.setY( rLayouter.GetPageObjectBox(nIndex,true).Top() );
}
else
if (nDistance > 0)
@@ -587,15 +587,15 @@ void ScrollBarManager::Scroll(
const sal_Int32 nIndex (rLayouter.GetIndexAtPoint(
Point(aNewTopLeft.X()+mpVerticalScrollBar->GetVisibleSize(), aNewTopLeft.Y()),
true));
- aNewTopLeft.X() = rLayouter.GetPageObjectBox(nIndex,true).Right()
- - mpVerticalScrollBar->GetVisibleSize();
+ aNewTopLeft.setX( rLayouter.GetPageObjectBox(nIndex,true).Right()
+ - mpVerticalScrollBar->GetVisibleSize() );
}
else
{
const sal_Int32 nIndex (rLayouter.GetIndexAtPoint(
Point(aNewTopLeft.X(), aNewTopLeft.Y()),
true));
- aNewTopLeft.X() = rLayouter.GetPageObjectBox(nIndex,true).Left();
+ aNewTopLeft.setX( rLayouter.GetPageObjectBox(nIndex,true).Left() );
}
mrSlideSorter.GetController().GetVisibleAreaManager().DeactivateCurrentSlideTracking();
diff --git a/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx b/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx
index 4aff45add4de..44e40a8c2240 100644
--- a/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx
@@ -235,16 +235,16 @@ VisibleAreaScroller::VisibleAreaScroller (
if (std::abs(rStart.X()-rEnd.X()) > gnMaxScrollDistance)
{
if (rStart.X() < rEnd.X())
- maStart.X() = rEnd.X()-gnMaxScrollDistance;
+ maStart.setX( rEnd.X()-gnMaxScrollDistance );
else
- maStart.X() = rEnd.X()+gnMaxScrollDistance;
+ maStart.setX( rEnd.X()+gnMaxScrollDistance );
}
if (std::abs(rStart.Y()-rEnd.Y()) > gnMaxScrollDistance)
{
if (rStart.Y() < rEnd.Y())
- maStart.Y() = rEnd.Y()-gnMaxScrollDistance;
+ maStart.setY( rEnd.Y()-gnMaxScrollDistance );
else
- maStart.Y() = rEnd.Y()+gnMaxScrollDistance;
+ maStart.setY( rEnd.Y()+gnMaxScrollDistance );
}
}
diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
index 7652ee526694..6db47041e20b 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
@@ -585,8 +585,8 @@ void SlideSorterViewShell::SetZoomRect (const ::tools::Rectangle& rZoomRect)
{
long nWidthDiff = (aPageSize.Width() - aRect.GetWidth()) / 2;
- aRect.Left() -= nWidthDiff;
- aRect.Right() += nWidthDiff;
+ aRect.SetLeft( aRect.Left() - nWidthDiff );
+ aRect.SetRight( aRect.Right() + nWidthDiff );
if (aRect.Left() < 0)
{
@@ -598,8 +598,8 @@ void SlideSorterViewShell::SetZoomRect (const ::tools::Rectangle& rZoomRect)
{
long nHeightDiff = (aPageSize.Height() - aRect.GetHeight()) / 2;
- aRect.Top() -= nHeightDiff;
- aRect.Bottom() += nHeightDiff;
+ aRect.SetTop( aRect.Top() - nHeightDiff );
+ aRect.SetBottom( aRect.Bottom() + nHeightDiff );
if (aRect.Top() < 0)
{
diff --git a/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx b/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx
index 0d39186e6a28..e41f02760881 100644
--- a/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx
+++ b/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx
@@ -338,9 +338,9 @@ void PageObjectRun::UpdateOffsets(
? rInsertPosition.GetLeadingOffset()
: rInsertPosition.GetTrailingOffset();
if (bIsVertical)
- maEndOffset[nIndex].X() = 0;
+ maEndOffset[nIndex].setX( 0 );
else
- maEndOffset[nIndex].Y() = 0;
+ maEndOffset[nIndex].setY( 0 );
}
RestartAnimation();
}
diff --git a/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx b/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx
index 96e7278faead..5fae78af3854 100644
--- a/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx
+++ b/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx
@@ -179,8 +179,8 @@ Point InsertionIndicatorOverlay::PaintRepresentatives (
break;
}
aPageOffset += aOffset;
- aPageOffset.X() += gnShadowBorder;
- aPageOffset.Y() += gnShadowBorder;
+ aPageOffset.setX( aPageOffset.X() + gnShadowBorder );
+ aPageOffset.setY( aPageOffset.Y() + gnShadowBorder );
// Paint the preview.
Bitmap aPreview (rRepresentatives[nIndex].maBitmap);
diff --git a/sd/source/ui/slidesorter/view/SlsLayouter.cxx b/sd/source/ui/slidesorter/view/SlsLayouter.cxx
index fc842d5d7419..3e0199d2db73 100644
--- a/sd/source/ui/slidesorter/view/SlsLayouter.cxx
+++ b/sd/source/ui/slidesorter/view/SlsLayouter.cxx
@@ -927,21 +927,21 @@ sal_Int32 Layouter::Implementation::GetIndex (
::tools::Rectangle aBoundingBox (rBoundingBox);
if (nColumn == 0)
- aBoundingBox.Left() = 0;
+ aBoundingBox.SetLeft( 0 );
else
- aBoundingBox.Left() -= mnHorizontalGap/2;
+ aBoundingBox.SetLeft( aBoundingBox.Left() - mnHorizontalGap/2 );
if (nColumn == mnColumnCount-1)
- aBoundingBox.Right() += mnRightBorder;
+ aBoundingBox.SetRight( aBoundingBox.Right() + mnRightBorder );
else
- aBoundingBox.Right() += mnHorizontalGap/2;
+ aBoundingBox.SetRight( aBoundingBox.Right() + mnHorizontalGap/2 );
if (nRow == 0)
- aBoundingBox.Top() = 0;
+ aBoundingBox.SetTop( 0 );
else
- aBoundingBox.Top() -= mnVerticalGap/2;
+ aBoundingBox.SetTop( aBoundingBox.Top() - mnVerticalGap/2 );
if (nRow == mnRowCount-1)
- aBoundingBox.Bottom() += mnBottomBorder;
+ aBoundingBox.SetBottom( aBoundingBox.Bottom() + mnBottomBorder );
else
- aBoundingBox.Bottom() += mnVerticalGap/2;
+ aBoundingBox.SetBottom( aBoundingBox.Bottom() + mnVerticalGap/2 );
return aBoundingBox;
}
diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx
index aba2d0473ae7..f5f411906fb7 100644
--- a/sd/source/ui/table/TableDesignPane.cxx
+++ b/sd/source/ui/table/TableDesignPane.cxx
@@ -312,7 +312,7 @@ void TableValueSet::Resize()
Image aImage = GetItemImage(GetItemId(0));
Size aItemSize = aImage.GetSizePixel();
- aItemSize.Height() += 10;
+ aItemSize.setHeight( aItemSize.Height() + 10 );
int nColumnCount = (aValueSetSize.Width() - GetScrollWidth()) / aItemSize.Width();
if (nColumnCount < 1)
nColumnCount = 1;
@@ -761,8 +761,8 @@ void TableDesignWidget::FillDesignPreviewControl()
WinBits nStyle = m_pValueSet->GetStyle() & ~WB_VSCROLL;
m_pValueSet->SetStyle(nStyle);
Size aSize(m_pValueSet->GetOptimalSize());
- aSize.Width() += (10 * nCols);
- aSize.Height() += (10 * nRows);
+ aSize.setWidth( aSize.Width() + (10 * nCols) );
+ aSize.setHeight( aSize.Height() + (10 * nRows) );
m_pValueSet->set_width_request(aSize.Width());
m_pValueSet->set_height_request(aSize.Height());
m_pValueSet->Resize();
diff --git a/sd/source/ui/table/tablefunction.cxx b/sd/source/ui/table/tablefunction.cxx
index 5590f9e150df..1ae40890b3f2 100644
--- a/sd/source/ui/table/tablefunction.cxx
+++ b/sd/source/ui/table/tablefunction.cxx
@@ -181,8 +181,8 @@ void DrawViewShell::FuTable(SfxRequest& rReq)
}
aPos = aWinRect.Center();
- aPos.X() -= aSize.Width() / 2;
- aPos.Y() -= aSize.Height() / 2;
+ aPos.setX( aPos.X() - aSize.Width() / 2 );
+ aPos.setY( aPos.Y() - aSize.Height() / 2 );
aRect = ::tools::Rectangle(aPos, aSize);
}
diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx
index 8572f566b739..b9f8ba53244a 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -1939,8 +1939,8 @@ private:
&& aPageWidth > aPageHeight ) )
{
const sal_Int32 nTmp (rInfo.maPrintSize.Width());
- rInfo.maPrintSize.Width() = rInfo.maPrintSize.Height();
- rInfo.maPrintSize.Height() = nTmp;
+ rInfo.maPrintSize.setWidth( rInfo.maPrintSize.Height() );
+ rInfo.maPrintSize.setHeight( nTmp );
}
if (mpOptions->IsTilePage()
@@ -1979,13 +1979,13 @@ private:
if( fPageWH < fPrintWH )
{
- aPageSize_2.Width() = static_cast<long>( aPrintSize_2.Height() * fPageWH );
- aPageSize_2.Height()= aPrintSize_2.Height();
+ aPageSize_2.setWidth( static_cast<long>( aPrintSize_2.Height() * fPageWH ) );
+ aPageSize_2.setHeight( aPrintSize_2.Height() );
}
else
{
- aPageSize_2.Width() = aPrintSize_2.Width();
- aPageSize_2.Height() = static_cast<long>( aPrintSize_2.Width() / fPageWH );
+ aPageSize_2.setWidth( aPrintSize_2.Width() );
+ aPageSize_2.setHeight( static_cast<long>( aPrintSize_2.Width() / fPageWH ) );
}
MapMode aMap (rInfo.maMap);
@@ -2000,13 +2000,13 @@ private:
if (rInfo.meOrientation == Orientation::Landscape)
{
- aOffset.X() = ( ( aAdjustedPrintSize.Width() >> 1 ) - rInfo.maPageSize.Width() ) >> 1;
- aOffset.Y() = ( aAdjustedPrintSize.Height() - rInfo.maPageSize.Height() ) >> 1;
+ aOffset.setX( ( ( aAdjustedPrintSize.Width() >> 1 ) - rInfo.maPageSize.Width() ) >> 1 );
+ aOffset.setY( ( aAdjustedPrintSize.Height() - rInfo.maPageSize.Height() ) >> 1 );
}
else
{
- aOffset.X() = ( aAdjustedPrintSize.Width() - rInfo.maPageSize.Width() ) >> 1;
- aOffset.Y() = ( ( aAdjustedPrintSize.Height() >> 1 ) - rInfo.maPageSize.Height() ) >> 1;
+ aOffset.setX( ( aAdjustedPrintSize.Width() - rInfo.maPageSize.Width() ) >> 1 );
+ aOffset.setY( ( ( aAdjustedPrintSize.Height() >> 1 ) - rInfo.maPageSize.Height() ) >> 1 );
}
// create vector of pages to print
@@ -2059,9 +2059,9 @@ private:
const std::pair<sal_uInt16, sal_uInt16> aPair (aPairVector[nIndex]);
Point aSecondOffset (aOffset);
if (rInfo.meOrientation == Orientation::Landscape)
- aSecondOffset.X() += aAdjustedPrintSize.Width() / 2;
+ aSecondOffset.setX( aSecondOffset.X() + aAdjustedPrintSize.Width() / 2 );
else
- aSecondOffset.Y() += aAdjustedPrintSize.Height() / 2;
+ aSecondOffset.setY( aSecondOffset.Y() + aAdjustedPrintSize.Height() / 2 );
maPrinterPages.push_back(
std::shared_ptr<PrinterPage>(
new BookletPrinterPage(
@@ -2171,11 +2171,11 @@ private:
for (Point aPageOrigin = aOrigin;
-aPageOrigin.Y()<nPageHeight;
- aPageOrigin.Y() -= rInfo.maPrintSize.Height())
+ aPageOrigin.setY( aPageOrigin.Y() - rInfo.maPrintSize.Height() ))
{
- for (aPageOrigin.X()=aOrigin.X();
+ for (aPageOrigin.setX(aOrigin.X() );
-aPageOrigin.X()<nPageWidth;
- aPageOrigin.X() -= rInfo.maPrintSize.Width())
+ aPageOrigin.setX( aPageOrigin.X() - rInfo.maPrintSize.Width() ))
{
aMap.SetOrigin(aPageOrigin);
maPrinterPages.push_back(
diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx
index 9be30f88fc36..2ba60d39bd29 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -477,8 +477,8 @@ void ViewShellBase::InnerResizePixel (const Point& rOrigin, const Size &rSize, b
{
SvBorder aBorder( GetBorderPixel() );
Size aSize( rSize );
- aSize.Width() -= (aBorder.Left() + aBorder.Right());
- aSize.Height() -= (aBorder.Top() + aBorder.Bottom());
+ aSize.setWidth( aSize.Width() - (aBorder.Left() + aBorder.Right()) );
+ aSize.setHeight( aSize.Height() - (aBorder.Top() + aBorder.Bottom()) );
Size aObjSizePixel = mpImpl->mpViewWindow->LogicToPixel(aObjSize, MapMode(MapUnit::Map100thMM));
SfxViewShell::SetZoomFactor(
Fraction( aSize.Width(), std::max( aObjSizePixel.Width(), static_cast<long int>(1) ) ),
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index 73f2b0740db6..deebe476ed38 100644
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -593,7 +593,7 @@ IMPL_LINK( DrawViewShell, TabSplitHdl, TabBar *, pTab, void )
- maTabControl->GetPosPixel().X() ;
Size aTabSize = maTabControl->GetSizePixel();
- aTabSize.Width() = std::min(pTab->GetSplitSize(), static_cast<long>(nMax-1));
+ aTabSize.setWidth( std::min(pTab->GetSplitSize(), static_cast<long>(nMax-1)) );
maTabControl->SetSizePixel(aTabSize);
@@ -603,7 +603,7 @@ IMPL_LINK( DrawViewShell, TabSplitHdl, TabBar *, pTab, void )
}
Point aPos = maTabControl->GetPosPixel();
- aPos.X() += aTabSize.Width();
+ aPos.setX( aPos.X() + aTabSize.Width() );
Size aScrSize(nMax - aTabSize.Width(), maScrBarWH.Height());
mpHorizontalScrollBar->SetPosSizePixel(aPos, aScrSize);
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index 9271c6fd0574..f811bca1d51f 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -529,8 +529,8 @@ public:
::tools::Rectangle aRectangle(Point(), pMasterPage->GetSize());
Point aPosition(aRectangle.Center().X(), aRectangle.Bottom());
- aPosition.X() -= aTextSize.Width() / 2;
- aPosition.Y() -= aTextSize.Height();
+ aPosition.setX( aPosition.X() - aTextSize.Width() / 2 );
+ aPosition.setY( aPosition.Y() - aTextSize.Height() );
pObject->SetLogicRect(::tools::Rectangle(aPosition, aTextSize));
}
@@ -2331,15 +2331,15 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
pOutl->UpdateFields();
pOutl->SetUpdateMode( true );
Size aSize( pOutl->CalcTextSize() );
- aSize.Width() *= nMul;
+ aSize.setWidth( aSize.Width() * nMul );
pOutl->SetUpdateMode( false );
Point aPos;
::tools::Rectangle aRect( aPos, GetActiveWindow()->GetOutputSizePixel() );
aPos = aRect.Center();
aPos = GetActiveWindow()->PixelToLogic(aPos);
- aPos.X() -= aSize.Width() / 2;
- aPos.Y() -= aSize.Height() / 2;
+ aPos.setX( aPos.X() - aSize.Width() / 2 );
+ aPos.setY( aPos.Y() - aSize.Height() / 2 );
::tools::Rectangle aLogicRect(aPos, aSize);
pRectObj->SetLogicRect(aLogicRect);
diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx
index ce60ef119797..d7723952ffbb 100644
--- a/sd/source/ui/view/drviews3.cxx
+++ b/sd/source/ui/view/drviews3.cxx
@@ -503,8 +503,8 @@ void DrawViewShell::ExecRuler(SfxRequest& rReq)
{
::tools::Rectangle aRect = maMarkRect;
aRect.SetPos(aRect.TopLeft() + aPagePos);
- aRect.Left() = rLRSpace.GetLeft();
- aRect.Right() = aViewSize.Width() - rLRSpace.GetRight();
+ aRect.SetLeft( rLRSpace.GetLeft() );
+ aRect.SetRight( aViewSize.Width() - rLRSpace.GetRight() );
aRect.SetPos(aRect.TopLeft() - aPagePos);
if ( aRect != maMarkRect)
{
@@ -568,8 +568,8 @@ void DrawViewShell::ExecRuler(SfxRequest& rReq)
{
::tools::Rectangle aRect = maMarkRect;
aRect.SetPos(aRect.TopLeft() + aPagePos);
- aRect.Top() = rULSpace.GetUpper();
- aRect.Bottom() = aViewSize.Height() - rULSpace.GetLower();
+ aRect.SetTop( rULSpace.GetUpper() );
+ aRect.SetBottom( aViewSize.Height() - rULSpace.GetLower() );
aRect.SetPos(aRect.TopLeft() - aPagePos);
if ( aRect != maMarkRect)
@@ -632,13 +632,13 @@ void DrawViewShell::ExecRuler(SfxRequest& rReq)
if ( rOI.GetStartX() != rOI.GetEndX() )
{
- aRect.Left() = rOI.GetStartX();
- aRect.Right() = rOI.GetEndX();
+ aRect.SetLeft( rOI.GetStartX() );
+ aRect.SetRight( rOI.GetEndX() );
}
if ( rOI.GetStartY() != rOI.GetEndY() )
{
- aRect.Top() = rOI.GetStartY();
- aRect.Bottom() = rOI.GetEndY();
+ aRect.SetTop( rOI.GetStartY() );
+ aRect.SetBottom( rOI.GetEndY() );
}
aRect.SetPos(aRect.TopLeft() - aPagePos);
if ( aRect != maMarkRect)
@@ -926,7 +926,7 @@ void DrawViewShell::GetRulerState(SfxItemSet& rSet)
{
const SdrMetricItem& rTLDItem = aEditAttr.Get( SDRATTR_TEXT_LEFTDIST );
long nLD = rTLDItem.GetValue();
- aPos.X() += nLD;
+ aPos.setX( aPos.X() + nLD );
}
aPointItem.SetValue( aPos );
diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx
index 0f38933a37f3..84ae97063822 100644
--- a/sd/source/ui/view/drviews4.cxx
+++ b/sd/source/ui/view/drviews4.cxx
@@ -756,13 +756,13 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin)
//move the point into the visible window area
if( aMenuPos.X() < 0 )
- aMenuPos.X() = 0;
+ aMenuPos.setX( 0 );
if( aMenuPos.Y() < 0 )
- aMenuPos.Y() = 0;
+ aMenuPos.setY( 0 );
if( aMenuPos.X() > GetActiveWindow()->GetSizePixel().Width() )
- aMenuPos.X() = GetActiveWindow()->GetSizePixel().Width();
+ aMenuPos.setX( GetActiveWindow()->GetSizePixel().Width() );
if( aMenuPos.Y() > GetActiveWindow()->GetSizePixel().Height() )
- aMenuPos.Y() = GetActiveWindow()->GetSizePixel().Height();
+ aMenuPos.setY( GetActiveWindow()->GetSizePixel().Height() );
}
//open context menu at that point
diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx
index d1d604e43ad0..4bdb4c509c82 100644
--- a/sd/source/ui/view/drviews5.cxx
+++ b/sd/source/ui/view/drviews5.cxx
@@ -108,7 +108,7 @@ void DrawViewShell::ArrangeGUIElements()
maScrBarWH = Size (nScrollBarSize, nScrollBarSize);
Point aHPos = maViewPos;
- aHPos.Y() += maViewSize.Height();
+ aHPos.setY( aHPos.Y() + maViewSize.Height() );
ViewShell::ArrangeGUIElements ();
diff --git a/sd/source/ui/view/drviews8.cxx b/sd/source/ui/view/drviews8.cxx
index 7904c458bf8f..7268e327ed0f 100644
--- a/sd/source/ui/view/drviews8.cxx
+++ b/sd/source/ui/view/drviews8.cxx
@@ -74,8 +74,8 @@ void DrawViewShell::ScannerEvent()
else
aBmpSize = OutputDevice::LogicToLogic( aBmpSize, aScanBmp.GetPrefMapMode(), aMap100 );
- aPageSize.Width() -= pPage->GetLeftBorder() + pPage->GetRightBorder();
- aPageSize.Height() -= pPage->GetUpperBorder() + pPage->GetLowerBorder();
+ aPageSize.setWidth( aPageSize.Width() - pPage->GetLeftBorder() + pPage->GetRightBorder() );
+ aPageSize.setHeight( aPageSize.Height() - pPage->GetUpperBorder() + pPage->GetLowerBorder() );
if( ( ( aBmpSize.Height() > aPageSize.Height() ) || ( aBmpSize.Width() > aPageSize.Width() ) ) && aBmpSize.Height() && aPageSize.Height() )
{
@@ -84,13 +84,13 @@ void DrawViewShell::ScannerEvent()
if( fGrfWH < fWinWH )
{
- aBmpSize.Width() = FRound( aPageSize.Height() * fGrfWH );
- aBmpSize.Height()= aPageSize.Height();
+ aBmpSize.setWidth( FRound( aPageSize.Height() * fGrfWH ) );
+ aBmpSize.setHeight( aPageSize.Height() );
}
else if( fGrfWH > 0.F )
{
- aBmpSize.Width() = aPageSize.Width();
- aBmpSize.Height()= FRound( aPageSize.Width() / fGrfWH );
+ aBmpSize.setWidth( aPageSize.Width() );
+ aBmpSize.setHeight( FRound( aPageSize.Width() / fGrfWH ) );
}
}
diff --git a/sd/source/ui/view/drviews9.cxx b/sd/source/ui/view/drviews9.cxx
index ad01925b8ebd..0ee31d473f4d 100644
--- a/sd/source/ui/view/drviews9.cxx
+++ b/sd/source/ui/view/drviews9.cxx
@@ -97,8 +97,8 @@ void DrawViewShell::ExecGallery(SfxRequest const & rReq)
// constrain size to page size if necessary
SdrPage* pPage = mpDrawView->GetSdrPageView()->GetPage();
Size aPageSize = pPage->GetSize();
- aPageSize.Width() -= pPage->GetLeftBorder() + pPage->GetRightBorder();
- aPageSize.Height() -= pPage->GetUpperBorder() + pPage->GetLowerBorder();
+ aPageSize.setWidth( aPageSize.Width() - pPage->GetLeftBorder() + pPage->GetRightBorder() );
+ aPageSize.setHeight( aPageSize.Height() - pPage->GetUpperBorder() + pPage->GetLowerBorder() );
// If the image is too large we make it fit into the page
if ( ( ( aSize.Height() > aPageSize.Height() ) || ( aSize.Width() > aPageSize.Width() ) ) &&
@@ -112,13 +112,13 @@ void DrawViewShell::ExecGallery(SfxRequest const & rReq)
// constrain size to page size if necessary
if ((fGrfWH != 0.F) && (fGrfWH < fWinWH))
{
- aSize.Width() = static_cast<long>(aPageSize.Height() * fGrfWH);
- aSize.Height()= aPageSize.Height();
+ aSize.setWidth( static_cast<long>(aPageSize.Height() * fGrfWH) );
+ aSize.setHeight( aPageSize.Height() );
}
else
{
- aSize.Width() = aPageSize.Width();
- aSize.Height()= static_cast<long>(aPageSize.Width() / fGrfWH);
+ aSize.setWidth( aPageSize.Width() );
+ aSize.setHeight( static_cast<long>(aPageSize.Width() / fGrfWH) );
}
}
diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx
index 4a1cd9c0b38e..a4c7860f5177 100644
--- a/sd/source/ui/view/drviewsa.cxx
+++ b/sd/source/ui/view/drviewsa.cxx
@@ -574,14 +574,14 @@ void DrawViewShell::GetStatusBarState(SfxItemSet& rSet)
Point aPagePos(0, 0);
Size aPageSize = pPageView->GetPage()->GetSize();
- aPagePos.X() += aPageSize.Width() / 2;
- aPageSize.Width() = static_cast<long>(aPageSize.Width() * 1.03);
+ aPagePos.setX( aPagePos.X() + aPageSize.Width() / 2 );
+ aPageSize.setWidth( static_cast<long>(aPageSize.Width() * 1.03) );
- aPagePos.Y() += aPageSize.Height() / 2;
- aPageSize.Height() = static_cast<long>(aPageSize.Height() * 1.03);
- aPagePos.Y() -= aPageSize.Height() / 2;
+ aPagePos.setY( aPagePos.Y() + aPageSize.Height() / 2 );
+ aPageSize.setHeight( static_cast<long>(aPageSize.Height() * 1.03) );
+ aPagePos.setY( aPagePos.Y() - aPageSize.Height() / 2 );
- aPagePos.X() -= aPageSize.Width() / 2;
+ aPagePos.setX( aPagePos.X() - aPageSize.Width() / 2 );
::tools::Rectangle aFullPageZoomRect( aPagePos, aPageSize );
aZoomItem.AddSnappingPoint( pActiveWindow->GetZoomForRect( aFullPageZoomRect ) );
@@ -597,8 +597,8 @@ void DrawViewShell::GetStatusBarState(SfxItemSet& rSet)
Point aPos = GetActiveWindow()->PixelToLogic(maMousePos);
pPageView->LogicToPagePos(aPos);
Fraction aUIScale(GetDoc()->GetUIScale());
- aPos.X() = long(aPos.X() / aUIScale);
- aPos.Y() = long(aPos.Y() / aUIScale);
+ aPos.setX( long(aPos.X() / aUIScale) );
+ aPos.setY( long(aPos.Y() / aUIScale) );
// position- and size items
if ( mpDrawView->IsAction() )
@@ -612,12 +612,12 @@ void DrawViewShell::GetStatusBarState(SfxItemSet& rSet)
{
pPageView->LogicToPagePos(aRect);
aPos = aRect.TopLeft();
- aPos.X() = long(aPos.X() / aUIScale);
- aPos.Y() = long(aPos.Y() / aUIScale);
+ aPos.setX( long(aPos.X() / aUIScale) );
+ aPos.setY( long(aPos.Y() / aUIScale) );
rSet.Put( SfxPointItem( SID_ATTR_POSITION, aPos) );
Size aSize( aRect.Right() - aRect.Left(), aRect.Bottom() - aRect.Top() );
- aSize.Height() = long(aSize.Height() / aUIScale);
- aSize.Width() = long(aSize.Width() / aUIScale);
+ aSize.setHeight( long(aSize.Height() / aUIScale) );
+ aSize.setWidth( long(aSize.Width() / aUIScale) );
rSet.Put( SvxSizeItem( SID_ATTR_SIZE, aSize) );
}
}
@@ -630,13 +630,13 @@ void DrawViewShell::GetStatusBarState(SfxItemSet& rSet)
// Show the position of the selected shape(s)
Point aShapePosition (aRect.TopLeft());
- aShapePosition.X() = long(aShapePosition.X() / aUIScale);
- aShapePosition.Y() = long(aShapePosition.Y() / aUIScale);
+ aShapePosition.setX( long(aShapePosition.X() / aUIScale) );
+ aShapePosition.setY( long(aShapePosition.Y() / aUIScale) );
rSet.Put (SfxPointItem(SID_ATTR_POSITION, aShapePosition));
Size aSize( aRect.Right() - aRect.Left(), aRect.Bottom() - aRect.Top() );
- aSize.Height() = long(aSize.Height() / aUIScale);
- aSize.Width() = long(aSize.Width() / aUIScale);
+ aSize.setHeight( long(aSize.Height() / aUIScale) );
+ aSize.setWidth( long(aSize.Width() / aUIScale) );
rSet.Put( SvxSizeItem( SID_ATTR_SIZE, aSize) );
}
else
diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx
index 4ec78e3ebb2c..2b343f7115ee 100644
--- a/sd/source/ui/view/drviewse.cxx
+++ b/sd/source/ui/view/drviewse.cxx
@@ -280,8 +280,8 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq)
::tools::Rectangle aVisArea = GetActiveWindow()->PixelToLogic(::tools::Rectangle(Point(0,0), GetActiveWindow()->GetOutputSizePixel()));
Point aObjPos(aVisArea.Center());
Size aObjSize(pNewDBField->GetLogicRect().GetSize());
- aObjPos.X() -= aObjSize.Width() / 2;
- aObjPos.Y() -= aObjSize.Height() / 2;
+ aObjPos.setX( aObjPos.X() - aObjSize.Width() / 2 );
+ aObjPos.setY( aObjPos.Y() - aObjSize.Height() / 2 );
::tools::Rectangle aNewObjectRectangle(aObjPos, aObjSize);
pNewDBField->SetLogicRect(aNewObjectRectangle);
@@ -592,8 +592,8 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq)
// calc position and size
::tools::Rectangle aVisArea = GetActiveWindow()->PixelToLogic(::tools::Rectangle(Point(0,0), GetActiveWindow()->GetOutputSizePixel()));
Point aPagePos = aVisArea.Center();
- aPagePos.X() -= nDefaultObjectSizeWidth / 2;
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list