strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS fwk66 (1.3.130); FILE MERGED

Browse source 
2007/06/04 11:11:03 cd 1.3.130.1: #i78020# Support merging to menu and toolbar for add-ons
This commit is contained in:
Ivo Hinkelmann 2007-07-10 14:06:31 +00:00
parent 697405a860
commit 8e03a4978d
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
framework/inc/uielement/comboboxtoolbarcontroller.hxx
View file

@ -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 );

8
framework/inc/uielement/complextoolbarcontroller.hxx
View file

@ -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;