summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-02-14 09:22:30 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-02-14 11:38:00 +0100
commitbf8a6cacd06d7c1961b5db8cc79ee4bbdb342e43 (patch)
tree3dd81e82c06ce5da82295e614aa5bf9252db2445 /framework
parente2372907c991833a8bbe13f84460783d8d8fdfdb (diff)
loplugin:changetoolsgen in filter..framework
Change-Id: I622da8a0c096c74efd97326451c4576b230f0483 Reviewed-on: https://gerrit.libreoffice.org/49701 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'framework')
-rw-r--r--framework/source/layoutmanager/helpers.cxx8
-rw-r--r--framework/source/layoutmanager/layoutmanager.cxx2
-rw-r--r--framework/source/layoutmanager/toolbarlayoutmanager.cxx24
-rw-r--r--framework/source/uiconfiguration/ImageList.cxx4
-rw-r--r--framework/source/uielement/addonstoolbarwrapper.cxx2
-rw-r--r--framework/source/uielement/toolbarmanager.cxx2
-rw-r--r--framework/source/uielement/toolbarwrapper.cxx4
7 files changed, 23 insertions, 23 deletions
diff --git a/framework/source/layoutmanager/helpers.cxx b/framework/source/layoutmanager/helpers.cxx
index 04adfdfc47d6..bf7af5e4a75d 100644
--- a/framework/source/layoutmanager/helpers.cxx
+++ b/framework/source/layoutmanager/helpers.cxx
@@ -236,10 +236,10 @@ css::awt::Rectangle putRectangleValueToAWT( const ::tools::Rectangle& rRect )
::tools::Rectangle putAWTToRectangle( const css::awt::Rectangle& rRect )
{
::tools::Rectangle aRect;
- aRect.Left() = rRect.X;
- aRect.Top() = rRect.Y;
- aRect.Right() = rRect.Width;
- aRect.Bottom() = rRect.Height;
+ aRect.SetLeft( rRect.X );
+ aRect.SetTop( rRect.Y );
+ aRect.SetRight( rRect.Width );
+ aRect.SetBottom( rRect.Height );
return aRect;
}
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index 894f1eafbad0..fcccda24afb7 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -2336,7 +2336,7 @@ bool LayoutManager::implts_doLayout( bool bForceRequestBorderSpace, bool bOuterR
// don't contain the status bar!
aStatusBarSize = implts_getStatusBarSize();
aContainerSize = implts_getContainerWindowOutputSize();
- aContainerSize.Height() -= aStatusBarSize.Height();
+ aContainerSize.setHeight( aContainerSize.Height() - aStatusBarSize.Height() );
if ( m_xToolbarManager.is() )
m_xToolbarManager->doLayout(aContainerSize);
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
index 09d16a7ae731..9243f6e6fe6c 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
@@ -334,13 +334,13 @@ tools::Rectangle ToolbarLayoutManager::implts_calcDockingArea()
nSize += aRowColumnSizes[i][j];
if ( i == sal_Int32(ui::DockingArea_DOCKINGAREA_TOP) )
- aBorderSpace.Top() = nSize;
+ aBorderSpace.SetTop( nSize );
else if ( i == sal_Int32(ui::DockingArea_DOCKINGAREA_BOTTOM) )
- aBorderSpace.Bottom() = nSize;
+ aBorderSpace.SetBottom( nSize );
else if ( i == sal_Int32(ui::DockingArea_DOCKINGAREA_LEFT) )
- aBorderSpace.Left() = nSize;
+ aBorderSpace.SetLeft( nSize );
else
- aBorderSpace.Right() = nSize;
+ aBorderSpace.SetRight( nSize );
}
}
@@ -1834,9 +1834,9 @@ void ToolbarLayoutManager::implts_getUIElementVectorCopy( UIElementVector& rCopy
aReadLock.clear();
if ( xTopDockingAreaWindow.is() )
- aSize.Width() = xTopDockingAreaWindow->getPosSize().Height;
+ aSize.setWidth( xTopDockingAreaWindow->getPosSize().Height );
if ( xBottomDockingAreaWindow.is() )
- aSize.Height() = xBottomDockingAreaWindow->getPosSize().Height;
+ aSize.setHeight( xBottomDockingAreaWindow->getPosSize().Height );
return aSize;
}
@@ -2576,10 +2576,10 @@ void ToolbarLayoutManager::implts_setLayoutInProgress( bool bInProgress )
{
::tools::Rectangle aRect( rRect );
- aRect.Left() -= nHotZoneOffset;
- aRect.Top() -= nHotZoneOffset;
- aRect.Right() += nHotZoneOffset;
- aRect.Bottom() += nHotZoneOffset;
+ aRect.SetLeft( aRect.Left() - nHotZoneOffset );
+ aRect.SetTop( aRect.Top() - nHotZoneOffset );
+ aRect.SetRight( aRect.Right() + nHotZoneOffset );
+ aRect.SetBottom( aRect.Bottom() + nHotZoneOffset );
return aRect;
}
@@ -3087,9 +3087,9 @@ void ToolbarLayoutManager::implts_setTrackingRect( ui::DockingArea eDockingArea,
{
::Point aPoint( rTrackingRect.TopLeft());
if ( isHorizontalDockingArea( eDockingArea ))
- aPoint.X() = rMousePos.X();
+ aPoint.setX( rMousePos.X() );
else
- aPoint.Y() = rMousePos.Y();
+ aPoint.setY( rMousePos.Y() );
rTrackingRect.SetPos( aPoint );
}
diff --git a/framework/source/uiconfiguration/ImageList.cxx b/framework/source/uiconfiguration/ImageList.cxx
index dbdb9459440f..3e39b08f45f8 100644
--- a/framework/source/uiconfiguration/ImageList.cxx
+++ b/framework/source/uiconfiguration/ImageList.cxx
@@ -63,7 +63,7 @@ BitmapEx ImageList::GetAsHorizontalStrip() const
sal_uInt16 nCount = GetImageCount();
if( !nCount )
return BitmapEx();
- aSize.Width() *= nCount;
+ aSize.setWidth( aSize.Width() * nCount );
// Load any stragglers
for (sal_uInt16 nIdx = 0; nIdx < nCount; nIdx++)
@@ -106,7 +106,7 @@ void ImageList::InsertFromHorizontalStrip( const BitmapEx &rBitmapEx,
Size aSize( rBitmapEx.GetSizePixel() );
DBG_ASSERT (rBitmapEx.GetSizePixel().Width() % nItems == 0,
"ImageList::InsertFromHorizontalStrip - very odd size");
- aSize.Width() /= nItems;
+ aSize.setWidth( aSize.Width() / nItems );
ImplInit( nItems, aSize );
for (sal_uInt16 nIdx = 0; nIdx < nItems; nIdx++)
diff --git a/framework/source/uielement/addonstoolbarwrapper.cxx b/framework/source/uielement/addonstoolbarwrapper.cxx
index ce9c61ede525..bcb8652aec58 100644
--- a/framework/source/uielement/addonstoolbarwrapper.cxx
+++ b/framework/source/uielement/addonstoolbarwrapper.cxx
@@ -130,7 +130,7 @@ void SAL_CALL AddonsToolBarWrapper::initialize( const Sequence< Any >& aArgument
pToolBar->EnableCustomize();
::Size aActSize( pToolBar->GetSizePixel() );
::Size aSize( pToolBar->CalcWindowSizePixel() );
- aSize.Width() = aActSize.Width();
+ aSize.setWidth( aActSize.Width() );
pToolBar->SetSizePixel( aSize );
}
}
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index 44596aec8a34..3d7228b76835 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -1563,7 +1563,7 @@ IMPL_LINK( ToolBarManager, MenuButton, ToolBox*, pToolBar, void )
::Size aActSize( pOverflowToolBar->GetSizePixel() );
::Size aSize( pOverflowToolBar->CalcWindowSizePixel() );
- aSize.Width() = aActSize.Width();
+ aSize.setWidth( aActSize.Width() );
pOverflowToolBar->SetOutputSizePixel( aSize );
aSize = pOverflowToolBar->CalcPopupWindowSizePixel();
diff --git a/framework/source/uielement/toolbarwrapper.cxx b/framework/source/uielement/toolbarwrapper.cxx
index b5b56f0ab070..5d681d8fa25c 100644
--- a/framework/source/uielement/toolbarwrapper.cxx
+++ b/framework/source/uielement/toolbarwrapper.cxx
@@ -170,7 +170,7 @@ void SAL_CALL ToolBarWrapper::initialize( const Sequence< Any >& aArguments )
pToolBar->EnableCustomize();
::Size aActSize( pToolBar->GetSizePixel() );
::Size aSize( pToolBar->CalcWindowSizePixel() );
- aSize.Width() = aActSize.Width();
+ aSize.setWidth( aActSize.Width() );
pToolBar->SetOutputSizePixel( aSize );
}
}
@@ -185,7 +185,7 @@ void SAL_CALL ToolBarWrapper::initialize( const Sequence< Any >& aArguments )
pToolBar->EnableCustomize();
::Size aActSize( pToolBar->GetSizePixel() );
::Size aSize( pToolBar->CalcWindowSizePixel() );
- aSize.Width() = aActSize.Width();
+ aSize.setWidth( aActSize.Width() );
pToolBar->SetOutputSizePixel( aSize );
}
}