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

[Michael Meeks]

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

New commits:
commit efed46563307075fb19bac3177e9d3243eb39ef5
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: Iceffca157643c2d73f581b655b39e09486c83897
    Reviewed-on: https://gerrit.libreoffice.org/7700
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Norbert Thiebaud <nthiebaud at gmail.com>

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: */