diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-07-10 14:11:20 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-07-10 14:11:20 +0000 |
| commit | 01e13b121230a264146596785e8e8cd8dc239edc (patch) | |
| tree | 7d0078e5642d39e0a877b42e70359dea229b9941 /framework | |
| parent | 7850ea78a0bf9b5f6b49fdb319802cbdafcedbe4 (diff) | |
INTEGRATION: CWS fwk66 (1.18.100); FILE MERGED
2007/06/04 11:22:20 cd 1.18.100.1: #i78020# Support merging to menu and toolbar for add-ons
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/uielement/generictoolbarcontroller.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/framework/source/uielement/generictoolbarcontroller.cxx b/framework/source/uielement/generictoolbarcontroller.cxx index 433558898a6c..ca5ea93dae3c 100644 --- a/framework/source/uielement/generictoolbarcontroller.cxx +++ b/framework/source/uielement/generictoolbarcontroller.cxx @@ -4,9 +4,9 @@ * * $RCSfile: generictoolbarcontroller.cxx,v $ * - * $Revision: 1.18 $ + * $Revision: 1.19 $ * - * last change: $Author: obo $ $Date: 2006-09-16 14:20:18 $ + * last change: $Author: ihi $ $Date: 2007-07-10 15:11:20 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -153,7 +153,7 @@ struct ExecuteInfo GenericToolbarController::GenericToolbarController( const Reference< XMultiServiceFactory >& rServiceManager, const Reference< XFrame >& rFrame, - ToolBar* pToolbar, + ToolBox* pToolbar, USHORT nID, const OUString& aCommand ) : svt::ToolboxController( rServiceManager, rFrame, aCommand ) |