diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-07-01 15:08:10 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-07-02 10:30:49 +0200 |
| commit | 7c610a2a74ca2bde7673b3ceee11c1b3f6b9d498 (patch) | |
| tree | ef333efac79c7e2eea2de1542488ee2565a506bf /svx | |
| parent | 7de66670069219c3507734aefc2d600a3bef2071 (diff) | |
loplugin:constantparam
Change-Id: I9fbfa6163c1d4650c52b00dc911972f07fe7c0e5
Reviewed-on: https://gerrit.libreoffice.org/56778
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/dialog/fntctrl.cxx | 10 | ||||
| -rw-r--r-- | svx/source/tbxctrls/tbcontrl.cxx | 5 |
2 files changed, 6 insertions, 9 deletions
diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx index 8dc5aabe8429..2cdbfbfb0372 100644 --- a/svx/source/dialog/fntctrl.cxx +++ b/svx/source/dialog/fntctrl.cxx @@ -1441,10 +1441,10 @@ Size SvxFontPrevWindow::GetOptimalSize() const return getPreviewStripSize(*this); } -void FontPrevWindow::ResetSettings(bool bForeground, bool bBackground) +void FontPrevWindow::ResetSettings() { - mbResetForeground = bForeground; - mbResetBackground = bBackground; + mbResetForeground = true; + mbResetBackground = true; Invalidate(); } @@ -1489,7 +1489,7 @@ void FontPrevWindow::SetDrawingArea(weld::DrawingArea* pDrawingArea) initFont(pImpl->maCJKFont); initFont(pImpl->maCTLFont); - ResetSettings(true, true); + ResetSettings(); } FontPrevWindow::FontPrevWindow() @@ -1514,7 +1514,7 @@ SvxFont& FontPrevWindow::GetCJKFont() void FontPrevWindow::StyleUpdated() { - ResetSettings(true, true); + ResetSettings(); CustomWidgetController::StyleUpdated(); } diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 3817aa6741f8..8548ea55946d 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -1364,8 +1364,7 @@ SvxColorWindow::SvxColorWindow(const OUString& rCommand, } } -ColorWindow::ColorWindow(const OUString& rCommand, - std::shared_ptr<PaletteManager> const & rPaletteManager, +ColorWindow::ColorWindow(std::shared_ptr<PaletteManager> const & rPaletteManager, BorderColorStatus& rBorderColorStatus, sal_uInt16 nSlotId, const Reference< XFrame >& rFrame, @@ -1375,7 +1374,6 @@ ColorWindow::ColorWindow(const OUString& rCommand, : ToolbarPopupBase(rFrame) , m_xBuilder(Application::CreateBuilder(pMenuButton, "svx/ui/colorwindow.ui")) , theSlotId(nSlotId) - , maCommand(rCommand) , mpParentWindow(pParentWindow) , mpMenuButton(pMenuButton) , mxPaletteManager(rPaletteManager) @@ -3788,7 +3786,6 @@ void ColorListBox::createColorWindow() EnsurePaletteManager(); m_xColorWindow.reset(new ColorWindow( - OUString() /*m_aCommandURL*/, m_xPaletteManager, m_aBorderColorStatus, 0, // slotID |