summaryrefslogtreecommitdiff
path: root/toolkit
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-02-21 14:43:13 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-02-22 07:22:33 +0100
commit8ec0f90a287febe661c89e098be457c5d593ded3 (patch)
treeb6facee7fd0cc0e77330c94202c4d75b788144ab /toolkit
parent8e7226233940a201c76c6a43e0648603d17961f4 (diff)
loplugin:changetoolsgen in tools..toolkit
Change-Id: I3d87ee59258567b5a82cb459248539faea1b3ca9 Reviewed-on: https://gerrit.libreoffice.org/50101 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'toolkit')
-rw-r--r--toolkit/source/awt/scrollabledialog.cxx4
-rw-r--r--toolkit/source/awt/vclxgraphics.cxx4
-rw-r--r--toolkit/source/awt/vclxwindow.cxx12
-rw-r--r--toolkit/source/awt/vclxwindows.cxx16
-rw-r--r--toolkit/source/controls/dialogcontrol.cxx4
-rw-r--r--toolkit/source/controls/stdtabcontroller.cxx4
-rw-r--r--toolkit/source/controls/tabpagemodel.cxx4
-rw-r--r--toolkit/source/helper/vclunohelper.cxx4
8 files changed, 26 insertions, 26 deletions
diff --git a/toolkit/source/awt/scrollabledialog.cxx b/toolkit/source/awt/scrollabledialog.cxx
index 0a808114a17f..3751ad5f29b9 100644
--- a/toolkit/source/awt/scrollabledialog.cxx
+++ b/toolkit/source/awt/scrollabledialog.cxx
@@ -138,13 +138,13 @@ void ScrollableDialog::SetScrollLeft( long nLeft )
void ScrollableDialog::SetScrollWidth( long nWidth )
{
- maScrollArea.Width() = nWidth;
+ maScrollArea.setWidth( nWidth );
ResetScrollBars();
}
void ScrollableDialog::SetScrollHeight( long nHeight )
{
- maScrollArea.Height() = nHeight;
+ maScrollArea.setHeight( nHeight );
ResetScrollBars();
}
diff --git a/toolkit/source/awt/vclxgraphics.cxx b/toolkit/source/awt/vclxgraphics.cxx
index e8496a105b6f..16a725bd8280 100644
--- a/toolkit/source/awt/vclxgraphics.cxx
+++ b/toolkit/source/awt/vclxgraphics.cxx
@@ -310,13 +310,13 @@ void VCLXGraphics::draw( const uno::Reference< awt::XDisplayBitmap >& rxBitmapHa
if(nDestWidth != nSourceWidth)
{
float zoomX = static_cast<float>(nDestWidth) / static_cast<float>(nSourceWidth);
- aSz.Width() = static_cast<long>(static_cast<float>(aSz.Width()) * zoomX);
+ aSz.setWidth( static_cast<long>(static_cast<float>(aSz.Width()) * zoomX) );
}
if(nDestHeight != nSourceHeight)
{
float zoomY = static_cast<float>(nDestHeight) / static_cast<float>(nSourceHeight);
- aSz.Height() = static_cast<long>(static_cast<float>(aSz.Height()) * zoomY);
+ aSz.setHeight( static_cast<long>(static_cast<float>(aSz.Height()) * zoomY) );
}
if(nSourceX || nSourceY || aSz.Width() != nSourceWidth || aSz.Height() != nSourceHeight)
diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx
index 0c2a44a51ce3..f6aa5766de20 100644
--- a/toolkit/source/awt/vclxwindow.cxx
+++ b/toolkit/source/awt/vclxwindow.cxx
@@ -895,8 +895,8 @@ Size VCLXWindow::ImplCalcWindowSize( const Size& rOutSz ) const
{
sal_Int32 nLeft, nTop, nRight, nBottom;
pWindow->GetBorder( nLeft, nTop, nRight, nBottom );
- aSz.Width() += nLeft+nRight;
- aSz.Height() += nTop+nBottom;
+ aSz.AdjustWidth(nLeft+nRight );
+ aSz.AdjustHeight(nTop+nBottom );
}
return aSz;
}
@@ -2166,8 +2166,8 @@ css::awt::Size VCLXWindow::getMinimumSize( )
switch ( nWinType )
{
case WindowType::CONTROL:
- aSz.Width() = GetWindow()->GetTextWidth( GetWindow()->GetText() )+2*12;
- aSz.Height() = GetWindow()->GetTextHeight()+2*6;
+ aSz.setWidth( GetWindow()->GetTextWidth( GetWindow()->GetText() )+2*12 );
+ aSz.setHeight( GetWindow()->GetTextHeight()+2*6 );
break;
case WindowType::PATTERNBOX:
@@ -2177,8 +2177,8 @@ css::awt::Size VCLXWindow::getMinimumSize( )
case WindowType::DATEBOX:
case WindowType::TIMEBOX:
case WindowType::LONGCURRENCYBOX:
- aSz.Width() = GetWindow()->GetTextWidth( GetWindow()->GetText() )+2*2;
- aSz.Height() = GetWindow()->GetTextHeight()+2*2;
+ aSz.setWidth( GetWindow()->GetTextWidth( GetWindow()->GetText() )+2*2 );
+ aSz.setHeight( GetWindow()->GetTextHeight()+2*2 );
break;
case WindowType::SCROLLBARBOX:
return VCLXScrollBar::implGetMinimumSize( GetWindow() );
diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx
index d984f94f66a1..a2dd7d4873a6 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -469,14 +469,14 @@ css::awt::Size VCLXButton::calcAdjustedSize( const css::awt::Size& rNewSize )
if ( pButton->GetText().isEmpty() )
{
if ( aSz.Width() < aMinSz.Width() )
- aSz.Width() = aMinSz.Width();
+ aSz.setWidth( aMinSz.Width() );
if ( aSz.Height() < aMinSz.Height() )
- aSz.Height() = aMinSz.Height();
+ aSz.setHeight( aMinSz.Height() );
}
else
{
if ( ( aSz.Width() > aMinSz.Width() ) && ( aSz.Height() < aMinSz.Height() ) )
- aSz.Height() = aMinSz.Height();
+ aSz.setHeight( aMinSz.Height() );
else
aSz = aMinSz;
}
@@ -937,7 +937,7 @@ css::awt::Size VCLXCheckBox::calcAdjustedSize( const css::awt::Size& rNewSize )
{
Size aMinSz = pCheckBox->CalcMinimumSize();
if ( ( aSz.Width() > aMinSz.Width() ) && ( aSz.Height() < aMinSz.Height() ) )
- aSz.Height() = aMinSz.Height();
+ aSz.setHeight( aMinSz.Height() );
else
aSz = aMinSz;
}
@@ -1279,7 +1279,7 @@ css::awt::Size VCLXRadioButton::calcAdjustedSize( const css::awt::Size& rNewSize
{
Size aMinSz = pRadioButton->CalcMinimumSize();
if ( ( aSz.Width() > aMinSz.Width() ) && ( aSz.Height() < aMinSz.Height() ) )
- aSz.Height() = aMinSz.Height();
+ aSz.setHeight( aMinSz.Height() );
else
aSz = aMinSz;
}
@@ -1979,7 +1979,7 @@ css::awt::Size VCLXListBox::getPreferredSize( )
{
aSz = pListBox->CalcMinimumSize();
if ( pListBox->GetStyle() & WB_DROPDOWN )
- aSz.Height() += 4;
+ aSz.AdjustHeight(4 );
}
return AWTSize(aSz);
}
@@ -4025,7 +4025,7 @@ css::awt::Size VCLXEdit::getPreferredSize( )
if ( pEdit )
{
aSz = pEdit->CalcMinimumSize();
- aSz.Height() += 4;
+ aSz.AdjustHeight(4 );
}
return AWTSize(aSz);
}
@@ -4451,7 +4451,7 @@ css::awt::Size VCLXComboBox::getPreferredSize( )
{
aSz = pComboBox->CalcMinimumSize();
if ( pComboBox->GetStyle() & WB_DROPDOWN )
- aSz.Height() += 4;
+ aSz.AdjustHeight(4 );
}
return AWTSize(aSz);
}
diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx
index edb95a6f3a94..05458dd13f05 100644
--- a/toolkit/source/controls/dialogcontrol.cxx
+++ b/toolkit/source/controls/dialogcontrol.cxx
@@ -502,8 +502,8 @@ void SAL_CALL UnoDialogControl::windowResized( const css::awt::WindowEvent& e )
if ( xDialogDevice.is() && mbDesignMode )
{
DeviceInfo aDeviceInfo( xDialogDevice->getInfo() );
- aAppFontSize.Width() -= aDeviceInfo.LeftInset + aDeviceInfo.RightInset;
- aAppFontSize.Height() -= aDeviceInfo.TopInset + aDeviceInfo.BottomInset;
+ aAppFontSize.AdjustWidth( -(aDeviceInfo.LeftInset + aDeviceInfo.RightInset) );
+ aAppFontSize.AdjustHeight( -(aDeviceInfo.TopInset + aDeviceInfo.BottomInset) );
}
aAppFontSize = ImplMapPixelToAppFont( pOutDev, aAppFontSize );
diff --git a/toolkit/source/controls/stdtabcontroller.cxx b/toolkit/source/controls/stdtabcontroller.cxx
index bf8a8192a58a..0b1c48045ea9 100644
--- a/toolkit/source/controls/stdtabcontroller.cxx
+++ b/toolkit/source/controls/stdtabcontroller.cxx
@@ -262,8 +262,8 @@ void StdTabController::autoTabOrder( )
ComponentEntry* pE = new ComponentEntry;
pE->pComponent = pC;
awt::Rectangle aPosSize = pC->getPosSize();
- pE->aPos.X() = aPosSize.X;
- pE->aPos.Y() = aPosSize.Y;
+ pE->aPos.setX( aPosSize.X );
+ pE->aPos.setY( aPosSize.Y );
ComponentEntryList::size_type nPos;
for ( nPos = 0; nPos < aCtrls.size(); nPos++ )
diff --git a/toolkit/source/controls/tabpagemodel.cxx b/toolkit/source/controls/tabpagemodel.cxx
index 73a10f3c5461..e80407ef5780 100644
--- a/toolkit/source/controls/tabpagemodel.cxx
+++ b/toolkit/source/controls/tabpagemodel.cxx
@@ -247,8 +247,8 @@ void SAL_CALL UnoControlTabPage::windowResized( const css::awt::WindowEvent& e )
if ( xDialogDevice.is() )
{
DeviceInfo aDeviceInfo( xDialogDevice->getInfo() );
- aAppFontSize.Width() -= aDeviceInfo.LeftInset + aDeviceInfo.RightInset;
- aAppFontSize.Height() -= aDeviceInfo.TopInset + aDeviceInfo.BottomInset;
+ aAppFontSize.AdjustWidth( -(aDeviceInfo.LeftInset + aDeviceInfo.RightInset) );
+ aAppFontSize.AdjustHeight( -(aDeviceInfo.TopInset + aDeviceInfo.BottomInset) );
}
aAppFontSize = ImplMapPixelToAppFont( pOutDev, aAppFontSize );
diff --git a/toolkit/source/helper/vclunohelper.cxx b/toolkit/source/helper/vclunohelper.cxx
index cd8a2e5c4e25..904e520fd0ea 100644
--- a/toolkit/source/helper/vclunohelper.cxx
+++ b/toolkit/source/helper/vclunohelper.cxx
@@ -179,8 +179,8 @@ tools::Polygon VCLUnoHelper::CreatePolygon( const css::uno::Sequence< sal_Int32
for ( sal_Int32 n = 0; n < nLen; n++ )
{
Point aPnt;
- aPnt.X() = pDataX[n];
- aPnt.Y() = pDataY[n];
+ aPnt.setX( pDataX[n] );
+ aPnt.setY( pDataY[n] );
aPoly[n] = aPnt;
}
return aPoly;