From 41cd38f1866668ab114a3a5f6e5761778f6baa99 Mon Sep 17 00:00:00 2001
From: Ivo Hinkelmann <ihi@openoffice.org>
Date: Mon, 19 Nov 2007 12:00:56 +0000
Subject: INTEGRATION: CWS ab38 (1.22.8); FILE MERGED 2007/11/06 15:09:27 ab
 1.22.8.1: #i20164# Extension help support

---
 xmlhelp/source/cxxhelp/provider/provider.cxx | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

(limited to 'xmlhelp/source')

diff --git a/xmlhelp/source/cxxhelp/provider/provider.cxx b/xmlhelp/source/cxxhelp/provider/provider.cxx
index eacd7c35b4b1..b0761463a14a 100644
--- a/xmlhelp/source/cxxhelp/provider/provider.cxx
+++ b/xmlhelp/source/cxxhelp/provider/provider.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: provider.cxx,v $
  *
- *  $Revision: 1.22 $
+ *  $Revision: 1.23 $
  *
- *  last change: $Author: ihi $ $Date: 2007-06-05 18:28:52 $
+ *  last change: $Author: ihi $ $Date: 2007-11-19 13:00:56 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -85,6 +85,8 @@
 #ifndef _COM_SUN_STAR_CONTAINER_XNAMEREPLACE_HPP_
 #include <com/sun/star/container/XNameReplace.hpp>
 #endif
+#include <com/sun/star/uno/XComponentContext.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
 
 using namespace com::sun::star;
 using namespace chelp;
@@ -379,6 +381,16 @@ void ContentProvider::init()
     subst( aPath );
     aImagesZipPaths[ 1 ] = aPath;
 
+    uno::Reference< uno::XComponentContext > xContext;
+    uno::Reference< beans::XPropertySet > xProps( m_xSMgr, uno::UNO_QUERY );
+    OSL_ASSERT( xProps.is() );
+    if (xProps.is())
+    {
+        xProps->getPropertyValue(
+            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("DefaultContext") ) ) >>= xContext;
+        OSL_ASSERT( xContext.is() );
+    }
+
     sal_Bool showBasic = getBooleanKey(xHierAccess,"Help/ShowBasic");
     m_pDatabases = new Databases( showBasic,
                                   instPath,
@@ -389,7 +401,7 @@ void ContentProvider::init()
                                   vendorversion,
                                   vendorshort,
                                   stylesheet,
-                                  m_xSMgr );
+                                  xContext );
 }
 
 uno::Reference< lang::XMultiServiceFactory >
-- 
cgit