[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - winaccessibility/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Fri Oct 26 18:29:10 UTC 2018


 winaccessibility/source/UAccCOM/AccTable.cxx |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

New commits:
commit ed0cba9301852feca3243338297121b4231cb0e3
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Oct 19 14:11:56 2018 +0100
Commit:     Michael Stahl <Michael.Stahl at cib.de>
CommitDate: Fri Oct 26 20:28:41 2018 +0200

    dubious SysAllocString check
    
    Change-Id: I1aece8321b12351b5e8a2d5c33e513531cbc95a1
    Reviewed-on: https://gerrit.libreoffice.org/62089
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>

diff --git a/winaccessibility/source/UAccCOM/AccTable.cxx b/winaccessibility/source/UAccCOM/AccTable.cxx
index dcd4ad2d65d7..6a872b277dc0 100644
--- a/winaccessibility/source/UAccCOM/AccTable.cxx
+++ b/winaccessibility/source/UAccCOM/AccTable.cxx
@@ -132,9 +132,9 @@ STDMETHODIMP CAccTable::get_columnDescription(long column, BSTR * description)
     const ::rtl::OUString& ouStr = GetXInterface()->getAccessibleColumnDescription(column);
     // #CHECK#
 
-    SAFE_SYSFREESTRING(*description);//??
+    SAFE_SYSFREESTRING(*description);
     *description = SysAllocString(o3tl::toW(ouStr.getStr()));
-    if(description==nullptr)
+    if (*description==nullptr)
         return E_FAIL;
     return S_OK;
 
@@ -353,9 +353,8 @@ STDMETHODIMP CAccTable::get_rowDescription(long row, BSTR * description)
 
     SAFE_SYSFREESTRING(*description);
     *description = SysAllocString(o3tl::toW(ouStr.getStr()));
-    if(description==nullptr)
+    if (*description==nullptr)
         return E_FAIL;
-
     return S_OK;
 
     LEAVE_PROTECTED_BLOCK


More information about the Libreoffice-commits mailing list