summaryrefslogtreecommitdiff
path: root/framework/inc
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2008-06-20 06:02:45 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2008-06-20 06:02:45 +0000
commit3d6de264ad80c38291be2499ea852cf310b9d5e3 (patch)
treeba157be312ef45a06ff968a708d1544e21fba9a6 /framework/inc
parentd7997a0f704d45a3462d45d68be0ce81bdcd631e (diff)
INTEGRATION: CWS fwk88 (1.21.64); FILE MERGED
2008/05/02 14:15:22 pb 1.21.64.2: RESYNC: (1.21-1.22); FILE MERGED 2008/04/15 06:21:57 cd 1.21.64.1: #i33668# Support customization context menu for toolbars
Diffstat (limited to 'framework/inc')
-rw-r--r--framework/inc/uielement/toolbarmanager.hxx6
1 files changed, 5 insertions, 1 deletions
diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx
index 4097838be418..e08983ef7a4a 100644
--- a/framework/inc/uielement/toolbarmanager.hxx
+++ b/framework/inc/uielement/toolbarmanager.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: toolbarmanager.hxx,v $
- * $Revision: 1.22 $
+ * $Revision: 1.23 $
*
* This file is part of OpenOffice.org.
*
@@ -154,6 +154,10 @@ class ToolBarManager : public ::com::sun::star::frame::XFrameActionListener
typedef std::vector< ControllerParams > ControllerParamsVector;
protected:
+ //added for 33668 by shizhoubo : 2008:04
+ DECL_LINK( Command, CommandEvent * );
+ PopupMenu * GetToolBarCustomMeun(ToolBox* pToolBar);
+ //end
DECL_LINK( Click, ToolBox * );
DECL_LINK( DropdownClick, ToolBox * );
DECL_LINK( DoubleClick, ToolBox * );