[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - winaccessibility/source

Michael Meeks michael.meeks at collabora.com
Mon Jan 27 10:04:20 PST 2014


 winaccessibility/source/UAccCOM/AccRelation.cxx |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 514c1ed971dfb9978848ba667598b336ad2943d2
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Mon Jan 27 17:59:51 2014 +0000

    fdo#73464 - get relation BSTR allocation right.
    
    Change-Id: I270bc9c8e0507f44d2c27639e86002c60f4e2e6d

diff --git a/winaccessibility/source/UAccCOM/AccRelation.cxx b/winaccessibility/source/UAccCOM/AccRelation.cxx
index ec52830..81e7fed 100644
--- a/winaccessibility/source/UAccCOM/AccRelation.cxx
+++ b/winaccessibility/source/UAccCOM/AccRelation.cxx
@@ -206,9 +206,7 @@ BSTR CAccRelation::getRelationTypeBSTR(int type)
             {IA2_RELATION_DESCRIBED_BY  ,  10},
         };
 
-    USES_CONVERSION;
-
-    return (type >= 0 && type <= 10) ? map[type].string : _T("");
+    return ::SysAllocString((type >= 0 && type <= 10) ? map[type].string : _T(""));
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */


More information about the Libreoffice-commits mailing list