diff options
| author | Noel Grandin <noel@peralex.com> | 2014-04-24 11:37:21 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-04-24 14:17:24 +0200 |
| commit | 532acfde021fb78de64faefeb561632b333931a2 (patch) | |
| tree | 6a445d7ac976d2101fb8425e79205ae3afe97414 | |
| parent | f5a4280122900f36193126bf7c97256159fa7af3 (diff) | |
make SvDetachedEventDescriptor::hasByName return bool
Also, since this is a utility method, and it does not override
a method from an UNO interface, it does not need to be virtual.
Change-Id: I2dd90331e8ff49572bdfcb6ea2e2e3ed2fd95051
| -rw-r--r-- | include/svtools/unoevent.hxx | 6 | ||||
| -rw-r--r-- | svtools/source/uno/unoevent.cxx | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/svtools/unoevent.hxx b/include/svtools/unoevent.hxx index e3d2ef788d86..cdcfb2e9702e 100644 --- a/include/svtools/unoevent.hxx +++ b/include/svtools/unoevent.hxx @@ -290,11 +290,11 @@ protected: ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; /// do we have an event? - /// return sal_True: we have a macro for the event - /// return sal_False: no macro; getByName() will return an empty macro + /// return true: we have a macro for the event + /// return false: no macro; getByName() will return an empty macro /// IllegalArgumentException: the event is not supported using SvBaseEventDescriptor::hasByName; - virtual sal_Bool hasByName( + bool hasByName( const sal_uInt16 nEvent ) const /// item ID of event throw( ::com::sun::star::lang::IllegalArgumentException); diff --git a/svtools/source/uno/unoevent.cxx b/svtools/source/uno/unoevent.cxx index dc3dfe770675..79c9c2b8cff2 100644 --- a/svtools/source/uno/unoevent.cxx +++ b/svtools/source/uno/unoevent.cxx @@ -497,7 +497,7 @@ void SvDetachedEventDescriptor::getByName( rMacro = (*aMacros[nIndex]); } -sal_Bool SvDetachedEventDescriptor::hasByName( +bool SvDetachedEventDescriptor::hasByName( const sal_uInt16 nEvent ) const /// item ID of event throw(IllegalArgumentException) { @@ -505,7 +505,7 @@ sal_Bool SvDetachedEventDescriptor::hasByName( if (-1 == nIndex) throw IllegalArgumentException(); - return (NULL == aMacros[nIndex]) ? sal_False : aMacros[nIndex]->HasMacro(); + return (NULL != aMacros[nIndex]) && aMacros[nIndex]->HasMacro(); } |