diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-02-16 11:56:18 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-02-16 15:13:53 +0100 |
| commit | 1d180f48bc61444c610c35083e35745d38c6cce2 (patch) | |
| tree | e580741aa902908a9fcf0c4b224e93ff42da1405 /framework | |
| parent | 26783527823883ccd5bbf3b9e014a0a3c1e3a022 (diff) | |
Revert "loplugin:changetoolsgen in filter..framework" and reapply plugin
because I
(a) forgot to insert parentheses which changes the meaning of some expressions and
(b) I now use the AdjustFoo calls when changing unary operations, which reads much better
This reverts commit bf8a6cacd06d7c1961b5db8cc79ee4bbdb342e43.
Change-Id: I4b5a9bf0c38ee1b57af91e6b7f184f1e8807f6f7
Reviewed-on: https://gerrit.libreoffice.org/49843
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/layoutmanager/layoutmanager.cxx | 2 | ||||
| -rw-r--r-- | framework/source/layoutmanager/toolbarlayoutmanager.cxx | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index fcccda24afb7..f03b50500827 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.setHeight( aContainerSize.Height() - aStatusBarSize.Height() ); + aContainerSize.AdjustHeight( -(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 9243f6e6fe6c..c261e2bc23ae 100644 --- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx +++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx @@ -2576,10 +2576,10 @@ void ToolbarLayoutManager::implts_setLayoutInProgress( bool bInProgress ) { ::tools::Rectangle aRect( rRect ); - aRect.SetLeft( aRect.Left() - nHotZoneOffset ); - aRect.SetTop( aRect.Top() - nHotZoneOffset ); - aRect.SetRight( aRect.Right() + nHotZoneOffset ); - aRect.SetBottom( aRect.Bottom() + nHotZoneOffset ); + aRect.AdjustLeft( -nHotZoneOffset ); + aRect.AdjustTop( -nHotZoneOffset ); + aRect.AdjustRight(nHotZoneOffset ); + aRect.AdjustBottom(nHotZoneOffset ); return aRect; } |