diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-02-13 14:21:50 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-02-14 12:50:37 +0100 |
commit | f841dada1a5018897cce29ccf972da33ece4738c (patch) | |
tree | af861d8c6abf98eed1b20ba7fdab2b3997d6e9be /cui | |
parent | 9763383ebb7e5b10ba9e7557dffa803a8d392c0d (diff) |
loplugin:changetoolsgen in canvas..cui
Change-Id: I4e320055a3dbe4159c2aa2714e1ee98182e1e80a
Reviewed-on: https://gerrit.libreoffice.org/49642
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'cui')
-rw-r--r-- | cui/source/customize/macropg.cxx | 10 | ||||
-rw-r--r-- | cui/source/dialogs/colorpicker.cxx | 24 | ||||
-rw-r--r-- | cui/source/dialogs/cuicharmap.cxx | 14 | ||||
-rw-r--r-- | cui/source/dialogs/cuigrfflt.cxx | 8 | ||||
-rw-r--r-- | cui/source/dialogs/cuihyperdlg.cxx | 12 | ||||
-rw-r--r-- | cui/source/dialogs/thesdlg.cxx | 6 | ||||
-rw-r--r-- | cui/source/options/dbregister.cxx | 2 | ||||
-rw-r--r-- | cui/source/options/optcolor.cxx | 2 | ||||
-rw-r--r-- | cui/source/options/optdict.cxx | 4 | ||||
-rw-r--r-- | cui/source/options/optlingu.cxx | 8 | ||||
-rw-r--r-- | cui/source/options/optpath.cxx | 2 | ||||
-rw-r--r-- | cui/source/tabpages/autocdlg.cxx | 4 | ||||
-rw-r--r-- | cui/source/tabpages/backgrnd.cxx | 22 | ||||
-rw-r--r-- | cui/source/tabpages/chardlg.cxx | 16 | ||||
-rw-r--r-- | cui/source/tabpages/grfpage.cxx | 12 | ||||
-rw-r--r-- | cui/source/tabpages/macroass.cxx | 2 | ||||
-rw-r--r-- | cui/source/tabpages/numpages.cxx | 18 | ||||
-rw-r--r-- | cui/source/tabpages/page.cxx | 6 | ||||
-rw-r--r-- | cui/source/tabpages/tabstpge.cxx | 4 | ||||
-rw-r--r-- | cui/source/tabpages/tparea.cxx | 4 | ||||
-rw-r--r-- | cui/source/tabpages/tpbitmap.cxx | 40 | ||||
-rw-r--r-- | cui/source/tabpages/tpline.cxx | 12 |
22 files changed, 116 insertions, 116 deletions
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx index 14efa4bb1ed4..e5c7629390f9 100644 --- a/cui/source/customize/macropg.cxx +++ b/cui/source/customize/macropg.cxx @@ -106,7 +106,7 @@ IMPL_LINK( MacroEventListBox, HeaderEndDrag_Impl, HeaderBar*, pBar, void ) for( sal_uInt16 i = 1 ; i < _nTabs ; ++i ) { long _nWidth = maHeaderBar->GetItemSize( i ); - aSz.Width() = _nWidth + nTmpSz; + aSz.setWidth( _nWidth + nTmpSz ); nTmpSz += _nWidth; maListBox->SetTab( i, PixelToLogic( aSz, MapMode( MapUnit::MapAppFont ) ).Width() ); } @@ -166,11 +166,11 @@ void MacroEventListBox::Resize() Point aPnt( 0, 0 ); Size aSize( maHeaderBar->CalcWindowSizePixel() ); Size aCtrlSize( GetOutputSizePixel() ); - aSize.Width() = aCtrlSize.Width(); + aSize.setWidth( aCtrlSize.Width() ); maHeaderBar->SetPosSizePixel( aPnt, aSize ); // calc pos and size of ListBox - aPnt.Y() += aSize.Height(); + aPnt.setY( aPnt.Y() + aSize.Height() ); aSize.Height() = 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.X() += 20; + aPnt.setX( aPnt.X() + 20 ); rRenderContext.DrawText(aPnt, aPureMethod); } } @@ -713,7 +713,7 @@ void SvxMacroTabPage_::InitAndSetHandler( const Reference< container::XNameRepla rListBox.SetTabs( &nTabs[0] ); Size aSize( nTabs[ 2 ], 0 ); rHeaderBar.InsertItem( ITEMID_EVENT, mpImpl->sStrEvent, LogicToPixel( aSize, MapMode( MapUnit::MapAppFont ) ).Width() ); - aSize.Width() = 1764; // don't know what, so 42^2 is best to use... + aSize.setWidth( 1764 ); // don't know what, so 42^2 is best to use... rHeaderBar.InsertItem( ITMEID_ASSMACRO, mpImpl->sAssignedMacro, LogicToPixel( aSize, MapMode( MapUnit::MapAppFont ) ).Width() ); rListBox.SetSpaceBetweenEntries( 0 ); diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx index 4fa2d98c1802..0dc4370cfa6a 100644 --- a/cui/source/dialogs/colorpicker.cxx +++ b/cui/source/dialogs/colorpicker.cxx @@ -426,8 +426,8 @@ void ColorFieldControl::ShowPosition( const Point& rPos, bool bUpdate ) nY = aSize.Height() - 1; Point aPos = maPosition; - maPosition.X() = nX - 5; - maPosition.Y() = nY - 5; + maPosition.setX( nX - 5 ); + maPosition.setY( nY - 5 ); Invalidate(::tools::Rectangle(aPos, Size(11, 11))); Invalidate(::tools::Rectangle(maPosition, Size(11, 11))); @@ -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.X() += dx; + aPos.setX( aPos.X() + dx ); aPos.Y() += dy; if( aPos.X() < 0 ) - aPos.X() += aSize.Width(); + aPos.setX( aPos.X() + aSize.Width() ); else if( aPos.X() >= aSize.Width() ) - aPos.X() -= aSize.Width(); + aPos.setX( aPos.X() - aSize.Width() ); if( aPos.Y() < 0 ) - aPos.Y() += aSize.Height(); + aPos.setY( aPos.Y() + aSize.Height() ); else if( aPos.Y() >= aSize.Height() ) - aPos.Y() -= aSize.Height(); + aPos.setY( aPos.Y() - 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.X() += 1; + aPos.setX( aPos.X() + 1 ); } } @@ -941,11 +941,11 @@ ColorPickerDialog::ColorPickerDialog( vcl::Window* pParent, sal_Int32 nColor, sa Point aPos( mpColorSlider->GetPosPixel() ); - aPos.X() -= aSize.Width(); + aPos.setX( aPos.X() - aSize.Width() ); aPos.Y() -= aSize.Height() / 2; mpFISliderLeft->SetPosPixel( aPos ); - aPos.X() += aSize.Width() + mpColorSlider->GetSizePixel().Width(); + aPos.setX( aPos.X() + aSize.Width() + mpColorSlider->GetSizePixel().Width() ); mpFISliderRight->SetPosPixel( aPos ); Color aColor( nColor ); @@ -1094,12 +1094,12 @@ void ColorPickerDialog::update_color( UpdateFlags n ) { Point aPos(0, mpColorSlider->GetLevel() + mpColorSlider->GetPosPixel().Y() - 1); - aPos.X() = mpFISliderLeft->GetPosPixel().X(); + aPos.setX( mpFISliderLeft->GetPosPixel().X() ); if (aPos != mpFISliderLeft->GetPosPixel()) { mpFISliderLeft->SetPosPixel(aPos); - aPos.X() = mpFISliderRight->GetPosPixel().X(); + aPos.setX( mpFISliderRight->GetPosPixel().X() ); mpFISliderRight->SetPosPixel(aPos); } } diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx index 77df333aa0c4..aedebfa6654d 100644 --- a/cui/source/dialogs/cuicharmap.cxx +++ b/cui/source/dialogs/cuicharmap.cxx @@ -1175,7 +1175,7 @@ void SvxShowText::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; @@ -1185,7 +1185,7 @@ void SvxShowText::Paint(vcl::RenderContext& rRenderContext, const ::tools::Recta Point aPoint(2, mnY); // adjust position using ink boundary if possible if (!bGotBoundary) - aPoint.X() = (aSize.Width() - rRenderContext.GetTextWidth(aText)) / 2; + aPoint.setX( (aSize.Width() - rRenderContext.GetTextWidth(aText)) / 2 ); else { // adjust position before it gets out of bounds @@ -1195,14 +1195,14 @@ void SvxShowText::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 ); if (mbCenter) { // move glyph to middle of cell - aPoint.X() = -aBoundRect.Left() + (aSize.Width() - aBoundRect.GetWidth()) / 2; + aPoint.setX( -aBoundRect.Left() + (aSize.Width() - aBoundRect.GetWidth()) / 2 ); } else { @@ -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.X() -= nXLDelta - 1; + aPoint.setX( aPoint.X() - nXLDelta - 1 ); else if( nXHDelta <= 0 ) - aPoint.X() += nXHDelta - 1; + aPoint.setX( aPoint.X() + nXHDelta - 1 ); } } diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx index 8dee795cda8b..2040cbaeaaa3 100644 --- a/cui/source/dialogs/cuigrfflt.cxx +++ b/cui/source/dialogs/cuigrfflt.cxx @@ -96,13 +96,13 @@ void GraphicPreviewWindow::ScaleImageToFit() if( fGrfWH < fPreWH ) { - aGrfSize.Width() = static_cast<long>( aPreviewSize.Height() * fGrfWH ); - aGrfSize.Height() = aPreviewSize.Height(); + aGrfSize.setWidth( static_cast<long>( aPreviewSize.Height() * fGrfWH ) ); + aGrfSize.setHeight( aPreviewSize.Height() ); } else { - aGrfSize.Width() = aPreviewSize.Width(); - aGrfSize.Height() = static_cast<long>( aPreviewSize.Width() / fGrfWH ); + aGrfSize.setWidth( aPreviewSize.Width() ); + aGrfSize.setHeight( static_cast<long>( aPreviewSize.Width() / fGrfWH ) ); } mfScaleX = static_cast<double>(aGrfSize.Width()) / aSizePixel.Width(); diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx index 50255e36ae35..b592dd338970 100644 --- a/cui/source/dialogs/cuihyperdlg.cxx +++ b/cui/source/dialogs/cuihyperdlg.cxx @@ -132,16 +132,16 @@ SvxHpLinkDlg::SvxHpLinkDlg (vcl::Window* pParent, SfxBindings* pBindings) Size aMaxPrefSize(pBox->get_preferred_size()); ShowPage(HyperLinkPageType::Document); Size aSize(pBox->get_preferred_size()); - aMaxPrefSize.Width() = std::max(aMaxPrefSize.Width(), aSize.Width()); - aMaxPrefSize.Height() = std::max(aMaxPrefSize.Height(), aSize.Height()); + aMaxPrefSize.setWidth( std::max(aMaxPrefSize.Width(), aSize.Width()) ); + aMaxPrefSize.setHeight( std::max(aMaxPrefSize.Height(), aSize.Height()) ); ShowPage(HyperLinkPageType::Mail); aSize = pBox->get_preferred_size(); - aMaxPrefSize.Width() = std::max(aMaxPrefSize.Width(), aSize.Width()); - aMaxPrefSize.Height() = std::max(aMaxPrefSize.Height(), aSize.Height()); + aMaxPrefSize.setWidth( std::max(aMaxPrefSize.Width(), aSize.Width()) ); + aMaxPrefSize.setHeight( std::max(aMaxPrefSize.Height(), aSize.Height()) ); ShowPage(HyperLinkPageType::Internet); aSize = pBox->get_preferred_size(); - aMaxPrefSize.Width() = std::max(aMaxPrefSize.Width(), aSize.Width()); - aMaxPrefSize.Height() = std::max(aMaxPrefSize.Height(), aSize.Height()); + aMaxPrefSize.setWidth( std::max(aMaxPrefSize.Width(), aSize.Width()) ); + aMaxPrefSize.setHeight( std::max(aMaxPrefSize.Height(), aSize.Height()) ); pBox->set_width_request(aMaxPrefSize.Width()); pBox->set_height_request(aMaxPrefSize.Height()); diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx index 96d8ff26e496..d80a88c0ff53 100644 --- a/cui/source/dialogs/thesdlg.cxx +++ b/cui/source/dialogs/thesdlg.cxx @@ -155,10 +155,10 @@ void AlternativesString::Paint(const Point& rPos, SvTreeListBox& /*rDev*/, vcl:: vcl::Font aFont(rRenderContext.GetFont()); aFont.SetWeight(WEIGHT_BOLD); rRenderContext.SetFont(aFont); - aPos.X() = 0; + aPos.setX( 0 ); } else - aPos.X() += 5; + aPos.setX( aPos.X() + 5 ); rRenderContext.DrawText(aPos, GetText()); rRenderContext.Pop(); } @@ -262,7 +262,7 @@ void ThesaurusAlternativesCtrl::Paint(vcl::RenderContext& rRenderContext, const Size aTextSize(rRenderContext.GetTextWidth(m_pDialog->getErrStr()), rRenderContext.GetTextHeight()); aTextSize = rRenderContext.LogicToPixel(aTextSize); Point aPos; - aPos.X() += GetSizePixel().Width() / 2 - aTextSize.Width() / 2; + aPos.setX( aPos.X() + GetSizePixel().Width() / 2 - aTextSize.Width() / 2 ); aPos.Y() += 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 4c334d9bcbe2..0fbbce7611bd 100644 --- a/cui/source/options/dbregister.cxx +++ b/cui/source/options/dbregister.cxx @@ -362,7 +362,7 @@ IMPL_LINK( DbRegistrationOptionsPage, HeaderEndDrag_Impl, HeaderBar*, pBar, void for ( sal_uInt16 i = 1; i <= nTabs; ++i ) { long _nWidth = pBar->GetItemSize(i); - aSz.Width() = _nWidth + nTmpSz; + aSz.setWidth( _nWidth + nTmpSz ); nTmpSz += _nWidth; m_pPathBox->SetTab( i, PixelToLogic( aSz, MapMode(MapUnit::MapAppFont) ).Width() ); } diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx index fc2fc316d17c..c20b723a26be 100644 --- a/cui/source/options/optcolor.cxx +++ b/cui/source/options/optcolor.cxx @@ -472,7 +472,7 @@ void ColorConfigWindow_Impl::setAllocation(const Size &rAllocation) { Point aChildPos(0, 0); Size aChildSize(getLayoutRequisition(*m_pGrid)); - aChildSize.Width() = rAllocation.Width(); + aChildSize.setWidth( rAllocation.Width() ); setLayoutPosSize(*m_pGrid, aChildPos, aChildSize); AdjustScrollBar(); AdjustHeaderBar(); diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx index b279fd2e71ee..695f358a0346 100644 --- a/cui/source/options/optdict.cxx +++ b/cui/source/options/optdict.cxx @@ -508,7 +508,7 @@ void SvxEditDictionaryDialog::ShowWords_Impl( sal_uInt16 nId ) if(!pReplaceFT->IsVisible()) { Size aSize=pWordED->GetSizePixel(); - aSize.Width()=nWidth; + aSize.setWidth(nWidth ); pWordED->SetSizePixel(aSize); pReplaceFT->Show(); pReplaceED->Show(); @@ -522,7 +522,7 @@ void SvxEditDictionaryDialog::ShowWords_Impl( sal_uInt16 nId ) if(pReplaceFT->IsVisible()) { Size aSize=pWordED->GetSizePixel(); - aSize.Width()=pWordsLB->GetSizePixel().Width(); + aSize.setWidth(pWordsLB->GetSizePixel().Width() ); pWordED->SetSizePixel(aSize); pReplaceFT->Hide(); pReplaceED->Hide(); diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index 65e31e2ad69e..a0532772c7c1 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -244,10 +244,10 @@ void BrwStringDic_Impl::Paint(const Point& rPos, SvTreeListBox& /*rDev*/, vcl::R vcl::Font aFont(rRenderContext.GetFont()); aFont.SetWeight(WEIGHT_BOLD); rRenderContext.SetFont(aFont); - aPos.X() = 0; + aPos.setX( 0 ); } else - aPos.X() += 5; + aPos.setX( aPos.X() + 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.X() += 20; + aPos.setX( aPos.X() + 20 ); rRenderContext.DrawText(aPos, GetText()); if (rEntry.GetUserData()) { Point aNewPos(aPos); - aNewPos.X() += rRenderContext.GetTextWidth(GetText()); + aNewPos.setX( aNewPos.X() + rRenderContext.GetTextWidth(GetText()) ); rRenderContext.Push(PushFlags::FONT); vcl::Font aFont(rRenderContext.GetFont()); aFont.SetWeight(WEIGHT_BOLD); diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx index 234fcebefab5..a37566835a7b 100644 --- a/cui/source/options/optpath.cxx +++ b/cui/source/options/optpath.cxx @@ -705,7 +705,7 @@ IMPL_LINK( SvxPathTabPage, HeaderEndDrag_Impl, HeaderBar*, pBar, void ) for ( sal_uInt16 i = 1; i <= nTabs; ++i ) { long _nWidth = pBar->GetItemSize(i); - aSz.Width() = _nWidth + nTmpSz; + aSz.setWidth( _nWidth + nTmpSz ); nTmpSz += _nWidth; pPathBox->SetTab( i, PixelToLogic( aSz, MapMode(MapUnit::MapAppFont) ).Width() ); } diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index 30cecb45fbfd..61995dec8816 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.X() += rRenderContext.GetTextWidth(GetText()); + aNewPos.setX( aNewPos.X() + 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.X() += rRenderContext.GetTextWidth(sTxt); + aNewPos.setX( aNewPos.X() + rRenderContext.GetTextWidth(sTxt) ); if (bFett) rRenderContext.SetFont(aOldFont); diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index 637f73c34c59..c2e6b05f0631 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -237,36 +237,36 @@ void BackgroundPreviewImpl::recalcDrawPos() Size aSize = GetOutputSizePixel(); // InnerSize == Size without one pixel border Size aInnerSize = aSize; - aInnerSize.Width() -= 2; + aInnerSize.setWidth( aInnerSize.Width() - 2 ); aInnerSize.Height() -= 2; aDrawSize = pBitmap->GetSizePixel(); // bitmap bigger than preview window? if (aDrawSize.Width() > aInnerSize.Width()) { - aDrawSize.Height() = aDrawSize.Height() * aInnerSize.Width() / aDrawSize.Width(); + aDrawSize.setHeight( aDrawSize.Height() * aInnerSize.Width() / aDrawSize.Width() ); if (aDrawSize.Height() > aInnerSize.Height()) { - aDrawSize.Width() = aDrawSize.Height(); - aDrawSize.Height() = aInnerSize.Height(); + aDrawSize.setWidth( aDrawSize.Height() ); + aDrawSize.setHeight( aInnerSize.Height() ); } else - aDrawSize.Width() = aInnerSize.Width(); + aDrawSize.setWidth( aInnerSize.Width() ); } else if (aDrawSize.Height() > aInnerSize.Height()) { - aDrawSize.Width() = aDrawSize.Width() * aInnerSize.Height() / aDrawSize.Height(); + aDrawSize.setWidth( aDrawSize.Width() * aInnerSize.Height() / aDrawSize.Height() ); if (aDrawSize.Width() > aInnerSize.Width()) { - aDrawSize.Height() = aDrawSize.Width(); - aDrawSize.Width() = aInnerSize.Width(); + aDrawSize.setHeight( aDrawSize.Width() ); + aDrawSize.setWidth( aInnerSize.Width() ); } else - aDrawSize.Height() = aInnerSize.Height(); + aDrawSize.setHeight( aInnerSize.Height() ); } - aDrawPos.X() = (aSize.Width() - aDrawSize.Width()) / 2; - aDrawPos.Y() = (aSize.Height() - aDrawSize.Height()) / 2; + aDrawPos.setX( (aSize.Width() - aDrawSize.Width()) / 2 ); + aDrawPos.setY( (aSize.Height() - aDrawSize.Height()) / 2 ); } } diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index ee00a1f87ae8..1e641d05c688 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -465,7 +465,7 @@ namespace sal_uInt16 _nFontHeightWhich) { Size aSize = _rFont.GetFontSize(); - aSize.Width() = 0; + aSize.setWidth( 0 ); FontMetric aFontMetrics; OUString sFontName(_pFontNameLB->GetText()); bool bFontAvailable = _pFontList->IsAvailable( sFontName ); @@ -498,13 +498,13 @@ namespace nHeight = static_cast<long>(rOldItem.GetHeight() * _pFontSizeLB->GetValue() / 100); // conversion twips for the example-window - aSize.Height() = - ItemToControl( nHeight, _pPage->GetItemSet().GetPool()->GetMetric( _nFontHeightWhich ), FUNIT_TWIP ); + aSize.setHeight( + ItemToControl( nHeight, _pPage->GetItemSet().GetPool()->GetMetric( _nFontHeightWhich ), FUNIT_TWIP ) ); } else if ( !_pFontSizeLB->GetText().isEmpty() ) - aSize.Height() = PointToTwips( static_cast<long>(_pFontSizeLB->GetValue() / 10) ); + aSize.setHeight( PointToTwips( static_cast<long>(_pFontSizeLB->GetValue() / 10) ) ); else - aSize.Height() = 200; // default 10pt + aSize.setHeight( 200 ); // default 10pt aFontMetrics.SetFontSize( aSize ); _rFont.SetLanguage(_pLanguageLB->GetSelectLanguage()); @@ -530,11 +530,11 @@ void SvxCharNamePage::UpdatePreview_Impl() SvxFont& rCTLFont = GetPreviewCTLFont(); // Size Size aSize = rFont.GetFontSize(); - aSize.Width() = 0; + aSize.setWidth( 0 ); Size aCJKSize = rCJKFont.GetFontSize(); - aCJKSize.Width() = 0; + aCJKSize.setWidth( 0 ); Size aCTLSize = rCTLFont.GetFontSize(); - aCTLSize.Width() = 0; + aCTLSize.setWidth( 0 ); // Font const FontList* pFontList = GetFontList(); diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx index a6601edbe2cf..06cdf8997943 100644 --- a/cui/source/tabpages/grfpage.cxx +++ b/cui/source/tabpages/grfpage.cxx @@ -282,9 +282,9 @@ bool SvxGrfCropPage::FillItemSet(SfxItemSet *rSet) Size aTmpSz( aSz.GetSize() ); if( m_pWidthMF->IsValueChangedFromSaved() ) - aTmpSz.Width() = lcl_GetValue( *m_pWidthMF, eUnit ); + aTmpSz.setWidth( lcl_GetValue( *m_pWidthMF, eUnit ) ); if( m_pHeightMF->IsValueChangedFromSaved() ) - aTmpSz.Height() = lcl_GetValue( *m_pHeightMF, eUnit ); + aTmpSz.setHeight( lcl_GetValue( *m_pHeightMF, eUnit ) ); aSz.SetSize( aTmpSz ); m_pWidthMF->SaveValue(); m_pHeightMF->SaveValue(); @@ -794,9 +794,9 @@ void SvxCropExample::Paint(vcl::RenderContext& rRenderContext, const ::tools::Re aSz = rRenderContext.PixelToLogic(aSz); rRenderContext.SetFillColor(Color(COL_TRANSPARENT)); rRenderContext.SetRasterOp(RasterOp::Invert); - aRect.Left() += aTopLeft.Y(); + aRect.SetLeft( aRect.Left() + aTopLeft.Y() ); aRect.Top() += aTopLeft.X(); - aRect.Right() -= aBottomRight.Y(); + aRect.SetRight( aRect.Right() - aBottomRight.Y() ); aRect.Bottom() -= aBottomRight.X(); rRenderContext.DrawRect(aRect); } @@ -810,9 +810,9 @@ void SvxCropExample::SetFrameSize( const Size& rSz ) { aFrameSize = rSz; if(!aFrameSize.Width()) - aFrameSize.Width() = 1; + aFrameSize.setWidth( 1 ); if(!aFrameSize.Height()) - aFrameSize.Height() = 1; + aFrameSize.setHeight( 1 ); Size aWinSize( GetOutputSizePixel() ); Fraction aXScale( aWinSize.Width() * 4, aFrameSize.Width() * 5 ); Fraction aYScale( aWinSize.Height() * 4, aFrameSize.Height() * 5 ); diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx index 0ee4dcff56b2..b2a62800b2d3 100644 --- a/cui/source/tabpages/macroass.cxx +++ b/cui/source/tabpages/macroass.cxx @@ -396,7 +396,7 @@ void SfxMacroTabPage::InitAndSetHandler() rListBox.SetTabs( &nTabs[0] ); Size aSize( nTabs[ 2 ], 0 ); rHeaderBar.InsertItem( ITEMID_EVENT, mpImpl->sStrEvent, LogicToPixel( aSize, MapMode( MapUnit::MapAppFont ) ).Width() ); - aSize.Width() = 1764; // don't know what, so 42^2 is best to use... + aSize.setWidth( 1764 ); // don't know what, so 42^2 is best to use... rHeaderBar.InsertItem( ITMEID_ASSMACRO, mpImpl->sAssignedMacro, LogicToPixel( aSize, MapMode( MapUnit::MapAppFont ) ).Width() ); rListBox.SetSpaceBetweenEntries( 0 ); diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index db1845cca7bf..f1851f2b2def 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -2126,10 +2126,10 @@ IMPL_LINK( SvxNumOptionsTabPage, SizeHdl_Impl, Edit&, rField, void) if(bWidth) { long nDelta = nWidthVal - aInitSize[i].Width(); - aSize.Width() = nWidthVal; + aSize.setWidth( nWidthVal ); if (bRatio) { - aSize.Height() = aInitSize[i].Height() + static_cast<long>(static_cast<double>(nDelta) / fSizeRatio); + aSize.setHeight( aInitSize[i].Height() + static_cast<long>(static_cast<double>(nDelta) / fSizeRatio) ); m_pHeightMF->SetUserValue(m_pHeightMF->Normalize( OutputDevice::LogicToLogic( aSize.Height(), eCoreUnit, MapUnit::Map100thMM )), FUNIT_100TH_MM); @@ -2138,10 +2138,10 @@ IMPL_LINK( SvxNumOptionsTabPage, SizeHdl_Impl, Edit&, rField, void) else { long nDelta = nHeightVal - aInitSize[i].Height(); - aSize.Height() = nHeightVal; + aSize.setHeight( nHeightVal ); if (bRatio) { - aSize.Width() = aInitSize[i].Width() + static_cast<long>(static_cast<double>(nDelta) * fSizeRatio); + aSize.setWidth( aInitSize[i].Width() + static_cast<long>(static_cast<double>(nDelta) * fSizeRatio) ); m_pWidthMF->SetUserValue(m_pWidthMF->Normalize( OutputDevice::LogicToLogic( aSize.Width(), eCoreUnit, MapUnit::Map100thMM )), FUNIT_100TH_MM); @@ -2239,9 +2239,9 @@ static long lcl_DrawGraphic(VirtualDevice* pVDev, const SvxNumberFormat &rFmt, l if(pGrf) { Size aGSize( rFmt.GetGraphicSize() ); - aGSize.Width() /= nDivision; + aGSize.setWidth( aGSize.Width() / nDivision ); nRet = aGSize.Width(); - aGSize.Height() /= nDivision; + aGSize.setHeight( aGSize.Height() / nDivision ); pGrf->Draw( pVDev, Point(nXStart,nYMiddle - ( aGSize.Height() / 2) ), pVDev->PixelToLogic( aGSize ) ); } @@ -2259,13 +2259,13 @@ 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.Width() *= rFmt.GetBulletRelSize(); + aTmpSize.setWidth( aTmpSize.Width() * rFmt.GetBulletRelSize() ); aTmpSize.Width() /= 100 ; - aTmpSize.Height() *= rFmt.GetBulletRelSize(); + aTmpSize.setHeight( aTmpSize.Height() * rFmt.GetBulletRelSize() ); aTmpSize.Height() /= 100 ; // in case of a height of zero it is drawed in original height if(!aTmpSize.Height()) - aTmpSize.Height() = 1; + aTmpSize.setHeight( 1 ); aFont.SetFontSize(aTmpSize); aFont.SetTransparent(true); Color aBulletColor = rFmt.GetBulletColor(); diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx index 214eef745e01..643d5a14b438 100644 --- a/cui/source/tabpages/page.cxx +++ b/cui/source/tabpages/page.cxx @@ -105,10 +105,10 @@ SvxPageUsage PosToPageUsage_Impl( sal_uInt16 nPos ) Size GetMinBorderSpace_Impl( const SvxShadowItem& rShadow, const SvxBoxItem& rBox ) { Size aSz; - aSz.Height() = rShadow.CalcShadowSpace( SvxShadowItemSide::BOTTOM ) + rBox.CalcLineSpace( SvxBoxItemLine::BOTTOM ); - aSz.Height() += rShadow.CalcShadowSpace( SvxShadowItemSide::TOP ) + rBox.CalcLineSpace( SvxBoxItemLine::TOP ); + 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.Width() += rShadow.CalcShadowSpace( SvxShadowItemSide::RIGHT ) + rBox.CalcLineSpace( SvxBoxItemLine::RIGHT ); + aSz.setWidth( aSz.Width() + rShadow.CalcShadowSpace( SvxShadowItemSide::RIGHT ) + rBox.CalcLineSpace( SvxBoxItemLine::RIGHT ) ); return aSz; } diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx index d4015f1d3a10..b36af8cb8024 100644 --- a/cui/source/tabpages/tabstpge.cxx +++ b/cui/source/tabpages/tabstpge.cxx @@ -83,8 +83,8 @@ void TabWin_Impl::Paint(vcl::RenderContext& rRenderContext, const ::tools::Recta // Paint tabulators Point aPoint; Size aSize(GetOutputSizePixel()); - aPoint.X() = aSize.Width() / 2; - aPoint.Y() = aSize.Height() / 2; + aPoint.setX( aSize.Width() / 2 ); + aPoint.setY( aSize.Height() / 2 ); Ruler::DrawTab(rRenderContext, rRenderContext.GetSettings().GetStyleSettings().GetFontColor(), aPoint, nTabStyle); } diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx index aa45639d1e14..95b511223a16 100644 --- a/cui/source/tabpages/tparea.cxx +++ b/cui/source/tabpages/tparea.cxx @@ -70,9 +70,9 @@ namespace void lclExtendSize(Size& rSize, const Size& rInputSize) { if (rSize.Width() < rInputSize.Width()) - rSize.Width() = rInputSize.Width(); + rSize.setWidth( rInputSize.Width() ); if (rSize.Height() < rInputSize.Height()) - rSize.Height() = rInputSize.Height(); + rSize.setHeight( rInputSize.Height() ); } } // end anonymous namespace diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx index 46d3f519ffad..fa75e28873bf 100644 --- a/cui/source/tabpages/tpbitmap.cxx +++ b/cui/source/tabpages/tpbitmap.cxx @@ -237,13 +237,13 @@ bool SvxBitmapTabPage::FillItemSet( SfxItemSet* rAttrs ) sal_Int64 nHeightPercent = m_pBitmapHeight->Denormalize(m_pBitmapHeight->GetValue()); if(eStylePos == CUSTOM && m_pTsbScale->IsEnabled() && m_pTsbScale->GetState() == TRISTATE_TRUE) { - aSetBitmapSize.Width() = -nWidthPercent; - aSetBitmapSize.Height() = -nHeightPercent; + aSetBitmapSize.setWidth( -nWidthPercent ); + aSetBitmapSize.setHeight( -nHeightPercent ); } else { - aSetBitmapSize.Width() = static_cast<long>(nWidthPercent*rBitmapSize.Width()/100); - aSetBitmapSize.Height() = static_cast<long>(nHeightPercent*rBitmapSize.Height()/100); + aSetBitmapSize.setWidth( static_cast<long>(nWidthPercent*rBitmapSize.Width()/100) ); + aSetBitmapSize.setHeight( static_cast<long>(nHeightPercent*rBitmapSize.Height()/100) ); } break; } @@ -316,8 +316,8 @@ void SvxBitmapTabPage::Reset( const SfxItemSet* rAttrs ) { BitmapEx aBmpEx(pGraphicObject->GetGraphic().GetBitmapEx()); Size aTempBitmapSize = aBmpEx.GetSizePixel(); - rBitmapSize.Width() = ((OutputDevice::LogicToLogic(static_cast<sal_Int32>(aTempBitmapSize.Width()),MapUnit::MapPixel, MapUnit::Map100thMM )) / fUIScale); - rBitmapSize.Height() = ((OutputDevice::LogicToLogic(static_cast<sal_Int32>(aTempBitmapSize.Height()),MapUnit::MapPixel, MapUnit::Map100thMM )) / fUIScale); + rBitmapSize.setWidth( (OutputDevice::LogicToLogic(static_cast<sal_Int32>(aTempBitmapSize.Width()),MapUnit::MapPixel, MapUnit::Map100thMM )) / fUIScale ); + rBitmapSize.setHeight( (OutputDevice::LogicToLogic(static_cast<sal_Int32>(aTempBitmapSize.Height()),MapUnit::MapPixel, MapUnit::Map100thMM )) / fUIScale ); CalculateBitmapPresetSize(); } @@ -470,17 +470,17 @@ void SvxBitmapTabPage::CalculateBitmapPresetSize() if(std::abs(rBitmapSize.Width() - nObjectWidth) < std::abs(rBitmapSize.Height() - nObjectHeight)) { - rFilledSize.Width() = nObjectWidth; - rFilledSize.Height() = rBitmapSize.Height()*nObjectWidth/rBitmapSize.Width(); - rZoomedSize.Width() = rBitmapSize.Width()*nObjectHeight/rBitmapSize.Height(); - rZoomedSize.Height() = nObjectHeight; + rFilledSize.setWidth( nObjectWidth ); + rFilledSize.setHeight( rBitmapSize.Height()*nObjectWidth/rBitmapSize.Width() ); + rZoomedSize.setWidth( rBitmapSize.Width()*nObjectHeight/rBitmapSize.Height() ); + rZoomedSize.setHeight( nObjectHeight ); } else { - rFilledSize.Width() = rBitmapSize.Width()*nObjectHeight/rBitmapSize.Height(); - rFilledSize.Height() = nObjectHeight; - rZoomedSize.Width() = nObjectWidth; - rZoomedSize.Height() = rBitmapSize.Height()*nObjectWidth/rBitmapSize.Width(); + rFilledSize.setWidth( rBitmapSize.Width()*nObjectHeight/rBitmapSize.Height() ); + rFilledSize.setHeight( nObjectHeight ); + rZoomedSize.setWidth( nObjectWidth ); + rZoomedSize.setHeight( rBitmapSize.Height()*nObjectWidth/rBitmapSize.Width() ); } nFilledWidthPercent = static_cast<sal_Int64>(rFilledSize.Width()*100/rBitmapSize.Width()); @@ -531,8 +531,8 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ModifyBitmapHdl, ValueSet*, void) Size aTempBitmapSize = aBmpEx.GetSizePixel(); const double fUIScale = ( (mpView && mpView->GetModel()) ? double(mpView->GetModel()->GetUIScale()) : 1.0); - rBitmapSize.Width() = ((OutputDevice::LogicToLogic(static_cast<sal_Int32>(aTempBitmapSize.Width()),MapUnit::MapPixel, MapUnit::Map100thMM )) / fUIScale); - rBitmapSize.Height() = ((OutputDevice::LogicToLogic(static_cast<sal_Int32>(aTempBitmapSize.Height()),MapUnit::MapPixel, MapUnit::Map100thMM )) / fUIScale); + rBitmapSize.setWidth( (OutputDevice::LogicToLogic(static_cast<sal_Int32>(aTempBitmapSize.Width()),MapUnit::MapPixel, MapUnit::Map100thMM )) / fUIScale ); + rBitmapSize.setHeight( (OutputDevice::LogicToLogic(static_cast<sal_Int32>(aTempBitmapSize.Height()),MapUnit::MapPixel, MapUnit::Map100thMM )) / fUIScale ); CalculateBitmapPresetSize(); ModifyBitmapStyleHdl( *m_pBitmapStyleLB ); ModifyBitmapPositionHdl( *m_pPositionLB ); @@ -694,13 +694,13 @@ IMPL_LINK_NOARG( SvxBitmapTabPage, ModifyBitmapStyleHdl, ListBox&, void ) sal_Int64 nHeightPercent = m_pBitmapWidth->Denormalize( m_pBitmapHeight->GetValue() ); if(eStylePos == CUSTOM && m_pTsbScale->IsEnabled() && m_pTsbScale->GetState() == TRISTATE_TRUE) { - aSetBitmapSize.Width() = -nWidthPercent; - aSetBitmapSize.Height() = -nHeightPercent; + aSetBitmapSize.setWidth( -nWidthPercent ); + aSetBitmapSize.setHeight( -nHeightPercent ); } else { - aSetBitmapSize.Width() = static_cast<long>(nWidthPercent*rBitmapSize.Width()/100); - aSetBitmapSize.Height() = static_cast<long>(nHeightPercent*rBitmapSize.Height()/100); + aSetBitmapSize.setWidth( static_cast<long>(nWidthPercent*rBitmapSize.Width()/100) ); + aSetBitmapSize.setHeight( static_cast<long>(nHeightPercent*rBitmapSize.Height()/100) ); } } break; diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index 44a2b721c44e..0ae280830694 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -1719,22 +1719,22 @@ IMPL_LINK( SvxLineTabPage, SizeHdl_Impl, Edit&, rField, void) if(bWidth) { long nDelta = nWidthVal - m_aSymbolLastSize.Width(); - m_aSymbolSize.Width() = nWidthVal; + m_aSymbolSize.setWidth( nWidthVal ); if (bRatio) { - m_aSymbolSize.Height() = m_aSymbolLastSize.Height() + static_cast<long>(static_cast<double>(nDelta) / fSizeRatio); - m_aSymbolSize.Height() = OutputDevice::LogicToLogic( m_aSymbolSize.Height(), m_ePoolUnit, MapUnit::Map100thMM ); + m_aSymbolSize.setHeight( m_aSymbolLastSize.Height() + static_cast<long>(static_cast<double>(nDelta) / fSizeRatio) ); + m_aSymbolSize.setHeight( OutputDevice::LogicToLogic( m_aSymbolSize.Height(), m_ePoolUnit, MapUnit::Map100thMM ) ); m_pSymbolHeightMF->SetUserValue(m_pSymbolHeightMF->Normalize(m_aSymbolSize.Height()), FUNIT_100TH_MM); } } else { long nDelta = nHeightVal - m_aSymbolLastSize.Height(); - m_aSymbolSize.Height() = nHeightVal; + m_aSymbolSize.setHeight( nHeightVal ); if (bRatio) { - m_aSymbolSize.Width() = m_aSymbolLastSize.Width() + static_cast<long>(static_cast<double>(nDelta) * fSizeRatio); - m_aSymbolSize.Width() = OutputDevice::LogicToLogic( m_aSymbolSize.Width(), m_ePoolUnit, MapUnit::Map100thMM ); + m_aSymbolSize.setWidth( m_aSymbolLastSize.Width() + static_cast<long>(static_cast<double>(nDelta) * fSizeRatio) ); + m_aSymbolSize.setWidth( OutputDevice::LogicToLogic( m_aSymbolSize.Width(), m_ePoolUnit, MapUnit::Map100thMM ) ); m_pSymbolWidthMF->SetUserValue(m_pSymbolWidthMF->Normalize(m_aSymbolSize.Width()), FUNIT_100TH_MM); } } |