[Libreoffice-commits] .: 3 commits - desktop/source desktop/unx filter/inc filter/source Module_tail_build.mk package/source package/util postprocess/prj tail_build/prj
Matus Kukan
mkukan at kemper.freedesktop.org
Sat Oct 8 06:32:10 PDT 2011
Module_tail_build.mk | 1
desktop/source/deployment/deployment.component | 2
desktop/source/deployment/dp_services.cxx | 2
desktop/source/deployment/gui/deploymentgui.component | 2
desktop/source/deployment/gui/dp_gui_service.cxx | 2
desktop/source/migration/services/cexports.cxx | 2
desktop/source/migration/services/cexportsoo3.cxx | 2
desktop/source/migration/services/migrationoo2.component | 2
desktop/source/migration/services/migrationoo3.component | 2
desktop/source/offacc/acceptor.cxx | 2
desktop/source/offacc/offacc.component | 2
desktop/source/splash/services_spl.cxx | 2
desktop/source/splash/spl.component | 2
desktop/unx/splash/splash.component | 2
desktop/unx/splash/unxsplash.cxx | 2
filter/inc/registration.hxx | 113 ---------------
filter/source/config/cache/filterconfig1.component | 2
filter/source/config/cache/registration.cxx | 85 +++++++----
filter/source/odfflatxml/OdfFlatXml.cxx | 36 +++-
package/source/manifest/UnoRegister.cxx | 2
package/source/xstor/register.cxx | 2
package/source/xstor/xstor.component | 2
package/util/package2.component | 2
postprocess/prj/build.lst | 2
tail_build/prj/build.lst | 2
25 files changed, 103 insertions(+), 174 deletions(-)
New commits:
commit 51798a4ecf01aa225875e8582787323b1092b2dd
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Sat Oct 8 13:31:52 2011 +0200
do not use _COMPHELPER_COMPONENT_GETFACTORY macro
diff --git a/filter/inc/registration.hxx b/filter/inc/registration.hxx
deleted file mode 100644
index 060a77d..0000000
--- a/filter/inc/registration.hxx
+++ /dev/null
@@ -1,113 +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.
- *
- ************************************************************************/
-
-#ifndef __COMPHELPER_REGISTRATION_HXX_
-#define __COMPHELPER_REGISTRATION_HXX_
-
-//_______________________________________________
-// includes
-
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <rtl/ustrbuf.hxx>
-#include <cppuhelper/factory.hxx>
-
-//_______________________________________________
-// namespace
-
-namespace comphelper{
-
-//_______________________________________________
-// declaration
-
-//_______________________________________________
-
-/** TODO doc
- */
-#define _COMPHELPER_MULTIINSTANCEFACTORY(IMPLEMENTATIONNAME, SERVICENAMES, FACTORYMETHOD) \
- if (IMPLEMENTATIONNAME == sImplName) \
- xFactory = ::cppu::createSingleFactory(xSMGR , \
- IMPLEMENTATIONNAME, \
- FACTORYMETHOD , \
- SERVICENAMES );
-
-//_______________________________________________
-
-/** TODO doc
- */
-#define _COMPHELPER_ONEINSTANCEFACTORY(IMPLEMENTATIONNAME, SERVICENAMES, FACTORYMETHOD) \
- if (IMPLEMENTATIONNAME == sImplName) \
- xFactory = ::cppu::createOneInstanceFactory(xSMGR , \
- IMPLEMENTATIONNAME, \
- FACTORYMETHOD , \
- SERVICENAMES );
-
-//_______________________________________________
-
-/** TODO doc
- */
-#define _COMPHELPER_COMPONENT_GETFACTORY(STATIC_INIT,FACTORYLIST) \
- extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(const sal_Char* pImplementationName, \
- void* pServiceManager , \
- void* /* pRegistryKey */ ) \
- { \
- if ( \
- (!pImplementationName) || \
- (!pServiceManager ) \
- ) \
- return NULL; \
- \
- STATIC_INIT \
- \
- ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xSMGR = reinterpret_cast< ::com::sun::star::lang::XMultiServiceFactory* >(pServiceManager); \
- ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > xFactory ; \
- rtl::OUString sImplName = ::rtl::OUString::createFromAscii(pImplementationName); \
- \
- /* This parameter will expand to: */ \
- /* _COMPHELPER_xxxFACTORY(1) */ \
- /* else */ \
- /* ... */ \
- /* else */ \
- /* _COMPHELPER_xxxFACTORY(n) */ \
- FACTORYLIST \
- \
- /* And if one of these checks was successfully => xFactory was set! */ \
- if (xFactory.is()) \
- { \
- xFactory->acquire(); \
- return xFactory.get(); \
- } \
- \
- return NULL; \
- }
-
-} // namespace comphelper
-
-#endif // #ifndef __COMPHELPER_REGISTRATION_HXX_
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/config/cache/filterconfig1.component b/filter/source/config/cache/filterconfig1.component
index 9d3c7c9..1d6c015 100644
--- a/filter/source/config/cache/filterconfig1.component
+++ b/filter/source/config/cache/filterconfig1.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="filterconfig1"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.filter.config.ConfigFlush">
<service name="com.sun.star.document.FilterConfigRefresh"/>
diff --git a/filter/source/config/cache/registration.cxx b/filter/source/config/cache/registration.cxx
index 6d449c4..0c83bdb 100644
--- a/filter/source/config/cache/registration.cxx
+++ b/filter/source/config/cache/registration.cxx
@@ -29,20 +29,15 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_filter.hxx"
-#include "registration.hxx"
-
+#include <cppuhelper/factory.hxx>
#include <rtl/instance.hxx>
-//_______________________________________________
-// includes
-
#ifdef _FILTER_CONFIG_CONSTANT_HXX_
# error "Already included constant.hxx"
#else
# define PROPNAME_IMPL_DECL
# include "constant.hxx"
#endif
-#include <stdio.h>
#include "typedetection.hxx"
#include "filterfactory.hxx"
#include "contenthandlerfactory.hxx"
@@ -99,30 +94,60 @@ static void InitConstants()
theConstantsInitializer::get();
}
-// extern "C" component_getFactory()
-_COMPHELPER_COMPONENT_GETFACTORY
-(
- { InitConstants(); },
- _COMPHELPER_MULTIINSTANCEFACTORY( TypeDetection::impl_getImplementationName() ,
- TypeDetection::impl_getSupportedServiceNames(),
- TypeDetection::impl_createInstance )
-
- _COMPHELPER_MULTIINSTANCEFACTORY( FilterFactory::impl_getImplementationName() ,
- FilterFactory::impl_getSupportedServiceNames(),
- FilterFactory::impl_createInstance )
-
- _COMPHELPER_MULTIINSTANCEFACTORY( ContentHandlerFactory::impl_getImplementationName() ,
- ContentHandlerFactory::impl_getSupportedServiceNames(),
- ContentHandlerFactory::impl_createInstance )
-
- _COMPHELPER_MULTIINSTANCEFACTORY( FrameLoaderFactory::impl_getImplementationName() ,
- FrameLoaderFactory::impl_getSupportedServiceNames(),
- FrameLoaderFactory::impl_createInstance )
-
- _COMPHELPER_ONEINSTANCEFACTORY( ConfigFlush::impl_getImplementationName() ,
- ConfigFlush::impl_getSupportedServiceNames(),
- ConfigFlush::impl_createInstance )
-)
+extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL
+ filterconfig1_component_getFactory( const sal_Char* pImplementationName,
+ void* pServiceManager,
+ void* /* pRegistryKey */ )
+{
+ if ((!pImplementationName) || (!pServiceManager ))
+ return NULL;
+
+ InitConstants();
+
+ com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >
+ xSMGR = reinterpret_cast< com::sun::star::lang::XMultiServiceFactory* >(pServiceManager);
+ com::sun::star::uno::Reference< com::sun::star::lang::XSingleServiceFactory > xFactory;
+ rtl::OUString sImplName = rtl::OUString::createFromAscii(pImplementationName);
+
+ if (TypeDetection::impl_getImplementationName() == sImplName)
+ xFactory = cppu::createSingleFactory( xSMGR,
+ TypeDetection::impl_getImplementationName(),
+ TypeDetection::impl_createInstance,
+ TypeDetection::impl_getSupportedServiceNames() );
+
+ if (FilterFactory::impl_getImplementationName() == sImplName)
+ xFactory = cppu::createSingleFactory( xSMGR,
+ FilterFactory::impl_getImplementationName(),
+ FilterFactory::impl_createInstance,
+ FilterFactory::impl_getSupportedServiceNames() );
+
+ if (ContentHandlerFactory::impl_getImplementationName() == sImplName)
+ xFactory = cppu::createSingleFactory( xSMGR,
+ ContentHandlerFactory::impl_getImplementationName(),
+ ContentHandlerFactory::impl_createInstance,
+ ContentHandlerFactory::impl_getSupportedServiceNames() );
+
+ if (FrameLoaderFactory::impl_getImplementationName() == sImplName)
+ xFactory = cppu::createSingleFactory( xSMGR,
+ FrameLoaderFactory::impl_getImplementationName(),
+ FrameLoaderFactory::impl_createInstance,
+ FrameLoaderFactory::impl_getSupportedServiceNames() );
+
+ if (ConfigFlush::impl_getImplementationName() == sImplName)
+ xFactory = cppu::createOneInstanceFactory( xSMGR,
+ ConfigFlush::impl_getImplementationName(),
+ ConfigFlush::impl_createInstance,
+ ConfigFlush::impl_getSupportedServiceNames() );
+
+ /* And if one of these checks was successful => xFactory was set! */
+ if (xFactory.is())
+ {
+ xFactory->acquire();
+ return xFactory.get();
+ }
+
+ return NULL;
+}
} // namespace config
} // namespace filter
diff --git a/filter/source/odfflatxml/OdfFlatXml.cxx b/filter/source/odfflatxml/OdfFlatXml.cxx
index 4be9250..edacff1 100644
--- a/filter/source/odfflatxml/OdfFlatXml.cxx
+++ b/filter/source/odfflatxml/OdfFlatXml.cxx
@@ -57,8 +57,6 @@
#include <com/sun/star/io/XActiveDataSource.hpp>
#include <com/sun/star/io/XSeekable.hpp>
-#include <registration.hxx>
-
using namespace ::rtl;
using namespace ::cppu;
using namespace ::osl;
@@ -235,14 +233,32 @@ Reference< XInterface > SAL_CALL OdfFlatXml::impl_createInstance(const Reference
}
-// extern "C" component_getFactory()
-_COMPHELPER_COMPONENT_GETFACTORY
-(
- {},
- _COMPHELPER_ONEINSTANCEFACTORY( OdfFlatXml::impl_getImplementationName(),
- OdfFlatXml::impl_getSupportedServiceNames(),
- OdfFlatXml::impl_createInstance)
+extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL
+component_getFactory( const sal_Char* pImplementationName,
+ void* pServiceManager,
+ void* /* pRegistryKey */ )
+{
+ if ((!pImplementationName) || (!pServiceManager))
+ return NULL;
+
+ com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >
+ xSMGR = reinterpret_cast< com::sun::star::lang::XMultiServiceFactory* >(pServiceManager);
+ com::sun::star::uno::Reference< com::sun::star::lang::XSingleServiceFactory > xFactory;
+ rtl::OUString sImplName = rtl::OUString::createFromAscii(pImplementationName);
+
+ if (OdfFlatXml::impl_getImplementationName() == sImplName)
+ xFactory = cppu::createOneInstanceFactory( xSMGR,
+ OdfFlatXml::impl_getImplementationName(),
+ OdfFlatXml::impl_createInstance,
+ OdfFlatXml::impl_getSupportedServiceNames() );
+
+ if (xFactory.is())
+ {
+ xFactory->acquire();
+ return xFactory.get();
+ }
-)
+ return NULL;
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 173cf81756c69f112c3d61403b5cf87ee81afcfb
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Fri Oct 7 23:51:40 2011 +0200
add more component prefixes
diff --git a/desktop/source/deployment/deployment.component b/desktop/source/deployment/deployment.component
index 11385c7..2a24467 100755
--- a/desktop/source/deployment/deployment.component
+++ b/desktop/source/deployment/deployment.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="deployment"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.deployment.ExtensionManager">
<service name="com.sun.star.comp.deployment.ExtensionManager"/>
diff --git a/desktop/source/deployment/dp_services.cxx b/desktop/source/deployment/dp_services.cxx
index 7a93e5b..1eae8ed 100644
--- a/desktop/source/deployment/dp_services.cxx
+++ b/desktop/source/deployment/dp_services.cxx
@@ -85,7 +85,7 @@ bool singleton_entries( uno::Reference<registry::XRegistryKey> const& );
extern "C" {
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL deployment_component_getFactory(
sal_Char const * pImplName,
lang::XMultiServiceFactory * pServiceManager,
registry::XRegistryKey * pRegistryKey )
diff --git a/desktop/source/deployment/gui/deploymentgui.component b/desktop/source/deployment/gui/deploymentgui.component
index d613f48..085100b 100755
--- a/desktop/source/deployment/gui/deploymentgui.component
+++ b/desktop/source/deployment/gui/deploymentgui.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="deploymentgui"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.deployment.ui.LicenseDialog">
<service name="com.sun.star.deployment.ui.LicenseDialog"/>
diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx b/desktop/source/deployment/gui/dp_gui_service.cxx
index efd055d..38c081b 100644
--- a/desktop/source/deployment/gui/dp_gui_service.cxx
+++ b/desktop/source/deployment/gui/dp_gui_service.cxx
@@ -351,7 +351,7 @@ sdecl::ServiceDecl const updateDecl(
extern "C" {
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL deploymentgui_component_getFactory(
sal_Char const * pImplName,
lang::XMultiServiceFactory * pServiceManager,
registry::XRegistryKey * pRegistryKey )
diff --git a/desktop/source/migration/services/cexports.cxx b/desktop/source/migration/services/cexports.cxx
index f527941..ae46b18 100644
--- a/desktop/source/migration/services/cexports.cxx
+++ b/desktop/source/migration/services/cexports.cxx
@@ -61,7 +61,7 @@ extern "C"
};
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL migrationoo2_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{
return ::cppu::component_getFactoryHelper(
diff --git a/desktop/source/migration/services/cexportsoo3.cxx b/desktop/source/migration/services/cexportsoo3.cxx
index 5f71539..3535e94 100644
--- a/desktop/source/migration/services/cexportsoo3.cxx
+++ b/desktop/source/migration/services/cexportsoo3.cxx
@@ -46,7 +46,7 @@ extern "C"
};
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL migrationoo3_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{
return ::cppu::component_getFactoryHelper(
diff --git a/desktop/source/migration/services/migrationoo2.component b/desktop/source/migration/services/migrationoo2.component
index 2b21ab1..f138a47 100755
--- a/desktop/source/migration/services/migrationoo2.component
+++ b/desktop/source/migration/services/migrationoo2.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="migrationoo2"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.desktop.migration.Basic">
<service name="com.sun.star.migration.Basic"/>
diff --git a/desktop/source/migration/services/migrationoo3.component b/desktop/source/migration/services/migrationoo3.component
index 380c389..94ac9cb 100755
--- a/desktop/source/migration/services/migrationoo3.component
+++ b/desktop/source/migration/services/migrationoo3.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="migrationoo3"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.desktop.migration.OOo3Extensions">
<service name="com.sun.star.migration.Extensions"/>
diff --git a/desktop/source/offacc/acceptor.cxx b/desktop/source/offacc/acceptor.cxx
index 82139ff..098dc5c 100644
--- a/desktop/source/offacc/acceptor.cxx
+++ b/desktop/source/offacc/acceptor.cxx
@@ -298,7 +298,7 @@ extern "C"
{
using namespace desktop;
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(const sal_Char *pImplementationName, void *pServiceManager, void *)
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL offacc_component_getFactory(const sal_Char *pImplementationName, void *pServiceManager, void *)
{
void* pReturn = NULL ;
if ( pImplementationName && pServiceManager )
diff --git a/desktop/source/offacc/offacc.component b/desktop/source/offacc/offacc.component
index 6f0d4a9..4004a45 100755
--- a/desktop/source/offacc/offacc.component
+++ b/desktop/source/offacc/offacc.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="offacc"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.office.comp.Acceptor">
<service name="com.sun.star.office.Acceptor"/>
diff --git a/desktop/source/splash/services_spl.cxx b/desktop/source/splash/services_spl.cxx
index a2f9bd2..6a621c3 100644
--- a/desktop/source/splash/services_spl.cxx
+++ b/desktop/source/splash/services_spl.cxx
@@ -84,7 +84,7 @@ getSupportedServiceNames(int p) {
extern "C"
{
-SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL spl_component_getFactory(
const sal_Char* pImplementationName,
void* pServiceManager,
void*)
diff --git a/desktop/source/splash/spl.component b/desktop/source/splash/spl.component
index 2caecf5..5d7a6e6 100755
--- a/desktop/source/splash/spl.component
+++ b/desktop/source/splash/spl.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="spl"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.desktop.FirstStart">
<service name="com.sun.star.task.Job"/>
diff --git a/desktop/unx/splash/splash.component b/desktop/unx/splash/splash.component
index cd77927..585f35c 100755
--- a/desktop/unx/splash/splash.component
+++ b/desktop/unx/splash/splash.component
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="splash"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.office.comp.PipeSplashScreen">
<service name="com.sun.star.office.PipeSplashScreen"/>
diff --git a/desktop/unx/splash/unxsplash.cxx b/desktop/unx/splash/unxsplash.cxx
index 85a9f80..c2beeff 100644
--- a/desktop/unx/splash/unxsplash.cxx
+++ b/desktop/unx/splash/unxsplash.cxx
@@ -182,7 +182,7 @@ uno::Sequence< OUString > SAL_CALL UnxSplash_getSupportedServiceNames() throw()
extern "C"
{
-SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* pRegistryKey )
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL splash_component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* pRegistryKey )
{
return ::cppu::component_getFactoryHelper( pImplName, pServiceManager,
pRegistryKey, aEntries );
diff --git a/package/source/manifest/UnoRegister.cxx b/package/source/manifest/UnoRegister.cxx
index c573497..4918b1d 100644
--- a/package/source/manifest/UnoRegister.cxx
+++ b/package/source/manifest/UnoRegister.cxx
@@ -54,7 +54,7 @@ using rtl::OUString;
* @param pRegistryKey registry data key to read and write component persistent data
* @return a component factory (generic uno interface)
*/
-extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL package2_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
{
void * pRet = 0;
diff --git a/package/source/xstor/register.cxx b/package/source/xstor/register.cxx
index 60ddc68..5ba6c30 100644
--- a/package/source/xstor/register.cxx
+++ b/package/source/xstor/register.cxx
@@ -41,7 +41,7 @@ using namespace ::com::sun::star;
extern "C" {
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL xstor_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
{
void * pRet = 0;
diff --git a/package/source/xstor/xstor.component b/package/source/xstor/xstor.component
index f338d6a..a2565a7 100644
--- a/package/source/xstor/xstor.component
+++ b/package/source/xstor/xstor.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="xstor"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.embed.StorageFactory">
<service name="com.sun.star.comp.embed.StorageFactory"/>
diff --git a/package/util/package2.component b/package/util/package2.component
index cdfa842..974aa9a 100644
--- a/package/util/package2.component
+++ b/package/util/package2.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="package2"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.package.zip.ZipFileAccess">
<service name="com.sun.star.comp.packages.zip.ZipFileAccess"/>
commit cad383870426fed3cbb83c17c39f910a454e001c
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Fri Oct 7 23:00:10 2011 +0200
add package to tail_build
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index 167d251..97c4372 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -43,6 +43,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
MathMLDTD \
Mesa \
oox \
+ package \
padmin \
reportdesign \
sc \
diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index 400cc85..d170851 100644
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@ -1,4 +1,4 @@
-po postprocess :: accessibility BINFILTER:binfilter configmgr CRASHREP:crashrep CT2N:ct2n dtrans embeddedobj embedserv EPM:epm DESKTOP:extensions extras fpicker HELP:helpcontent2 io LIBRSVG:librsvg lingucomponent ODK:odk officecfg package psprint_config remotebridges scaddins scp2 DESKTOP:setup_native sysui testtools ucb UnoControls ure wizards MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno readlicense_oo DESKTOP:unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool SDEXT:sdext MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport LIBXSLT:libxslt tail_build NULL
+po postprocess :: accessibility BINFILTER:binfilter configmgr CRASHREP:crashrep CT2N:ct2n dtrans embeddedobj embedserv EPM:epm DESKTOP:extensions extras fpicker HELP:helpcontent2 io LIBRSVG:librsvg lingucomponent ODK:odk officecfg psprint_config remotebridges scaddins scp2 DESKTOP:setup_native sysui testtools ucb UnoControls ure wizards MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno readlicense_oo DESKTOP:unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool SDEXT:sdext MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport LIBXSLT:libxslt tail_build NULL
po postprocess usr1 - all po_mkout NULL
po postprocess\checkxml nmake - all po_checkxml NULL
po postprocess\checkdeliver nmake - all po_checkdlv NULL
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index 613dd5d..16df54b 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb tail_build : APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost l10ntools LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds NEON:neon NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland SAXON:saxon TRANSLATIONS:translations XPDF:xpdf avmedia basegfx basic bridges canvas comphelper connectivity cppcanvas cppu cppuhelper fpicker javaunohelper jurt jvmaccess offapi officecfg oovbaapi package qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar sal sax sfx2 solenv soltools sot stoc svtools svx sysui test toolkit tools ucbhelper udkapi unoil unotools ure vcl xmlhelp xmloff xmlscript xsltml NULL
+tb tail_build : APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost l10ntools LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds NEON:neon NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland SAXON:saxon TRANSLATIONS:translations XPDF:xpdf avmedia basegfx basic bridges canvas comphelper connectivity cppcanvas cppu cppuhelper fpicker javaunohelper jurt jvmaccess offapi officecfg oovbaapi qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar sal sax sfx2 solenv soltools sot stoc svtools svx sysui test toolkit tools ucbhelper udkapi unoil unotools ure vcl xmlhelp xmloff xmlscript xsltml NULL
tb tail_build\prj nmake - all tb_prj NULL
More information about the Libreoffice-commits
mailing list