diff options
| author | Peter Foley <pefoley2@verizon.net> | 2013-04-15 08:36:13 -0400 |
|---|---|---|
| committer | Peter Foley <pefoley2@verizon.net> | 2013-04-15 09:12:08 -0400 |
| commit | cd79d51420b90117d0f3e1d5f3cdf9187bd61b88 (patch) | |
| tree | e526d0c548f67baf0b3fcd7e23f69814816709b5 /stoc | |
| parent | d8b8530d4b920618e188bdfbe8e17d0a150df692 (diff) | |
prefix all component_getFactory methods
Change-Id: I954176fdab9103125444dd2fb397673406f7aff9
Diffstat (limited to 'stoc')
| -rw-r--r-- | stoc/source/bootstrap/services.cxx | 6 | ||||
| -rw-r--r-- | stoc/util/bootstrap.component | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/stoc/source/bootstrap/services.cxx b/stoc/source/bootstrap/services.cxx index 56bcd1c87e33..72404f19f9bb 100644 --- a/stoc/source/bootstrap/services.cxx +++ b/stoc/source/bootstrap/services.cxx @@ -116,12 +116,8 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_canUnload( TimeValue *pTime ) } #endif -#ifdef DISABLE_DYNLOADING -#define component_getFactory bootstrap_component_getFactory -#endif - //================================================================================================== -SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void * SAL_CALL bootstrap_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries ); diff --git a/stoc/util/bootstrap.component b/stoc/util/bootstrap.component index d6e9b0c4f03f..ec1aa548e2d1 100644 --- a/stoc/util/bootstrap.component +++ b/stoc/util/bootstrap.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="bootstrap" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.stoc.DLLComponentLoader"> <service name="com.sun.star.loader.SharedLibrary"/> |