diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-05-15 11:27:44 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-05-16 08:45:17 +0200 |
commit | 98c4cd372bf0e9d4b5b129405f5af4562d8a0f64 (patch) | |
tree | f3aae749f01d0453a227b922a6ad3217171700d7 /framework | |
parent | 666901bc82fab69f9a80b564f97b5456d0ef684e (diff) |
loplugin:unusedfields improve write-only analysis
by whitelisting a couple of methods we know only write to their
parameters
Change-Id: Id7aef9c03c23d10c27707b21eb9a0db4a6c2757c
Reviewed-on: https://gerrit.libreoffice.org/37647
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'framework')
-rw-r--r-- | framework/inc/uielement/menubarmerger.hxx | 2 | ||||
-rw-r--r-- | framework/source/fwe/classes/addonsoptions.cxx | 2 | ||||
-rw-r--r-- | framework/source/uielement/menubarmerger.cxx | 4 |
3 files changed, 1 insertions, 7 deletions
diff --git a/framework/inc/uielement/menubarmerger.hxx b/framework/inc/uielement/menubarmerger.hxx index 1cced9978330..f5720da0c8b0 100644 --- a/framework/inc/uielement/menubarmerger.hxx +++ b/framework/inc/uielement/menubarmerger.hxx @@ -35,8 +35,6 @@ struct AddonMenuItem { OUString aTitle; OUString aURL; - OUString aTarget; - OUString aImageId; OUString aContext; AddonMenuContainer aSubMenu; }; diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx index 96cb03bdbc5f..adcf8b8b827f 100644 --- a/framework/source/fwe/classes/addonsoptions.cxx +++ b/framework/source/fwe/classes/addonsoptions.cxx @@ -970,7 +970,7 @@ void AddonsOptions_Impl::ReadStatusbarMergeInstructions( MergeStatusbarInstructi aNodePropValues[0] >>= aMergeStatusbarInstruction.aMergePoint; aNodePropValues[1] >>= aMergeStatusbarInstruction.aMergeCommand; aNodePropValues[2] >>= aMergeStatusbarInstruction.aMergeCommandParameter; - aNodePropValues[3] >>= aMergeStatusbarInstruction.aMergeFallback; + // aNodePropValues[3] >>= aMergeStatusbarInstruction.aMergeFallback; aNodePropValues[4] >>= aMergeStatusbarInstruction.aMergeContext; ReadMergeStatusbarData( aMergeAddonInstructionBase.makeStringAndClear(), diff --git a/framework/source/uielement/menubarmerger.cxx b/framework/source/uielement/menubarmerger.cxx index 8adb19f0b28e..7a9123cb96bb 100644 --- a/framework/source/uielement/menubarmerger.cxx +++ b/framework/source/uielement/menubarmerger.cxx @@ -396,8 +396,6 @@ void MenuBarMerger::GetMenuEntry( rAddonMenuEntry[i].Value >>= rAddonMenuItem.aURL; else if ( aMenuEntryPropName == ADDONSMENUITEM_STRING_TITLE ) rAddonMenuEntry[i].Value >>= rAddonMenuItem.aTitle; - else if ( aMenuEntryPropName == ADDONSMENUITEM_STRING_TARGET ) - rAddonMenuEntry[i].Value >>= rAddonMenuItem.aTarget; else if ( aMenuEntryPropName == ADDONSMENUITEM_STRING_SUBMENU ) { uno::Sequence< uno::Sequence< beans::PropertyValue > > aSubMenu; @@ -406,8 +404,6 @@ void MenuBarMerger::GetMenuEntry( } else if ( aMenuEntryPropName == ADDONSMENUITEM_STRING_CONTEXT ) rAddonMenuEntry[i].Value >>= rAddonMenuItem.aContext; - else if ( aMenuEntryPropName == ADDONSMENUITEM_STRING_IMAGEIDENTIFIER ) - rAddonMenuEntry[i].Value >>= rAddonMenuItem.aImageId; } } |