From 703583704eeafafa95de529e7a55fba8e6472774 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=BCdiger=20Timm?= Date: Mon, 3 May 2004 12:58:08 +0000 Subject: [PATCH] INTEGRATION: CWS binfilter (1.19.20); FILE MERGED 2004/04/05 19:15:01 aw 1.19.20.2: RESYNC: (1.19-1.20); FILE MERGED 2003/10/22 15:04:00 dbo 1.19.20.1: #112766# passing context's service manager --- cppuhelper/source/factory.cxx | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/cppuhelper/source/factory.cxx b/cppuhelper/source/factory.cxx index eaf3298eae42..b3fcf3336d10 100644 --- a/cppuhelper/source/factory.cxx +++ b/cppuhelper/source/factory.cxx @@ -2,9 +2,9 @@ * * $RCSfile: factory.cxx,v $ * - * $Revision: 1.21 $ + * $Revision: 1.22 $ * - * last change: $Author: rt $ $Date: 2004-03-30 14:45:46 $ + * last change: $Author: rt $ $Date: 2004-05-03 13:58:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -224,12 +224,13 @@ Reference OSingleFactoryHelper::createInstanceEveryTime( } else if( pCreateFunction ) { -#if OSL_DEBUG_LEVEL > 1 if (xContext.is()) { - OSL_TRACE( "### ignoring context calling OSingleFactoryHelper::createInstanceEveryTime()!\n" ); + Reference< lang::XMultiServiceFactory > xContextMgr( + xContext->getServiceManager(), UNO_QUERY ); + if (xContextMgr.is()) + return (*pCreateFunction)( xContextMgr ); } -#endif return (*pCreateFunction)( xSMgr ); } else