[Libreoffice-commits] .: Branch 'feature/android-single-dso' - 14 commits - basctl/source basctl/util binaryurp/source cui/source cui/util embeddedobj/source embedserv/source embedserv/util extensions/source filter/source forms/source forms/util fpicker/source io/source lingucomponent/source pyuno/source remotebridges/source scripting/source scripting/util
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Tue Oct 2 03:58:37 PDT 2012
basctl/source/basicide/register.cxx | 2 +-
basctl/util/basctl.component | 2 +-
binaryurp/source/binaryurp.component | 2 +-
binaryurp/source/bridgefactory.cxx | 2 +-
cui/source/uno/services.cxx | 2 +-
cui/util/cui.component | 2 +-
cui/util/cui.map | 2 +-
embeddedobj/source/msole/emboleobj.component | 2 +-
embeddedobj/source/msole/oleregister.cxx | 2 +-
embedserv/source/embed/register.cxx | 2 +-
embedserv/util/emser.component | 2 +-
extensions/source/abpilot/abp.component | 2 +-
extensions/source/abpilot/abpservices.cxx | 2 +-
extensions/source/bibliography/bib.component | 2 +-
extensions/source/bibliography/bibload.cxx | 2 +-
extensions/source/config/ldap/componentdef.cxx | 2 +-
extensions/source/config/ldap/ldapbe2.component | 2 +-
extensions/source/dbpilots/dbp.component | 2 +-
extensions/source/dbpilots/dbpservices.cxx | 2 +-
extensions/source/logging/log.component | 2 +-
extensions/source/logging/log_services.cxx | 2 +-
extensions/source/ole/oleautobridge.component | 2 +-
extensions/source/ole/servreg.cxx | 4 ++--
extensions/source/plugin/base/service.cxx | 2 +-
extensions/source/plugin/pl.component | 2 +-
extensions/source/propctrlr/pcr.component | 2 +-
extensions/source/propctrlr/pcrservices.cxx | 2 +-
extensions/source/resource/res.component | 2 +-
extensions/source/resource/resourceservices.cxx | 2 +-
extensions/source/scanner/scn.component | 2 +-
extensions/source/scanner/scnserv.cxx | 2 +-
extensions/source/update/check/updatecheckjob.cxx | 2 +-
extensions/source/update/check/updchk.uno.component | 2 +-
extensions/source/update/feed/updatefeed.component | 2 +-
extensions/source/update/feed/updatefeed.cxx | 2 +-
extensions/source/update/ui/updatecheckui.cxx | 2 +-
extensions/source/update/ui/updchk.component | 2 +-
filter/source/flash/flash.component | 2 +-
filter/source/flash/swfuno.cxx | 2 +-
filter/source/msfilter/msfilter.component | 2 +-
filter/source/msfilter/services.cxx | 2 +-
filter/source/pdf/pdffilter.component | 2 +-
filter/source/pdf/pdfuno.cxx | 2 +-
filter/source/placeware/placeware.component | 2 +-
filter/source/placeware/uno.cxx | 2 +-
filter/source/t602/filterenv.cxx | 6 +-----
filter/source/xmlfilteradaptor/genericfilter.cxx | 2 +-
filter/source/xmlfilteradaptor/xmlfa.component | 2 +-
filter/source/xmlfilterdetect/fdcomp.cxx | 10 ++--------
filter/source/xmlfilterdetect/xmlfd.component | 2 +-
filter/source/xsltdialog/xmlfilterdialogcomponent.cxx | 2 +-
filter/source/xsltdialog/xsltdlg.component | 2 +-
filter/source/xsltfilter/XSLTFilter.cxx | 2 +-
filter/source/xsltfilter/xsltfilter.component | 2 +-
forms/source/misc/services.cxx | 2 +-
forms/util/frm.component | 2 +-
fpicker/source/aqua/FPentry.mm | 2 +-
fpicker/source/aqua/fps_aqua.component | 2 +-
fpicker/source/generic/fpicker.component | 2 +-
fpicker/source/generic/fpicker.cxx | 2 +-
fpicker/source/office/fps_office.component | 2 +-
fpicker/source/office/fps_office.cxx | 2 +-
fpicker/source/win32/filepicker/FPentry.cxx | 2 +-
fpicker/source/win32/fps.component | 2 +-
io/source/TextInputStream/TextInputStream.cxx | 2 +-
io/source/TextInputStream/textinstream.component | 2 +-
io/source/TextOutputStream/TextOutputStream.cxx | 2 +-
io/source/TextOutputStream/textoutstream.component | 2 +-
io/source/acceptor/acceptor.component | 2 +-
io/source/acceptor/acceptor.cxx | 2 +-
io/source/connector/connector.component | 2 +-
io/source/connector/connector.cxx | 2 +-
io/source/stm/factreg.cxx | 2 +-
io/source/stm/streams.component | 2 +-
lingucomponent/source/spellcheck/macosxspell/MacOSXSpell.component | 2 +-
lingucomponent/source/spellcheck/macosxspell/macreg.mm | 2 +-
pyuno/source/loader/pythonloader.component | 2 +-
pyuno/source/loader/pyuno_loader.cxx | 2 +-
remotebridges/source/unourl_resolver/unourl_resolver.cxx | 4 ++--
remotebridges/source/unourl_resolver/uuresolver.component | 2 +-
scripting/source/basprov/basprov.component | 2 +-
scripting/source/basprov/basprov.cxx | 2 +-
scripting/source/dlgprov/dlgprov.component | 2 +-
scripting/source/dlgprov/dlgprov.cxx | 2 +-
scripting/source/protocolhandler/protocolhandler.component | 2 +-
scripting/source/protocolhandler/scripthandler.cxx | 2 +-
scripting/source/provider/MasterScriptProvider.cxx | 2 +-
scripting/source/stringresource/stringresource.component | 2 +-
scripting/source/stringresource/stringresource.cxx | 2 +-
scripting/source/vbaevents/service.cxx | 2 +-
scripting/source/vbaevents/vbaevents.component | 2 +-
scripting/util/scriptframe.component | 2 +-
92 files changed, 95 insertions(+), 105 deletions(-)
New commits:
commit 32ae78d4d83889f97732e609f6ac9eec1568a8ce
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Oct 1 21:54:06 2012 +0300
Use prefix
Change-Id: Ide081f18af82e68b55d6d48168a0a567e5e64f04
diff --git a/basctl/source/basicide/register.cxx b/basctl/source/basicide/register.cxx
index b284659..563cc62 100644
--- a/basctl/source/basicide/register.cxx
+++ b/basctl/source/basicide/register.cxx
@@ -36,7 +36,7 @@ using namespace ::com::sun::star::lang;
extern "C" {
-SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName,
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL basctl_component_getFactory( const sal_Char* pImplementationName,
void* pServiceManager,
void* pRegistryKey )
{
diff --git a/basctl/util/basctl.component b/basctl/util/basctl.component
index d9ecf79..a42ddff 100644
--- a/basctl/util/basctl.component
+++ b/basctl/util/basctl.component
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="basctl"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.basic.BasicIDE">
<service name="com.sun.star.script.BasicIDE"/>
commit 1c1750ddeb331b390e2ad0fd13d7bfa59c784256
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Oct 1 21:54:23 2012 +0300
Use prefix
Change-Id: Ic1fcb3078757d7948bbb4ddb155ab9584e861c12
diff --git a/binaryurp/source/binaryurp.component b/binaryurp/source/binaryurp.component
index f590854..37fb96f 100644
--- a/binaryurp/source/binaryurp.component
+++ b/binaryurp/source/binaryurp.component
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="binaryurp"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.bridge.BridgeFactory">
<service name="com.sun.star.bridge.BridgeFactory"/>
diff --git a/binaryurp/source/bridgefactory.cxx b/binaryurp/source/bridgefactory.cxx
index 634ddb3..4050e06 100644
--- a/binaryurp/source/bridgefactory.cxx
+++ b/binaryurp/source/bridgefactory.cxx
@@ -197,7 +197,7 @@ static cppu::ImplementationEntry const services[] = {
}
-extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL binaryurp_component_getFactory(
char const * pImplName, void * pServiceManager, void * pRegistryKey)
{
return cppu::component_getFactoryHelper(
commit 33b7a59a50e73e843154f9eb350ee9986293fe83
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Oct 1 21:54:40 2012 +0300
Use prefix
Change-Id: Id3d3df7869f6efb548ae44c3a6cac23dc1e21774
diff --git a/cui/source/uno/services.cxx b/cui/source/uno/services.cxx
index a63fd3c..8164dea 100644
--- a/cui/source/uno/services.cxx
+++ b/cui/source/uno/services.cxx
@@ -52,7 +52,7 @@ namespace
};
}
-extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( char const * implName, void * serviceManager, void * registryKey)
+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL cui_component_getFactory( char const * implName, void * serviceManager, void * registryKey)
{
return cppu::component_getFactoryHelper(implName, serviceManager, registryKey, entries);
}
diff --git a/cui/util/cui.component b/cui/util/cui.component
index 43cfdb5..ab11293 100644
--- a/cui/util/cui.component
+++ b/cui/util/cui.component
@@ -30,7 +30,7 @@
* instead of those above.
* -->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="cui"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.cui.ColorPicker">
<service name="com.sun.star.ui.dialogs.ColorPicker"/>
diff --git a/cui/util/cui.map b/cui/util/cui.map
index e0809cf..5f35b16 100644
--- a/cui/util/cui.map
+++ b/cui/util/cui.map
@@ -2,7 +2,7 @@ UDK_3_0_0 {
global:
CreateDialogFactory;
GetSpecialCharsForEdit;
- component_getFactory;
+ cui_component_getFactory;
local:
*;
};
commit 9af6c4280316ef54a45ba91ab3f8d2f5cee5e7c4
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Oct 1 22:00:53 2012 +0300
Use prefix
Change-Id: I28607f54eb06912ab1d27d80813d54cb6faa7771
diff --git a/embeddedobj/source/msole/emboleobj.component b/embeddedobj/source/msole/emboleobj.component
index 96f8ed0..1f59d8e 100644
--- a/embeddedobj/source/msole/emboleobj.component
+++ b/embeddedobj/source/msole/emboleobj.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="emboleobj"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.embed.OLEEmbeddedObjectFactory">
<service name="com.sun.star.comp.embed.OLEEmbeddedObjectFactory"/>
diff --git a/embeddedobj/source/msole/oleregister.cxx b/embeddedobj/source/msole/oleregister.cxx
index 608e69f..eaf3473 100644
--- a/embeddedobj/source/msole/oleregister.cxx
+++ b/embeddedobj/source/msole/oleregister.cxx
@@ -38,7 +38,7 @@ using namespace ::com::sun::star;
extern "C" {
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL emboleobj_component_getFactory(
const sal_Char * pImplName, void * pServiceManager,
SAL_UNUSED_PARAMETER void * /*pRegistryKey*/ )
{
commit e470a90a7717f23dfcd3acee9e5f5befbebaae08
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Oct 1 22:02:03 2012 +0300
Use prefix
Change-Id: I5514112b700c31fa7e30c70ca7764d4ae1170ed2
diff --git a/embedserv/source/embed/register.cxx b/embedserv/source/embed/register.cxx
index 58f4fca..e6d1fff 100644
--- a/embedserv/source/embed/register.cxx
+++ b/embedserv/source/embed/register.cxx
@@ -58,7 +58,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL EmbedServer_getSupportedServiceNames()
extern "C" {
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL emser_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
{
void * pRet = 0;
diff --git a/embedserv/util/emser.component b/embedserv/util/emser.component
index 29358c9..3e1b891 100644
--- a/embedserv/util/emser.component
+++ b/embedserv/util/emser.component
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="emser"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.ole.EmbedServer">
<service name="com.sun.star.document.OleEmbeddedServerRegistration"/>
commit 9f6c190caf4fe247a5b9bd1e45a279d454d1d477
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Oct 1 23:00:13 2012 +0300
Use prefix
Change-Id: Ica989983b36ff4df7f6d6ab529c3bc0efef984e1
diff --git a/extensions/source/abpilot/abp.component b/extensions/source/abpilot/abp.component
index a07cef9..83c42e5 100644
--- a/extensions/source/abpilot/abp.component
+++ b/extensions/source/abpilot/abp.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="abp"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="org.openoffice.comp.abp.OAddressBookSourcePilot">
<service name="com.sun.star.ui.dialogs.AddressBookSourcePilot"/>
diff --git a/extensions/source/abpilot/abpservices.cxx b/extensions/source/abpilot/abpservices.cxx
index c43d978..a7955d6 100644
--- a/extensions/source/abpilot/abpservices.cxx
+++ b/extensions/source/abpilot/abpservices.cxx
@@ -53,7 +53,7 @@ extern "C" void SAL_CALL abp_initializeModule()
}
//---------------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL abp_component_getFactory(
const sal_Char* pImplementationName,
void* pServiceManager,
void* /*pRegistryKey*/)
diff --git a/extensions/source/bibliography/bib.component b/extensions/source/bibliography/bib.component
index 9862785..b59add7 100644
--- a/extensions/source/bibliography/bib.component
+++ b/extensions/source/bibliography/bib.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="bib"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.extensions.Bibliography">
<service name="com.sun.star.frame.Bibliography"/>
diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx
index 5753a86..d963d2c 100644
--- a/extensions/source/bibliography/bibload.cxx
+++ b/extensions/source/bibliography/bibload.cxx
@@ -212,7 +212,7 @@ Sequence< rtl::OUString > BibliographyLoader::getSupportedServiceNames_Static(vo
extern "C"
{
- SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+ SAL_DLLPUBLIC_EXPORT void * SAL_CALL bib_component_getFactory(
const sal_Char * pImplName, XMultiServiceFactory * pServiceManager, void * /*pRegistryKey*/ )
{
void * pRet = 0;
diff --git a/extensions/source/config/ldap/componentdef.cxx b/extensions/source/config/ldap/componentdef.cxx
index 86a56c7..b3ea47b 100644
--- a/extensions/source/config/ldap/componentdef.cxx
+++ b/extensions/source/config/ldap/componentdef.cxx
@@ -54,7 +54,7 @@ static const cppu::ImplementationEntry kImplementations_entries[] =
} ;
//------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(const sal_Char *aImplementationName,
+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ldapbe2_component_getFactory(const sal_Char *aImplementationName,
void *aServiceManager,
void *aRegistryKey) {
return cppu::component_getFactoryHelper(aImplementationName,
diff --git a/extensions/source/config/ldap/ldapbe2.component b/extensions/source/config/ldap/ldapbe2.component
index 071064d..390da11 100644
--- a/extensions/source/config/ldap/ldapbe2.component
+++ b/extensions/source/config/ldap/ldapbe2.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="ldapbe2"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.configuration.backend.LdapUserProfileBe">
<service name="com.sun.star.configuration.backend.LdapUserProfileBe"/>
diff --git a/extensions/source/dbpilots/dbp.component b/extensions/source/dbpilots/dbp.component
index 84ec987..a0657ef 100644
--- a/extensions/source/dbpilots/dbp.component
+++ b/extensions/source/dbpilots/dbp.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="dbp"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="org.openoffice.comp.dbp.OGridWizard">
<service name="com.sun.star.sdb.GridControlAutoPilot"/>
diff --git a/extensions/source/dbpilots/dbpservices.cxx b/extensions/source/dbpilots/dbpservices.cxx
index 0f0d892..e8b42ca 100644
--- a/extensions/source/dbpilots/dbpservices.cxx
+++ b/extensions/source/dbpilots/dbpservices.cxx
@@ -57,7 +57,7 @@ extern "C" void SAL_CALL dbp_initializeModule()
}
//---------------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL dbp_component_getFactory(
const sal_Char* pImplementationName,
void* pServiceManager,
void* /*pRegistryKey*/)
diff --git a/extensions/source/logging/log.component b/extensions/source/logging/log.component
index 4dd2db5..0f7093a 100644
--- a/extensions/source/logging/log.component
+++ b/extensions/source/logging/log.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="log"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.extensions.ConsoleHandler">
<service name="com.sun.star.logging.ConsoleHandler"/>
diff --git a/extensions/source/logging/log_services.cxx b/extensions/source/logging/log_services.cxx
index e5af7a6..b084103 100644
--- a/extensions/source/logging/log_services.cxx
+++ b/extensions/source/logging/log_services.cxx
@@ -54,7 +54,7 @@ namespace logging
} // namespace logging
//........................................................................
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL log_component_getFactory(
const sal_Char* pImplementationName, SAL_UNUSED_PARAMETER void*,
SAL_UNUSED_PARAMETER void* )
{
diff --git a/extensions/source/ole/oleautobridge.component b/extensions/source/ole/oleautobridge.component
index 6f5309e..ea7d021 100644
--- a/extensions/source/ole/oleautobridge.component
+++ b/extensions/source/ole/oleautobridge.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="oleautobridge"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.ole.OleClient">
<service name="com.sun.star.bridge.OleObjectFactory"/>
diff --git a/extensions/source/ole/servreg.cxx b/extensions/source/ole/servreg.cxx
index b6471e4..9cd793f 100644
--- a/extensions/source/ole/servreg.cxx
+++ b/extensions/source/ole/servreg.cxx
@@ -72,7 +72,7 @@ Reference<XInterface> SAL_CALL OleServer_CreateInstance( const Reference<XMultiS
}
} // end namespace
-extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL oleautobridge_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
{
void * pRet = 0;
@@ -119,7 +119,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
}
extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL
-component_canUnload( TimeValue* libUnused)
+oleautobridge_component_canUnload( TimeValue* libUnused)
{
return globalModuleCount.canUnload( &globalModuleCount, libUnused);
}
diff --git a/extensions/source/plugin/base/service.cxx b/extensions/source/plugin/base/service.cxx
index 0d9f5f9..cb0ba02 100644
--- a/extensions/source/plugin/base/service.cxx
+++ b/extensions/source/plugin/base/service.cxx
@@ -55,7 +55,7 @@
using namespace cppu;
extern "C" {
- SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
+ SAL_DLLPUBLIC_EXPORT void* SAL_CALL pl_component_getFactory(
const sal_Char* pImplementationName,
void* pXUnoSMgr,
void* /*pXUnoKey*/
diff --git a/extensions/source/plugin/pl.component b/extensions/source/plugin/pl.component
index 4a9d98f..e2b7c1a 100644
--- a/extensions/source/plugin/pl.component
+++ b/extensions/source/plugin/pl.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="pl"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.extensions.PluginManager">
<service name="com.sun.star.plugin.PluginManager"/>
diff --git a/extensions/source/propctrlr/pcr.component b/extensions/source/propctrlr/pcr.component
index 2b606cc..6fc8094 100644
--- a/extensions/source/propctrlr/pcr.component
+++ b/extensions/source/propctrlr/pcr.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="pcr"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="StringRepresentation">
<service name="com.sun.star.inspection.StringRepresentation"/>
diff --git a/extensions/source/propctrlr/pcrservices.cxx b/extensions/source/propctrlr/pcrservices.cxx
index ffde3d8..ab1da1d 100644
--- a/extensions/source/propctrlr/pcrservices.cxx
+++ b/extensions/source/propctrlr/pcrservices.cxx
@@ -89,7 +89,7 @@ extern "C" void SAL_CALL pcr_initializeModule()
}
//---------------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL pcr_component_getFactory(
const sal_Char* pImplementationName,
void* pServiceManager,
SAL_UNUSED_PARAMETER void* /*pRegistryKey*/)
diff --git a/extensions/source/resource/res.component b/extensions/source/resource/res.component
index b5df974..6ad58b4 100644
--- a/extensions/source/resource/res.component
+++ b/extensions/source/resource/res.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="res"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.resource.OpenOfficeResourceLoader">
<service name="com.sun.star.resource.OfficeResourceLoader"/>
diff --git a/extensions/source/resource/resourceservices.cxx b/extensions/source/resource/resourceservices.cxx
index b683484..670c663 100644
--- a/extensions/source/resource/resourceservices.cxx
+++ b/extensions/source/resource/resourceservices.cxx
@@ -49,7 +49,7 @@ const sdecl::ServiceDecl OpenOfficeResourceLoaderDecl(
"com.sun.star.comp.resource.OpenOfficeResourceLoader",
"com.sun.star.resource.OfficeResourceLoader");
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL res_component_getFactory(
sal_Char const* pImplName,
::com::sun::star::lang::XMultiServiceFactory* pServiceManager,
::com::sun::star::registry::XRegistryKey* pRegistryKey )
diff --git a/extensions/source/scanner/scn.component b/extensions/source/scanner/scn.component
index 076b745..80ca072 100644
--- a/extensions/source/scanner/scn.component
+++ b/extensions/source/scanner/scn.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="scn"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.scanner.ScannerManager">
<service name="com.sun.star.scanner.ScannerManager"/>
diff --git a/extensions/source/scanner/scnserv.cxx b/extensions/source/scanner/scnserv.cxx
index 72d37fc..56cde1e 100644
--- a/extensions/source/scanner/scnserv.cxx
+++ b/extensions/source/scanner/scnserv.cxx
@@ -36,7 +36,7 @@
using namespace com::sun::star::registry;
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /*pRegistryKey*/ )
+extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL scn_component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /*pRegistryKey*/ )
{
REF( ::com::sun::star::lang::XSingleServiceFactory ) xFactory;
void* pRet = 0;
diff --git a/extensions/source/update/check/updatecheckjob.cxx b/extensions/source/update/check/updatecheckjob.cxx
index 2b7aa0a..230d1f1 100644
--- a/extensions/source/update/check/updatecheckjob.cxx
+++ b/extensions/source/update/check/updatecheckjob.cxx
@@ -379,7 +379,7 @@ static const cppu::ImplementationEntry kImplementations_entries[] =
//------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(const sal_Char *pszImplementationName, void *pServiceManager, void *pRegistryKey)
+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL updchk_component_getFactory(const sal_Char *pszImplementationName, void *pServiceManager, void *pRegistryKey)
{
return cppu::component_getFactoryHelper(
pszImplementationName,
diff --git a/extensions/source/update/check/updchk.uno.component b/extensions/source/update/check/updchk.uno.component
index b1eb329..c19ae2f 100644
--- a/extensions/source/update/check/updchk.uno.component
+++ b/extensions/source/update/check/updchk.uno.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="updchk"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="vnd.sun.UpdateCheck">
<service name="com.sun.star.setup.UpdateCheck"/>
diff --git a/extensions/source/update/feed/updatefeed.component b/extensions/source/update/feed/updatefeed.component
index 2d53ff5..f43afc1 100644
--- a/extensions/source/update/feed/updatefeed.component
+++ b/extensions/source/update/feed/updatefeed.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="updatefeed"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="vnd.sun.UpdateInformationProvider">
<service name="com.sun.star.deployment.UpdateInformationProvider"/>
diff --git a/extensions/source/update/feed/updatefeed.cxx b/extensions/source/update/feed/updatefeed.cxx
index 74a29e2..1f27754 100644
--- a/extensions/source/update/feed/updatefeed.cxx
+++ b/extensions/source/update/feed/updatefeed.cxx
@@ -828,7 +828,7 @@ static const cppu::ImplementationEntry kImplementations_entries[] =
//------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(const sal_Char *pszImplementationName, void *pServiceManager, void *pRegistryKey)
+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL updatefeed_component_getFactory(const sal_Char *pszImplementationName, void *pServiceManager, void *pRegistryKey)
{
return cppu::component_getFactoryHelper(
pszImplementationName,
diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx
index a6ce20f..0d6128b 100644
--- a/extensions/source/update/ui/updatecheckui.cxx
+++ b/extensions/source/update/ui/updatecheckui.cxx
@@ -1033,7 +1033,7 @@ static const cppu::ImplementationEntry kImplementations_entries[] =
//------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(const sal_Char *pszImplementationName, void *pServiceManager, void *pRegistryKey)
+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL updchkui_component_getFactory(const sal_Char *pszImplementationName, void *pServiceManager, void *pRegistryKey)
{
return cppu::component_getFactoryHelper(
pszImplementationName,
diff --git a/extensions/source/update/ui/updchk.component b/extensions/source/update/ui/updchk.component
index bd533e3..855936c 100644
--- a/extensions/source/update/ui/updchk.component
+++ b/extensions/source/update/ui/updchk.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="updchkui"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="vnd.sun.UpdateCheckUI">
<service name="com.sun.star.setup.UpdateCheckUI"/>
commit c0c58816bc59b750d183a9c0b4f9a759b0ad8e78
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Oct 1 23:02:44 2012 +0300
Use prefix
Change-Id: Ie741222944bf8ed6cacd5a3037f8aa75a6a4dec3
diff --git a/filter/source/flash/flash.component b/filter/source/flash/flash.component
index 1ce69b3..79e1e68 100644
--- a/filter/source/flash/flash.component
+++ b/filter/source/flash/flash.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="flash"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.Impress.FlashExportDialog">
<service name="com.sun.star.Impress.FlashExportDialog"/>
diff --git a/filter/source/flash/swfuno.cxx b/filter/source/flash/swfuno.cxx
index b350153..49addf4 100644
--- a/filter/source/flash/swfuno.cxx
+++ b/filter/source/flash/swfuno.cxx
@@ -54,7 +54,7 @@ using namespace ::swf;
extern "C"
{
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL flash_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * /* pRegistryKey */ )
{
void * pRet = 0;
diff --git a/filter/source/msfilter/msfilter.component b/filter/source/msfilter/msfilter.component
index 64128aa..e3ea7e5 100644
--- a/filter/source/msfilter/msfilter.component
+++ b/filter/source/msfilter/msfilter.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="msfilter"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.vba.VBAMacroResolver">
<service name="com.sun.star.script.vba.VBAMacroResolver"/>
diff --git a/filter/source/msfilter/services.cxx b/filter/source/msfilter/services.cxx
index 9586d42..4e4a77e 100644
--- a/filter/source/msfilter/services.cxx
+++ b/filter/source/msfilter/services.cxx
@@ -60,7 +60,7 @@ static ::cppu::ImplementationEntry const spServices[] =
} // namespace
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const char* pImplName, void* pServiceManager, void* pRegistryKey )
+extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL msfilter_component_getFactory( const char* pImplName, void* pServiceManager, void* pRegistryKey )
{
return ::cppu::component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey, spServices );
}
diff --git a/filter/source/pdf/pdffilter.component b/filter/source/pdf/pdffilter.component
index 438d697..e9b84a5 100644
--- a/filter/source/pdf/pdffilter.component
+++ b/filter/source/pdf/pdffilter.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="pdffilter"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.PDF.PDFDialog">
<service name="com.sun.star.document.PDFDialog"/>
diff --git a/filter/source/pdf/pdfuno.cxx b/filter/source/pdf/pdfuno.cxx
index fe5ab0a..a885a82 100644
--- a/filter/source/pdf/pdfuno.cxx
+++ b/filter/source/pdf/pdfuno.cxx
@@ -45,7 +45,7 @@ using namespace ::com::sun::star::registry;
extern "C"
{
- SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
+ SAL_DLLPUBLIC_EXPORT void* SAL_CALL pdffilter_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
{
OUString aImplName( OUString::createFromAscii( pImplName ) );
void* pRet = 0;
diff --git a/filter/source/placeware/placeware.component b/filter/source/placeware/placeware.component
index 9a6ca70..0ec5ef8 100644
--- a/filter/source/placeware/placeware.component
+++ b/filter/source/placeware/placeware.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="placeware"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.Impress.PlaceWareExportFilter">
<service name="com.sun.star.document.ExportFilter"/>
diff --git a/filter/source/placeware/uno.cxx b/filter/source/placeware/uno.cxx
index cd0396d..1574803 100644
--- a/filter/source/placeware/uno.cxx
+++ b/filter/source/placeware/uno.cxx
@@ -51,7 +51,7 @@ using namespace ::pwp;
extern "C"
{
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL placeware_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * /* pRegistryKey */ )
{
void * pRet = 0;
diff --git a/filter/source/t602/filterenv.cxx b/filter/source/t602/filterenv.cxx
index 1963ddb..6154dbf 100644
--- a/filter/source/t602/filterenv.cxx
+++ b/filter/source/t602/filterenv.cxx
@@ -44,11 +44,7 @@ using namespace T602ImportFilter;
extern "C"
{
-#ifdef DISABLE_DYNLOADING
-#define component_getFactory t602filter_component_getFactory
-#endif
-
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL t602filter_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * /* pRegistryKey */ )
{
void * pRet = 0;
diff --git a/filter/source/xmlfilteradaptor/genericfilter.cxx b/filter/source/xmlfilteradaptor/genericfilter.cxx
index 5f9fe9e..67bc536 100644
--- a/filter/source/xmlfilteradaptor/genericfilter.cxx
+++ b/filter/source/xmlfilteradaptor/genericfilter.cxx
@@ -41,7 +41,7 @@ using namespace ::com::sun::star::registry;
extern "C"
{
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL xmlfa_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * /* pRegistryKey */ )
{
void * pRet = 0;
diff --git a/filter/source/xmlfilteradaptor/xmlfa.component b/filter/source/xmlfilteradaptor/xmlfa.component
index d835782..97ffd4e 100644
--- a/filter/source/xmlfilteradaptor/xmlfa.component
+++ b/filter/source/xmlfilteradaptor/xmlfa.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="xmlfa"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.Writer.XmlFilterAdaptor">
<service name="com.sun.star.document.ExportFilter"/>
diff --git a/filter/source/xmlfilterdetect/fdcomp.cxx b/filter/source/xmlfilterdetect/fdcomp.cxx
index c942e92..300da56 100644
--- a/filter/source/xmlfilterdetect/fdcomp.cxx
+++ b/filter/source/xmlfilterdetect/fdcomp.cxx
@@ -39,14 +39,8 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::registry;
-extern "C"
-{
-#ifdef DISABLE_DYNLOADING
-#define component_getFactory xmlfd_component_getFactory
-#endif
-
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
- const sal_Char * pImplName, void * pServiceManager, void * /* pRegistryKey */ )
+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL xmlfd_component_getFactory(
+ char const * pImplName, void * pServiceManager, void * pRegistryKey)
{
void * pRet = 0;
OUString implName = OUString::createFromAscii( pImplName );
diff --git a/filter/source/xmlfilterdetect/xmlfd.component b/filter/source/xmlfilterdetect/xmlfd.component
index 3796b0e..798e940 100644
--- a/filter/source/xmlfilterdetect/xmlfd.component
+++ b/filter/source/xmlfilterdetect/xmlfd.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="xmlfd"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.filters.XMLFilterDetect">
<service name="com.sun.star.document.ExtendedTypeDetection"/>
diff --git a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
index ed77cd3..3cc5b0e 100644
--- a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
+++ b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
@@ -392,7 +392,7 @@ void SAL_CALL XMLFilterDialogComponent::initialize( const Sequence< Any >& aArgu
extern "C"
{
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL xsltdlg_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * /* pRegistryKey */ )
{
void * pRet = 0;
diff --git a/filter/source/xsltdialog/xsltdlg.component b/filter/source/xsltdialog/xsltdlg.component
index 086208f..5f68156 100644
--- a/filter/source/xsltdialog/xsltdlg.component
+++ b/filter/source/xsltdialog/xsltdlg.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="xsltdlg"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="XMLFilterDialogComponent">
<service name="com.sun.star.comp.ui.XSLTFilterDialog"/>
diff --git a/filter/source/xsltfilter/XSLTFilter.cxx b/filter/source/xsltfilter/XSLTFilter.cxx
index 4ebabc7..c28d2c4 100644
--- a/filter/source/xsltfilter/XSLTFilter.cxx
+++ b/filter/source/xsltfilter/XSLTFilter.cxx
@@ -580,7 +580,7 @@ using namespace XSLT;
extern "C"
{
- SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(const sal_Char * pImplName,
+ SAL_DLLPUBLIC_EXPORT void * SAL_CALL xsltfilter_component_getFactory(const sal_Char * pImplName,
void * pServiceManager, void * /* pRegistryKey */)
{
void * pRet = 0;
diff --git a/filter/source/xsltfilter/xsltfilter.component b/filter/source/xsltfilter/xsltfilter.component
index 5fb985c..b1cf362 100644
--- a/filter/source/xsltfilter/xsltfilter.component
+++ b/filter/source/xsltfilter/xsltfilter.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="xsltfilter"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.documentconversion.XSLTFilter">
<service name="com.sun.star.documentconversion.XSLTFilter"/>
commit 32ef54ff813d2dda443e2b3e9b4907b53e86dfdb
Author: Tor Lillqvist <tml at iki.fi>
Date: Tue Oct 2 10:37:33 2012 +0300
Use prefix
Change-Id: Id6ef3325df8dc8d193a7745370134ef47792893a
diff --git a/forms/source/misc/services.cxx b/forms/source/misc/services.cxx
index 9f1785f..de7cf79 100644
--- a/forms/source/misc/services.cxx
+++ b/forms/source/misc/services.cxx
@@ -319,7 +319,7 @@ void SAL_CALL createRegistryInfo_FORMS()
}
//---------------------------------------------------------------------------------------
-SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(const sal_Char* _pImplName, XMultiServiceFactory* _pServiceManager, void* /*_pRegistryKey*/)
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL frm_component_getFactory(const sal_Char* _pImplName, XMultiServiceFactory* _pServiceManager, void* /*_pRegistryKey*/)
{
if (!_pServiceManager || !_pImplName)
return NULL;
diff --git a/forms/util/frm.component b/forms/util/frm.component
index c727e80..fcb7050 100644
--- a/forms/util/frm.component
+++ b/forms/util/frm.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="frm"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.form.ONavigationBarControl">
<service name="com.sun.star.form.control.NavigationToolBar"/>
commit a6ec5fecf3a41bdbb0d0d7d9c9109549b115c6e8
Author: Tor Lillqvist <tml at iki.fi>
Date: Tue Oct 2 10:46:53 2012 +0300
Use prefix
Change-Id: Ifbe8796e3af2e7544cf7d47bacb0632d36202433
diff --git a/fpicker/source/aqua/FPentry.mm b/fpicker/source/aqua/FPentry.mm
index f3fee99..d514868 100644
--- a/fpicker/source/aqua/FPentry.mm
+++ b/fpicker/source/aqua/FPentry.mm
@@ -53,7 +53,7 @@ static Reference< XInterface > SAL_CALL createFolderInstance(
extern "C"
{
-SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL fps_aqua_component_getFactory(
const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* /*pRegistryKey*/ )
{
void* pRet = 0;
diff --git a/fpicker/source/aqua/fps_aqua.component b/fpicker/source/aqua/fps_aqua.component
index f0e2f47..7ad2926 100644
--- a/fpicker/source/aqua/fps_aqua.component
+++ b/fpicker/source/aqua/fps_aqua.component
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="fps_aqua"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.ui.dialogs.SalAquaFilePicker">
<service name="com.sun.star.ui.dialogs.AquaFilePicker"/>
diff --git a/fpicker/source/generic/fpicker.component b/fpicker/source/generic/fpicker.component
index b87a2c8..7aee017 100644
--- a/fpicker/source/generic/fpicker.component
+++ b/fpicker/source/generic/fpicker.component
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="fpicker"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.fpicker.FilePicker">
<service name="com.sun.star.ui.dialogs.FilePicker"/>
diff --git a/fpicker/source/generic/fpicker.cxx b/fpicker/source/generic/fpicker.cxx
index 1222025..4c4dd9a 100644
--- a/fpicker/source/generic/fpicker.cxx
+++ b/fpicker/source/generic/fpicker.cxx
@@ -225,7 +225,7 @@ static cppu::ImplementationEntry g_entries[] =
*/
extern "C"
{
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory (
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL fpicker_component_getFactory (
const sal_Char * pImplementationName, void * pServiceManager, void * pRegistryKey)
{
return cppu::component_getFactoryHelper (
diff --git a/fpicker/source/office/fps_office.component b/fpicker/source/office/fps_office.component
index ebce7f2..335a63a 100644
--- a/fpicker/source/office/fps_office.component
+++ b/fpicker/source/office/fps_office.component
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="fps_office"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.svtools.OfficeFilePicker">
<service name="com.sun.star.ui.dialogs.OfficeFilePicker"/>
diff --git a/fpicker/source/office/fps_office.cxx b/fpicker/source/office/fps_office.cxx
index 77a9e20..e38d25f 100644
--- a/fpicker/source/office/fps_office.cxx
+++ b/fpicker/source/office/fps_office.cxx
@@ -44,7 +44,7 @@ static cppu::ImplementationEntry g_entries[] =
extern "C"
{
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL fps_office_component_getFactory(
const sal_Char * pImplementationName, void * pServiceManager, void * pRegistryKey)
{
return cppu::component_getFactoryHelper (
diff --git a/fpicker/source/win32/filepicker/FPentry.cxx b/fpicker/source/win32/filepicker/FPentry.cxx
index 532edcf..f09938d 100644
--- a/fpicker/source/win32/filepicker/FPentry.cxx
+++ b/fpicker/source/win32/filepicker/FPentry.cxx
@@ -89,7 +89,7 @@ createInstance_fop( const Reference< XMultiServiceFactory >& rServiceManager )
extern "C"
{
-SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL fps_win32_component_getFactory(
const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* )
{
void* pRet = 0;
diff --git a/fpicker/source/win32/fps.component b/fpicker/source/win32/fps.component
index 1a2e7f2..1dc9d4f 100644
--- a/fpicker/source/win32/fps.component
+++ b/fpicker/source/win32/fps.component
@@ -16,7 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="fps_win32"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.ui.dialogs.Win32FilePicker">
<service name="com.sun.star.ui.dialogs.SystemFilePicker"/>
commit 4cadf3a381dbe01901301ee1f2339a7fbde56dca
Author: Tor Lillqvist <tml at iki.fi>
Date: Tue Oct 2 11:19:05 2012 +0300
Use prefix
Change-Id: I84ec9d6eed209eb429f5b5d4a667d3450a1435e1
diff --git a/io/source/TextInputStream/TextInputStream.cxx b/io/source/TextInputStream/TextInputStream.cxx
index 8015c3b..5e87cf6 100644
--- a/io/source/TextInputStream/TextInputStream.cxx
+++ b/io/source/TextInputStream/TextInputStream.cxx
@@ -493,7 +493,7 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_canUnload( TimeValue *pTime )
}
//==================================================================================================
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL textinstream_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{
return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries );
diff --git a/io/source/TextInputStream/textinstream.component b/io/source/TextInputStream/textinstream.component
index 8c02149..5d543a1 100644
--- a/io/source/TextInputStream/textinstream.component
+++ b/io/source/TextInputStream/textinstream.component
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="textinstream"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.io.TextInputStream">
<service name="com.sun.star.io.TextInputStream"/>
diff --git a/io/source/TextOutputStream/TextOutputStream.cxx b/io/source/TextOutputStream/TextOutputStream.cxx
index da32f34..beabc01 100644
--- a/io/source/TextOutputStream/TextOutputStream.cxx
+++ b/io/source/TextOutputStream/TextOutputStream.cxx
@@ -292,7 +292,7 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_canUnload( TimeValue *pTime )
}
//==================================================================================================
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL textoutstream_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{
return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries );
diff --git a/io/source/TextOutputStream/textoutstream.component b/io/source/TextOutputStream/textoutstream.component
index f498f5a..807489c 100644
--- a/io/source/TextOutputStream/textoutstream.component
+++ b/io/source/TextOutputStream/textoutstream.component
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="textoutstream"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.io.TextOutputStream">
<service name="com.sun.star.io.TextOutputStream"/>
diff --git a/io/source/acceptor/acceptor.component b/io/source/acceptor/acceptor.component
index 1fcb6ab..0b4877b 100644
--- a/io/source/acceptor/acceptor.component
+++ b/io/source/acceptor/acceptor.component
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="acceptor"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.io.Acceptor">
<service name="com.sun.star.connection.Acceptor"/>
diff --git a/io/source/acceptor/acceptor.cxx b/io/source/acceptor/acceptor.cxx
index d3efe3b..eb94ca5 100644
--- a/io/source/acceptor/acceptor.cxx
+++ b/io/source/acceptor/acceptor.cxx
@@ -339,7 +339,7 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_canUnload( TimeValue *pTime )
}
//==================================================================================================
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL acceptor_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{
return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries );
diff --git a/io/source/connector/connector.component b/io/source/connector/connector.component
index 13f0513..3e60b18 100644
--- a/io/source/connector/connector.component
+++ b/io/source/connector/connector.component
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="connector"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.io.Connector">
<service name="com.sun.star.connection.Connector"/>
diff --git a/io/source/connector/connector.cxx b/io/source/connector/connector.cxx
index 72401cd..9ba335b 100644
--- a/io/source/connector/connector.cxx
+++ b/io/source/connector/connector.cxx
@@ -250,7 +250,7 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_canUnload( TimeValue *pTime )
}
//==================================================================================================
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL connector_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{
return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries );
diff --git a/io/source/stm/factreg.cxx b/io/source/stm/factreg.cxx
index 35111fa..ccd4eac 100644
--- a/io/source/stm/factreg.cxx
+++ b/io/source/stm/factreg.cxx
@@ -94,7 +94,7 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_canUnload( TimeValue *pTime )
}
//==================================================================================================
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL streams_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{
return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries );
diff --git a/io/source/stm/streams.component b/io/source/stm/streams.component
index 1469ef1..7de1ebb 100644
--- a/io/source/stm/streams.component
+++ b/io/source/stm/streams.component
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="streams"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.io.Pump">
<service name="com.sun.star.io.Pump"/>
commit e8afe7a290bce10082539b1e11572c54a4079325
Author: Tor Lillqvist <tml at iki.fi>
Date: Tue Oct 2 11:33:11 2012 +0300
Use prefix
Change-Id: Iee586539871acee78a32d13141dd446feb43efdb
diff --git a/lingucomponent/source/spellcheck/macosxspell/MacOSXSpell.component b/lingucomponent/source/spellcheck/macosxspell/MacOSXSpell.component
index 2f2f9e1..9bc9267 100644
--- a/lingucomponent/source/spellcheck/macosxspell/MacOSXSpell.component
+++ b/lingucomponent/source/spellcheck/macosxspell/MacOSXSpell.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="MacOSXSpell"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="org.openoffice.lingu.MacOSXSpellChecker">
<service name="com.sun.star.linguistic2.SpellChecker"/>
diff --git a/lingucomponent/source/spellcheck/macosxspell/macreg.mm b/lingucomponent/source/spellcheck/macosxspell/macreg.mm
index 9020ace..6e438bb 100644
--- a/lingucomponent/source/spellcheck/macosxspell/macreg.mm
+++ b/lingucomponent/source/spellcheck/macosxspell/macreg.mm
@@ -52,7 +52,7 @@ extern void * SAL_CALL MacSpellChecker_getFactory(
extern "C"
{
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL MacOSXSpell_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{
void * pRet = NULL;
commit 8352e0ffa5aea1ebbb142e3e3d41cc3ed2a21843
Author: Tor Lillqvist <tml at iki.fi>
Date: Tue Oct 2 11:37:05 2012 +0300
Use prefix
Change-Id: Ibc446d8616bad00ce71c273e46517e80527e2f0e
diff --git a/pyuno/source/loader/pythonloader.component b/pyuno/source/loader/pythonloader.component
index 0abab7f..1dc51f4 100644
--- a/pyuno/source/loader/pythonloader.component
+++ b/pyuno/source/loader/pythonloader.component
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="pythonloader"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="org.openoffice.comp.pyuno.Loader">
<service name="com.sun.star.loader.Python"/>
diff --git a/pyuno/source/loader/pyuno_loader.cxx b/pyuno/source/loader/pyuno_loader.cxx
index 34176eb..3e7a250 100644
--- a/pyuno/source/loader/pyuno_loader.cxx
+++ b/pyuno/source/loader/pyuno_loader.cxx
@@ -252,7 +252,7 @@ static struct cppu::ImplementationEntry g_entries[] =
extern "C"
{
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL pythonloader_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{
return cppu::component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries );
commit de983bb1c855b479c51a9e7f04e826c52af61837
Author: Tor Lillqvist <tml at iki.fi>
Date: Tue Oct 2 11:38:39 2012 +0300
Use prefix
Change-Id: Ifa5ea2dd818043b6b5442e580bff51d1e2cb93e1
diff --git a/remotebridges/source/unourl_resolver/unourl_resolver.cxx b/remotebridges/source/unourl_resolver/unourl_resolver.cxx
index b3a54c6..6355d6e 100644
--- a/remotebridges/source/unourl_resolver/unourl_resolver.cxx
+++ b/remotebridges/source/unourl_resolver/unourl_resolver.cxx
@@ -200,13 +200,13 @@ static struct ImplementationEntry g_entries[] =
extern "C"
{
-SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_canUnload( TimeValue *pTime )
+SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL uuresolver_component_canUnload( TimeValue *pTime )
{
return g_moduleCount.canUnload( &g_moduleCount , pTime );
}
//==================================================================================================
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL uuresolver_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{
return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries );
diff --git a/remotebridges/source/unourl_resolver/uuresolver.component b/remotebridges/source/unourl_resolver/uuresolver.component
index 4cfb40e..5131b8a 100644
--- a/remotebridges/source/unourl_resolver/uuresolver.component
+++ b/remotebridges/source/unourl_resolver/uuresolver.component
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="uuresolver"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.bridge.UnoUrlResolver">
<service name="com.sun.star.bridge.UnoUrlResolver"/>
commit 614ab11d5649788f026de570167d7929f2c0d7fa
Author: Tor Lillqvist <tml at iki.fi>
Date: Tue Oct 2 11:45:11 2012 +0300
Use prefix
Change-Id: I0323e3eb9446c4f2b18f84f5ed33909a877163c8
diff --git a/scripting/source/basprov/basprov.component b/scripting/source/basprov/basprov.component
index 5268cfe..09ed542 100644
--- a/scripting/source/basprov/basprov.component
+++ b/scripting/source/basprov/basprov.component
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="basprov"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.scripting.ScriptProviderForBasic">
<service name="com.sun.star.script.browse.BrowseNode"/>
diff --git a/scripting/source/basprov/basprov.cxx b/scripting/source/basprov/basprov.cxx
index 06675e8..bf4a449 100644
--- a/scripting/source/basprov/basprov.cxx
+++ b/scripting/source/basprov/basprov.cxx
@@ -586,7 +586,7 @@ namespace basprov
extern "C"
{
- SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+ SAL_DLLPUBLIC_EXPORT void * SAL_CALL basprov_component_getFactory(
const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager,
registry::XRegistryKey * pRegistryKey )
{
diff --git a/scripting/source/dlgprov/dlgprov.component b/scripting/source/dlgprov/dlgprov.component
index dffc48e..66dd111 100644
--- a/scripting/source/dlgprov/dlgprov.component
+++ b/scripting/source/dlgprov/dlgprov.component
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="dlgprov"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.scripting.DialogProvider">
<service name="com.sun.star.awt.ContainerWindowProvider"/>
diff --git a/scripting/source/dlgprov/dlgprov.cxx b/scripting/source/dlgprov/dlgprov.cxx
index 862e21a..2c55c32 100644
--- a/scripting/source/dlgprov/dlgprov.cxx
+++ b/scripting/source/dlgprov/dlgprov.cxx
@@ -876,7 +876,7 @@ static ::rtl::OUString aResourceResolverPropName("ResourceResolver");
extern "C"
{
- SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+ SAL_DLLPUBLIC_EXPORT void * SAL_CALL dlgprov_component_getFactory(
const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager,
registry::XRegistryKey * pRegistryKey )
{
diff --git a/scripting/source/protocolhandler/protocolhandler.component b/scripting/source/protocolhandler/protocolhandler.component
index 5bfe9d9..95c6b50 100644
--- a/scripting/source/protocolhandler/protocolhandler.component
+++ b/scripting/source/protocolhandler/protocolhandler.component
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="protocolhandler"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.ScriptProtocolHandler">
<service name="com.sun.star.frame.ProtocolHandler"/>
diff --git a/scripting/source/protocolhandler/scripthandler.cxx b/scripting/source/protocolhandler/scripthandler.cxx
index ed41ebc..ce7ca42 100644
--- a/scripting/source/protocolhandler/scripthandler.cxx
+++ b/scripting/source/protocolhandler/scripthandler.cxx
@@ -502,7 +502,7 @@ extern "C"
namespace css = ::com::sun::star;
- SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char * pImplementationName ,
+ SAL_DLLPUBLIC_EXPORT void* SAL_CALL protocolhandler_component_getFactory( const sal_Char * pImplementationName ,
void * pServiceManager ,
void * pRegistryKey )
{
diff --git a/scripting/source/provider/MasterScriptProvider.cxx b/scripting/source/provider/MasterScriptProvider.cxx
index f0623c0..ff03469 100644
--- a/scripting/source/provider/MasterScriptProvider.cxx
+++ b/scripting/source/provider/MasterScriptProvider.cxx
@@ -959,7 +959,7 @@ extern "C"
* data
* @return a component factory
*/
- SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+ SAL_DLLPUBLIC_EXPORT void * SAL_CALL scriptframe_component_getFactory(
const sal_Char * pImplName,
lang::XMultiServiceFactory * pServiceManager,
registry::XRegistryKey * pRegistryKey )
diff --git a/scripting/source/stringresource/stringresource.component b/scripting/source/stringresource/stringresource.component
index eb2e9ac..5407300 100644
--- a/scripting/source/stringresource/stringresource.component
+++ b/scripting/source/stringresource/stringresource.component
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="stringresource"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.scripting.StringResource">
<service name="com.sun.star.resource.StringResource"/>
diff --git a/scripting/source/stringresource/stringresource.cxx b/scripting/source/stringresource/stringresource.cxx
index 7af39bd..338883d 100644
--- a/scripting/source/stringresource/stringresource.cxx
+++ b/scripting/source/stringresource/stringresource.cxx
@@ -3050,7 +3050,7 @@ static struct ::cppu::ImplementationEntry s_component_entries [] =
extern "C"
{
- SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+ SAL_DLLPUBLIC_EXPORT void * SAL_CALL stringresource_component_getFactory(
const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager,
registry::XRegistryKey * pRegistryKey )
{
diff --git a/scripting/source/vbaevents/service.cxx b/scripting/source/vbaevents/service.cxx
index 1f6bbc8..11b51d0 100644
--- a/scripting/source/vbaevents/service.cxx
+++ b/scripting/source/vbaevents/service.cxx
@@ -90,7 +90,7 @@ namespace ooevtdescgen
extern "C"
{
- SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+ SAL_DLLPUBLIC_EXPORT void * SAL_CALL vbaevents_component_getFactory(
const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager,
registry::XRegistryKey * pRegistryKey )
{
diff --git a/scripting/source/vbaevents/vbaevents.component b/scripting/source/vbaevents/vbaevents.component
index 78b17a3..ea45658 100644
--- a/scripting/source/vbaevents/vbaevents.component
+++ b/scripting/source/vbaevents/vbaevents.component
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="vbaevents"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="ooo.vba.EventListener">
<service name="ooo.vba.EventListener"/>
diff --git a/scripting/util/scriptframe.component b/scripting/util/scriptframe.component
index 959f9fc..09f874e 100644
--- a/scripting/util/scriptframe.component
+++ b/scripting/util/scriptframe.component
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="scriptframe"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.script.browse.BrowseNodeFactory">
<service name="com.sun.star.script.browse.BrowseNodeFactory"/>
More information about the Libreoffice-commits
mailing list