mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

initial commit of code reorg, existing files that are modified

Browse Source
This commit is contained in:
Noel Power
2009-09-18 15:24:22 +00:00
parent 4694e90c50
commit dfc77d75e1
100 changed files with 1153 additions and 3168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
sc/source/ui/vba/service.cxx
View File

@@ -61,11 +61,15 @@ namespace globals
{
extern sdecl::ServiceDecl const serviceDecl;
}
namespace userform
namespace hyperlink
{
extern sdecl::ServiceDecl const serviceDecl;
}
namespace hyperlink
namespace application
{
extern sdecl::ServiceDecl const serviceDecl;
}
namespace textframe
{
extern sdecl::ServiceDecl const serviceDecl;
}
@@ -83,10 +87,10 @@ extern "C"
lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey )
{
OSL_TRACE("In component_writeInfo");
#if 0
// Component registration
if ( component_writeInfoHelper( pServiceManager, pRegistryKey,
range::serviceDecl, workbook::serviceDecl, worksheet::serviceDecl, globals::serviceDecl, userform::serviceDecl, window::serviceDecl, hyperlink::serviceDecl ) )
range::serviceDecl, workbook::serviceDecl, worksheet::serviceDecl, globals::serviceDecl, window::serviceDecl, hyperlink::serviceDecl, application::serviceDecl ) )
{
// Singleton registration
try
@@ -106,6 +110,12 @@ extern "C"
}
}
return sal_False;
#else
// Component registration
return component_writeInfoHelper( pServiceManager, pRegistryKey,
range::serviceDecl, workbook::serviceDecl, worksheet::serviceDecl, globals::serviceDecl, window::serviceDecl, hyperlink::serviceDecl, application::serviceDecl ) && component_writeInfoHelper( pServiceManager, pRegistryKey, textframe::serviceDecl );
#endif
}
SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
@@ -114,7 +124,9 @@ extern "C"
{
OSL_TRACE("In component_getFactory for %s", pImplName );
void* pRet = component_getFactoryHelper(
pImplName, pServiceManager, pRegistryKey, range::serviceDecl, workbook::serviceDecl, worksheet::serviceDecl, globals::serviceDecl, userform::serviceDecl, window::serviceDecl, hyperlink::serviceDecl );
pImplName, pServiceManager, pRegistryKey, range::serviceDecl, workbook::serviceDecl, worksheet::serviceDecl, globals::serviceDecl, window::serviceDecl, hyperlink::serviceDecl, application::serviceDecl );
if( !pRet )
pRet = component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey, textframe::serviceDecl );
OSL_TRACE("Ret is 0x%x", pRet);
return pRet;
}