[Libreoffice-commits] core.git: extensions/source

Julien Nabet serval2412 at yahoo.fr
Sat Mar 18 11:08:04 UTC 2017


 extensions/source/ole/unoobjw.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 468d2964e9c30df4cdbfcab000b1f513021a22d3
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sat Mar 18 11:12:35 2017 +0100

    cppcheck: nullPointer
    
    Avoid to forget E_POINTER return value
    
    Change-Id: I1887d20c7d73dcd3c6ddc1287b6c1ad6c13dd69f
    Reviewed-on: https://gerrit.libreoffice.org/35394
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>

diff --git a/extensions/source/ole/unoobjw.cxx b/extensions/source/ole/unoobjw.cxx
index 0262723d5eeb..63c7cf30272d 100644
--- a/extensions/source/ole/unoobjw.cxx
+++ b/extensions/source/ole/unoobjw.cxx
@@ -1060,7 +1060,7 @@ HRESULT InterfaceOleWrapper_Impl::InvokeGeneral( DISPID dispidMember, unsigned s
         {
             bHandled= true;
             if( !pvarResult)
-                ret= E_POINTER;
+                return E_POINTER;
             CComObject< JScriptValue>* pValue;
             if( SUCCEEDED( CComObject<JScriptValue>::CreateInstance( &pValue)))
             {
@@ -1104,7 +1104,7 @@ HRESULT InterfaceOleWrapper_Impl::InvokeGeneral( DISPID dispidMember, unsigned s
         {
             bHandled= true;
             if( !pvarResult)
-                ret= E_POINTER;
+                return E_POINTER;
             // the first parameter is in DISPPARAMS rgvargs contains the name of the struct.
             CComVariant arg;
             if( pdispparams->cArgs != 1)


More information about the Libreoffice-commits mailing list