diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-05-03 12:58:08 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-05-03 12:58:08 +0000 |
| commit | 703583704eeafafa95de529e7a55fba8e6472774 (patch) | |
| tree | 2ce80fdea822212e30f4024e71b719813f10f7a9 /cppuhelper | |
| parent | ec9a851027c4f3b0565d5978e9b356e7403e6c5d (diff) | |
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
Diffstat (limited to 'cppuhelper')
| -rw-r--r-- | cppuhelper/source/factory.cxx | 11 |
1 files 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<XInterface > 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 |