Skip to content

C
core
Kaydet (Commit) 25aeecfd authored tarafından Matus Kukan's avatar Matus Kukan Kaydeden (comit) Michael Meeks
Dosyalara gözat
Seçenekler

update component factory methods to use new prefixes, to add lib merging

üst 44f80498
Show whitespace changes
Inline Side-by-side
Showing with 28 additions and 27 deletions
fileaccess/source/FileAccess.cxx
Dosyayı görüntüle @ 25aeecfd
...@@ -866,13 +866,13 @@ Sequence< rtl::OUString > FileAccess_getSupportedServiceNames() ...@@ -866,13 +866,13 @@ Sequence< rtl::OUString > FileAccess_getSupportedServiceNames()
extern "C" extern "C"
{ {
//================================================================================================== //==================================================================================================
SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( SAL_DLLPUBLIC_EXPORT void SAL_CALL fileacc_component_getImplementationEnvironment(
const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
{ {
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
} }
//================================================================================================== //==================================================================================================
SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( SAL_DLLPUBLIC_EXPORT void * SAL_CALL fileacc_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
{ {
void * pRet = 0; void * pRet = 0;
......
fileaccess/source/fileacc.component
Dosyayı görüntüle @ 25aeecfd
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
* *
**********************************************************************--> **********************************************************************-->
<component loader="com.sun.star.loader.SharedLibrary" <component loader="com.sun.star.loader.SharedLibrary" prefix="fileacc"
xmlns="http://openoffice.org/2010/uno-components"> xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.ucb.SimpleFileAccess"> <implementation name="com.sun.star.comp.ucb.SimpleFileAccess">
<service name="com.sun.star.ucb.SimpleFileAccess"/> <service name="com.sun.star.ucb.SimpleFileAccess"/>
......
framework/source/lomenubar/exports.cxx
Dosyayı görüntüle @ 25aeecfd
...@@ -54,13 +54,13 @@ static void writeInfo(const css::uno::Reference< css::registry::XRegistryKey >& ...@@ -54,13 +54,13 @@ static void writeInfo(const css::uno::Reference< css::registry::XRegistryKey >&
extern "C" extern "C"
{ {
SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(const sal_Char** ppEnvTypeName, SAL_DLLPUBLIC_EXPORT void SAL_CALL lomenubar_component_getImplementationEnvironment(const sal_Char** ppEnvTypeName,
uno_Environment** /*ppEnv*/ ) uno_Environment** /*ppEnv*/ )
{ {
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
} }
SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(const sal_Char* pImplName , SAL_DLLPUBLIC_EXPORT void* SAL_CALL lomenubar_component_getFactory(const sal_Char* pImplName ,
void* pServiceManager, void* pServiceManager,
void* /*pRegistryKey*/ ) void* /*pRegistryKey*/ )
{ {
......
framework/util/lomenubar.component
Dosyayı görüntüle @ 25aeecfd
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
* in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
* instead of those above. * instead of those above.
*--> *-->
<component loader="com.sun.star.loader.SharedLibrary" <component loader="com.sun.star.loader.SharedLibrary" prefix="lomenubar"
xmlns="http://openoffice.org/2010/uno-components"> xmlns="http://openoffice.org/2010/uno-components">
<implementation name="org.libreoffice.comp.framework.lomenubar.FrameJob"> <implementation name="org.libreoffice.comp.framework.lomenubar.FrameJob">
<service name="com.sun.star.task.Job"/> <service name="com.sun.star.task.Job"/>
......
sfx2/inc/sfx2/sfxuno.hxx
Dosyayı görüntüle @ 25aeecfd
...@@ -590,7 +590,7 @@ bool GetEncryptionData_Impl( const SfxItemSet* pSet, ::com::sun::star::uno::Sequ ...@@ -590,7 +590,7 @@ bool GetEncryptionData_Impl( const SfxItemSet* pSet, ::com::sun::star::uno::Sequ
} }
//************************************************************************************************************************ //************************************************************************************************************************
// definition for "extern c component_getFactory()" // definition for "extern c sfx_component_getFactory()"
//************************************************************************************************************************ //************************************************************************************************************************
#define CREATEFACTORY(CLASS) \ #define CREATEFACTORY(CLASS) \
\ \
...@@ -598,7 +598,7 @@ bool GetEncryptionData_Impl( const SfxItemSet* pSet, ::com::sun::star::uno::Sequ ...@@ -598,7 +598,7 @@ bool GetEncryptionData_Impl( const SfxItemSet* pSet, ::com::sun::star::uno::Sequ
xFactory = CLASS::impl_createFactory( xServiceManager ); xFactory = CLASS::impl_createFactory( xServiceManager );
//************************************************************************************************************************ //************************************************************************************************************************
// definition for "extern c component_getFactory()" // definition for "extern c sfx_component_getFactory()"
//************************************************************************************************************************ //************************************************************************************************************************
#define IF_NAME_CREATECOMPONENTFACTORY(CLASS) \ #define IF_NAME_CREATECOMPONENTFACTORY(CLASS) \
\ \
......
sfx2/source/appl/appuno.cxx
Dosyayı görüntüle @ 25aeecfd
...@@ -2143,14 +2143,14 @@ SFX_IMPL_SINGLEFACTORY( TestMouseClickHandler ); ...@@ -2143,14 +2143,14 @@ SFX_IMPL_SINGLEFACTORY( TestMouseClickHandler );
extern "C" { extern "C" {
SFX2_DLLPUBLIC void SAL_CALL component_getImplementationEnvironment( SFX2_DLLPUBLIC void SAL_CALL sfx_component_getImplementationEnvironment(
const sal_Char** ppEnvironmentTypeName , const sal_Char** ppEnvironmentTypeName ,
uno_Environment** ) uno_Environment** )
{ {
*ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ; *ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ;
} }
SFX2_DLLPUBLIC void* SAL_CALL component_getFactory( SFX2_DLLPUBLIC void* SAL_CALL sfx_component_getFactory(
const sal_Char* pImplementationName , const sal_Char* pImplementationName ,
void* pServiceManager , void* pServiceManager ,
void* ) void* )
......
sfx2/util/sfx.component
Dosyayı görüntüle @ 25aeecfd
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
* *
**********************************************************************--> **********************************************************************-->
<component loader="com.sun.star.loader.SharedLibrary" <component loader="com.sun.star.loader.SharedLibrary" prefix="sfx"
xmlns="http://openoffice.org/2010/uno-components"> xmlns="http://openoffice.org/2010/uno-components">
<implementation name="SfxDocumentMetaData"> <implementation name="SfxDocumentMetaData">
<service name="com.sun.star.document.DocumentProperties"/> <service name="com.sun.star.document.DocumentProperties"/>
......
svx/source/core/coreservices.cxx
Dosyayı görüntüle @ 25aeecfd
...@@ -72,13 +72,13 @@ extern Sequence< OUString > SAL_CALL FontWorkCharacterSpacingControl_getSupporte ...@@ -72,13 +72,13 @@ extern Sequence< OUString > SAL_CALL FontWorkCharacterSpacingControl_getSupporte
extern "C" extern "C"
{ {
SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment ( SAL_DLLPUBLIC_EXPORT void SAL_CALL svxcore_component_getImplementationEnvironment (
const sal_Char ** ppEnvTypeName, uno_Environment ** ) const sal_Char ** ppEnvTypeName, uno_Environment ** )
{ {
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
} }
SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory ( SAL_DLLPUBLIC_EXPORT void * SAL_CALL svxcore_component_getFactory (
const sal_Char * pImplName, void * pServiceManager, void * ) const sal_Char * pImplName, void * pServiceManager, void * )
{ {
void * pRet = 0; void * pRet = 0;
......
svx/source/unodialogs/textconversiondlgs/services.cxx
Dosyayı görüntüle @ 25aeecfd
...@@ -48,13 +48,13 @@ static struct ::cppu::ImplementationEntry g_entries_unodialogs_chinesetranslatio ...@@ -48,13 +48,13 @@ static struct ::cppu::ImplementationEntry g_entries_unodialogs_chinesetranslatio
extern "C" extern "C"
{ {
//================================================================================================== //==================================================================================================
SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( SAL_DLLPUBLIC_EXPORT void SAL_CALL textconversiondlgs_component_getImplementationEnvironment(
const sal_Char ** ppEnvTypeName, uno_Environment ** ) const sal_Char ** ppEnvTypeName, uno_Environment ** )
{ {
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
} }
//================================================================================================== //==================================================================================================
SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( SAL_DLLPUBLIC_EXPORT void * SAL_CALL textconversiondlgs_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{ {
return ::cppu::component_getFactoryHelper( return ::cppu::component_getFactoryHelper(
......
svx/source/unodraw/unoctabl.cxx
Dosyayı görüntüle @ 25aeecfd
...@@ -256,13 +256,13 @@ extern uno::Sequence< OUString > SAL_CALL ExtrusionDepthController_getSupportedS ...@@ -256,13 +256,13 @@ extern uno::Sequence< OUString > SAL_CALL ExtrusionDepthController_getSupportedS
extern "C" extern "C"
{ {
SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment ( SAL_DLLPUBLIC_EXPORT void SAL_CALL svx_component_getImplementationEnvironment (
const sal_Char ** ppEnvTypeName, uno_Environment ** ) const sal_Char ** ppEnvTypeName, uno_Environment ** )
{ {
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
} }
SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory ( SAL_DLLPUBLIC_EXPORT void * SAL_CALL svx_component_getFactory (
const sal_Char * pImplName, void * pServiceManager, void * ) const sal_Char * pImplName, void * pServiceManager, void * )
{ {
void * pRet = 0; void * pRet = 0;
......
svx/util/svx.component
Dosyayı görüntüle @ 25aeecfd
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
* *
**********************************************************************--> **********************************************************************-->
<component loader="com.sun.star.loader.SharedLibrary" <component loader="com.sun.star.loader.SharedLibrary" prefix="svx"
xmlns="http://openoffice.org/2010/uno-components"> xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.Draw.GraphicExporter"> <implementation name="com.sun.star.comp.Draw.GraphicExporter">
<service name="com.sun.star.drawing.GraphicExportFilter"/> <service name="com.sun.star.drawing.GraphicExportFilter"/>
......
svx/util/svxcore.component
Dosyayı görüntüle @ 25aeecfd
...@@ -25,7 +25,8 @@ ...@@ -25,7 +25,8 @@
* for a copy of the LGPLv3 License. * for a copy of the LGPLv3 License.
* *
**********************************************************************--> **********************************************************************-->
<component xmlns="http://openoffice.org/2010/uno-components" loader="com.sun.star.loader.SharedLibrary"> <component loader="com.sun.star.loader.SharedLibrary" prefix="svxcore"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.svx.ExtrusionDepthController"> <implementation name="com.sun.star.comp.svx.ExtrusionDepthController">
<service name="com.sun.star.frame.PopupMenuController"/> <service name="com.sun.star.frame.PopupMenuController"/>
</implementation> </implementation>
......
svx/util/textconversiondlgs.component
Dosyayı görüntüle @ 25aeecfd
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
* *
**********************************************************************--> **********************************************************************-->
<component loader="com.sun.star.loader.SharedLibrary" <component loader="com.sun.star.loader.SharedLibrary" prefix="textconversiondlgs"
xmlns="http://openoffice.org/2010/uno-components"> xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.linguistic2.ChineseTranslationDialog"> <implementation name="com.sun.star.comp.linguistic2.ChineseTranslationDialog">
<service name="com.sun.star.linguistic2.ChineseTranslationDialog"/> <service name="com.sun.star.linguistic2.ChineseTranslationDialog"/>
......
xmloff/source/core/facreg.cxx
Dosyayı görüntüle @ 25aeecfd
...@@ -164,7 +164,7 @@ extern "C" ...@@ -164,7 +164,7 @@ extern "C"
{ {
#endif #endif
XMLOFF_DLLPUBLIC void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ) XMLOFF_DLLPUBLIC void SAL_CALL xo_component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** )
{ {
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
} }
...@@ -178,7 +178,7 @@ XMLOFF_DLLPUBLIC void SAL_CALL component_getImplementationEnvironment( const sal ...@@ -178,7 +178,7 @@ XMLOFF_DLLPUBLIC void SAL_CALL component_getImplementationEnvironment( const sal
classname##_getSupportedServiceNames() );\ classname##_getSupportedServiceNames() );\
} }
XMLOFF_DLLPUBLIC void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) XMLOFF_DLLPUBLIC void * SAL_CALL xo_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
{ {
void * pRet = 0; void * pRet = 0;
if( pServiceManager ) if( pServiceManager )
......
xmloff/source/transform/XMLFilterRegistration.cxx
Dosyayı görüntüle @ 25aeecfd
...@@ -142,12 +142,12 @@ extern "C" ...@@ -142,12 +142,12 @@ extern "C"
{ {
#endif #endif
SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ) SAL_DLLPUBLIC_EXPORT void SAL_CALL xof_component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** )
{ {
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
} }
SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) SAL_DLLPUBLIC_EXPORT void* SAL_CALL xof_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
{ {
void * pRet = NULL; void * pRet = NULL;
if( pServiceManager ) if( pServiceManager )
...@@ -183,7 +183,7 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char * pImpl ...@@ -183,7 +183,7 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char * pImpl
} }
catch( uno::Exception& ) catch( uno::Exception& )
{ {
OSL_FAIL( "xof::component_getFactory: Exception!" ); OSL_FAIL( "xof::xof_component_getFactory: Exception!" );
} }
} }
......
xmloff/source/transform/xof.component
Dosyayı görüntüle @ 25aeecfd
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
* *
**********************************************************************--> **********************************************************************-->
<component loader="com.sun.star.loader.SharedLibrary" <component loader="com.sun.star.loader.SharedLibrary" prefix="xof"
xmlns="http://openoffice.org/2010/uno-components"> xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.Calc.XMLContentImporter"> <implementation name="com.sun.star.comp.Calc.XMLContentImporter">
<service name="com.sun.star.comp.Calc.XMLContentImporter"/> <service name="com.sun.star.comp.Calc.XMLContentImporter"/>
......
xmloff/util/xo.component
Dosyayı görüntüle @ 25aeecfd
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
* *
**********************************************************************--> **********************************************************************-->
<component loader="com.sun.star.loader.SharedLibrary" <component loader="com.sun.star.loader.SharedLibrary" prefix="xo"
xmlns="http://openoffice.org/2010/uno-components"> xmlns="http://openoffice.org/2010/uno-components">
<implementation name="SchXMLExport.Compact"> <implementation name="SchXMLExport.Compact">
<service name="com.sun.star.comp.Chart.XMLExporter"/> <service name="com.sun.star.comp.Chart.XMLExporter"/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment