diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2006-04-07 09:18:22 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2006-04-07 09:18:22 +0000 |
| commit | 949d6ebe483a100122b024db60a3a9df4f91ae1f (patch) | |
| tree | 52f95cc2f025926b0c9528cac31e756f8dbd668a /framework/inc/uielement/toolbarsmenucontroller.hxx | |
| parent | 48f45511aaa4200728deae98ddbf1a6fc3de5ef8 (diff) | |
INTEGRATION: CWS toolbarbehavior (1.7.108); FILE MERGED
2006/03/28 15:41:38 cd 1.7.108.2: #i50428# Change label to 'Reset' and enable/disable menu item according to spec
2006/03/27 15:19:33 cd 1.7.108.1: #i50428# Support restore context toolbar visibility
Diffstat (limited to 'framework/inc/uielement/toolbarsmenucontroller.hxx')
| -rw-r--r-- | framework/inc/uielement/toolbarsmenucontroller.hxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/framework/inc/uielement/toolbarsmenucontroller.hxx b/framework/inc/uielement/toolbarsmenucontroller.hxx index 57ee1308a325..ec2a3adeae72 100644 --- a/framework/inc/uielement/toolbarsmenucontroller.hxx +++ b/framework/inc/uielement/toolbarsmenucontroller.hxx @@ -4,9 +4,9 @@ * * $RCSfile: toolbarsmenucontroller.hxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: rt $ $Date: 2005-09-09 00:48:22 $ + * last change: $Author: vg $ $Date: 2006-04-07 10:18:22 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -154,7 +154,8 @@ namespace framework ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > > getLayoutManagerToolbars( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager >& rLayoutManager ); rtl::OUString getUINameFromCommand( const rtl::OUString& rCommandURL ); ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > getDispatchFromCommandURL( const rtl::OUString& rCommandURL ); - void addCommand( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu, const rtl::OUString& rCommandURL, USHORT nHelpId ); + void addCommand( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu, const rtl::OUString& rCommandURL, USHORT nHelpId, const rtl::OUString& aLabel ); + sal_Bool isContextSensitiveToolbarNonVisible(); ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xPersistentWindowState; ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer > m_xURLTransformer; @@ -165,6 +166,7 @@ namespace framework rtl::OUString m_aPropUIName; rtl::OUString m_aPropResourceURL; sal_Bool m_bModuleIdentified; + sal_Bool m_bResetActive; std::vector< rtl::OUString > m_aCommandVector; IntlWrapper m_aIntlWrapper; }; |