[Libreoffice-commits] core.git: embedserv/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Oct 22 13:59:17 UTC 2018
embedserv/source/inprocserv/inprocembobj.cxx | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
New commits:
commit 9c51e6fb8915bb084d25a58a6eb217f17ecf308b
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Oct 22 10:00:22 2018 +0100
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Oct 22 15:58:55 2018 +0200
pvs-studio: V716 Suspicious type conversion in return statement
https://docs.microsoft.com/en-us/windows/desktop/api/objidl/nf-objidl-irunnableobject-isrunning
has IRunnableObject::IsRunning as returning BOOL unlike ::Run which returns HRESULT
Change-Id: I992d8ba33502eff56b582e1cb9b73f6227c383b8
Reviewed-on: https://gerrit.libreoffice.org/62169
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/embedserv/source/inprocserv/inprocembobj.cxx b/embedserv/source/inprocserv/inprocembobj.cxx
index cffa2cf03c58..32d27fd37089 100644
--- a/embedserv/source/inprocserv/inprocembobj.cxx
+++ b/embedserv/source/inprocserv/inprocembobj.cxx
@@ -1283,10 +1283,9 @@ STDMETHODIMP InprocEmbedDocument_Impl::Run( LPBINDCTX pbc )
return E_FAIL;
}
-
BOOL STDMETHODCALLTYPE InprocEmbedDocument_Impl::IsRunning()
{
- if ( CheckDefHandler() )
+ if (CheckDefHandler())
{
ComSmart< IRunnableObject > pIRunObj;
HRESULT hr = m_pDefHandler->QueryInterface( IID_IRunnableObject, reinterpret_cast<void**>(&pIRunObj) );
@@ -1296,11 +1295,9 @@ BOOL STDMETHODCALLTYPE InprocEmbedDocument_Impl::IsRunning()
return pIRunObj->IsRunning();
}
- return E_FAIL;
-
+ return FALSE;
}
-
STDMETHODIMP InprocEmbedDocument_Impl::LockRunning( BOOL fLock, BOOL fLastUnlockCloses )
{
if ( CheckDefHandler() )
More information about the Libreoffice-commits
mailing list