diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 10:35:42 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 10:35:42 +0000 |
| commit | f7879e82f09966a19de49f2b912fbc017fbf9651 (patch) | |
| tree | 1e25d9d507f38639490f84fa22ebb56c9ad5fb00 /framework | |
| parent | 69bacef3457bf0229db1ce679eab57b16096f034 (diff) | |
INTEGRATION: CWS warnings01 (1.5.32); FILE MERGED
2006/05/29 07:55:06 sb 1.5.32.6: #i53898# Made code warning-free and/or compile at all after resync to SRC680m170.
2006/05/23 16:12:19 sb 1.5.32.5: RESYNC: (1.8-1.9); FILE MERGED
2006/04/07 16:07:25 sb 1.5.32.4: RESYNC: (1.7-1.8); FILE MERGED
2006/01/25 17:35:47 sb 1.5.32.3: RESYNC: (1.5-1.7); FILE MERGED
2005/11/16 15:20:38 pl 1.5.32.2: #i55991# removed warnings
2005/10/28 14:48:43 cd 1.5.32.1: #i55991# Warning free code changes for gcc
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/uielement/addonstoolbarmanager.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx index be19b3bdbb4c..ec1302a4502d 100644 --- a/framework/source/uielement/addonstoolbarmanager.cxx +++ b/framework/source/uielement/addonstoolbarmanager.cxx @@ -4,9 +4,9 @@ * * $RCSfile: addonstoolbarmanager.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: hr $ $Date: 2006-05-08 15:18:26 $ + * last change: $Author: hr $ $Date: 2006-06-19 11:35:42 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -419,7 +419,7 @@ void AddonsToolBarManager::FillToolbar( const Sequence< Sequence< PropertyValue ::cppu::OWeakObject* pController = 0; if ( aControlType.equalsAsciiL( "Button", 6 )) - pController = new ButtonToolbarController( m_xServiceManager, m_xFrame, m_pToolBar, nId, aURL ); + pController = new ButtonToolbarController( m_xServiceManager, m_pToolBar, aURL ); else if ( aControlType.equalsAsciiL( "Combobox", 8 )) pController = new ComboboxToolbarController( m_xServiceManager, m_xFrame, m_pToolBar, nId, nWidth, aURL ); else if ( aControlType.equalsAsciiL( "ImageButton", 11 )) @@ -500,7 +500,7 @@ void AddonsToolBarManager::FillToolbar( const Sequence< Sequence< PropertyValue AddFrameActionListener(); } -IMPL_LINK( AddonsToolBarManager, Click, ToolBox*, pToolBar ) +IMPL_LINK( AddonsToolBarManager, Click, ToolBox*, EMPTYARG ) { if ( m_bDisposed ) return 1; @@ -517,7 +517,7 @@ IMPL_LINK( AddonsToolBarManager, Click, ToolBox*, pToolBar ) return 1; } -IMPL_LINK( AddonsToolBarManager, DoubleClick, ToolBox*, pToolBar ) +IMPL_LINK( AddonsToolBarManager, DoubleClick, ToolBox*, EMPTYARG ) { if ( m_bDisposed ) return 1; @@ -534,7 +534,7 @@ IMPL_LINK( AddonsToolBarManager, DoubleClick, ToolBox*, pToolBar ) return 1; } -IMPL_LINK( AddonsToolBarManager, Command, CommandEvent*, pCmdEvt ) +IMPL_LINK( AddonsToolBarManager, Command, CommandEvent*, EMPTYARG ) { ResetableGuard aGuard( m_aLock ); @@ -544,7 +544,7 @@ IMPL_LINK( AddonsToolBarManager, Command, CommandEvent*, pCmdEvt ) return 0; } -IMPL_LINK( AddonsToolBarManager, Select, ToolBox*, pToolBar ) +IMPL_LINK( AddonsToolBarManager, Select, ToolBox*, EMPTYARG ) { if ( m_bDisposed ) return 1; @@ -559,17 +559,17 @@ IMPL_LINK( AddonsToolBarManager, Select, ToolBox*, pToolBar ) return 1; } -IMPL_LINK( AddonsToolBarManager, Highlight, ToolBox*, pToolBar ) +IMPL_LINK( AddonsToolBarManager, Highlight, ToolBox*, EMPTYARG ) { return 1; } -IMPL_LINK( AddonsToolBarManager, Activate, ToolBox*, pToolBar ) +IMPL_LINK( AddonsToolBarManager, Activate, ToolBox*, EMPTYARG ) { return 1; } -IMPL_LINK( AddonsToolBarManager, Deactivate, ToolBox*, pToolBar ) +IMPL_LINK( AddonsToolBarManager, Deactivate, ToolBox*, EMPTYARG ) { return 1; } |