summaryrefslogtreecommitdiff
path: root/sd/source/ui/presenter
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-04-14 12:44:47 +0200
committerNoel Grandin <noel@peralex.com>2015-04-15 11:47:12 +0200
commit71b809959bb8f775d83dc52628448bb8b8322b28 (patch)
treef9aa4308050eb7d55611068602c0cf0e3c1b3690 /sd/source/ui/presenter
parent135907f2061550624ee1859745d94eee01849070 (diff)
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
Diffstat (limited to 'sd/source/ui/presenter')
-rw-r--r--sd/source/ui/presenter/CanvasUpdateRequester.cxx2
-rw-r--r--sd/source/ui/presenter/CanvasUpdateRequester.hxx2
-rw-r--r--sd/source/ui/presenter/PresenterCanvas.cxx40
-rw-r--r--sd/source/ui/presenter/PresenterCanvas.hxx18
-rw-r--r--sd/source/ui/presenter/PresenterHelper.cxx2
-rw-r--r--sd/source/ui/presenter/PresenterHelper.hxx2
-rw-r--r--sd/source/ui/presenter/PresenterPreviewCache.cxx24
-rw-r--r--sd/source/ui/presenter/PresenterPreviewCache.hxx8
-rw-r--r--sd/source/ui/presenter/PresenterTextView.cxx36
-rw-r--r--sd/source/ui/presenter/PresenterTextView.hxx6
-rw-r--r--sd/source/ui/presenter/SlideRenderer.cxx6
-rw-r--r--sd/source/ui/presenter/SlideRenderer.hxx6
12 files changed, 76 insertions, 76 deletions
diff --git a/sd/source/ui/presenter/CanvasUpdateRequester.cxx b/sd/source/ui/presenter/CanvasUpdateRequester.cxx
index f460f2bdc493..0f73676fff4b 100644
--- a/sd/source/ui/presenter/CanvasUpdateRequester.cxx
+++ b/sd/source/ui/presenter/CanvasUpdateRequester.cxx
@@ -68,7 +68,7 @@ CanvasUpdateRequester::CanvasUpdateRequester (
}
}
-CanvasUpdateRequester::~CanvasUpdateRequester (void)
+CanvasUpdateRequester::~CanvasUpdateRequester()
{
if (mnUserEventId != 0)
Application::RemoveUserEvent(mnUserEventId);
diff --git a/sd/source/ui/presenter/CanvasUpdateRequester.hxx b/sd/source/ui/presenter/CanvasUpdateRequester.hxx
index 4143f4e4e9c2..35085a1e2fc8 100644
--- a/sd/source/ui/presenter/CanvasUpdateRequester.hxx
+++ b/sd/source/ui/presenter/CanvasUpdateRequester.hxx
@@ -50,7 +50,7 @@ public:
private:
CanvasUpdateRequester (const css::uno::Reference<css::rendering::XSpriteCanvas>& rxCanvas);
- ~CanvasUpdateRequester (void);
+ ~CanvasUpdateRequester();
class Deleter; friend class Deleter;
typedef ::std::vector<
diff --git a/sd/source/ui/presenter/PresenterCanvas.cxx b/sd/source/ui/presenter/PresenterCanvas.cxx
index 908908c7277c..dd38320f3c7c 100644
--- a/sd/source/ui/presenter/PresenterCanvas.cxx
+++ b/sd/source/ui/presenter/PresenterCanvas.cxx
@@ -61,8 +61,8 @@ public:
const Reference<rendering::XCustomSprite>& rxSprite,
const Reference<awt::XWindow>& rxBaseWindow,
const css::geometry::RealSize2D& rSpriteSize);
- virtual ~PresenterCustomSprite (void);
- virtual void SAL_CALL disposing (void)
+ virtual ~PresenterCustomSprite();
+ virtual void SAL_CALL disposing()
throw (RuntimeException) SAL_OVERRIDE;
// XSprite
@@ -84,15 +84,15 @@ public:
virtual void SAL_CALL setPriority (double nPriority)
throw (RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL show (void)
+ virtual void SAL_CALL show()
throw (RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL hide (void)
+ virtual void SAL_CALL hide()
throw (RuntimeException, std::exception) SAL_OVERRIDE;
// XCustomSprite
- virtual Reference<rendering::XCanvas> SAL_CALL getContentCanvas (void)
+ virtual Reference<rendering::XCanvas> SAL_CALL getContentCanvas()
throw (RuntimeException, std::exception) SAL_OVERRIDE;
private:
@@ -102,13 +102,13 @@ private:
geometry::RealPoint2D maPosition;
geometry::RealSize2D maSpriteSize;
- void ThrowIfDisposed (void)
+ void ThrowIfDisposed()
throw (css::lang::DisposedException);
};
//===== PresenterCanvas =======================================================
-PresenterCanvas::PresenterCanvas (void)
+PresenterCanvas::PresenterCanvas()
: PresenterCanvasInterfaceBase(m_aMutex),
mxUpdateCanvas(),
mxSharedCanvas(),
@@ -145,11 +145,11 @@ PresenterCanvas::PresenterCanvas (
mpUpdateRequester = CanvasUpdateRequester::Instance(mxUpdateCanvas);
}
-PresenterCanvas::~PresenterCanvas (void)
+PresenterCanvas::~PresenterCanvas()
{
}
-void SAL_CALL PresenterCanvas::disposing (void)
+void SAL_CALL PresenterCanvas::disposing()
throw (css::uno::RuntimeException)
{
if (mxWindow.is())
@@ -234,7 +234,7 @@ css::uno::Sequence<OUString> PresenterCanvas::getSupportedServiceNames()
//----- XCanvas ---------------------------------------------------------------
-void SAL_CALL PresenterCanvas::clear (void)
+void SAL_CALL PresenterCanvas::clear()
throw (css::uno::RuntimeException, std::exception)
{
ThrowIfDisposed();
@@ -470,7 +470,7 @@ css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL
}
css::uno::Reference<css::rendering::XGraphicDevice> SAL_CALL
- PresenterCanvas::getDevice (void)
+ PresenterCanvas::getDevice()
throw (css::uno::RuntimeException, std::exception)
{
ThrowIfDisposed();
@@ -612,7 +612,7 @@ void SAL_CALL PresenterCanvas::windowHidden (const css::lang::EventObject& rEven
//----- XBitmap ---------------------------------------------------------------
-geometry::IntegerSize2D SAL_CALL PresenterCanvas::getSize (void)
+geometry::IntegerSize2D SAL_CALL PresenterCanvas::getSize()
throw (RuntimeException, std::exception)
{
ThrowIfDisposed();
@@ -626,7 +626,7 @@ geometry::IntegerSize2D SAL_CALL PresenterCanvas::getSize (void)
return geometry::IntegerSize2D(0,0);
}
-sal_Bool SAL_CALL PresenterCanvas::hasAlpha (void)
+sal_Bool SAL_CALL PresenterCanvas::hasAlpha()
throw (RuntimeException, std::exception)
{
Reference<rendering::XBitmap> xBitmap (mxSharedCanvas, UNO_QUERY);
@@ -856,7 +856,7 @@ Reference<rendering::XPolyPolygon2D> PresenterCanvas::UpdateSpriteClip (
return xPolygon;
}
-void PresenterCanvas::ThrowIfDisposed (void)
+void PresenterCanvas::ThrowIfDisposed()
throw (css::lang::DisposedException)
{
if (rBHelper.bDisposed || rBHelper.bInDispose || ! mxSharedCanvas.is())
@@ -882,11 +882,11 @@ PresenterCustomSprite::PresenterCustomSprite (
{
}
-PresenterCustomSprite::~PresenterCustomSprite (void)
+PresenterCustomSprite::~PresenterCustomSprite()
{
}
-void SAL_CALL PresenterCustomSprite::disposing (void)
+void SAL_CALL PresenterCustomSprite::disposing()
throw (RuntimeException)
{
Reference<XComponent> xComponent (mxSprite, UNO_QUERY);
@@ -948,14 +948,14 @@ void SAL_CALL PresenterCustomSprite::setPriority (const double nPriority)
mxSprite->setPriority(nPriority);
}
-void SAL_CALL PresenterCustomSprite::show (void)
+void SAL_CALL PresenterCustomSprite::show()
throw (RuntimeException, std::exception)
{
ThrowIfDisposed();
mxSprite->show();
}
-void SAL_CALL PresenterCustomSprite::hide (void)
+void SAL_CALL PresenterCustomSprite::hide()
throw (RuntimeException, std::exception)
{
ThrowIfDisposed();
@@ -964,14 +964,14 @@ void SAL_CALL PresenterCustomSprite::hide (void)
//----- XCustomSprite ---------------------------------------------------------
-Reference<rendering::XCanvas> PresenterCustomSprite::getContentCanvas (void)
+Reference<rendering::XCanvas> PresenterCustomSprite::getContentCanvas()
throw (RuntimeException, std::exception)
{
ThrowIfDisposed();
return mxSprite->getContentCanvas();
}
-void PresenterCustomSprite::ThrowIfDisposed (void)
+void PresenterCustomSprite::ThrowIfDisposed()
throw (css::lang::DisposedException)
{
if (rBHelper.bDisposed || rBHelper.bInDispose || ! mxSprite.is())
diff --git a/sd/source/ui/presenter/PresenterCanvas.hxx b/sd/source/ui/presenter/PresenterCanvas.hxx
index d60d41f95c9b..606117caca4e 100644
--- a/sd/source/ui/presenter/PresenterCanvas.hxx
+++ b/sd/source/ui/presenter/PresenterCanvas.hxx
@@ -70,7 +70,7 @@ public:
/** This constructor is used when a PresenterCanvas object is created as
a service.
*/
- PresenterCanvas (void);
+ PresenterCanvas();
/** This constructor is used when a PresenterCanvas object is created
directly, typically by the PresenterCanvasFactory.
@@ -105,9 +105,9 @@ public:
const css::uno::Reference<css::rendering::XCanvas>& rxSharedCanvas,
const css::uno::Reference<css::awt::XWindow>& rxSharedWindow,
const css::uno::Reference<css::awt::XWindow>& rxWindow);
- virtual ~PresenterCanvas (void);
+ virtual ~PresenterCanvas();
- virtual void SAL_CALL disposing (void)
+ virtual void SAL_CALL disposing()
throw (css::uno::RuntimeException) SAL_OVERRIDE;
css::awt::Point GetOffset (const css::uno::Reference<css::awt::XWindow>& rxBaseWindow);
@@ -119,7 +119,7 @@ public:
const css::rendering::ViewState& rViewState,
const css::awt::Point& raOffset);
- css::uno::Reference<css::rendering::XCanvas> GetSharedCanvas (void) const;
+ css::uno::Reference<css::rendering::XCanvas> GetSharedCanvas() const;
/** This method is typically called by CanvasPane objects to set the
repaint rectangle of a windowPaint() call as clip rectangle. When
@@ -160,7 +160,7 @@ public:
// XCanvas
- virtual void SAL_CALL clear (void)
+ virtual void SAL_CALL clear()
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL drawPoint (
@@ -305,7 +305,7 @@ public:
css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual css::uno::Reference<css::rendering::XGraphicDevice> SAL_CALL
- getDevice (void)
+ getDevice()
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XSpriteCanvas
@@ -358,10 +358,10 @@ public:
// XBitmap
- virtual css::geometry::IntegerSize2D SAL_CALL getSize (void)
+ virtual css::geometry::IntegerSize2D SAL_CALL getSize()
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual sal_Bool SAL_CALL hasAlpha (void)
+ virtual sal_Bool SAL_CALL hasAlpha()
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual css::uno::Reference<css::rendering::XBitmap> SAL_CALL getScaledBitmap(
@@ -411,7 +411,7 @@ private:
/** This method throws a DisposedException when the object has already been
disposed.
*/
- void ThrowIfDisposed (void)
+ void ThrowIfDisposed()
throw (css::lang::DisposedException);
};
diff --git a/sd/source/ui/presenter/PresenterHelper.cxx b/sd/source/ui/presenter/PresenterHelper.cxx
index 8e62792adb37..79d9ef48cad2 100644
--- a/sd/source/ui/presenter/PresenterHelper.cxx
+++ b/sd/source/ui/presenter/PresenterHelper.cxx
@@ -51,7 +51,7 @@ PresenterHelper::PresenterHelper (
{
}
-PresenterHelper::~PresenterHelper (void)
+PresenterHelper::~PresenterHelper()
{
}
diff --git a/sd/source/ui/presenter/PresenterHelper.hxx b/sd/source/ui/presenter/PresenterHelper.hxx
index 44bc3fc7b555..4f1625bc919b 100644
--- a/sd/source/ui/presenter/PresenterHelper.hxx
+++ b/sd/source/ui/presenter/PresenterHelper.hxx
@@ -46,7 +46,7 @@ class PresenterHelper
{
public:
PresenterHelper (const css::uno::Reference<css::uno::XComponentContext>& rxContext);
- virtual ~PresenterHelper (void);
+ virtual ~PresenterHelper();
// XInitialize
diff --git a/sd/source/ui/presenter/PresenterPreviewCache.cxx b/sd/source/ui/presenter/PresenterPreviewCache.cxx
index c4fd99bb1b7e..00406b0759b0 100644
--- a/sd/source/ui/presenter/PresenterPreviewCache.cxx
+++ b/sd/source/ui/presenter/PresenterPreviewCache.cxx
@@ -35,8 +35,8 @@ namespace sd { namespace presenter {
class PresenterPreviewCache::PresenterCacheContext : public CacheContext
{
public:
- PresenterCacheContext (void);
- virtual ~PresenterCacheContext (void);
+ PresenterCacheContext();
+ virtual ~PresenterCacheContext();
void SetDocumentSlides (
const Reference<container::XIndexAccess>& rxSlides,
@@ -52,12 +52,12 @@ public:
virtual void NotifyPreviewCreation (
CacheKey aKey,
const Bitmap& rPreview) SAL_OVERRIDE;
- virtual bool IsIdle (void) SAL_OVERRIDE;
+ virtual bool IsIdle() SAL_OVERRIDE;
virtual bool IsVisible (CacheKey aKey) SAL_OVERRIDE;
virtual const SdrPage* GetPage (CacheKey aKey) SAL_OVERRIDE;
virtual ::boost::shared_ptr<std::vector<CacheKey> > GetEntryList (bool bVisible) SAL_OVERRIDE;
virtual sal_Int32 GetPriority (CacheKey aKey) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Reference<com::sun::star::uno::XInterface> GetModel (void) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Reference<com::sun::star::uno::XInterface> GetModel() SAL_OVERRIDE;
private:
Reference<container::XIndexAccess> mxSlides;
@@ -81,7 +81,7 @@ PresenterPreviewCache::PresenterPreviewCache (const Reference<XComponentContext>
(void)rxContext;
}
-PresenterPreviewCache::~PresenterPreviewCache (void)
+PresenterPreviewCache::~PresenterPreviewCache()
{
}
@@ -171,7 +171,7 @@ void SAL_CALL PresenterPreviewCache::removePreviewCreationNotifyListener (
mpCacheContext->RemovePreviewCreationNotifyListener(rxListener);
}
-void SAL_CALL PresenterPreviewCache::pause (void)
+void SAL_CALL PresenterPreviewCache::pause()
throw (css::uno::RuntimeException, std::exception)
{
ThrowIfDisposed();
@@ -179,7 +179,7 @@ void SAL_CALL PresenterPreviewCache::pause (void)
mpCache->Pause();
}
-void SAL_CALL PresenterPreviewCache::resume (void)
+void SAL_CALL PresenterPreviewCache::resume()
throw (css::uno::RuntimeException, std::exception)
{
ThrowIfDisposed();
@@ -187,7 +187,7 @@ void SAL_CALL PresenterPreviewCache::resume (void)
mpCache->Resume();
}
-void PresenterPreviewCache::ThrowIfDisposed (void)
+void PresenterPreviewCache::ThrowIfDisposed()
throw (::com::sun::star::lang::DisposedException)
{
if (rBHelper.bDisposed || rBHelper.bInDispose)
@@ -199,7 +199,7 @@ void PresenterPreviewCache::ThrowIfDisposed (void)
//===== PresenterPreviewCache::PresenterCacheContext ==========================
-PresenterPreviewCache::PresenterCacheContext::PresenterCacheContext (void)
+PresenterPreviewCache::PresenterCacheContext::PresenterCacheContext()
: mxSlides(),
mxDocument(),
mnFirstVisibleSlideIndex(-1),
@@ -208,7 +208,7 @@ PresenterPreviewCache::PresenterCacheContext::PresenterCacheContext (void)
{
}
-PresenterPreviewCache::PresenterCacheContext::~PresenterCacheContext (void)
+PresenterPreviewCache::PresenterCacheContext::~PresenterCacheContext()
{
}
@@ -274,7 +274,7 @@ void PresenterPreviewCache::PresenterCacheContext::NotifyPreviewCreation (
CallListeners(nIndex);
}
-bool PresenterPreviewCache::PresenterCacheContext::IsIdle (void)
+bool PresenterPreviewCache::PresenterCacheContext::IsIdle()
{
return true;
}
@@ -337,7 +337,7 @@ sal_Int32 PresenterPreviewCache::PresenterCacheContext::GetPriority (CacheKey aK
return 0;
}
-Reference<XInterface> PresenterPreviewCache::PresenterCacheContext::GetModel (void)
+Reference<XInterface> PresenterPreviewCache::PresenterCacheContext::GetModel()
{
return mxDocument;
}
diff --git a/sd/source/ui/presenter/PresenterPreviewCache.hxx b/sd/source/ui/presenter/PresenterPreviewCache.hxx
index 28e7be95957a..fa680c72e0ca 100644
--- a/sd/source/ui/presenter/PresenterPreviewCache.hxx
+++ b/sd/source/ui/presenter/PresenterPreviewCache.hxx
@@ -47,7 +47,7 @@ class PresenterPreviewCache
{
public:
PresenterPreviewCache (const css::uno::Reference<css::uno::XComponentContext>& rxContext);
- virtual ~PresenterPreviewCache (void);
+ virtual ~PresenterPreviewCache();
// XInitialize
@@ -87,10 +87,10 @@ public:
const css::uno::Reference<css::drawing::XSlidePreviewCacheListener>& rxListener)
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL pause (void)
+ virtual void SAL_CALL pause()
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL resume (void)
+ virtual void SAL_CALL resume()
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
private:
@@ -103,7 +103,7 @@ private:
/** This method throws a DisposedException when the object has already been
disposed.
*/
- void ThrowIfDisposed (void) throw (css::lang::DisposedException);
+ void ThrowIfDisposed() throw (css::lang::DisposedException);
};
} } // end of namespace ::sd::presenter
diff --git a/sd/source/ui/presenter/PresenterTextView.cxx b/sd/source/ui/presenter/PresenterTextView.cxx
index b9fe2662921e..7fde4a4c5e08 100644
--- a/sd/source/ui/presenter/PresenterTextView.cxx
+++ b/sd/source/ui/presenter/PresenterTextView.cxx
@@ -64,20 +64,20 @@ public:
const OUString msTopRelativePropertyName;
const OUString msTotalHeightPropertyName;
- Implementation (void);
- ~Implementation (void);
+ Implementation();
+ ~Implementation();
void SetCanvas (const cppcanvas::CanvasSharedPtr& rCanvas);
void SetSize (const Size aSize);
void SetBackgroundColor (const Color aColor);
void SetTextColor (const Color aColor);
void SetFontDescriptor (const awt::FontDescriptor& rFontDescriptor);
- sal_Int32 GetTop (void) const { return mnTop;}
+ sal_Int32 GetTop() const { return mnTop;}
void SetTop (const sal_Int32 nTop);
void SetText (const OUString& Text);
sal_Int32 ParseDistance (const OUString& rsDistance) const;
- Reference<rendering::XBitmap> GetBitmap (void);
- sal_Int32 GetTotalHeight (void);
+ Reference<rendering::XBitmap> GetBitmap();
+ sal_Int32 GetTotalHeight();
private:
Reference<rendering::XBitmap> mxBitmap;
@@ -92,9 +92,9 @@ private:
sal_Int32 mnTop;
sal_Int32 mnTotalHeight;
- EditEngine * GetEditEngine (void);
- EditEngine* CreateEditEngine (void);
- void CheckTop (void);
+ EditEngine * GetEditEngine();
+ EditEngine* CreateEditEngine();
+ void CheckTop();
};
// PresenterTextView
@@ -105,11 +105,11 @@ PresenterTextView::PresenterTextView (const Reference<XComponentContext>& rxCont
(void)rxContext;
}
-PresenterTextView::~PresenterTextView (void)
+PresenterTextView::~PresenterTextView()
{
}
-void SAL_CALL PresenterTextView::disposing (void)
+void SAL_CALL PresenterTextView::disposing()
{
mpImplementation.reset();
}
@@ -217,7 +217,7 @@ Any PresenterTextView::SetPropertyValue (
return aOldValue;
}
-void PresenterTextView::ThrowIfDisposed (void)
+void PresenterTextView::ThrowIfDisposed()
throw (::com::sun::star::lang::DisposedException)
{
if (PresenterTextViewInterfaceBase::rBHelper.bDisposed
@@ -230,7 +230,7 @@ void PresenterTextView::ThrowIfDisposed (void)
}
// PresenterTextView::Implementation
-PresenterTextView::Implementation::Implementation (void)
+PresenterTextView::Implementation::Implementation()
: msTextPropertyName("Text"),
msBitmapPropertyName("Bitmap"),
msSizePropertyName("Size"),
@@ -257,21 +257,21 @@ PresenterTextView::Implementation::Implementation (void)
GetEditEngine();
}
-PresenterTextView::Implementation::~Implementation (void)
+PresenterTextView::Implementation::~Implementation()
{
delete mpEditEngine;
SfxItemPool::Free(mpEditEngineItemPool);
delete mpOutputDevice;
}
-EditEngine * PresenterTextView::Implementation::GetEditEngine (void)
+EditEngine * PresenterTextView::Implementation::GetEditEngine()
{
if (mpEditEngine == NULL)
mpEditEngine = CreateEditEngine ();
return mpEditEngine;
}
-EditEngine* PresenterTextView::Implementation::CreateEditEngine (void)
+EditEngine* PresenterTextView::Implementation::CreateEditEngine()
{
EditEngine* pEditEngine = mpEditEngine;
if (pEditEngine == NULL)
@@ -447,7 +447,7 @@ sal_Int32 PresenterTextView::Implementation::ParseDistance (const OUString& rsDi
return nDistance;
}
-Reference<rendering::XBitmap> PresenterTextView::Implementation::GetBitmap (void)
+Reference<rendering::XBitmap> PresenterTextView::Implementation::GetBitmap()
{
DBG_ASSERT(mpEditEngine!=NULL, "EditEngine missing");
@@ -484,7 +484,7 @@ Reference<rendering::XBitmap> PresenterTextView::Implementation::GetBitmap (void
return mxBitmap;
}
-sal_Int32 PresenterTextView::Implementation::GetTotalHeight (void)
+sal_Int32 PresenterTextView::Implementation::GetTotalHeight()
{
DBG_ASSERT(mpEditEngine!=NULL, "EditEngine missing");
@@ -497,7 +497,7 @@ sal_Int32 PresenterTextView::Implementation::GetTotalHeight (void)
return mnTotalHeight;
}
-void PresenterTextView::Implementation::CheckTop (void)
+void PresenterTextView::Implementation::CheckTop()
{
DBG_ASSERT(mpEditEngine!=NULL, "EditEngine missing");
diff --git a/sd/source/ui/presenter/PresenterTextView.hxx b/sd/source/ui/presenter/PresenterTextView.hxx
index 21a878dcc698..2927e3831499 100644
--- a/sd/source/ui/presenter/PresenterTextView.hxx
+++ b/sd/source/ui/presenter/PresenterTextView.hxx
@@ -50,7 +50,7 @@ class PresenterTextView
{
public:
explicit PresenterTextView (const css::uno::Reference<css::uno::XComponentContext>& rxContext);
- virtual ~PresenterTextView (void);
+ virtual ~PresenterTextView();
// XInitialization
@@ -58,7 +58,7 @@ public:
throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
protected:
- virtual void SAL_CALL disposing (void) SAL_OVERRIDE;
+ virtual void SAL_CALL disposing() SAL_OVERRIDE;
virtual css::uno::Any GetPropertyValue (
const OUString& rsPropertyName) SAL_OVERRIDE;
@@ -73,7 +73,7 @@ private:
/** This method throws a DisposedException when the object has already been
disposed.
*/
- void ThrowIfDisposed (void) throw (css::lang::DisposedException);
+ void ThrowIfDisposed() throw (css::lang::DisposedException);
};
} } // end of namespace ::sd::presenter
diff --git a/sd/source/ui/presenter/SlideRenderer.cxx b/sd/source/ui/presenter/SlideRenderer.cxx
index bec55173cf9a..f64f6c515cc0 100644
--- a/sd/source/ui/presenter/SlideRenderer.cxx
+++ b/sd/source/ui/presenter/SlideRenderer.cxx
@@ -41,11 +41,11 @@ SlideRenderer::SlideRenderer (const Reference<XComponentContext>& rxContext)
(void)rxContext;
}
-SlideRenderer::~SlideRenderer (void)
+SlideRenderer::~SlideRenderer()
{
}
-void SAL_CALL SlideRenderer::disposing (void)
+void SAL_CALL SlideRenderer::disposing()
{
}
@@ -197,7 +197,7 @@ BitmapEx SlideRenderer::CreatePreview (
}
}
-void SlideRenderer::ThrowIfDisposed (void)
+void SlideRenderer::ThrowIfDisposed()
throw (::com::sun::star::lang::DisposedException)
{
if (SlideRendererInterfaceBase::rBHelper.bDisposed || SlideRendererInterfaceBase::rBHelper.bInDispose)
diff --git a/sd/source/ui/presenter/SlideRenderer.hxx b/sd/source/ui/presenter/SlideRenderer.hxx
index 19846faca260..d99459019ab9 100644
--- a/sd/source/ui/presenter/SlideRenderer.hxx
+++ b/sd/source/ui/presenter/SlideRenderer.hxx
@@ -51,8 +51,8 @@ class SlideRenderer
{
public:
explicit SlideRenderer (const css::uno::Reference<css::uno::XComponentContext>& rxContext);
- virtual ~SlideRenderer (void);
- virtual void SAL_CALL disposing (void) SAL_OVERRIDE;
+ virtual ~SlideRenderer();
+ virtual void SAL_CALL disposing() SAL_OVERRIDE;
// XInitialization
@@ -100,7 +100,7 @@ private:
/** This method throws a DisposedException when the object has already been
disposed.
*/
- void ThrowIfDisposed (void) throw (css::lang::DisposedException);
+ void ThrowIfDisposed() throw (css::lang::DisposedException);
};
} } // end of namespace ::sd::presenter