diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-10-12 11:57:05 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-10-12 11:57:05 +0000 |
| commit | abbf4eb3461e94806208153a0e6b58b3bd433085 (patch) | |
| tree | 368d0c4e66f77c778bba10a1e94df4c9bdb55fb1 /svx/source/mnuctrls | |
| parent | 6f8661fd0c472cb960b7c796a1980c1e9dc72c53 (diff) | |
INTEGRATION: CWS sb59 (1.3.62); FILE MERGED
2006/08/03 13:51:50 cl 1.3.62.1: removed compiler warnings
Diffstat (limited to 'svx/source/mnuctrls')
| -rw-r--r-- | svx/source/mnuctrls/fntctl.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/svx/source/mnuctrls/fntctl.cxx b/svx/source/mnuctrls/fntctl.cxx index 856e90567db2..c0a9ff218225 100644 --- a/svx/source/mnuctrls/fntctl.cxx +++ b/svx/source/mnuctrls/fntctl.cxx @@ -4,9 +4,9 @@ * * $RCSfile: fntctl.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: obo $ $Date: 2006-09-17 05:25:14 $ + * last change: $Author: obo $ $Date: 2006-10-12 12:57:05 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -78,14 +78,14 @@ SFX_IMPL_MENU_CONTROL(SvxFontMenuControl, SvxFontItem); SvxFontMenuControl::SvxFontMenuControl ( - USHORT nId, + USHORT _nId, Menu& rMenu, SfxBindings& rBindings ) : pMenu ( new FontNameMenu ), rParent ( rMenu ) { - rMenu.SetPopupMenu( nId, pMenu ); + rMenu.SetPopupMenu( _nId, pMenu ); pMenu->SetSelectHdl( LINK( this, SvxFontMenuControl, MenuSelect ) ); StartListening( rBindings ); FillMenu(); @@ -127,7 +127,7 @@ void SvxFontMenuControl::FillMenu() void SvxFontMenuControl::StateChanged( - USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ) + USHORT, SfxItemState eState, const SfxPoolItem* pState ) { rParent.EnableItem( GetId(), SFX_ITEM_DISABLED != eState ); @@ -154,7 +154,7 @@ void SvxFontMenuControl::StateChanged( der DocumentShell gef"ullt. */ -void SvxFontMenuControl::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType, +void SvxFontMenuControl::SFX_NOTIFY( SfxBroadcaster&, const TypeId& rBCType, const SfxHint& rHint, const TypeId& rHintType ) { if ( rHint.Type() != TYPE(SfxSimpleHint) && |