diff options
| author | Noel Grandin <noel@peralex.com> | 2014-03-19 11:18:00 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-03-24 08:12:07 +0200 |
| commit | 83d807ba78bfc0b1648e0b574af0d490352bc469 (patch) | |
| tree | 224008f77519a8682f46640378fee08cd09e78a6 | |
| parent | cc20f52a15abb218284ec69da25c75919f4947c9 (diff) | |
svtools: sal_Bool->bool and remove virtual
remove virtual from AcceleratorExecute::execute because nothing
seems to override it.
Change-Id: Idac00ce421f2a46921347b976b7658aac9097ee2
| -rw-r--r-- | include/svtools/acceleratorexecute.hxx | 8 | ||||
| -rw-r--r-- | svtools/source/misc/acceleratorexecute.cxx | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/include/svtools/acceleratorexecute.hxx b/include/svtools/acceleratorexecute.hxx index 8cf6d3fe8e08..5ae1f76b2dde 100644 --- a/include/svtools/acceleratorexecute.hxx +++ b/include/svtools/acceleratorexecute.hxx @@ -180,13 +180,13 @@ class SVT_DLLPUBLIC AcceleratorExecute : private TMutexInit @param aKey specify the accelerator for execute. - @return [sal_Bool] - sal_True if this key is configured and match to a command. + @return [bool] + true if this key is configured and match to a command. Attention: This state does not mean the success state of the corresponding execute. Because its done asynchronous! */ - virtual sal_Bool execute(const KeyCode& aKey); - virtual sal_Bool execute(const css::awt::KeyEvent& aKey); + bool execute(const KeyCode& aKey); + bool execute(const css::awt::KeyEvent& aKey); /** search the command for the given key event. * diff --git a/svtools/source/misc/acceleratorexecute.cxx b/svtools/source/misc/acceleratorexecute.cxx index 36c0457ffe1a..3cb104a029dd 100644 --- a/svtools/source/misc/acceleratorexecute.cxx +++ b/svtools/source/misc/acceleratorexecute.cxx @@ -169,20 +169,20 @@ void AcceleratorExecute::init(const css::uno::Reference< css::uno::XComponentCon } -sal_Bool AcceleratorExecute::execute(const KeyCode& aVCLKey) +bool AcceleratorExecute::execute(const KeyCode& aVCLKey) { css::awt::KeyEvent aAWTKey = AcceleratorExecute::st_VCLKey2AWTKey(aVCLKey); return execute(aAWTKey); } -sal_Bool AcceleratorExecute::execute(const css::awt::KeyEvent& aAWTKey) +bool AcceleratorExecute::execute(const css::awt::KeyEvent& aAWTKey) { OUString sCommand = impl_ts_findCommand(aAWTKey); // No Command found? Do nothing! User isnt interested on any error handling .-) if (sCommand.isEmpty()) - return sal_False; + return false; // SAFE -> ---------------------------------- ::osl::ResettableMutexGuard aLock(m_aLock); @@ -200,7 +200,7 @@ sal_Bool AcceleratorExecute::execute(const css::awt::KeyEvent& aAWTKey) // ask for dispatch object css::uno::Reference< css::frame::XDispatch > xDispatch = xProvider->queryDispatch(aURL, OUString(), 0); - sal_Bool bRet = xDispatch.is(); + bool bRet = xDispatch.is(); if ( bRet ) { // Note: Such instance can be used one times only and destroy itself afterwards .-) |