diff options
Diffstat (limited to 'sd/source/ui/sidebar')
38 files changed, 180 insertions, 180 deletions
diff --git a/sd/source/ui/sidebar/AllMasterPagesSelector.cxx b/sd/source/ui/sidebar/AllMasterPagesSelector.cxx index d633cfecf978..8e40ef1d0471 100644 --- a/sd/source/ui/sidebar/AllMasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/AllMasterPagesSelector.cxx @@ -74,7 +74,7 @@ class AllMasterPagesSelector::SortedMasterPageDescriptorList : public ::std::set<SharedMasterPageDescriptor,MasterPageDescriptorOrder> { public: - SortedMasterPageDescriptorList (void) {} + SortedMasterPageDescriptorList() {} }; MasterPagesSelector* AllMasterPagesSelector::Create ( @@ -113,7 +113,7 @@ AllMasterPagesSelector::AllMasterPagesSelector ( MasterPagesSelector::Fill(); } -AllMasterPagesSelector::~AllMasterPagesSelector (void) +AllMasterPagesSelector::~AllMasterPagesSelector() { } @@ -146,7 +146,7 @@ void AllMasterPagesSelector::NotifyContainerChangeEvent ( } } -void AllMasterPagesSelector::UpdateMasterPageList (void) +void AllMasterPagesSelector::UpdateMasterPageList() { mpSortedMasterPages->clear(); int nTokenCount = mpContainer->GetTokenCount(); diff --git a/sd/source/ui/sidebar/AllMasterPagesSelector.hxx b/sd/source/ui/sidebar/AllMasterPagesSelector.hxx index e3135871d5ca..11bcb2640f65 100644 --- a/sd/source/ui/sidebar/AllMasterPagesSelector.hxx +++ b/sd/source/ui/sidebar/AllMasterPagesSelector.hxx @@ -62,7 +62,7 @@ private: ViewShellBase& rBase, const ::boost::shared_ptr<MasterPageContainer>& rpContainer, const css::uno::Reference<css::ui::XSidebar>& rxSidebar); - virtual ~AllMasterPagesSelector (void); + virtual ~AllMasterPagesSelector(); void AddTemplate (const TemplateEntry& rEntry); @@ -75,7 +75,7 @@ private: /** Update the internal list of master pages that are to show in the control. */ - void UpdateMasterPageList (void); + void UpdateMasterPageList(); using MasterPagesSelector::Fill; }; diff --git a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx index 5e01b5fa66e4..5e8bdad96b52 100644 --- a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx @@ -89,7 +89,7 @@ CurrentMasterPagesSelector::CurrentMasterPagesSelector ( | sd::tools::EventMultiplexerEvent::EID_SHAPE_REMOVED); } -CurrentMasterPagesSelector::~CurrentMasterPagesSelector (void) +CurrentMasterPagesSelector::~CurrentMasterPagesSelector() { if (mrDocument.GetDocSh() != NULL) { @@ -104,7 +104,7 @@ CurrentMasterPagesSelector::~CurrentMasterPagesSelector (void) mrBase.GetEventMultiplexer()->RemoveEventListener(aLink); } -void CurrentMasterPagesSelector::LateInit (void) +void CurrentMasterPagesSelector::LateInit() { MasterPagesSelector::LateInit(); MasterPagesSelector::Fill(); @@ -157,12 +157,12 @@ void CurrentMasterPagesSelector::Fill (ItemList& rItemList) } } -ResId CurrentMasterPagesSelector::GetContextMenuResId (void) const +ResId CurrentMasterPagesSelector::GetContextMenuResId() const { return SdResId(RID_TASKPANE_CURRENT_MASTERPAGESSELECTOR_POPUP); } -void CurrentMasterPagesSelector::UpdateSelection (void) +void CurrentMasterPagesSelector::UpdateSelection() { // Iterate over all pages and for the selected ones put the name of // their master page into a set. diff --git a/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx b/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx index e5c2932b90be..e9a3cbe5d7d8 100644 --- a/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx +++ b/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx @@ -44,7 +44,7 @@ public: used by the currently selected page of the document in the center pane. */ - virtual void UpdateSelection (void) SAL_OVERRIDE; + virtual void UpdateSelection() SAL_OVERRIDE; /** Copy all master pages that are to be shown into the given list. */ @@ -53,7 +53,7 @@ public: using MasterPagesSelector::Fill; protected: - virtual ResId GetContextMenuResId (void) const SAL_OVERRIDE; + virtual ResId GetContextMenuResId() const SAL_OVERRIDE; virtual void ProcessPopupMenu (Menu& rMenu) SAL_OVERRIDE; virtual void ExecuteCommand (const sal_Int32 nCommandId) SAL_OVERRIDE; @@ -67,9 +67,9 @@ private: ViewShellBase& rBase, const ::boost::shared_ptr<MasterPageContainer>& rpContainer, const css::uno::Reference<css::ui::XSidebar>& rxSidebar); - virtual ~CurrentMasterPagesSelector (void); + virtual ~CurrentMasterPagesSelector(); - virtual void LateInit (void) SAL_OVERRIDE; + virtual void LateInit() SAL_OVERRIDE; DECL_LINK(EventMultiplexerListener,sd::tools::EventMultiplexerEvent*); }; diff --git a/sd/source/ui/sidebar/CustomAnimationPanel.cxx b/sd/source/ui/sidebar/CustomAnimationPanel.cxx index 804b6c143aa7..7f0f2d5c4d69 100644 --- a/sd/source/ui/sidebar/CustomAnimationPanel.cxx +++ b/sd/source/ui/sidebar/CustomAnimationPanel.cxx @@ -39,7 +39,7 @@ CustomAnimationPanel::CustomAnimationPanel ( #endif } -CustomAnimationPanel::~CustomAnimationPanel (void) +CustomAnimationPanel::~CustomAnimationPanel() { } diff --git a/sd/source/ui/sidebar/CustomAnimationPanel.hxx b/sd/source/ui/sidebar/CustomAnimationPanel.hxx index f9a9d708c8e3..5b42840cb3e3 100644 --- a/sd/source/ui/sidebar/CustomAnimationPanel.hxx +++ b/sd/source/ui/sidebar/CustomAnimationPanel.hxx @@ -32,7 +32,7 @@ public: vcl::Window* pParentWindow, ViewShellBase& rViewShellBase, const css::uno::Reference<css::frame::XFrame>& rxFrame); - virtual ~CustomAnimationPanel (void); + virtual ~CustomAnimationPanel(); // ILayoutableWindow virtual css::ui::LayoutSize GetHeightForWidth (const sal_Int32 nWidth) SAL_OVERRIDE; diff --git a/sd/source/ui/sidebar/IDisposable.hxx b/sd/source/ui/sidebar/IDisposable.hxx index 41dc811e0f57..3bad77980735 100644 --- a/sd/source/ui/sidebar/IDisposable.hxx +++ b/sd/source/ui/sidebar/IDisposable.hxx @@ -29,7 +29,7 @@ namespace sd { namespace sidebar { class IDisposable { public: - virtual void Dispose (void) = 0; + virtual void Dispose() = 0; virtual ~IDisposable(); }; diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx index b421ac01bf29..1306ffbb8f13 100644 --- a/sd/source/ui/sidebar/LayoutMenu.cxx +++ b/sd/source/ui/sidebar/LayoutMenu.cxx @@ -192,13 +192,13 @@ void LayoutMenu::implConstruct( DrawDocShell& rDocumentShell ) GetParent()->AddEventListener(aWindowEventHandlerLink); } -LayoutMenu::~LayoutMenu (void) +LayoutMenu::~LayoutMenu() { SAL_INFO("sd.ui", "destroying LayoutMenu at " << this); Dispose(); } -void LayoutMenu::Dispose (void) +void LayoutMenu::Dispose() { if (mbIsDisposed) return; @@ -219,7 +219,7 @@ void LayoutMenu::Dispose (void) GetParent()->RemoveEventListener(aWindowEventHandlerLink); } -AutoLayout LayoutMenu::GetSelectedAutoLayout (void) +AutoLayout LayoutMenu::GetSelectedAutoLayout() { AutoLayout aResult = AUTOLAYOUT_NONE; @@ -266,7 +266,7 @@ void LayoutMenu::Paint (const Rectangle& rRect) ValueSet::Paint (rRect); } -void LayoutMenu::Resize (void) +void LayoutMenu::Resize() { Size aWindowSize = GetOutputSizePixel(); if (IsVisible() && aWindowSize.Width() > 0) @@ -337,7 +337,7 @@ void LayoutMenu::InsertPageWithLayout (AutoLayout aLayout) UpdateSelection(); } -void LayoutMenu::InvalidateContent (void) +void LayoutMenu::InvalidateContent() { // Throw away the current set and fill the menu anew according to the // current settings (this includes the support for vertical writing.) @@ -493,7 +493,7 @@ SfxRequest LayoutMenu::CreateRequest ( return aRequest; } -void LayoutMenu::Fill (void) +void LayoutMenu::Fill() { SvtLanguageOptions aLanguageOptions; bool bVertical = aLanguageOptions.IsVerticalTextEnabled(); @@ -559,7 +559,7 @@ void LayoutMenu::Fill (void) mbSelectionUpdatePending = true; } -void LayoutMenu::Clear (void) +void LayoutMenu::Clear() { for (sal_uInt16 nId=1; nId<=GetItemCount(); nId++) delete static_cast<AutoLayout*>(GetItemData(nId)); @@ -661,7 +661,7 @@ IMPL_LINK(LayoutMenu, OnMenuItemSelected, Menu*, pMenu) return 0; } -void LayoutMenu::UpdateSelection (void) +void LayoutMenu::UpdateSelection() { bool bItemSelected = false; diff --git a/sd/source/ui/sidebar/LayoutMenu.hxx b/sd/source/ui/sidebar/LayoutMenu.hxx index 7eb77fc38f46..32c5819f9649 100644 --- a/sd/source/ui/sidebar/LayoutMenu.hxx +++ b/sd/source/ui/sidebar/LayoutMenu.hxx @@ -72,21 +72,21 @@ public: vcl::Window* pParent, ViewShellBase& rViewShellBase, const css::uno::Reference<css::ui::XSidebar>& rxSidebar); - virtual ~LayoutMenu (void); + virtual ~LayoutMenu(); - void Dispose (void); + void Dispose(); /** Return a numerical value representing the currently selected layout. */ - AutoLayout GetSelectedAutoLayout (void); + AutoLayout GetSelectedAutoLayout(); // From ILayoutableWindow virtual css::ui::LayoutSize GetHeightForWidth (const sal_Int32 nWidth) SAL_OVERRIDE; // From vcl::Window virtual void Paint (const Rectangle& rRect) SAL_OVERRIDE; - virtual void Resize (void) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; /** Show a context menu when the right mouse button is pressed. */ @@ -96,7 +96,7 @@ public: anymore. It will re-assemble this set according to the current settings. */ - void InvalidateContent (void); + void InvalidateContent(); // DragSourceHelper virtual void StartDrag (sal_Int8 nAction, const Point& rPosPixel) SAL_OVERRIDE; @@ -146,11 +146,11 @@ private: /** Fill the value set with the layouts that are applicable to the current main view shell. */ - void Fill (void); + void Fill(); /** Remove all items from the value set. */ - void Clear (void); + void Clear(); /** Assign the given layout to all selected slides of a slide sorter. If no slide sorter is active then this call is ignored. The slide @@ -180,7 +180,7 @@ private: /** Select the layout that is used by the current page. */ - void UpdateSelection (void); + void UpdateSelection(); // internal ctor void implConstruct( DrawDocShell& rDocumentShell ); diff --git a/sd/source/ui/sidebar/MasterPageContainer.cxx b/sd/source/ui/sidebar/MasterPageContainer.cxx index 6ce87fb0019a..0a6c697fa6d1 100644 --- a/sd/source/ui/sidebar/MasterPageContainer.cxx +++ b/sd/source/ui/sidebar/MasterPageContainer.cxx @@ -81,12 +81,12 @@ public: static ::boost::weak_ptr<Implementation> mpInstance; MasterPageContainerType maContainer; - static ::boost::shared_ptr<Implementation> Instance (void); + static ::boost::shared_ptr<Implementation> Instance(); - void LateInit (void); + void LateInit(); void AddChangeListener (const Link& rLink); void RemoveChangeListener (const Link& rLink); - void UpdatePreviewSizePixel (void); + void UpdatePreviewSizePixel(); Size GetPreviewSizePixel (PreviewSize eSize) const; bool HasToken (Token aToken) const; @@ -100,8 +100,8 @@ public: PreviewState GetPreviewState (Token aToken) const; bool RequestPreview (Token aToken); - Reference<frame::XModel> GetModel (void); - SdDrawDocument* GetDocument (void); + Reference<frame::XModel> GetModel(); + SdDrawDocument* GetDocument(); void FireContainerChange ( MasterPageContainerChangeEvent::EventType eType, @@ -119,11 +119,11 @@ public: /** Called by the MasterPageContainerFiller to notify that all master pages from template documents have been added. */ - virtual void FillingDone (void) SAL_OVERRIDE; + virtual void FillingDone() SAL_OVERRIDE; private: - Implementation (void); - virtual ~Implementation (void); + Implementation(); + virtual ~Implementation(); class Deleter { public: void operator() (Implementation* pObject) { delete pObject; } @@ -175,7 +175,7 @@ private: Image GetPreviewSubstitution (sal_uInt16 nId, PreviewSize ePreviewSize); - void CleanContainer (void); + void CleanContainer(); }; //===== MasterPageContainer =================================================== @@ -184,7 +184,7 @@ private: MasterPageContainer::Implementation::mpInstance; ::boost::shared_ptr<MasterPageContainer::Implementation> - MasterPageContainer::Implementation::Instance (void) + MasterPageContainer::Implementation::Instance() { ::boost::shared_ptr<MasterPageContainer::Implementation> pInstance; @@ -217,14 +217,14 @@ private: return pInstance; } -MasterPageContainer::MasterPageContainer (void) +MasterPageContainer::MasterPageContainer() : mpImpl(Implementation::Instance()), mePreviewSize(SMALL) { mpImpl->LateInit(); } -MasterPageContainer::~MasterPageContainer (void) +MasterPageContainer::~MasterPageContainer() { } @@ -246,7 +246,7 @@ void MasterPageContainer::SetPreviewSize (PreviewSize eSize) NIL_TOKEN); } -Size MasterPageContainer::GetPreviewSizePixel (void) const +Size MasterPageContainer::GetPreviewSizePixel() const { return mpImpl->GetPreviewSizePixel(mePreviewSize); } @@ -290,7 +290,7 @@ void MasterPageContainer::ReleaseToken (Token aToken) } } -int MasterPageContainer::GetTokenCount (void) const +int MasterPageContainer::GetTokenCount() const { const ::osl::MutexGuard aGuard (mpImpl->maMutex); @@ -483,7 +483,7 @@ bool MasterPageContainer::RequestPreview (Token aToken) //==== Implementation ================================================ -MasterPageContainer::Implementation::Implementation (void) +MasterPageContainer::Implementation::Implementation() : maMutex(), maContainer(), meInitializationState(NOT_INITIALIZED), @@ -505,7 +505,7 @@ MasterPageContainer::Implementation::Implementation (void) UpdatePreviewSizePixel(); } -MasterPageContainer::Implementation::~Implementation (void) +MasterPageContainer::Implementation::~Implementation() { // When the initializer or filler tasks are still running then we have // to stop them now in order to prevent them from calling us back. @@ -527,7 +527,7 @@ MasterPageContainer::Implementation::~Implementation (void) mxModel = NULL; } -void MasterPageContainer::Implementation::LateInit (void) +void MasterPageContainer::Implementation::LateInit() { const ::osl::MutexGuard aGuard (maMutex); @@ -569,7 +569,7 @@ void MasterPageContainer::Implementation::RemoveChangeListener (const Link& rLin maChangeListeners.erase(iListener); } -void MasterPageContainer::Implementation::UpdatePreviewSizePixel (void) +void MasterPageContainer::Implementation::UpdatePreviewSizePixel() { const ::osl::MutexGuard aGuard (maMutex); @@ -835,7 +835,7 @@ bool MasterPageContainer::Implementation::RequestPreview (Token aToken) return false; } -Reference<frame::XModel> MasterPageContainer::Implementation::GetModel (void) +Reference<frame::XModel> MasterPageContainer::Implementation::GetModel() { const ::osl::MutexGuard aGuard (maMutex); @@ -887,7 +887,7 @@ Reference<frame::XModel> MasterPageContainer::Implementation::GetModel (void) return mxModel; } -SdDrawDocument* MasterPageContainer::Implementation::GetDocument (void) +SdDrawDocument* MasterPageContainer::Implementation::GetDocument() { GetModel(); return mpDocument; @@ -937,7 +937,7 @@ Image MasterPageContainer::Implementation::GetPreviewSubstitution ( return aPreview; } -void MasterPageContainer::Implementation::CleanContainer (void) +void MasterPageContainer::Implementation::CleanContainer() { // Remove the empty elements at the end of the container. The empty // elements in the middle can not be removed because that would @@ -1031,7 +1031,7 @@ void MasterPageContainer::Implementation::ReleaseDescriptor (Token aToken) } } -void MasterPageContainer::Implementation::FillingDone (void) +void MasterPageContainer::Implementation::FillingDone() { mpRequestQueue->ProcessAllRequests(); } diff --git a/sd/source/ui/sidebar/MasterPageContainer.hxx b/sd/source/ui/sidebar/MasterPageContainer.hxx index 4ed2d90bb6d9..020b6bd2d7fb 100644 --- a/sd/source/ui/sidebar/MasterPageContainer.hxx +++ b/sd/source/ui/sidebar/MasterPageContainer.hxx @@ -58,8 +58,8 @@ public: typedef int Token; static const Token NIL_TOKEN = -1; - MasterPageContainer (void); - virtual ~MasterPageContainer (void); + MasterPageContainer(); + virtual ~MasterPageContainer(); void AddChangeListener (const Link& rLink); void RemoveChangeListener (const Link& rLink); @@ -75,11 +75,11 @@ public: /** Returns the preview size. */ - PreviewSize GetPreviewSize (void) const { return mePreviewSize;} + PreviewSize GetPreviewSize() const { return mePreviewSize;} /** Return the preview size in pixels. */ - Size GetPreviewSizePixel (void) const; + Size GetPreviewSizePixel() const; enum PreviewState { PS_AVAILABLE, PS_CREATABLE, PS_PREPARING, PS_NOT_AVAILABLE }; PreviewState GetPreviewState (Token aToken); @@ -115,7 +115,7 @@ public: /** This and the GetTokenForIndex() methods can be used to iterate over all members of the container. */ - int GetTokenCount (void) const; + int GetTokenCount() const; /** Determine whether the container has a member for the given token. */ diff --git a/sd/source/ui/sidebar/MasterPageContainerFiller.cxx b/sd/source/ui/sidebar/MasterPageContainerFiller.cxx index 49fba6dbfc06..f85c72f360e4 100644 --- a/sd/source/ui/sidebar/MasterPageContainerFiller.cxx +++ b/sd/source/ui/sidebar/MasterPageContainerFiller.cxx @@ -51,11 +51,11 @@ MasterPageContainerFiller::MasterPageContainerFiller (ContainerAdapter& rpAdapte mrContainerAdapter.PutMasterPage(pDescriptor); } -MasterPageContainerFiller::~MasterPageContainerFiller (void) +MasterPageContainerFiller::~MasterPageContainerFiller() { } -void MasterPageContainerFiller::RunNextStep (void) +void MasterPageContainerFiller::RunNextStep() { switch (meState) { @@ -95,7 +95,7 @@ void MasterPageContainerFiller::RunNextStep (void) } } -bool MasterPageContainerFiller::HasNextStep (void) +bool MasterPageContainerFiller::HasNextStep() { switch (meState) { @@ -108,7 +108,7 @@ bool MasterPageContainerFiller::HasNextStep (void) } } -MasterPageContainerFiller::State MasterPageContainerFiller::ScanTemplate (void) +MasterPageContainerFiller::State MasterPageContainerFiller::ScanTemplate() { State eState (ERROR); @@ -135,7 +135,7 @@ MasterPageContainerFiller::State MasterPageContainerFiller::ScanTemplate (void) return eState; } -MasterPageContainerFiller::State MasterPageContainerFiller::AddTemplate (void) +MasterPageContainerFiller::State MasterPageContainerFiller::AddTemplate() { if (mpLastAddedEntry != NULL) { diff --git a/sd/source/ui/sidebar/MasterPageContainerFiller.hxx b/sd/source/ui/sidebar/MasterPageContainerFiller.hxx index d6229edd36bc..2ea39a194ba7 100644 --- a/sd/source/ui/sidebar/MasterPageContainerFiller.hxx +++ b/sd/source/ui/sidebar/MasterPageContainerFiller.hxx @@ -47,25 +47,25 @@ public: /** This method is called when all Impress templates have been added to the container via the PutMasterPage() method. */ - virtual void FillingDone (void) = 0; + virtual void FillingDone() = 0; protected: ~ContainerAdapter() {} }; MasterPageContainerFiller (ContainerAdapter& rContainerAdapter); - virtual ~MasterPageContainerFiller (void); + virtual ~MasterPageContainerFiller(); /** Run the next step of the task. After HasNextStep() returns false this method should ignore further calls. */ - virtual void RunNextStep (void) SAL_OVERRIDE; + virtual void RunNextStep() SAL_OVERRIDE; /** Return <TRUE/> when there is at least one more step to execute. When the task has been executed completely then <FALSE/> is returned. */ - virtual bool HasNextStep (void) SAL_OVERRIDE; + virtual bool HasNextStep() SAL_OVERRIDE; private: ContainerAdapter& mrContainerAdapter; @@ -81,8 +81,8 @@ private: const TemplateEntry* mpLastAddedEntry; int mnIndex; - State ScanTemplate (void); - State AddTemplate (void); + State ScanTemplate(); + State AddTemplate(); }; } } // end of namespace sd::sidebar diff --git a/sd/source/ui/sidebar/MasterPageContainerProviders.cxx b/sd/source/ui/sidebar/MasterPageContainerProviders.cxx index c197615666e3..6474735da5e8 100644 --- a/sd/source/ui/sidebar/MasterPageContainerProviders.cxx +++ b/sd/source/ui/sidebar/MasterPageContainerProviders.cxx @@ -40,7 +40,7 @@ namespace sd { namespace sidebar { //===== PagePreviewProvider =================================================== -PagePreviewProvider::PagePreviewProvider (void) +PagePreviewProvider::PagePreviewProvider() { } @@ -65,12 +65,12 @@ Image PagePreviewProvider::operator () ( return aPreview; } -int PagePreviewProvider::GetCostIndex (void) +int PagePreviewProvider::GetCostIndex() { return 5; } -bool PagePreviewProvider::NeedsPageObject (void) +bool PagePreviewProvider::NeedsPageObject() { return true; } @@ -95,12 +95,12 @@ Image TemplatePreviewProvider::operator() ( return Image(ThumbnailView::readThumbnail(msURL)); } -int TemplatePreviewProvider::GetCostIndex (void) +int TemplatePreviewProvider::GetCostIndex() { return 10; } -bool TemplatePreviewProvider::NeedsPageObject (void) +bool TemplatePreviewProvider::NeedsPageObject() { return false; } @@ -163,7 +163,7 @@ SdPage* TemplatePageObjectProvider::operator() (SdDrawDocument* pContainerDocume return PTR_CAST(::sd::DrawDocShell,pShell); } -int TemplatePageObjectProvider::GetCostIndex (void) +int TemplatePageObjectProvider::GetCostIndex() { return 20; } @@ -180,7 +180,7 @@ bool TemplatePageObjectProvider::operator== (const PageObjectProvider& rProvider //===== DefaultPageObjectProvider ============================================== -DefaultPageObjectProvider::DefaultPageObjectProvider (void) +DefaultPageObjectProvider::DefaultPageObjectProvider() { } @@ -203,7 +203,7 @@ SdPage* DefaultPageObjectProvider::operator () (SdDrawDocument* pContainerDocume return pLocalMasterPage; } -int DefaultPageObjectProvider::GetCostIndex (void) +int DefaultPageObjectProvider::GetCostIndex() { return 15; } @@ -227,7 +227,7 @@ SdPage* ExistingPageProvider::operator() (SdDrawDocument* pDocument) return mpPage; } -int ExistingPageProvider::GetCostIndex (void) +int ExistingPageProvider::GetCostIndex() { return 0; } diff --git a/sd/source/ui/sidebar/MasterPageContainerProviders.hxx b/sd/source/ui/sidebar/MasterPageContainerProviders.hxx index 7fc367ebe30b..bffab9c3270c 100644 --- a/sd/source/ui/sidebar/MasterPageContainerProviders.hxx +++ b/sd/source/ui/sidebar/MasterPageContainerProviders.hxx @@ -52,7 +52,7 @@ public: immediate return. Positive values stand for higher costs. Negative values are not supported. */ - virtual int GetCostIndex (void) = 0; + virtual int GetCostIndex() = 0; virtual bool operator== (const PageObjectProvider& rProvider) = 0; @@ -83,12 +83,12 @@ public: is the preview creation. Return 0 when the preview is already present and can be returned immediately. */ - virtual int GetCostIndex (void) = 0; + virtual int GetCostIndex() = 0; /** Return whether the page object passed is necessary to create a preview. */ - virtual bool NeedsPageObject (void) = 0; + virtual bool NeedsPageObject() = 0; protected: ~PreviewProvider() {} @@ -99,11 +99,11 @@ protected: class PagePreviewProvider : public PreviewProvider { public: - PagePreviewProvider (void); + PagePreviewProvider(); virtual ~PagePreviewProvider() {} virtual Image operator () (int nWidth, SdPage* pPage, ::sd::PreviewRenderer& rRenderer) SAL_OVERRIDE; - virtual int GetCostIndex (void) SAL_OVERRIDE; - virtual bool NeedsPageObject (void) SAL_OVERRIDE; + virtual int GetCostIndex() SAL_OVERRIDE; + virtual bool NeedsPageObject() SAL_OVERRIDE; private: }; @@ -114,9 +114,9 @@ class TemplatePageObjectProvider : public PageObjectProvider { public: TemplatePageObjectProvider (const OUString& rsURL); - virtual ~TemplatePageObjectProvider (void) {}; + virtual ~TemplatePageObjectProvider() {}; virtual SdPage* operator () (SdDrawDocument* pDocument) SAL_OVERRIDE; - virtual int GetCostIndex (void) SAL_OVERRIDE; + virtual int GetCostIndex() SAL_OVERRIDE; virtual bool operator== (const PageObjectProvider& rProvider) SAL_OVERRIDE; private: OUString msURL; @@ -131,10 +131,10 @@ class TemplatePreviewProvider : public PreviewProvider { public: TemplatePreviewProvider (const OUString& rsURL); - virtual ~TemplatePreviewProvider (void) {}; + virtual ~TemplatePreviewProvider() {}; virtual Image operator() (int nWidth, SdPage* pPage, ::sd::PreviewRenderer& rRenderer) SAL_OVERRIDE; - virtual int GetCostIndex (void) SAL_OVERRIDE; - virtual bool NeedsPageObject (void) SAL_OVERRIDE; + virtual int GetCostIndex() SAL_OVERRIDE; + virtual bool NeedsPageObject() SAL_OVERRIDE; private: OUString msURL; }; @@ -144,10 +144,10 @@ private: class DefaultPageObjectProvider : public PageObjectProvider { public: - DefaultPageObjectProvider (void); + DefaultPageObjectProvider(); virtual ~DefaultPageObjectProvider() {} virtual SdPage* operator () (SdDrawDocument* pDocument) SAL_OVERRIDE; - virtual int GetCostIndex (void) SAL_OVERRIDE; + virtual int GetCostIndex() SAL_OVERRIDE; virtual bool operator== (const PageObjectProvider& rProvider) SAL_OVERRIDE; }; @@ -160,7 +160,7 @@ public: ExistingPageProvider (SdPage* pPage); virtual ~ExistingPageProvider() {} virtual SdPage* operator() (SdDrawDocument* pDocument) SAL_OVERRIDE; - virtual int GetCostIndex (void) SAL_OVERRIDE; + virtual int GetCostIndex() SAL_OVERRIDE; virtual bool operator== (const PageObjectProvider& rProvider) SAL_OVERRIDE; private: SdPage* mpPage; diff --git a/sd/source/ui/sidebar/MasterPageContainerQueue.cxx b/sd/source/ui/sidebar/MasterPageContainerQueue.cxx index 6841211049b2..0d5b6e46caa4 100644 --- a/sd/source/ui/sidebar/MasterPageContainerQueue.cxx +++ b/sd/source/ui/sidebar/MasterPageContainerQueue.cxx @@ -76,7 +76,7 @@ class MasterPageContainerQueue::RequestQueue : public ::std::set<PreviewCreationRequest,PreviewCreationRequest::Compare> { public: - RequestQueue (void) {} + RequestQueue() {} }; //===== MasterPageContainerQueue ============================================== @@ -98,14 +98,14 @@ MasterPageContainerQueue::MasterPageContainerQueue ( { } -MasterPageContainerQueue::~MasterPageContainerQueue (void) +MasterPageContainerQueue::~MasterPageContainerQueue() { maDelayedPreviewCreationTimer.Stop(); while ( ! mpRequestQueue->empty()) mpRequestQueue->erase(mpRequestQueue->begin()); } -void MasterPageContainerQueue::LateInit (void) +void MasterPageContainerQueue::LateInit() { // Set up the timer for the delayed creation of preview bitmaps. maDelayedPreviewCreationTimer.SetTimeout (snDelayedCreationTimeout); @@ -248,12 +248,12 @@ bool MasterPageContainerQueue::HasRequest (MasterPageContainer::Token aToken) co return (iRequest != mpRequestQueue->end()); } -bool MasterPageContainerQueue::IsEmpty (void) const +bool MasterPageContainerQueue::IsEmpty() const { return mpRequestQueue->empty(); } -void MasterPageContainerQueue::ProcessAllRequests (void) +void MasterPageContainerQueue::ProcessAllRequests() { snWaitForMoreRequestsCount = 0; if (mpRequestQueue->size() > 0) diff --git a/sd/source/ui/sidebar/MasterPageContainerQueue.hxx b/sd/source/ui/sidebar/MasterPageContainerQueue.hxx index f013acc7da9a..1aa6589c4547 100644 --- a/sd/source/ui/sidebar/MasterPageContainerQueue.hxx +++ b/sd/source/ui/sidebar/MasterPageContainerQueue.hxx @@ -51,7 +51,7 @@ public: static MasterPageContainerQueue* Create ( const ::boost::weak_ptr<ContainerAdapter>& rpContainer); - virtual ~MasterPageContainerQueue (void); + virtual ~MasterPageContainerQueue(); /** This method is typically called for entries in the container for which GetPreviewState() returns OS_CREATABLE. The creation of the @@ -68,14 +68,14 @@ public: /** Return <TRUE/> when there is at least one request in the queue. */ - bool IsEmpty (void) const; + bool IsEmpty() const; /** After this call the queue does not wait anymore for requests with higher priority when only a small number of requests with lower priority are present. This method should be called when all templates are inserted into the MasterPageContainer. */ - void ProcessAllRequests (void); + void ProcessAllRequests(); private: ::boost::weak_ptr<ContainerAdapter> mpWeakContainer; @@ -116,7 +116,7 @@ private: static sal_uInt32 snWaitForMoreRequestsCount; MasterPageContainerQueue (const ::boost::weak_ptr<ContainerAdapter>& rpContainer); - void LateInit (void); + void LateInit(); /** Calculate the priority that defines the order in which requests are processed. diff --git a/sd/source/ui/sidebar/MasterPageDescriptor.cxx b/sd/source/ui/sidebar/MasterPageDescriptor.cxx index 5ec98d9ff3bb..5c4889d94765 100644 --- a/sd/source/ui/sidebar/MasterPageDescriptor.cxx +++ b/sd/source/ui/sidebar/MasterPageDescriptor.cxx @@ -73,7 +73,7 @@ MasterPageDescriptor::MasterPageDescriptor (const MasterPageDescriptor& rDescrip { } -MasterPageDescriptor::~MasterPageDescriptor (void) +MasterPageDescriptor::~MasterPageDescriptor() { } @@ -251,7 +251,7 @@ bool MasterPageDescriptor::UpdatePreview ( return bModified; } -MasterPageDescriptor::URLClassification MasterPageDescriptor::GetURLClassification (void) +MasterPageDescriptor::URLClassification MasterPageDescriptor::GetURLClassification() { if (meURLClassification == URLCLASS_UNDETERMINED) { diff --git a/sd/source/ui/sidebar/MasterPageDescriptor.hxx b/sd/source/ui/sidebar/MasterPageDescriptor.hxx index c77b2197cda8..7636cf6b4a8d 100644 --- a/sd/source/ui/sidebar/MasterPageDescriptor.hxx +++ b/sd/source/ui/sidebar/MasterPageDescriptor.hxx @@ -47,7 +47,7 @@ public: const ::boost::shared_ptr<PageObjectProvider>& rpPageObjectProvider, const ::boost::shared_ptr<PreviewProvider>& rpPreviewProvider); MasterPageDescriptor (const MasterPageDescriptor& rDescriptor); - ~MasterPageDescriptor (void); + ~MasterPageDescriptor(); void SetToken (MasterPageContainer::Token aToken); @@ -137,7 +137,7 @@ public: URLCLASS_UNDETERMINED }; - URLClassification GetURLClassification (void); + URLClassification GetURLClassification(); /** The Token under which the MasterPageContainer gives access to the object. diff --git a/sd/source/ui/sidebar/MasterPageObserver.cxx b/sd/source/ui/sidebar/MasterPageObserver.cxx index 606902ac7ba4..b5b5f4bd4ac5 100644 --- a/sd/source/ui/sidebar/MasterPageObserver.cxx +++ b/sd/source/ui/sidebar/MasterPageObserver.cxx @@ -92,7 +92,7 @@ MasterPageObserver* MasterPageObserver::Implementation::mpInstance = NULL; //===== MasterPageObserver ==================================================== -MasterPageObserver& MasterPageObserver::Instance (void) +MasterPageObserver& MasterPageObserver::Instance() { if (Implementation::mpInstance == NULL) { @@ -138,11 +138,11 @@ void MasterPageObserver::RemoveEventListener (const Link& rEventListener) mpImpl->RemoveEventListener (rEventListener); } -MasterPageObserver::MasterPageObserver (void) +MasterPageObserver::MasterPageObserver() : mpImpl (new Implementation()) {} -MasterPageObserver::~MasterPageObserver (void) +MasterPageObserver::~MasterPageObserver() {} //===== MasterPageObserver::Implementation ==================================== diff --git a/sd/source/ui/sidebar/MasterPagesSelector.cxx b/sd/source/ui/sidebar/MasterPagesSelector.cxx index 6a0e7b35082b..28d3abde2d9a 100644 --- a/sd/source/ui/sidebar/MasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/MasterPagesSelector.cxx @@ -102,7 +102,7 @@ MasterPagesSelector::MasterPagesSelector ( mpContainer->AddChangeListener(aChangeListener); } -MasterPagesSelector::~MasterPagesSelector (void) +MasterPagesSelector::~MasterPagesSelector() { Clear(); UpdateLocks(ItemList()); @@ -111,7 +111,7 @@ MasterPagesSelector::~MasterPagesSelector (void) mpContainer->RemoveChangeListener(aChangeListener); } -void MasterPagesSelector::LateInit (void) +void MasterPagesSelector::LateInit() { } @@ -149,7 +149,7 @@ void MasterPagesSelector::UpdateLocks (const ItemList& rItemList) maLockedMasterPages.swap(aNewLockList); } -void MasterPagesSelector::Fill (void) +void MasterPagesSelector::Fill() { ::std::unique_ptr<ItemList> pItemList (new ItemList()); @@ -159,7 +159,7 @@ void MasterPagesSelector::Fill (void) UpdateItemList(std::move(pItemList)); } -ResId MasterPagesSelector::GetContextMenuResId (void) const +ResId MasterPagesSelector::GetContextMenuResId() const { return SdResId(RID_TASKPANE_MASTERPAGESSELECTOR_POPUP); } @@ -332,7 +332,7 @@ IMPL_LINK(MasterPagesSelector, ContainerChangeListener, MasterPageContainerChang return 0; } -SdPage* MasterPagesSelector::GetSelectedMasterPage (void) +SdPage* MasterPagesSelector::GetSelectedMasterPage() { const ::osl::MutexGuard aGuard (maMutex); @@ -483,7 +483,7 @@ void MasterPagesSelector::SetUserData (int nIndex, UserData* pData) } } -void MasterPagesSelector::UpdateSelection (void) +void MasterPagesSelector::UpdateSelection() { } @@ -582,7 +582,7 @@ void MasterPagesSelector::InvalidatePreview (const SdPage* pPage) } } -void MasterPagesSelector::UpdateAllPreviews (void) +void MasterPagesSelector::UpdateAllPreviews() { const ::osl::MutexGuard aGuard (maMutex); @@ -602,7 +602,7 @@ void MasterPagesSelector::UpdateAllPreviews (void) PreviewValueSet::Rearrange(true); } -void MasterPagesSelector::ClearPageSet (void) +void MasterPagesSelector::ClearPageSet() { const ::osl::MutexGuard aGuard (maMutex); @@ -633,7 +633,7 @@ sal_Int32 MasterPagesSelector::GetIndexForToken (MasterPageContainer::Token aTok return -1; } -void MasterPagesSelector::Clear (void) +void MasterPagesSelector::Clear() { const ::osl::MutexGuard aGuard (maMutex); diff --git a/sd/source/ui/sidebar/MasterPagesSelector.hxx b/sd/source/ui/sidebar/MasterPagesSelector.hxx index 46e6f72c95d1..eab38546d57b 100644 --- a/sd/source/ui/sidebar/MasterPagesSelector.hxx +++ b/sd/source/ui/sidebar/MasterPagesSelector.hxx @@ -62,9 +62,9 @@ public: ViewShellBase& rBase, const ::boost::shared_ptr<MasterPageContainer>& rpContainer, const css::uno::Reference<css::ui::XSidebar>& rxSidebar); - virtual ~MasterPagesSelector (void); + virtual ~MasterPagesSelector(); - virtual void LateInit (void); + virtual void LateInit(); /** Return the height that this control needs to show all of its lines. */ @@ -93,15 +93,15 @@ public: the currently used master pages by default and thus is not influenced by its changes. */ - virtual void UpdateSelection (void); + virtual void UpdateSelection(); - void FillPageSet (void); + void FillPageSet(); /** Make the selector empty. This method clear the value set from any entries. Override this method to add functionality, especially to destroy objects set as data items at the value set. */ - void ClearPageSet (void); + void ClearPageSet(); void SetHelpId( const OString& aId ); @@ -115,7 +115,7 @@ public: */ void InvalidatePreview (const SdPage* pPage); - void UpdateAllPreviews (void); + void UpdateAllPreviews(); // ILayoutableWindow virtual css::ui::LayoutSize GetHeightForWidth (const sal_Int32 nWidth) SAL_OVERRIDE; @@ -137,7 +137,7 @@ protected: */ ::std::queue<sal_uInt16> maPreviewUpdateQueue; - SdPage* GetSelectedMasterPage (void); + SdPage* GetSelectedMasterPage(); /** Assign the given master page to all slides of the document. @param pMasterPage @@ -166,7 +166,7 @@ protected: sal_Int32 GetIndexForToken (MasterPageContainer::Token aToken) const; typedef ::std::vector<MasterPageContainer::Token> ItemList; void UpdateItemList (::std::unique_ptr<ItemList> && pList); - void Clear (void); + void Clear(); /** Invalidate the specified item so that on the next Fill() this item is updated. */ @@ -184,14 +184,14 @@ protected: */ void UpdateLocks (const ItemList& rItemList); - void Fill (void); + void Fill(); virtual void Fill (ItemList& rItemList) = 0; /** Give derived classes the opportunity to provide their own context menu. If they do then they probably have to provide their own Execute() and GetState() methods as well. */ - virtual ResId GetContextMenuResId (void) const; + virtual ResId GetContextMenuResId() const; virtual void Command (const CommandEvent& rEvent) SAL_OVERRIDE; diff --git a/sd/source/ui/sidebar/NavigatorWrapper.cxx b/sd/source/ui/sidebar/NavigatorWrapper.cxx index 3197ffcb7daa..6df0a2e01aa6 100644 --- a/sd/source/ui/sidebar/NavigatorWrapper.cxx +++ b/sd/source/ui/sidebar/NavigatorWrapper.cxx @@ -47,11 +47,11 @@ NavigatorWrapper::NavigatorWrapper ( maNavigator.Show(); } -NavigatorWrapper::~NavigatorWrapper (void) +NavigatorWrapper::~NavigatorWrapper() { } -void NavigatorWrapper::Resize (void) +void NavigatorWrapper::Resize() { maNavigator.SetSizePixel(GetSizePixel()); } @@ -63,12 +63,12 @@ css::ui::LayoutSize NavigatorWrapper::GetHeightForWidth (const sal_Int32 nWidth) return css::ui::LayoutSize(-1,-1,-1); } -void NavigatorWrapper::UpdateNavigator (void) +void NavigatorWrapper::UpdateNavigator() { maNavigator.InitTreeLB(mrViewShellBase.GetDocument()); } -void NavigatorWrapper::GetFocus (void) +void NavigatorWrapper::GetFocus() { maNavigator.GrabFocus(); } diff --git a/sd/source/ui/sidebar/NavigatorWrapper.hxx b/sd/source/ui/sidebar/NavigatorWrapper.hxx index edc258ffae64..98c95aa72426 100644 --- a/sd/source/ui/sidebar/NavigatorWrapper.hxx +++ b/sd/source/ui/sidebar/NavigatorWrapper.hxx @@ -45,11 +45,11 @@ public: sd::ViewShellBase& rViewShellBase, SfxBindings* pBindings); - virtual ~NavigatorWrapper (void); + virtual ~NavigatorWrapper(); // Control - virtual void Resize (void) SAL_OVERRIDE; - virtual void GetFocus (void) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual void GetFocus() SAL_OVERRIDE; // From ILayoutableWindow virtual css::ui::LayoutSize GetHeightForWidth (const sal_Int32 nWidth) SAL_OVERRIDE; @@ -58,7 +58,7 @@ private: ViewShellBase& mrViewShellBase; SdNavigatorWin maNavigator; - void UpdateNavigator (void); + void UpdateNavigator(); }; } } // end of namespace sd::sidebar diff --git a/sd/source/ui/sidebar/PanelBase.cxx b/sd/source/ui/sidebar/PanelBase.cxx index 90c4a49a2907..f0366b7c329d 100644 --- a/sd/source/ui/sidebar/PanelBase.cxx +++ b/sd/source/ui/sidebar/PanelBase.cxx @@ -36,14 +36,14 @@ PanelBase::PanelBase ( #endif } -PanelBase::~PanelBase (void) +PanelBase::~PanelBase() { OSL_TRACE("deleting wrapped control at %p", mpWrappedControl.get()); mpWrappedControl.reset(); OSL_TRACE("deleting PanelBase at %p from parent %p", this, GetParent()); } -void PanelBase::Dispose (void) +void PanelBase::Dispose() { OSL_TRACE("PanelBase::DisposeL: deleting wrapped control at %p", mpWrappedControl.get()); mpWrappedControl.reset(); @@ -57,7 +57,7 @@ css::ui::LayoutSize PanelBase::GetHeightForWidth (const sal_Int32 /*nWidth*/) return css::ui::LayoutSize(nHeight,nHeight,nHeight); } -void PanelBase::Resize (void) +void PanelBase::Resize() { if (ProvideWrappedControl()) { @@ -73,7 +73,7 @@ void PanelBase::SetSidebar (const css::uno::Reference<css::ui::XSidebar>& rxSide mxSidebar->requestLayout(); } -bool PanelBase::ProvideWrappedControl (void) +bool PanelBase::ProvideWrappedControl() { if ( ! mpWrappedControl) { diff --git a/sd/source/ui/sidebar/PanelBase.hxx b/sd/source/ui/sidebar/PanelBase.hxx index 672112fa57d7..dcef4732e521 100644 --- a/sd/source/ui/sidebar/PanelBase.hxx +++ b/sd/source/ui/sidebar/PanelBase.hxx @@ -44,12 +44,12 @@ public: PanelBase ( vcl::Window* pParentWindow, ViewShellBase& rViewShellBase); - virtual ~PanelBase (void); + virtual ~PanelBase(); - virtual void Resize (void) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; // IDisposable - virtual void Dispose (void) SAL_OVERRIDE; + virtual void Dispose() SAL_OVERRIDE; // ILayoutableWindow virtual css::ui::LayoutSize GetHeightForWidth (const sal_Int32 nWidth) SAL_OVERRIDE; @@ -67,7 +67,7 @@ private: css::uno::Reference<css::ui::XSidebar> mxSidebar; ViewShellBase& mrViewShellBase; - bool ProvideWrappedControl (void); + bool ProvideWrappedControl(); }; } } // end of namespace sd::sidebar diff --git a/sd/source/ui/sidebar/PanelFactory.cxx b/sd/source/ui/sidebar/PanelFactory.cxx index 03dbddaa1c49..f10290af8572 100644 --- a/sd/source/ui/sidebar/PanelFactory.cxx +++ b/sd/source/ui/sidebar/PanelFactory.cxx @@ -69,11 +69,11 @@ PanelFactory::PanelFactory( { } -PanelFactory::~PanelFactory (void) +PanelFactory::~PanelFactory() { } -void SAL_CALL PanelFactory::disposing (void) +void SAL_CALL PanelFactory::disposing() { } diff --git a/sd/source/ui/sidebar/PanelFactory.hxx b/sd/source/ui/sidebar/PanelFactory.hxx index 8365a49764f9..6188e3033de1 100644 --- a/sd/source/ui/sidebar/PanelFactory.hxx +++ b/sd/source/ui/sidebar/PanelFactory.hxx @@ -52,15 +52,15 @@ class PanelFactory public PanelFactoryInterfaceBase { public: - static ::rtl::OUString SAL_CALL getImplementationName (void); + static ::rtl::OUString SAL_CALL getImplementationName(); static css::uno::Reference<css::uno::XInterface> SAL_CALL createInstance ( const css::uno::Reference<css::lang::XMultiServiceFactory>& rxFactory); - static css::uno::Sequence<rtl::OUString> SAL_CALL getSupportedServiceNames (void); + static css::uno::Sequence<rtl::OUString> SAL_CALL getSupportedServiceNames(); PanelFactory (const css::uno::Reference<css::uno::XComponentContext>& rxContext); - virtual ~PanelFactory (void); + virtual ~PanelFactory(); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XUIElementFactory diff --git a/sd/source/ui/sidebar/PreviewValueSet.cxx b/sd/source/ui/sidebar/PreviewValueSet.cxx index c738b0be64d5..4c199cbb1611 100644 --- a/sd/source/ui/sidebar/PreviewValueSet.cxx +++ b/sd/source/ui/sidebar/PreviewValueSet.cxx @@ -38,7 +38,7 @@ PreviewValueSet::PreviewValueSet (vcl::Window* pParent) SetExtraSpacing (2); } -PreviewValueSet::~PreviewValueSet (void) +PreviewValueSet::~PreviewValueSet() { } @@ -62,7 +62,7 @@ void PreviewValueSet::MouseButtonDown (const MouseEvent& rEvent) } -void PreviewValueSet::Resize (void) +void PreviewValueSet::Resize() { ValueSet::Resize (); diff --git a/sd/source/ui/sidebar/PreviewValueSet.hxx b/sd/source/ui/sidebar/PreviewValueSet.hxx index f41f33b2462d..2ce5fc564db0 100644 --- a/sd/source/ui/sidebar/PreviewValueSet.hxx +++ b/sd/source/ui/sidebar/PreviewValueSet.hxx @@ -31,10 +31,10 @@ class PreviewValueSet { public: PreviewValueSet (vcl::Window* pParent); - virtual ~PreviewValueSet (void); + virtual ~PreviewValueSet(); void SetRightMouseClickHandler (const Link& rLink); - virtual void Resize (void) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; void SetPreviewSize (const Size& rSize); diff --git a/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx b/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx index 002f088746bf..6266e2e25f61 100644 --- a/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx @@ -66,13 +66,13 @@ RecentMasterPagesSelector::RecentMasterPagesSelector ( { } -RecentMasterPagesSelector::~RecentMasterPagesSelector (void) +RecentMasterPagesSelector::~RecentMasterPagesSelector() { RecentlyUsedMasterPages::Instance().RemoveEventListener ( LINK(this,RecentMasterPagesSelector,MasterPageListListener)); } -void RecentMasterPagesSelector::LateInit (void) +void RecentMasterPagesSelector::LateInit() { MasterPagesSelector::LateInit(); diff --git a/sd/source/ui/sidebar/RecentMasterPagesSelector.hxx b/sd/source/ui/sidebar/RecentMasterPagesSelector.hxx index 0c1c53f67ccd..f690c7875674 100644 --- a/sd/source/ui/sidebar/RecentMasterPagesSelector.hxx +++ b/sd/source/ui/sidebar/RecentMasterPagesSelector.hxx @@ -64,9 +64,9 @@ private: ViewShellBase& rBase, const ::boost::shared_ptr<MasterPageContainer>& rpContainer, const css::uno::Reference<css::ui::XSidebar>& rxSidebar); - virtual ~RecentMasterPagesSelector (void); + virtual ~RecentMasterPagesSelector(); - virtual void LateInit (void) SAL_OVERRIDE; + virtual void LateInit() SAL_OVERRIDE; }; } } // end of namespace sd::sidebar diff --git a/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx b/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx index 4f7b7577e952..f237da8fd10e 100644 --- a/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx +++ b/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx @@ -63,7 +63,7 @@ namespace sd { namespace sidebar { RecentlyUsedMasterPages* RecentlyUsedMasterPages::mpInstance = NULL; -RecentlyUsedMasterPages& RecentlyUsedMasterPages::Instance (void) +RecentlyUsedMasterPages& RecentlyUsedMasterPages::Instance() { if (mpInstance == NULL) { @@ -86,7 +86,7 @@ RecentlyUsedMasterPages& RecentlyUsedMasterPages::Instance (void) return *mpInstance; } -RecentlyUsedMasterPages::RecentlyUsedMasterPages (void) +RecentlyUsedMasterPages::RecentlyUsedMasterPages() : maListeners(), mvMasterPages(), mnMaxListSize(8), @@ -94,7 +94,7 @@ RecentlyUsedMasterPages::RecentlyUsedMasterPages (void) { } -RecentlyUsedMasterPages::~RecentlyUsedMasterPages (void) +RecentlyUsedMasterPages::~RecentlyUsedMasterPages() { Link aLink (LINK(this,RecentlyUsedMasterPages,MasterPageContainerChangeListener)); mpContainer->RemoveChangeListener(aLink); @@ -103,7 +103,7 @@ RecentlyUsedMasterPages::~RecentlyUsedMasterPages (void) LINK(this,RecentlyUsedMasterPages,MasterPageChangeListener)); } -void RecentlyUsedMasterPages::LateInit (void) +void RecentlyUsedMasterPages::LateInit() { Link aLink (LINK(this,RecentlyUsedMasterPages,MasterPageContainerChangeListener)); mpContainer->AddChangeListener(aLink); @@ -113,7 +113,7 @@ void RecentlyUsedMasterPages::LateInit (void) LINK(this,RecentlyUsedMasterPages,MasterPageChangeListener)); } -void RecentlyUsedMasterPages::LoadPersistentValues (void) +void RecentlyUsedMasterPages::LoadPersistentValues() { try { @@ -178,7 +178,7 @@ void RecentlyUsedMasterPages::LoadPersistentValues (void) } } -void RecentlyUsedMasterPages::SavePersistentValues (void) +void RecentlyUsedMasterPages::SavePersistentValues() { try { @@ -257,7 +257,7 @@ void RecentlyUsedMasterPages::RemoveEventListener (const Link& rEventListener) rEventListener)); } -int RecentlyUsedMasterPages::GetMasterPageCount (void) const +int RecentlyUsedMasterPages::GetMasterPageCount() const { return mvMasterPages.size(); } @@ -270,7 +270,7 @@ MasterPageContainer::Token RecentlyUsedMasterPages::GetTokenForIndex (sal_uInt32 return MasterPageContainer::NIL_TOKEN; } -void RecentlyUsedMasterPages::SendEvent (void) +void RecentlyUsedMasterPages::SendEvent() { ::std::vector<Link>::iterator aLink (maListeners.begin()); ::std::vector<Link>::iterator aEnd (maListeners.end()); @@ -361,7 +361,7 @@ void RecentlyUsedMasterPages::AddMasterPage ( } } -void RecentlyUsedMasterPages::ResolveList (void) +void RecentlyUsedMasterPages::ResolveList() { bool bNotify (false); diff --git a/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx b/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx index c4725f678d1b..04fbd5b9c44c 100644 --- a/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx +++ b/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx @@ -44,12 +44,12 @@ class RecentlyUsedMasterPages public: /** Return the single instance of this class. */ - static RecentlyUsedMasterPages& Instance (void); + static RecentlyUsedMasterPages& Instance(); void AddEventListener (const Link& rEventListener); void RemoveEventListener (const Link& rEventListener); - int GetMasterPageCount (void) const; + int GetMasterPageCount() const; MasterPageContainer::Token GetTokenForIndex (sal_uInt32 nIndex) const; private: @@ -91,18 +91,18 @@ private: unsigned long int mnMaxListSize; ::boost::shared_ptr<MasterPageContainer> mpContainer; - RecentlyUsedMasterPages (void); - virtual ~RecentlyUsedMasterPages (void); + RecentlyUsedMasterPages(); + virtual ~RecentlyUsedMasterPages(); /** Call this method after a new object has been created. */ - void LateInit (void); + void LateInit(); RecentlyUsedMasterPages (const RecentlyUsedMasterPages&) SAL_DELETED_FUNCTION; RecentlyUsedMasterPages& operator= (const RecentlyUsedMasterPages&) SAL_DELETED_FUNCTION; - void SendEvent (void); + void SendEvent(); DECL_LINK(MasterPageChangeListener, MasterPageObserverEvent*); DECL_LINK(MasterPageContainerChangeListener, MasterPageContainerChangeEvent*); @@ -123,14 +123,14 @@ private: /** Load the list of recently used master pages from the registry where it was saved to make it persistent. */ - void LoadPersistentValues (void); + void LoadPersistentValues(); /** Save the list of recently used master pages to the registry to make it presistent. */ - void SavePersistentValues (void); + void SavePersistentValues(); - void ResolveList (void); + void ResolveList(); }; } } // end of namespace sd::sidebar diff --git a/sd/source/ui/sidebar/SlideTransitionPanel.cxx b/sd/source/ui/sidebar/SlideTransitionPanel.cxx index 7051d3a957db..2d58b94ac6dc 100644 --- a/sd/source/ui/sidebar/SlideTransitionPanel.cxx +++ b/sd/source/ui/sidebar/SlideTransitionPanel.cxx @@ -37,7 +37,7 @@ SlideTransitionPanel::SlideTransitionPanel ( #endif } -SlideTransitionPanel::~SlideTransitionPanel (void) +SlideTransitionPanel::~SlideTransitionPanel() { } diff --git a/sd/source/ui/sidebar/SlideTransitionPanel.hxx b/sd/source/ui/sidebar/SlideTransitionPanel.hxx index ab36313cbea6..bd975baf83f9 100644 --- a/sd/source/ui/sidebar/SlideTransitionPanel.hxx +++ b/sd/source/ui/sidebar/SlideTransitionPanel.hxx @@ -32,7 +32,7 @@ public: vcl::Window* pParentWindow, ViewShellBase& rViewShellBase, const css::uno::Reference<css::frame::XFrame>& rxFrame ); - virtual ~SlideTransitionPanel (void); + virtual ~SlideTransitionPanel(); // ILayoutableWindow virtual css::ui::LayoutSize GetHeightForWidth (const sal_Int32 nWidth) SAL_OVERRIDE; diff --git a/sd/source/ui/sidebar/TableDesignPanel.cxx b/sd/source/ui/sidebar/TableDesignPanel.cxx index f0008cd28a88..30d31ebcac5b 100644 --- a/sd/source/ui/sidebar/TableDesignPanel.cxx +++ b/sd/source/ui/sidebar/TableDesignPanel.cxx @@ -34,7 +34,7 @@ TableDesignPanel::TableDesignPanel ( #endif } -TableDesignPanel::~TableDesignPanel (void) +TableDesignPanel::~TableDesignPanel() { } diff --git a/sd/source/ui/sidebar/TableDesignPanel.hxx b/sd/source/ui/sidebar/TableDesignPanel.hxx index 9d9c5d188c4b..7d52b612460e 100644 --- a/sd/source/ui/sidebar/TableDesignPanel.hxx +++ b/sd/source/ui/sidebar/TableDesignPanel.hxx @@ -30,7 +30,7 @@ public: TableDesignPanel ( vcl::Window* pParentWindow, ViewShellBase& rViewShellBase); - virtual ~TableDesignPanel (void); + virtual ~TableDesignPanel(); // ILayoutableWindow virtual css::ui::LayoutSize GetHeightForWidth (const sal_Int32 nWidth) SAL_OVERRIDE; |