Kaydet (Commit) 83d807ba authored tarafından Noel Grandin's avatar Noel Grandin

svtools: sal_Bool->bool and remove virtual

remove virtual from AcceleratorExecute::execute because nothing
seems to override it.

Change-Id: Idac00ce421f2a46921347b976b7658aac9097ee2
üst cc20f52a
...@@ -180,13 +180,13 @@ class SVT_DLLPUBLIC AcceleratorExecute : private TMutexInit ...@@ -180,13 +180,13 @@ class SVT_DLLPUBLIC AcceleratorExecute : private TMutexInit
@param aKey @param aKey
specify the accelerator for execute. specify the accelerator for execute.
@return [sal_Bool] @return [bool]
sal_True if this key is configured and match to a command. true if this key is configured and match to a command.
Attention: This state does not mean the success state Attention: This state does not mean the success state
of the corresponding execute. Because its done asynchronous! of the corresponding execute. Because its done asynchronous!
*/ */
virtual sal_Bool execute(const KeyCode& aKey); bool execute(const KeyCode& aKey);
virtual sal_Bool execute(const css::awt::KeyEvent& aKey); bool execute(const css::awt::KeyEvent& aKey);
/** search the command for the given key event. /** search the command for the given key event.
* *
......
...@@ -169,20 +169,20 @@ void AcceleratorExecute::init(const css::uno::Reference< css::uno::XComponentCon ...@@ -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); css::awt::KeyEvent aAWTKey = AcceleratorExecute::st_VCLKey2AWTKey(aVCLKey);
return execute(aAWTKey); 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); OUString sCommand = impl_ts_findCommand(aAWTKey);
// No Command found? Do nothing! User isnt interested on any error handling .-) // No Command found? Do nothing! User isnt interested on any error handling .-)
if (sCommand.isEmpty()) if (sCommand.isEmpty())
return sal_False; return false;
// SAFE -> ---------------------------------- // SAFE -> ----------------------------------
::osl::ResettableMutexGuard aLock(m_aLock); ::osl::ResettableMutexGuard aLock(m_aLock);
...@@ -200,7 +200,7 @@ sal_Bool AcceleratorExecute::execute(const css::awt::KeyEvent& aAWTKey) ...@@ -200,7 +200,7 @@ sal_Bool AcceleratorExecute::execute(const css::awt::KeyEvent& aAWTKey)
// ask for dispatch object // ask for dispatch object
css::uno::Reference< css::frame::XDispatch > xDispatch = xProvider->queryDispatch(aURL, OUString(), 0); css::uno::Reference< css::frame::XDispatch > xDispatch = xProvider->queryDispatch(aURL, OUString(), 0);
sal_Bool bRet = xDispatch.is(); bool bRet = xDispatch.is();
if ( bRet ) if ( bRet )
{ {
// Note: Such instance can be used one times only and destroy itself afterwards .-) // Note: Such instance can be used one times only and destroy itself afterwards .-)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment