INTEGRATION: CWS fwk66 (1.7.62); FILE MERGED

2007/06/04 11:22:20 cd 1.7.62.1: #i78020# Support merging to menu and toolbar for add-ons
This commit is contained in:
Ivo Hinkelmann 2007-07-10 14:10:07 +00:00
parent 74a8e792e0
commit 09f0acc97a

View file

@ -4,9 +4,9 @@
*
* $RCSfile: comboboxtoolbarcontroller.cxx,v $
*
* $Revision: 1.8 $
* $Revision: 1.9 $
*
* last change: $Author: rt $ $Date: 2007-07-06 12:23:29 $
* last change: $Author: ihi $ $Date: 2007-07-10 15:10:07 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -205,7 +205,7 @@ long ComboBoxControl::PreNotify( NotifyEvent& rNEvt )
ComboboxToolbarController::ComboboxToolbarController(
const Reference< XMultiServiceFactory >& rServiceManager,
const Reference< XFrame >& rFrame,
ToolBar* pToolbar,
ToolBox* pToolbar,
USHORT nID,
sal_Int32 nWidth,
const OUString& aCommand ) :