From fc7b677043318ca400080681762e8ea12aa295f7 Mon Sep 17 00:00:00 2001
From: Kurt Zenker <kz@openoffice.org>
Date: Wed, 9 May 2007 12:26:19 +0000
Subject: [PATCH] INTEGRATION: CWS bunoexttm (1.13.28); FILE MERGED 2007/01/30
 15:46:24 kr 1.13.28.1: adapted: joined from UTF2 - add purposed env. support

---
 cppuhelper/source/tdmgr.cxx | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/cppuhelper/source/tdmgr.cxx b/cppuhelper/source/tdmgr.cxx
index 8ed792dcf2d8..26a3db78ba75 100644
--- a/cppuhelper/source/tdmgr.cxx
+++ b/cppuhelper/source/tdmgr.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: tdmgr.cxx,v $
  *
- *  $Revision: 1.13 $
+ *  $Revision: 1.14 $
  *
- *  last change: $Author: obo $ $Date: 2006-09-16 12:42:56 $
+ *  last change: $Author: kz $ $Date: 2007-05-09 13:26:19 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -44,6 +44,9 @@
 #include <rtl/alloc.h>
 #include <rtl/ustring.hxx>
 
+#include <uno/mapping.hxx>
+
+#include <cppuhelper/bootstrap.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <typelib/typedescription.h>
 
@@ -741,9 +744,20 @@ void EventListenerImpl::disposing( lang::EventObject const & rEvt )
 
 //==================================================================================================
 sal_Bool SAL_CALL installTypeDescriptionManager(
-    Reference< container::XHierarchicalNameAccess > const & xTDMgr )
+    Reference< container::XHierarchicalNameAccess > const & xTDMgr_c )
     SAL_THROW( () )
 {
+    uno::Environment curr_env(Environment::getCurrent());
+    uno::Environment target_env(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(CPPU_STRINGIFY(CPPU_ENV))));
+
+    uno::Mapping curr2target(curr_env, target_env);
+
+
+    Reference<container::XHierarchicalNameAccess> xTDMgr(
+        reinterpret_cast<container::XHierarchicalNameAccess *>(
+            curr2target.mapInterface(xTDMgr_c.get(), ::getCppuType(&xTDMgr_c))),
+        SAL_NO_ACQUIRE);
+
     Reference< lang::XComponent > xComp( xTDMgr, UNO_QUERY );
     if (xComp.is())
     {