mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS scriptingf9 (1.7.6); FILE MERGED

Browse Source 
2004/11/16 12:32:10 toconnor 1.7.6.2: #i36849# MasterScriptProviderFactory should handle empty Any
2004/11/12 11:37:24 toconnor 1.7.6.1: #i36913# make ActiveMSPList a member of fMasterScriptProviderFactory
This commit is contained in:
Vladimir Glazounov
2004-12-23 10:50:05 +00:00
parent bf10cd0f4d
commit 584091c98f
1 changed files with 4 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
scripting/source/provider/ActiveMSPList.cxx
View File

@@ -2,9 +2,9 @@
*
* $RCSfile: ActiveMSPList.cxx,v $
*
* $Revision: 1.8 $
* $Revision: 1.9 $
*
* last change: $Author: rt $ $Date: 2004-12-07 10:54:07 $
* last change: $Author: vg $ $Date: 2004-12-23 11:50:05 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -61,7 +61,6 @@
#include <cppuhelper/implementationentry.hxx>
#include <cppuhelper/factory.hxx>
#include <cppuhelper/implbase1.hxx>
#include <util/scriptingconstants.hxx>
#include <util/util.hxx>
#include <util/MiscUtils.hxx>
@@ -155,8 +154,8 @@ ActiveMSPList::createMSP( const Any& aContext )
}
else
{
createNonDocMSPs();
return m_hMsps[ shareDirString ];
createNonDocMSPs();
return m_hMsps[ shareDirString ];
}
}
@@ -308,25 +307,6 @@ throw ( ::com::sun::star::uno::RuntimeException )
}
ActiveMSPList&
ActiveMSPList::instance( const Reference< XComponentContext > & xContext )
{
static ActiveMSPList* inst = 0;
// need to not only hold a static pointer to this object but also
// keep it aqcuired
static Reference< lang::XEventListener > holder;
if ( !inst )
{
::osl::MutexGuard guard( ::osl::Mutex::getGlobalMutex() );
if ( !inst )
{
inst = new ActiveMSPList( xContext );
holder = inst;
}
}
return *inst;
}
void
ActiveMSPList::createNonDocMSPs()
{