[Libreoffice-commits] core.git: compilerplugins/clang framework/inc framework/source
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Sat Aug 29 19:03:21 UTC 2020
compilerplugins/clang/unusedfields.only-used-in-constructor.results | 30 ++++------
compilerplugins/clang/unusedfields.readonly.results | 18 ++----
compilerplugins/clang/unusedfields.untouched.results | 20 ++----
compilerplugins/clang/unusedfields.writeonly.results | 24 ++++----
framework/inc/uielement/menubarmanager.hxx | 1
framework/inc/uielement/toolbarmerger.hxx | 1
framework/source/uielement/menubarmanager.cxx | 5 -
framework/source/uielement/toolbarmanager.cxx | 1
framework/source/uielement/toolbarmerger.cxx | 1
9 files changed, 40 insertions(+), 61 deletions(-)
New commits:
commit 74123ac84cb632434d3b88168bb8494307253b00
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Sat Aug 29 08:51:30 2020 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Sat Aug 29 21:02:35 2020 +0200
loplugin:unusedfields
Change-Id: I3f14647eed72898b641fbd583d18f914c7461628
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101630
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/compilerplugins/clang/unusedfields.only-used-in-constructor.results b/compilerplugins/clang/unusedfields.only-used-in-constructor.results
index 47ed56264dfd..a66a8db6d3eb 100644
--- a/compilerplugins/clang/unusedfields.only-used-in-constructor.results
+++ b/compilerplugins/clang/unusedfields.only-used-in-constructor.results
@@ -132,11 +132,9 @@ cui/source/dialogs/colorpicker.cxx:736
cui::(anonymous namespace)::ColorPickerDialog m_aColorPrevious class cui::(anonymous namespace)::ColorPreviewControl
cui/source/factory/dlgfact.cxx:1410
(anonymous namespace)::SvxMacroAssignDialog m_aItems class SfxItemSet
-cui/source/inc/AdditionsDialog.hxx:46
+cui/source/inc/AdditionsDialog.hxx:57
AdditionInfo sReleaseVersion class rtl::OUString
-cui/source/inc/AdditionsDialog.hxx:50
- AdditionInfo sRating class rtl::OUString
-cui/source/inc/AdditionsDialog.hxx:80
+cui/source/inc/AdditionsDialog.hxx:94
AdditionsDialog m_sTag class rtl::OString
cui/source/inc/cfgutil.hxx:241
SvxScriptSelectorDialog m_aStylesInfo struct SfxStylesInfo_Impl
@@ -176,10 +174,6 @@ dbaccess/source/core/dataaccess/connection.hxx:102
dbaccess::OConnection m_nInAppend std::atomic<std::size_t>
dbaccess/source/core/inc/databasecontext.hxx:85
dbaccess::ODatabaseContext m_aBasicDLL class BasicDLL
-dbaccess/source/ui/inc/dbtreelistbox.hxx:40
- dbaui::DBTreeEditedEntry aNewText class rtl::OUString
-desktop/qa/desktop_lib/test_desktop_lib.cxx:2832
- class AllSettings &
drawinglayer/inc/texture/texture3d.hxx:57
drawinglayer::texture::GeoTexSvxBitmapEx maBitmap class Bitmap
drawinglayer/inc/texture/texture3d.hxx:59
@@ -756,6 +750,8 @@ sw/source/core/text/inftxt.hxx:682
SwTextSlot aText class rtl::OUString
sw/source/core/text/porfld.cxx:140
(anonymous namespace)::SwFieldSlot aText class rtl::OUString
+sw/source/core/text/porlay.cxx:1312
+ const sw::MergedPara *const &
sw/source/uibase/docvw/romenu.hxx:34
SwReadOnlyPopup m_aBuilder class VclBuilder
sw/source/uibase/docvw/romenu.hxx:46
@@ -806,9 +802,9 @@ vcl/inc/salmenu.hxx:43
SalMenuButtonItem maImage class Image
vcl/inc/salmenu.hxx:44
SalMenuButtonItem maToolTipText class rtl::OUString
-vcl/inc/salvtables.hxx:559
+vcl/inc/salvtables.hxx:561
SalInstanceEntry m_aTextFilter class WeldTextFilter
-vcl/inc/salvtables.hxx:939
+vcl/inc/salvtables.hxx:941
SalInstanceComboBoxWithEdit m_aTextFilter class WeldTextFilter
vcl/inc/svimpbox.hxx:120
SvImpLBox m_aFctSet class ImpLBSelEng
@@ -856,19 +852,19 @@ vcl/unx/gtk3/gtk3gloactiongroup.cxx:27
(anonymous namespace)::GLOAction parent_instance GObject
vcl/unx/gtk3/gtk3glomenu.cxx:14
GLOMenu parent_instance const GMenuModel
-vcl/unx/gtk3/gtk3gtkinst.cxx:4822
+vcl/unx/gtk3/gtk3gtkinst.cxx:4820
(anonymous namespace)::GtkInstanceAssistant m_pButtonBox GtkButtonBox *
-vcl/unx/gtk3/gtk3gtkinst.cxx:5195
+vcl/unx/gtk3/gtk3gtkinst.cxx:5193
(anonymous namespace)::CrippledViewport viewport GtkViewport
-vcl/unx/gtk3/gtk3gtkinst.cxx:5339
+vcl/unx/gtk3/gtk3gtkinst.cxx:5337
(anonymous namespace)::CustomCellRendererSurface parent GtkCellRendererText
-vcl/unx/gtk3/gtk3gtkinst.cxx:5347
+vcl/unx/gtk3/gtk3gtkinst.cxx:5345
(anonymous namespace)::CustomCellRendererSurfaceClass parent_class GtkCellRendererTextClass
-vcl/unx/gtk3/gtk3gtkinst.cxx:13202
+vcl/unx/gtk3/gtk3gtkinst.cxx:13266
(anonymous namespace)::GtkInstanceComboBox m_pOverlay GtkOverlay *
-vcl/unx/gtk3/gtk3gtkinst.cxx:13208
+vcl/unx/gtk3/gtk3gtkinst.cxx:13272
(anonymous namespace)::GtkInstanceComboBox m_pMenuTextRenderer GtkCellRenderer *
-writerfilter/source/dmapper/PropertyMap.hxx:219
+writerfilter/source/dmapper/PropertyMap.hxx:220
writerfilter::dmapper::SectionPropertyMap m_nDebugSectionNumber sal_Int32
xmloff/source/chart/transporttypes.hxx:149
CustomLabelField sRuns std::vector<OUString>
diff --git a/compilerplugins/clang/unusedfields.readonly.results b/compilerplugins/clang/unusedfields.readonly.results
index aaf2e2b2c1f8..468015125711 100644
--- a/compilerplugins/clang/unusedfields.readonly.results
+++ b/compilerplugins/clang/unusedfields.readonly.results
@@ -178,12 +178,12 @@ dbaccess/source/core/inc/ContentHelper.hxx:103
dbaccess::OContentHelper m_aErrorHelper const ::connectivity::SQLError
dbaccess/source/filter/hsqldb/parseschema.hxx:35
dbahsql::SchemaParser m_PrimaryKeys std::map<OUString, std::vector<OUString> >
-dbaccess/source/ui/control/tabletree.cxx:195
+dbaccess/source/ui/control/tabletree.cxx:132
dbaui::(anonymous namespace)::OViewSetter m_aEqualFunctor ::comphelper::UStringMixEqual
dbaccess/source/ui/inc/charsetlistbox.hxx:44
dbaui::CharSetListBox m_aCharSets class dbaui::OCharsetDisplay
-dbaccess/source/ui/inc/directsql.hxx:69
- dbaui::DirectSQLDialog m_aColorConfig const svtools::ColorConfig
+dbaccess/source/ui/inc/sqledit.hxx:41
+ dbaui::SQLEditView m_aColorConfig const svtools::ColorConfig
dbaccess/source/ui/inc/WCopyTable.hxx:259
dbaui::OCopyTableWizard m_aLocale css::lang::Locale
drawinglayer/inc/processor3d/defaultprocessor3d.hxx:87
@@ -326,8 +326,6 @@ include/sfx2/sidebar/ResourceManager.hxx:110
sfx2::sidebar::ResourceManager maMiscOptions class SvtMiscOptions
include/svl/ondemand.hxx:55
OnDemandLocaleDataWrapper aSysLocale class SvtSysLocale
-include/svtools/editsyntaxhighlighter.hxx:32
- MultiLineEditSyntaxHighlight m_aColorConfig svtools::ColorConfig
include/svx/graphctl.hxx:52
GraphCtrl xVD ScopedVclPtrInstance<class VirtualDevice>
include/svx/sdr/overlay/overlayanimatedbitmapex.hxx:49
@@ -582,7 +580,7 @@ sw/inc/acmplwrd.hxx:42
SwAutoCompleteWord m_LookupTree editeng::Trie
sw/inc/breakit.hxx:38
SwBreakIt m_xLanguageTag std::unique_ptr<LanguageTag>
-sw/inc/calc.hxx:197
+sw/inc/calc.hxx:202
SwCalc m_aSysLocale class SvtSysLocale
sw/inc/dpage.hxx:35
SwDPage pGridLst std::unique_ptr<SdrPageGridFrameList>
@@ -634,7 +632,7 @@ sw/source/uibase/dbui/mmconfigitem.cxx:116
SwMailMergeConfigItem_Impl m_aNeutralGreetingLines std::vector<OUString>
sw/source/uibase/inc/fldmgr.hxx:79
SwInsertField_Data m_aDBDataSource css::uno::Any
-toolkit/source/awt/vclxtoolkit.cxx:435
+toolkit/source/awt/vclxtoolkit.cxx:436
(anonymous namespace)::VCLXToolkit mxSelection css::uno::Reference<css::datatransfer::clipboard::XClipboard>
ucb/source/ucp/gio/gio_mount.hxx:74
OOoMountOperationClass parent_class GMountOperationClass
@@ -696,9 +694,9 @@ unoidl/source/sourceprovider-scanner.hxx:249
unoidl::detail::SourceProviderAccumulationBasedServiceEntityPad directMandatoryBaseInterfaces std::vector<unoidl::AnnotatedReference>
unoidl/source/sourceprovider-scanner.hxx:250
unoidl::detail::SourceProviderAccumulationBasedServiceEntityPad directOptionalBaseInterfaces std::vector<unoidl::AnnotatedReference>
-unoidl/source/unoidl-read.cxx:146
- (anonymous namespace)::Entity dependencies std::set<OUString>
unoidl/source/unoidl-read.cxx:147
+ (anonymous namespace)::Entity dependencies std::set<OUString>
+unoidl/source/unoidl-read.cxx:148
(anonymous namespace)::Entity interfaceDependencies std::set<OUString>
unoidl/source/unoidlprovider.cxx:86
unoidl::detail::(anonymous namespace)::Memory16 byte unsigned char [2]
@@ -1000,8 +998,6 @@ vcl/source/treelist/headbar.cxx:41
ImplHeadItem maHelpId class rtl::OString
vcl/source/treelist/headbar.cxx:42
ImplHeadItem maImage class Image
-vcl/source/window/menuitemlist.hxx:56
- MenuItemData aAccessibleName class rtl::OUString
vcl/unx/gtk3/a11y/atkwrapper.hxx:47
AtkObjectWrapper aParent AtkObject
vcl/unx/gtk3/a11y/atkwrapper.hxx:75
diff --git a/compilerplugins/clang/unusedfields.untouched.results b/compilerplugins/clang/unusedfields.untouched.results
index 5a332fdc1427..746700e1d380 100644
--- a/compilerplugins/clang/unusedfields.untouched.results
+++ b/compilerplugins/clang/unusedfields.untouched.results
@@ -36,18 +36,12 @@ cppu/source/threadpool/threadpool.cxx:365
_uno_ThreadPool dummy sal_Int32
cppu/source/typelib/typelib.cxx:60
(anonymous namespace)::AlignSize_Impl nInt16 sal_Int16
-cui/source/inc/AdditionsDialog.hxx:46
+cui/source/inc/AdditionsDialog.hxx:57
AdditionInfo sReleaseVersion class rtl::OUString
-cui/source/inc/AdditionsDialog.hxx:50
- AdditionInfo sRating class rtl::OUString
dbaccess/source/core/inc/databasecontext.hxx:85
dbaccess::ODatabaseContext m_aBasicDLL class BasicDLL
dbaccess/source/sdbtools/inc/connectiondependent.hxx:115
sdbtools::ConnectionDependentComponent::EntryGuard m_aMutexGuard ::osl::MutexGuard
-dbaccess/source/ui/inc/dbtreelistbox.hxx:40
- dbaui::DBTreeEditedEntry aNewText class rtl::OUString
-desktop/qa/desktop_lib/test_desktop_lib.cxx:2832
- class AllSettings &
emfio/source/emfuno/xemfparser.cxx:48
emfio::emfreader::(anonymous namespace)::XEmfParser context_ uno::Reference<uno::XComponentContext>
extensions/source/scanner/scanner.hxx:43
@@ -96,12 +90,12 @@ include/sfx2/msg.hxx:134
SfxType3 nAttribs sal_uInt16
include/sfx2/msg.hxx:134
SfxType3 aAttrib struct SfxTypeAttrib [3]
-include/sfx2/msg.hxx:135
- SfxType4 aAttrib struct SfxTypeAttrib [4]
include/sfx2/msg.hxx:135
SfxType4 nAttribs sal_uInt16
include/sfx2/msg.hxx:135
SfxType4 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
+include/sfx2/msg.hxx:135
+ SfxType4 aAttrib struct SfxTypeAttrib [4]
include/sfx2/msg.hxx:135
SfxType4 pType const std::type_info *
include/sfx2/msg.hxx:136
@@ -396,6 +390,8 @@ sw/source/core/frmedt/fetab.cxx:75
(anonymous namespace)::TableWait m_pWait const std::unique_ptr<SwWait>
sw/source/core/layout/dbg_lay.cxx:171
SwImplEnterLeave nAction enum DbgAction
+sw/source/core/text/porlay.cxx:1312
+ const sw::MergedPara *const &
sw/source/uibase/inc/condedit.hxx:43
ConditionEdit m_aDropTargetHelper class ConditionEditDropTarget
sw/source/uibase/inc/conttree.hxx:294
@@ -456,11 +452,11 @@ vcl/unx/gtk3/a11y/gtk3atkhypertext.cxx:31
(anonymous namespace)::HyperLink atk_hyper_link const AtkHyperlink
vcl/unx/gtk3/gtk3gloactiongroup.cxx:27
(anonymous namespace)::GLOAction parent_instance GObject
-vcl/unx/gtk3/gtk3gtkinst.cxx:5195
+vcl/unx/gtk3/gtk3gtkinst.cxx:5193
(anonymous namespace)::CrippledViewport viewport GtkViewport
-vcl/unx/gtk3/gtk3gtkinst.cxx:5339
+vcl/unx/gtk3/gtk3gtkinst.cxx:5337
(anonymous namespace)::CustomCellRendererSurface parent GtkCellRendererText
-vcl/unx/gtk3/gtk3gtkinst.cxx:5347
+vcl/unx/gtk3/gtk3gtkinst.cxx:5345
(anonymous namespace)::CustomCellRendererSurfaceClass parent_class GtkCellRendererTextClass
writerfilter/source/ooxml/OOXMLStreamImpl.hxx:42
writerfilter::ooxml::OOXMLStreamImpl mxFastParser css::uno::Reference<css::xml::sax::XFastParser>
diff --git a/compilerplugins/clang/unusedfields.writeonly.results b/compilerplugins/clang/unusedfields.writeonly.results
index e819201e612d..e39d19fd5233 100644
--- a/compilerplugins/clang/unusedfields.writeonly.results
+++ b/compilerplugins/clang/unusedfields.writeonly.results
@@ -168,7 +168,7 @@ connectivity/source/inc/writer/WConnection.hxx:55
connectivity::writer::OWriterConnection::CloseVetoButTerminateListener m_pCloseListener std::unique_ptr<utl::CloseVeto>
cppcanvas/source/inc/implrenderer.hxx:207
cppcanvas::internal::ImplRenderer aBaseTransform struct cppcanvas::internal::XForm
-cppu/source/typelib/typelib.cxx:907
+cppu/source/typelib/typelib.cxx:906
(anonymous namespace)::BaseList set (anonymous namespace)::BaseList::Set
cppu/source/uno/check.cxx:38
(anonymous namespace)::C1 n1 sal_Int16
@@ -246,9 +246,9 @@ dbaccess/source/ui/browser/dbloader.cxx:62
(anonymous namespace)::DBContentLoader m_xListener Reference<class com::sun::star::frame::XLoadEventListener>
desktop/qa/desktop_lib/test_desktop_lib.cxx:237
DesktopLOKTest m_bModified _Bool
-desktop/source/app/app.cxx:1198
+desktop/source/app/app.cxx:1184
desktop::(anonymous namespace)::ExecuteGlobals pLanguageOptions std::unique_ptr<SvtLanguageOptions>
-desktop/source/app/app.cxx:1199
+desktop/source/app/app.cxx:1185
desktop::(anonymous namespace)::ExecuteGlobals pPathOptions std::unique_ptr<SvtPathOptions>
desktop/source/deployment/gui/dp_gui_extlistbox.hxx:138
dp_gui::ExtensionBox_Impl m_vRemovedEntries std::vector<TEntry_Impl>
@@ -318,6 +318,10 @@ framework/inc/uielement/langselectionmenucontroller.hxx:73
framework::LanguageSelectionMenuController m_xMenuDispatch_Font css::uno::Reference<css::frame::XDispatch>
framework/inc/uielement/langselectionmenucontroller.hxx:75
framework::LanguageSelectionMenuController m_xMenuDispatch_CharDlgForParagraph css::uno::Reference<css::frame::XDispatch>
+framework/inc/uielement/menubarmanager.hxx:186
+ framework::MenuBarManager m_aMenuItemCommand class rtl::OUString
+framework/inc/uielement/toolbarmerger.hxx:37
+ framework::AddonsParams aImageId class rtl::OUString
framework/source/layoutmanager/toolbarlayoutmanager.hxx:272
framework::ToolbarLayoutManager m_pGlobalSettings std::unique_ptr<GlobalSettings>
framework/source/layoutmanager/toolbarlayoutmanager.hxx:276
@@ -631,7 +635,7 @@ sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx:79
sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx:83
sc::sidebar::CellAppearancePropertyPanel mxLineColorDispatch std::unique_ptr<ToolbarUnoDispatcher>
sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx:70
- sc::sidebar::NumberFormatPropertyPanel mxCatagoryDispatch std::unique_ptr<ToolbarUnoDispatcher>
+ sc::sidebar::NumberFormatPropertyPanel mxCategoryDispatch std::unique_ptr<ToolbarUnoDispatcher>
sc/source/ui/vba/vbachartobject.hxx:44
ScVbaChartObject oShapeHelper std::unique_ptr<ov::ShapeHelper>
sd/inc/sdmod.hxx:133
@@ -690,10 +694,6 @@ sfx2/inc/notebookbar/NotebookbarTabControl.hxx:41
NotebookbarTabControl m_pListener css::uno::Reference<css::ui::XUIConfigurationListener>
sfx2/source/appl/fileobj.hxx:40
SvFileObject mxDelMed tools::SvRef<SfxMedium>
-sfx2/source/control/objface.cxx:79
- SfxInterface_Impl pModule class SfxModule *
-sfx2/source/control/objface.cxx:80
- SfxInterface_Impl bRegistered _Bool
sfx2/source/doc/sfxbasemodel.cxx:448
(anonymous namespace)::SfxSaveGuard m_pFramesLock std::unique_ptr<SfxOwnFramesLocker>
sfx2/source/inc/appdata.hxx:71
@@ -1018,7 +1018,7 @@ vbahelper/source/vbahelper/vbafillformat.hxx:36
ScVbaFillFormat m_nForeColor sal_Int32
vcl/inc/accel.h:33
ImplAccelEntry mpAutoAccel class Accelerator *
-vcl/inc/driverblocklist.hxx:99
+vcl/inc/driverblocklist.hxx:98
DriverBlocklist::DriverInfo maMsg class rtl::OUString
vcl/inc/fontselect.hxx:61
FontSelectPattern mfExactHeight float
@@ -1136,7 +1136,7 @@ vcl/unx/gtk3/gtk3glomenu.cxx:14
GLOMenu parent_instance const GMenuModel
vcl/unx/gtk3/gtk3gtkinst.cxx:1613
in char *
-vcl/unx/gtk3/gtk3gtkinst.cxx:13212
+vcl/unx/gtk3/gtk3gtkinst.cxx:13276
(anonymous namespace)::GtkInstanceComboBox m_xCustomMenuButtonHelper std::unique_ptr<CustomRenderMenuButtonHelper>
vcl/unx/gtk3/gtk3hudawareness.cxx:18
(anonymous namespace)::HudAwarenessHandle connection GDBusConnection *
@@ -1146,7 +1146,7 @@ vcl/workben/vcldemo.cxx:1748
(anonymous namespace)::DemoWin mxThread rtl::Reference<RenderThread>
writerfilter/source/dmapper/DomainMapperTableHandler.cxx:228
writerfilter::dmapper::TableInfo aTablePropertyIds std::vector<PropertyIds>
-writerfilter/source/dmapper/PropertyMap.hxx:219
+writerfilter/source/dmapper/PropertyMap.hxx:220
writerfilter::dmapper::SectionPropertyMap m_nDebugSectionNumber sal_Int32
writerfilter/source/dmapper/SettingsTable.cxx:264
writerfilter::dmapper::SettingsTable_Impl m_sRedlineProtectionKey class rtl::OUString
@@ -1160,7 +1160,7 @@ xmlhelp/source/cxxhelp/provider/databases.hxx:266
chelp::Databases m_aZipFileTable chelp::Databases::ZipFileTable
xmlhelp/source/cxxhelp/provider/databases.hxx:272
chelp::Databases m_aCollatorTable chelp::Databases::CollatorTable
-xmloff/source/draw/ximpstyl.hxx:224
+xmloff/source/draw/ximpstyl.hxx:216
SdXMLMasterStylesContext maMasterPageList std::vector<rtl::Reference<SdXMLMasterPageContext> >
xmloff/source/forms/elementexport.hxx:47
xmloff::OElementExport m_pXMLElement std::unique_ptr<SvXMLElementExport>
diff --git a/framework/inc/uielement/menubarmanager.hxx b/framework/inc/uielement/menubarmanager.hxx
index 698b46341579..60baef602fc7 100644
--- a/framework/inc/uielement/menubarmanager.hxx
+++ b/framework/inc/uielement/menubarmanager.hxx
@@ -183,7 +183,6 @@ class MenuBarManager final :
bool m_bAcceleratorCfg;
bool m_bModuleIdentified;
bool m_bHasMenuBar;
- OUString m_aMenuItemCommand;
OUString m_aModuleIdentifier;
VclPtr<Menu> m_pVCLMenu;
css::uno::Reference< css::frame::XFrame > m_xFrame;
diff --git a/framework/inc/uielement/toolbarmerger.hxx b/framework/inc/uielement/toolbarmerger.hxx
index 95ca6cc01458..f89bd8c6a1c3 100644
--- a/framework/inc/uielement/toolbarmerger.hxx
+++ b/framework/inc/uielement/toolbarmerger.hxx
@@ -34,7 +34,6 @@ namespace framework
struct AddonsParams
{
- OUString aImageId;
OUString aControlType;
sal_uInt16 nWidth;
};
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index eb3fe530acce..cbe4f5ebf64f 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -1605,8 +1605,6 @@ void MenuBarManager::AddMenu(MenuBarManager* pSubMenuManager,const OUString& _sI
Reference< XStatusListener > xSubMenuManager( static_cast< OWeakObject *>( pSubMenuManager ), UNO_QUERY );
m_xFrame->addFrameActionListener( Reference< XFrameActionListener >( xSubMenuManager, UNO_QUERY ));
- // store menu item command as we later have to know which menu is active (see Activate handler)
- pSubMenuManager->m_aMenuItemCommand = _sItemCommand;
Reference< XDispatch > xDispatch;
std::unique_ptr<MenuItemHandler> pMenuItemHandler(new MenuItemHandler(
_nItemId,
@@ -1659,9 +1657,6 @@ void MenuBarManager::Init(const Reference< XFrame >& rFrame, Menu* pAddonMenu, b
Reference< XStatusListener > xSubMenuManager( static_cast< OWeakObject *>( pSubMenuManager ), UNO_QUERY );
- // store menu item command as we later have to know which menu is active (see Activate handler)
- pSubMenuManager->m_aMenuItemCommand = aItemCommand;
-
std::unique_ptr<MenuItemHandler> pMenuItemHandler(new MenuItemHandler(
nItemId,
xSubMenuManager,
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index 5dc5c17dca48..b36a24d4784d 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -1211,7 +1211,6 @@ void ToolBarManager::FillAddonToolbar( const Sequence< Sequence< PropertyValue >
// Create AddonsParams to hold additional information we will need in the future
AddonsParams* pRuntimeItemData = new AddonsParams;
- pRuntimeItemData->aImageId = aImageId;
pRuntimeItemData->aControlType = aControlType;
pRuntimeItemData->nWidth = nWidth;
m_pToolBar->SetItemData( nId, pRuntimeItemData );
diff --git a/framework/source/uielement/toolbarmerger.cxx b/framework/source/uielement/toolbarmerger.cxx
index c012576fa35b..771fbbe5df01 100644
--- a/framework/source/uielement/toolbarmerger.cxx
+++ b/framework/source/uielement/toolbarmerger.cxx
@@ -639,7 +639,6 @@ void ToolBarMerger::CreateToolbarItem( ToolBox* pToolbar, ToolBox::ImplToolItems
// Use the user data to store add-on specific data with the toolbar item
AddonsParams* pAddonParams = new AddonsParams;
- pAddonParams->aImageId = rItem.aImageIdentifier;
pAddonParams->aControlType = rItem.aControlType;
pAddonParams->nWidth = rItem.nWidth;
pToolbar->SetItemData( nItemId, pAddonParams );
More information about the Libreoffice-commits
mailing list