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

[Stephan Bergmann]

 xmlhelp/source/cxxhelp/provider/provider.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit f284ec139beb920486e8351f9e758966969349ab
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Jan 4 15:14:27 2016 +0100

    tdf#96855: Put back assignment of xHierAccess
    
    ...that had inadvertently been removed as part of a larger code removal in
    6948c546fdc00dddec7d58e03150dcc87921d6b2 "tdf#75637: Resolve help images via a
    vnd.libreoffice.image UCP"
    
    Change-Id: Ic2d5e1a5fa5a10b240bb9e511e6dcb8097e58081
    (cherry picked from commit 549e900b4b0047b8cb6c236ea50a3fc046e5fb51)
    Reviewed-on: https://gerrit.libreoffice.org/21081
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/xmlhelp/source/cxxhelp/provider/provider.cxx b/xmlhelp/source/cxxhelp/provider/provider.cxx
index 2df4bb5..ffac57d 100644
--- a/xmlhelp/source/cxxhelp/provider/provider.cxx
+++ b/xmlhelp/source/cxxhelp/provider/provider.cxx
@@ -323,6 +323,8 @@ void ContentProvider::init()
     }
 
     OUString productversion( setupversion + " " + setupextension );
+
+    xHierAccess = getHierAccess( sProvider,  "org.openoffice.Office.Common" );
     bool showBasic = getBooleanKey(xHierAccess,"Help/ShowBasic");
     m_pDatabases = new Databases( showBasic,
                                   instPath,