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

52 files changed, 220 insertions, 220 deletions

diff --git a/sd/source/ui/framework/configuration/ChangeRequestQueue.cxx b/sd/source/ui/framework/configuration/ChangeRequestQueue.cxx
index 4758f5ab828f..f41f4e7417ff 100644
--- a/sd/source/ui/framework/configuration/ChangeRequestQueue.cxx
+++ b/sd/source/ui/framework/configuration/ChangeRequestQueue.cxx
@@ -21,7 +21,7 @@
 
 namespace sd { namespace framework {
 
-ChangeRequestQueue::ChangeRequestQueue (void)
+ChangeRequestQueue::ChangeRequestQueue()
 {
 }
 
diff --git a/sd/source/ui/framework/configuration/ChangeRequestQueue.hxx b/sd/source/ui/framework/configuration/ChangeRequestQueue.hxx
index a9fbae6a5d8f..2792539b389e 100644
--- a/sd/source/ui/framework/configuration/ChangeRequestQueue.hxx
+++ b/sd/source/ui/framework/configuration/ChangeRequestQueue.hxx
@@ -37,7 +37,7 @@ class ChangeRequestQueue
 public:
     /** Create an empty queue.
     */
-    ChangeRequestQueue (void);
+    ChangeRequestQueue();
 };
 
 } } // end of namespace sd::framework
diff --git a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx
index 15a472007b5a..a8cf31ee5cd1 100644
--- a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx
+++ b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx
@@ -62,7 +62,7 @@ ChangeRequestQueueProcessor::ChangeRequestQueueProcessor (
 {
 }
 
-ChangeRequestQueueProcessor::~ChangeRequestQueueProcessor (void)
+ChangeRequestQueueProcessor::~ChangeRequestQueueProcessor()
 {
     if (mnUserEventId != 0)
         Application::RemoveUserEvent(mnUserEventId);
@@ -97,7 +97,7 @@ void ChangeRequestQueueProcessor::AddRequest (
     StartProcessing();
 }
 
-void ChangeRequestQueueProcessor::StartProcessing (void)
+void ChangeRequestQueueProcessor::StartProcessing()
 {
     ::osl::MutexGuard aGuard (maMutex);
 
@@ -130,7 +130,7 @@ IMPL_LINK(ChangeRequestQueueProcessor, ProcessEvent, void*, pUnused)
     return 0;
 }
 
-void ChangeRequestQueueProcessor::ProcessOneEvent (void)
+void ChangeRequestQueueProcessor::ProcessOneEvent()
 {
     ::osl::MutexGuard aGuard (maMutex);
 
@@ -169,18 +169,18 @@ void ChangeRequestQueueProcessor::ProcessOneEvent (void)
     }
 }
 
-bool ChangeRequestQueueProcessor::IsEmpty (void) const
+bool ChangeRequestQueueProcessor::IsEmpty() const
 {
     return maQueue.empty();
 }
 
-void ChangeRequestQueueProcessor::ProcessUntilEmpty (void)
+void ChangeRequestQueueProcessor::ProcessUntilEmpty()
 {
     while ( ! IsEmpty())
         ProcessOneEvent();
 }
 
-void ChangeRequestQueueProcessor::Clear (void)
+void ChangeRequestQueueProcessor::Clear()
 {
     ::osl::MutexGuard aGuard (maMutex);
     maQueue.clear();
diff --git a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx
index d58b1a676422..fa3b4d456b9c 100644
--- a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx
+++ b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx
@@ -57,7 +57,7 @@ public:
     ChangeRequestQueueProcessor (
         const ::rtl::Reference<ConfigurationController>& rxController,
         const ::boost::shared_ptr<ConfigurationUpdater>& rpUpdater);
-    ~ChangeRequestQueueProcessor (void);
+    ~ChangeRequestQueueProcessor();
 
     /** Sets the configuration who will be changed by subsequent change
         requests.  This method should be called only by the configuration
@@ -76,25 +76,25 @@ public:
 
     /** Returns </sal_True> when the queue is empty.
     */
-    bool IsEmpty (void) const;
+    bool IsEmpty() const;
 
     /** Process all events in the queue synchronously.
 
         <p>This method is typically called when the framework is shut down
         to establish an empty configuration.</p>
     */
-    void ProcessUntilEmpty (void);
+    void ProcessUntilEmpty();
 
     /** Process the first event in queue.
     */
-    void ProcessOneEvent (void);
+    void ProcessOneEvent();
 
     /** Remove all events from the queue.
 
         <p>This method is typically called when the framework is shut down
         to avoid the processing of still pending activation requests.</p>
     */
-    void Clear (void);
+    void Clear();
 
 private:
     mutable ::osl::Mutex maMutex;
@@ -117,7 +117,7 @@ private:
     /** Initiate the processing of the entries in the queue.  The actual
         processing starts asynchronously.
     */
-    void StartProcessing (void);
+    void StartProcessing();
 
     /** Callback function for the PostUserEvent() call.
     */
diff --git a/sd/source/ui/framework/configuration/Configuration.cxx b/sd/source/ui/framework/configuration/Configuration.cxx
index b25a33d0bb21..f64bcd5f9346 100644
--- a/sd/source/ui/framework/configuration/Configuration.cxx
+++ b/sd/source/ui/framework/configuration/Configuration.cxx
@@ -50,7 +50,7 @@ class Configuration::ResourceContainer
     : public ::std::set<Reference<XResourceId>, XResourceIdLess>
 {
 public:
-    ResourceContainer (void) {}
+    ResourceContainer() {}
 };
 
 //===== Configuration =========================================================
@@ -76,11 +76,11 @@ Configuration::Configuration (
 {
 }
 
-Configuration::~Configuration (void)
+Configuration::~Configuration()
 {
 }
 
-void SAL_CALL Configuration::disposing (void)
+void SAL_CALL Configuration::disposing()
 {
     ::osl::MutexGuard aGuard (maMutex);
     mpResourceContainer->clear();
@@ -188,7 +188,7 @@ sal_Bool SAL_CALL Configuration::hasResource (const Reference<XResourceId>& rxRe
 
 //----- XCloneable ------------------------------------------------------------
 
-Reference<util::XCloneable> SAL_CALL Configuration::createClone (void)
+Reference<util::XCloneable> SAL_CALL Configuration::createClone()
     throw (RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard (maMutex);
@@ -204,7 +204,7 @@ Reference<util::XCloneable> SAL_CALL Configuration::createClone (void)
 
 //----- XNamed ----------------------------------------------------------------
 
-OUString SAL_CALL Configuration::getName (void)
+OUString SAL_CALL Configuration::getName()
     throw (RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard (maMutex);
@@ -280,7 +280,7 @@ void Configuration::PostEvent (
     }
 }
 
-void Configuration::ThrowIfDisposed (void) const
+void Configuration::ThrowIfDisposed() const
     throw (::com::sun::star::lang::DisposedException)
 {
     if (rBHelper.bDisposed || rBHelper.bInDispose)
diff --git a/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx b/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx
index d970b447efd6..50d99322068e 100644
--- a/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx
@@ -38,7 +38,7 @@ ConfigurationClassifier::ConfigurationClassifier (
 {
 }
 
-bool ConfigurationClassifier::Partition (void)
+bool ConfigurationClassifier::Partition()
 {
     maC1minusC2.clear();
     maC2minusC1.clear();
diff --git a/sd/source/ui/framework/configuration/ConfigurationClassifier.hxx b/sd/source/ui/framework/configuration/ConfigurationClassifier.hxx
index b74a4487a946..da7038241e0b 100644
--- a/sd/source/ui/framework/configuration/ConfigurationClassifier.hxx
+++ b/sd/source/ui/framework/configuration/ConfigurationClassifier.hxx
@@ -51,7 +51,7 @@ public:
             When the two configurations differ then return <TRUE/>.  When
             they are equivalent then return <FALSE/>.
     */
-    bool Partition (void);
+    bool Partition();
 
     typedef ::std::vector<com::sun::star::uno::Reference<
         ::com::sun::star::drawing::framework::XResourceId> > ResourceIdVector;
@@ -64,7 +64,7 @@ public:
             returned.  This reference remains valid as long as the called
             ConfigurationClassifier object stays alive.
     */
-    const ResourceIdVector& GetC1minusC2 (void) const { return maC1minusC2;}
+    const ResourceIdVector& GetC1minusC2() const { return maC1minusC2;}
 
     /** Return the resources that belong to the configuration given as
         rxConfiguration2 to the constructor but that do not belong to
@@ -74,7 +74,7 @@ public:
             returned.  This reference remains valid as long as the called
             ConfigurationClassifier object stays alive.
     */
-    const ResourceIdVector& GetC2minusC1 (void) const { return maC2minusC1;}
+    const ResourceIdVector& GetC2minusC1() const { return maC2minusC1;}
 
     /** Return the resources that belong to both the configurations that
         where given to the constructor.
@@ -83,7 +83,7 @@ public:
             returned.  This reference remains valid as long as the called
             ConfigurationClassifier object stays alive.
     */
-    const ResourceIdVector& GetC1andC2 (void) const { return maC1andC2;}
+    const ResourceIdVector& GetC1andC2() const { return maC1andC2;}
 
     void TraceResourceIdVector (
         const sal_Char* pMessage,
diff --git a/sd/source/ui/framework/configuration/ConfigurationController.cxx b/sd/source/ui/framework/configuration/ConfigurationController.cxx
index e0744a417f32..e2ecae03f79d 100644
--- a/sd/source/ui/framework/configuration/ConfigurationController.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationController.cxx
@@ -52,7 +52,7 @@ public:
     Implementation (
         ConfigurationController& rController,
         const Reference<frame::XController>& rxController);
-    ~Implementation (void);
+    ~Implementation();
 
     Reference<XControllerManager> mxControllerManager;
 
@@ -97,7 +97,7 @@ ConfigurationController::Lock::Lock (const Reference<XConfigurationController>&
         mxController->lock();
 }
 
-ConfigurationController::Lock::~Lock (void)
+ConfigurationController::Lock::~Lock()
 {
     if (mxController.is())
         mxController->unlock();
@@ -105,18 +105,18 @@ ConfigurationController::Lock::~Lock (void)
 
 //===== ConfigurationController ===============================================
 
-ConfigurationController::ConfigurationController (void) throw()
+ConfigurationController::ConfigurationController() throw()
     : ConfigurationControllerInterfaceBase(MutexOwner::maMutex)
     , mpImplementation()
     , mbIsDisposed(false)
 {
 }
 
-ConfigurationController::~ConfigurationController (void) throw()
+ConfigurationController::~ConfigurationController() throw()
 {
 }
 
-void SAL_CALL ConfigurationController::disposing (void)
+void SAL_CALL ConfigurationController::disposing()
 {
     if (mpImplementation.get() == NULL)
         return;
@@ -148,7 +148,7 @@ void SAL_CALL ConfigurationController::disposing (void)
     mpImplementation.reset();
 }
 
-void ConfigurationController::ProcessEvent (void)
+void ConfigurationController::ProcessEvent()
 {
     if (mpImplementation.get() != NULL)
     {
@@ -158,7 +158,7 @@ void ConfigurationController::ProcessEvent (void)
     }
 }
 
-void ConfigurationController::RequestSynchronousUpdate (void)
+void ConfigurationController::RequestSynchronousUpdate()
 {
     if (mpImplementation.get() == NULL)
         return;
@@ -217,7 +217,7 @@ void SAL_CALL ConfigurationController::lock()
             = mpImplementation->mpConfigurationUpdater->GetLock();
 }
 
-void SAL_CALL ConfigurationController::unlock (void)
+void SAL_CALL ConfigurationController::unlock()
     throw (RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard (maMutex);
@@ -342,7 +342,7 @@ Reference<XResource> SAL_CALL ConfigurationController::getResource (
     return aDescriptor.mxResource;
 }
 
-void SAL_CALL ConfigurationController::update (void)
+void SAL_CALL ConfigurationController::update()
     throw (RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard (maMutex);
@@ -361,7 +361,7 @@ void SAL_CALL ConfigurationController::update (void)
     }
 }
 
-sal_Bool SAL_CALL ConfigurationController::hasPendingRequests (void)
+sal_Bool SAL_CALL ConfigurationController::hasPendingRequests()
     throw (RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard (maMutex);
@@ -380,7 +380,7 @@ void SAL_CALL ConfigurationController::postChangeRequest (
     mpImplementation->mpQueueProcessor->AddRequest(rxRequest);
 }
 
-Reference<XConfiguration> SAL_CALL ConfigurationController::getRequestedConfiguration (void)
+Reference<XConfiguration> SAL_CALL ConfigurationController::getRequestedConfiguration()
     throw (RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard (maMutex);
@@ -393,7 +393,7 @@ Reference<XConfiguration> SAL_CALL ConfigurationController::getRequestedConfigur
         return Reference<XConfiguration>();
 }
 
-Reference<XConfiguration> SAL_CALL ConfigurationController::getCurrentConfiguration (void)
+Reference<XConfiguration> SAL_CALL ConfigurationController::getCurrentConfiguration()
     throw (RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard (maMutex);
@@ -563,7 +563,7 @@ ConfigurationController::Implementation::Implementation (
     mpQueueProcessor->SetConfiguration(mxRequestedConfiguration);
 }
 
-ConfigurationController::Implementation::~Implementation (void)
+ConfigurationController::Implementation::~Implementation()
 {
 }
 
diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx
index fbe1ed0c13c3..5ee7f9d15780 100644
--- a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx
@@ -147,7 +147,7 @@ void ConfigurationControllerBroadcaster::NotifyListeners (
     }
 }
 
-void ConfigurationControllerBroadcaster::DisposeAndClear (void)
+void ConfigurationControllerBroadcaster::DisposeAndClear()
 {
     lang::EventObject aEvent;
     aEvent.Source = mxConfigurationController;
diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx
index 6b801500e070..049a8703ac0b 100644
--- a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx
+++ b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx
@@ -104,7 +104,7 @@ public:
         the list of registered listeners is empty.  Further calls to
         RemoveListener() are not necessary but do not result in an error.
     */
-    void DisposeAndClear (void);
+    void DisposeAndClear();
 
 private:
     css::uno::Reference<
diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx
index d7a04442539c..5e0e92864b15 100644
--- a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx
@@ -43,7 +43,7 @@ ConfigurationControllerResourceManager::ConfigurationControllerResourceManager (
 {
 }
 
-ConfigurationControllerResourceManager::~ConfigurationControllerResourceManager (void)
+ConfigurationControllerResourceManager::~ConfigurationControllerResourceManager()
 {
 }
 
diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.hxx b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.hxx
index ccfcf3f0bfe8..727365574207 100644
--- a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.hxx
+++ b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.hxx
@@ -61,7 +61,7 @@ public:
         const ::boost::shared_ptr<ResourceFactoryManager>& rpResourceFactoryContainer,
         const ::boost::shared_ptr<ConfigurationControllerBroadcaster>& rpBroadcaster);
 
-    ~ConfigurationControllerResourceManager (void);
+    ~ConfigurationControllerResourceManager();
 
     /** Activate all the resources that are specified by resource ids in
         rResources.  The resource ids of activated resources are added to
diff --git a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx
index 10ea9201038f..5cc3a3a2fad8 100644
--- a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx
@@ -52,7 +52,7 @@ class ConfigurationUpdaterLock
 public:
     ConfigurationUpdaterLock (ConfigurationUpdater& rUpdater)
         : mrUpdater(rUpdater) { mrUpdater.LockUpdates(); }
-    ~ConfigurationUpdaterLock(void) { mrUpdater.UnlockUpdates(); }
+    ~ConfigurationUpdaterLock() { mrUpdater.UnlockUpdates(); }
 private:
     ConfigurationUpdater& mrUpdater;
 };
@@ -82,7 +82,7 @@ ConfigurationUpdater::ConfigurationUpdater (
     SetControllerManager(rxControllerManager);
 }
 
-ConfigurationUpdater::~ConfigurationUpdater (void)
+ConfigurationUpdater::~ConfigurationUpdater()
 {
     maUpdateTimer.Stop();
 }
@@ -118,7 +118,7 @@ void ConfigurationUpdater::RequestUpdate (
     }
 }
 
-bool ConfigurationUpdater::IsUpdatePossible (void)
+bool ConfigurationUpdater::IsUpdatePossible()
 {
     return ! mbUpdateBeingProcessed
         && mxControllerManager.is()
@@ -127,7 +127,7 @@ bool ConfigurationUpdater::IsUpdatePossible (void)
         && mxCurrentConfiguration.is();
 }
 
-void ConfigurationUpdater::UpdateConfiguration (void)
+void ConfigurationUpdater::UpdateConfiguration()
 {
     SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": UpdateConfiguration update");
     SetUpdateBeingProcessed(true);
@@ -192,7 +192,7 @@ void ConfigurationUpdater::UpdateConfiguration (void)
     SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": UpdateConfiguration end");
 }
 
-void ConfigurationUpdater::CleanRequestedConfiguration (void)
+void ConfigurationUpdater::CleanRequestedConfiguration()
 {
     if (mxControllerManager.is())
     {
@@ -211,7 +211,7 @@ void ConfigurationUpdater::CleanRequestedConfiguration (void)
     }
 }
 
-void ConfigurationUpdater::CheckUpdateSuccess (void)
+void ConfigurationUpdater::CheckUpdateSuccess()
 {
     // When the two configurations differ then start the timer to call
     // another update later.
@@ -341,12 +341,12 @@ void ConfigurationUpdater::CheckPureAnchors (
     }
 }
 
-void ConfigurationUpdater::LockUpdates (void)
+void ConfigurationUpdater::LockUpdates()
 {
     ++mnLockCount;
 }
 
-void ConfigurationUpdater::UnlockUpdates (void)
+void ConfigurationUpdater::UnlockUpdates()
 {
     --mnLockCount;
     if (mnLockCount == 0 && mbUpdatePending)
@@ -355,7 +355,7 @@ void ConfigurationUpdater::UnlockUpdates (void)
     }
 }
 
-::boost::shared_ptr<ConfigurationUpdaterLock> ConfigurationUpdater::GetLock (void)
+::boost::shared_ptr<ConfigurationUpdaterLock> ConfigurationUpdater::GetLock()
 {
     return ::boost::shared_ptr<ConfigurationUpdaterLock>(new ConfigurationUpdaterLock(*this));
 }
diff --git a/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx b/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx
index bde705ff32af..8c25b7575387 100644
--- a/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx
+++ b/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx
@@ -53,7 +53,7 @@ public:
         const ::boost::shared_ptr<ConfigurationControllerResourceManager>& rpResourceManager,
         const css::uno::Reference<
             css::drawing::framework::XControllerManager>& rxControllerManager);
-    ~ConfigurationUpdater (void);
+    ~ConfigurationUpdater();
 
     /** This method is typically called once, when the controller manager is
         accessible to the caller.
@@ -72,14 +72,14 @@ public:
         css::drawing::framework::XConfiguration>& rxRequestedConfiguration);
 
     css::uno::Reference<
-        css::drawing::framework::XConfiguration> GetCurrentConfiguration (void) const { return mxCurrentConfiguration;}
+        css::drawing::framework::XConfiguration> GetCurrentConfiguration() const { return mxCurrentConfiguration;}
 
     friend class ConfigurationUpdaterLock;
     /** Return a lock of the called ConfigurationUpdater.  While the
         returned object exists no update of the current configuration is
         made.
     */
-    ::boost::shared_ptr<ConfigurationUpdaterLock> GetLock (void);
+    ::boost::shared_ptr<ConfigurationUpdaterLock> GetLock();
 
 private:
     /** A reference to the XControllerManager is kept so that
@@ -146,7 +146,7 @@ private:
         and tells them to update their active resources.  It notifies
         listeners about the start and end of the configuration update.
     */
-    void UpdateConfiguration (void);
+    void UpdateConfiguration();
 
     /** Basically calls UpdaterStart() andUpdateEnd() and makes some debug
         output.
@@ -167,12 +167,12 @@ private:
         because without the actual resource the 'pureness' of an anchor can
         not be determined.
     */
-    void CleanRequestedConfiguration (void);
+    void CleanRequestedConfiguration();
 
     /** Check the success of a recently executed configuration update.
         When the update failed then start the timer.
     */
-    void CheckUpdateSuccess (void);
+    void CheckUpdateSuccess();
 
     /** This method sets the mbUpdateBeingProcessed member that is used to
         prevent reentrance problems.  This method allows function objects
@@ -185,17 +185,17 @@ private:
         executed, the lock count, and whether the configuration controller
         is still valid.
     */
-    bool IsUpdatePossible (void);
+    bool IsUpdatePossible();
 
     /** Lock updates of the current configuration.  For intermediate requests
         for updates mbUpdatePending is set to <TRUE/>.
     */
-    void LockUpdates (void);
+    void LockUpdates();
 
     /** When an update was requested since the last LockUpdates() call then
         RequestUpdate() is called.
     */
-    void UnlockUpdates (void);
+    void UnlockUpdates();
 
     DECL_LINK(TimeoutHandler, void *);
 };
diff --git a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx
index 6653a3409550..c4f569109684 100644
--- a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx
+++ b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx
@@ -38,7 +38,7 @@ GenericConfigurationChangeRequest::GenericConfigurationChangeRequest (
         throw ::com::sun::star::lang::IllegalArgumentException();
 }
 
-GenericConfigurationChangeRequest::~GenericConfigurationChangeRequest (void) throw()
+GenericConfigurationChangeRequest::~GenericConfigurationChangeRequest() throw()
 {
 }
 
@@ -61,7 +61,7 @@ void SAL_CALL GenericConfigurationChangeRequest::execute (
     }
 }
 
-OUString SAL_CALL GenericConfigurationChangeRequest::getName (void)
+OUString SAL_CALL GenericConfigurationChangeRequest::getName()
     throw (RuntimeException, std::exception)
 {
     return "GenericConfigurationChangeRequest "
diff --git a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx
index 1eb507da9f30..36bdacdb34a9 100644
--- a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx
+++ b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx
@@ -70,7 +70,7 @@ public:
         const Mode eMode)
         throw (::com::sun::star::lang::IllegalArgumentException);
 
-    virtual ~GenericConfigurationChangeRequest (void) throw();
+    virtual ~GenericConfigurationChangeRequest() throw();
 
     // XConfigurationChangeOperation
 
@@ -91,7 +91,7 @@ public:
     /** Return a human readable string representation.  This is used for
         debugging purposes.
     */
-    virtual OUString SAL_CALL getName (void)
+    virtual OUString SAL_CALL getName()
         throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     /** This call is ignored because the XNamed interface is (mis)used to
diff --git a/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx b/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx
index 7602b0847cdb..e3a7cd911783 100644
--- a/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx
+++ b/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx
@@ -48,7 +48,7 @@ ResourceFactoryManager::ResourceFactoryManager (const Reference<XControllerManag
     mxURLTransformer = util::URLTransformer::create(xContext);
 }
 
-ResourceFactoryManager::~ResourceFactoryManager (void)
+ResourceFactoryManager::~ResourceFactoryManager()
 {
     Reference<lang::XComponent> xComponent (mxURLTransformer, UNO_QUERY);
     if (xComponent.is())
diff --git a/sd/source/ui/framework/configuration/ResourceFactoryManager.hxx b/sd/source/ui/framework/configuration/ResourceFactoryManager.hxx
index 3087051118f1..dcb24835f1fc 100644
--- a/sd/source/ui/framework/configuration/ResourceFactoryManager.hxx
+++ b/sd/source/ui/framework/configuration/ResourceFactoryManager.hxx
@@ -42,7 +42,7 @@ public:
     ResourceFactoryManager (
         const css::uno::Reference<css::drawing::framework::XControllerManager>& rxManager);
 
-    ~ResourceFactoryManager (void);
+    ~ResourceFactoryManager();
 
     /** Register a resource factory for one type of resource.
         @param rsURL
diff --git a/sd/source/ui/framework/configuration/ResourceId.cxx b/sd/source/ui/framework/configuration/ResourceId.cxx
index 1aef100bf4c7..3f343c989069 100644
--- a/sd/source/ui/framework/configuration/ResourceId.cxx
+++ b/sd/source/ui/framework/configuration/ResourceId.cxx
@@ -47,7 +47,7 @@ namespace sd { namespace framework {
 
 WeakReference<util::XURLTransformer> ResourceId::mxURLTransformerWeak;
 
-ResourceId::ResourceId (void)
+ResourceId::ResourceId()
     : ResourceIdInterfaceBase(),
       maResourceURLs(0),
       mpURL()
@@ -102,13 +102,13 @@ ResourceId::ResourceId (
     ParseResourceURL();
 }
 
-ResourceId::~ResourceId (void)
+ResourceId::~ResourceId()
 {
     mpURL.reset();
 }
 
 OUString SAL_CALL
-    ResourceId::getResourceURL (void)
+    ResourceId::getResourceURL()
     throw(com::sun::star::uno::RuntimeException, std::exception)
 {
     if (!maResourceURLs.empty())
@@ -118,7 +118,7 @@ OUString SAL_CALL
 }
 
 util::URL SAL_CALL
-    ResourceId::getFullResourceURL (void)
+    ResourceId::getFullResourceURL()
  throw(com::sun::star::uno::RuntimeException, std::exception)
 {
     if (mpURL.get() != NULL)
@@ -140,14 +140,14 @@ util::URL SAL_CALL
 }
 
 sal_Bool SAL_CALL
-    ResourceId::hasAnchor (void)
+    ResourceId::hasAnchor()
     throw (RuntimeException, std::exception)
 {
     return maResourceURLs.size()>1;
 }
 
 Reference<XResourceId> SAL_CALL
-    ResourceId::getAnchor (void)
+    ResourceId::getAnchor()
     throw (RuntimeException, std::exception)
 {
     ::rtl::Reference<ResourceId> rResourceId (new ResourceId());
@@ -162,7 +162,7 @@ Reference<XResourceId> SAL_CALL
 }
 
 Sequence<OUString> SAL_CALL
-    ResourceId::getAnchorURLs (void)
+    ResourceId::getAnchorURLs()
     throw (RuntimeException, std::exception)
 {
     const sal_Int32 nAnchorCount (maResourceURLs.size() - 1);
@@ -178,7 +178,7 @@ Sequence<OUString> SAL_CALL
 }
 
 OUString SAL_CALL
-    ResourceId::getResourceTypePrefix (void)
+    ResourceId::getResourceTypePrefix()
     throw (RuntimeException, std::exception)
 {
     if (!maResourceURLs.empty() )
@@ -361,7 +361,7 @@ sal_Bool SAL_CALL
 }
 
 Reference<XResourceId> SAL_CALL
-    ResourceId::clone (void)
+    ResourceId::clone()
     throw(RuntimeException, std::exception)
 {
     return new ResourceId(maResourceURLs);
@@ -492,7 +492,7 @@ bool ResourceId::IsBoundToAnchor (
     return true;
 }
 
-void ResourceId::ParseResourceURL (void)
+void ResourceId::ParseResourceURL()
 {
     ::osl::Guard< ::osl::Mutex > aGuard (::osl::Mutex::getGlobalMutex());
     Reference<util::XURLTransformer> xURLTransformer (mxURLTransformerWeak);
diff --git a/sd/source/ui/framework/configuration/UpdateRequest.cxx b/sd/source/ui/framework/configuration/UpdateRequest.cxx
index 332c8a25b5f6..10142f9b1501 100644
--- a/sd/source/ui/framework/configuration/UpdateRequest.cxx
+++ b/sd/source/ui/framework/configuration/UpdateRequest.cxx
@@ -27,13 +27,13 @@ using namespace ::com::sun::star::drawing::framework;
 
 namespace sd { namespace framework {
 
-UpdateRequest::UpdateRequest (void)
+UpdateRequest::UpdateRequest()
     throw()
     : UpdateRequestInterfaceBase(MutexOwner::maMutex)
 {
 }
 
-UpdateRequest::~UpdateRequest (void) throw()
+UpdateRequest::~UpdateRequest() throw()
 {
 }
 
@@ -45,7 +45,7 @@ void SAL_CALL UpdateRequest::execute (const Reference<XConfiguration>& rxConfigu
     // becomes empty.
 }
 
-OUString SAL_CALL UpdateRequest::getName (void)
+OUString SAL_CALL UpdateRequest::getName()
     throw (RuntimeException, std::exception)
 {
     return OUString("UpdateRequest");
diff --git a/sd/source/ui/framework/configuration/UpdateRequest.hxx b/sd/source/ui/framework/configuration/UpdateRequest.hxx
index b6461ae31205..cd597028ba91 100644
--- a/sd/source/ui/framework/configuration/UpdateRequest.hxx
+++ b/sd/source/ui/framework/configuration/UpdateRequest.hxx
@@ -50,8 +50,8 @@ class UpdateRequest
       public UpdateRequestInterfaceBase
 {
 public:
-    UpdateRequest (void) throw();
-    virtual ~UpdateRequest (void) throw();
+    UpdateRequest() throw();
+    virtual ~UpdateRequest() throw();
 
     // XConfigurationChangeOperation
 
@@ -65,7 +65,7 @@ public:
     /** Return a human readable string representation.  This is used for
         debugging purposes.
     */
-    virtual OUString SAL_CALL getName (void)
+    virtual OUString SAL_CALL getName()
         throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     /** This call is ignored because the XNamed interface is (mis)used to
diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.cxx b/sd/source/ui/framework/factories/BasicPaneFactory.cxx
index e0e30c7971ae..9d9c7959e0b2 100644
--- a/sd/source/ui/framework/factories/BasicPaneFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicPaneFactory.cxx
@@ -81,7 +81,7 @@ class BasicPaneFactory::PaneContainer
     : public ::std::vector<PaneDescriptor>
 {
 public:
-    PaneContainer (void) {}
+    PaneContainer() {}
 };
 
 //===== PaneFactory ===========================================================
@@ -96,11 +96,11 @@ BasicPaneFactory::BasicPaneFactory (
 {
 }
 
-BasicPaneFactory::~BasicPaneFactory (void)
+BasicPaneFactory::~BasicPaneFactory()
 {
 }
 
-void SAL_CALL BasicPaneFactory::disposing (void)
+void SAL_CALL BasicPaneFactory::disposing()
 {
     Reference<XConfigurationController> xCC (mxConfigurationControllerWeak);
     if (xCC.is())
@@ -427,7 +427,7 @@ Reference<XResource> BasicPaneFactory::CreateChildWindowPane (
     return xPane;
 }
 
-void BasicPaneFactory::ThrowIfDisposed (void) const
+void BasicPaneFactory::ThrowIfDisposed() const
     throw (lang::DisposedException)
 {
     if (rBHelper.bDisposed || rBHelper.bInDispose)
diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.hxx b/sd/source/ui/framework/factories/BasicPaneFactory.hxx
index b7752de26b68..f5700d706f24 100644
--- a/sd/source/ui/framework/factories/BasicPaneFactory.hxx
+++ b/sd/source/ui/framework/factories/BasicPaneFactory.hxx
@@ -67,9 +67,9 @@ class BasicPaneFactory
 public:
     BasicPaneFactory (
         const css::uno::Reference<css::uno::XComponentContext>& rxContext);
-    virtual ~BasicPaneFactory (void);
+    virtual ~BasicPaneFactory();
 
-    virtual void SAL_CALL disposing (void) SAL_OVERRIDE;
+    virtual void SAL_CALL disposing() SAL_OVERRIDE;
 
     // XInitialization
 
@@ -138,7 +138,7 @@ private:
                 css::drawing::framework::XResourceId>& rxPaneId,
             const PaneDescriptor& rDescriptor);
 
-    void ThrowIfDisposed (void) const
+    void ThrowIfDisposed() const
         throw (css::lang::DisposedException);
 };
 
diff --git a/sd/source/ui/framework/factories/BasicToolBarFactory.cxx b/sd/source/ui/framework/factories/BasicToolBarFactory.cxx
index 2ac67314ff7a..7ae9508d906a 100644
--- a/sd/source/ui/framework/factories/BasicToolBarFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicToolBarFactory.cxx
@@ -46,16 +46,16 @@ BasicToolBarFactory::BasicToolBarFactory (
     (void)rxContext;
 }
 
-BasicToolBarFactory::~BasicToolBarFactory (void)
+BasicToolBarFactory::~BasicToolBarFactory()
 {
 }
 
-void SAL_CALL BasicToolBarFactory::disposing (void)
+void SAL_CALL BasicToolBarFactory::disposing()
 {
     Shutdown();
 }
 
-void BasicToolBarFactory::Shutdown (void)
+void BasicToolBarFactory::Shutdown()
 {
     mpViewShellBase = NULL;
     Reference<lang::XComponent> xComponent (mxConfigurationController, UNO_QUERY);
@@ -161,7 +161,7 @@ void SAL_CALL BasicToolBarFactory::releaseResource (
         xComponent->dispose();
 }
 
-void BasicToolBarFactory::ThrowIfDisposed (void) const
+void BasicToolBarFactory::ThrowIfDisposed() const
     throw (lang::DisposedException)
 {
     if (rBHelper.bDisposed || rBHelper.bInDispose)
diff --git a/sd/source/ui/framework/factories/BasicToolBarFactory.hxx b/sd/source/ui/framework/factories/BasicToolBarFactory.hxx
index 5442f4e19051..024af69fc134 100644
--- a/sd/source/ui/framework/factories/BasicToolBarFactory.hxx
+++ b/sd/source/ui/framework/factories/BasicToolBarFactory.hxx
@@ -58,9 +58,9 @@ class BasicToolBarFactory
 public:
     BasicToolBarFactory (
         const css::uno::Reference<com::sun::star::uno::XComponentContext>& rxContext);
-    virtual ~BasicToolBarFactory (void);
+    virtual ~BasicToolBarFactory();
 
-    virtual void SAL_CALL disposing (void) SAL_OVERRIDE;
+    virtual void SAL_CALL disposing() SAL_OVERRIDE;
 
     // ToolBarFactory
 
@@ -93,9 +93,9 @@ private:
     css::uno::Reference<css::frame::XController> mxController;
     ViewShellBase* mpViewShellBase;
 
-    void Shutdown (void);
+    void Shutdown();
 
-    void ThrowIfDisposed (void) const
+    void ThrowIfDisposed() const
         throw (css::lang::DisposedException);
 };
 
diff --git a/sd/source/ui/framework/factories/BasicViewFactory.cxx b/sd/source/ui/framework/factories/BasicViewFactory.cxx
index 10fe98d14b2d..21be69f667a8 100644
--- a/sd/source/ui/framework/factories/BasicViewFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicViewFactory.cxx
@@ -72,14 +72,14 @@ class BasicViewFactory::ViewShellContainer
     : public ::std::vector<boost::shared_ptr<ViewDescriptor> >
 {
 public:
-    ViewShellContainer (void) {};
+    ViewShellContainer() {};
 };
 
 class BasicViewFactory::ViewCache
     : public ::std::vector<boost::shared_ptr<ViewDescriptor> >
 {
 public:
-    ViewCache (void) {};
+    ViewCache() {};
 };
 
 //===== ViewFactory ===========================================================
@@ -98,11 +98,11 @@ BasicViewFactory::BasicViewFactory (
     (void)rxContext;
 }
 
-BasicViewFactory::~BasicViewFactory (void)
+BasicViewFactory::~BasicViewFactory()
 {
 }
 
-void SAL_CALL BasicViewFactory::disposing (void)
+void SAL_CALL BasicViewFactory::disposing()
 {
     // Disconnect from the frame view.
     if (mpFrameView != NULL)
diff --git a/sd/source/ui/framework/factories/BasicViewFactory.hxx b/sd/source/ui/framework/factories/BasicViewFactory.hxx
index fa62d325b17d..6d6d89591fa3 100644
--- a/sd/source/ui/framework/factories/BasicViewFactory.hxx
+++ b/sd/source/ui/framework/factories/BasicViewFactory.hxx
@@ -73,9 +73,9 @@ class BasicViewFactory
 public:
     BasicViewFactory (
         const css::uno::Reference<css::uno::XComponentContext>& rxContext);
-    virtual ~BasicViewFactory (void);
+    virtual ~BasicViewFactory();
 
-    virtual void SAL_CALL disposing (void) SAL_OVERRIDE;
+    virtual void SAL_CALL disposing() SAL_OVERRIDE;
 
     // XViewFactory
 
diff --git a/sd/source/ui/framework/factories/ChildWindowPane.cxx b/sd/source/ui/framework/factories/ChildWindowPane.cxx
index 7e6da77b9cbf..69e79836ba6f 100644
--- a/sd/source/ui/framework/factories/ChildWindowPane.cxx
+++ b/sd/source/ui/framework/factories/ChildWindowPane.cxx
@@ -88,11 +88,11 @@ ChildWindowPane::ChildWindowPane (
     }
 }
 
-ChildWindowPane::~ChildWindowPane (void)
+ChildWindowPane::~ChildWindowPane()
 {
 }
 
-void ChildWindowPane::Hide (void)
+void ChildWindowPane::Hide()
 {
     SfxViewFrame* pViewFrame = mrViewShellBase.GetViewFrame();
     if (pViewFrame != NULL)
@@ -105,7 +105,7 @@ void ChildWindowPane::Hide (void)
     mxWindow = NULL;
 }
 
-void SAL_CALL ChildWindowPane::disposing (void)
+void SAL_CALL ChildWindowPane::disposing()
 {
     ::osl::MutexGuard aGuard (maMutex);
 
@@ -120,7 +120,7 @@ void SAL_CALL ChildWindowPane::disposing (void)
     Pane::disposing();
 }
 
-::vcl::Window* ChildWindowPane::GetWindow (void)
+::vcl::Window* ChildWindowPane::GetWindow()
 {
     do
     {
@@ -185,7 +185,7 @@ void SAL_CALL ChildWindowPane::disposing (void)
     return mpWindow;
 }
 
-Reference<awt::XWindow> SAL_CALL ChildWindowPane::getWindow (void)
+Reference<awt::XWindow> SAL_CALL ChildWindowPane::getWindow()
     throw (RuntimeException, std::exception)
 {
     if (mpWindow == NULL || ! mxWindow.is())
diff --git a/sd/source/ui/framework/factories/ChildWindowPane.hxx b/sd/source/ui/framework/factories/ChildWindowPane.hxx
index a4725002bbdc..ba83dfb53edb 100644
--- a/sd/source/ui/framework/factories/ChildWindowPane.hxx
+++ b/sd/source/ui/framework/factories/ChildWindowPane.hxx
@@ -57,13 +57,13 @@ public:
         sal_uInt16 nChildWindowId,
         ViewShellBase& rViewShellBase,
         ::std::unique_ptr<SfxShell> && pShell);
-    virtual ~ChildWindowPane (void);
+    virtual ~ChildWindowPane();
 
     /** Hide the pane.  To make the pane visible again, call GetWindow().
     */
-    void Hide (void);
+    void Hide();
 
-    virtual void SAL_CALL disposing (void) SAL_OVERRIDE;
+    virtual void SAL_CALL disposing() SAL_OVERRIDE;
 
     /** This returns the content window when the child window is already
         visible.  Otherwise <NULL/> is returned.  In that case a later call
@@ -72,13 +72,13 @@ public:
         Note that GetWindow() may return different Window pointers when
         Hide() is called in between.
     */
-    virtual vcl::Window* GetWindow (void) SAL_OVERRIDE;
+    virtual vcl::Window* GetWindow() SAL_OVERRIDE;
 
     /** The local getWindow() first calls GetWindow() to provide a valid
         window pointer before forwarding the call to the base class.
     */
     virtual ::com::sun::star::uno::Reference<com::sun::star::awt::XWindow>
-        SAL_CALL getWindow (void)
+        SAL_CALL getWindow()
         throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     DECLARE_XINTERFACE()
diff --git a/sd/source/ui/framework/factories/FrameWindowPane.cxx b/sd/source/ui/framework/factories/FrameWindowPane.cxx
index 82af2666733b..c30d5860ed7b 100644
--- a/sd/source/ui/framework/factories/FrameWindowPane.cxx
+++ b/sd/source/ui/framework/factories/FrameWindowPane.cxx
@@ -32,11 +32,11 @@ FrameWindowPane::FrameWindowPane (
 {
 }
 
-FrameWindowPane::~FrameWindowPane (void) throw()
+FrameWindowPane::~FrameWindowPane() throw()
 {
 }
 
-sal_Bool SAL_CALL FrameWindowPane::isAnchorOnly (void)
+sal_Bool SAL_CALL FrameWindowPane::isAnchorOnly()
     throw (RuntimeException, std::exception)
 {
     return false;
diff --git a/sd/source/ui/framework/factories/FrameWindowPane.hxx b/sd/source/ui/framework/factories/FrameWindowPane.hxx
index 836c2f77929f..cc77ac7f5d28 100644
--- a/sd/source/ui/framework/factories/FrameWindowPane.hxx
+++ b/sd/source/ui/framework/factories/FrameWindowPane.hxx
@@ -37,13 +37,13 @@ public:
         const ::com::sun::star::uno::Reference<
             com::sun::star::drawing::framework::XResourceId>& rxPaneId,
         vcl::Window* pWindow);
-    virtual ~FrameWindowPane (void) throw();
+    virtual ~FrameWindowPane() throw();
 
     /** A frame window typically can (and should) exists on its own without
         children, if only to visualize that something (a view) is missing.
         Therefore this method always returns <FALSE/>.
     */
-    virtual sal_Bool SAL_CALL isAnchorOnly (void)
+    virtual sal_Bool SAL_CALL isAnchorOnly()
         throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 };
 
diff --git a/sd/source/ui/framework/factories/FullScreenPane.cxx b/sd/source/ui/framework/factories/FullScreenPane.cxx
index ae8698c4f503..009975465541 100644
--- a/sd/source/ui/framework/factories/FullScreenPane.cxx
+++ b/sd/source/ui/framework/factories/FullScreenPane.cxx
@@ -97,11 +97,11 @@ FullScreenPane::FullScreenPane (
     mpWindow->GrabFocus();
 }
 
-FullScreenPane::~FullScreenPane (void) throw()
+FullScreenPane::~FullScreenPane() throw()
 {
 }
 
-void SAL_CALL FullScreenPane::disposing (void)
+void SAL_CALL FullScreenPane::disposing()
 {
     // We have created the window pointed to by mpWindow, we delete it.
     if (mpWindow != NULL)
@@ -121,7 +121,7 @@ void SAL_CALL FullScreenPane::disposing (void)
 
 //----- XPane -----------------------------------------------------------------
 
-sal_Bool SAL_CALL FullScreenPane::isVisible (void)
+sal_Bool SAL_CALL FullScreenPane::isVisible()
     throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
@@ -143,7 +143,7 @@ void SAL_CALL FullScreenPane::setVisible (const sal_Bool bIsVisible)
         mpWorkWindow->Show(bIsVisible);
 }
 
-Reference<css::accessibility::XAccessible> SAL_CALL FullScreenPane::getAccessible (void)
+Reference<css::accessibility::XAccessible> SAL_CALL FullScreenPane::getAccessible()
     throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
@@ -195,7 +195,7 @@ IMPL_LINK(FullScreenPane, WindowEventHandler, VclWindowEvent*, pEvent)
     return 1;
 }
 
-Reference<rendering::XCanvas> FullScreenPane::CreateCanvas (void)
+Reference<rendering::XCanvas> FullScreenPane::CreateCanvas()
     throw (RuntimeException)
 {
     vcl::Window* pWindow = VCLUnoHelper::GetWindow(mxWindow);
diff --git a/sd/source/ui/framework/factories/FullScreenPane.hxx b/sd/source/ui/framework/factories/FullScreenPane.hxx
index 1d7c3481ea98..0c2e1afac517 100644
--- a/sd/source/ui/framework/factories/FullScreenPane.hxx
+++ b/sd/source/ui/framework/factories/FullScreenPane.hxx
@@ -52,19 +52,19 @@ public:
         const css::uno::Reference<css::uno::XComponentContext>& rxComponentContext,
         const css::uno::Reference<css::drawing::framework::XResourceId>& rxPaneId,
         const vcl::Window* pViewShellWindow);
-    virtual ~FullScreenPane (void) throw();
+    virtual ~FullScreenPane() throw();
 
-    virtual void SAL_CALL disposing (void) SAL_OVERRIDE;
+    virtual void SAL_CALL disposing() SAL_OVERRIDE;
 
     //----- XPane -------------------------------------------------------------
 
-    virtual sal_Bool SAL_CALL isVisible (void)
+    virtual sal_Bool SAL_CALL isVisible()
         throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     virtual void SAL_CALL setVisible (sal_Bool bIsVisible)
         throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
-    virtual css::uno::Reference<css::accessibility::XAccessible> SAL_CALL getAccessible (void)
+    virtual css::uno::Reference<css::accessibility::XAccessible> SAL_CALL getAccessible()
         throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     virtual void SAL_CALL setAccessible (
@@ -75,7 +75,7 @@ public:
 
 protected:
     virtual ::com::sun::star::uno::Reference<com::sun::star::rendering::XCanvas>
-        CreateCanvas (void)
+        CreateCanvas()
         throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
 
 private:
diff --git a/sd/source/ui/framework/factories/Pane.cxx b/sd/source/ui/framework/factories/Pane.cxx
index 321692e2e87a..0fd14c668bb2 100644
--- a/sd/source/ui/framework/factories/Pane.cxx
+++ b/sd/source/ui/framework/factories/Pane.cxx
@@ -43,17 +43,17 @@ Pane::Pane (
 {
 }
 
-Pane::~Pane (void)
+Pane::~Pane()
 {
 }
 
-void Pane::disposing (void)
+void Pane::disposing()
 {
     mxWindow = NULL;
     mpWindow = NULL;
 }
 
-::vcl::Window* Pane::GetWindow (void)
+::vcl::Window* Pane::GetWindow()
 {
     if (mxWindow.is())
         return mpWindow;
@@ -63,7 +63,7 @@ void Pane::disposing (void)
 
 //----- XPane -----------------------------------------------------------------
 
-Reference<awt::XWindow> SAL_CALL Pane::getWindow (void)
+Reference<awt::XWindow> SAL_CALL Pane::getWindow()
     throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
@@ -71,7 +71,7 @@ Reference<awt::XWindow> SAL_CALL Pane::getWindow (void)
     return mxWindow;
 }
 
-Reference<rendering::XCanvas> SAL_CALL Pane::getCanvas (void)
+Reference<rendering::XCanvas> SAL_CALL Pane::getCanvas()
     throw (RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard (maMutex);
@@ -85,7 +85,7 @@ Reference<rendering::XCanvas> SAL_CALL Pane::getCanvas (void)
 
 //----- XPane2 ----------------------------------------------------------------
 
-sal_Bool SAL_CALL Pane::isVisible (void)
+sal_Bool SAL_CALL Pane::isVisible()
     throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
@@ -107,7 +107,7 @@ void SAL_CALL Pane::setVisible (sal_Bool bIsVisible)
         pWindow->Show(bIsVisible);
 }
 
-Reference<css::accessibility::XAccessible> SAL_CALL Pane::getAccessible (void)
+Reference<css::accessibility::XAccessible> SAL_CALL Pane::getAccessible()
     throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
@@ -130,7 +130,7 @@ void SAL_CALL Pane::setAccessible (
 
 //----- XResource -------------------------------------------------------------
 
-Reference<XResourceId> SAL_CALL Pane::getResourceId (void)
+Reference<XResourceId> SAL_CALL Pane::getResourceId()
     throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
@@ -138,7 +138,7 @@ Reference<XResourceId> SAL_CALL Pane::getResourceId (void)
     return mxPaneId;
 }
 
-sal_Bool SAL_CALL Pane::isAnchorOnly (void)
+sal_Bool SAL_CALL Pane::isAnchorOnly()
     throw (RuntimeException, std::exception)
 {
     return true;
@@ -151,7 +151,7 @@ namespace
     class thePaneUnoTunnelId : public rtl::Static< UnoTunnelIdInit, thePaneUnoTunnelId > {};
 }
 
-const Sequence<sal_Int8>& Pane::getUnoTunnelId (void)
+const Sequence<sal_Int8>& Pane::getUnoTunnelId()
 {
     return thePaneUnoTunnelId::get().getSeq();
 }
@@ -170,7 +170,7 @@ sal_Int64 SAL_CALL Pane::getSomething (const Sequence<sal_Int8>& rId)
     return nResult;
 }
 
-Reference<rendering::XCanvas> Pane::CreateCanvas (void)
+Reference<rendering::XCanvas> Pane::CreateCanvas()
     throw (RuntimeException)
 {
     Reference<rendering::XCanvas> xCanvas;
@@ -186,7 +186,7 @@ Reference<rendering::XCanvas> Pane::CreateCanvas (void)
     return xCanvas;
 }
 
-void Pane::ThrowIfDisposed (void) const
+void Pane::ThrowIfDisposed() const
     throw (lang::DisposedException)
 {
     if (rBHelper.bDisposed || rBHelper.bInDispose)
diff --git a/sd/source/ui/framework/factories/PresentationFactory.cxx b/sd/source/ui/framework/factories/PresentationFactory.cxx
index dfe9bf2a0cc0..f8e0322ee7d0 100644
--- a/sd/source/ui/framework/factories/PresentationFactory.cxx
+++ b/sd/source/ui/framework/factories/PresentationFactory.cxx
@@ -47,9 +47,9 @@ class PresentationFactoryProvider
 {
 public:
     PresentationFactoryProvider (const Reference<XComponentContext>& rxContext);
-    virtual ~PresentationFactoryProvider (void);
+    virtual ~PresentationFactoryProvider();
 
-    virtual void SAL_CALL disposing (void) SAL_OVERRIDE;
+    virtual void SAL_CALL disposing() SAL_OVERRIDE;
 
     // XInitialization
 
@@ -71,14 +71,14 @@ class PresentationView
 public:
     PresentationView (const Reference<XResourceId>& rxViewId)
         : PresentationViewInterfaceBase(maMutex),mxResourceId(rxViewId) {};
-    virtual ~PresentationView (void) {};
+    virtual ~PresentationView() {};
 
     // XView
 
-    virtual Reference<XResourceId> SAL_CALL getResourceId (void) throw (RuntimeException, std::exception) SAL_OVERRIDE
+    virtual Reference<XResourceId> SAL_CALL getResourceId() throw (RuntimeException, std::exception) SAL_OVERRIDE
     { return mxResourceId; };
 
-    virtual sal_Bool SAL_CALL isAnchorOnly (void) throw (RuntimeException, std::exception) SAL_OVERRIDE
+    virtual sal_Bool SAL_CALL isAnchorOnly() throw (RuntimeException, std::exception) SAL_OVERRIDE
     { return false; }
 
 private:
@@ -109,11 +109,11 @@ PresentationFactory::PresentationFactory (
     }
 }
 
-PresentationFactory::~PresentationFactory (void)
+PresentationFactory::~PresentationFactory()
 {
 }
 
-void SAL_CALL PresentationFactory::disposing (void)
+void SAL_CALL PresentationFactory::disposing()
 {
 }
 
@@ -171,7 +171,7 @@ void SAL_CALL PresentationFactory::disposing (
     (void)rEventObject;
 }
 
-void PresentationFactory::ThrowIfDisposed (void) const
+void PresentationFactory::ThrowIfDisposed() const
     throw (lang::DisposedException)
 {
     if (rBHelper.bDisposed || rBHelper.bInDispose)
@@ -192,11 +192,11 @@ PresentationFactoryProvider::PresentationFactoryProvider (
     (void)rxContext;
 }
 
-PresentationFactoryProvider::~PresentationFactoryProvider (void)
+PresentationFactoryProvider::~PresentationFactoryProvider()
 {
 }
 
-void PresentationFactoryProvider::disposing (void)
+void PresentationFactoryProvider::disposing()
 {
 }
 
diff --git a/sd/source/ui/framework/factories/ViewShellWrapper.cxx b/sd/source/ui/framework/factories/ViewShellWrapper.cxx
index 8d1181d61f1b..ba3361233568 100644
--- a/sd/source/ui/framework/factories/ViewShellWrapper.cxx
+++ b/sd/source/ui/framework/factories/ViewShellWrapper.cxx
@@ -67,11 +67,11 @@ ViewShellWrapper::ViewShellWrapper (
 {
 }
 
-ViewShellWrapper::~ViewShellWrapper (void)
+ViewShellWrapper::~ViewShellWrapper()
 {
 }
 
-void SAL_CALL ViewShellWrapper::disposing (void)
+void SAL_CALL ViewShellWrapper::disposing()
 {
     ::osl::MutexGuard aGuard( maMutex );
 
@@ -107,13 +107,13 @@ uno::Any SAL_CALL ViewShellWrapper::queryInterface( const uno::Type & rType ) th
 
 //----- XResource -------------------------------------------------------------
 
-Reference<XResourceId> SAL_CALL ViewShellWrapper::getResourceId (void)
+Reference<XResourceId> SAL_CALL ViewShellWrapper::getResourceId()
     throw (RuntimeException, std::exception)
 {
     return mxViewId;
 }
 
-sal_Bool SAL_CALL ViewShellWrapper::isAnchorOnly (void)
+sal_Bool SAL_CALL ViewShellWrapper::isAnchorOnly()
     throw (RuntimeException, std::exception)
 {
     return false;
@@ -236,7 +236,7 @@ namespace
     class theViewShellWrapperUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theViewShellWrapperUnoTunnelId> {};
 }
 
-const Sequence<sal_Int8>& ViewShellWrapper::getUnoTunnelId (void)
+const Sequence<sal_Int8>& ViewShellWrapper::getUnoTunnelId()
 {
     return theViewShellWrapperUnoTunnelId::get().getSeq();
 }
diff --git a/sd/source/ui/framework/module/CenterViewFocusModule.cxx b/sd/source/ui/framework/module/CenterViewFocusModule.cxx
index a84ded03f401..a0f2c54f1e9f 100644
--- a/sd/source/ui/framework/module/CenterViewFocusModule.cxx
+++ b/sd/source/ui/framework/module/CenterViewFocusModule.cxx
@@ -86,11 +86,11 @@ CenterViewFocusModule::CenterViewFocusModule (Reference<frame::XController>& rxC
     }
 }
 
-CenterViewFocusModule::~CenterViewFocusModule (void)
+CenterViewFocusModule::~CenterViewFocusModule()
 {
 }
 
-void SAL_CALL CenterViewFocusModule::disposing (void)
+void SAL_CALL CenterViewFocusModule::disposing()
 {
     if (mxConfigurationController.is())
         mxConfigurationController->removeConfigurationChangeListener(this);
diff --git a/sd/source/ui/framework/module/CenterViewFocusModule.hxx b/sd/source/ui/framework/module/CenterViewFocusModule.hxx
index d1ff8eba52e2..af911dbef097 100644
--- a/sd/source/ui/framework/module/CenterViewFocusModule.hxx
+++ b/sd/source/ui/framework/module/CenterViewFocusModule.hxx
@@ -56,9 +56,9 @@ class CenterViewFocusModule
 public:
     CenterViewFocusModule (
         ::com::sun::star::uno::Reference<com::sun::star::frame::XController>& rxController);
-    virtual ~CenterViewFocusModule (void);
+    virtual ~CenterViewFocusModule();
 
-    virtual void SAL_CALL disposing (void) SAL_OVERRIDE;
+    virtual void SAL_CALL disposing() SAL_OVERRIDE;
 
     // XConfigurationChangeListener
 
diff --git a/sd/source/ui/framework/module/ModuleController.cxx b/sd/source/ui/framework/module/ModuleController.cxx
index 4cce9529c557..8b86fca69008 100644
--- a/sd/source/ui/framework/module/ModuleController.cxx
+++ b/sd/source/ui/framework/module/ModuleController.cxx
@@ -45,7 +45,7 @@ class ModuleController::ResourceToFactoryMap
     OUStringHash>
 {
 public:
-    ResourceToFactoryMap (void) {}
+    ResourceToFactoryMap() {}
 };
 
 class ModuleController::LoadedFactoryContainer
@@ -55,7 +55,7 @@ class ModuleController::LoadedFactoryContainer
     OUStringHash>
 {
 public:
-    LoadedFactoryContainer (void) {}
+    LoadedFactoryContainer() {}
 };
 
 //===== ModuleController ======================================================
@@ -76,11 +76,11 @@ ModuleController::ModuleController (const Reference<XComponentContext>& rxContex
     LoadFactories(rxContext);
 }
 
-ModuleController::~ModuleController (void) throw()
+ModuleController::~ModuleController() throw()
 {
 }
 
-void SAL_CALL ModuleController::disposing (void)
+void SAL_CALL ModuleController::disposing()
 {
     // Break the cyclic reference back to DrawController object
     mpLoadedFactories.reset();
@@ -142,7 +142,7 @@ void ModuleController::ProcessFactory (const ::std::vector<Any>& rValues)
     }
 }
 
-void ModuleController::InstantiateStartupServices (void)
+void ModuleController::InstantiateStartupServices()
 {
     try
     {
diff --git a/sd/source/ui/framework/module/ResourceManager.cxx b/sd/source/ui/framework/module/ResourceManager.cxx
index 14901db3044e..a3255c9fd763 100644
--- a/sd/source/ui/framework/module/ResourceManager.cxx
+++ b/sd/source/ui/framework/module/ResourceManager.cxx
@@ -42,7 +42,7 @@ class ResourceManager::MainViewContainer
     : public ::std::set<OUString>
 {
 public:
-    MainViewContainer (void) {}
+    MainViewContainer() {}
 };
 
 //===== ResourceManager =======================================================
@@ -80,7 +80,7 @@ ResourceManager::ResourceManager (
     }
 }
 
-ResourceManager::~ResourceManager (void)
+ResourceManager::~ResourceManager()
 {
 }
 
@@ -96,11 +96,11 @@ bool ResourceManager::IsResourceActive (
     return (mpActiveMainViewContainer->find(rsMainViewURL) != mpActiveMainViewContainer->end());
 }
 
-void ResourceManager::SaveResourceState (void)
+void ResourceManager::SaveResourceState()
 {
 }
 
-void SAL_CALL ResourceManager::disposing (void)
+void SAL_CALL ResourceManager::disposing()
 {
     if (mxConfigurationController.is())
     {
@@ -165,7 +165,7 @@ void SAL_CALL ResourceManager::notifyConfigurationChange (
     }
 }
 
-void ResourceManager::UpdateForMainViewShell (void)
+void ResourceManager::UpdateForMainViewShell()
 {
     if (mxConfigurationController.is())
     {
diff --git a/sd/source/ui/framework/module/ResourceManager.hxx b/sd/source/ui/framework/module/ResourceManager.hxx
index 1ce16db74410..e2d31dd49c1a 100644
--- a/sd/source/ui/framework/module/ResourceManager.hxx
+++ b/sd/source/ui/framework/module/ResourceManager.hxx
@@ -53,16 +53,16 @@ public:
             ::com::sun::star::frame::XController>& rxController,
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::drawing::framework::XResourceId>& rxResourceId);
-    virtual ~ResourceManager (void);
+    virtual ~ResourceManager();
 
     /** Remember the given URL as one of a center pane view for which to
         activate the resource managed by the called object.
     */
     void AddActiveMainView (const OUString& rsMainViewURL);
     bool IsResourceActive (const OUString& rsMainViewURL);
-    virtual void SaveResourceState (void);
+    virtual void SaveResourceState();
 
-    virtual void SAL_CALL disposing (void) SAL_OVERRIDE;
+    virtual void SAL_CALL disposing() SAL_OVERRIDE;
 
     // XConfigurationChangeListener
 
@@ -101,7 +101,7 @@ private:
         bool bActivation,
         const ::com::sun::star::uno::Reference<
             com::sun::star::drawing::framework::XConfiguration>& rxConfiguration);
-    void UpdateForMainViewShell (void);
+    void UpdateForMainViewShell();
 };
 
 } } // end of namespace sd::framework
diff --git a/sd/source/ui/framework/module/ShellStackGuard.cxx b/sd/source/ui/framework/module/ShellStackGuard.cxx
index 7f2f172d9cef..3e9ef23a51b1 100644
--- a/sd/source/ui/framework/module/ShellStackGuard.cxx
+++ b/sd/source/ui/framework/module/ShellStackGuard.cxx
@@ -76,11 +76,11 @@ ShellStackGuard::ShellStackGuard (Reference<frame::XController>& rxController)
     }
 }
 
-ShellStackGuard::~ShellStackGuard (void)
+ShellStackGuard::~ShellStackGuard()
 {
 }
 
-void SAL_CALL ShellStackGuard::disposing (void)
+void SAL_CALL ShellStackGuard::disposing()
 {
     if (mxConfigurationController.is())
         mxConfigurationController->removeConfigurationChangeListener(this);
@@ -142,7 +142,7 @@ IMPL_LINK(ShellStackGuard, TimeoutHandler, Idle*, pIdle)
     return 0;
 }
 
-bool ShellStackGuard::IsPrinting (void) const
+bool ShellStackGuard::IsPrinting() const
 {
     if (mpBase != NULL)
     {
diff --git a/sd/source/ui/framework/module/ShellStackGuard.hxx b/sd/source/ui/framework/module/ShellStackGuard.hxx
index 56796f423d09..851687490d1b 100644
--- a/sd/source/ui/framework/module/ShellStackGuard.hxx
+++ b/sd/source/ui/framework/module/ShellStackGuard.hxx
@@ -65,9 +65,9 @@ class ShellStackGuard
 {
 public:
     ShellStackGuard (css::uno::Reference<css::frame::XController>& rxController);
-    virtual ~ShellStackGuard (void);
+    virtual ~ShellStackGuard();
 
-    virtual void SAL_CALL disposing (void) SAL_OVERRIDE;
+    virtual void SAL_CALL disposing() SAL_OVERRIDE;
 
     // XConfigurationChangeListener
 
@@ -93,7 +93,7 @@ private:
         the printer is not printing, or there is no printer, or something
         else went wrong.
     */
-    bool IsPrinting (void) const;
+    bool IsPrinting() const;
 };
 
 } } // end of namespace sd::framework
diff --git a/sd/source/ui/framework/module/SlideSorterModule.cxx b/sd/source/ui/framework/module/SlideSorterModule.cxx
index b4a3c430b995..32dc1e79dba5 100644
--- a/sd/source/ui/framework/module/SlideSorterModule.cxx
+++ b/sd/source/ui/framework/module/SlideSorterModule.cxx
@@ -71,11 +71,11 @@ SlideSorterModule::SlideSorterModule (
     }
 }
 
-SlideSorterModule::~SlideSorterModule (void)
+SlideSorterModule::~SlideSorterModule()
 {
 }
 
-void SlideSorterModule::SaveResourceState (void)
+void SlideSorterModule::SaveResourceState()
 {
     SvtSlideSorterBarOptions().SetVisibleImpressView(IsResourceActive(FrameworkHelper::msImpressViewURL));
     SvtSlideSorterBarOptions().SetVisibleOutlineView(IsResourceActive(FrameworkHelper::msOutlineViewURL));
diff --git a/sd/source/ui/framework/module/SlideSorterModule.hxx b/sd/source/ui/framework/module/SlideSorterModule.hxx
index 906a8ec1b556..349d2f18cadc 100644
--- a/sd/source/ui/framework/module/SlideSorterModule.hxx
+++ b/sd/source/ui/framework/module/SlideSorterModule.hxx
@@ -37,9 +37,9 @@ public:
     SlideSorterModule (
         const css::uno::Reference<css::frame::XController>& rxController,
         const OUString& rsLeftPaneURL);
-    virtual ~SlideSorterModule (void);
+    virtual ~SlideSorterModule();
 
-    virtual void SaveResourceState (void) SAL_OVERRIDE;
+    virtual void SaveResourceState() SAL_OVERRIDE;
     // XConfigurationChangeListener
 
     virtual void SAL_CALL notifyConfigurationChange (
diff --git a/sd/source/ui/framework/module/ToolBarModule.cxx b/sd/source/ui/framework/module/ToolBarModule.cxx
index a7b88bd06a13..51e4b6ba6254 100644
--- a/sd/source/ui/framework/module/ToolBarModule.cxx
+++ b/sd/source/ui/framework/module/ToolBarModule.cxx
@@ -84,11 +84,11 @@ ToolBarModule::ToolBarModule (
     }
 }
 
-ToolBarModule::~ToolBarModule (void)
+ToolBarModule::~ToolBarModule()
 {
 }
 
-void SAL_CALL ToolBarModule::disposing (void)
+void SAL_CALL ToolBarModule::disposing()
 {
     if (mxConfigurationController.is())
         mxConfigurationController->removeConfigurationChangeListener(this);
@@ -133,7 +133,7 @@ void SAL_CALL ToolBarModule::notifyConfigurationChange (
     }
 }
 
-void ToolBarModule::HandleUpdateStart (void)
+void ToolBarModule::HandleUpdateStart()
 {
     // Lock the ToolBarManager and tell it to lock the ViewShellManager as
     // well.  This way the ToolBarManager can optimize the releasing of
@@ -147,7 +147,7 @@ void ToolBarModule::HandleUpdateStart (void)
     }
 }
 
-void ToolBarModule::HandleUpdateEnd (void)
+void ToolBarModule::HandleUpdateEnd()
 {
     if (mbMainViewSwitchUpdatePending)
     {
diff --git a/sd/source/ui/framework/module/ToolBarModule.hxx b/sd/source/ui/framework/module/ToolBarModule.hxx
index 1a309ac66630..36ba62be7144 100644
--- a/sd/source/ui/framework/module/ToolBarModule.hxx
+++ b/sd/source/ui/framework/module/ToolBarModule.hxx
@@ -56,9 +56,9 @@ public:
     */
     ToolBarModule (
         const css::uno::Reference<css::frame::XController>& rxController);
-    virtual ~ToolBarModule (void);
+    virtual ~ToolBarModule();
 
-    virtual void SAL_CALL disposing (void) SAL_OVERRIDE;
+    virtual void SAL_CALL disposing() SAL_OVERRIDE;
 
     // XConfigurationChangeListener
 
@@ -79,8 +79,8 @@ private:
     ::boost::scoped_ptr<ToolBarManager::UpdateLock> mpToolBarManagerLock;
     bool mbMainViewSwitchUpdatePending;
 
-    void HandleUpdateStart (void);
-    void HandleUpdateEnd (void);
+    void HandleUpdateStart();
+    void HandleUpdateEnd();
 };
 
 } } // end of namespace sd::framework
diff --git a/sd/source/ui/framework/module/ToolPanelModule.cxx b/sd/source/ui/framework/module/ToolPanelModule.cxx
index 942e83c5a5aa..617a293862e6 100644
--- a/sd/source/ui/framework/module/ToolPanelModule.cxx
+++ b/sd/source/ui/framework/module/ToolPanelModule.cxx
@@ -64,11 +64,11 @@ ToolPanelModule::ToolPanelModule (
     }
 }
 
-ToolPanelModule::~ToolPanelModule (void)
+ToolPanelModule::~ToolPanelModule()
 {
 }
 
-void ToolPanelModule::SaveResourceState (void)
+void ToolPanelModule::SaveResourceState()
 {
     SvtToolPanelOptions().SetVisibleImpressView(IsResourceActive(FrameworkHelper::msImpressViewURL));
     SvtToolPanelOptions().SetVisibleOutlineView(IsResourceActive(FrameworkHelper::msOutlineViewURL));
diff --git a/sd/source/ui/framework/module/ToolPanelModule.hxx b/sd/source/ui/framework/module/ToolPanelModule.hxx
index 3f22e6efe39a..bbf4ee7c638a 100644
--- a/sd/source/ui/framework/module/ToolPanelModule.hxx
+++ b/sd/source/ui/framework/module/ToolPanelModule.hxx
@@ -36,9 +36,9 @@ public:
     ToolPanelModule (
         const css::uno::Reference<css::frame::XController>& rxController,
         const OUString& rsRightPaneURL);
-    virtual ~ToolPanelModule (void);
+    virtual ~ToolPanelModule();
 
-    virtual void SaveResourceState (void) SAL_OVERRIDE;
+    virtual void SaveResourceState() SAL_OVERRIDE;
     // XConfigurationChangeListener
 
     virtual void SAL_CALL notifyConfigurationChange (
diff --git a/sd/source/ui/framework/module/ViewTabBarModule.cxx b/sd/source/ui/framework/module/ViewTabBarModule.cxx
index bc02e08151f0..ccf08fbabe47 100644
--- a/sd/source/ui/framework/module/ViewTabBarModule.cxx
+++ b/sd/source/ui/framework/module/ViewTabBarModule.cxx
@@ -77,11 +77,11 @@ ViewTabBarModule::ViewTabBarModule (
     }
 }
 
-ViewTabBarModule::~ViewTabBarModule (void)
+ViewTabBarModule::~ViewTabBarModule()
 {
 }
 
-void SAL_CALL ViewTabBarModule::disposing (void)
+void SAL_CALL ViewTabBarModule::disposing()
 {
     if (mxConfigurationController.is())
         mxConfigurationController->removeConfigurationChangeListener(this);
diff --git a/sd/source/ui/framework/module/ViewTabBarModule.hxx b/sd/source/ui/framework/module/ViewTabBarModule.hxx
index b07eef9b0d5e..b8bd19bc4a2d 100644
--- a/sd/source/ui/framework/module/ViewTabBarModule.hxx
+++ b/sd/source/ui/framework/module/ViewTabBarModule.hxx
@@ -59,9 +59,9 @@ public:
         const css::uno::Reference<css::frame::XController>& rxController,
         const css::uno::Reference<
             css::drawing::framework::XResourceId>& rxViewTabBarId);
-    virtual ~ViewTabBarModule (void);
+    virtual ~ViewTabBarModule();
 
-    virtual void SAL_CALL disposing (void) SAL_OVERRIDE;
+    virtual void SAL_CALL disposing() SAL_OVERRIDE;
 
     // XConfigurationChangeListener
 
diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx
index f775eb2cd972..c666e7017b19 100644
--- a/sd/source/ui/framework/tools/FrameworkHelper.cxx
+++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx
@@ -91,9 +91,9 @@ public:
         const OUString& rsEventType,
         const ::sd::framework::FrameworkHelper::ConfigurationChangeEventFilter& rFilter,
         const ::sd::framework::FrameworkHelper::Callback& rCallback);
-    virtual ~CallbackCaller (void);
+    virtual ~CallbackCaller();
 
-    virtual void SAL_CALL disposing (void) SAL_OVERRIDE;
+    virtual void SAL_CALL disposing() SAL_OVERRIDE;
     // XEventListener
     virtual void SAL_CALL disposing (const lang::EventObject& rEvent)
         throw (RuntimeException, std::exception) SAL_OVERRIDE;
@@ -126,9 +126,9 @@ class LifetimeController
 {
 public:
     explicit LifetimeController (::sd::ViewShellBase& rBase);
-    virtual ~LifetimeController (void);
+    virtual ~LifetimeController();
 
-    virtual void SAL_CALL disposing (void) SAL_OVERRIDE;
+    virtual void SAL_CALL disposing() SAL_OVERRIDE;
 
     /** XEventListener.  This method is called when the frame::XController
         is being destroyed.
@@ -149,7 +149,7 @@ private:
         mbListeningToController members were modified then call this method
         to either dispose or release the associated FrameworkHelper.
     */
-    void Update (void);
+    void Update();
 };
 
 } // end of anonymous namespace
@@ -279,7 +279,7 @@ class FrameworkHelper::ViewURLMap
           OUStringHash>
 {
 public:
-    ViewURLMap (void) {}
+    ViewURLMap() {}
 };
 
 //----- Framework::DiposeListener ---------------------------------------------
@@ -296,9 +296,9 @@ class FrameworkHelper::DisposeListener
 {
 public:
     DisposeListener (const ::boost::shared_ptr<FrameworkHelper>& rpHelper);
-    virtual ~DisposeListener (void);
+    virtual ~DisposeListener();
 
-    virtual void SAL_CALL disposing (void) SAL_OVERRIDE;
+    virtual void SAL_CALL disposing() SAL_OVERRIDE;
 
     virtual void SAL_CALL disposing (const lang::EventObject& rEventObject)
         throw(RuntimeException, std::exception) SAL_OVERRIDE;
@@ -384,23 +384,23 @@ FrameworkHelper::FrameworkHelper (ViewShellBase& rBase)
     new LifetimeController(mrBase);
 }
 
-void FrameworkHelper::Initialize (void)
+void FrameworkHelper::Initialize()
 {
     mxDisposeListener = new DisposeListener(shared_from_this());
 }
 
-FrameworkHelper::~FrameworkHelper (void)
+FrameworkHelper::~FrameworkHelper()
 {
 }
 
-void FrameworkHelper::Dispose (void)
+void FrameworkHelper::Dispose()
 {
     if (mxDisposeListener.is())
         mxDisposeListener->dispose();
     mxConfigurationController = NULL;
 }
 
-bool FrameworkHelper::IsValid (void)
+bool FrameworkHelper::IsValid()
 {
     return mxConfigurationController.is();
 }
@@ -659,7 +659,7 @@ private:
     bool& mrFlag;
 };
 
-void FrameworkHelper::RequestSynchronousUpdate (void)
+void FrameworkHelper::RequestSynchronousUpdate()
 {
     rtl::Reference<ConfigurationController> pCC (
         dynamic_cast<ConfigurationController*>(mxConfigurationController.get()));
@@ -689,7 +689,7 @@ void FrameworkHelper::WaitForEvent (const OUString& rsEventType) const
     }
 }
 
-void FrameworkHelper::WaitForUpdate (void) const
+void FrameworkHelper::WaitForUpdate() const
 {
     WaitForEvent(msConfigurationUpdateEndEvent);
 }
@@ -708,7 +708,7 @@ void FrameworkHelper::disposing (const lang::EventObject& rEventObject)
         mxConfigurationController = NULL;
 }
 
-void FrameworkHelper::UpdateConfiguration (void)
+void FrameworkHelper::UpdateConfiguration()
 {
     if (mxConfigurationController.is())
     {
@@ -784,11 +784,11 @@ FrameworkHelper::DisposeListener::DisposeListener (
         xComponent->addEventListener(this);
 }
 
-FrameworkHelper::DisposeListener::~DisposeListener (void)
+FrameworkHelper::DisposeListener::~DisposeListener()
 {
 }
 
-void SAL_CALL FrameworkHelper::DisposeListener::disposing (void)
+void SAL_CALL FrameworkHelper::DisposeListener::disposing()
 {
     Reference<XComponent> xComponent (mpHelper->mxConfigurationController, UNO_QUERY);
     if (xComponent.is())
@@ -856,11 +856,11 @@ CallbackCaller::CallbackCaller (
     }
 }
 
-CallbackCaller::~CallbackCaller (void)
+CallbackCaller::~CallbackCaller()
 {
 }
 
-void CallbackCaller::disposing (void)
+void CallbackCaller::disposing()
 {
     try
     {
@@ -933,12 +933,12 @@ LifetimeController::LifetimeController (::sd::ViewShellBase& rBase)
     }
 }
 
-LifetimeController::~LifetimeController (void)
+LifetimeController::~LifetimeController()
 {
     OSL_ASSERT(!mbListeningToController && !mbListeningToViewShellBase);
 }
 
-void LifetimeController::disposing (void)
+void LifetimeController::disposing()
 {
 }
 
@@ -962,7 +962,7 @@ void LifetimeController::Notify (SfxBroadcaster& rBroadcaster, const SfxHint& rH
     }
 }
 
-void LifetimeController::Update (void)
+void LifetimeController::Update()
 {
     if (mbListeningToViewShellBase && mbListeningToController)
     {