[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - xmlhelp/source

[Caolán McNamara]

 xmlhelp/source/cxxhelp/provider/databases.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 090d7f01fdbdb0abff52b86b5145216c6835acfc
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Oct 24 16:20:08 2013 +0100

    valgrind: on success aHDFData is out of scope
    
    and pData points to data belonging to it
    
    (cherry picked from commit b7efab3a9841a9f01c5da07db870a22866b65b04)
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>
    
    Change-Id: I2a3c1f73e4cdcb07d21ef14cb410d351f39cdba8

diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx
index 331aa20..0c4bdab 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.cxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.cxx
@@ -767,12 +767,12 @@ void KeywordInfo::KeywordElement::init( Databases *pDatabases,helpdatafileproxy:
         listId[i] = id[i];
         listAnchor[i] = anchor[i];
 
+        helpdatafileproxy::HDFData aHDFData;
         const sal_Char* pData = NULL;
 
         if( pHdf )
         {
             OString idi( id[i].getStr(),id[i].getLength(),RTL_TEXTENCODING_UTF8 );
-            helpdatafileproxy::HDFData aHDFData;
             bool bSuccess = pHdf->getValueForKey( idi, aHDFData );
             if( bSuccess )
                 pData = aHDFData.getData();