editeng/source/misc/unolingu.cxx | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-)
New commits: commit 4e2cc748f5ec00ef6ed326ec03aff8f0cd8c9654 Author: Stephan Bergmann <sberg...@redhat.com> Date: Thu Jun 12 15:26:06 2014 +0200 Clean up Change-Id: I3fc017fb5ef1fe704d273d667405eee588fa35cb diff --git a/editeng/source/misc/unolingu.cxx b/editeng/source/misc/unolingu.cxx index e9c087b..049e71d 100644 --- a/editeng/source/misc/unolingu.cxx +++ b/editeng/source/misc/unolingu.cxx @@ -432,26 +432,25 @@ uno::Reference< linguistic2::XPossibleHyphens > SAL_CALL } -typedef cppu::WeakImplHelper1 < XEventListener > LinguMgrAppExitLstnrBaseClass; +typedef cppu::WeakImplHelper1 < XEventListener > LinguMgrExitLstnrBaseClass; -class LinguMgrAppExitLstnr : public LinguMgrAppExitLstnrBaseClass +class LinguMgrExitLstnr : public LinguMgrExitLstnrBaseClass { uno::Reference< XDesktop2 > xDesktop; -public: - LinguMgrAppExitLstnr(); - virtual ~LinguMgrAppExitLstnr(); - - virtual void AtExit() = 0; + void AtExit(); +public: + LinguMgrExitLstnr(); + virtual ~LinguMgrExitLstnr(); // lang::XEventListener virtual void SAL_CALL disposing(const EventObject& rSource) throw( RuntimeException, std::exception ) SAL_OVERRIDE; }; -LinguMgrAppExitLstnr::LinguMgrAppExitLstnr() +LinguMgrExitLstnr::LinguMgrExitLstnr() { // add object to frame::Desktop EventListeners in order to properly call // the AtExit function at appliction exit. @@ -461,7 +460,7 @@ LinguMgrAppExitLstnr::LinguMgrAppExitLstnr() xDesktop->addEventListener( this ); } -LinguMgrAppExitLstnr::~LinguMgrAppExitLstnr() +LinguMgrExitLstnr::~LinguMgrExitLstnr() { if (xDesktop.is()) { @@ -471,7 +470,7 @@ LinguMgrAppExitLstnr::~LinguMgrAppExitLstnr() OSL_ENSURE(!xDesktop.is(), "reference to desktop should be realeased"); } -void LinguMgrAppExitLstnr::disposing(const EventObject& rSource) +void LinguMgrExitLstnr::disposing(const EventObject& rSource) throw( RuntimeException, std::exception ) { if (xDesktop.is() && rSource.Source == xDesktop) @@ -483,12 +482,6 @@ void LinguMgrAppExitLstnr::disposing(const EventObject& rSource) } } -class LinguMgrExitLstnr : public LinguMgrAppExitLstnr -{ -public: - virtual void AtExit() SAL_OVERRIDE; -}; - void LinguMgrExitLstnr::AtExit() { SolarMutexGuard g; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits