diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-11-09 07:44:45 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-11-13 12:27:08 +0100 |
| commit | e3290499009492e39e5ddd870d314bb5df494199 (patch) | |
| tree | 6ffaa7c199e74791ed1a2aa8a74a0a528509a02f /framework | |
| parent | 8709c643136eed67bc8f04ab9465b4a76085747c (diff) | |
loplugin singlevalfields improvement
checking for casting to void* turns out to mask useful stuff, so
remove that and just deal with a few extra false+
Change-Id: Id9700d7ceda90ba8fdb38aa870f13a7ca3acb668
Reviewed-on: https://gerrit.libreoffice.org/63145
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/inc/uielement/toolbarsmenucontroller.hxx | 2 | ||||
| -rw-r--r-- | framework/source/uielement/toolbarsmenucontroller.cxx | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/framework/inc/uielement/toolbarsmenucontroller.hxx b/framework/inc/uielement/toolbarsmenucontroller.hxx index 6328ed60c0c1..2ce73d2bc1de 100644 --- a/framework/inc/uielement/toolbarsmenucontroller.hxx +++ b/framework/inc/uielement/toolbarsmenucontroller.hxx @@ -93,8 +93,6 @@ namespace framework css::uno::Reference< css::ui::XUIConfigurationManager > m_xModuleCfgMgr; css::uno::Reference< css::ui::XUIConfigurationManager > m_xDocCfgMgr; OUString m_aModuleIdentifier; - OUString m_aPropUIName; - OUString m_aPropResourceURL; bool m_bResetActive; std::vector< OUString > m_aCommandVector; IntlWrapper m_aIntlWrapper; diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx index 4bf670c7f325..c5f554488800 100644 --- a/framework/source/uielement/toolbarsmenucontroller.cxx +++ b/framework/source/uielement/toolbarsmenucontroller.cxx @@ -123,11 +123,12 @@ DEFINE_XSERVICEINFO_MULTISERVICE_2 ( ToolbarsMenuController DEFINE_INIT_SERVICE ( ToolbarsMenuController, {} ) +static constexpr OUStringLiteral g_aPropUIName( "UIName" ); +static constexpr OUStringLiteral g_aPropResourceURL( "ResourceURL" ); + ToolbarsMenuController::ToolbarsMenuController( const css::uno::Reference< css::uno::XComponentContext >& xContext ) : svt::PopupMenuControllerBase( xContext ), m_xContext( xContext ), - m_aPropUIName( "UIName" ), - m_aPropResourceURL( "ResourceURL" ), m_bResetActive( false ), m_aIntlWrapper(SvtSysLocale().GetUILanguageTag()) { @@ -261,8 +262,8 @@ Sequence< Sequence< css::beans::PropertyValue > > ToolbarsMenuController::getLay } Sequence< css::beans::PropertyValue > aTbSeq( 2 ); - aTbSeq[0].Name = m_aPropUIName; - aTbSeq[1].Name = m_aPropResourceURL; + aTbSeq[0].Name = g_aPropUIName; + aTbSeq[1].Name = g_aPropResourceURL; Sequence< Sequence< css::beans::PropertyValue > > aSeq( aToolBarArray.size() ); const sal_uInt32 nCount = aToolBarArray.size(); |