remove unnecessary use of void in function declarations

ie.
void f(void);
becomes
void f();

I used the following command to make the changes:

git grep -lP '\(\s*void\s*\)' -- *.cxx \
| xargs perl -pi -w -e 's/(\w+)\s*\(\s*void\s*\)/$1\(\)/g;'

and ran it for both .cxx and .hxx files.

Change-Id: I314a1b56e9c14d10726e32841736b0ad5eef8ddd

63 files changed, 261 insertions, 261 deletions

diff --git a/sfx2/inc/sidebar/ContextChangeBroadcaster.hxx b/sfx2/inc/sidebar/ContextChangeBroadcaster.hxx
index 1db08173fda3..5a2ba3c5243f 100644
--- a/sfx2/inc/sidebar/ContextChangeBroadcaster.hxx
+++ b/sfx2/inc/sidebar/ContextChangeBroadcaster.hxx
@@ -31,8 +31,8 @@ namespace sfx2 { namespace sidebar {
 class ContextChangeBroadcaster
 {
 public:
-    ContextChangeBroadcaster (void);
-    ~ContextChangeBroadcaster (void);
+    ContextChangeBroadcaster();
+    ~ContextChangeBroadcaster();
 
     void Initialize (const ::rtl::OUString& rsContextName);
 
diff --git a/sfx2/inc/sidebar/PopupContainer.hxx b/sfx2/inc/sidebar/PopupContainer.hxx
index 764b9af1cea7..e34b207ffacc 100644
--- a/sfx2/inc/sidebar/PopupContainer.hxx
+++ b/sfx2/inc/sidebar/PopupContainer.hxx
@@ -28,7 +28,7 @@ class SFX2_DLLPUBLIC PopupContainer : public FloatingWindow
 {
 public:
     PopupContainer (vcl::Window* pParent);
-    virtual ~PopupContainer (void);
+    virtual ~PopupContainer();
 
     virtual long Notify (NotifyEvent& rNEvt);
 };
diff --git a/sfx2/source/control/thumbnailviewacc.cxx b/sfx2/source/control/thumbnailviewacc.cxx
index 4d0886e8de2f..c29e797b4c47 100644
--- a/sfx2/source/control/thumbnailviewacc.cxx
+++ b/sfx2/source/control/thumbnailviewacc.cxx
@@ -94,7 +94,7 @@ ThumbnailViewAcc* ThumbnailViewAcc::getImplementation( const uno::Reference< uno
     }
 }
 
-void ThumbnailViewAcc::GetFocus (void)
+void ThumbnailViewAcc::GetFocus()
 {
     mbIsFocused = true;
 
@@ -106,7 +106,7 @@ void ThumbnailViewAcc::GetFocus (void)
         aOldState, aNewState);
 }
 
-void ThumbnailViewAcc::LoseFocus (void)
+void ThumbnailViewAcc::LoseFocus()
 {
     mbIsFocused = false;
 
@@ -536,7 +536,7 @@ sal_Int64 SAL_CALL ThumbnailViewAcc::getSomething( const uno::Sequence< sal_Int8
     return nRet;
 }
 
-void SAL_CALL ThumbnailViewAcc::disposing (void)
+void SAL_CALL ThumbnailViewAcc::disposing()
 {
     ::std::vector<uno::Reference<accessibility::XAccessibleEventListener> > aListenerListCopy;
 
@@ -571,7 +571,7 @@ void SAL_CALL ThumbnailViewAcc::disposing (void)
     }
 }
 
-sal_uInt16 ThumbnailViewAcc::getItemCount (void) const
+sal_uInt16 ThumbnailViewAcc::getItemCount() const
 {
     return mpParent->ImplGetVisibleItemCount();
 }
@@ -581,7 +581,7 @@ ThumbnailViewItem* ThumbnailViewAcc::getItem (sal_uInt16 nIndex) const
     return mpParent->ImplGetVisibleItem (static_cast<sal_uInt16>(nIndex));
 }
 
-void ThumbnailViewAcc::ThrowIfDisposed (void)
+void ThumbnailViewAcc::ThrowIfDisposed()
     throw (::com::sun::star::lang::DisposedException)
 {
     if (rBHelper.bDisposed || rBHelper.bInDispose)
diff --git a/sfx2/source/control/thumbnailviewacc.hxx b/sfx2/source/control/thumbnailviewacc.hxx
index 3eae0c037e66..2190d35100da 100644
--- a/sfx2/source/control/thumbnailviewacc.hxx
+++ b/sfx2/source/control/thumbnailviewacc.hxx
@@ -69,12 +69,12 @@ public:
     /** Called by the corresponding ValueSet when it gets the focus.
         Stores the new focus state and broadcasts a state change event.
     */
-    void GetFocus (void);
+    void GetFocus();
 
     /** Called by the corresponding ValueSet when it loses the focus.
         Stores the new focus state and broadcasts a state change event.
     */
-    void LoseFocus (void);
+    void LoseFocus();
 
     // XComponent
     virtual void SAL_CALL dispose()throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
@@ -139,11 +139,11 @@ private:
     /** Tell all listeners that the object is dying.  This callback is
         usually called from the WeakComponentImplHelper class.
     */
-    virtual void SAL_CALL disposing (void) SAL_OVERRIDE;
+    virtual void SAL_CALL disposing() SAL_OVERRIDE;
 
     /** Return the number of items.  This takes the None-Item into account.
     */
-    sal_uInt16 getItemCount (void) const;
+    sal_uInt16 getItemCount() const;
 
     /** Return the item associated with the given index.  The None-Item is
         taken into account which, when present, is taken to be the first
@@ -161,7 +161,7 @@ private:
         DisposedException is thrown to inform the (indirect) caller of the
         foul deed.
     */
-    void ThrowIfDisposed (void)
+    void ThrowIfDisposed()
         throw (::com::sun::star::lang::DisposedException);
 };
 
diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx
index 33f532b9b293..ac7d9ec2e081 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -356,7 +356,7 @@ void FileDialogHelper_Impl::SaveLastUsedFilter( const OUString& _rContextIdentif
                         makeAny( getFilterWithExtension( getFilter() ) ) );
 }
 
-void FileDialogHelper_Impl::SaveLastUsedFilter( void )
+void FileDialogHelper_Impl::SaveLastUsedFilter()
 {
     const OUString* pConfigId = GetLastFilterConfigId( meContext );
     if( pConfigId )
diff --git a/sfx2/source/dialog/filedlgimpl.hxx b/sfx2/source/dialog/filedlgimpl.hxx
index b947ca9adecd..b9e069680095 100644
--- a/sfx2/source/dialog/filedlgimpl.hxx
+++ b/sfx2/source/dialog/filedlgimpl.hxx
@@ -139,7 +139,7 @@ namespace sfx2
 
         void                    LoadLastUsedFilter( const OUString& _rContextIdentifier );
         void                    SaveLastUsedFilter( const OUString& _rContextIdentifier );
-        void                    SaveLastUsedFilter( void );
+        void                    SaveLastUsedFilter();
 
         void                    implInitializeFileName( );
 
diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx
index 250d6e56ad5f..461feacf5031 100644
--- a/sfx2/source/dialog/splitwin.cxx
+++ b/sfx2/source/dialog/splitwin.cxx
@@ -63,7 +63,7 @@ namespace {
             }
         }
 
-        ~DeactivateUpdateMode( void )
+        ~DeactivateUpdateMode()
         {
             if ( mbUpdateMode )
             {
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index cc726c4d1cb9..633af8b531e6 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -228,7 +228,7 @@ SfxActionListBox::SfxActionListBox(SfxCommonTemplateDialog_Impl* pParent, WinBit
     EnableContextMenuHandling();
 }
 
-PopupMenu* SfxActionListBox::CreateContextMenu( void )
+PopupMenu* SfxActionListBox::CreateContextMenu()
 {
 
     if( !( GetSelectionCount() > 0 ) )
@@ -251,7 +251,7 @@ SfxTemplatePanelControl::SfxTemplatePanelControl(SfxBindings* pBindings, vcl::Wi
     SetStyle(GetStyle() & ~WB_DOCKABLE);
 }
 
-SfxTemplatePanelControl::~SfxTemplatePanelControl (void)
+SfxTemplatePanelControl::~SfxTemplatePanelControl()
 {
 }
 
@@ -274,7 +274,7 @@ void SfxTemplatePanelControl::Resize()
     DockingWindow::Resize();
 }
 
-void SfxTemplatePanelControl::FreeResource (void)
+void SfxTemplatePanelControl::FreeResource()
 {
     DockingWindow::FreeResource();
 }
@@ -2033,7 +2033,7 @@ void SfxCommonTemplateDialog_Impl::EnableExample_Impl(sal_uInt16 nId, bool bEnab
     EnableItem(nId, bEnable);
 }
 
-PopupMenu* SfxCommonTemplateDialog_Impl::CreateContextMenu( void )
+PopupMenu* SfxCommonTemplateDialog_Impl::CreateContextMenu()
 {
     if ( bBindingUpdate )
     {
@@ -2064,7 +2064,7 @@ SfxTemplateDialog_Impl::SfxTemplateDialog_Impl(
     Initialize();
 }
 
-void SfxTemplateDialog_Impl::Initialize (void)
+void SfxTemplateDialog_Impl::Initialize()
 {
     SfxCommonTemplateDialog_Impl::Initialize();
 
diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx
index a983a7f130e1..c11a859fc764 100644
--- a/sfx2/source/inc/templdgi.hxx
+++ b/sfx2/source/inc/templdgi.hxx
@@ -131,7 +131,7 @@ public:
     }
     void MakeExpanded_Impl(ExpandedEntries_t& rEntries) const;
 
-    virtual PopupMenu* CreateContextMenu( void ) SAL_OVERRIDE;
+    virtual PopupMenu* CreateContextMenu() SAL_OVERRIDE;
 };
 
 class SfxActionListBox : public DropListBox_Impl
@@ -140,7 +140,7 @@ protected:
 public:
     SfxActionListBox( SfxCommonTemplateDialog_Impl* pParent, WinBits nWinBits );
 
-    virtual PopupMenu*  CreateContextMenu( void ) SAL_OVERRIDE;
+    virtual PopupMenu*  CreateContextMenu() SAL_OVERRIDE;
 };
 
 class SfxCommonTemplateDialog_Impl : public SfxListener
@@ -325,31 +325,31 @@ public:
         return pCurObjShell;
     }
 
-    inline bool CanEdit( void ) const
+    inline bool CanEdit() const
     {
         return bCanEdit;
     }
-    inline bool CanDel( void ) const
+    inline bool CanDel() const
     {
         return bCanDel;
     }
-    inline bool CanNew( void ) const
+    inline bool CanNew() const
     {
         return bCanNew;
     }
 
-    inline bool CanHide( void ) const
+    inline bool CanHide() const
     {
         return bCanHide;
     }
 
-    inline bool CanShow( void ) const
+    inline bool CanShow() const
     {
         return bCanShow;
     }
 
     // normally for derivates from SvTreeListBoxes, but in this case the dialog handles context menus
-    PopupMenu*  CreateContextMenu( void );
+    PopupMenu*  CreateContextMenu();
 };
 
 class DropToolBox_Impl : public ToolBox, public DropTargetHelper
diff --git a/sfx2/source/sidebar/Accessible.cxx b/sfx2/source/sidebar/Accessible.cxx
index 00c669eee6c4..7cf157e012f2 100644
--- a/sfx2/source/sidebar/Accessible.cxx
+++ b/sfx2/source/sidebar/Accessible.cxx
@@ -31,18 +31,18 @@ Accessible::Accessible (
 {
 }
 
-Accessible::~Accessible (void)
+Accessible::~Accessible()
 {
 }
 
-void SAL_CALL Accessible::disposing (void)
+void SAL_CALL Accessible::disposing()
 {
     Reference<XComponent> xComponent (mxContext, UNO_QUERY);
     if (xComponent.is())
         xComponent->dispose();
 }
 
-Reference<accessibility::XAccessibleContext> SAL_CALL Accessible::getAccessibleContext (void)
+Reference<accessibility::XAccessibleContext> SAL_CALL Accessible::getAccessibleContext()
     throw (css::uno::RuntimeException, std::exception)
 {
     return mxContext;
diff --git a/sfx2/source/sidebar/Accessible.hxx b/sfx2/source/sidebar/Accessible.hxx
index 8e9ddcdf34f0..790a5f43b490 100644
--- a/sfx2/source/sidebar/Accessible.hxx
+++ b/sfx2/source/sidebar/Accessible.hxx
@@ -49,11 +49,11 @@ class Accessible
 public:
     Accessible (
         const css::uno::Reference<css::accessibility::XAccessibleContext>& rxContext);
-    virtual ~Accessible (void);
+    virtual ~Accessible();
 
-    virtual void SAL_CALL disposing (void) SAL_OVERRIDE;
+    virtual void SAL_CALL disposing() SAL_OVERRIDE;
     // XAccessible
-    virtual css::uno::Reference<css::accessibility::XAccessibleContext> SAL_CALL getAccessibleContext (void)
+    virtual css::uno::Reference<css::accessibility::XAccessibleContext> SAL_CALL getAccessibleContext()
         throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
 private:
diff --git a/sfx2/source/sidebar/AccessibleTitleBar.cxx b/sfx2/source/sidebar/AccessibleTitleBar.cxx
index a3713ec801e6..5405837c3046 100644
--- a/sfx2/source/sidebar/AccessibleTitleBar.cxx
+++ b/sfx2/source/sidebar/AccessibleTitleBar.cxx
@@ -45,7 +45,7 @@ AccessibleTitleBar::AccessibleTitleBar (VCLXWindow* pWindow)
 {
 }
 
-AccessibleTitleBar::~AccessibleTitleBar (void)
+AccessibleTitleBar::~AccessibleTitleBar()
 {
 }
 
diff --git a/sfx2/source/sidebar/AccessibleTitleBar.hxx b/sfx2/source/sidebar/AccessibleTitleBar.hxx
index 9e6f6d1e5cb4..2b39c8f1f9df 100644
--- a/sfx2/source/sidebar/AccessibleTitleBar.hxx
+++ b/sfx2/source/sidebar/AccessibleTitleBar.hxx
@@ -37,7 +37,7 @@ protected:
 
 private:
     AccessibleTitleBar (VCLXWindow* pWindow);
-    virtual ~AccessibleTitleBar (void);
+    virtual ~AccessibleTitleBar();
 };
 
 } } // end of namespace sfx2::sidebar
diff --git a/sfx2/source/sidebar/AsynchronousCall.cxx b/sfx2/source/sidebar/AsynchronousCall.cxx
index 7dee20afe958..5814d2b6acf0 100644
--- a/sfx2/source/sidebar/AsynchronousCall.cxx
+++ b/sfx2/source/sidebar/AsynchronousCall.cxx
@@ -21,7 +21,7 @@
 
 namespace sfx2 { namespace sidebar {
 
-AsynchronousCall::AsynchronousCall (void)
+AsynchronousCall::AsynchronousCall()
     : maAction(),
       mnCallId(0)
 {
@@ -33,7 +33,7 @@ AsynchronousCall::AsynchronousCall (const Action& rAction)
 {
 }
 
-AsynchronousCall::~AsynchronousCall (void)
+AsynchronousCall::~AsynchronousCall()
 {
     CancelRequest();
 }
diff --git a/sfx2/source/sidebar/AsynchronousCall.hxx b/sfx2/source/sidebar/AsynchronousCall.hxx
index d18b8302b617..338505c83e4b 100644
--- a/sfx2/source/sidebar/AsynchronousCall.hxx
+++ b/sfx2/source/sidebar/AsynchronousCall.hxx
@@ -32,14 +32,14 @@ namespace sfx2 { namespace sidebar {
 class AsynchronousCall
 {
 public:
-    typedef ::boost::function<void(void)> Action;
+    typedef ::boost::function<void()> Action;
 
-    AsynchronousCall (void);
+    AsynchronousCall();
     AsynchronousCall (const Action& rAction);
-    ~AsynchronousCall (void);
+    ~AsynchronousCall();
 
-    void RequestCall (void);
-    void CancelRequest (void);
+    void RequestCall();
+    void CancelRequest();
 
 private:
     Action maAction;
diff --git a/sfx2/source/sidebar/CommandInfoProvider.cxx b/sfx2/source/sidebar/CommandInfoProvider.cxx
index 6ee034d65386..46bda049eac1 100644
--- a/sfx2/source/sidebar/CommandInfoProvider.cxx
+++ b/sfx2/source/sidebar/CommandInfoProvider.cxx
@@ -53,10 +53,10 @@ namespace
             if (mxFrame.is())
                 mxFrame->addEventListener(this);
         }
-        virtual ~FrameListener (void)
+        virtual ~FrameListener()
         {
         }
-        virtual void SAL_CALL disposing (void) SAL_OVERRIDE
+        virtual void SAL_CALL disposing() SAL_OVERRIDE
         {
             if (mxFrame.is())
                 mxFrame->removeEventListener(this);
@@ -77,13 +77,13 @@ namespace
 
 namespace sfx2 { namespace sidebar {
 
-CommandInfoProvider& CommandInfoProvider::Instance (void)
+CommandInfoProvider& CommandInfoProvider::Instance()
 {
     static CommandInfoProvider aProvider;
     return aProvider;
 }
 
-CommandInfoProvider::CommandInfoProvider (void)
+CommandInfoProvider::CommandInfoProvider()
     : mxContext(comphelper::getProcessComponentContext()),
       mxCachedDataFrame(),
       mxCachedDocumentAcceleratorConfiguration(),
@@ -94,7 +94,7 @@ CommandInfoProvider::CommandInfoProvider (void)
 {
 }
 
-CommandInfoProvider::~CommandInfoProvider (void)
+CommandInfoProvider::~CommandInfoProvider()
 {
     if (mxFrameListener.is())
     {
@@ -141,7 +141,7 @@ void CommandInfoProvider::SetFrame (const Reference<frame::XFrame>& rxFrame)
     }
 }
 
-Reference<ui::XAcceleratorConfiguration> CommandInfoProvider::GetDocumentAcceleratorConfiguration (void)
+Reference<ui::XAcceleratorConfiguration> CommandInfoProvider::GetDocumentAcceleratorConfiguration()
 {
     if ( ! mxCachedDocumentAcceleratorConfiguration.is())
     {
@@ -172,7 +172,7 @@ Reference<ui::XAcceleratorConfiguration> CommandInfoProvider::GetDocumentAcceler
     return mxCachedDocumentAcceleratorConfiguration;
 }
 
-Reference<ui::XAcceleratorConfiguration> CommandInfoProvider::GetModuleAcceleratorConfiguration (void)
+Reference<ui::XAcceleratorConfiguration> CommandInfoProvider::GetModuleAcceleratorConfiguration()
 {
     if ( ! mxCachedModuleAcceleratorConfiguration.is())
     {
@@ -193,7 +193,7 @@ Reference<ui::XAcceleratorConfiguration> CommandInfoProvider::GetModuleAccelerat
     return mxCachedModuleAcceleratorConfiguration;
 }
 
-Reference<ui::XAcceleratorConfiguration> CommandInfoProvider::GetGlobalAcceleratorConfiguration (void)
+Reference<ui::XAcceleratorConfiguration> CommandInfoProvider::GetGlobalAcceleratorConfiguration()
 {
     // Get the global accelerator configuration.
     if ( ! mxCachedGlobalAcceleratorConfiguration.is())
@@ -204,7 +204,7 @@ Reference<ui::XAcceleratorConfiguration> CommandInfoProvider::GetGlobalAccelerat
     return mxCachedGlobalAcceleratorConfiguration;
 }
 
-OUString CommandInfoProvider::GetModuleIdentifier (void)
+OUString CommandInfoProvider::GetModuleIdentifier()
 {
     if (msCachedModuleIdentifier.getLength() == 0)
     {
diff --git a/sfx2/source/sidebar/Context.cxx b/sfx2/source/sidebar/Context.cxx
index 630c8dbae39a..27d35dd48817 100644
--- a/sfx2/source/sidebar/Context.cxx
+++ b/sfx2/source/sidebar/Context.cxx
@@ -28,7 +28,7 @@ const sal_Int32 Context::ApplicationWildcardMatch = 1;
 const sal_Int32 Context::ContextWildcardMatch = 2;
 const sal_Int32 Context::OptimalMatch = 0;  // Neither application nor context name is "any".
 
-Context::Context (void)
+Context::Context()
     : msApplication(AnyApplicationName),
       msContext(AnyContextName)
 {
diff --git a/sfx2/source/sidebar/Context.hxx b/sfx2/source/sidebar/Context.hxx
index 22fc590c8615..b9430baedfb3 100644
--- a/sfx2/source/sidebar/Context.hxx
+++ b/sfx2/source/sidebar/Context.hxx
@@ -31,7 +31,7 @@ public:
     ::rtl::OUString msApplication;
     ::rtl::OUString msContext;
 
-    Context (void);
+    Context();
     Context (
         const ::rtl::OUString& rsApplication,
         const ::rtl::OUString& rsContext);
diff --git a/sfx2/source/sidebar/ContextChangeBroadcaster.cxx b/sfx2/source/sidebar/ContextChangeBroadcaster.cxx
index ea761f0bcf58..5ede4a575ad6 100644
--- a/sfx2/source/sidebar/ContextChangeBroadcaster.cxx
+++ b/sfx2/source/sidebar/ContextChangeBroadcaster.cxx
@@ -30,13 +30,13 @@ using namespace css::uno;
 
 namespace sfx2 { namespace sidebar {
 
-ContextChangeBroadcaster::ContextChangeBroadcaster (void)
+ContextChangeBroadcaster::ContextChangeBroadcaster()
     : msContextName(),
       mbIsBroadcasterEnabled(true)
 {
 }
 
-ContextChangeBroadcaster::~ContextChangeBroadcaster (void)
+ContextChangeBroadcaster::~ContextChangeBroadcaster()
 {
 }
 
diff --git a/sfx2/source/sidebar/ContextList.cxx b/sfx2/source/sidebar/ContextList.cxx
index c46118a69e5f..a64b43a8f5af 100644
--- a/sfx2/source/sidebar/ContextList.cxx
+++ b/sfx2/source/sidebar/ContextList.cxx
@@ -23,12 +23,12 @@ using ::rtl::OUString;
 
 namespace sfx2 { namespace sidebar {
 
-ContextList::ContextList (void)
+ContextList::ContextList()
     : maEntries()
 {
 }
 
-ContextList::~ContextList (void)
+ContextList::~ContextList()
 {
 }
 
diff --git a/sfx2/source/sidebar/ContextList.hxx b/sfx2/source/sidebar/ContextList.hxx
index 47e561857515..98860078de93 100644
--- a/sfx2/source/sidebar/ContextList.hxx
+++ b/sfx2/source/sidebar/ContextList.hxx
@@ -32,8 +32,8 @@ namespace sfx2 { namespace sidebar {
 class ContextList
 {
 public:
-    ContextList (void);
-    ~ContextList (void);
+    ContextList();
+    ~ContextList();
 
     class Entry
     {
diff --git a/sfx2/source/sidebar/ControllerItem.cxx b/sfx2/source/sidebar/ControllerItem.cxx
index db7f155b0879..729e2b210164 100644
--- a/sfx2/source/sidebar/ControllerItem.cxx
+++ b/sfx2/source/sidebar/ControllerItem.cxx
@@ -55,10 +55,10 @@ namespace
             if (mxFrame.is())
                 mxFrame->addFrameActionListener(this);
         }
-        virtual ~FrameActionListener (void)
+        virtual ~FrameActionListener()
         {
         }
-        virtual void SAL_CALL disposing (void) SAL_OVERRIDE
+        virtual void SAL_CALL disposing() SAL_OVERRIDE
         {
             SolarMutexGuard g;
             if (mxFrame.is())
@@ -115,7 +115,7 @@ ControllerItem::ControllerItem (
 {
 }
 
-ControllerItem::~ControllerItem (void)
+ControllerItem::~ControllerItem()
 {
     if (mxFrameActionListener.is())
         mxFrameActionListener->dispose();
@@ -153,31 +153,31 @@ bool ControllerItem::IsEnabled (SfxItemState eState) const
         return true;
 }
 
-void ControllerItem::RequestUpdate (void)
+void ControllerItem::RequestUpdate()
 {
     SfxPoolItem* pState = NULL;
     const SfxItemState eState (GetBindings().QueryState(GetId(), pState));
     mrItemUpdateReceiver.NotifyItemUpdate(GetId(), eState, pState, IsEnabled(eState));
 }
 
-void ControllerItem::NotifyFrameContextChange (void)
+void ControllerItem::NotifyFrameContextChange()
 {
     RequestUpdate();
 }
 
-void ControllerItem::ResetFrame (void)
+void ControllerItem::ResetFrame()
 {
     mxFrame = NULL;
 }
 
-::rtl::OUString ControllerItem::GetLabel (void) const
+::rtl::OUString ControllerItem::GetLabel() const
 {
     return CommandInfoProvider::Instance().GetLabelForCommand(
         ".uno:" + msCommandName,
         mxFrame);
 }
 
-::rtl::OUString ControllerItem::GetHelpText (void) const
+::rtl::OUString ControllerItem::GetHelpText() const
 {
     Help* pHelp = Application::GetHelp();
     if (pHelp != NULL)
@@ -191,7 +191,7 @@ void ControllerItem::ResetFrame (void)
     return ::rtl::OUString();
 }
 
-Image ControllerItem::GetIcon (void) const
+Image ControllerItem::GetIcon() const
 {
     return GetImage(mxFrame, ".uno:" + msCommandName, false);
 }
diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx
index 1013f9d7a39f..831c05325d8c 100644
--- a/sfx2/source/sidebar/Deck.cxx
+++ b/sfx2/source/sidebar/Deck.cxx
@@ -42,7 +42,7 @@ namespace sfx2 { namespace sidebar {
 Deck::Deck (
     const DeckDescriptor& rDeckDescriptor,
     vcl::Window* pParentWindow,
-    const ::boost::function<void(void)>& rCloserAction)
+    const ::boost::function<void()>& rCloserAction)
     : Window(pParentWindow, 0),
       msId(rDeckDescriptor.msId),
       maIcon(),
@@ -73,7 +73,7 @@ Deck::Deck (
 #endif
 }
 
-Deck::~Deck (void)
+Deck::~Deck()
 {
     Dispose();
 
@@ -83,7 +83,7 @@ Deck::~Deck (void)
     maPanels.clear();
 }
 
-void Deck::Dispose (void)
+void Deck::Dispose()
 {
     SharedPanelContainer aPanels;
     aPanels.swap(maPanels);
@@ -106,12 +106,12 @@ void Deck::Dispose (void)
     mpVerticalScrollBar.reset();
 }
 
-DeckTitleBar* Deck::GetTitleBar (void) const
+DeckTitleBar* Deck::GetTitleBar() const
 {
     return mpTitleBar.get();
 }
 
-Rectangle Deck::GetContentArea (void) const
+Rectangle Deck::GetContentArea() const
 {
     const Size aWindowSize (GetSizePixel());
     const int nBorderSize (Theme::GetInteger(Theme::Int_DeckBorderSize));
@@ -217,7 +217,7 @@ void Deck::SetPanels (const SharedPanelContainer& rPanels)
     RequestLayout();
 }
 
-void Deck::RequestLayout (void)
+void Deck::RequestLayout()
 {
     mnMinimalWidth = 0;
 
@@ -232,7 +232,7 @@ void Deck::RequestLayout (void)
         *mpVerticalScrollBar);
 }
 
-vcl::Window* Deck::GetPanelParentWindow (void)
+vcl::Window* Deck::GetPanelParentWindow()
 {
     return mpScrollContainer.get();
 }
@@ -297,7 +297,7 @@ void Deck::PrintWindowSubTree (vcl::Window* pRoot, int nIndentation)
         PrintWindowSubTree(pRoot->GetChild(nIndex), nIndentation+1);
 }
 
-void Deck::PrintWindowTree (void)
+void Deck::PrintWindowTree()
 {
     PrintWindowSubTree(this, 0);
 }
@@ -323,7 +323,7 @@ Deck::ScrollContainerWindow::ScrollContainerWindow (vcl::Window* pParentWindow)
 #endif
 }
 
-Deck::ScrollContainerWindow::~ScrollContainerWindow (void)
+Deck::ScrollContainerWindow::~ScrollContainerWindow()
 {
 }
 
diff --git a/sfx2/source/sidebar/Deck.hxx b/sfx2/source/sidebar/Deck.hxx
index 215bb3be1490..ddb5354b21e1 100644
--- a/sfx2/source/sidebar/Deck.hxx
+++ b/sfx2/source/sidebar/Deck.hxx
@@ -45,18 +45,18 @@ public:
     Deck (
         const DeckDescriptor& rDeckDescriptor,
         vcl::Window* pParentWindow,
-        const ::boost::function<void(void)>& rCloserAction);
-    virtual ~Deck (void);
+        const ::boost::function<void()>& rCloserAction);
+    virtual ~Deck();
 
-    void Dispose (void);
+    void Dispose();
 
-    const ::rtl::OUString& GetId (void) const { return msId;}
-    DeckTitleBar* GetTitleBar (void) const;
-    Rectangle GetContentArea (void) const;
+    const ::rtl::OUString& GetId() const { return msId;}
+    DeckTitleBar* GetTitleBar() const;
+    Rectangle GetContentArea() const;
     void SetPanels (const SharedPanelContainer& rPanels);
-    const SharedPanelContainer& GetPanels (void) const { return maPanels;}
-    void RequestLayout (void);
-    vcl::Window* GetPanelParentWindow (void);
+    const SharedPanelContainer& GetPanels() const { return maPanels;}
+    void RequestLayout();
+    vcl::Window* GetPanelParentWindow();
 
     /** Try to make the panel completely visible.
         When the whole panel does not fit then make its top visible
@@ -77,7 +77,7 @@ public:
     {
     public:
         ScrollContainerWindow (vcl::Window* pParentWindow);
-        virtual ~ScrollContainerWindow (void);
+        virtual ~ScrollContainerWindow();
         virtual void Paint (const Rectangle& rUpdateArea) SAL_OVERRIDE;
         void SetSeparators (const ::std::vector<sal_Int32>& rSeparators);
     private:
diff --git a/sfx2/source/sidebar/DeckDescriptor.cxx b/sfx2/source/sidebar/DeckDescriptor.cxx
index 13396112144e..9981b79fe1da 100644
--- a/sfx2/source/sidebar/DeckDescriptor.cxx
+++ b/sfx2/source/sidebar/DeckDescriptor.cxx
@@ -21,7 +21,7 @@
 
 namespace sfx2 { namespace sidebar {
 
-DeckDescriptor::DeckDescriptor (void)
+DeckDescriptor::DeckDescriptor()
     : msTitle(),
       msId(),
       msIconURL(),
@@ -51,7 +51,7 @@ DeckDescriptor::DeckDescriptor (const DeckDescriptor& rOther)
 {
 }
 
-DeckDescriptor::~DeckDescriptor (void)
+DeckDescriptor::~DeckDescriptor()
 {
 }
 
diff --git a/sfx2/source/sidebar/DeckDescriptor.hxx b/sfx2/source/sidebar/DeckDescriptor.hxx
index fc3f09f9debd..3ea1db1cf4dc 100644
--- a/sfx2/source/sidebar/DeckDescriptor.hxx
+++ b/sfx2/source/sidebar/DeckDescriptor.hxx
@@ -40,9 +40,9 @@ public:
     bool mbIsEnabled;
     sal_Int32 mnOrderIndex;
 
-    DeckDescriptor (void);
+    DeckDescriptor();
     DeckDescriptor (const DeckDescriptor& rOther);
-    ~DeckDescriptor (void);
+    ~DeckDescriptor();
 };
 
 } } // end of namespace sfx2::sidebar
diff --git a/sfx2/source/sidebar/DeckLayouter.cxx b/sfx2/source/sidebar/DeckLayouter.cxx
index 984b61bedd2e..aae65c611950 100644
--- a/sfx2/source/sidebar/DeckLayouter.cxx
+++ b/sfx2/source/sidebar/DeckLayouter.cxx
@@ -50,7 +50,7 @@ namespace {
         sal_Int32 mnPanelIndex;
         bool mbShowTitleBar;
 
-        LayoutItem (void)
+        LayoutItem()
             : mpPanel(),maLayoutSize(0,0,0),mnDistributedHeight(0),mnWeight(0),mnPanelIndex(0),mbShowTitleBar(true)
         {}
     };
diff --git a/sfx2/source/sidebar/DeckTitleBar.cxx b/sfx2/source/sidebar/DeckTitleBar.cxx
index 0294ce930788..9c296b1f3f3d 100644
--- a/sfx2/source/sidebar/DeckTitleBar.cxx
+++ b/sfx2/source/sidebar/DeckTitleBar.cxx
@@ -36,7 +36,7 @@ static const sal_Int32 gaRightGripPadding (3);
 DeckTitleBar::DeckTitleBar (
     const ::rtl::OUString& rsTitle,
     vcl::Window* pParentWindow,
-    const ::boost::function<void(void)>& rCloserAction)
+    const ::boost::function<void()>& rCloserAction)
     : TitleBar(rsTitle, pParentWindow, GetBackgroundPaint()),
       mnCloserItemIndex(1),
       maCloserAction(rCloserAction),
@@ -52,7 +52,7 @@ DeckTitleBar::DeckTitleBar (
 #endif
 }
 
-DeckTitleBar::~DeckTitleBar (void)
+DeckTitleBar::~DeckTitleBar()
 {
 }
 
@@ -92,12 +92,12 @@ void DeckTitleBar::PaintDecoration (const Rectangle& rTitleBarBox)
     (void)rTitleBarBox;
 }
 
-sidebar::Paint DeckTitleBar::GetBackgroundPaint (void)
+sidebar::Paint DeckTitleBar::GetBackgroundPaint()
 {
     return Theme::GetPaint(Theme::Paint_DeckTitleBarBackground);
 }
 
-Color DeckTitleBar::GetTextColor (void)
+Color DeckTitleBar::GetTextColor()
 {
     return Theme::GetColor(Theme::Color_DeckTitleFont);
 }
@@ -109,7 +109,7 @@ void DeckTitleBar::HandleToolBoxItemClick (const sal_uInt16 nItemIndex)
             maCloserAction();
 }
 
-css::uno::Reference<css::accessibility::XAccessible> DeckTitleBar::CreateAccessible (void)
+css::uno::Reference<css::accessibility::XAccessible> DeckTitleBar::CreateAccessible()
 {
     const ::rtl::OUString sAccessibleName(msTitle);
     SetAccessibleName(sAccessibleName);
diff --git a/sfx2/source/sidebar/DeckTitleBar.hxx b/sfx2/source/sidebar/DeckTitleBar.hxx
index 5f163caf1c56..d481b2d842d3 100644
--- a/sfx2/source/sidebar/DeckTitleBar.hxx
+++ b/sfx2/source/sidebar/DeckTitleBar.hxx
@@ -32,8 +32,8 @@ public:
     DeckTitleBar (
         const ::rtl::OUString& rsTitle,
         vcl::Window* pParentWindow,
-        const ::boost::function<void(void)>& rCloserAction);
-    virtual ~DeckTitleBar (void);
+        const ::boost::function<void()>& rCloserAction);
+    virtual ~DeckTitleBar();
 
     void SetCloserVisible (const bool bIsCloserVisible);
 
@@ -42,14 +42,14 @@ public:
 protected:
     virtual Rectangle GetTitleArea (const Rectangle& rTitleBarBox) SAL_OVERRIDE;
     virtual void PaintDecoration (const Rectangle& rTitleBarBox) SAL_OVERRIDE;
-    virtual sidebar::Paint GetBackgroundPaint (void) SAL_OVERRIDE;
-    virtual Color GetTextColor (void) SAL_OVERRIDE;
+    virtual sidebar::Paint GetBackgroundPaint() SAL_OVERRIDE;
+    virtual Color GetTextColor() SAL_OVERRIDE;
     virtual void HandleToolBoxItemClick (const sal_uInt16 nItemIndex) SAL_OVERRIDE;
-    virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible (void) SAL_OVERRIDE;
+    virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() SAL_OVERRIDE;
 
 private:
     const sal_uInt16 mnCloserItemIndex;
-    const ::boost::function<void(void)> maCloserAction;
+    const ::boost::function<void()> maCloserAction;
     bool mbIsCloserVisible;
 };
 
diff --git a/sfx2/source/sidebar/EnumContext.cxx b/sfx2/source/sidebar/EnumContext.cxx
index e89f5627f7bb..9f8a63077f18 100644
--- a/sfx2/source/sidebar/EnumContext.cxx
+++ b/sfx2/source/sidebar/EnumContext.cxx
@@ -41,7 +41,7 @@ static ContextVector maContextVector;
 const sal_Int32 EnumContext::NoMatch = 4;
 const sal_Int32 EnumContext::OptimalMatch = 0;  // Neither application nor context name is "any".
 
-EnumContext::EnumContext (void)
+EnumContext::EnumContext()
     : meApplication(Application_None),
       meContext(Context_Unknown)
 {
@@ -63,12 +63,12 @@ EnumContext::EnumContext (
 {
 }
 
-sal_Int32 EnumContext::GetCombinedContext_DI (void) const
+sal_Int32 EnumContext::GetCombinedContext_DI() const
 {
     return CombinedEnumContext(GetApplication_DI(), meContext);
 }
 
-EnumContext::Application EnumContext::GetApplication_DI (void) const
+EnumContext::Application EnumContext::GetApplication_DI() const
 {
      switch (meApplication)
      {
@@ -110,7 +110,7 @@ void EnumContext::AddEntry (const ::rtl::OUString& rsName, const Application eAp
     maApplicationVector[eApplication]=rsName;
 }
 
-void EnumContext::ProvideApplicationContainers (void)
+void EnumContext::ProvideApplicationContainers()
 {
     if (maApplicationMap.empty())
     {
@@ -162,7 +162,7 @@ void EnumContext::AddEntry (const ::rtl::OUString& rsName, const Context eApplic
     maContextVector[eApplication] = rsName;
 }
 
-void EnumContext::ProvideContextContainers (void)
+void EnumContext::ProvideContextContainers()
 {
     if (maContextMap.empty())
     {
diff --git a/sfx2/source/sidebar/FocusManager.cxx b/sfx2/source/sidebar/FocusManager.cxx
index af116e67c605..1dae58556cbd 100644
--- a/sfx2/source/sidebar/FocusManager.cxx
+++ b/sfx2/source/sidebar/FocusManager.cxx
@@ -46,24 +46,24 @@ FocusManager::FocusManager (const ::boost::function<void(const Panel&)>& rShowPa
 {
 }
 
-FocusManager::~FocusManager (void)
+FocusManager::~FocusManager()
 {
     Clear();
 }
 
-void FocusManager::GrabFocus (void)
+void FocusManager::GrabFocus()
 {
     FocusDeckTitle();
 }
 
-void FocusManager::Clear (void)
+void FocusManager::Clear()
 {
     SetDeckTitle(NULL);
     ClearPanels();
     ClearButtons();
 }
 
-void FocusManager::ClearPanels (void)
+void FocusManager::ClearPanels()
 {
     ::std::vector<Panel*> aPanels;
     aPanels.swap(maPanels);
@@ -82,7 +82,7 @@ void FocusManager::ClearPanels (void)
     }
 }
 
-void FocusManager::ClearButtons (void)
+void FocusManager::ClearButtons()
 {
     ::std::vector<Button*> aButtons;
     aButtons.swap(maButtons);
@@ -184,7 +184,7 @@ FocusManager::FocusLocation FocusManager::GetFocusLocation (const vcl::Window& r
     return FocusLocation(PC_None, -1);
 }
 
-void FocusManager::FocusDeckTitle (void)
+void FocusManager::FocusDeckTitle()
 {
     if (mpDeckTitleBar != NULL)
     {
@@ -205,7 +205,7 @@ void FocusManager::FocusDeckTitle (void)
         FocusPanel(0, false);
 }
 
-bool FocusManager::IsDeckTitleVisible (void) const
+bool FocusManager::IsDeckTitleVisible() const
 {
     return mpDeckTitleBar != NULL && mpDeckTitleBar->IsVisible();
 }
diff --git a/sfx2/source/sidebar/FocusManager.hxx b/sfx2/source/sidebar/FocusManager.hxx
index 0577c8cd88e7..4db5fe1ead64 100644
--- a/sfx2/source/sidebar/FocusManager.hxx
+++ b/sfx2/source/sidebar/FocusManager.hxx
@@ -51,17 +51,17 @@ class FocusManager
 {
 public:
     FocusManager (const ::boost::function<void(const Panel&)>& rShowPanelFunctor);
-    ~FocusManager (void);
+    ~FocusManager();
 
     /** Forget all panels and buttons.  Remove all window listeners.
     */
-    void Clear (void);
+    void Clear();
 
     /** Transfer the focus into the sidebar tree of windows.  This is
         typically called from the SidebarChildWindow as result of
         pressing the F6 key.
     */
-    void GrabFocus (void);
+    void GrabFocus();
 
     void SetDeckTitle (DeckTitleBar* pDeckTitleBar);
     void SetPanels (const SharedPanelContainer& rPanels);
@@ -99,8 +99,8 @@ private:
     DECL_LINK(WindowEventListener, VclSimpleEvent*);
     DECL_LINK(ChildEventListener, VclSimpleEvent*);
 
-    void ClearPanels (void);
-    void ClearButtons (void);
+    void ClearPanels();
+    void ClearButtons();
 
     /** Let the focus manager listen for window events for the given
         window.
@@ -112,8 +112,8 @@ private:
     */
     void RemoveWindow (vcl::Window& rWindow);
 
-    void FocusDeckTitle (void);
-    bool IsDeckTitleVisible (void) const;
+    void FocusDeckTitle();
+    bool IsDeckTitleVisible() const;
     bool IsPanelTitleVisible (const sal_Int32 nPanelIndex) const;
 
     /** Set the focus to the title bar of the panel or, if the
diff --git a/sfx2/source/sidebar/IContextChangeReceiver.cxx b/sfx2/source/sidebar/IContextChangeReceiver.cxx
index a592b8275b6e..8a4ad0f6701d 100644
--- a/sfx2/source/sidebar/IContextChangeReceiver.cxx
+++ b/sfx2/source/sidebar/IContextChangeReceiver.cxx
@@ -20,7 +20,7 @@
 
 namespace sfx2 { namespace sidebar {
 
-IContextChangeReceiver::~IContextChangeReceiver (void)
+IContextChangeReceiver::~IContextChangeReceiver()
 {
 }
 
diff --git a/sfx2/source/sidebar/ILayoutableWindow.cxx b/sfx2/source/sidebar/ILayoutableWindow.cxx
index 1b4cd53710cc..c8d740947d2f 100644
--- a/sfx2/source/sidebar/ILayoutableWindow.cxx
+++ b/sfx2/source/sidebar/ILayoutableWindow.cxx
@@ -20,7 +20,7 @@
 
 namespace sfx2 { namespace sidebar {
 
-ILayoutableWindow::~ILayoutableWindow (void)
+ILayoutableWindow::~ILayoutableWindow()
 {
 }
 
diff --git a/sfx2/source/sidebar/MenuButton.cxx b/sfx2/source/sidebar/MenuButton.cxx
index 36d5a4c75236..8620b30f9b93 100644
--- a/sfx2/source/sidebar/MenuButton.cxx
+++ b/sfx2/source/sidebar/MenuButton.cxx
@@ -39,7 +39,7 @@ MenuButton::MenuButton (vcl::Window* pParentWindow)
 #endif
 }
 
-MenuButton::~MenuButton (void)
+MenuButton::~MenuButton()
 {
 }
 
diff --git a/sfx2/source/sidebar/MenuButton.hxx b/sfx2/source/sidebar/MenuButton.hxx
index 1be374ebf7f7..121dd991d4c6 100644
--- a/sfx2/source/sidebar/MenuButton.hxx
+++ b/sfx2/source/sidebar/MenuButton.hxx
@@ -28,7 +28,7 @@ class MenuButton
 {
 public:
     MenuButton (vcl::Window* pParentWindow);
-    virtual ~MenuButton (void);
+    virtual ~MenuButton();
 
     virtual void Paint (const Rectangle& rUpdateArea) SAL_OVERRIDE;
     virtual void MouseMove (const MouseEvent& rEvent) SAL_OVERRIDE;
diff --git a/sfx2/source/sidebar/Paint.cxx b/sfx2/source/sidebar/Paint.cxx
index 2d3fe7d2a8c2..caa371d2acf6 100644
--- a/sfx2/source/sidebar/Paint.cxx
+++ b/sfx2/source/sidebar/Paint.cxx
@@ -24,7 +24,7 @@ using namespace css;
 
 namespace sfx2 { namespace sidebar {
 
-Paint::Paint (void)
+Paint::Paint()
     : meType(NoPaint)
 {
 }
@@ -54,7 +54,7 @@ Paint Paint::Create (const css::uno::Any& rValue)
     return Paint();
 }
 
-const Color& Paint::GetColor (void) const
+const Color& Paint::GetColor() const
 {
     if (meType != ColorPaint)
     {
@@ -66,7 +66,7 @@ const Color& Paint::GetColor (void) const
         return ::boost::get<Color>(maValue);
 }
 
-const Gradient& Paint::GetGradient (void) const
+const Gradient& Paint::GetGradient() const
 {
     if (meType != GradientPaint)
     {
@@ -78,7 +78,7 @@ const Gradient& Paint::GetGradient (void) const
         return ::boost::get<Gradient>(maValue);
 }
 
-Wallpaper Paint::GetWallpaper (void) const
+Wallpaper Paint::GetWallpaper() const
 {
     switch (meType)
     {
diff --git a/sfx2/source/sidebar/Paint.hxx b/sfx2/source/sidebar/Paint.hxx
index 8c1445f3940f..91b36f093bf8 100644
--- a/sfx2/source/sidebar/Paint.hxx
+++ b/sfx2/source/sidebar/Paint.hxx
@@ -49,7 +49,7 @@ public:
     static Paint Create (const css::uno::Any& rValue);
 
     // Create paint with type NoPaint.
-    explicit Paint (void);
+    explicit Paint();
 
     // Create a Paint object for the given color.
     explicit Paint (const Color& rColor);
@@ -57,11 +57,11 @@ public:
     // Create a Paint object for the given gradient.
     explicit Paint (const Gradient& rGradient);
 
-    Type GetType (void) const { return meType;}
-    const Color& GetColor (void) const;
-    const Gradient& GetGradient (void) const;
+    Type GetType() const { return meType;}
+    const Color& GetColor() const;
+    const Gradient& GetGradient() const;
 
-    Wallpaper GetWallpaper (void) const;
+    Wallpaper GetWallpaper() const;
 
 private:
     Type meType;
diff --git a/sfx2/source/sidebar/Panel.cxx b/sfx2/source/sidebar/Panel.cxx
index f7666e794599..d72f15e57c22 100644
--- a/sfx2/source/sidebar/Panel.cxx
+++ b/sfx2/source/sidebar/Panel.cxx
@@ -47,8 +47,8 @@ Panel::Panel (
     const PanelDescriptor& rPanelDescriptor,
     vcl::Window* pParentWindow,
     const bool bIsInitiallyExpanded,
-    const ::boost::function<void(void)>& rDeckLayoutTrigger,
-    const ::boost::function<Context(void)>& rContextAccess)
+    const ::boost::function<void()>& rDeckLayoutTrigger,
+    const ::boost::function<Context()>& rContextAccess)
     : Window(pParentWindow),
       msPanelId(rPanelDescriptor.msId),
       mpTitleBar(new PanelTitleBar(
@@ -69,12 +69,12 @@ Panel::Panel (
 #endif
 }
 
-Panel::~Panel (void)
+Panel::~Panel()
 {
     Dispose();
 }
 
-void Panel::Dispose (void)
+void Panel::Dispose()
 {
     mxPanelComponent = NULL;
 
@@ -94,7 +94,7 @@ void Panel::Dispose (void)
     mpTitleBar.reset();
 }
 
-PanelTitleBar* Panel::GetTitleBar (void) const
+PanelTitleBar* Panel::GetTitleBar() const
 {
     return mpTitleBar.get();
 }
@@ -133,7 +133,7 @@ void Panel::Paint (const Rectangle& rUpdateArea)
     Window::Paint(rUpdateArea);
 }
 
-void Panel::Resize (void)
+void Panel::Resize()
 {
     Window::Resize();
 
@@ -151,7 +151,7 @@ void Panel::Resize (void)
     }
 }
 
-void Panel::Activate (void)
+void Panel::Activate()
 {
     Window::Activate();
 }
@@ -162,7 +162,7 @@ void Panel::DataChanged (const DataChangedEvent& rEvent)
     SetBackground(Theme::GetPaint(Theme::Paint_PanelBackground).GetWallpaper());
 }
 
-Reference<awt::XWindow> Panel::GetElementWindow (void)
+Reference<awt::XWindow> Panel::GetElementWindow()
 {
     if (mxElement.is())
     {
diff --git a/sfx2/source/sidebar/Panel.hxx b/sfx2/source/sidebar/Panel.hxx
index 219943cd7cc5..ad2c78d6e95d 100644
--- a/sfx2/source/sidebar/Panel.hxx
+++ b/sfx2/source/sidebar/Panel.hxx
@@ -44,26 +44,26 @@ public:
         const PanelDescriptor& rPanelDescriptor,
         vcl::Window* pParentWindow,
         const bool bIsInitiallyExpanded,
-        const ::boost::function<void(void)>& rDeckLayoutTrigger,
-        const ::boost::function<Context(void)>& rContextAccess);
-    virtual ~Panel (void);
+        const ::boost::function<void()>& rDeckLayoutTrigger,
+        const ::boost::function<Context()>& rContextAccess);
+    virtual ~Panel();
 
-    void Dispose (void);
+    void Dispose();
 
-    PanelTitleBar* GetTitleBar (void) const;
-    bool IsTitleBarOptional (void) const { return mbIsTitleBarOptional;}
+    PanelTitleBar* GetTitleBar() const;
+    bool IsTitleBarOptional() const { return mbIsTitleBarOptional;}
     void SetUIElement (const css::uno::Reference<css::ui::XUIElement>& rxElement);
-    css::uno::Reference<css::ui::XSidebarPanel> GetPanelComponent (void) const { return mxPanelComponent;}
-    css::uno::Reference<css::awt::XWindow> GetElementWindow (void);
+    css::uno::Reference<css::ui::XSidebarPanel> GetPanelComponent() const { return mxPanelComponent;}
+    css::uno::Reference<css::awt::XWindow> GetElementWindow();
     void SetExpanded (const bool bIsExpanded);
-    bool IsExpanded (void) const { return mbIsExpanded;}
+    bool IsExpanded() const { return mbIsExpanded;}
     bool HasIdPredicate (const ::rtl::OUString& rsId) const;
-    const ::rtl::OUString& GetId (void) const { return msPanelId;}
+    const ::rtl::OUString& GetId() const { return msPanelId;}
 
     virtual void Paint (const Rectangle& rUpdateArea) SAL_OVERRIDE;
-    virtual void Resize (void) SAL_OVERRIDE;
+    virtual void Resize() SAL_OVERRIDE;
     virtual void DataChanged (const DataChangedEvent& rEvent) SAL_OVERRIDE;
-    virtual void Activate (void) SAL_OVERRIDE;
+    virtual void Activate() SAL_OVERRIDE;
 
 private:
     const ::rtl::OUString msPanelId;
@@ -72,8 +72,8 @@ private:
     css::uno::Reference<css::ui::XUIElement> mxElement;
     css::uno::Reference<css::ui::XSidebarPanel> mxPanelComponent;
     bool mbIsExpanded;
-    const ::boost::function<void(void)> maDeckLayoutTrigger;
-    const ::boost::function<Context(void)> maContextAccess;
+    const ::boost::function<void()> maDeckLayoutTrigger;
+    const ::boost::function<Context()> maContextAccess;
 };
 typedef ::boost::shared_ptr<Panel> SharedPanel;
 typedef ::std::vector<SharedPanel> SharedPanelContainer;
diff --git a/sfx2/source/sidebar/PanelDescriptor.cxx b/sfx2/source/sidebar/PanelDescriptor.cxx
index aad36f4f0aba..c7837bf36d41 100644
--- a/sfx2/source/sidebar/PanelDescriptor.cxx
+++ b/sfx2/source/sidebar/PanelDescriptor.cxx
@@ -21,7 +21,7 @@
 
 namespace sfx2 { namespace sidebar {
 
-PanelDescriptor::PanelDescriptor (void)
+PanelDescriptor::PanelDescriptor()
     : msTitle(),
       mbIsTitleBarOptional(false),
       msId(),
@@ -53,7 +53,7 @@ PanelDescriptor::PanelDescriptor (const PanelDescriptor& rOther)
 {
 }
 
-PanelDescriptor::~PanelDescriptor (void)
+PanelDescriptor::~PanelDescriptor()
 {
 }
 
diff --git a/sfx2/source/sidebar/PanelDescriptor.hxx b/sfx2/source/sidebar/PanelDescriptor.hxx
index c2ae4afb44d9..d1a20d253967 100644
--- a/sfx2/source/sidebar/PanelDescriptor.hxx
+++ b/sfx2/source/sidebar/PanelDescriptor.hxx
@@ -41,9 +41,9 @@ public:
     bool mbShowForReadOnlyDocuments;
     bool mbWantsCanvas;
 
-    PanelDescriptor (void);
+    PanelDescriptor();
     PanelDescriptor (const PanelDescriptor& rPanelDescriptor);
-    ~PanelDescriptor (void);
+    ~PanelDescriptor();
 };
 
 } } // end of namespace sfx2::sidebar
diff --git a/sfx2/source/sidebar/PanelTitleBar.cxx b/sfx2/source/sidebar/PanelTitleBar.cxx
index 5437c5312a0c..b8cf19fbc507 100644
--- a/sfx2/source/sidebar/PanelTitleBar.cxx
+++ b/sfx2/source/sidebar/PanelTitleBar.cxx
@@ -58,7 +58,7 @@ PanelTitleBar::PanelTitleBar (
 #endif
 }
 
-PanelTitleBar::~PanelTitleBar (void)
+PanelTitleBar::~PanelTitleBar()
 {
 }
 
@@ -129,12 +129,12 @@ void PanelTitleBar::PaintDecoration (const Rectangle& rTitleBarBox)
     }
 }
 
-Paint PanelTitleBar::GetBackgroundPaint (void)
+Paint PanelTitleBar::GetBackgroundPaint()
 {
     return Theme::GetPaint(Theme::Paint_PanelTitleBarBackground);
 }
 
-Color PanelTitleBar::GetTextColor (void)
+Color PanelTitleBar::GetTextColor()
 {
     return Theme::GetColor(Theme::Color_PanelTitleFont);
 }
@@ -159,7 +159,7 @@ void PanelTitleBar::HandleToolBoxItemClick (const sal_uInt16 nItemIndex)
         }
 }
 
-Reference<accessibility::XAccessible> PanelTitleBar::CreateAccessible (void)
+Reference<accessibility::XAccessible> PanelTitleBar::CreateAccessible()
 {
     const ::rtl::OUString sAccessibleName(msAccessibleNamePrefix + msTitle);
     SetAccessibleName(sAccessibleName);
diff --git a/sfx2/source/sidebar/PanelTitleBar.hxx b/sfx2/source/sidebar/PanelTitleBar.hxx
index 51af11d2c176..37effd70726f 100644
--- a/sfx2/source/sidebar/PanelTitleBar.hxx
+++ b/sfx2/source/sidebar/PanelTitleBar.hxx
@@ -36,7 +36,7 @@ public:
         const ::rtl::OUString& rsTitle,
         vcl::Window* pParentWindow,
         Panel* pPanel );
-    virtual ~PanelTitleBar (void);
+    virtual ~PanelTitleBar();
 
     void SetMoreOptionsCommand (
         const ::rtl::OUString& rsCommandName,
@@ -49,10 +49,10 @@ public:
 protected:
     virtual Rectangle GetTitleArea (const Rectangle& rTitleBarBox) SAL_OVERRIDE;
     virtual void PaintDecoration (const Rectangle& rTitleBarBox) SAL_OVERRIDE;
-    virtual sidebar::Paint GetBackgroundPaint (void) SAL_OVERRIDE;
-    virtual Color GetTextColor (void) SAL_OVERRIDE;
+    virtual sidebar::Paint GetBackgroundPaint() SAL_OVERRIDE;
+    virtual Color GetTextColor() SAL_OVERRIDE;
     virtual void HandleToolBoxItemClick (const sal_uInt16 nItemIndex) SAL_OVERRIDE;
-    virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible (void) SAL_OVERRIDE;
+    virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() SAL_OVERRIDE;
 
 private:
     bool mbIsLeftButtonDown;
diff --git a/sfx2/source/sidebar/PopupContainer.cxx b/sfx2/source/sidebar/PopupContainer.cxx
index 0952765fb8b6..0b52d1fddc7e 100644
--- a/sfx2/source/sidebar/PopupContainer.cxx
+++ b/sfx2/source/sidebar/PopupContainer.cxx
@@ -27,7 +27,7 @@ PopupContainer::PopupContainer (vcl::Window* pParent)
 {
 }
 
-PopupContainer::~PopupContainer (void)
+PopupContainer::~PopupContainer()
 {
 }
 
diff --git a/sfx2/source/sidebar/ResourceManager.cxx b/sfx2/source/sidebar/ResourceManager.cxx
index 570480391993..c5bfa88359bd 100644
--- a/sfx2/source/sidebar/ResourceManager.cxx
+++ b/sfx2/source/sidebar/ResourceManager.cxx
@@ -38,13 +38,13 @@ using namespace css::uno;
 
 namespace sfx2 { namespace sidebar {
 
-ResourceManager& ResourceManager::Instance (void)
+ResourceManager& ResourceManager::Instance()
 {
     static ResourceManager maInstance;
     return maInstance;
 }
 
-ResourceManager::ResourceManager (void)
+ResourceManager::ResourceManager()
     : maDecks(),
       maPanels(),
       maProcessedApplications()
@@ -53,7 +53,7 @@ ResourceManager::ResourceManager (void)
     ReadPanelList();
 }
 
-ResourceManager::~ResourceManager (void)
+ResourceManager::~ResourceManager()
 {
     maPanels.clear();
     maDecks.clear();
@@ -192,7 +192,7 @@ const ResourceManager::PanelContextDescriptorContainer& ResourceManager::GetMatc
     return rPanelIds;
 }
 
-void ResourceManager::ReadDeckList (void)
+void ResourceManager::ReadDeckList()
 {
     const ::utl::OConfigurationTreeRoot aDeckRootNode (
         ::comphelper::getProcessComponentContext(),
@@ -244,7 +244,7 @@ void ResourceManager::ReadDeckList (void)
         maDecks.resize(nWriteIndex);
 }
 
-void ResourceManager::ReadPanelList (void)
+void ResourceManager::ReadPanelList()
 {
     const ::utl::OConfigurationTreeRoot aPanelRootNode (
         ::comphelper::getProcessComponentContext(),
diff --git a/sfx2/source/sidebar/ResourceManager.hxx b/sfx2/source/sidebar/ResourceManager.hxx
index c8e2d07678a0..57fc5beaf993 100644
--- a/sfx2/source/sidebar/ResourceManager.hxx
+++ b/sfx2/source/sidebar/ResourceManager.hxx
@@ -39,7 +39,7 @@ class ContextList;
 class ResourceManager
 {
 public:
-    static ResourceManager& Instance (void);
+    static ResourceManager& Instance();
 
     const DeckDescriptor* GetDeckDescriptor (
         const ::rtl::OUString& rsDeckId) const;
@@ -96,8 +96,8 @@ public:
         const Context& rContext);
 
 private:
-    ResourceManager (void);
-    ~ResourceManager (void);
+    ResourceManager();
+    ~ResourceManager();
 
     typedef ::std::vector<DeckDescriptor> DeckContainer;
     DeckContainer maDecks;
@@ -105,8 +105,8 @@ private:
     PanelContainer maPanels;
     mutable ::std::set<rtl::OUString> maProcessedApplications;
 
-    void ReadDeckList (void);
-    void ReadPanelList (void);
+    void ReadDeckList();
+    void ReadPanelList();
     void ReadContextList (
         const ::utl::OConfigurationNode& rNode,
         ContextList& rContextList,
diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx
index eb2554df744d..af144a19e510 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -153,7 +153,7 @@ SidebarController::SidebarController (
             xWeakController));
 }
 
-SidebarController::~SidebarController (void)
+SidebarController::~SidebarController()
 {
 }
 
@@ -171,7 +171,7 @@ SidebarController* SidebarController::GetSidebarControllerForFrame (
     return dynamic_cast<SidebarController*>(xController.get());
 }
 
-void SAL_CALL SidebarController::disposing (void)
+void SAL_CALL SidebarController::disposing()
 {
     SidebarControllerContainer::iterator iEntry (maSidebarControllerContainer.find(mxFrame));
     if (iEntry != maSidebarControllerContainer.end())
@@ -269,7 +269,7 @@ void SAL_CALL SidebarController::statusChanged (const css::frame::FeatureStateEv
     }
 }
 
-void SAL_CALL SidebarController::requestLayout (void)
+void SAL_CALL SidebarController::requestLayout()
     throw(css::uno::RuntimeException, std::exception)
 {
     sal_Int32 nMinimalWidth = 0;
@@ -281,14 +281,14 @@ void SAL_CALL SidebarController::requestLayout (void)
     RestrictWidth(nMinimalWidth);
 }
 
-void SidebarController::BroadcastPropertyChange (void)
+void SidebarController::BroadcastPropertyChange()
 {
     DataChangedEvent aEvent (DataChangedEventType::USER);
     mpParentWindow->NotifyAllChildren(aEvent);
     mpParentWindow->Invalidate(INVALIDATE_CHILDREN);
 }
 
-void SidebarController::NotifyResize (void)
+void SidebarController::NotifyResize()
 {
     if (mpTabBar == 0)
     {
@@ -419,7 +419,7 @@ void SidebarController::ProcessNewWidth (const sal_Int32 nNewWidth)
     }
 }
 
-void SidebarController::UpdateConfigurations (void)
+void SidebarController::UpdateConfigurations()
 {
     if (maCurrentContext != maRequestedContext
         || mnRequestedForceFlags!=SwitchFlag_NoForce)
@@ -958,7 +958,7 @@ IMPL_LINK(SidebarController, OnMenuItemSelected, Menu*, pMenu)
     return 1;
 }
 
-void SidebarController::RequestCloseDeck (void)
+void SidebarController::RequestCloseDeck()
 {
     mbIsDeckRequestedOpen = false;
     UpdateDeckOpenState();
@@ -967,7 +967,7 @@ void SidebarController::RequestCloseDeck (void)
     mpTabBar->RemoveDeckHighlight();
 }
 
-void SidebarController::RequestOpenDeck (void)
+void SidebarController::RequestOpenDeck()
 {
     mbIsDeckRequestedOpen = true;
     UpdateDeckOpenState();
@@ -978,7 +978,7 @@ bool SidebarController::IsDeckVisible(const OUString& rsDeckId)
     return mbIsDeckOpen && mbIsDeckOpen.get() && msCurrentDeckId == rsDeckId;
 }
 
-void SidebarController::UpdateDeckOpenState (void)
+void SidebarController::UpdateDeckOpenState()
 {
     if ( ! mbIsDeckRequestedOpen)
         // No state requested.
@@ -1014,7 +1014,7 @@ void SidebarController::UpdateDeckOpenState (void)
     }
 }
 
-bool SidebarController::CanModifyChildWindowWidth (void)
+bool SidebarController::CanModifyChildWindowWidth()
 {
     SfxSplitWindow* pSplitWindow = GetSplitWindow();
     if (pSplitWindow == NULL)
@@ -1069,7 +1069,7 @@ void SidebarController::RestrictWidth (sal_Int32 nWidth)
     }
 }
 
-SfxSplitWindow* SidebarController::GetSplitWindow (void)
+SfxSplitWindow* SidebarController::GetSplitWindow()
 {
     if (mpParentWindow != NULL)
     {
@@ -1125,7 +1125,7 @@ void SidebarController::UpdateCloseIndicator (const bool bCloseAfterDrag)
     }
 }
 
-void SidebarController::UpdateTitleBarIcons (void)
+void SidebarController::UpdateTitleBarIcons()
 {
     if ( ! mpCurrentDeck)
         return;
diff --git a/sfx2/source/sidebar/SidebarController.hxx b/sfx2/source/sidebar/SidebarController.hxx
index 15c694d85fea..14705d91ca02 100644
--- a/sfx2/source/sidebar/SidebarController.hxx
+++ b/sfx2/source/sidebar/SidebarController.hxx
@@ -76,7 +76,7 @@ public:
     SidebarController(
         SidebarDockingWindow* pParentWindow,
         const css::uno::Reference<css::frame::XFrame>& rxFrame);
-    virtual ~SidebarController (void);
+    virtual ~SidebarController();
 
     /** Return the SidebarController object that is associated with
         the given XFrame.
@@ -104,10 +104,10 @@ public:
         throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     // ui::XSidebar
-    virtual void SAL_CALL requestLayout (void)
+    virtual void SAL_CALL requestLayout()
         throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
-    void NotifyResize (void);
+    void NotifyResize();
 
     /** In some situations it is necessary to force an update of the
         current deck and its panels.  One reason is a change of the
@@ -125,17 +125,17 @@ public:
 
     /** Show only the tab bar, not the deck.
     */
-    void RequestCloseDeck (void);
+    void RequestCloseDeck();
 
     /** Open the deck area and restore the parent window to its old width.
     */
-    void RequestOpenDeck (void);
+    void RequestOpenDeck();
 
     /** Returns true when the given deck is the currently visible deck
      */
     bool IsDeckVisible (const ::rtl::OUString& rsDeckId);
 
-    FocusManager& GetFocusManager (void) { return maFocusManager;}
+    FocusManager& GetFocusManager() { return maFocusManager;}
 
 private:
     typedef ::std::map<
@@ -191,7 +191,7 @@ private:
     DECL_LINK(WindowEventHandler, VclWindowEvent*);
     /** Make maRequestedContext the current context.
     */
-    void UpdateConfigurations (void);
+    void UpdateConfigurations();
 
     css::uno::Reference<css::ui::XUIElement> CreateUIElement (
         const css::uno::Reference<css::awt::XWindowPeer>& rxWindow,
@@ -214,13 +214,13 @@ private:
     ::boost::shared_ptr<PopupMenu> CreatePopupMenu (
         const ::std::vector<TabBar::DeckMenuData>& rMenuData) const;
     DECL_LINK(OnMenuItemSelected, Menu*);
-    void BroadcastPropertyChange (void);
+    void BroadcastPropertyChange();
 
     /** The close of the deck changes the width of the child window.
         That is only possible if there is no other docking window docked above or below the sidebar.
         Return whether the width of the child window can be modified.
     */
-    bool CanModifyChildWindowWidth (void);
+    bool CanModifyChildWindowWidth();
 
     /** Set the child window container to a new width.
         Return the old width.
@@ -231,11 +231,11 @@ private:
         the panels.  This is called once when a deck is created and
         every time when a data change event is processed.
     */
-    void UpdateTitleBarIcons (void);
+    void UpdateTitleBarIcons();
 
-    void UpdateDeckOpenState (void);
+    void UpdateDeckOpenState();
     void RestrictWidth (sal_Int32 nWidth);
-    SfxSplitWindow* GetSplitWindow (void);
+    SfxSplitWindow* GetSplitWindow();
     void ProcessNewWidth (const sal_Int32 nNewWidth);
     void UpdateCloseIndicator (const bool bIsIndicatorVisible);
 
@@ -245,9 +245,9 @@ private:
     */
     void ShowPanel (const Panel& rPanel);
 
-    Context GetCurrentContext (void) const { return maCurrentContext;}
+    Context GetCurrentContext() const { return maCurrentContext;}
 
-    virtual void SAL_CALL disposing (void) SAL_OVERRIDE;
+    virtual void SAL_CALL disposing() SAL_OVERRIDE;
 };
 
 } } // end of namespace sfx2::sidebar
diff --git a/sfx2/source/sidebar/SidebarDockingWindow.cxx b/sfx2/source/sidebar/SidebarDockingWindow.cxx
index 5ccf6fe60674..f67240c1a06c 100644
--- a/sfx2/source/sidebar/SidebarDockingWindow.cxx
+++ b/sfx2/source/sidebar/SidebarDockingWindow.cxx
@@ -51,12 +51,12 @@ SidebarDockingWindow::SidebarDockingWindow(
     }
 }
 
-SidebarDockingWindow::~SidebarDockingWindow (void)
+SidebarDockingWindow::~SidebarDockingWindow()
 {
     DoDispose();
 }
 
-void SidebarDockingWindow::DoDispose (void)
+void SidebarDockingWindow::DoDispose()
 {
     Reference<lang::XComponent> xComponent (static_cast<XWeak*>(mpSidebarController.get()), UNO_QUERY);
     mpSidebarController.clear();
@@ -75,7 +75,7 @@ void SidebarDockingWindow::GetFocus()
 }
 
 // fdo#87217
-bool SidebarDockingWindow::Close (void)
+bool SidebarDockingWindow::Close()
 {
     return SfxDockingWindow::Close();
 }
diff --git a/sfx2/source/sidebar/SidebarDockingWindow.hxx b/sfx2/source/sidebar/SidebarDockingWindow.hxx
index c15422601c9b..47724b4d3520 100644
--- a/sfx2/source/sidebar/SidebarDockingWindow.hxx
+++ b/sfx2/source/sidebar/SidebarDockingWindow.hxx
@@ -38,13 +38,13 @@ public:
         SidebarChildWindow& rChildWindow,
         vcl::Window* pParent,
         WinBits nBits);
-    virtual ~SidebarDockingWindow (void);
+    virtual ~SidebarDockingWindow();
 
-    virtual bool Close (void) SAL_OVERRIDE;
+    virtual bool Close() SAL_OVERRIDE;
 
 protected:
     // Window overridables
-    virtual void GetFocus (void) SAL_OVERRIDE;
+    virtual void GetFocus() SAL_OVERRIDE;
 
     virtual SfxChildAlignment CheckAlignment (
         SfxChildAlignment eCurrentAlignment,
@@ -53,7 +53,7 @@ protected:
 private:
     ::rtl::Reference<sfx2::sidebar::SidebarController> mpSidebarController;
 
-    void DoDispose (void);
+    void DoDispose();
 };
 
 } } // end of namespace sfx2::sidebar
diff --git a/sfx2/source/sidebar/SidebarPanelBase.cxx b/sfx2/source/sidebar/SidebarPanelBase.cxx
index a1b54dba617e..fbe51379f322 100644
--- a/sfx2/source/sidebar/SidebarPanelBase.cxx
+++ b/sfx2/source/sidebar/SidebarPanelBase.cxx
@@ -74,11 +74,11 @@ SidebarPanelBase::SidebarPanelBase (
     }
 }
 
-SidebarPanelBase::~SidebarPanelBase (void)
+SidebarPanelBase::~SidebarPanelBase()
 {
 }
 
-void SAL_CALL SidebarPanelBase::disposing (void)
+void SAL_CALL SidebarPanelBase::disposing()
     throw (css::uno::RuntimeException)
 {
     if (mpControl != NULL)
@@ -124,25 +124,25 @@ void SAL_CALL SidebarPanelBase::disposing (
     mpControl = NULL;
 }
 
-css::uno::Reference<css::frame::XFrame> SAL_CALL SidebarPanelBase::getFrame (void)
+css::uno::Reference<css::frame::XFrame> SAL_CALL SidebarPanelBase::getFrame()
     throw(css::uno::RuntimeException, std::exception)
 {
     return mxFrame;
 }
 
-::rtl::OUString SAL_CALL SidebarPanelBase::getResourceURL (void)
+::rtl::OUString SAL_CALL SidebarPanelBase::getResourceURL()
     throw(css::uno::RuntimeException, std::exception)
 {
     return msResourceURL;
 }
 
-sal_Int16 SAL_CALL SidebarPanelBase::getType (void)
+sal_Int16 SAL_CALL SidebarPanelBase::getType()
     throw(css::uno::RuntimeException, std::exception)
 {
     return ui::UIElementType::TOOLPANEL;
 }
 
-Reference<XInterface> SAL_CALL SidebarPanelBase::getRealInterface (void)
+Reference<XInterface> SAL_CALL SidebarPanelBase::getRealInterface()
     throw(css::uno::RuntimeException, std::exception)
 {
     return Reference<XInterface>(static_cast<XWeak*>(this));
@@ -158,7 +158,7 @@ Reference<accessibility::XAccessible> SAL_CALL SidebarPanelBase::createAccessibl
     return NULL;
 }
 
-Reference<awt::XWindow> SAL_CALL SidebarPanelBase::getWindow (void)
+Reference<awt::XWindow> SAL_CALL SidebarPanelBase::getWindow()
     throw(css::uno::RuntimeException, std::exception)
 {
     if (mpControl != NULL)
diff --git a/sfx2/source/sidebar/SidebarResource.hxx b/sfx2/source/sidebar/SidebarResource.hxx
index fb107a2ecb3a..3a6363a49b0d 100644
--- a/sfx2/source/sidebar/SidebarResource.hxx
+++ b/sfx2/source/sidebar/SidebarResource.hxx
@@ -26,8 +26,8 @@
 class SidebarResource : public Resource
 {
 public:
-    SidebarResource (void) : Resource(SfxResId(RID_SIDEBAR_RESOURCE)){}
-    ~SidebarResource (void) { FreeResource(); }
+    SidebarResource() : Resource(SfxResId(RID_SIDEBAR_RESOURCE)){}
+    ~SidebarResource() { FreeResource(); }
 };
 
 #endif
diff --git a/sfx2/source/sidebar/SidebarToolBox.cxx b/sfx2/source/sidebar/SidebarToolBox.cxx
index 023919f7cfbb..e1987fd8c9cc 100644
--- a/sfx2/source/sidebar/SidebarToolBox.cxx
+++ b/sfx2/source/sidebar/SidebarToolBox.cxx
@@ -55,7 +55,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSidebarToolBox(vcl::Wi
     return new SidebarToolBox(pParent);
 }
 
-SidebarToolBox::~SidebarToolBox (void)
+SidebarToolBox::~SidebarToolBox()
 {
     ControllerContainer aControllers;
     aControllers.swap(maControllers);
@@ -207,7 +207,7 @@ sal_uInt16 SidebarToolBox::GetItemIdForSubToolbarName (const OUString& rsSubTool
     return 0;
 }
 
-void SidebarToolBox::RegisterHandlers (void)
+void SidebarToolBox::RegisterHandlers()
 {
     if ( ! mbAreHandlersRegistered)
     {
diff --git a/sfx2/source/sidebar/TabBar.cxx b/sfx2/source/sidebar/TabBar.cxx
index d5196da235e4..7f63755b5b82 100644
--- a/sfx2/source/sidebar/TabBar.cxx
+++ b/sfx2/source/sidebar/TabBar.cxx
@@ -62,7 +62,7 @@ TabBar::TabBar (
 #endif
 }
 
-TabBar::~TabBar (void)
+TabBar::~TabBar()
 {
 }
 
@@ -77,7 +77,7 @@ void TabBar::Paint (const Rectangle& rUpdateArea)
         Point(GetSizePixel().Width()-nHorizontalPadding, mnMenuSeparatorY));
 }
 
-sal_Int32 TabBar::GetDefaultWidth (void)
+sal_Int32 TabBar::GetDefaultWidth()
 {
     return Theme::GetInteger(Theme::Int_TabItemWidth)
         + Theme::GetInteger(Theme::Int_TabBarLeftPadding)
@@ -128,7 +128,7 @@ void TabBar::SetDecks (
     Layout();
 }
 
-void TabBar::UpdateButtonIcons (void)
+void TabBar::UpdateButtonIcons()
 {
     Image aImage = Theme::GetImage(Theme::Image_TabBarMenu);
     if ( mpMenuButton->GetDPIScaleFactor() > 1 )
@@ -162,7 +162,7 @@ void TabBar::UpdateButtonIcons (void)
     Invalidate();
 }
 
-void TabBar::Layout (void)
+void TabBar::Layout()
 {
     const SvBorder aPadding (
         Theme::GetInteger(Theme::Int_TabBarLeftPadding),
@@ -295,7 +295,7 @@ void TabBar::ToggleHideFlag (const sal_Int32 nIndex)
     }
 }
 
-void TabBar::RestoreHideFlags (void)
+void TabBar::RestoreHideFlags()
 {
     bool bNeedsLayout (false);
     for(ItemContainer::iterator iItem(maItems.begin()),iEnd(maItems.end());
diff --git a/sfx2/source/sidebar/TabBar.hxx b/sfx2/source/sidebar/TabBar.hxx
index 97772749a1f3..a0c14ab0d4ff 100644
--- a/sfx2/source/sidebar/TabBar.hxx
+++ b/sfx2/source/sidebar/TabBar.hxx
@@ -67,13 +67,13 @@ public:
         const css::uno::Reference<css::frame::XFrame>& rxFrame,
         const ::boost::function<void(const ::rtl::OUString&rsDeckId)>& rDeckActivationFunctor,
         const PopupMenuProvider& rPopupMenuProvider);
-    virtual ~TabBar (void);
+    virtual ~TabBar();
 
     virtual void Paint (const Rectangle& rUpdateArea) SAL_OVERRIDE;
     virtual void DataChanged (const DataChangedEvent& rDataChangedEvent) SAL_OVERRIDE;
     virtual bool Notify (NotifyEvent& rEvent) SAL_OVERRIDE;
 
-    static sal_Int32 GetDefaultWidth (void);
+    static sal_Int32 GetDefaultWidth();
 
     void SetDecks (
         const ResourceManager::DeckContextDescriptorContainer& rDecks);
@@ -87,7 +87,7 @@ public:
         const sal_Int32 nFirstIndex);
     const ::rtl::OUString GetDeckIdForIndex (const sal_Int32 nIndex) const;
     void ToggleHideFlag (const sal_Int32 nIndex);
-    void RestoreHideFlags (void);
+    void RestoreHideFlags();
 
     void UpdateFocusManager (FocusManager& rFocusManager);
 
@@ -112,11 +112,11 @@ private:
 
     RadioButton* CreateTabItem (const DeckDescriptor& rDeckDescriptor);
     Image GetItemImage (const DeckDescriptor& rDeskDescriptor) const;
-    void Layout (void);
-    void UpdateButtonIcons (void);
+    void Layout();
+    void UpdateButtonIcons();
 
-    ::boost::shared_ptr<PopupMenu> CreatePopupMenu (void) const;
-    void ShowPopupMenu (void) const;
+    ::boost::shared_ptr<PopupMenu> CreatePopupMenu() const;
+    void ShowPopupMenu() const;
     DECL_LINK(OnToolboxClicked, void*);
 
 };
diff --git a/sfx2/source/sidebar/TabItem.cxx b/sfx2/source/sidebar/TabItem.cxx
index ec763a0250f9..476803bae488 100644
--- a/sfx2/source/sidebar/TabItem.cxx
+++ b/sfx2/source/sidebar/TabItem.cxx
@@ -42,7 +42,7 @@ TabItem::TabItem (vcl::Window* pParentWindow)
 #endif
 }
 
-TabItem::~TabItem (void)
+TabItem::~TabItem()
 {
 }
 
diff --git a/sfx2/source/sidebar/TabItem.hxx b/sfx2/source/sidebar/TabItem.hxx
index 4d9521143185..33fa016aceb3 100644
--- a/sfx2/source/sidebar/TabItem.hxx
+++ b/sfx2/source/sidebar/TabItem.hxx
@@ -34,7 +34,7 @@ class TabItem
 {
 public:
     TabItem (vcl::Window* pParentWindow);
-    virtual ~TabItem (void);
+    virtual ~TabItem();
 
     virtual void Paint (const Rectangle& rUpdateArea) SAL_OVERRIDE;
     virtual void MouseMove (const MouseEvent& rEvent) SAL_OVERRIDE;
diff --git a/sfx2/source/sidebar/Theme.cxx b/sfx2/source/sidebar/Theme.cxx
index c3596b13bca3..c93691e28254 100644
--- a/sfx2/source/sidebar/Theme.cxx
+++ b/sfx2/source/sidebar/Theme.cxx
@@ -56,7 +56,7 @@ Theme::Theme()
     SetupPropertyMaps();
 }
 
-Theme::~Theme (void)
+Theme::~Theme()
 {
 }
 
@@ -115,13 +115,13 @@ bool Theme::GetBoolean (const ThemeItem eItem)
     return rTheme.maBooleans[nIndex];
 }
 
-bool Theme::IsHighContrastMode (void)
+bool Theme::IsHighContrastMode()
 {
     const Theme& rTheme (GetCurrentTheme());
     return rTheme.mbIsHighContrastMode;
 }
 
-void Theme::HandleDataChange (void)
+void Theme::HandleDataChange()
 {
     Theme& rTheme (GetCurrentTheme());
 
@@ -135,7 +135,7 @@ void Theme::HandleDataChange (void)
     GetCurrentTheme().UpdateTheme();
 }
 
-void Theme::InitializeTheme (void)
+void Theme::InitializeTheme()
 {
     setPropertyValue(
         maPropertyIdToNameMap[Bool_UseSymphonyIcons],
@@ -145,7 +145,7 @@ void Theme::InitializeTheme (void)
         Any(false));
 }
 
-void Theme::UpdateTheme (void)
+void Theme::UpdateTheme()
 {
     SidebarResource aLocalResource;
 
@@ -387,7 +387,7 @@ void Theme::UpdateTheme (void)
     }
 }
 
-void SAL_CALL Theme::disposing (void)
+void SAL_CALL Theme::disposing()
 {
     ChangeListeners aListeners;
     aListeners.swap(maChangeListeners);
@@ -417,12 +417,12 @@ void SAL_CALL Theme::disposing (void)
     }
 }
 
-Reference<beans::XPropertySet> Theme::GetPropertySet (void)
+Reference<beans::XPropertySet> Theme::GetPropertySet()
 {
     return Reference<beans::XPropertySet>(static_cast<XWeak*>(&GetCurrentTheme()), UNO_QUERY);
 }
 
-Reference<beans::XPropertySetInfo> SAL_CALL Theme::getPropertySetInfo (void)
+Reference<beans::XPropertySetInfo> SAL_CALL Theme::getPropertySetInfo()
     throw(css::uno::RuntimeException, std::exception)
 {
     return Reference<beans::XPropertySetInfo>(this);
@@ -612,7 +612,7 @@ void SAL_CALL Theme::removeVetoableChangeListener(
     }
 }
 
-css::uno::Sequence<css::beans::Property> SAL_CALL Theme::getProperties (void)
+css::uno::Sequence<css::beans::Property> SAL_CALL Theme::getProperties()
     throw(css::uno::RuntimeException, std::exception)
 {
     ::std::vector<beans::Property> aProperties;
@@ -672,7 +672,7 @@ sal_Bool SAL_CALL Theme::hasPropertyByName (const ::rtl::OUString& rsPropertyNam
     return sal_True;
 }
 
-void Theme::SetupPropertyMaps (void)
+void Theme::SetupPropertyMaps()
 {
     maPropertyIdToNameMap.resize(__Post_Rect);
     maImages.resize(__Image_Color - __Pre_Image - 1);
diff --git a/sfx2/source/sidebar/TitleBar.cxx b/sfx2/source/sidebar/TitleBar.cxx
index fa9b8c23a1d7..ff5687336811 100644
--- a/sfx2/source/sidebar/TitleBar.cxx
+++ b/sfx2/source/sidebar/TitleBar.cxx
@@ -50,7 +50,7 @@ TitleBar::TitleBar (
     maToolBox.SetSelectHdl(LINK(this, TitleBar, SelectionHandler));
 }
 
-TitleBar::~TitleBar (void)
+TitleBar::~TitleBar()
 {
 }
 
@@ -113,7 +113,7 @@ void TitleBar::HandleToolBoxItemClick (const sal_uInt16 nItemIndex)
     // Any real processing has to be done in derived class.
 }
 
-css::uno::Reference<css::accessibility::XAccessible> TitleBar::CreateAccessible (void)
+css::uno::Reference<css::accessibility::XAccessible> TitleBar::CreateAccessible()
 {
     SetAccessibleRole(css::accessibility::AccessibleRole::PANEL);
     return AccessibleTitleBar::Create(*this);
diff --git a/sfx2/source/sidebar/TitleBar.hxx b/sfx2/source/sidebar/TitleBar.hxx
index cf50dfe74def..735eca4e25a3 100644
--- a/sfx2/source/sidebar/TitleBar.hxx
+++ b/sfx2/source/sidebar/TitleBar.hxx
@@ -34,7 +34,7 @@ public:
         const ::rtl::OUString& rsTitle,
         vcl::Window* pParentWindow,
         const sidebar::Paint& rInitialBackgroundPaint);
-    virtual ~TitleBar (void);
+    virtual ~TitleBar();
 
     void SetTitle (const ::rtl::OUString& rsTitle);
     void SetIcon (const Image& rIcon);
@@ -48,8 +48,8 @@ public:
         long nHeight,
         sal_uInt16 nFlags = WINDOW_POSSIZE_ALL) SAL_OVERRIDE;
 
-    ToolBox& GetToolBox (void) { return maToolBox;}
-    const ToolBox& GetToolBox (void) const { return maToolBox;}
+    ToolBox& GetToolBox() { return maToolBox;}
+    const ToolBox& GetToolBox() const { return maToolBox;}
 
 protected:
     SidebarToolBox maToolBox;
@@ -58,10 +58,10 @@ protected:
     virtual Rectangle GetTitleArea (const Rectangle& rTitleBarBox) = 0;
     virtual void PaintDecoration (const Rectangle& rTitleBarBox) = 0;
     void PaintFocus (const Rectangle& rFocusBox);
-    virtual sidebar::Paint GetBackgroundPaint (void) = 0;
-    virtual Color GetTextColor (void) = 0;
+    virtual sidebar::Paint GetBackgroundPaint() = 0;
+    virtual Color GetTextColor() = 0;
     virtual void HandleToolBoxItemClick (const sal_uInt16 nItemIndex);
-    virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible (void) SAL_OVERRIDE;
+    virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() SAL_OVERRIDE;
 
 private:
     Image maIcon;
diff --git a/sfx2/source/sidebar/ToolBox.hxx b/sfx2/source/sidebar/ToolBox.hxx
index 0742c5cb912d..834d7cb2b7a0 100644
--- a/sfx2/source/sidebar/ToolBox.hxx
+++ b/sfx2/source/sidebar/ToolBox.hxx
@@ -28,7 +28,7 @@ class ToolBox
 {
 public:
     MenuButton (vcl::Window* pParentWindow);
-    virtual ~MenuButton (void);
+    virtual ~MenuButton();
 
     virtual void Paint (const Rectangle& rUpdateArea);
     virtual void MouseMove (const MouseEvent& rEvent);
diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx
index e9fc0af43150..4bed8b2f3b59 100644
--- a/sfx2/source/view/sfxbasecontroller.cxx
+++ b/sfx2/source/view/sfxbasecontroller.cxx
@@ -211,7 +211,7 @@ public:
                             }
 
     virtual void SAL_CALL   start(const OUString& aText, sal_Int32 nRange) throw(RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual void SAL_CALL   end(void) throw(RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual void SAL_CALL   end() throw(RuntimeException, std::exception) SAL_OVERRIDE;
     virtual void SAL_CALL   setText(const OUString& aText) throw(RuntimeException, std::exception) SAL_OVERRIDE;
     virtual void SAL_CALL   setValue(sal_Int32 nValue) throw(RuntimeException, std::exception) SAL_OVERRIDE;
     virtual void SAL_CALL   reset() throw(RuntimeException, std::exception) SAL_OVERRIDE;
@@ -238,7 +238,7 @@ void SAL_CALL SfxStatusIndicator::start(const OUString& aText, sal_Int32 nRange)
     }
 }
 
-void SAL_CALL SfxStatusIndicator::end(void) throw(RuntimeException, std::exception)
+void SAL_CALL SfxStatusIndicator::end() throw(RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if ( xOwner.is() )