summaryrefslogtreecommitdiffstats
path: root/sd/source/ui/tools/EventMultiplexer.cxx
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2016-10-27 14:49:43 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2016-10-28 07:08:47 +0000
commit89687d651eabcf64816c1b25defe38c7b68dd468 (patch)
treeaa7e6f0848424d408a992815feab4f3e6ee6495d /sd/source/ui/tools/EventMultiplexer.cxx
parentloplugin:expandablemethods in scaddins..scripting (diff)
downloadcore-89687d651eabcf64816c1b25defe38c7b68dd468.tar.gz
core-89687d651eabcf64816c1b25defe38c7b68dd468.zip
loplugin:expandablemethods in sd
Change-Id: I87a537928bdf42285448bba7cb50c497f2637c3c Reviewed-on: https://gerrit.libreoffice.org/30330 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd/source/ui/tools/EventMultiplexer.cxx')
-rw-r--r--sd/source/ui/tools/EventMultiplexer.cxx24
1 files changed, 6 insertions, 18 deletions
diff --git a/sd/source/ui/tools/EventMultiplexer.cxx b/sd/source/ui/tools/EventMultiplexer.cxx
index fc5aae457e25..8a38ebdf59bf 100644
--- a/sd/source/ui/tools/EventMultiplexer.cxx
+++ b/sd/source/ui/tools/EventMultiplexer.cxx
@@ -142,12 +142,6 @@ private:
EventMultiplexerEventId eId,
void* pUserData = nullptr);
- /** This method throws a DisposedException when the object has already been
- disposed.
- */
- void ThrowIfDisposed()
- throw (css::lang::DisposedException);
-
DECL_LINK(SlideSorterSelectionChangeListener, LinkParamNone*, void);
};
@@ -484,7 +478,12 @@ void SAL_CALL EventMultiplexer::Implementation::propertyChange (
const beans::PropertyChangeEvent& rEvent)
throw (RuntimeException, std::exception)
{
- ThrowIfDisposed();
+ if (rBHelper.bDisposed || rBHelper.bInDispose)
+ {
+ throw lang::DisposedException (
+ "SlideSorterController object has already been disposed",
+ static_cast<uno::XWeak*>(this));
+ }
if ( rEvent.PropertyName == aCurrentPagePropertyName )
{
@@ -618,17 +617,6 @@ void SAL_CALL EventMultiplexer::Implementation::disposing()
ReleaseListeners();
}
-void EventMultiplexer::Implementation::ThrowIfDisposed()
- throw (css::lang::DisposedException)
-{
- if (rBHelper.bDisposed || rBHelper.bInDispose)
- {
- throw lang::DisposedException (
- "SlideSorterController object has already been disposed",
- static_cast<uno::XWeak*>(this));
- }
-}
-
void EventMultiplexer::Implementation::Notify (
SfxBroadcaster&,
const SfxHint& rHint)