From 8e03a4978d54cc6133dd3dfdf8b14fbc5623ac6f Mon Sep 17 00:00:00 2001
From: Ivo Hinkelmann <ihi@openoffice.org>
Date: Tue, 10 Jul 2007 14:06:31 +0000
Subject: [PATCH] INTEGRATION: CWS fwk66 (1.3.130); FILE MERGED 2007/06/04
 11:11:03 cd 1.3.130.1: #i78020# Support merging to menu and toolbar for
 add-ons

---
 framework/inc/uielement/comboboxtoolbarcontroller.hxx | 6 +++---
 framework/inc/uielement/complextoolbarcontroller.hxx  | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/framework/inc/uielement/comboboxtoolbarcontroller.hxx b/framework/inc/uielement/comboboxtoolbarcontroller.hxx
index 9a2168ca357e..841a786e71bf 100644
--- a/framework/inc/uielement/comboboxtoolbarcontroller.hxx
+++ b/framework/inc/uielement/comboboxtoolbarcontroller.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: comboboxtoolbarcontroller.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: ihi $ $Date: 2006-08-01 09:35:31 $
+ *  last change: $Author: ihi $ $Date: 2007-07-10 15:06:11 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -73,7 +73,7 @@ class ComboboxToolbarController : public IComboBoxListener,
     public:
         ComboboxToolbarController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager,
                                    const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame,
-                                   ToolBar*     pToolBar,
+                                   ToolBox*     pToolBar,
                                    USHORT       nID,
                                    sal_Int32    nWidth,
                                    const rtl::OUString& aCommand );
diff --git a/framework/inc/uielement/complextoolbarcontroller.hxx b/framework/inc/uielement/complextoolbarcontroller.hxx
index 49231ca032db..c8b34d1a2e19 100644
--- a/framework/inc/uielement/complextoolbarcontroller.hxx
+++ b/framework/inc/uielement/complextoolbarcontroller.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: complextoolbarcontroller.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: ihi $ $Date: 2006-08-01 09:36:35 $
+ *  last change: $Author: ihi $ $Date: 2007-07-10 15:06:31 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -78,7 +78,7 @@ class ComplexToolbarController : public svt::ToolboxController
     public:
         ComplexToolbarController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager,
                                   const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame,
-                                  ToolBar*     pToolBar,
+                                  ToolBox*     pToolBar,
                                   USHORT       nID,
                                   const rtl::OUString& aCommand );
         virtual ~ComplexToolbarController();
@@ -108,7 +108,7 @@ class ComplexToolbarController : public svt::ToolboxController
         void notifyFocusLost();
         void notifyTextChanged( const ::rtl::OUString& aText );
 
-        ToolBar*                                                                    m_pToolbar;
+        ToolBox*                                                                    m_pToolbar;
         sal_uInt16                                                                  m_nID;
         sal_Bool                                                                    m_bMadeInvisible;
         mutable ::com::sun::star::util::URL                                         m_aURL;