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/Library_PptImporter.mk | 1
filter/source/flash/flash.component | 2
filter/source/flash/swfuno.cxx | 2
filter/source/msfilter/msfilter.component | 2
filter/source/msfilter/powerpoint/pptimporteruno.cxx | 63 ------------------
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 | 6 -
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
49 files changed, 48 insertions(+), 120 deletions(-)
New commits:
commit 2726f7f4ca5cde91565203ef055561558ea66e7d
Author: Tor Lillqvist <t...@iki.fi>
Date: Mon Oct 1 23:03:59 2012 +0300
As far as I can see the PptImporter library is not a UNO component
Change-Id: I5a230207bb760dde7ffb2e052148072d9f589cba
diff --git a/filter/Library_PptImporter.mk b/filter/Library_PptImporter.mk
index f1d172a..8fee1bd 100644
--- a/filter/Library_PptImporter.mk
+++ b/filter/Library_PptImporter.mk
@@ -35,7 +35,6 @@ $(eval $(call gb_Library_use_libraries,PptImporter,\
$(eval $(call gb_Library_add_exception_objects,PptImporter,\
filter/source/msfilter/powerpoint/pptimporter \
- filter/source/msfilter/powerpoint/pptimporteruno \
filter/source/msfilter/powerpoint/ppttoxml \
))
diff --git a/filter/source/msfilter/powerpoint/pptimporteruno.cxx
b/filter/source/msfilter/powerpoint/pptimporteruno.cxx
deleted file mode 100644
index be0b49e..0000000
--- a/filter/source/msfilter/powerpoint/pptimporteruno.cxx
+++ /dev/null
@@ -1,63 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-
-#include "pptimporter.hxx"
-
-#include <cppuhelper/factory.hxx>
-#include <uno/mapping.hxx>
-
-static REF( NMSP_UNO::XInterface ) SAL_CALL create_PptImporter( const REF(
NMSP_LANG::XMultiServiceFactory )& rxFact )
-{
- return REF( NMSP_UNO::XInterface )( *new PptImporter( rxFact ) );
-}
-
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const
sal_Char* pImplName, void* pServiceManager, void* /* pRegistryKey */ )
-{
- REF( NMSP_LANG::XSingleServiceFactory ) xFactory;
- void* pRet = 0;
-
- if( rtl_str_compare( pImplName, "com.sun.star.presentation.PptImporter" )
== 0 )
- {
- const NMSP_RTL::OUString aServiceName( B2UCONST(
"com.sun.star.presentation.PptImporter" ) );
-
- xFactory = REF( NMSP_LANG::XSingleServiceFactory )(
NMSP_CPPU::createSingleFactory(
- reinterpret_cast< NMSP_LANG::XMultiServiceFactory* >(
pServiceManager ),
- B2UCONST( "com.sun.star.presentation.PptImporter" ),
- create_PptImporter, SEQ( NMSP_RTL::OUString )(
&aServiceName, 1 ) ) );
- }
- if( xFactory.is() )
- {
- xFactory->acquire();
- pRet = xFactory.get();
- }
-
- return pRet;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 8c04828bb1a6fefe258b5412db8e1b31a5b8cbb6
Author: Tor Lillqvist <t...@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 b12cdb3..004d110 100644
--- a/filter/source/xmlfilterdetect/fdcomp.cxx
+++ b/filter/source/xmlfilterdetect/fdcomp.cxx
@@ -45,11 +45,7 @@ static cppu::ImplementationEntry const services[] = {
}
-#ifdef DISABLE_DYNLOADING
-#define component_getFactory xmlfd_component_getFactory
-#endif
-
-extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL xmlfd_component_getFactory(
char const * pImplName, void * pServiceManager, void * pRegistryKey)
{
return cppu::component_getFactoryHelper(
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 ba8503f..63de5a6 100644
--- a/filter/source/xsltfilter/XSLTFilter.cxx
+++ b/filter/source/xsltfilter/XSLTFilter.cxx
@@ -575,7 +575,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 616023b7a73511a73fcc88e8ebfdcd4bb050812e
Author: Tor Lillqvist <t...@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 d1db88c..310bbe8 100644
--- a/extensions/source/update/feed/updatefeed.cxx
+++ b/extensions/source/update/feed/updatefeed.cxx
@@ -822,7 +822,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 75143fa..fab97f5 100644
--- a/extensions/source/update/ui/updatecheckui.cxx
+++ b/extensions/source/update/ui/updatecheckui.cxx
@@ -1025,7 +1025,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 28f128f037d627d08322ac1524dc04b65043790a
Author: Tor Lillqvist <t...@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 393588ce8e698203dd87a87eb506afb551457717
Author: Tor Lillqvist <t...@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 e9b5ea1..80f8eab 100644
--- a/embeddedobj/source/msole/emboleobj.component
+++ b/embeddedobj/source/msole/emboleobj.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="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 28b4029..f16a29a 100644
--- a/embeddedobj/source/msole/oleregister.cxx
+++ b/embeddedobj/source/msole/oleregister.cxx
@@ -29,7 +29,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*/ )
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
