Skip to content

C
core
Kaydet (Commit) 1ebdd13f authored tarafından Peter Foley's avatar Peter Foley
Dosyalara gözat
Seçenekler

add oox sd and xmlsecurity to Library_merged 

Change-Id: Ie9ef511308179902cbaeb2cca39414e86c57ce30
üst 13d935d0
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 1 deletion
Library_merged.mk
Dosyayı görüntüle @ 1ebdd13f
...@@ -58,6 +58,7 @@ $(eval $(call gb_Library_use_externals,merged,\ ...@@ -58,6 +58,7 @@ $(eval $(call gb_Library_use_externals,merged,\
lcms2 \ lcms2 \
libxml2 \ libxml2 \
nss3 \ nss3 \
openssl \
$(if $(filter-out IOS,$(OS)),\ $(if $(filter-out IOS,$(OS)),\
wpd \ wpd \
wpg \ wpg \
......
sd/source/ui/view/viewshe2.cxx
Dosyayı görüntüle @ 1ebdd13f
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
using namespace com::sun::star; 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; const String aEmptyStr;
#endif #endif
......
solenv/gbuild/extensions/pre_MergedLibsList.mk
Dosyayı görüntüle @ 1ebdd13f
...@@ -49,10 +49,12 @@ gb_MERGEDLIBS := \ ...@@ -49,10 +49,12 @@ gb_MERGEDLIBS := \
lng \ lng \
localebe1 \ localebe1 \
msfilter \ msfilter \
oox \
package2 \ package2 \
sax \ sax \
sb \ sb \
sc \ sc \
sd \
sfx \ sfx \
sofficeapp \ sofficeapp \
sot \ sot \
...@@ -73,6 +75,7 @@ gb_MERGEDLIBS := \ ...@@ -73,6 +75,7 @@ gb_MERGEDLIBS := \
vcl \ vcl \
$(if $(filter-out IOS,$(OS)),wpftwriter) \ $(if $(filter-out IOS,$(OS)),wpftwriter) \
xmlscript \ xmlscript \
xmlsecurity \
xo \ xo \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment