diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-07-28 18:37:15 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-07-28 18:37:15 +0200 |
| commit | 73c35c44008025bc907a22c44a0340373afb6585 (patch) | |
| tree | cefc1fb98cf9dcbddbf5b9566abfde736d2a7cc8 /sc/source | |
| parent | 964987e155b26cd2df5df4aba7d079360be7ffc6 (diff) | |
| parent | 45fb35c7ac3c4868b0e7a1edb66279183144c737 (diff) | |
Merge branch 'master' of git://anongit.freedesktop.org/libreoffice/calc
Diffstat (limited to 'sc/source')
| -rw-r--r-- | sc/source/filter/excel/xestream.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/unoobj/appluno.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/unoobj/detreg.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/vba/service.cxx | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx index d71377c8411c..0d66d463d60e 100644 --- a/sc/source/filter/excel/xestream.cxx +++ b/sc/source/filter/excel/xestream.cxx @@ -1204,7 +1204,7 @@ extern "C" { 0, 0, 0, 0, 0, 0 } }; -SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, XMultiServiceFactory* pServiceManager, XRegistryKey* pRegistryKey ) +SAL_DLLPUBLIC_EXPORT void* SAL_CALL scfilt_component_getFactory( const sal_Char* pImplName, XMultiServiceFactory* pServiceManager, XRegistryKey* pRegistryKey ) { return ::cppu::component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey, entries ); diff --git a/sc/source/ui/unoobj/appluno.cxx b/sc/source/ui/unoobj/appluno.cxx index 66b3c7b26cfd..a37e02f0ec8e 100644 --- a/sc/source/ui/unoobj/appluno.cxx +++ b/sc/source/ui/unoobj/appluno.cxx @@ -186,7 +186,7 @@ SC_SIMPLE_SERVICE_INFO( ScSpreadsheetSettings, "ScSpreadsheetSettings", SCSPREAD extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void * SAL_CALL sc_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /* pRegistryKey */ ) { if (!pServiceManager) diff --git a/sc/source/ui/unoobj/detreg.cxx b/sc/source/ui/unoobj/detreg.cxx index 02ae0f8d4294..c32fbb15e0bd 100644 --- a/sc/source/ui/unoobj/detreg.cxx +++ b/sc/source/ui/unoobj/detreg.cxx @@ -43,7 +43,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 scd_component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, void* /* pRegistryKey */ ) { diff --git a/sc/source/ui/vba/service.cxx b/sc/source/ui/vba/service.cxx index e086afa0cfe9..b31e3291fd4f 100644 --- a/sc/source/ui/vba/service.cxx +++ b/sc/source/ui/vba/service.cxx @@ -78,11 +78,11 @@ extern sdecl::ServiceDecl const serviceDecl; extern "C" { - SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( + SAL_DLLPUBLIC_EXPORT void * SAL_CALL vbaobj_component_getFactory( const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey ) { - OSL_TRACE("In component_getFactory for %s", pImplName ); + OSL_TRACE("In vbaobj_component_getFactory for %s", pImplName ); void* pRet = component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey, range::serviceDecl, workbook::serviceDecl, worksheet::serviceDecl, globals::serviceDecl, window::serviceDecl, hyperlink::serviceDecl, application::serviceDecl ); if( !pRet ) |