diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-05-15 15:21:22 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-05-16 09:04:55 +0200 |
commit | 196f46db1b5dfddda6972a6b738d8b77b6c3601e (patch) | |
tree | 3264b328e2479c38f08e7db7e2f1e93df7c3539a /sd | |
parent | 19b4520fbfa8080821021586d8fe3428a2a893af (diff) |
loplugin:constantparam
Change-Id: I0110e0c662004456e4bc8f8082e2e2fea59e0148
Reviewed-on: https://gerrit.libreoffice.org/54385
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd')
-rw-r--r-- | sd/source/ui/table/TableDesignPane.cxx | 21 | ||||
-rw-r--r-- | sd/source/ui/table/TableDesignPane.hxx | 7 |
2 files changed, 8 insertions, 20 deletions
diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx index 5e1114ea5e51..1a61bf6f100e 100644 --- a/sd/source/ui/table/TableDesignPane.cxx +++ b/sd/source/ui/table/TableDesignPane.cxx @@ -84,25 +84,16 @@ static const OUStringLiteral gPropNames[CB_COUNT] = "UseBandingColumnStyle" }; -TableDesignWidget::TableDesignWidget( VclBuilderContainer* pParent, ViewShellBase& rBase, bool bModal ) +TableDesignWidget::TableDesignWidget( VclBuilderContainer* pParent, ViewShellBase& rBase ) : mrBase(rBase) - , mbModal(bModal) , mbStyleSelected(false) , mbOptionsChanged(false) { pParent->get(m_pValueSet, "previews"); m_pValueSet->SetStyle(m_pValueSet->GetStyle() | WB_NO_DIRECTSELECT | WB_FLATVALUESET | WB_ITEMBORDER); m_pValueSet->SetExtraSpacing(8); - m_pValueSet->setModal(mbModal); - if( !mbModal ) - { - m_pValueSet->SetColor(); - } - else - { - m_pValueSet->SetColor( COL_WHITE ); - m_pValueSet->SetBackground( COL_WHITE ); - } + m_pValueSet->setModal(false); + m_pValueSet->SetColor(); m_pValueSet->SetSelectHdl (LINK(this, TableDesignWidget, implValueSetHdl)); for (sal_uInt16 i = CB_HEADER_ROW; i <= CB_BANDED_COLUMNS; ++i) @@ -156,8 +147,7 @@ static SfxDispatcher* getDispatcher( ViewShellBase const & rBase ) IMPL_LINK_NOARG(TableDesignWidget, implValueSetHdl, ValueSet*, void) { mbStyleSelected = true; - if( !mbModal ) - ApplyStyle(); + ApplyStyle(); } void TableDesignWidget::ApplyStyle() @@ -214,8 +204,7 @@ IMPL_LINK_NOARG(TableDesignWidget, implCheckBoxHdl, Button*, void) { mbOptionsChanged = true; - if( !mbModal ) - ApplyOptions(); + ApplyOptions(); FillDesignPreviewControl(); } diff --git a/sd/source/ui/table/TableDesignPane.hxx b/sd/source/ui/table/TableDesignPane.hxx index 347e4ed980c2..8c631dceeb3b 100644 --- a/sd/source/ui/table/TableDesignPane.hxx +++ b/sd/source/ui/table/TableDesignPane.hxx @@ -69,7 +69,7 @@ public: class TableDesignWidget final { public: - TableDesignWidget( VclBuilderContainer* pParent, ViewShellBase& rBase, bool bModal ); + TableDesignWidget( VclBuilderContainer* pParent, ViewShellBase& rBase ); ~TableDesignWidget(); // callbacks @@ -102,7 +102,6 @@ private: css::uno::Reference< css::drawing::XDrawView > mxView; css::uno::Reference< css::container::XIndexAccess > mxTableFamily; - bool mbModal; bool mbStyleSelected; bool mbOptionsChanged; }; @@ -115,13 +114,13 @@ public: TableDesignPane( vcl::Window* pParent, ViewShellBase& rBase ) : PanelLayout(pParent, "TableDesignPanel", "modules/simpress/ui/tabledesignpanel.ui", css::uno::Reference<css::frame::XFrame>()) - , aImpl(this, rBase, false) + , aImpl(this, rBase) { } TableDesignPane( vcl::Window* pParent, ViewShellBase& rBase, bool ) : PanelLayout(pParent, "TableDesignPanel", "modules/simpress/ui/tabledesignpanelhorizontal.ui", css::uno::Reference<css::frame::XFrame>()) - , aImpl(this, rBase, false) + , aImpl(this, rBase) { } }; |