summaryrefslogtreecommitdiff
path: root/framework/inc
diff options
context:
space:
mode:
authorSusobhan Ghosh <susobhang70@gmail.com>2016-01-14 16:18:35 +0530
committerSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>2016-01-14 15:17:24 +0000
commit98887155c0fd209ed60e181f745bf00fb2d69ab7 (patch)
tree7964ec6130b63688f8e67548fc5d3dbf2530531a /framework/inc
parent1305e7be74dba26d8612004473711f154835a94f (diff)
tdf#95845 Use CommandInfoProvider to receive UNO command labels
Replaced getUINameFromCommand by GetMenuLabelForCommand Change-Id: Icd89fed4d9944653996a2218c6ed80af72cefe89 Reviewed-on: https://gerrit.libreoffice.org/21464 Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'framework/inc')
-rw-r--r--framework/inc/uielement/toolbarsmenucontroller.hxx3
1 files changed, 0 insertions, 3 deletions
diff --git a/framework/inc/uielement/toolbarsmenucontroller.hxx b/framework/inc/uielement/toolbarsmenucontroller.hxx
index f16a4e4032f7..f8240df92f29 100644
--- a/framework/inc/uielement/toolbarsmenucontroller.hxx
+++ b/framework/inc/uielement/toolbarsmenucontroller.hxx
@@ -85,20 +85,17 @@ namespace framework
private:
void fillPopupMenu( css::uno::Reference< css::awt::XPopupMenu >& rPopupMenu );
css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > > getLayoutManagerToolbars( const css::uno::Reference< css::frame::XLayoutManager >& rLayoutManager );
- OUString getUINameFromCommand( const OUString& rCommandURL );
css::uno::Reference< css::frame::XDispatch > getDispatchFromCommandURL( const OUString& rCommandURL );
void addCommand( css::uno::Reference< css::awt::XPopupMenu >& rPopupMenu, const OUString& rCommandURL, const OUString& aLabel );
bool isContextSensitiveToolbarNonVisible() { return m_bResetActive;}
css::uno::Reference< css::uno::XComponentContext > m_xContext;
css::uno::Reference< css::container::XNameAccess > m_xPersistentWindowState;
- css::uno::Reference< css::container::XNameAccess > m_xUICommandDescription;
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_bModuleIdentified;
bool m_bResetActive;
std::vector< OUString > m_aCommandVector;
IntlWrapper m_aIntlWrapper;