INTEGRATION: CWS impress146 (1.43.54); FILE MERGED

2008/06/27 14:58:12 af 1.43.54.1: #i89785# Removed GetMenuState() method.
This commit is contained in:
Rüdiger Timm 2008-07-07 12:33:19 +00:00
parent c543bbaaf0
commit fc70896811

View file

@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite * OpenOffice.org - a multi-platform office productivity suite
* *
* $RCSfile: SlideSorterController.cxx,v $ * $RCSfile: SlideSorterController.cxx,v $
* $Revision: 1.43 $ * $Revision: 1.44 $
* *
* This file is part of OpenOffice.org. * This file is part of OpenOffice.org.
* *
@ -39,13 +39,13 @@
#include "controller/SlsCurrentSlideManager.hxx" #include "controller/SlsCurrentSlideManager.hxx"
#include "SlsListener.hxx" #include "SlsListener.hxx"
#include "controller/SlsFocusManager.hxx" #include "controller/SlsFocusManager.hxx"
#include "SlsSlotManager.hxx"
#include "SlsSelectionCommand.hxx" #include "SlsSelectionCommand.hxx"
#include "controller/SlsAnimator.hxx"
#include "controller/SlsClipboard.hxx" #include "controller/SlsClipboard.hxx"
#include "controller/SlsScrollBarManager.hxx" #include "controller/SlsScrollBarManager.hxx"
#include "controller/SlsPageObjectFactory.hxx" #include "controller/SlsPageObjectFactory.hxx"
#include "controller/SlsSelectionManager.hxx" #include "controller/SlsSelectionManager.hxx"
#include "controller/SlsAnimator.hxx" #include "controller/SlsSlotManager.hxx"
#include "model/SlideSorterModel.hxx" #include "model/SlideSorterModel.hxx"
#include "model/SlsPageEnumerationProvider.hxx" #include "model/SlsPageEnumerationProvider.hxx"
#include "model/SlsPageDescriptor.hxx" #include "model/SlsPageDescriptor.hxx"
@ -729,14 +729,6 @@ void SlideSorterController::GetCtrlState (SfxItemSet& rSet)
void SlideSorterController::GetMenuState ( SfxItemSet& rSet)
{
mpSlotManager->GetMenuState (rSet);
}
void SlideSorterController::GetStatusBarState (SfxItemSet& rSet) void SlideSorterController::GetStatusBarState (SfxItemSet& rSet)
{ {
mpSlotManager->GetStatusBarState (rSet); mpSlotManager->GetStatusBarState (rSet);