diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-07-10 14:11:45 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-07-10 14:11:45 +0000 |
| commit | 199e5c88163bf83a216244b75d8bbfb208c84789 (patch) | |
| tree | a793302f36273a924cf5692ed20d5c664e4337da /framework/source | |
| parent | e0170be7b7278deab18258eb447de47df26a4bb7 (diff) | |
INTEGRATION: CWS fwk66 (1.5.32); FILE MERGED
2007/06/04 11:22:21 cd 1.5.32.1: #i78020# Support merging to menu and toolbar for add-ons
Diffstat (limited to 'framework/source')
| -rw-r--r-- | framework/source/uielement/imagebuttontoolbarcontroller.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/framework/source/uielement/imagebuttontoolbarcontroller.cxx b/framework/source/uielement/imagebuttontoolbarcontroller.cxx index f672b6365f8c..a386728c3ade 100644 --- a/framework/source/uielement/imagebuttontoolbarcontroller.cxx +++ b/framework/source/uielement/imagebuttontoolbarcontroller.cxx @@ -4,9 +4,9 @@ * * $RCSfile: imagebuttontoolbarcontroller.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: rt $ $Date: 2007-01-29 14:51:39 $ + * last change: $Author: ihi $ $Date: 2007-07-10 15:11:45 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -163,7 +163,7 @@ static void SubstituteVariables( ::rtl::OUString& aURL ) ImageButtonToolbarController::ImageButtonToolbarController( const Reference< XMultiServiceFactory >& rServiceManager, const Reference< XFrame >& rFrame, - ToolBar* pToolbar, + ToolBox* pToolbar, USHORT nID, const OUString& aCommand ) : ComplexToolbarController( rServiceManager, rFrame, pToolbar, nID, aCommand ) |