INTEGRATION: CWS fwk66 (1.6.100); FILE MERGED

2007/06/04 11:22:20 cd 1.6.100.1: #i78020# Support merging to menu and toolbar for add-ons

framework/source/uielement/complextoolbarcontroller.cxx

@@ -4,9 +4,9 @@
  *
  *  $RCSfile: complextoolbarcontroller.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: obo $ $Date: 2006-09-16 14:18:22 $
+ *  last change: $Author: ihi $ $Date: 2007-07-10 15:10:23 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -113,7 +113,7 @@ namespace framework
 ComplexToolbarController::ComplexToolbarController(
     const Reference< XMultiServiceFactory >& rServiceManager,
     const Reference< XFrame >&               rFrame,
-    ToolBar*                                 pToolbar,
+    ToolBox*                                 pToolbar,
     USHORT                                   nID,
     const OUString&                          aCommand ) :
     svt::ToolboxController( rServiceManager, rFrame, aCommand )