diff options
-rw-r--r-- | canvas/source/vcl/canvashelper_texturefill.cxx | 4 | ||||
-rw-r--r-- | chart2/source/controller/dialogs/DataBrowser.cxx | 2 | ||||
-rw-r--r-- | chart2/source/controller/dialogs/dlg_CreationWizard.cxx | 2 | ||||
-rw-r--r-- | chart2/source/controller/main/DrawCommandDispatch.cxx | 4 | ||||
-rw-r--r-- | cui/source/customize/macropg.cxx | 6 | ||||
-rw-r--r-- | cui/source/dialogs/colorpicker.cxx | 20 | ||||
-rw-r--r-- | cui/source/dialogs/cuicharmap.cxx | 8 | ||||
-rw-r--r-- | cui/source/dialogs/hangulhanjadlg.cxx | 26 | ||||
-rw-r--r-- | cui/source/dialogs/thesdlg.cxx | 6 | ||||
-rw-r--r-- | cui/source/options/dbregister.cxx | 4 | ||||
-rw-r--r-- | cui/source/options/optlingu.cxx | 6 | ||||
-rw-r--r-- | cui/source/tabpages/autocdlg.cxx | 4 | ||||
-rw-r--r-- | cui/source/tabpages/backgrnd.cxx | 4 | ||||
-rw-r--r-- | cui/source/tabpages/grfpage.cxx | 8 | ||||
-rw-r--r-- | cui/source/tabpages/numpages.cxx | 8 | ||||
-rw-r--r-- | cui/source/tabpages/page.cxx | 6 |
16 files changed, 59 insertions, 59 deletions
diff --git a/canvas/source/vcl/canvashelper_texturefill.cxx b/canvas/source/vcl/canvashelper_texturefill.cxx index 892d6d781e8f..fcec72c0b475 100644 --- a/canvas/source/vcl/canvashelper_texturefill.cxx +++ b/canvas/source/vcl/canvashelper_texturefill.cxx @@ -90,8 +90,8 @@ namespace vclcanvas rTileSize, &rAttr ); - aCurrPos.setX( aCurrPos.X() + rNextTileX.Width() ); - aCurrPos.setY( aCurrPos.Y() + rNextTileX.Height() ); + aCurrPos.AdjustX(rNextTileX.Width() ); + aCurrPos.AdjustY(rNextTileX.Height() ); } } diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx index f58b25264fca..2a7a41e754cd 100644 --- a/chart2/source/controller/dialogs/DataBrowser.cxx +++ b/chart2/source/controller/dialogs/DataBrowser.cxx @@ -1006,7 +1006,7 @@ void DataBrowser::PaintCell( OutputDevice& rDev, const tools::Rectangle& rRect, sal_uInt16 nColumnId ) const { Point aPos( rRect.TopLeft()); - aPos.setX( aPos.X() + 1 ); + aPos.AdjustX(1 ); OUString aText = GetCellText( m_nSeekRow, nColumnId ); Size TxtSize( GetDataWindow().GetTextWidth( aText ), GetDataWindow().GetTextHeight()); diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx index ac7201d5e987..9967c6123a76 100644 --- a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx +++ b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx @@ -73,7 +73,7 @@ CreationWizard::CreationWizard(vcl::Window* pParent, const uno::Reference<frame: Size aAdditionalRoadmapSize(LogicToPixel(Size(85, 0), MapMode(MapUnit::MapAppFont))); Size aSize(LogicToPixel(Size(CHART_WIZARD_PAGEWIDTH, CHART_WIZARD_PAGEHEIGHT), MapMode(MapUnit::MapAppFont))); - aSize.setWidth( aSize.Width() + aAdditionalRoadmapSize.Width() ); + aSize.AdjustWidth(aAdditionalRoadmapSize.Width() ); SetSizePixel(aSize); if (!m_pDialogModel->getModel().isDataFromSpreadsheet()) diff --git a/chart2/source/controller/main/DrawCommandDispatch.cxx b/chart2/source/controller/main/DrawCommandDispatch.cxx index 8c62f46ef7b7..7e318646ebf5 100644 --- a/chart2/source/controller/main/DrawCommandDispatch.cxx +++ b/chart2/source/controller/main/DrawCommandDispatch.cxx @@ -432,8 +432,8 @@ SdrObject* DrawCommandDispatch::createDefaultObject( const sal_uInt16 nID ) Size aObjectSize( 4000, 2500 ); tools::Rectangle aPageRect( tools::Rectangle( Point( 0, 0 ), pPage->GetSize() ) ); Point aObjectPos = aPageRect.Center(); - aObjectPos.setX( aObjectPos.X() - aObjectSize.Width() / 2 ); - aObjectPos.setY( aObjectPos.Y() - aObjectSize.Height() / 2 ); + aObjectPos.AdjustX( -(aObjectSize.Width() / 2) ); + aObjectPos.AdjustY( -(aObjectSize.Height() / 2) ); tools::Rectangle aRect( aObjectPos, aObjectSize ); switch ( nID ) diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx index e5c7629390f9..0aadee3e1191 100644 --- a/cui/source/customize/macropg.cxx +++ b/cui/source/customize/macropg.cxx @@ -170,8 +170,8 @@ void MacroEventListBox::Resize() maHeaderBar->SetPosSizePixel( aPnt, aSize ); // calc pos and size of ListBox - aPnt.setY( aPnt.Y() + aSize.Height() ); - aSize.Height() = aCtrlSize.Height() - aSize.Height(); + aPnt.AdjustY(aSize.Height() ); + aSize.setHeight( aCtrlSize.Height() - aSize.Height() ); maListBox->SetPosSizePixel( aPnt, aSize ); } @@ -473,7 +473,7 @@ void IconLBoxString::Paint(const Point& aPos, SvTreeListBox& /*aDevice*/, vcl::R } Point aPnt(aPos); - aPnt.setX( aPnt.X() + 20 ); + aPnt.AdjustX(20 ); rRenderContext.DrawText(aPnt, aPureMethod); } } diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx index 0dc4370cfa6a..869917270eb7 100644 --- a/cui/source/dialogs/colorpicker.cxx +++ b/cui/source/dialogs/colorpicker.cxx @@ -469,17 +469,17 @@ void ColorFieldControl::KeyMove( int dx, int dy ) { Size aSize(GetOutputSizePixel()); Point aPos(static_cast<long>(mdX * aSize.Width()), static_cast<long>((1.0 - mdY) * aSize.Height())); - aPos.setX( aPos.X() + dx ); - aPos.Y() += dy; + aPos.AdjustX(dx ); + aPos.AdjustY(dy ); if( aPos.X() < 0 ) - aPos.setX( aPos.X() + aSize.Width() ); + aPos.AdjustX(aSize.Width() ); else if( aPos.X() >= aSize.Width() ) - aPos.setX( aPos.X() - aSize.Width() ); + aPos.AdjustX( -(aSize.Width()) ); if( aPos.Y() < 0 ) - aPos.setY( aPos.Y() + aSize.Height() ); + aPos.AdjustY(aSize.Height() ); else if( aPos.Y() >= aSize.Height() ) - aPos.setY( aPos.Y() - aSize.Height() ); + aPos.AdjustY( -(aSize.Height()) ); ShowPosition( aPos, true ); Modify(); @@ -774,7 +774,7 @@ void ColorSliderControl::Paint(vcl::RenderContext& rRenderContext, const ::tools while (x--) { rRenderContext.DrawOutDev(aPos, aSize, Point(0,0), aSize, *mxBitmap); - aPos.setX( aPos.X() + 1 ); + aPos.AdjustX(1 ); } } @@ -941,11 +941,11 @@ ColorPickerDialog::ColorPickerDialog( vcl::Window* pParent, sal_Int32 nColor, sa Point aPos( mpColorSlider->GetPosPixel() ); - aPos.setX( aPos.X() - aSize.Width() ); - aPos.Y() -= aSize.Height() / 2; + aPos.AdjustX( -(aSize.Width()) ); + aPos.AdjustY( -(aSize.Height() / 2) ); mpFISliderLeft->SetPosPixel( aPos ); - aPos.setX( aPos.X() + aSize.Width() + mpColorSlider->GetSizePixel().Width() ); + aPos.AdjustX(aSize.Width() + mpColorSlider->GetSizePixel().Width() ); mpFISliderRight->SetPosPixel( aPos ); Color aColor( nColor ); diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx index aedebfa6654d..83e99cd10bf2 100644 --- a/cui/source/dialogs/cuicharmap.cxx +++ b/cui/source/dialogs/cuicharmap.cxx @@ -1195,9 +1195,9 @@ void SvxShowText::Paint(vcl::RenderContext& rRenderContext, const ::tools::Recta int nYLDelta = aBoundRect.Top(); int nYHDelta = aSize.Height() - aBoundRect.Bottom(); if( nYLDelta <= 0 ) - aPoint.setY( aPoint.Y() - nYLDelta - 1 ); + aPoint.AdjustY( -(nYLDelta - 1) ); else if( nYHDelta <= 0 ) - aPoint.setY( aPoint.Y() + nYHDelta - 1 ); + aPoint.AdjustY(nYHDelta - 1 ); if (mbCenter) { @@ -1210,9 +1210,9 @@ void SvxShowText::Paint(vcl::RenderContext& rRenderContext, const ::tools::Recta int nXLDelta = aBoundRect.Left(); int nXHDelta = aSize.Width() - aBoundRect.Right(); if( nXLDelta <= 0 ) - aPoint.setX( aPoint.X() - nXLDelta - 1 ); + aPoint.AdjustX( -(nXLDelta - 1) ); else if( nXHDelta <= 0 ) - aPoint.setX( aPoint.X() + nXHDelta - 1 ); + aPoint.AdjustX(nXHDelta - 1 ); } } diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index 90afcd2f700e..b26c7b0b6beb 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -236,15 +236,15 @@ namespace svx // calculate the size of the radio image - we're to paint our text _after_ this image DBG_ASSERT( !GetModeRadioImage(), "RubyRadioButton::Paint: images not supported!" ); Size aImageSize = GetRadioImage(rRenderContext.GetSettings(), DrawButtonFlags::NONE).GetSizePixel(); - aImageSize.Width() = CalcZoom( aImageSize.Width() ) + 2; // + 2 because otherwise the radiobuttons - aImageSize.Height() = CalcZoom( aImageSize.Height() ) + 2; // appear a bit cut from right and top. + aImageSize.setWidth( CalcZoom( aImageSize.Width() ) + 2 ); // + 2 because otherwise the radiobuttons + aImageSize.setHeight( CalcZoom( aImageSize.Height() ) + 2 ); // appear a bit cut from right and top. ::tools::Rectangle aOverallRect( Point( 0, 0 ), GetOutputSizePixel() ); - aOverallRect.Left() += aImageSize.Width() + 4; // 4 is the separator between the image and the text + aOverallRect.AdjustLeft(aImageSize.Width() + 4 ); // 4 is the separator between the image and the text // inflate the rect a little bit (because the VCL radio button does the same) ::tools::Rectangle aTextRect( aOverallRect ); - ++aTextRect.Left(); --aTextRect.Right(); - ++aTextRect.Top(); --aTextRect.Bottom(); + aTextRect.AdjustLeft( 1 ); aTextRect.AdjustRight( -1 ); + aTextRect.AdjustTop( 1 ); aTextRect.AdjustBottom( -1 ); // calculate the text flags for the painting DrawTextFlags nTextStyle = DrawTextFlags::Mnemonic; @@ -283,17 +283,17 @@ namespace svx // for this, give it the proper location to paint the image (vertically centered, relative to our text) ::tools::Rectangle aImageLocation( Point( 0, 0 ), aImageSize ); sal_Int32 nTextHeight = aSecondaryTextLocation.Bottom() - aPrimaryTextLocation.Top(); - aImageLocation.Top() = aPrimaryTextLocation.Top() + ( nTextHeight - aImageSize.Height() ) / 2; - aImageLocation.Bottom() = aImageLocation.Top() + aImageSize.Height(); + aImageLocation.SetTop( aPrimaryTextLocation.Top() + ( nTextHeight - aImageSize.Height() ) / 2 ); + aImageLocation.SetBottom( aImageLocation.Top() + aImageSize.Height() ); SetStateRect( aImageLocation ); DrawRadioButtonState(rRenderContext); // mouse clicks should be recognized in a rect which is one pixel larger in each direction, plus // includes the image - aCombinedRect.Left() = aImageLocation.Left(); - ++aCombinedRect.Right(); - --aCombinedRect.Top(); - ++aCombinedRect.Bottom(); + aCombinedRect.SetLeft( aImageLocation.Left() ); + aCombinedRect.AdjustRight( 1 ); + aCombinedRect.AdjustTop( -1 ); + aCombinedRect.AdjustBottom( 1 ); SetMouseRect(aCombinedRect); @@ -316,8 +316,8 @@ namespace svx } Size minimumSize = CalcMinimumSize(); - minimumSize.Height() = aPrimarySize.Height() + aSecondarySize.Height() + 5; - minimumSize.Width() = aPrimarySize.Width() + aSecondarySize.Width() + 5; + minimumSize.setHeight( aPrimarySize.Height() + aSecondarySize.Height() + 5 ); + minimumSize.setWidth( aPrimarySize.Width() + aSecondarySize.Width() + 5 ); return minimumSize; } diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx index d80a88c0ff53..bc4d8ca58ce3 100644 --- a/cui/source/dialogs/thesdlg.cxx +++ b/cui/source/dialogs/thesdlg.cxx @@ -158,7 +158,7 @@ void AlternativesString::Paint(const Point& rPos, SvTreeListBox& /*rDev*/, vcl:: aPos.setX( 0 ); } else - aPos.setX( aPos.X() + 5 ); + aPos.AdjustX(5 ); rRenderContext.DrawText(aPos, GetText()); rRenderContext.Pop(); } @@ -262,8 +262,8 @@ void ThesaurusAlternativesCtrl::Paint(vcl::RenderContext& rRenderContext, const Size aTextSize(rRenderContext.GetTextWidth(m_pDialog->getErrStr()), rRenderContext.GetTextHeight()); aTextSize = rRenderContext.LogicToPixel(aTextSize); Point aPos; - aPos.setX( aPos.X() + GetSizePixel().Width() / 2 - aTextSize.Width() / 2 ); - aPos.Y() += GetSizePixel().Height() / 2; + aPos.AdjustX(GetSizePixel().Width() / 2 - aTextSize.Width() / 2 ); + aPos.AdjustY(GetSizePixel().Height() / 2 ); aPos = rRenderContext.PixelToLogic(aPos); rRenderContext.DrawText(aPos, m_pDialog->getErrStr()); } diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx index 0fbbce7611bd..2ab19ca73d15 100644 --- a/cui/source/options/dbregister.cxx +++ b/cui/source/options/dbregister.cxx @@ -133,11 +133,11 @@ DbRegistrationOptionsPage::DbRegistrationOptionsPage( vcl::Window* pParent, cons rBar.SetSelectHdl( LINK( this, DbRegistrationOptionsPage, HeaderSelect_Impl ) ); rBar.SetEndDragHdl( LINK( this, DbRegistrationOptionsPage, HeaderEndDrag_Impl ) ); Size aSz; - aSz.Width() = TAB_WIDTH1; + aSz.setWidth( TAB_WIDTH1 ); rBar.InsertItem( ITEMID_TYPE, m_aTypeText, LogicToPixel( aSz, MapMode( MapUnit::MapAppFont ) ).Width(), HeaderBarItemBits::LEFT | HeaderBarItemBits::VCENTER | HeaderBarItemBits::CLICKABLE | HeaderBarItemBits::UPARROW ); - aSz.Width() = TAB_WIDTH2; + aSz.setWidth( TAB_WIDTH2 ); rBar.InsertItem( ITEMID_PATH, m_aPathText, LogicToPixel( aSz, MapMode( MapUnit::MapAppFont ) ).Width(), HeaderBarItemBits::LEFT | HeaderBarItemBits::VCENTER ); diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index a0532772c7c1..9400320e3d2d 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -247,7 +247,7 @@ void BrwStringDic_Impl::Paint(const Point& rPos, SvTreeListBox& /*rDev*/, vcl::R aPos.setX( 0 ); } else - aPos.setX( aPos.X() + 5 ); + aPos.AdjustX(5 ); rRenderContext.DrawText(aPos, GetText()); rRenderContext.Pop(); } @@ -406,12 +406,12 @@ void BrwString_Impl::Paint(const Point& rPos, SvTreeListBox& /*rDev*/, vcl::Rend const SvViewDataEntry* /*pView*/, const SvTreeListEntry& rEntry) { Point aPos(rPos); - aPos.setX( aPos.X() + 20 ); + aPos.AdjustX(20 ); rRenderContext.DrawText(aPos, GetText()); if (rEntry.GetUserData()) { Point aNewPos(aPos); - aNewPos.setX( aNewPos.X() + rRenderContext.GetTextWidth(GetText()) ); + aNewPos.AdjustX(rRenderContext.GetTextWidth(GetText()) ); rRenderContext.Push(PushFlags::FONT); vcl::Font aFont(rRenderContext.GetFont()); aFont.SetWeight(WEIGHT_BOLD); diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index 61995dec8816..7b575d0ed605 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -345,7 +345,7 @@ void OfaImpBrwString::Paint(const Point& rPos, SvTreeListBox& /*rDev*/, vcl::Ren { ImpUserData* pUserData = static_cast<ImpUserData*>(rEntry.GetUserData()); Point aNewPos(rPos); - aNewPos.setX( aNewPos.X() + rRenderContext.GetTextWidth(GetText()) ); + aNewPos.AdjustX(rRenderContext.GetTextWidth(GetText()) ); vcl::Font aOldFont(rRenderContext.GetFont()); vcl::Font aFont(aOldFont); if (pUserData->pFont) @@ -367,7 +367,7 @@ void OfaImpBrwString::Paint(const Point& rPos, SvTreeListBox& /*rDev*/, vcl::Ren rRenderContext.DrawText(aNewPos, sTxt); if (-1 != nPos) - aNewPos.setX( aNewPos.X() + rRenderContext.GetTextWidth(sTxt) ); + aNewPos.AdjustX(rRenderContext.GetTextWidth(sTxt) ); if (bFett) rRenderContext.SetFont(aOldFont); diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index c2e6b05f0631..ddf8dcb024b4 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -237,8 +237,8 @@ void BackgroundPreviewImpl::recalcDrawPos() Size aSize = GetOutputSizePixel(); // InnerSize == Size without one pixel border Size aInnerSize = aSize; - aInnerSize.setWidth( aInnerSize.Width() - 2 ); - aInnerSize.Height() -= 2; + aInnerSize.AdjustWidth( -2 ); + aInnerSize.AdjustHeight( -2 ); aDrawSize = pBitmap->GetSizePixel(); // bitmap bigger than preview window? diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx index 06cdf8997943..3ce3925c937d 100644 --- a/cui/source/tabpages/grfpage.cxx +++ b/cui/source/tabpages/grfpage.cxx @@ -794,10 +794,10 @@ void SvxCropExample::Paint(vcl::RenderContext& rRenderContext, const ::tools::Re aSz = rRenderContext.PixelToLogic(aSz); rRenderContext.SetFillColor(Color(COL_TRANSPARENT)); rRenderContext.SetRasterOp(RasterOp::Invert); - aRect.SetLeft( aRect.Left() + aTopLeft.Y() ); - aRect.Top() += aTopLeft.X(); - aRect.SetRight( aRect.Right() - aBottomRight.Y() ); - aRect.Bottom() -= aBottomRight.X(); + aRect.AdjustLeft(aTopLeft.Y() ); + aRect.AdjustTop(aTopLeft.X() ); + aRect.AdjustRight( -(aBottomRight.Y()) ); + aRect.AdjustBottom( -(aBottomRight.X()) ); rRenderContext.DrawRect(aRect); } diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index f1851f2b2def..9eb975a44921 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -2259,10 +2259,10 @@ static long lcl_DrawBullet(VirtualDevice* pVDev, // via Uno it's possible that no font has been set! vcl::Font aFont(rFmt.GetBulletFont() ? *rFmt.GetBulletFont() : aTmpFont); Size aTmpSize(rSize); - aTmpSize.setWidth( aTmpSize.Width() * rFmt.GetBulletRelSize() ); - aTmpSize.Width() /= 100 ; - aTmpSize.setHeight( aTmpSize.Height() * rFmt.GetBulletRelSize() ); - aTmpSize.Height() /= 100 ; + aTmpSize.setWidth( aTmpSize.Width() * ( rFmt.GetBulletRelSize()) ); + aTmpSize.setWidth( aTmpSize.Width() / 100 ) ; + aTmpSize.setHeight( aTmpSize.Height() * ( rFmt.GetBulletRelSize()) ); + aTmpSize.setHeight( aTmpSize.Height() / 100 ) ; // in case of a height of zero it is drawed in original height if(!aTmpSize.Height()) aTmpSize.setHeight( 1 ); diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx index 643d5a14b438..dbde0bf2dc9c 100644 --- a/cui/source/tabpages/page.cxx +++ b/cui/source/tabpages/page.cxx @@ -106,9 +106,9 @@ Size GetMinBorderSpace_Impl( const SvxShadowItem& rShadow, const SvxBoxItem& rBo { Size aSz; aSz.setHeight( rShadow.CalcShadowSpace( SvxShadowItemSide::BOTTOM ) + rBox.CalcLineSpace( SvxBoxItemLine::BOTTOM ) ); - aSz.setHeight( aSz.Height() + rShadow.CalcShadowSpace( SvxShadowItemSide::TOP ) + rBox.CalcLineSpace( SvxBoxItemLine::TOP ) ); - aSz.Width() = rShadow.CalcShadowSpace( SvxShadowItemSide::LEFT ) + rBox.CalcLineSpace( SvxBoxItemLine::LEFT ); - aSz.setWidth( aSz.Width() + rShadow.CalcShadowSpace( SvxShadowItemSide::RIGHT ) + rBox.CalcLineSpace( SvxBoxItemLine::RIGHT ) ); + aSz.AdjustHeight(rShadow.CalcShadowSpace( SvxShadowItemSide::TOP ) + rBox.CalcLineSpace( SvxBoxItemLine::TOP ) ); + aSz.setWidth( rShadow.CalcShadowSpace( SvxShadowItemSide::LEFT ) + rBox.CalcLineSpace( SvxBoxItemLine::LEFT ) ); + aSz.AdjustWidth(rShadow.CalcShadowSpace( SvxShadowItemSide::RIGHT ) + rBox.CalcLineSpace( SvxBoxItemLine::RIGHT ) ); return aSz; } |