diff options
| -rw-r--r-- | Library_merged.mk | 1 | ||||
| -rw-r--r-- | sd/source/ui/view/viewshe2.cxx | 2 | ||||
| -rw-r--r-- | solenv/gbuild/extensions/pre_MergedLibsList.mk | 3 |
3 files changed, 5 insertions, 1 deletions
diff --git a/Library_merged.mk b/Library_merged.mk index e6243086dbb9..4c632bc3a6cf 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -58,6 +58,7 @@ $(eval $(call gb_Library_use_externals,merged,\ lcms2 \ libxml2 \ nss3 \ + openssl \ $(if $(filter-out IOS,$(OS)),\ wpd \ wpg \ diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx index 90b81798ad8f..69cc2be872a2 100644 --- a/sd/source/ui/view/viewshe2.cxx +++ b/sd/source/ui/view/viewshe2.cxx @@ -72,7 +72,7 @@ using namespace com::sun::star; -#ifndef DISABLE_DYNLOADING // otherwise use the one in sw... +#if !defined(DISABLE_DYNLOADING) && !defined(LIBO_MERGELIBS) // otherwise use the one in sw... const String aEmptyStr; #endif diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index 9b92c11fc0ee..6597c4dce9d9 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -49,10 +49,12 @@ gb_MERGEDLIBS := \ lng \ localebe1 \ msfilter \ + oox \ package2 \ sax \ sb \ sc \ + sd \ sfx \ sofficeapp \ sot \ @@ -73,6 +75,7 @@ gb_MERGEDLIBS := \ vcl \ $(if $(filter-out IOS,$(OS)),wpftwriter) \ xmlscript \ + xmlsecurity \ xo \ |