diff options
| author | Peter Foley <pefoley2@verizon.net> | 2013-04-15 14:46:15 -0400 |
|---|---|---|
| committer | Peter Foley <pefoley2@verizon.net> | 2013-04-15 14:47:43 -0400 |
| commit | a81f161b120de283cf9c5532223a022dbcbeaab7 (patch) | |
| tree | f67e84578c67e535a8aafea5708047e23d50d39d /desktop | |
| parent | 0b2eae62f1ccaad1c963d2637aafaa1ce9062455 (diff) | |
add desktop libs to libmerged
Change-Id: I0e5477f84de316598015330cea995e42f1249acb
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/migration/services/cexports.cxx | 4 | ||||
| -rw-r--r-- | desktop/source/migration/services/cexportsoo3.cxx | 4 | ||||
| -rw-r--r-- | desktop/source/offacc/acceptor.cxx | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/desktop/source/migration/services/cexports.cxx b/desktop/source/migration/services/cexports.cxx index 52cbf55b783f..a95ed508d4aa 100644 --- a/desktop/source/migration/services/cexports.cxx +++ b/desktop/source/migration/services/cexports.cxx @@ -26,7 +26,7 @@ extern "C" { -::cppu::ImplementationEntry entries [] = +::cppu::ImplementationEntry oo2_entries [] = { { migration::BasicMigration_create, migration::BasicMigration_getImplementationName, @@ -54,7 +54,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL migrationoo2_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { return ::cppu::component_getFactoryHelper( - pImplName, pServiceManager, pRegistryKey, entries ); + pImplName, pServiceManager, pRegistryKey, oo2_entries ); } } diff --git a/desktop/source/migration/services/cexportsoo3.cxx b/desktop/source/migration/services/cexportsoo3.cxx index a8146457024f..888c926456f2 100644 --- a/desktop/source/migration/services/cexportsoo3.cxx +++ b/desktop/source/migration/services/cexportsoo3.cxx @@ -24,7 +24,7 @@ extern "C" { -::cppu::ImplementationEntry entries [] = +::cppu::ImplementationEntry oo3_entries [] = { { migration::OO3ExtensionMigration_create, migration::OO3ExtensionMigration_getImplementationName, @@ -39,7 +39,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL migrationoo3_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { return ::cppu::component_getFactoryHelper( - pImplName, pServiceManager, pRegistryKey, entries ); + pImplName, pServiceManager, pRegistryKey, oo3_entries ); } } diff --git a/desktop/source/offacc/acceptor.cxx b/desktop/source/offacc/acceptor.cxx index 56471ca3aa8c..21b97f4ad7b4 100644 --- a/desktop/source/offacc/acceptor.cxx +++ b/desktop/source/offacc/acceptor.cxx @@ -28,7 +28,7 @@ namespace desktop { -extern "C" void workerfunc (void * acc) +extern "C" void offacc_workerfunc (void * acc) { ((Acceptor*)acc)->run(); } @@ -157,7 +157,7 @@ void SAL_CALL Acceptor::initialize( const Sequence<Any>& aArguments ) m_aProtocol = m_aAcceptString.copy( nIndex1, nIndex2 - nIndex1 ); // start accepting in new thread... - m_thread = osl_createThread(workerfunc, this); + m_thread = osl_createThread(offacc_workerfunc, this); m_bInit = sal_True; bOk = sal_True; } |