loplugin:changetoolsgen in sfx2

Change-Id: I34a007711e2ffc70bdee6823ea9b85f60f819e6e
Reviewed-on: https://gerrit.libreoffice.org/49727
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

27 files changed, 181 insertions, 179 deletions

diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx
index aec56687d3d7..2b019f2a5a37 100644
--- a/sfx2/source/appl/childwin.cxx
+++ b/sfx2/source/appl/childwin.cxx
@@ -113,10 +113,10 @@ bool GetPosSizeFromString( const OUString& rStr, Point& rPos, Size& rSize )
         return false;
 
     sal_Int32 nIdx = 0;
-    rPos.X() = rStr.getToken(0, '/', nIdx).toInt32();
-    rPos.Y() = rStr.getToken(0, '/', nIdx).toInt32();
-    rSize.Width() = rStr.getToken(0, '/', nIdx).toInt32();
-    rSize.Height() = rStr.getToken(0, '/', nIdx).toInt32();
+    rPos.setX( rStr.getToken(0, '/', nIdx).toInt32() );
+    rPos.setY( rStr.getToken(0, '/', nIdx).toInt32() );
+    rSize.setWidth( rStr.getToken(0, '/', nIdx).toInt32() );
+    rSize.setHeight( rStr.getToken(0, '/', nIdx).toInt32() );
 
     // negative sizes are invalid
     return !(rSize.Width() < 0 || rSize.Height() < 0);
@@ -133,8 +133,8 @@ bool GetSplitSizeFromString( const OUString& rStr, Size& rSize )
         if ( nCount != 2 )
             return false;
 
-        rSize.Width() = aStr.getToken(0, ';' ).toInt32();
-        rSize.Height() = aStr.getToken(1, ';' ).toInt32();
+        rSize.setWidth( aStr.getToken(0, ';' ).toInt32() );
+        rSize.setHeight( aStr.getToken(1, ';' ).toInt32() );
 
         // negative sizes are invalid
         return !(rSize.Width() < 0 || rSize.Height() < 0);
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index e13437461fc9..1afc7258af4a 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -488,8 +488,8 @@ void IndexBox_Impl::UserDraw( const UserDrawEvent& rUDEvt )
     {
         // indent sub entries
         Point aPos( rUDEvt.GetRect().TopLeft() );
-        aPos.X() += 8;
-        aPos.Y() += (rUDEvt.GetRect().GetHeight() - rUDEvt.GetRenderContext()->GetTextHeight()) / 2;
+        aPos.setX( aPos.X() + 8 );
+        aPos.setY( aPos.Y() + (rUDEvt.GetRect().GetHeight() - rUDEvt.GetRenderContext()->GetTextHeight()) / 2 );
         OUString aEntry( GetEntry( rUDEvt.GetItemId() ) );
         sal_Int32 nPos = aEntry.indexOf( ';' );
         rUDEvt.GetRenderContext()->DrawText(aPos, (nPos !=-1) ? aEntry.copy(nPos + 1) : aEntry);
@@ -2063,7 +2063,7 @@ void SfxHelpTextWindow_Impl::InitOnStartupBox()
             sCBText += aOnStartupCB->GetText();
             long nTextWidth = aOnStartupCB->GetTextWidth( sCBText );
             Size aSize = aOnStartupCB->GetSizePixel();
-            aSize.Width() = nTextWidth;
+            aSize.setWidth( nTextWidth );
             aOnStartupCB->SetSizePixel( aSize );
             SetOnStartupBoxPosition();
         }
@@ -2073,8 +2073,8 @@ void SfxHelpTextWindow_Impl::InitOnStartupBox()
         Size aTBSize = aToolBox->GetSizePixel();
         Size aCBSize = aOnStartupCB->GetSizePixel();
         Point aPnt = aToolBox->GetPosPixel();
-        aPnt.X() += aTBSize.Width() + a3Size.Width();
-        aPnt.Y() += ( ( aTBSize.Height() - aCBSize.Height() ) / 2 );
+        aPnt.setX( aPnt.X() + aTBSize.Width() + a3Size.Width() );
+        aPnt.setY( aPnt.Y() + ( ( aTBSize.Height() - aCBSize.Height() ) / 2 ) );
         aOnStartupCB->SetPosPixel( aPnt );
         nMinPos = aPnt.X();
     }
@@ -2085,7 +2085,7 @@ void SfxHelpTextWindow_Impl::SetOnStartupBoxPosition()
 {
     long nX = std::max( GetOutputSizePixel().Width() - aOnStartupCB->GetSizePixel().Width(), nMinPos );
     Point aPos = aOnStartupCB->GetPosPixel();
-    aPos.X() = nX;
+    aPos.setX( nX );
     aOnStartupCB->SetPosPixel( aPos );
 }
 
@@ -2312,7 +2312,7 @@ void SfxHelpTextWindow_Impl::Resize()
 {
     Size aSize = GetOutputSizePixel();
     long nToolBoxHeight = aToolBox->GetSizePixel().Height() + TOOLBOX_OFFSET;
-    aSize.Height() -= nToolBoxHeight;
+    aSize.setHeight( aSize.Height() - nToolBoxHeight );
     pTextWin->SetPosSizePixel( Point( 0, nToolBoxHeight  ), aSize );
     SetOnStartupBoxPosition();
 }
@@ -2334,7 +2334,7 @@ bool SfxHelpTextWindow_Impl::PreNotify( NotifyEvent& rNEvt )
                 aPos = pCmdEvt->GetMousePosPixel();
             else
                 aPos = Point( pTextWin->GetPosPixel().X() + 20, 20 );
-            aPos.Y() += pTextWin->GetPosPixel().Y();
+            aPos.setY( aPos.Y() + pTextWin->GetPosPixel().Y() );
             ScopedVclPtrInstance<PopupMenu> aMenu;
             if ( bIsIndexOn )
                 aMenu->InsertItem(TBI_INDEX, aIndexOffText, Image(BitmapEx(BMP_HELP_TOOLBOX_INDEX_OFF)));
@@ -2667,7 +2667,7 @@ void SfxHelpWindow_Impl::MakeLayout()
             tools::Rectangle aScreenRect = pScreenWin->GetClientWindowExtentsRelative();
             Point aNewPos = aScreenRect.TopLeft();
             sal_Int32 nDiffWidth = nOldWidth - nWidth;
-            aNewPos.X() += nDiffWidth;
+            aNewPos.setX( aNewPos.X() + nDiffWidth );
             pScreenWin->SetPosPixel( aNewPos );
         }
         else if ( aWinPos.X() > 0 && aWinPos.Y() > 0 )
@@ -2731,8 +2731,8 @@ void SfxHelpWindow_Impl::LoadConfig()
             nTextSize = aUserData.getToken( 0, ';', nIdx ).toInt32();
             sal_Int32 nWidth = aUserData.getToken( 0, ';', nIdx ).toInt32();
             nHeight = aUserData.getToken( 0, ';', nIdx ).toInt32();
-            aWinPos.X() = aUserData.getToken( 0, ';', nIdx ).toInt32();
-            aWinPos.Y() = aUserData.getToken( 0, ';', nIdx ).toInt32();
+            aWinPos.setX( aUserData.getToken( 0, ';', nIdx ).toInt32() );
+            aWinPos.setY( aUserData.getToken( 0, ';', nIdx ).toInt32() );
             if ( bIndex )
             {
                 nExpandWidth = nWidth;
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index 1a2524a485f0..daaf69943ce1 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -748,60 +748,60 @@ SvBorder SfxWorkWindow::Arrange_Impl()
             case SfxChildAlignment::TOP:
             case SfxChildAlignment::TOOLBOXTOP:
             case SfxChildAlignment::LOWESTTOP:
-                aSize.Width() = aTmp.GetWidth();
+                aSize.setWidth( aTmp.GetWidth() );
                 if ( pCli->pWin->GetType() == WindowType::SPLITWINDOW )
                     aSize = static_cast<SplitWindow *>(pCli->pWin.get())->CalcLayoutSizePixel( aSize );
                 bAllowHiding = false;
                 aBorder.Top() += aSize.Height();
                 aPos = aTmp.TopLeft();
-                aTmp.Top() += aSize.Height();
+                aTmp.SetTop( aTmp.Top() + aSize.Height() );
                 if ( pCli->eAlign == SfxChildAlignment::HIGHESTTOP )
-                    aUpperClientArea.Top() += aSize.Height();
+                    aUpperClientArea.SetTop( aUpperClientArea.Top() + aSize.Height() );
                 break;
 
             case SfxChildAlignment::LOWESTBOTTOM:
             case SfxChildAlignment::BOTTOM:
             case SfxChildAlignment::TOOLBOXBOTTOM:
             case SfxChildAlignment::HIGHESTBOTTOM:
-                aSize.Width() = aTmp.GetWidth();
+                aSize.setWidth( aTmp.GetWidth() );
                 if ( pCli->pWin->GetType() == WindowType::SPLITWINDOW )
                     aSize = static_cast<SplitWindow *>(pCli->pWin.get())->CalcLayoutSizePixel( aSize );
                 aBorder.Bottom() += aSize.Height();
                 aPos = aTmp.BottomLeft();
-                aPos.Y() -= (aSize.Height()-1);
-                aTmp.Bottom() -= aSize.Height();
+                aPos.setY( aPos.Y() - (aSize.Height()-1) );
+                aTmp.SetBottom( aTmp.Bottom() - aSize.Height() );
                 if ( pCli->eAlign == SfxChildAlignment::LOWESTBOTTOM )
-                    aUpperClientArea.Bottom() -= aSize.Height();
+                    aUpperClientArea.SetBottom( aUpperClientArea.Bottom() - aSize.Height() );
                 break;
 
             case SfxChildAlignment::FIRSTLEFT:
             case SfxChildAlignment::LEFT:
             case SfxChildAlignment::LASTLEFT:
             case SfxChildAlignment::TOOLBOXLEFT:
-                aSize.Height() = aTmp.GetHeight();
+                aSize.setHeight( aTmp.GetHeight() );
                 if ( pCli->pWin->GetType() == WindowType::SPLITWINDOW )
                     aSize = static_cast<SplitWindow *>(pCli->pWin.get())->CalcLayoutSizePixel( aSize );
                 bAllowHiding = false;
                 aBorder.Left() += aSize.Width();
                 aPos = aTmp.TopLeft();
-                aTmp.Left() += aSize.Width();
+                aTmp.SetLeft( aTmp.Left() + aSize.Width() );
                 if ( pCli->eAlign != SfxChildAlignment::TOOLBOXLEFT )
-                    aUpperClientArea.Left() += aSize.Width();
+                    aUpperClientArea.SetLeft( aUpperClientArea.Left() + aSize.Width() );
                 break;
 
             case SfxChildAlignment::FIRSTRIGHT:
             case SfxChildAlignment::RIGHT:
             case SfxChildAlignment::LASTRIGHT:
             case SfxChildAlignment::TOOLBOXRIGHT:
-                aSize.Height() = aTmp.GetHeight();
+                aSize.setHeight( aTmp.GetHeight() );
                 if ( pCli->pWin->GetType() == WindowType::SPLITWINDOW )
                     aSize = static_cast<SplitWindow *>(pCli->pWin.get())->CalcLayoutSizePixel( aSize );
                 aBorder.Right() += aSize.Width();
                 aPos = aTmp.TopRight();
-                aPos.X() -= (aSize.Width()-1);
-                aTmp.Right() -= aSize.Width();
+                aPos.setX( aPos.X() - (aSize.Width()-1) );
+                aTmp.SetRight( aTmp.Right() - aSize.Width() );
                 if ( pCli->eAlign != SfxChildAlignment::TOOLBOXRIGHT )
-                    aUpperClientArea.Right() -= aSize.Width();
+                    aUpperClientArea.SetRight( aUpperClientArea.Right() - aSize.Width() );
                 break;
 
             default:
@@ -822,26 +822,28 @@ SvBorder SfxWorkWindow::Arrange_Impl()
 
     if ( aClientArea.GetWidth() >= aBorder.Left() + aBorder.Right() )
     {
-        aClientArea.Left() += aBorder.Left();
-        aClientArea.Right() -= aBorder.Right();
+        aClientArea.SetLeft( aClientArea.Left() + aBorder.Left() );
+        aClientArea.SetRight( aClientArea.Right() - aBorder.Right() );
     }
     else
     {
         aBorder.Left() = aClientArea.Left();
         aBorder.Right() = aClientArea.Right();
-        aClientArea.Right() = aClientArea.Left() = aTmp.Left();
+        aClientArea.SetRight( aTmp.Left() );
+        aClientArea.SetLeft( aTmp.Left() );
     }
 
     if ( aClientArea.GetHeight() >= aBorder.Top() + aBorder.Bottom() )
     {
-        aClientArea.Top() += aBorder.Top();
-        aClientArea.Bottom() -= aBorder.Bottom();
+        aClientArea.SetTop( aClientArea.Top() + aBorder.Top() );
+        aClientArea.SetBottom( aClientArea.Bottom() - aBorder.Bottom() );
     }
     else
     {
         aBorder.Top() = aClientArea.Top();
         aBorder.Bottom() = aClientArea.Bottom();
-        aClientArea.Top() = aClientArea.Bottom() = aTmp.Top();
+        aClientArea.SetTop( aTmp.Top() );
+        aClientArea.SetBottom( aTmp.Top() );
     }
 
     return IsDockingAllowed() ? aBorder : SvBorder();
@@ -1594,66 +1596,66 @@ void SfxWorkWindow::ConfigChild_Impl(SfxChildIdentifier eChild,
                     {
                         case SfxChildAlignment::TOP:
                             // Object-Toolboxes come always last
-                                aInnerRect.Top() += pCli->aSize.Height();
+                                aInnerRect.SetTop( aInnerRect.Top() + pCli->aSize.Height() );
                             break;
 
                         case SfxChildAlignment::HIGHESTTOP:
                             // Always performed first
-                            aInnerRect.Top() += pCli->aSize.Height();
+                            aInnerRect.SetTop( aInnerRect.Top() + pCli->aSize.Height() );
                             break;
 
                         case SfxChildAlignment::LOWESTTOP:
                             // Is only counted if it is the current window
                             if ( i == nPos )
-                                aInnerRect.Top() += pCli->aSize.Height();
+                                aInnerRect.SetTop( aInnerRect.Top() + pCli->aSize.Height() );
                             break;
 
                         case SfxChildAlignment::BOTTOM:
                             // Object-Toolboxes come always last
-                                aInnerRect.Bottom() -= pCli->aSize.Height();
+                                aInnerRect.SetBottom( aInnerRect.Bottom() - pCli->aSize.Height() );
                             break;
 
                         case SfxChildAlignment::LOWESTBOTTOM:
                             // Always performed first
-                            aInnerRect.Bottom() -= pCli->aSize.Height();
+                            aInnerRect.SetBottom( aInnerRect.Bottom() - pCli->aSize.Height() );
                             break;
 
                         case SfxChildAlignment::HIGHESTBOTTOM:
                             // Is only counted if it is the current window
                             if ( i == nPos )
-                                aInnerRect.Bottom() -= pCli->aSize.Height();
+                                aInnerRect.SetBottom( aInnerRect.Bottom() - pCli->aSize.Height() );
                             break;
 
                         case SfxChildAlignment::LEFT:
                             // Toolboxes come always last
-                                aInnerRect.Left() += pCli->aSize.Width();
+                                aInnerRect.SetLeft( aInnerRect.Left() + pCli->aSize.Width() );
                             break;
 
                         case SfxChildAlignment::FIRSTLEFT:
                             // Always performed first
-                            aInnerRect.Left() += pCli->aSize.Width();
+                            aInnerRect.SetLeft( aInnerRect.Left() + pCli->aSize.Width() );
                             break;
 
                         case SfxChildAlignment::LASTLEFT:
                             // Is only counted if it is the current window
                             if (i == nPos)
-                                aInnerRect.Left() += pCli->aSize.Width();
+                                aInnerRect.SetLeft( aInnerRect.Left() + pCli->aSize.Width() );
                             break;
 
                         case SfxChildAlignment::RIGHT:
                             // Toolboxes come always last
-                                aInnerRect.Right() -= pCli->aSize.Width();
+                                aInnerRect.SetRight( aInnerRect.Right() - pCli->aSize.Width() );
                             break;
 
                         case SfxChildAlignment::FIRSTRIGHT:
                             // Is only counted if it is the current window
                             if (i == nPos)
-                                aInnerRect.Right() -= pCli->aSize.Width();
+                                aInnerRect.SetRight( aInnerRect.Right() - pCli->aSize.Width() );
                             break;
 
                         case SfxChildAlignment::LASTRIGHT:
                             // Always performed first
-                            aInnerRect.Right() -= pCli->aSize.Width();
+                            aInnerRect.SetRight( aInnerRect.Right() - pCli->aSize.Width() );
                             break;
 
                         default:
@@ -2358,40 +2360,40 @@ void SfxWorkWindow::ArrangeAutoHideWindows( SfxSplitWindow *pActSplitWin )
                 // Left SplitWindow
                 // Get the width of the Window yourself, if no DummyWindow
                 if ( !bDummyWindow )
-                    aSize.Width() = pSplitWin->GetSizePixel().Width();
+                    aSize.setWidth( pSplitWin->GetSizePixel().Width() );
 
                 // If a Window is visible to the left, then the free region
                 // starts to the right from it, for example at the Client area
                 long nLeft = aPos.X() + aSize.Width();
                 if ( nLeft > aArea.Left() )
-                    aArea.Left() = nLeft;
+                    aArea.SetLeft( nLeft );
                 break;
             }
             case 1 :
             {
                 // Right SplitWindow
                 // Position to correct the difference of the widths
-                aPos.X() += aSize.Width();
+                aPos.setX( aPos.X() + aSize.Width() );
 
                 // Get the width of the Window yourself, if no DummyWindow
                 if ( !bDummyWindow )
-                    aSize.Width() = pSplitWin->GetSizePixel().Width();
+                    aSize.setWidth( pSplitWin->GetSizePixel().Width() );
 
-                aPos.X() -= aSize.Width();
+                aPos.setX( aPos.X() - aSize.Width() );
 
                 // If already a window is opened at the left side, then the
                 // right is not allowed to overlap this one.
                 if ( aPos.X() < aArea.Left() )
                 {
-                    aPos.X() = aArea.Left();
-                    aSize.Width() = aArea.GetWidth();
+                    aPos.setX( aArea.Left() );
+                    aSize.setWidth( aArea.GetWidth() );
                 }
 
                 // If a Window is visible to the right, then the free region
                 // starts to the left from it, for example at the Client area
                 long nRight = aPos.X();
                 if ( nRight < aArea.Right() )
-                    aArea.Right() = nRight;
+                    aArea.SetRight( nRight );
                 break;
             }
             case 2 :
@@ -2399,44 +2401,44 @@ void SfxWorkWindow::ArrangeAutoHideWindows( SfxSplitWindow *pActSplitWin )
                 // Top SplitWindow
                 // Get the height of the Window yourself, if no DummyWindow
                 if ( !bDummyWindow )
-                    aSize.Height() = pSplitWin->GetSizePixel().Height();
+                    aSize.setHeight( pSplitWin->GetSizePixel().Height() );
 
 
                 // Adjust width with regard to if a Window is already open
                 // to the left or right
-                aPos.X() = aArea.Left();
-                aSize.Width() = aArea.GetWidth();
+                aPos.setX( aArea.Left() );
+                aSize.setWidth( aArea.GetWidth() );
 
                 // If a Window is visible at the top, then the free region
                 // starts beneath it, for example at the Client area
                 long nTop = aPos.Y() + aSize.Height();
                 if ( nTop > aArea.Top() )
-                    aArea.Top() = nTop;
+                    aArea.SetTop( nTop );
                 break;
             }
             case 3 :
             {
                 // The bottom SplitWindow
                 // Position to correct the difference of the heights
-                aPos.Y() += aSize.Height();
+                aPos.setY( aPos.Y() + aSize.Height() );
 
                 // Get the height of the Window yourself, if no DummyWindow
                 if ( !bDummyWindow )
-                    aSize.Height() = pSplitWin->GetSizePixel().Height();
+                    aSize.setHeight( pSplitWin->GetSizePixel().Height() );
 
-                aPos.Y() -= aSize.Height();
+                aPos.setY( aPos.Y() - aSize.Height() );
 
                 // Adjust width with regard to if a Window is already open
                 // to the left or right.
-                aPos.X() = aArea.Left();
-                aSize.Width() = aArea.GetWidth();
+                aPos.setX( aArea.Left() );
+                aSize.setWidth( aArea.GetWidth() );
 
                 // If already a window is opened at the top, then the
                 // bottom one is not allowed to overlap this one.
                 if ( aPos.Y() < aArea.Top() )
                 {
-                    aPos.Y() = aArea.Top();
-                    aSize.Height() = aArea.GetHeight();
+                    aPos.setY( aArea.Top() );
+                    aSize.setHeight( aArea.GetHeight() );
                 }
 
                 break;
@@ -2467,16 +2469,16 @@ tools::Rectangle SfxWorkWindow::GetFreeArea( bool bAutoHide ) const
             switch ( n )
             {
                 case 0 :
-                    aArea.Left() += aSize.Width();
+                    aArea.SetLeft( aArea.Left() + aSize.Width() );
                     break;
                 case 1 :
-                    aArea.Right() -= aSize.Width();
+                    aArea.SetRight( aArea.Right() - aSize.Width() );
                     break;
                 case 2 :
-                    aArea.Top() += aSize.Height();
+                    aArea.SetTop( aArea.Top() + aSize.Height() );
                     break;
                 case 3 :
-                    aArea.Bottom() -= aSize.Height();
+                    aArea.SetBottom( aArea.Bottom() - aSize.Height() );
                     break;
             }
         }
diff --git a/sfx2/source/bastyp/frmhtml.cxx b/sfx2/source/bastyp/frmhtml.cxx
index 1ca43cd67bdb..5bcf59dfb167 100644
--- a/sfx2/source/bastyp/frmhtml.cxx
+++ b/sfx2/source/bastyp/frmhtml.cxx
@@ -67,17 +67,17 @@ void SfxFrameHTMLParser::ParseFrameOptions(
             pFrame->SetName( rOption.GetString() );
             break;
         case HtmlOptionId::MARGINWIDTH:
-            aMargin.Width() = rOption.GetNumber();
+            aMargin.setWidth( rOption.GetNumber() );
 
             if( !bMarginHeight )
-                aMargin.Height() = 0;
+                aMargin.setHeight( 0 );
             bMarginWidth = true;
             break;
         case HtmlOptionId::MARGINHEIGHT:
-            aMargin.Height() = rOption.GetNumber();
+            aMargin.setHeight( rOption.GetNumber() );
 
             if( !bMarginWidth )
-                aMargin.Width() = 0;
+                aMargin.setWidth( 0 );
             bMarginHeight = true;
             break;
         case HtmlOptionId::SCROLLING:
diff --git a/sfx2/source/control/charwin.cxx b/sfx2/source/control/charwin.cxx
index 9d0f45e4ae62..82e69b33b489 100644
--- a/sfx2/source/control/charwin.cxx
+++ b/sfx2/source/control/charwin.cxx
@@ -160,7 +160,7 @@ void SvxCharView::Paint(vcl::RenderContext& rRenderContext, const ::tools::Recta
         if (nAvailWidth > nTextWidth)
             break;
         vcl::Font aFont(aOrigFont);
-        aFontSize.Height() = nFontHeight;
+        aFontSize.setHeight( nFontHeight );
         aFont.SetFontSize(aFontSize);
         rRenderContext.SetFont(aFont);
         mnY = (nWinHeight - GetTextHeight()) / 2;
@@ -170,7 +170,7 @@ void SvxCharView::Paint(vcl::RenderContext& rRenderContext, const ::tools::Recta
     Point aPoint(2, mnY);
 
     if (!bGotBoundary)
-        aPoint.X() = (aSize.Width() - rRenderContext.GetTextWidth(aText)) / 2;
+        aPoint.setX( (aSize.Width() - rRenderContext.GetTextWidth(aText)) / 2 );
     else
     {
         // adjust position
@@ -180,12 +180,12 @@ void SvxCharView::Paint(vcl::RenderContext& rRenderContext, const ::tools::Recta
         int nYLDelta = aBoundRect.Top();
         int nYHDelta = aSize.Height() - aBoundRect.Bottom();
         if( nYLDelta <= 0 )
-            aPoint.Y() -= nYLDelta - 1;
+            aPoint.setY( aPoint.Y() - nYLDelta - 1 );
         else if( nYHDelta <= 0 )
-            aPoint.Y() += nYHDelta - 1;
+            aPoint.setY( aPoint.Y() + nYHDelta - 1 );
 
         // centrally align glyph
-        aPoint.X() = -aBoundRect.Left() + (aSize.Width() - aBoundRect.GetWidth()) / 2;
+        aPoint.setX( -aBoundRect.Left() + (aSize.Width() - aBoundRect.GetWidth()) / 2 );
     }
 
     if (HasFocus())
diff --git a/sfx2/source/control/emojiviewitem.cxx b/sfx2/source/control/emojiviewitem.cxx
index 1408d8d215a7..6a5d7987f980 100644
--- a/sfx2/source/control/emojiviewitem.cxx
+++ b/sfx2/source/control/emojiviewitem.cxx
@@ -53,8 +53,8 @@ void EmojiViewItem::calculateItemsPosition (const long /*nThumbnailHeight*/, con
     Point aPos = maDrawArea.TopLeft();
 
     // Calculate text position
-    aPos.Y() = maDrawArea.getY() + (aRectSize.Height() - aTextDev.getTextHeight())/3;
-    aPos.X() = maDrawArea.Left() + (aRectSize.Width() - aTextDev.getTextWidth(maTitle,0,nMaxTextLength))/2;
+    aPos.setY( maDrawArea.getY() + (aRectSize.Height() - aTextDev.getTextHeight())/3 );
+    aPos.setX( maDrawArea.Left() + (aRectSize.Width() - aTextDev.getTextWidth(maTitle,0,nMaxTextLength))/2 );
     maTextPos = aPos;
 }
 
diff --git a/sfx2/source/control/templatelocalview.cxx b/sfx2/source/control/templatelocalview.cxx
index 76a44a02d65b..ec4321606bfb 100644
--- a/sfx2/source/control/templatelocalview.cxx
+++ b/sfx2/source/control/templatelocalview.cxx
@@ -951,10 +951,10 @@ BitmapEx TemplateLocalView::scaleImg (const BitmapEx &rImg, long width, long hei
         Size aSize = rImg.GetSizePixel();
 
         if (aSize.Width() == 0)
-            aSize.Width() = 1;
+            aSize.setWidth( 1 );
 
         if (aSize.Height() == 0)
-            aSize.Height() = 1;
+            aSize.setHeight( 1 );
 
         // make the picture fit the given width/height constraints
         double nRatio = std::min(double(width)/double(aSize.Width()), double(height)/double(aSize.Height()));
diff --git a/sfx2/source/control/thumbnailviewitem.cxx b/sfx2/source/control/thumbnailviewitem.cxx
index 852e091ef909..a59d2377884b 100644
--- a/sfx2/source/control/thumbnailviewitem.cxx
+++ b/sfx2/source/control/thumbnailviewitem.cxx
@@ -134,13 +134,13 @@ void ThumbnailViewItem::calculateItemsPosition (const long nThumbnailHeight, con
 
     // Calculate thumbnail position
     Point aPos = maDrawArea.TopLeft();
-    aPos.X() = maDrawArea.getX() + (aRectSize.Width()-aImageSize.Width())/2;
-    aPos.Y() = maDrawArea.getY() + nPadding + (nThumbnailHeight-aImageSize.Height())/2;
+    aPos.setX( maDrawArea.getX() + (aRectSize.Width()-aImageSize.Width())/2 );
+    aPos.setY( maDrawArea.getY() + nPadding + (nThumbnailHeight-aImageSize.Height())/2 );
     maPrev1Pos = aPos;
 
     // Calculate text position
-    aPos.Y() = maDrawArea.getY() + nThumbnailHeight + nPadding * 2;
-    aPos.X() = maDrawArea.Left() + (aRectSize.Width() - aTextDev.getTextWidth(maTitle,0,nMaxTextLength))/2;
+    aPos.setY( maDrawArea.getY() + nThumbnailHeight + nPadding * 2 );
+    aPos.setX( maDrawArea.Left() + (aRectSize.Width() - aTextDev.getTextWidth(maTitle,0,nMaxTextLength))/2 );
     maTextPos = aPos;
 }
 
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index 02533e4fb22e..76f181536e44 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -230,23 +230,23 @@ void SfxModelessDialog::StateChanged( StateChangedType nStateChange )
 
                 Size aParentSize = GetParent()->GetOutputSizePixel();
                 Size aDlgSize = GetSizePixel();
-                aPos.X() += ( aParentSize.Width() - aDlgSize.Width() ) / 2;
-                aPos.Y() += ( aParentSize.Height() - aDlgSize.Height() ) / 2;
+                aPos.setX( aPos.X() + ( aParentSize.Width() - aDlgSize.Width() ) / 2 );
+                aPos.setY( aPos.Y() + ( aParentSize.Height() - aDlgSize.Height() ) / 2 );
 
                 Point aPoint;
                 tools::Rectangle aRect = GetDesktopRectPixel();
-                aPoint.X() = aRect.Right() - aDlgSize.Width();
-                aPoint.Y() = aRect.Bottom() - aDlgSize.Height();
+                aPoint.setX( aRect.Right() - aDlgSize.Width() );
+                aPoint.setY( aRect.Bottom() - aDlgSize.Height() );
 
                 aPoint = OutputToScreenPixel( aPoint );
 
                 if ( aPos.X() > aPoint.X() )
-                    aPos.X() = aPoint.X() ;
+                    aPos.setX( aPoint.X() ) ;
                 if ( aPos.Y() > aPoint.Y() )
-                    aPos.Y() = aPoint.Y();
+                    aPos.setY( aPoint.Y() );
 
-                if ( aPos.X() < 0 ) aPos.X() = 0;
-                if ( aPos.Y() < 0 ) aPos.Y() = 0;
+                if ( aPos.X() < 0 ) aPos.setX( 0 );
+                if ( aPos.Y() < 0 ) aPos.setY( 0 );
 
                 SetPosPixel( aPos );
             }
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 2de97e9910d0..ebd4c8f37250 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -1393,7 +1393,7 @@ void CustomPropertiesYesNoButton::Resize()
     Size aSize(nNewWidth, m_aYesButton->get_preferred_size().Height());
     Point aPos(n1Width, (aParentSize.Height() - aSize.Height()) / 2);
     m_aYesButton->SetPosSizePixel(aPos, aSize);
-    aPos.X() += aSize.Width() + n3Width;
+    aPos.setX( aPos.X() + aSize.Width() + n3Width );
     m_aNoButton->SetPosSizePixel(aPos, aSize);
 }
 
diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx
index d1caedf86848..117511d4d544 100644
--- a/sfx2/source/dialog/dockwin.cxx
+++ b/sfx2/source/dialog/dockwin.cxx
@@ -697,7 +697,7 @@ bool SfxDockingWindow::Docking( const Point& rPos, tools::Rectangle& rRect )
             case SfxChildAlignment::LASTLEFT:
                 aPos = aInnerRect.TopLeft();
                 if ( pImpl->GetDockAlignment() == GetAlignment() )
-                    aPos.X() -= aSize.Width();
+                    aPos.setX( aPos.X() - aSize.Width() );
                 break;
 
             case SfxChildAlignment::TOP:
@@ -705,7 +705,7 @@ bool SfxDockingWindow::Docking( const Point& rPos, tools::Rectangle& rRect )
             case SfxChildAlignment::HIGHESTTOP:
                 aPos = Point(aOuterRect.Left(), aInnerRect.Top());
                 if ( pImpl->GetDockAlignment() == GetAlignment() )
-                    aPos.Y() -= aSize.Height();
+                    aPos.setY( aPos.Y() - aSize.Height() );
                 break;
 
             case SfxChildAlignment::RIGHT:
@@ -714,7 +714,7 @@ bool SfxDockingWindow::Docking( const Point& rPos, tools::Rectangle& rRect )
                 aPos = Point(aInnerRect.Right() - rRect.GetSize().Width(),
                             aInnerRect.Top());
                 if ( pImpl->GetDockAlignment() == GetAlignment() )
-                    aPos.X() += aSize.Width();
+                    aPos.setX( aPos.X() + aSize.Width() );
                 break;
 
             case SfxChildAlignment::BOTTOM:
@@ -723,7 +723,7 @@ bool SfxDockingWindow::Docking( const Point& rPos, tools::Rectangle& rRect )
                 aPos = Point(aOuterRect.Left(),
                         aInnerRect.Bottom() - rRect.GetSize().Height());
                 if ( pImpl->GetDockAlignment() == GetAlignment() )
-                    aPos.Y() += aSize.Height();
+                    aPos.setY( aPos.Y() + aSize.Height() );
                 break;
                      default:
                          break;
@@ -862,9 +862,9 @@ void SfxDockingWindow::Initialize(SfxChildWinInfo *pInfo)
         Size aMinSize( GetMinOutputSizePixel() );
         SetFloatingSize( pImpl->aSplitSize );
         if ( pImpl->aSplitSize.Width() < aMinSize.Width() )
-            pImpl->aSplitSize.Width() = aMinSize.Width();
+            pImpl->aSplitSize.setWidth( aMinSize.Width() );
         if ( pImpl->aSplitSize.Height() < aMinSize.Height() )
-            pImpl->aSplitSize.Height() = aMinSize.Height();
+            pImpl->aSplitSize.setHeight( aMinSize.Height() );
     }
 
     bool bVertHorzRead( false );
@@ -1162,9 +1162,9 @@ SfxChildAlignment SfxDockingWindow::CalcAlignment(const Point& rPos, tools::Rect
         // take the smaller size of docked and floating mode
         Size aSize = pImpl->aSplitSize;
         if ( GetFloatingSize().Height() < aSize.Height() )
-            aSize.Height() = GetFloatingSize().Height();
+            aSize.setHeight( GetFloatingSize().Height() );
         if ( GetFloatingSize().Width() < aSize.Width() )
-            aSize.Width() = GetFloatingSize().Width();
+            aSize.setWidth( GetFloatingSize().Width() );
 
         nLRBorder = aSize.Width();
         nTBBorder = aSize.Height();
@@ -1184,13 +1184,13 @@ SfxChildAlignment SfxDockingWindow::CalcAlignment(const Point& rPos, tools::Rect
     // shrink area for floating mode if possible
     tools::Rectangle aInRect = GetInnerRect();
     if ( aInRect.GetWidth() > nLRBorder )
-        aInRect.Left()   += nLRBorder/2;
+        aInRect.SetLeft( aInRect.Left() + nLRBorder/2 );
     if ( aInRect.GetWidth() > nLRBorder )
-        aInRect.Right()  -= nLRBorder/2;
+        aInRect.SetRight( aInRect.Right() - nLRBorder/2 );
     if ( aInRect.GetHeight() > nTBBorder )
-        aInRect.Top()    += nTBBorder/2;
+        aInRect.SetTop( aInRect.Top() + nTBBorder/2 );
     if ( aInRect.GetHeight() > nTBBorder )
-        aInRect.Bottom() -= nTBBorder/2;
+        aInRect.SetBottom( aInRect.Bottom() - nTBBorder/2 );
 
     // calculate alignment resulting from docking rectangle
     bool bBecomesFloating = false;
@@ -1220,8 +1220,8 @@ SfxChildAlignment SfxDockingWindow::CalcAlignment(const Point& rPos, tools::Rect
         tools::Rectangle aSmallDockingRect;
         aSmallDockingRect.SetSize( Size( MAX_TOGGLEAREA_WIDTH, MAX_TOGGLEAREA_HEIGHT ) );
         Point aNewPos(rPos);
-        aNewPos.X() -= aSmallDockingRect.GetWidth()/2;
-        aNewPos.Y() -= aSmallDockingRect.GetHeight()/2;
+        aNewPos.setX( aNewPos.X() - aSmallDockingRect.GetWidth()/2 );
+        aNewPos.setY( aNewPos.Y() - aSmallDockingRect.GetHeight()/2 );
         aSmallDockingRect.SetPos(rPos);
         tools::Rectangle aIntersectRect = aInRect.GetIntersection( aSmallDockingRect );
         if ( aIntersectRect == aSmallDockingRect )
@@ -1384,8 +1384,8 @@ SfxChildAlignment SfxDockingWindow::CalcAlignment(const Point& rPos, tools::Rect
             if ( pImpl->bNewLine )
             {
                 // set height to height of free area
-                aSize.Height() = aInnerSize.Height();
-                aSize.Width() = pImpl->nHorizontalSize;
+                aSize.setHeight( aInnerSize.Height() );
+                aSize.setWidth( pImpl->nHorizontalSize );
                 if ( eDockAlign == SfxChildAlignment::LEFT )
                 {
                     aPoint = aInnerRect.TopLeft();
@@ -1393,14 +1393,14 @@ SfxChildAlignment SfxDockingWindow::CalcAlignment(const Point& rPos, tools::Rect
                 else
                 {
                     aPoint = aInnerRect.TopRight();
-                    aPoint.X() -= aSize.Width();
+                    aPoint.setX( aPoint.X() - aSize.Width() );
                 }
             }
             else
             {
                 // get width from splitwindow
-                aSize.Width() = pSplitWin->GetLineSize(nLine);
-                aSize.Height() = pImpl->aSplitSize.Height();
+                aSize.setWidth( pSplitWin->GetLineSize(nLine) );
+                aSize.setHeight( pImpl->aSplitSize.Height() );
             }
         }
         else
@@ -1408,8 +1408,8 @@ SfxChildAlignment SfxDockingWindow::CalcAlignment(const Point& rPos, tools::Rect
             if ( pImpl->bNewLine )
             {
                 // set width to width of free area
-                aSize.Width() = aInnerSize.Width();
-                aSize.Height() = pImpl->nVerticalSize;
+                aSize.setWidth( aInnerSize.Width() );
+                aSize.setHeight( pImpl->nVerticalSize );
                 if ( eDockAlign == SfxChildAlignment::TOP )
                 {
                     aPoint = aInnerRect.TopLeft();
@@ -1417,14 +1417,14 @@ SfxChildAlignment SfxDockingWindow::CalcAlignment(const Point& rPos, tools::Rect
                 else
                 {
                     aPoint = aInnerRect.BottomLeft();
-                    aPoint.Y() -= aSize.Height();
+                    aPoint.setY( aPoint.Y() - aSize.Height() );
                 }
             }
             else
             {
                 // get height from splitwindow
-                aSize.Height() = pSplitWin->GetLineSize(nLine);
-                aSize.Width() = pImpl->aSplitSize.Width();
+                aSize.setHeight( pSplitWin->GetLineSize(nLine) );
+                aSize.setWidth( pImpl->aSplitSize.Width() );
             }
         }
 
@@ -1450,7 +1450,7 @@ SfxChildAlignment SfxDockingWindow::CalcAlignment(const Point& rPos, tools::Rect
                 case SfxChildAlignment::LASTRIGHT:
                 {
                     Point aPt( aInnerRect.TopRight() );
-                    aPt.X() -= aDockingRect.GetWidth();
+                    aPt.setX( aPt.X() - aDockingRect.GetWidth() );
                     aDockingRect.SetPos( aPt );
                     aDockingRect.SetSize( aVerticalSize );
                     break;
@@ -1467,7 +1467,7 @@ SfxChildAlignment SfxDockingWindow::CalcAlignment(const Point& rPos, tools::Rect
                 case SfxChildAlignment::HIGHESTBOTTOM:
                 {
                     Point aPt( aInnerRect.BottomLeft() );
-                    aPt.Y() -= aDockingRect.GetHeight();
+                    aPt.setY( aPt.Y() - aDockingRect.GetHeight() );
                     aDockingRect.SetPos( aPt );
                     aDockingRect.SetSize( aHorizontalSize );
                     break;
@@ -1506,7 +1506,7 @@ Size SfxDockingWindow::CalcDockingSize(SfxChildAlignment eAlign)
         case SfxChildAlignment::HIGHESTTOP:
         case SfxChildAlignment::LOWESTBOTTOM:
         case SfxChildAlignment::HIGHESTBOTTOM:
-            aSize.Width() = aOuterRect.Right() - aOuterRect.Left();
+            aSize.setWidth( aOuterRect.Right() - aOuterRect.Left() );
             break;
         case SfxChildAlignment::LEFT:
         case SfxChildAlignment::RIGHT:
@@ -1514,7 +1514,7 @@ Size SfxDockingWindow::CalcDockingSize(SfxChildAlignment eAlign)
         case SfxChildAlignment::LASTLEFT:
         case SfxChildAlignment::FIRSTRIGHT:
         case SfxChildAlignment::LASTRIGHT:
-            aSize.Height() = aInnerRect.Bottom() - aInnerRect.Top();
+            aSize.setHeight( aInnerRect.Bottom() - aInnerRect.Top() );
             break;
         case SfxChildAlignment::NOALIGNMENT:
             break;
@@ -1567,28 +1567,28 @@ void SfxDockingWindow::Paint(vcl::RenderContext& rRenderContext, const tools::Re
         case SfxChildAlignment::TOP:
         {
             rRenderContext.DrawLine(aRect.BottomLeft(), aRect.BottomRight());
-            aRect.Bottom()--;
+            aRect.SetBottom( --aRect.Bottom() );
             break;
         }
 
         case SfxChildAlignment::BOTTOM:
         {
             rRenderContext.DrawLine(aRect.TopLeft(), aRect.TopRight());
-            aRect.Top()++;
+            aRect.SetTop( ++aRect.Top() );
             break;
         }
 
         case SfxChildAlignment::LEFT:
         {
             rRenderContext.DrawLine(aRect.TopRight(), aRect.BottomRight());
-            aRect.Right()--;
+            aRect.SetRight( --aRect.Right() );
             break;
         }
 
         case SfxChildAlignment::RIGHT:
         {
             rRenderContext.DrawLine(aRect.TopLeft(), aRect.BottomLeft());
-            aRect.Left()++;
+            aRect.SetLeft( ++aRect.Left() );
             break;
         }
 
diff --git a/sfx2/source/dialog/recfloat.cxx b/sfx2/source/dialog/recfloat.cxx
index eb3d34176757..539589e62b53 100644
--- a/sfx2/source/dialog/recfloat.cxx
+++ b/sfx2/source/dialog/recfloat.cxx
@@ -108,8 +108,8 @@ void SfxRecordingFloat_Impl::StateChanged( StateChangedType nStateChange )
 
         Point aPoint = pEditWin->OutputToScreenPixel( pEditWin->GetPosPixel() );
         aPoint = GetParent()->ScreenToOutputPixel( aPoint );
-        aPoint.X() += 20;
-        aPoint.Y() += 10;
+        aPoint.setX( aPoint.X() + 20 );
+        aPoint.setY( aPoint.Y() + 10 );
         SetPosPixel( aPoint );
     }
 
diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx
index 4ca909d50142..456e7abf213e 100644
--- a/sfx2/source/dialog/splitwin.cxx
+++ b/sfx2/source/dialog/splitwin.cxx
@@ -134,11 +134,11 @@ void SfxEmptySplitWin_Impl::Actualize()
     {
         case WindowAlign::Left:
         case WindowAlign::Right:
-            aSize.Width() = GetFadeInSize();
+            aSize.setWidth( GetFadeInSize() );
             break;
         case WindowAlign::Top:
         case WindowAlign::Bottom:
-            aSize.Height() = GetFadeInSize();
+            aSize.setHeight( GetFadeInSize() );
             break;
     }
 
@@ -397,13 +397,13 @@ void SfxSplitWindow::Split()
 
             if ( IsHorizontal() )
             {
-                aSize.Width()  = nSize;
-                aSize.Height() = nSetSize;
+                aSize.setWidth( nSize );
+                aSize.setHeight( nSetSize );
             }
             else
             {
-                aSize.Width()  = nSetSize;
-                aSize.Height() = nSize;
+                aSize.setWidth( nSetSize );
+                aSize.setHeight( nSize );
             }
 
             rD.pWin->SetItemSize_Impl( aSize );
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index a25f4685c4e7..de2cf05e7743 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -374,8 +374,8 @@ void SfxTemplatePanelControl::StateChanged( StateChangedType nStateChange )
         Point aPoint = pEditWin->OutputToScreenPixel( pEditWin->GetPosPixel() );
         aPoint = GetParent()->ScreenToOutputPixel( aPoint );
         Size aWinSize = GetSizePixel();
-        aPoint.X() += aSize.Width() - aWinSize.Width() - 20;
-        aPoint.Y() += aSize.Height() / 2 - aWinSize.Height() / 2;
+        aPoint.setX( aPoint.X() + aSize.Width() - aWinSize.Width() - 20 );
+        aPoint.setY( aPoint.Y() + aSize.Height() / 2 - aWinSize.Height() / 2 );
         // SetFloatingPos( aPoint );
     }
 
@@ -2310,7 +2310,7 @@ void SfxTemplateDialog_Impl::Resize()
             pTreeBox->SetPosPixel(aFmtPos);
     }
     else
-        aFmtSize.Height() += aFilterSize.Height();
+        aFmtSize.setHeight( aFmtSize.Height() + aFilterSize.Height() );
 
     aFilterLb->SetSizePixel(aFilterSize);
     aFmtLb->SetSizePixel( aFmtSize );
diff --git a/sfx2/source/dialog/titledockwin.cxx b/sfx2/source/dialog/titledockwin.cxx
index 36ca2572d6e7..f8d621bee9a0 100644
--- a/sfx2/source/dialog/titledockwin.cxx
+++ b/sfx2/source/dialog/titledockwin.cxx
@@ -122,7 +122,7 @@ namespace sfx2
         // Place the content window.
         if ( m_nTitleBarHeight < aToolBoxSize.Height() )
             m_nTitleBarHeight = aToolBoxSize.Height();
-        aWindowSize.Height() -= m_nTitleBarHeight;
+        aWindowSize.setHeight( aWindowSize.Height() - m_nTitleBarHeight );
         m_aContentWindow->SetPosSizePixel(
             Point( m_aBorder.Left(), m_nTitleBarHeight + m_aBorder.Top() ),
             Size(
@@ -200,7 +200,7 @@ namespace sfx2
 
         // Paint title bar text.
         rRenderContext.SetLineColor(rStyleSettings.GetActiveTextColor());
-        aTitleBarBox.Left() += 3;
+        aTitleBarBox.SetLeft( aTitleBarBox.Left() + 3 );
         rRenderContext.DrawText(aTitleBarBox,
                                 !m_sTitle.isEmpty() ? m_sTitle : GetText(),
                                 DrawTextFlags::Left | DrawTextFlags::VCenter | DrawTextFlags::MultiLine | DrawTextFlags::WordBreak);
diff --git a/sfx2/source/doc/iframe.cxx b/sfx2/source/doc/iframe.cxx
index 5f0837000902..4e111a759dd6 100644
--- a/sfx2/source/doc/iframe.cxx
+++ b/sfx2/source/doc/iframe.cxx
@@ -297,7 +297,7 @@ void SAL_CALL IFrameObject::setPropertyValue(const OUString& aPropertyName, cons
         Size aSize = maFrmDescr.GetMargin();
         if ( aAny >>= nMargin )
         {
-            aSize.Width() = nMargin;
+            aSize.setWidth( nMargin );
             maFrmDescr.SetMargin( aSize );
         }
     }
@@ -308,7 +308,7 @@ void SAL_CALL IFrameObject::setPropertyValue(const OUString& aPropertyName, cons
         Size aSize = maFrmDescr.GetMargin();
         if ( aAny >>= nMargin )
         {
-            aSize.Height() = nMargin;
+            aSize.setHeight( nMargin );
             maFrmDescr.SetMargin( aSize );
         }
     }
diff --git a/sfx2/source/doc/printhelper.cxx b/sfx2/source/doc/printhelper.cxx
index 08a607b91d0d..8c6a9a4f2e2a 100644
--- a/sfx2/source/doc/printhelper.cxx
+++ b/sfx2/source/doc/printhelper.cxx
@@ -89,8 +89,8 @@ awt::Size impl_Size_Object2Struct( const Size& aSize )
 Size impl_Size_Struct2Object( const awt::Size& aSize )
 {
     Size aReturnValue;
-    aReturnValue.Width()  = aSize.Width  ;
-    aReturnValue.Height() = aSize.Height ;
+    aReturnValue.setWidth( aSize.Width )  ;
+    aReturnValue.setHeight( aSize.Height ) ;
     return aReturnValue ;
 }
 
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 9987acf9b5db..d1364196077e 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -3513,8 +3513,8 @@ void SAL_CALL SfxBaseModel::setVisualAreaSize( sal_Int64 nAspect, const awt::Siz
         awt::Size aCurrent = getVisualAreaSize( nAspect );
         Size aDiff( aSize.Width-aCurrent.Width, aSize.Height-aCurrent.Height );
         aDiff = pViewFrm->GetViewShell()->GetWindow()->LogicToPixel( aDiff );
-        aWinSize.Width() += aDiff.Width();
-        aWinSize.Height() += aDiff.Height();
+        aWinSize.setWidth( aWinSize.Width() + aDiff.Width() );
+        aWinSize.setHeight( aWinSize.Height() + aDiff.Height() );
         pWindow->SetSizePixel( aWinSize );
     }
     else
diff --git a/sfx2/source/notebookbar/ContextVBox.cxx b/sfx2/source/notebookbar/ContextVBox.cxx
index a89c9c2938ce..9a894cf1b6ee 100644
--- a/sfx2/source/notebookbar/ContextVBox.cxx
+++ b/sfx2/source/notebookbar/ContextVBox.cxx
@@ -53,7 +53,7 @@ public:
                 if ( pChild->HasContext( eContext ) || pChild->HasContext( vcl::EnumContext::Context::Any ) )
                 {
                     Size aSize( pChild->GetOptimalSize() );
-                    aSize.Height() += 6;
+                    aSize.setHeight( aSize.Height() + 6 );
                     pChild->Show();
                     pChild->SetSizePixel( aSize );
                 }
@@ -65,7 +65,7 @@ public:
             }
         }
         Size aSize( GetOptimalSize() );
-        aSize.Width() += 6;
+        aSize.setWidth( aSize.Width() + 6 );
         SetSizePixel( aSize );
     }
 };
diff --git a/sfx2/source/notebookbar/NotebookbarTabControl.cxx b/sfx2/source/notebookbar/NotebookbarTabControl.cxx
index 87c05ae9179c..6ed83ad9b0c8 100644
--- a/sfx2/source/notebookbar/NotebookbarTabControl.cxx
+++ b/sfx2/source/notebookbar/NotebookbarTabControl.cxx
@@ -278,12 +278,12 @@ Size NotebookbarTabControl::calculateRequisition() const
             Size aChildSize = VclAlignment::getLayoutRequisition(*pChild);
 
             if (aChildSize.getWidth() < aSize.getWidth())
-                aSize.Width() = aChildSize.Width();
+                aSize.setWidth( aChildSize.Width() );
         }
     }
 
     if (aSize.Width() < 400)
-        aSize.Width() = 400;
+        aSize.setWidth( 400 );
 
     return aSize;
 }
diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx
index ff736a4896a5..1717ca27ac6e 100644
--- a/sfx2/source/sidebar/Deck.cxx
+++ b/sfx2/source/sidebar/Deck.cxx
@@ -130,10 +130,10 @@ void Deck::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& /*r
 
     // Paint the border.
     const int nBorderSize(Theme::GetInteger(Theme::Int_DeckBorderSize));
-    aBox.Left() += aPadding.Left();
-    aBox.Top() += aPadding.Top();
-    aBox.Right() -= aPadding.Right();
-    aBox.Bottom() -= aPadding.Bottom();
+    aBox.SetLeft( aBox.Left() + aPadding.Left() );
+    aBox.SetTop( aBox.Top() + aPadding.Top() );
+    aBox.SetRight( aBox.Right() - aPadding.Right() );
+    aBox.SetBottom( aBox.Bottom() - aPadding.Bottom() );
     const sfx2::sidebar::Paint& rHorizontalBorderPaint(Theme::GetPaint(Theme::Paint_HorizontalBorder));
     DrawHelper::DrawBorder(rRenderContext, aBox,
                            SvBorder(nBorderSize, nBorderSize, nBorderSize, nBorderSize),
diff --git a/sfx2/source/sidebar/DeckLayouter.cxx b/sfx2/source/sidebar/DeckLayouter.cxx
index b0d177ec7406..cfc2f14a5e4b 100644
--- a/sfx2/source/sidebar/DeckLayouter.cxx
+++ b/sfx2/source/sidebar/DeckLayouter.cxx
@@ -234,7 +234,7 @@ tools::Rectangle LayoutPanels (
         SetupVerticalScrollBar(rVerticalScrollBar, nContentHeight, aBox.GetHeight());
 
     const sal_Int32 nUsedHeight (PlacePanels(rLayoutItems, nWidth, eMode, rScrollContainer));
-    aBox.Top() += nUsedHeight;
+    aBox.SetTop( aBox.Top() + nUsedHeight );
     return aBox;
 }
 
diff --git a/sfx2/source/sidebar/TitleBar.cxx b/sfx2/source/sidebar/TitleBar.cxx
index f43e8895bbcd..74de65d4b9bc 100644
--- a/sfx2/source/sidebar/TitleBar.cxx
+++ b/sfx2/source/sidebar/TitleBar.cxx
@@ -128,7 +128,7 @@ void TitleBar::PaintTitle(vcl::RenderContext& rRenderContext, const tools::Recta
         rRenderContext.DrawImage(Point(aTitleBox.Left() + gnLeftIconSpace,
                                        aTitleBox.Top() + (aTitleBox.GetHeight() - maIcon.GetSizePixel().Height()) / 2),
                                  maIcon);
-        aTitleBox.Left() += gnLeftIconSpace + maIcon.GetSizePixel().Width() + gnRightIconSpace;
+        aTitleBox.SetLeft( aTitleBox.Left() + gnLeftIconSpace + maIcon.GetSizePixel().Width() + gnRightIconSpace );
     }
 
     vcl::Font aFont(rRenderContext.GetFont());
diff --git a/sfx2/source/view/classificationcontroller.cxx b/sfx2/source/view/classificationcontroller.cxx
index 9e726230326b..f584f366c9b2 100644
--- a/sfx2/source/view/classificationcontroller.cxx
+++ b/sfx2/source/view/classificationcontroller.cxx
@@ -258,7 +258,7 @@ ClassificationControl::ClassificationControl(vcl::Window* pParent)
     Size aTextSize(m_pLabel->GetTextWidth(aText), m_pLabel->GetTextHeight());
 
     // Padding.
-    aTextSize.Width() += 12;
+    aTextSize.setWidth( aTextSize.Width() + 12 );
     m_pLabel->SetText(aText);
     m_pLabel->SetSizePixel(aTextSize);
     m_pLabel->Show();
@@ -306,10 +306,10 @@ void ClassificationControl::SetOptimalSize()
 
     Point aPosition = m_pCategory->GetPosPixel();
 
-    aSize.Height() = std::max(aSize.Height(), m_pLabel->get_preferred_size().Height());
-    aSize.Height() = std::max(aSize.Height(), m_pCategory->get_preferred_size().Height());
+    aSize.setHeight( std::max(aSize.Height(), m_pLabel->get_preferred_size().Height()) );
+    aSize.setHeight( std::max(aSize.Height(), m_pCategory->get_preferred_size().Height()) );
 
-    aSize.Width() = aPosition.X() + aSize.Width();
+    aSize.setWidth( aPosition.X() + aSize.Width() );
 
     SetSizePixel(aSize);
 }
diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx
index af0e596a2440..1b7bc574641b 100644
--- a/sfx2/source/view/frame.cxx
+++ b/sfx2/source/view/frame.cxx
@@ -582,15 +582,15 @@ void SfxFrame::SetToolSpaceBorderPixel_Impl( const SvBorder& rBorder )
         Size aSize( GetWindow().GetOutputSizePixel() );
         long nDeltaX = rBorder.Left() + rBorder.Right();
         if ( aSize.Width() > nDeltaX )
-            aSize.Width() -= nDeltaX;
+            aSize.setWidth( aSize.Width() - nDeltaX );
         else
-            aSize.Width() = 0;
+            aSize.setWidth( 0 );
 
         long nDeltaY = rBorder.Top() + rBorder.Bottom();
         if ( aSize.Height() > nDeltaY )
-            aSize.Height() -= nDeltaY;
+            aSize.setHeight( aSize.Height() - nDeltaY );
         else
-            aSize.Height() = 0;
+            aSize.setHeight( 0 );
 
         pF->GetWindow().SetPosSizePixel( aPos, aSize );
     }
diff --git a/sfx2/source/view/lokcharthelper.cxx b/sfx2/source/view/lokcharthelper.cxx
index dc82d2ffe4db..b3a326bfbc0b 100644
--- a/sfx2/source/view/lokcharthelper.cxx
+++ b/sfx2/source/view/lokcharthelper.cxx
@@ -140,11 +140,11 @@ tools::Rectangle LokChartHelper::GetChartBoundingBox()
                     double fXScale( aCWMapMode.GetScaleX() );
                     double fYScale( aCWMapMode.GetScaleY() );
                     Point aOffset = pWindow->GetOffsetPixelFrom(*pRootWin);
-                    aOffset.X() *= (TWIPS_PER_PIXEL / fXScale);
-                    aOffset.Y() *= (TWIPS_PER_PIXEL / fYScale);
+                    aOffset.setX( aOffset.X() * (TWIPS_PER_PIXEL / fXScale) );
+                    aOffset.setY( aOffset.Y() * (TWIPS_PER_PIXEL / fYScale) );
                     Size aSize = pWindow->GetSizePixel();
-                    aSize.Width() *= (TWIPS_PER_PIXEL / fXScale);
-                    aSize.Height() *= (TWIPS_PER_PIXEL / fYScale);
+                    aSize.setWidth( aSize.Width() * (TWIPS_PER_PIXEL / fXScale) );
+                    aSize.setHeight( aSize.Height() * (TWIPS_PER_PIXEL / fYScale) );
                     aBBox = tools::Rectangle(aOffset, aSize);
                 }
             }
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 9016fb4a5bb8..d24bb5b7b623 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -1160,8 +1160,8 @@ void SfxViewFrame::SetBorderPixelImpl
         Size aSize = pVSh->GetWindow()->GetOutputSizePixel();
         if ( aSize.Width() && aSize.Height() )
         {
-            aSize.Width() += rBorder.Left() + rBorder.Right();
-            aSize.Height() += rBorder.Top() + rBorder.Bottom();
+            aSize.setWidth( aSize.Width() + rBorder.Left() + rBorder.Right() );
+            aSize.setHeight( aSize.Height() + rBorder.Top() + rBorder.Bottom() );
 
             Size aOldSize = GetWindow().GetOutputSizePixel();
             GetWindow().SetOutputSizePixel( aSize );
@@ -1169,8 +1169,8 @@ void SfxViewFrame::SetBorderPixelImpl
             while ( pParent->GetParent() )
                 pParent = pParent->GetParent();
             Size aOuterSize = pParent->GetOutputSizePixel();
-            aOuterSize.Width() += ( aSize.Width() - aOldSize.Width() );
-            aOuterSize.Height() += ( aSize.Height() - aOldSize.Height() );
+            aOuterSize.setWidth( aOuterSize.Width() + ( aSize.Width() - aOldSize.Width() ) );
+            aOuterSize.setHeight( aOuterSize.Height() + ( aSize.Height() - aOldSize.Height() ) );
             pParent->SetOutputSizePixel( aOuterSize );
         }
     }
@@ -1178,10 +1178,10 @@ void SfxViewFrame::SetBorderPixelImpl
     {
         Point aPoint;
         tools::Rectangle aEditArea( aPoint, GetWindow().GetOutputSizePixel() );
-        aEditArea.Left() += rBorder.Left();
-        aEditArea.Right() -= rBorder.Right();
-        aEditArea.Top() += rBorder.Top();
-        aEditArea.Bottom() -= rBorder.Bottom();
+        aEditArea.SetLeft( aEditArea.Left() + rBorder.Left() );
+        aEditArea.SetRight( aEditArea.Right() - rBorder.Right() );
+        aEditArea.SetTop( aEditArea.Top() + rBorder.Top() );
+        aEditArea.SetBottom( aEditArea.Bottom() - rBorder.Bottom() );
         pVSh->GetWindow()->SetPosSizePixel( aEditArea.TopLeft(), aEditArea.GetSize() );
     }
 }