summaryrefslogtreecommitdiff
path: root/sd/source/ui/tools
diff options
context:
space:
mode:
Diffstat (limited to 'sd/source/ui/tools')
-rw-r--r--sd/source/ui/tools/AsynchronousCall.cxx4
-rw-r--r--sd/source/ui/tools/ConfigurationAccess.cxx2
-rw-r--r--sd/source/ui/tools/EventMultiplexer.cxx26
-rw-r--r--sd/source/ui/tools/IconCache.cxx6
-rw-r--r--sd/source/ui/tools/IdleDetection.cxx4
-rw-r--r--sd/source/ui/tools/PreviewRenderer.cxx14
-rw-r--r--sd/source/ui/tools/PropertySet.cxx10
-rw-r--r--sd/source/ui/tools/SdGlobalResourceContainer.cxx6
-rw-r--r--sd/source/ui/tools/SlotStateListener.cxx8
-rw-r--r--sd/source/ui/tools/TimerBasedTaskExecution.cxx4
10 files changed, 42 insertions, 42 deletions
diff --git a/sd/source/ui/tools/AsynchronousCall.cxx b/sd/source/ui/tools/AsynchronousCall.cxx
index 13b890406291..1a3639409570 100644
--- a/sd/source/ui/tools/AsynchronousCall.cxx
+++ b/sd/source/ui/tools/AsynchronousCall.cxx
@@ -23,7 +23,7 @@
namespace sd { namespace tools {
-AsynchronousCall::AsynchronousCall (void)
+AsynchronousCall::AsynchronousCall()
: maTimer(),
mpFunction()
{
@@ -31,7 +31,7 @@ AsynchronousCall::AsynchronousCall (void)
maTimer.SetTimeoutHdl(aCallback);
}
-AsynchronousCall::~AsynchronousCall (void)
+AsynchronousCall::~AsynchronousCall()
{
mpFunction.reset();
maTimer.Stop();
diff --git a/sd/source/ui/tools/ConfigurationAccess.cxx b/sd/source/ui/tools/ConfigurationAccess.cxx
index eb22a2f663a6..565a152e3135 100644
--- a/sd/source/ui/tools/ConfigurationAccess.cxx
+++ b/sd/source/ui/tools/ConfigurationAccess.cxx
@@ -123,7 +123,7 @@ Any ConfigurationAccess::GetConfigurationNode (
return Any();
}
-void ConfigurationAccess::CommitChanges (void)
+void ConfigurationAccess::CommitChanges()
{
Reference<util::XChangesBatch> xConfiguration (mxRoot, UNO_QUERY);
if (xConfiguration.is())
diff --git a/sd/source/ui/tools/EventMultiplexer.cxx b/sd/source/ui/tools/EventMultiplexer.cxx
index ede1c01f2abb..f23d9fd0a267 100644
--- a/sd/source/ui/tools/EventMultiplexer.cxx
+++ b/sd/source/ui/tools/EventMultiplexer.cxx
@@ -65,7 +65,7 @@ class EventMultiplexer::Implementation
{
public:
Implementation (ViewShellBase& rBase);
- virtual ~Implementation (void);
+ virtual ~Implementation();
void AddEventListener (
Link& rCallback,
@@ -111,7 +111,7 @@ public:
const ::com::sun::star::drawing::framework::ConfigurationChangeEvent& rEvent)
throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL disposing (void) SAL_OVERRIDE;
+ virtual void SAL_CALL disposing() SAL_OVERRIDE;
protected:
virtual void Notify (
@@ -140,10 +140,10 @@ private:
::com::sun::star::drawing::framework::XConfigurationController>
mxConfigurationControllerWeak;
- void ReleaseListeners (void);
+ void ReleaseListeners();
- void ConnectToController (void);
- void DisconnectFromController (void);
+ void ConnectToController();
+ void DisconnectFromController();
void CallListeners (
EventMultiplexerEvent::EventId eId,
@@ -152,7 +152,7 @@ private:
/** This method throws a DisposedException when the object has already been
disposed.
*/
- void ThrowIfDisposed (void)
+ void ThrowIfDisposed()
throw (::com::sun::star::lang::DisposedException);
DECL_LINK(SlideSorterSelectionChangeListener, void*);
@@ -169,7 +169,7 @@ EventMultiplexer::EventMultiplexer (ViewShellBase& rBase)
mpImpl->acquire();
}
-EventMultiplexer::~EventMultiplexer (void)
+EventMultiplexer::~EventMultiplexer()
{
try
{
@@ -278,13 +278,13 @@ EventMultiplexer::Implementation::Implementation (ViewShellBase& rBase)
}
}
-EventMultiplexer::Implementation::~Implementation (void)
+EventMultiplexer::Implementation::~Implementation()
{
DBG_ASSERT( !mbListeningToFrame,
"sd::EventMultiplexer::Implementation::~Implementation(), disposing was not called!" );
}
-void EventMultiplexer::Implementation::ReleaseListeners (void)
+void EventMultiplexer::Implementation::ReleaseListeners()
{
if (mbListeningToFrame)
{
@@ -359,7 +359,7 @@ void EventMultiplexer::Implementation::RemoveEventListener (
}
}
-void EventMultiplexer::Implementation::ConnectToController (void)
+void EventMultiplexer::Implementation::ConnectToController()
{
// Just in case that we missed some event we now disconnect from the old
// controller.
@@ -421,7 +421,7 @@ void EventMultiplexer::Implementation::ConnectToController (void)
}
}
-void EventMultiplexer::Implementation::DisconnectFromController (void)
+void EventMultiplexer::Implementation::DisconnectFromController()
{
if (mbListeningToController)
{
@@ -629,13 +629,13 @@ void SAL_CALL EventMultiplexer::Implementation::notifyConfigurationChange (
}
-void SAL_CALL EventMultiplexer::Implementation::disposing (void)
+void SAL_CALL EventMultiplexer::Implementation::disposing()
{
CallListeners (EventMultiplexerEvent::EID_DISPOSING);
ReleaseListeners();
}
-void EventMultiplexer::Implementation::ThrowIfDisposed (void)
+void EventMultiplexer::Implementation::ThrowIfDisposed()
throw (::com::sun::star::lang::DisposedException)
{
if (rBHelper.bDisposed || rBHelper.bInDispose)
diff --git a/sd/source/ui/tools/IconCache.cxx b/sd/source/ui/tools/IconCache.cxx
index ae895876c912..54563201282f 100644
--- a/sd/source/ui/tools/IconCache.cxx
+++ b/sd/source/ui/tools/IconCache.cxx
@@ -65,7 +65,7 @@ Image IconCache::Implementation::GetIcon (sal_uInt16 nResourceId)
//===== IconCache =============================================================
//static
-IconCache& IconCache::Instance (void)
+IconCache& IconCache::Instance()
{
if (Implementation::mpInstance == NULL)
{
@@ -95,12 +95,12 @@ Image IconCache::GetIcon (sal_uInt16 nResourceId)
return mpImpl->GetIcon (nResourceId);
}
-IconCache::IconCache (void)
+IconCache::IconCache()
: mpImpl (new Implementation())
{
}
-IconCache::~IconCache (void)
+IconCache::~IconCache()
{
// empty
}
diff --git a/sd/source/ui/tools/IdleDetection.cxx b/sd/source/ui/tools/IdleDetection.cxx
index df7c23e337f1..ed16b2f92a3a 100644
--- a/sd/source/ui/tools/IdleDetection.cxx
+++ b/sd/source/ui/tools/IdleDetection.cxx
@@ -41,7 +41,7 @@ sal_Int32 IdleDetection::GetIdleState (const vcl::Window* pWindow)
return nResult;
}
-sal_Int32 IdleDetection::CheckInputPending (void)
+sal_Int32 IdleDetection::CheckInputPending()
{
if (Application::AnyInput(VclInputFlags::MOUSE | VclInputFlags::KEYBOARD | VclInputFlags::PAINT))
return IDET_SYSTEM_EVENT_PENDING;
@@ -49,7 +49,7 @@ sal_Int32 IdleDetection::CheckInputPending (void)
return IDET_IDLE;
}
-sal_Int32 IdleDetection::CheckSlideShowRunning (void)
+sal_Int32 IdleDetection::CheckSlideShowRunning()
{
sal_Int32 eResult (IDET_IDLE);
diff --git a/sd/source/ui/tools/PreviewRenderer.cxx b/sd/source/ui/tools/PreviewRenderer.cxx
index a43b9966c42b..bff275971dde 100644
--- a/sd/source/ui/tools/PreviewRenderer.cxx
+++ b/sd/source/ui/tools/PreviewRenderer.cxx
@@ -51,8 +51,8 @@ namespace {
class ViewRedirector : public ::sdr::contact::ViewObjectContactRedirector
{
public:
- ViewRedirector (void);
- virtual ~ViewRedirector (void);
+ ViewRedirector();
+ virtual ~ViewRedirector();
virtual drawinglayer::primitive2d::Primitive2DSequence createRedirectedPrimitive2DSequence(
const sdr::contact::ViewObjectContact& rOriginal,
const sdr::contact::DisplayInfo& rDisplayInfo) SAL_OVERRIDE;
@@ -81,7 +81,7 @@ PreviewRenderer::PreviewRenderer (
}
}
-PreviewRenderer::~PreviewRenderer (void)
+PreviewRenderer::~PreviewRenderer()
{
if (mpDocShellOfView != NULL)
EndListening (*mpDocShellOfView);
@@ -282,7 +282,7 @@ bool PreviewRenderer::Initialize (
return true;
}
-void PreviewRenderer::Cleanup (void)
+void PreviewRenderer::Cleanup()
{
mpView->HideSdrPage();
}
@@ -352,7 +352,7 @@ void PreviewRenderer::PaintSubstitutionText (const OUString& rSubstitutionText)
}
}
-void PreviewRenderer::PaintFrame (void)
+void PreviewRenderer::PaintFrame()
{
if (mbHasFrame)
{
@@ -505,11 +505,11 @@ void PreviewRenderer::Notify(SfxBroadcaster&, const SfxHint& rHint)
namespace {
-ViewRedirector::ViewRedirector (void)
+ViewRedirector::ViewRedirector()
{
}
-ViewRedirector::~ViewRedirector (void)
+ViewRedirector::~ViewRedirector()
{
}
diff --git a/sd/source/ui/tools/PropertySet.cxx b/sd/source/ui/tools/PropertySet.cxx
index 66fecd19a58f..eb7c06d0b0fa 100644
--- a/sd/source/ui/tools/PropertySet.cxx
+++ b/sd/source/ui/tools/PropertySet.cxx
@@ -26,23 +26,23 @@ using namespace ::com::sun::star::uno;
namespace sd { namespace tools {
-PropertySet::PropertySet (void)
+PropertySet::PropertySet()
: PropertySetInterfaceBase(m_aMutex),
mpChangeListeners(new ChangeListenerContainer())
{
}
-PropertySet::~PropertySet (void)
+PropertySet::~PropertySet()
{
}
-void SAL_CALL PropertySet::disposing (void)
+void SAL_CALL PropertySet::disposing()
{
}
//----- XPropertySet ----------------------------------------------------------
-Reference<beans::XPropertySetInfo> SAL_CALL PropertySet::getPropertySetInfo (void)
+Reference<beans::XPropertySetInfo> SAL_CALL PropertySet::getPropertySetInfo()
throw(RuntimeException, std::exception)
{
return NULL;
@@ -173,7 +173,7 @@ void PropertySet::CallListeners (
}
}
-void PropertySet::ThrowIfDisposed (void)
+void PropertySet::ThrowIfDisposed()
throw (::com::sun::star::lang::DisposedException)
{
if (rBHelper.bDisposed || rBHelper.bInDispose)
diff --git a/sd/source/ui/tools/SdGlobalResourceContainer.cxx b/sd/source/ui/tools/SdGlobalResourceContainer.cxx
index 7bc31789a6c9..88eab7dd0518 100644
--- a/sd/source/ui/tools/SdGlobalResourceContainer.cxx
+++ b/sd/source/ui/tools/SdGlobalResourceContainer.cxx
@@ -51,7 +51,7 @@ private:
};
// static
-SdGlobalResourceContainer& SdGlobalResourceContainer::Instance (void)
+SdGlobalResourceContainer& SdGlobalResourceContainer::Instance()
{
DBG_ASSERT(Implementation::mpInstance!=NULL,
"SdGlobalResourceContainer::Instance(): instance has been deleted");
@@ -125,13 +125,13 @@ void SdGlobalResourceContainer::AddResource (const Reference<XInterface>& rxReso
}
}
-SdGlobalResourceContainer::SdGlobalResourceContainer (void)
+SdGlobalResourceContainer::SdGlobalResourceContainer()
: mpImpl (new SdGlobalResourceContainer::Implementation())
{
Implementation::mpInstance = this;
}
-SdGlobalResourceContainer::~SdGlobalResourceContainer (void)
+SdGlobalResourceContainer::~SdGlobalResourceContainer()
{
::osl::MutexGuard aGuard (mpImpl->maMutex);
diff --git a/sd/source/ui/tools/SlotStateListener.cxx b/sd/source/ui/tools/SlotStateListener.cxx
index 1091a34dc4d8..017ff5e215ec 100644
--- a/sd/source/ui/tools/SlotStateListener.cxx
+++ b/sd/source/ui/tools/SlotStateListener.cxx
@@ -44,7 +44,7 @@ SlotStateListener::SlotStateListener (
ObserveSlot(rSlotName);
}
-SlotStateListener::~SlotStateListener (void)
+SlotStateListener::~SlotStateListener()
{
ReleaseListeners();
}
@@ -86,7 +86,7 @@ void SlotStateListener::ObserveSlot (const OUString& rSlotName)
}
}
-void SlotStateListener::disposing (void)
+void SlotStateListener::disposing()
{
ReleaseListeners();
mxDispatchProviderWeak = uno::WeakReference<frame::XDispatchProvider>(NULL);
@@ -126,7 +126,7 @@ void SlotStateListener::statusChanged (
maCallback.Call(&sSlotName);
}
-void SlotStateListener::ReleaseListeners (void)
+void SlotStateListener::ReleaseListeners()
{
if ( ! maRegisteredURLList.empty())
{
@@ -151,7 +151,7 @@ void SAL_CALL SlotStateListener::disposing (
{
}
-void SlotStateListener::ThrowIfDisposed (void)
+void SlotStateListener::ThrowIfDisposed()
throw (lang::DisposedException)
{
if (rBHelper.bDisposed || rBHelper.bInDispose)
diff --git a/sd/source/ui/tools/TimerBasedTaskExecution.cxx b/sd/source/ui/tools/TimerBasedTaskExecution.cxx
index 4525b36be635..03335f7e06e4 100644
--- a/sd/source/ui/tools/TimerBasedTaskExecution.cxx
+++ b/sd/source/ui/tools/TimerBasedTaskExecution.cxx
@@ -52,7 +52,7 @@ public:
return pExecution;
}
-void TimerBasedTaskExecution::Release (void)
+void TimerBasedTaskExecution::Release()
{
maTimer.Stop();
mpSelf.reset();
@@ -94,7 +94,7 @@ TimerBasedTaskExecution::TimerBasedTaskExecution (
maTimer.Start();
}
-TimerBasedTaskExecution::~TimerBasedTaskExecution (void)
+TimerBasedTaskExecution::~TimerBasedTaskExecution()
{
maTimer.Stop();
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-01 03:21:31 +0000