strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS binfilter (1.19.20); FILE MERGED

Browse source 
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
This commit is contained in:
Rüdiger Timm 2004-05-03 12:58:08 +00:00
parent ec9a851027
commit 703583704e
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
cppuhelper/source/factory.cxx
View file

@ -2,9 +2,9 @@
* *
* $RCSfile: factory.cxx,v $ * $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 * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@ -224,12 +224,13 @@ Reference<XInterface > OSingleFactoryHelper::createInstanceEveryTime(
} }
else if( pCreateFunction ) else if( pCreateFunction )
{ {
#if OSL_DEBUG_LEVEL > 1
if (xContext.is()) 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 ); return (*pCreateFunction)( xSMgr );
} }
else else