diff options
Diffstat (limited to 'sd/source/ui/slidesorter/controller')
19 files changed, 161 insertions, 161 deletions
diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx index ad76ae766faf..aae8a7eec2b7 100644 --- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx +++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx @@ -136,7 +136,7 @@ SlideSorterController::SlideSorterController (SlideSorter& rSlideSorter) } } -void SlideSorterController::Init (void) +void SlideSorterController::Init() { mpCurrentSlideManager.reset(new CurrentSlideManager(mrSlideSorter)); mpPageSelector.reset(new PageSelector(mrSlideSorter)); @@ -159,7 +159,7 @@ void SlideSorterController::Init (void) GetSelectionManager()->SelectionHasChanged(); } -SlideSorterController::~SlideSorterController (void) +SlideSorterController::~SlideSorterController() { try { @@ -177,7 +177,7 @@ SlideSorterController::~SlideSorterController (void) // to shut down cleanly. } -void SlideSorterController::Dispose (void) +void SlideSorterController::Dispose() { mpInsertionIndicatorHandler->End(Animator::AM_Immediate); mpClipboard.reset(); @@ -214,50 +214,50 @@ model::SharedPageDescriptor SlideSorterController::GetPageAt ( return pDescriptorAtPoint; } -PageSelector& SlideSorterController::GetPageSelector (void) +PageSelector& SlideSorterController::GetPageSelector() { OSL_ASSERT(mpPageSelector.get()!=NULL); return *mpPageSelector.get(); } -FocusManager& SlideSorterController::GetFocusManager (void) +FocusManager& SlideSorterController::GetFocusManager() { OSL_ASSERT(mpFocusManager.get()!=NULL); return *mpFocusManager.get(); } -Clipboard& SlideSorterController::GetClipboard (void) +Clipboard& SlideSorterController::GetClipboard() { OSL_ASSERT(mpClipboard.get()!=NULL); return *mpClipboard.get(); } -ScrollBarManager& SlideSorterController::GetScrollBarManager (void) +ScrollBarManager& SlideSorterController::GetScrollBarManager() { OSL_ASSERT(mpScrollBarManager.get()!=NULL); return *mpScrollBarManager.get(); } -::boost::shared_ptr<CurrentSlideManager> SlideSorterController::GetCurrentSlideManager (void) const +::boost::shared_ptr<CurrentSlideManager> SlideSorterController::GetCurrentSlideManager() const { OSL_ASSERT(mpCurrentSlideManager.get()!=NULL); return mpCurrentSlideManager; } -::boost::shared_ptr<SlotManager> SlideSorterController::GetSlotManager (void) const +::boost::shared_ptr<SlotManager> SlideSorterController::GetSlotManager() const { OSL_ASSERT(mpSlotManager.get()!=NULL); return mpSlotManager; } -::boost::shared_ptr<SelectionManager> SlideSorterController::GetSelectionManager (void) const +::boost::shared_ptr<SelectionManager> SlideSorterController::GetSelectionManager() const { OSL_ASSERT(mpSelectionManager.get()!=NULL); return mpSelectionManager; } ::boost::shared_ptr<InsertionIndicatorHandler> - SlideSorterController::GetInsertionIndicatorHandler (void) const + SlideSorterController::GetInsertionIndicatorHandler() const { OSL_ASSERT(mpInsertionIndicatorHandler.get()!=NULL); return mpInsertionIndicatorHandler; @@ -464,12 +464,12 @@ bool SlideSorterController::Command ( return bEventHasBeenHandled; } -void SlideSorterController::LockModelChange (void) +void SlideSorterController::LockModelChange() { mnModelChangeLockCount += 1; } -void SlideSorterController::UnlockModelChange (void) +void SlideSorterController::UnlockModelChange() { mnModelChangeLockCount -= 1; if (mnModelChangeLockCount==0 && mbPostModelChangePending) @@ -478,7 +478,7 @@ void SlideSorterController::UnlockModelChange (void) } } -void SlideSorterController::PreModelChange (void) +void SlideSorterController::PreModelChange() { // Prevent PreModelChange to execute more than once per model lock. if (mbPostModelChangePending) @@ -497,7 +497,7 @@ void SlideSorterController::PreModelChange (void) mbPostModelChangePending = true; } -void SlideSorterController::PostModelChange (void) +void SlideSorterController::PostModelChange() { mbPostModelChangePending = false; mrModel.Resync(); @@ -523,7 +523,7 @@ void SlideSorterController::PostModelChange (void) ViewShellHint(ViewShellHint::HINT_COMPLEX_MODEL_CHANGE_END)); } -void SlideSorterController::HandleModelChange (void) +void SlideSorterController::HandleModelChange() { // Ignore this call when the document is not in a valid state, i.e. has // not the same number of regular and notes pages. @@ -680,7 +680,7 @@ void SlideSorterController::GetAttrState (SfxItemSet& rSet) mpSlotManager->GetAttrState (rSet); } -void SlideSorterController::UpdateAllPages (void) +void SlideSorterController::UpdateAllPages() { // Do a redraw. mrSlideSorter.GetContentWindow()->Invalidate(); @@ -760,13 +760,13 @@ rtl::Reference<FuPoor> SlideSorterController::CreateSelectionFunction (SfxReques return xFunc; } -::rtl::Reference<SelectionFunction> SlideSorterController::GetCurrentSelectionFunction (void) +::rtl::Reference<SelectionFunction> SlideSorterController::GetCurrentSelectionFunction() { rtl::Reference<FuPoor> pFunction (mrSlideSorter.GetViewShell()->GetCurrentFunction()); return ::rtl::Reference<SelectionFunction>(dynamic_cast<SelectionFunction*>(pFunction.get())); } -void SlideSorterController::PrepareEditModeChange (void) +void SlideSorterController::PrepareEditModeChange() { // Before we throw away the page descriptors we prepare for selecting // descriptors in the other mode and for restoring the current @@ -814,7 +814,7 @@ bool SlideSorterController::ChangeEditMode (EditMode eEditMode) return bResult; } -void SlideSorterController::FinishEditModeChange (void) +void SlideSorterController::FinishEditModeChange() { if (mrModel.GetEditMode() == EM_MASTERPAGE) { @@ -912,13 +912,13 @@ void SlideSorterController::SetDocumentSlides (const Reference<container::XIndex } } -VisibleAreaManager& SlideSorterController::GetVisibleAreaManager (void) const +VisibleAreaManager& SlideSorterController::GetVisibleAreaManager() const { OSL_ASSERT(mpVisibleAreaManager); return *mpVisibleAreaManager; } -void SlideSorterController::CheckForMasterPageAssignment (void) +void SlideSorterController::CheckForMasterPageAssignment() { if (mrModel.GetPageCount()%2==0) return; @@ -935,7 +935,7 @@ void SlideSorterController::CheckForMasterPageAssignment (void) } } -void SlideSorterController::CheckForSlideTransitionAssignment (void) +void SlideSorterController::CheckForSlideTransitionAssignment() { if (mrModel.GetPageCount()%2==0) return; @@ -961,12 +961,12 @@ SlideSorterController::ModelChangeLock::ModelChangeLock ( mpController->LockModelChange(); } -SlideSorterController::ModelChangeLock::~ModelChangeLock (void) +SlideSorterController::ModelChangeLock::~ModelChangeLock() { Release(); } -void SlideSorterController::ModelChangeLock::Release (void) +void SlideSorterController::ModelChangeLock::Release() { if (mpController != NULL) { diff --git a/sd/source/ui/slidesorter/controller/SlsAnimator.cxx b/sd/source/ui/slidesorter/controller/SlsAnimator.cxx index 99a838866192..e2f909075953 100644 --- a/sd/source/ui/slidesorter/controller/SlsAnimator.cxx +++ b/sd/source/ui/slidesorter/controller/SlsAnimator.cxx @@ -37,7 +37,7 @@ public: const double nGlobalTime, const Animator::AnimationId nAnimationId, const Animator::FinishFunctor& rFinishFunctor); - ~Animation (void); + ~Animation(); /** Run next animation step. If animation has reached its end it is expired. */ @@ -47,8 +47,8 @@ public: Animator::Disposed(). The finish functor is called and the animation is marked as expired to prevent another run. */ - void Expire (void); - bool IsExpired (void) { return mbIsExpired;} + void Expire(); + bool IsExpired() { return mbIsExpired;} Animator::AnimationFunctor maAnimation; Animator::FinishFunctor maFinishFunctor; @@ -72,7 +72,7 @@ Animator::Animator (SlideSorter& rSlideSorter) maIdle.SetIdleHdl(LINK(this,Animator,TimeoutHandler)); } -Animator::~Animator (void) +Animator::~Animator() { if ( ! mbIsDisposed) { @@ -81,7 +81,7 @@ Animator::~Animator (void) } } -void Animator::Dispose (void) +void Animator::Dispose() { mbIsDisposed = true; @@ -154,7 +154,7 @@ void Animator::RemoveAnimation (const Animator::AnimationId nId) } } -void Animator::RemoveAllAnimations (void) +void Animator::RemoveAllAnimations() { ::std::for_each( maAnimations.begin(), @@ -188,7 +188,7 @@ bool Animator::ProcessAnimations (const double nTime) return bExpired; } -void Animator::CleanUpAnimationList (void) +void Animator::CleanUpAnimationList() { OSL_ASSERT( ! mbIsDisposed); if (mbIsDisposed) @@ -256,7 +256,7 @@ Animator::Animation::Animation ( Run(nGlobalTime); } -Animator::Animation::~Animation (void) +Animator::Animation::~Animation() { } @@ -286,7 +286,7 @@ bool Animator::Animation::Run (const double nGlobalTime) return mbIsExpired; } -void Animator::Animation::Expire (void) +void Animator::Animation::Expire() { if ( ! mbIsExpired) { diff --git a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx index 1157b2973e3d..d7898c1a3d9f 100644 --- a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx +++ b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx @@ -95,7 +95,7 @@ public: if (mbIsCurrentSlideTrackingActive) mrController.GetVisibleAreaManager().DeactivateCurrentSlideTracking(); } - ~TemporarySlideTrackingDeactivator (void) + ~TemporarySlideTrackingDeactivator() { if (mbIsCurrentSlideTrackingActive) mrController.GetVisibleAreaManager().ActivateCurrentSlideTracking(); @@ -125,7 +125,7 @@ public: } } - ~UndoContext (void) + ~UndoContext() { if (mpDocument!=NULL && mpDocument->IsUndoEnabled()) mpDocument->EndUndo(); @@ -154,7 +154,7 @@ Clipboard::Clipboard (SlideSorter& rSlideSorter) { } -Clipboard::~Clipboard (void) +Clipboard::~Clipboard() { if (mnDragFinishedUserEventId != 0) Application::RemoveUserEvent(mnDragFinishedUserEventId); @@ -795,7 +795,7 @@ bool Clipboard::IsInsertionTrivial ( return mrController.GetInsertionIndicatorHandler()->IsInsertionTrivial(nDndAction); } -void Clipboard::Abort (void) +void Clipboard::Abort() { if (mxSelectionObserverContext) { diff --git a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx index ab4885a33be1..61973a7e3d71 100644 --- a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx @@ -49,7 +49,7 @@ CurrentSlideManager::CurrentSlideManager (SlideSorter& rSlideSorter) maSwitchPageDelayTimer.SetTimeoutHdl(LINK(this,CurrentSlideManager,SwitchPageCallback)); } -CurrentSlideManager::~CurrentSlideManager (void) +CurrentSlideManager::~CurrentSlideManager() { } @@ -85,7 +85,7 @@ void CurrentSlideManager::NotifyCurrentSlideChange (const sal_Int32 nSlideIndex) } } -void CurrentSlideManager::ReleaseCurrentSlide (void) +void CurrentSlideManager::ReleaseCurrentSlide() { if (mpCurrentSlide.get() != NULL) mrSlideSorter.GetView().SetState(mpCurrentSlide, PageDescriptor::ST_Current, false); @@ -94,7 +94,7 @@ void CurrentSlideManager::ReleaseCurrentSlide (void) mnCurrentSlideIndex = -1; } -bool CurrentSlideManager::IsCurrentSlideIsValid (void) +bool CurrentSlideManager::IsCurrentSlideIsValid() { return mnCurrentSlideIndex >= 0 && mnCurrentSlideIndex<mrSlideSorter.GetModel().GetPageCount(); } @@ -224,12 +224,12 @@ void CurrentSlideManager::SetCurrentSlideAtXController (const SharedPageDescript } } -void CurrentSlideManager::PrepareModelChange (void) +void CurrentSlideManager::PrepareModelChange() { mpCurrentSlide.reset(); } -void CurrentSlideManager::HandleModelChange (void) +void CurrentSlideManager::HandleModelChange() { if (mnCurrentSlideIndex >= 0) { diff --git a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx index 3338bfeac24e..3faf316f1dda 100644 --- a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx +++ b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx @@ -63,12 +63,12 @@ DragAndDropContext::DragAndDropContext (SlideSorter& rSlideSorter) rSlideSorter.GetController().GetInsertionIndicatorHandler()->UpdateIndicatorIcon(pTransferable); } -DragAndDropContext::~DragAndDropContext (void) +DragAndDropContext::~DragAndDropContext() { SetTargetSlideSorter (NULL, Point(0,0), InsertionIndicatorHandler::UnknownMode, false); } -void DragAndDropContext::Dispose (void) +void DragAndDropContext::Dispose() { mnInsertionIndex = -1; } diff --git a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.hxx b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.hxx index 9af4797e3478..c7f6f1ee6c57 100644 --- a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.hxx +++ b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.hxx @@ -43,13 +43,13 @@ public: when provided, the pages in the transferable. */ DragAndDropContext (SlideSorter& rSlideSorter); - ~DragAndDropContext (void); + ~DragAndDropContext(); /** Call this method (for example as reaction to ESC key press) to avoid processing (ie moving or inserting) the substition when the called DragAndDropContext object is destroyed. */ - void Dispose (void); + void Dispose(); /** Move the substitution display by the distance the mouse has travelled since the last call to this method or to diff --git a/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx b/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx index 1b9a3dc17ef6..b0acdd6ed90f 100644 --- a/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx @@ -45,7 +45,7 @@ FocusManager::FocusManager (SlideSorter& rSlideSorter) mnPageIndex = 0; } -FocusManager::~FocusManager (void) +FocusManager::~FocusManager() { } @@ -159,13 +159,13 @@ void FocusManager::ShowFocus (const bool bScrollToFocus) ShowFocusIndicator(GetFocusedPageDescriptor(), bScrollToFocus); } -void FocusManager::HideFocus (void) +void FocusManager::HideFocus() { mbPageIsFocused = false; HideFocusIndicator(GetFocusedPageDescriptor()); } -bool FocusManager::ToggleFocus (void) +bool FocusManager::ToggleFocus() { if (mnPageIndex >= 0) { @@ -177,12 +177,12 @@ bool FocusManager::ToggleFocus (void) return mbPageIsFocused; } -bool FocusManager::HasFocus (void) const +bool FocusManager::HasFocus() const { return mrSlideSorter.GetContentWindow()->HasFocus(); } -model::SharedPageDescriptor FocusManager::GetFocusedPageDescriptor (void) const +model::SharedPageDescriptor FocusManager::GetFocusedPageDescriptor() const { return mrSlideSorter.GetModel().GetPageDescriptor(mnPageIndex); } @@ -202,12 +202,12 @@ void FocusManager::SetFocusedPage (sal_Int32 nPageIndex) mnPageIndex = nPageIndex; } -void FocusManager::SetFocusedPageToCurrentPage (void) +void FocusManager::SetFocusedPageToCurrentPage() { SetFocusedPage(mrSlideSorter.GetController().GetCurrentSlideManager()->GetCurrentSlide()); } -bool FocusManager::IsFocusShowing (void) const +bool FocusManager::IsFocusShowing() const { return HasFocus() && mbPageIsFocused; } @@ -258,7 +258,7 @@ void FocusManager::RemoveFocusChangeListener (const Link& rListener) ::std::find (maFocusChangeListeners.begin(), maFocusChangeListeners.end(), rListener)); } -void FocusManager::NotifyFocusChangeListeners (void) const +void FocusManager::NotifyFocusChangeListeners() const { // Create a copy of the listener list to be safe when that is modified. ::std::vector<Link> aListeners (maFocusChangeListeners); @@ -279,7 +279,7 @@ FocusManager::FocusHider::FocusHider (FocusManager& rManager) mrManager.HideFocus(); } -FocusManager::FocusHider::~FocusHider (void) +FocusManager::FocusHider::~FocusHider() { if (mbFocusVisible) mrManager.ShowFocus(); diff --git a/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx b/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx index fd8dcef357da..42b932e640a8 100644 --- a/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx +++ b/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx @@ -47,7 +47,7 @@ InsertionIndicatorHandler::InsertionIndicatorHandler (SlideSorter& rSlideSorter) { } -InsertionIndicatorHandler::~InsertionIndicatorHandler (void) +InsertionIndicatorHandler::~InsertionIndicatorHandler() { } @@ -81,12 +81,12 @@ void InsertionIndicatorHandler::End (const controller::Animator::AnimationMode e mpInsertionIndicatorOverlay.reset(new view::InsertionIndicatorOverlay(mrSlideSorter)); } -void InsertionIndicatorHandler::ForceShow (void) +void InsertionIndicatorHandler::ForceShow() { mbIsForcedShow = true; } -void InsertionIndicatorHandler::ForceEnd (void) +void InsertionIndicatorHandler::ForceEnd() { mbIsForcedShow = false; End(Animator::AM_Immediate); @@ -129,7 +129,7 @@ void InsertionIndicatorHandler::UpdatePosition ( UpdatePosition(rMouseModelPosition, GetModeFromDndAction(nDndAction)); } -sal_Int32 InsertionIndicatorHandler::GetInsertionPageIndex (void) const +sal_Int32 InsertionIndicatorHandler::GetInsertionPageIndex() const { if (mbIsReadOnly) return -1; @@ -171,7 +171,7 @@ void InsertionIndicatorHandler::SetPosition ( } } -::boost::shared_ptr<view::InsertAnimator> InsertionIndicatorHandler::GetInsertAnimator (void) +::boost::shared_ptr<view::InsertAnimator> InsertionIndicatorHandler::GetInsertAnimator() { if ( ! mpInsertAnimator) mpInsertAnimator.reset(new view::InsertAnimator(mrSlideSorter)); @@ -240,7 +240,7 @@ InsertionIndicatorHandler::ForceShowContext::ForceShowContext ( mpHandler->ForceShow(); } -InsertionIndicatorHandler::ForceShowContext::~ForceShowContext (void) +InsertionIndicatorHandler::ForceShowContext::~ForceShowContext() { mpHandler->ForceEnd(); } diff --git a/sd/source/ui/slidesorter/controller/SlsListener.cxx b/sd/source/ui/slidesorter/controller/SlsListener.cxx index b821f77a081e..149edf879839 100644 --- a/sd/source/ui/slidesorter/controller/SlsListener.cxx +++ b/sd/source/ui/slidesorter/controller/SlsListener.cxx @@ -136,13 +136,13 @@ Listener::Listener ( } } -Listener::~Listener (void) +Listener::~Listener() { DBG_ASSERT( !mbListeningToDocument && !mbListeningToUNODocument && !mbListeningToFrame, "sd::Listener::~Listener(), disposing() was not called, ask DBO!" ); } -void Listener::ReleaseListeners (void) +void Listener::ReleaseListeners() { if (mbListeningToDocument) { @@ -196,7 +196,7 @@ void Listener::ReleaseListeners (void) } } -void Listener::ConnectToController (void) +void Listener::ConnectToController() { ViewShell* pShell = mrSlideSorter.GetViewShell(); @@ -241,7 +241,7 @@ void Listener::ConnectToController (void) } } -void Listener::DisconnectFromController (void) +void Listener::DisconnectFromController() { if (mbListeningToController) { @@ -527,12 +527,12 @@ void SAL_CALL Listener::notifyEvent ( { } -void SAL_CALL Listener::disposing (void) +void SAL_CALL Listener::disposing() { ReleaseListeners(); } -void Listener::UpdateEditMode (void) +void Listener::UpdateEditMode() { // When there is a new controller then the edit mode may have changed at // the same time. @@ -631,7 +631,7 @@ void Listener::HandleShapeModification (const SdrPage* pPage) } } -void Listener::ThrowIfDisposed (void) +void Listener::ThrowIfDisposed() throw (::com::sun::star::lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) diff --git a/sd/source/ui/slidesorter/controller/SlsListener.hxx b/sd/source/ui/slidesorter/controller/SlsListener.hxx index fe2d018129ca..c00ce5680014 100644 --- a/sd/source/ui/slidesorter/controller/SlsListener.hxx +++ b/sd/source/ui/slidesorter/controller/SlsListener.hxx @@ -72,7 +72,7 @@ class Listener { public: Listener (SlideSorter& rSlideSorter); - virtual ~Listener (void); + virtual ~Listener(); /** Connect to the current controller of the view shell as listener. This method is called once during initialization and every time a @@ -80,7 +80,7 @@ public: When the connection is successful then the flag mbListeningToController is set to <TRUE/>. */ - void ConnectToController (void); + void ConnectToController(); /** Disconnect from the current controller of the view shell as listener. This method is called once during initialization and @@ -88,7 +88,7 @@ public: exchanged. When this method terminates then mbListeningToController is <FALSE/>. */ - void DisconnectFromController (void); + void DisconnectFromController(); virtual void Notify ( SfxBroadcaster& rBroadcaster, @@ -127,7 +127,7 @@ public: frameAction (const ::com::sun::star::frame::FrameActionEvent& rEvent) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; private: SlideSorter& mrSlideSorter; @@ -153,11 +153,11 @@ private: */ ::boost::shared_ptr<SlideSorterController::ModelChangeLock> mpModelChangeLock; - void ReleaseListeners (void); + void ReleaseListeners(); /** Called when the edit mode has changed. Update model accordingly. */ - void UpdateEditMode (void); + void UpdateEditMode(); /** Handle a change in the order of slides or when the set of slides has changed, i.e. a slide has been created. @@ -173,7 +173,7 @@ private: /** This method throws a DisposedException when the object has already been disposed. */ - void ThrowIfDisposed (void) + void ThrowIfDisposed() throw (::com::sun::star::lang::DisposedException); DECL_LINK(EventMultiplexerCallback, tools::EventMultiplexerEvent*); diff --git a/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx b/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx index 3e6e9f9959c0..b9563ae7b814 100644 --- a/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx +++ b/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx @@ -62,7 +62,7 @@ PageSelector::PageSelector (SlideSorter& rSlideSorter) CountSelectedPages (); } -void PageSelector::SelectAllPages (void) +void PageSelector::SelectAllPages() { VisibleAreaManager::TemporaryDisabler aDisabler (mrSlideSorter); PageSelector::UpdateLock aLock (*this); @@ -72,7 +72,7 @@ void PageSelector::SelectAllPages (void) SelectPage(nPageIndex); } -void PageSelector::DeselectAllPages (void) +void PageSelector::DeselectAllPages() { VisibleAreaManager::TemporaryDisabler aDisabler (mrSlideSorter); PageSelector::UpdateLock aLock (*this); @@ -87,7 +87,7 @@ void PageSelector::DeselectAllPages (void) mpSelectionAnchor.reset(); } -void PageSelector::GetCoreSelection (void) +void PageSelector::GetCoreSelection() { PageSelector::UpdateLock aLock (*this); @@ -118,7 +118,7 @@ void PageSelector::GetCoreSelection (void) } } -void PageSelector::SetCoreSelection (void) +void PageSelector::SetCoreSelection() { model::PageEnumeration aAllPages ( model::PageEnumerationProvider::CreateAllPagesEnumeration(mrModel)); @@ -199,7 +199,7 @@ void PageSelector::DeselectPage ( } } -void PageSelector::CheckConsistency (void) const +void PageSelector::CheckConsistency() const { int nSelectionCount (0); for (int nPageIndex=0,nPageCount=mrModel.GetPageCount(); nPageIndex<nPageCount; nPageIndex++) @@ -228,12 +228,12 @@ bool PageSelector::IsPageSelected (int nPageIndex) return false; } -int PageSelector::GetPageCount (void) const +int PageSelector::GetPageCount() const { return mrModel.GetPageCount(); } -void PageSelector::CountSelectedPages (void) +void PageSelector::CountSelectedPages() { mnSelectedPageCount = 0; model::PageEnumeration aSelectedPages ( @@ -245,7 +245,7 @@ void PageSelector::CountSelectedPages (void) } } -void PageSelector::EnableBroadcasting (void) +void PageSelector::EnableBroadcasting() { if (mnBroadcastDisableLevel > 0) mnBroadcastDisableLevel --; @@ -256,12 +256,12 @@ void PageSelector::EnableBroadcasting (void) } } -void PageSelector::DisableBroadcasting (void) +void PageSelector::DisableBroadcasting() { mnBroadcastDisableLevel ++; } -::boost::shared_ptr<PageSelector::PageSelection> PageSelector::GetPageSelection (void) const +::boost::shared_ptr<PageSelector::PageSelection> PageSelector::GetPageSelection() const { ::boost::shared_ptr<PageSelection> pSelection (new PageSelection()); pSelection->reserve(GetSelectedPageCount()); @@ -346,12 +346,12 @@ PageSelector::UpdateLock::UpdateLock (PageSelector& rSelector) ++mpSelector->mnUpdateLockCount; } -PageSelector::UpdateLock::~UpdateLock (void) +PageSelector::UpdateLock::~UpdateLock() { Release(); } -void PageSelector::UpdateLock::Release (void) +void PageSelector::UpdateLock::Release() { if (mpSelector != NULL) { @@ -378,7 +378,7 @@ PageSelector::BroadcastLock::BroadcastLock (PageSelector& rSelector) mrSelector.DisableBroadcasting(); } -PageSelector::BroadcastLock::~BroadcastLock (void) +PageSelector::BroadcastLock::~BroadcastLock() { mrSelector.EnableBroadcasting(); } diff --git a/sd/source/ui/slidesorter/controller/SlsProperties.cxx b/sd/source/ui/slidesorter/controller/SlsProperties.cxx index 5165a5f14de6..a876bd2ae37f 100644 --- a/sd/source/ui/slidesorter/controller/SlsProperties.cxx +++ b/sd/source/ui/slidesorter/controller/SlsProperties.cxx @@ -23,7 +23,7 @@ namespace sd { namespace slidesorter { namespace controller { -Properties::Properties (void) +Properties::Properties() : mbIsHighlightCurrentSlide(false), mbIsShowSelection(true), mbIsShowFocus(true), @@ -41,11 +41,11 @@ Properties::Properties (void) { } -Properties::~Properties (void) +Properties::~Properties() { } -void Properties::HandleDataChangeEvent (void) +void Properties::HandleDataChangeEvent() { maBackgroundColor = Application::GetSettings().GetStyleSettings().GetWindowColor(); maTextColor = Application::GetSettings().GetStyleSettings().GetActiveTextColor(); diff --git a/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx b/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx index 971c7e75aebb..5fcebfb83746 100644 --- a/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx @@ -66,11 +66,11 @@ ScrollBarManager::ScrollBarManager (SlideSorter& rSlideSorter) LINK(this, ScrollBarManager, AutoScrollTimeoutHandler)); } -ScrollBarManager::~ScrollBarManager (void) +ScrollBarManager::~ScrollBarManager() { } -void ScrollBarManager::Connect (void) +void ScrollBarManager::Connect() { if (mpVerticalScrollBar != 0) { @@ -84,7 +84,7 @@ void ScrollBarManager::Connect (void) } } -void ScrollBarManager::Disconnect (void) +void ScrollBarManager::Disconnect() { if (mpVerticalScrollBar != 0) { @@ -429,7 +429,7 @@ void ScrollBarManager::SetTopLeft(const Point& rNewTopLeft) mrSlideSorter.GetView().InvalidatePageObjectVisibilities(); } -int ScrollBarManager::GetVerticalScrollBarWidth (void) const +int ScrollBarManager::GetVerticalScrollBarWidth() const { if (mpVerticalScrollBar != 0 && mpVerticalScrollBar->IsVisible()) return mpVerticalScrollBar->GetSizePixel().Width(); @@ -437,7 +437,7 @@ int ScrollBarManager::GetVerticalScrollBarWidth (void) const return 0; } -int ScrollBarManager::GetHorizontalScrollBarHeight (void) const +int ScrollBarManager::GetHorizontalScrollBarHeight() const { if (mpHorizontalScrollBar != 0 && mpHorizontalScrollBar->IsVisible()) return mpHorizontalScrollBar->GetSizePixel().Height(); @@ -501,7 +501,7 @@ void ScrollBarManager::CalcAutoScrollOffset (const Point& rMouseWindowPosition) bool ScrollBarManager::AutoScroll ( const Point& rMouseWindowPosition, - const ::boost::function<void(void)>& rAutoScrollFunctor) + const ::boost::function<void()>& rAutoScrollFunctor) { maAutoScrollFunctor = rAutoScrollFunctor; CalcAutoScrollOffset(rMouseWindowPosition); @@ -512,13 +512,13 @@ bool ScrollBarManager::AutoScroll ( return bResult; } -void ScrollBarManager::StopAutoScroll (void) +void ScrollBarManager::StopAutoScroll() { maAutoScrollTimer.Stop(); mbIsAutoScrollActive = false; } -bool ScrollBarManager::RepeatAutoScroll (void) +bool ScrollBarManager::RepeatAutoScroll() { if (maAutoScrollOffset != Size(0,0)) { @@ -546,7 +546,7 @@ bool ScrollBarManager::RepeatAutoScroll (void) void ScrollBarManager::clearAutoScrollFunctor() { - maAutoScrollFunctor = ::boost::function<void(void)>(); + maAutoScrollFunctor = ::boost::function<void()>(); } IMPL_LINK_NOARG(ScrollBarManager, AutoScrollTimeoutHandler) diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx index 64ee5effc7e8..8bef190c0ecf 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx @@ -133,7 +133,7 @@ private: whether the selection rectangle is visible or whether the page under the mouse or the one that has the focus is selected. */ - sal_uInt32 EncodeState (void) const; + sal_uInt32 EncodeState() const; }; //===== SelectionFunction::ModeHandler ======================================== @@ -145,10 +145,10 @@ public: SlideSorter& rSlideSorter, SelectionFunction& rSelectionFunction, const bool bIsMouseOverIndicatorAllowed); - virtual ~ModeHandler (void); + virtual ~ModeHandler(); - virtual Mode GetMode (void) const = 0; - virtual void Abort (void) = 0; + virtual Mode GetMode() const = 0; + virtual void Abort() = 0; virtual void ProcessEvent (EventDescriptor& rDescriptor); /** Set the selection to exactly the specified page and also set it as @@ -157,7 +157,7 @@ public: void SetCurrentPage (const model::SharedPageDescriptor& rpDescriptor); /// Deselect all pages. - void DeselectAllPages (void); + void DeselectAllPages(); void SelectOnePage (const model::SharedPageDescriptor& rpDescriptor); /** When the view on which this selection function is working is the @@ -169,7 +169,7 @@ public: const Point& rMousePosition, const InsertionIndicatorHandler::Mode eMode); - bool IsMouseOverIndicatorAllowed (void) const { return mbIsMouseOverIndicatorAllowed;} + bool IsMouseOverIndicatorAllowed() const { return mbIsMouseOverIndicatorAllowed;} protected: SlideSorter& mrSlideSorter; @@ -196,12 +196,12 @@ public: NormalModeHandler ( SlideSorter& rSlideSorter, SelectionFunction& rSelectionFunction); - virtual ~NormalModeHandler (void); + virtual ~NormalModeHandler(); - virtual SelectionFunction::Mode GetMode (void) const SAL_OVERRIDE; - virtual void Abort (void) SAL_OVERRIDE; + virtual SelectionFunction::Mode GetMode() const SAL_OVERRIDE; + virtual void Abort() SAL_OVERRIDE; - void ResetButtonDownLocation (void); + void ResetButtonDownLocation(); protected: virtual bool ProcessButtonDownEvent (SelectionFunction::EventDescriptor& rDescriptor) SAL_OVERRIDE; @@ -235,14 +235,14 @@ public: const Point& rMouseModelPosition, const sal_uInt32 nEventCode); #endif - virtual ~MultiSelectionModeHandler (void); + virtual ~MultiSelectionModeHandler(); #ifndef MACOSX void Initialize(const sal_uInt32 nEventCode); #endif - virtual SelectionFunction::Mode GetMode (void) const SAL_OVERRIDE; - virtual void Abort (void) SAL_OVERRIDE; + virtual SelectionFunction::Mode GetMode() const SAL_OVERRIDE; + virtual void Abort() SAL_OVERRIDE; virtual void ProcessEvent (SelectionFunction::EventDescriptor& rDescriptor) SAL_OVERRIDE; enum SelectionMode { SM_Normal, SM_Add, SM_Toggle }; @@ -264,7 +264,7 @@ private: sal_Int32 mnSecondIndex; void UpdateModelPosition (const Point& rMouseModelPosition); - void UpdateSelection (void); + void UpdateSelection(); /** Update the rectangle selection so that the given position becomes the new second point of the selection rectangle. @@ -292,14 +292,14 @@ public: const Point& rMousePosition, ::vcl::Window* pWindow); #endif - virtual ~DragAndDropModeHandler (void); + virtual ~DragAndDropModeHandler(); #ifndef MACOSX void Initialize(const Point& rMousePosition, ::vcl::Window* pWindow); #endif - virtual SelectionFunction::Mode GetMode (void) const SAL_OVERRIDE; - virtual void Abort (void) SAL_OVERRIDE; + virtual SelectionFunction::Mode GetMode() const SAL_OVERRIDE; + virtual void Abort() SAL_OVERRIDE; protected: virtual bool ProcessButtonUpEvent (SelectionFunction::EventDescriptor& rDescriptor) SAL_OVERRIDE; @@ -332,7 +332,7 @@ SelectionFunction::SelectionFunction ( { } -SelectionFunction::~SelectionFunction (void) +SelectionFunction::~SelectionFunction() { mpModeHandler.reset(); } @@ -376,7 +376,7 @@ bool SelectionFunction::MouseButtonUp (const MouseEvent& rEvent) return true; } -void SelectionFunction::NotifyDragFinished (void) +void SelectionFunction::NotifyDragFinished() { SwitchToNormalMode(); } @@ -599,7 +599,7 @@ void SelectionFunction::Deactivate() FuPoor::Deactivate(); } -void SelectionFunction::DoCut (void) +void SelectionFunction::DoCut() { if ( ! mrSlideSorter.GetProperties()->IsUIReadOnly()) { @@ -607,12 +607,12 @@ void SelectionFunction::DoCut (void) } } -void SelectionFunction::DoCopy (void) +void SelectionFunction::DoCopy() { mrController.GetClipboard().DoCopy(); } -void SelectionFunction::DoPaste (void) +void SelectionFunction::DoPaste() { if ( ! mrSlideSorter.GetProperties()->IsUIReadOnly()) { @@ -620,7 +620,7 @@ void SelectionFunction::DoPaste (void) } } -bool SelectionFunction::cancel (void) +bool SelectionFunction::cancel() { mrController.GetFocusManager().ToggleFocus(); return true; @@ -694,7 +694,7 @@ bool Match ( return (nEventCode & nPositivePattern)==nPositivePattern; } -void SelectionFunction::SwitchToNormalMode (void) +void SelectionFunction::SwitchToNormalMode() { if (mpModeHandler->GetMode() != NormalMode) SwitchMode(::boost::shared_ptr<ModeHandler>( @@ -756,12 +756,12 @@ void SelectionFunction::SwitchMode (const ::boost::shared_ptr<ModeHandler>& rpHa mpModeHandler = rpHandler; } -void SelectionFunction::ResetShiftKeySelectionAnchor (void) +void SelectionFunction::ResetShiftKeySelectionAnchor() { mnShiftKeySelectionAnchor = -1; } -void SelectionFunction::ResetMouseAnchor (void) +void SelectionFunction::ResetMouseAnchor() { if (mpModeHandler && mpModeHandler->GetMode() == NormalMode) { @@ -866,7 +866,7 @@ sal_uInt32 SelectionFunction::EventDescriptor::EncodeMouseEvent ( return nEventCode; } -sal_uInt32 SelectionFunction::EventDescriptor::EncodeState (void) const +sal_uInt32 SelectionFunction::EventDescriptor::EncodeState() const { sal_uInt32 nEventCode (0); @@ -894,7 +894,7 @@ SelectionFunction::ModeHandler::ModeHandler ( { } -SelectionFunction::ModeHandler::~ModeHandler (void) +SelectionFunction::ModeHandler::~ModeHandler() { } @@ -977,7 +977,7 @@ void SelectionFunction::ModeHandler::SetCurrentPage ( mrSlideSorter.GetController().GetCurrentSlideManager()->SwitchCurrentSlide(rpDescriptor); } -void SelectionFunction::ModeHandler::DeselectAllPages (void) +void SelectionFunction::ModeHandler::DeselectAllPages() { mrSlideSorter.GetController().GetPageSelector().DeselectAllPages(); mrSelectionFunction.ResetShiftKeySelectionAnchor(); @@ -1039,16 +1039,16 @@ NormalModeHandler::NormalModeHandler ( { } -NormalModeHandler::~NormalModeHandler (void) +NormalModeHandler::~NormalModeHandler() { } -SelectionFunction::Mode NormalModeHandler::GetMode (void) const +SelectionFunction::Mode NormalModeHandler::GetMode() const { return SelectionFunction::NormalMode; } -void NormalModeHandler::Abort (void) +void NormalModeHandler::Abort() { } @@ -1259,7 +1259,7 @@ void NormalModeHandler::RangeSelect (const model::SharedPageDescriptor& rpDescri } } -void NormalModeHandler::ResetButtonDownLocation (void) +void NormalModeHandler::ResetButtonDownLocation() { maButtonDownLocation = ::boost::optional<Point>(); } @@ -1294,7 +1294,7 @@ void MultiSelectionModeHandler::Initialize(const sal_uInt32 nEventCode) SetSelectionModeFromModifier(nEventCode); } -MultiSelectionModeHandler::~MultiSelectionModeHandler (void) +MultiSelectionModeHandler::~MultiSelectionModeHandler() { if (mbAutoScrollInstalled) { @@ -1305,12 +1305,12 @@ MultiSelectionModeHandler::~MultiSelectionModeHandler (void) mrSlideSorter.GetContentWindow()->SetPointer(maSavedPointer); } -SelectionFunction::Mode MultiSelectionModeHandler::GetMode (void) const +SelectionFunction::Mode MultiSelectionModeHandler::GetMode() const { return SelectionFunction::MultiSelectionMode; } -void MultiSelectionModeHandler::Abort (void) +void MultiSelectionModeHandler::Abort() { mrSlideSorter.GetView().RequestRepaint(mrSlideSorter.GetModel().RestoreSelection()); } @@ -1470,7 +1470,7 @@ void MultiSelectionModeHandler::UpdateModelPosition (const Point& rMouseModelPos UpdateSelection(); } -void MultiSelectionModeHandler::UpdateSelection (void) +void MultiSelectionModeHandler::UpdateSelection() { view::SlideSorterView::DrawLock aLock (mrSlideSorter); @@ -1533,7 +1533,7 @@ void DragAndDropModeHandler::Initialize(const Point& rMousePosition, ::vcl::Wind && pDragTransferable->GetView()==&mrSlideSorter.GetView()); } -DragAndDropModeHandler::~DragAndDropModeHandler (void) +DragAndDropModeHandler::~DragAndDropModeHandler() { if (mpDragAndDropContext) { @@ -1544,12 +1544,12 @@ DragAndDropModeHandler::~DragAndDropModeHandler (void) mrSlideSorter.GetController().GetInsertionIndicatorHandler()->End(Animator::AM_Animated); } -SelectionFunction::Mode DragAndDropModeHandler::GetMode (void) const +SelectionFunction::Mode DragAndDropModeHandler::GetMode() const { return SelectionFunction::DragAndDropMode; } -void DragAndDropModeHandler::Abort (void) +void DragAndDropModeHandler::Abort() { mrSlideSorter.GetController().GetClipboard().Abort(); if (mpDragAndDropContext) diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx index 13246b7444ec..889e3510c940 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx @@ -75,7 +75,7 @@ SelectionManager::SelectionManager (SlideSorter& rSlideSorter) { } -SelectionManager::~SelectionManager (void) +SelectionManager::~SelectionManager() { if (mnAnimationId != Animator::NotAnAnimationId) mrController.GetAnimator()->RemoveAnimation(mnAnimationId); @@ -269,7 +269,7 @@ void SelectionManager::RemoveSelectionChangeListener(const Link&rListener) rListener)); } -sal_Int32 SelectionManager::GetInsertionPosition (void) const +sal_Int32 SelectionManager::GetInsertionPosition() const { sal_Int32 nInsertionPosition (mnInsertionPosition); if (nInsertionPosition < 0) diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx index 2af4e0334cbf..9b2f8c9da7c6 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx @@ -38,13 +38,13 @@ SelectionObserver::Context::Context (SlideSorter& rSlideSorter) mpSelectionObserver->StartObservation(); } -SelectionObserver::Context::~Context(void) +SelectionObserver::Context::~Context() { if (mpSelectionObserver) mpSelectionObserver->EndObservation(); } -void SelectionObserver::Context::Abort(void) +void SelectionObserver::Context::Abort() { if (mpSelectionObserver) { @@ -63,7 +63,7 @@ SelectionObserver::SelectionObserver (SlideSorter& rSlideSorter) { } -SelectionObserver::~SelectionObserver (void) +SelectionObserver::~SelectionObserver() { } @@ -89,7 +89,7 @@ void SelectionObserver::NotifyPageEvent (const SdrPage* pSdrPage) } } -void SelectionObserver::StartObservation (void) +void SelectionObserver::StartObservation() { OSL_ASSERT(!mbIsOvservationActive); maInsertedPages.clear(); @@ -97,7 +97,7 @@ void SelectionObserver::StartObservation (void) mbIsOvservationActive = true; } -void SelectionObserver::AbortObservation (void) +void SelectionObserver::AbortObservation() { OSL_ASSERT(mbIsOvservationActive); mbIsOvservationActive = false; @@ -105,7 +105,7 @@ void SelectionObserver::AbortObservation (void) maDeletedPages.clear(); } -void SelectionObserver::EndObservation (void) +void SelectionObserver::EndObservation() { OSL_ASSERT(mbIsOvservationActive); mbIsOvservationActive = false; diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx index d6ac365ef3fb..17eaee29fd1a 100644 --- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx @@ -117,7 +117,7 @@ SlotManager::SlotManager (SlideSorter& rSlideSorter) { } -SlotManager::~SlotManager (void) +SlotManager::~SlotManager() { } @@ -877,7 +877,7 @@ void SlotManager::ShowSlideShow( SfxRequest& rReq) slideshowhelp::ShowSlideShow(rReq, *mrSlideSorter.GetModel().GetDocument()); } -void SlotManager::RenameSlide (void) +void SlotManager::RenameSlide() { PageKind ePageKind = mrSlideSorter.GetModel().GetPageType(); View* pDrView = &mrSlideSorter.GetView(); @@ -1186,7 +1186,7 @@ void SlotManager::ChangeSlideExclusionState ( mrSlideSorter.GetModel().GetDocument()->SetChanged(); } -sal_Int32 SlotManager::GetInsertionPosition (void) +sal_Int32 SlotManager::GetInsertionPosition() { PageSelector& rSelector (mrSlideSorter.GetController().GetPageSelector()); @@ -1233,7 +1233,7 @@ sal_Int32 SlotManager::GetInsertionPosition (void) } } -void SlotManager::NotifyEditModeChange (void) +void SlotManager::NotifyEditModeChange() { SfxBindings& rBindings (mrSlideSorter.GetViewShell()->GetViewFrame()->GetBindings()); rBindings.Invalidate(SID_PRESENTATION); diff --git a/sd/source/ui/slidesorter/controller/SlsTransferableData.cxx b/sd/source/ui/slidesorter/controller/SlsTransferableData.cxx index ea088a0b916d..85777682c4e2 100644 --- a/sd/source/ui/slidesorter/controller/SlsTransferableData.cxx +++ b/sd/source/ui/slidesorter/controller/SlsTransferableData.cxx @@ -62,7 +62,7 @@ TransferableData::TransferableData ( StartListening(*mpViewShell); } -TransferableData::~TransferableData (void) +TransferableData::~TransferableData() { if (mpViewShell != NULL) EndListening(*mpViewShell); diff --git a/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx b/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx index 8ccb1106c5e6..4a29df00b43e 100644 --- a/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx @@ -59,16 +59,16 @@ VisibleAreaManager::VisibleAreaManager (SlideSorter& rSlideSorter) { } -VisibleAreaManager::~VisibleAreaManager (void) +VisibleAreaManager::~VisibleAreaManager() { } -void VisibleAreaManager::ActivateCurrentSlideTracking (void) +void VisibleAreaManager::ActivateCurrentSlideTracking() { mbIsCurrentSlideTrackingActive = true; } -void VisibleAreaManager::DeactivateCurrentSlideTracking (void) +void VisibleAreaManager::DeactivateCurrentSlideTracking() { mbIsCurrentSlideTrackingActive = false; } @@ -92,14 +92,14 @@ void VisibleAreaManager::RequestVisible ( } } -void VisibleAreaManager::RequestCurrentSlideVisible (void) +void VisibleAreaManager::RequestCurrentSlideVisible() { if (mbIsCurrentSlideTrackingActive && mnDisableCount==0) RequestVisible( mrSlideSorter.GetController().GetCurrentSlideManager()->GetCurrentSlide()); } -void VisibleAreaManager::MakeVisible (void) +void VisibleAreaManager::MakeVisible() { if (maVisibleRequests.empty()) return; @@ -146,7 +146,7 @@ void VisibleAreaManager::MakeVisible (void) meRequestedAnimationMode = Animator::AM_Immediate; } -::boost::optional<Point> VisibleAreaManager::GetRequestedTopLeft (void) const +::boost::optional<Point> VisibleAreaManager::GetRequestedTopLeft() const { SharedSdWindow pWindow (mrSlideSorter.GetContentWindow()); if ( ! pWindow) @@ -208,7 +208,7 @@ VisibleAreaManager::TemporaryDisabler::TemporaryDisabler (SlideSorter& rSlideSor ++mrVisibleAreaManager.mnDisableCount; } -VisibleAreaManager::TemporaryDisabler::~TemporaryDisabler (void) +VisibleAreaManager::TemporaryDisabler::~TemporaryDisabler() { --mrVisibleAreaManager.mnDisableCount; } |