diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-10-12 12:21:47 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-10-12 12:21:47 +0000 |
| commit | d1fc3199603d272c808a0184ac01ac305d328964 (patch) | |
| tree | 81bfb9c7f54e1b96c7d6a5b1e56f3a4c2ef60463 /svx/source/tbxctrls/lboxctrl.cxx | |
| parent | e2ddc648ccfe87f33d45288c7bc703f403c3fe8d (diff) | |
INTEGRATION: CWS sb59 (1.23.486); FILE MERGED
2006/08/03 13:51:59 cl 1.23.486.1: removed compiler warnings
Diffstat (limited to 'svx/source/tbxctrls/lboxctrl.cxx')
| -rw-r--r-- | svx/source/tbxctrls/lboxctrl.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/svx/source/tbxctrls/lboxctrl.cxx b/svx/source/tbxctrls/lboxctrl.cxx index ed948e52e710..ff564d89cc5a 100644 --- a/svx/source/tbxctrls/lboxctrl.cxx +++ b/svx/source/tbxctrls/lboxctrl.cxx @@ -4,9 +4,9 @@ * * $RCSfile: lboxctrl.cxx,v $ * - * $Revision: 1.24 $ + * $Revision: 1.25 $ * - * last change: $Author: obo $ $Date: 2006-09-17 06:06:09 $ + * last change: $Author: obo $ $Date: 2006-10-12 13:21:47 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -109,6 +109,8 @@ class SvxPopupWindowListBox; class SvxPopupWindowListBox : public SfxPopupWindow { + using FloatingWindow::StateChanged; + FixedInfo aInfo; ListBox * pListBox; ToolBox & rToolBox; @@ -237,7 +239,7 @@ SfxPopupWindowType SvxListBoxControl::GetPopupWindowType() const void SvxListBoxControl::StateChanged( - USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ) + USHORT, SfxItemState, const SfxPoolItem* pState ) { GetToolBox().EnableItem( GetId(), SFX_ITEM_DISABLED != GetItemState(pState) ); @@ -266,7 +268,7 @@ void SvxListBoxControl::Impl_SetInfo( USHORT nCount ) { DBG_ASSERT( pPopupWin, "NULL pointer, PopupWindow missing" ); - ListBox &rListBox = pPopupWin->GetListBox(); +// ListBox &rListBox = pPopupWin->GetListBox(); USHORT nId; if (nCount == 1) |