add desktop libs to libmerged

Change-Id: I0e5477f84de316598015330cea995e42f1249acb

5 files changed, 14 insertions, 8 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;
     }
diff --git a/linguistic/source/gciterator.cxx b/linguistic/source/gciterator.cxx
index 84c03347a188..41214d6f2dfa 100644
--- a/linguistic/source/gciterator.cxx
+++ b/linguistic/source/gciterator.cxx
@@ -219,7 +219,7 @@ static sal_Int32 lcl_BacktraceWhiteSpaces( const OUString &rText, sal_Int32 nSta
 }
 
 
-extern "C" void workerfunc (void * gci)
+extern "C" void lcl_workerfunc (void * gci)
 {
     ((GrammarCheckingIterator*)gci)->DequeueAndCheck();
 }
@@ -243,7 +243,7 @@ GrammarCheckingIterator::GrammarCheckingIterator( const uno::Reference< lang::XM
     m_aEventListeners( MyMutex::get() ),
     m_aNotifyListeners( MyMutex::get() )
 {
-    m_thread = osl_createThread( workerfunc, this );
+    m_thread = osl_createThread( lcl_workerfunc, this );
 }
 
 
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 441263b51338..75dc78ce61e8 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -35,6 +35,7 @@ gb_EXTRAMERGEDLIBS := \
 	$(call gb_Helper_optional,DBCONNECTIVITY,dbase) \
 	$(call gb_Helper_optional,DBCONNECTIVITY,dbtools) \
 	$(call gb_Helper_optional,DBCONNECTIVITY,dbu) \
+	deploymentgui \
 	$(call gb_Helper_optional,EXPORT,egi) \
 	$(call gb_Helper_optional,EXPORT,eme) \
 	$(call gb_Helper_optional,EXPORT,epb) \
@@ -66,11 +67,14 @@ gb_EXTRAMERGEDLIBS := \
 	itg \
 	iti \
 	$(if $(filter TRUE,$(SOLAR_JAVA)),jdbc) \
+	$(call gb_Helper_optional,DESKTOP,migrationoo2) \
+	$(call gb_Helper_optional,DESKTOP,migrationoo3) \
 	$(call gb_Helper_optional,DBCONNECTIVITY,mork) \
 	$(call gb_Helper_optional,DBCONNECTIVITY,mysql) \
 	$(if $(filter-out ANDROID IOS,$(OS)),odbc) \
 	$(if $(filter-out ANDROID IOS,$(OS)),odbcbase) \
 	odfflatxml \
+	offacc \
 	oox \
 	pdffilter \
 	placeware \
@@ -78,11 +82,13 @@ gb_EXTRAMERGEDLIBS := \
 	$(call gb_Helper_optional,DBCONNECTIVITY,rpt) \
 	sd \
 	$(call gb_Helper_optional,DBCONNECTIVITY,sdbc2) \
+	$(if $(filter-out WNT MACOSX ANDROID IOS,$(OS)),spl_unx) \
 	svgfilter \
 	swd \
 	t602filter \
 	test \
 	textfd \
+	$(call gb_Helper_optional,DESKTOP,unopkgapp) \
 	unotest \
 	$(if $(DISABLE_SCRIPTING),,vbahelper) \
 	xmlfa \