diff options
| -rwxr-xr-x | Repository.mk | 2 | ||||
| -rwxr-xr-x | RepositoryFixes.mk | 5 | ||||
| -rwxr-xr-x | scp2/source/ooo/file_library_ooo.scp | 6 | ||||
| -rw-r--r-- | scp2/source/ooo/module_hidden_ooo.scp | 2 | ||||
| -rw-r--r-- | solenv/gbuild/platform/linux.mk | 1 | ||||
| -rw-r--r-- | solenv/gbuild/platform/windows.mk | 1 |
6 files changed, 13 insertions, 4 deletions
diff --git a/Repository.mk b/Repository.mk index d4e0fced1215..646ffc92effa 100755 --- a/Repository.mk +++ b/Repository.mk @@ -137,6 +137,8 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \ canvasfactory \ directx5canvas \ directx9canvas \ + expwrap \ + fastsax \ fsstorage \ gdipluscanvas \ hatchwindowfactory \ diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk index bec225e948a1..a94605eacbd2 100755 --- a/RepositoryFixes.mk +++ b/RepositoryFixes.mk @@ -212,4 +212,9 @@ gb_Library_TARGETS := $(filter-out cairo,$(gb_Library_TARGETS)) gb_Library_TARGETS := $(filter-out pixman-1,$(gb_Library_TARGETS)) endif +ifeq ($(SYSTEM_EXPAT),YES) +gb_Library_TARGETS := $(filter-out expat,$(gb_Library_TARGETS)) +endif + + # vim: set noet sw=4 ts=4: diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 94f42dcb96e4..6c96df0d78ef 100755 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -1186,14 +1186,14 @@ File gid_File_Lib_Res Dir = SCP2_OOO_BIN_DIR; End -File gid_File_Lib_Sax_Uno +File gid_File_Lib_Expwrap_Uno TXT_FILE_BODY; Styles = (PACKED,DONT_OVERWRITE); Dir = SCP2_OOO_BIN_DIR; #ifdef UNX - Name = STRING(CONCAT2(sax.uno,UNXSUFFIX)); + Name = STRING(CONCAT2(expwrap.uno,UNXSUFFIX)); #else - Name = "sax.uno.dll"; + Name = "expwrap.uno.dll"; #endif End diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index ee7b91e5e8cd..bba74c8dd56f 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -344,7 +344,7 @@ Module gid_Module_Root_Files_5 gid_File_Lib_Package2, gid_File_Lib_Deployment, gid_File_Lib_DeploymentGui, - gid_File_Lib_Sax_Uno, + gid_File_Lib_Expwrap_Uno, gid_File_Lib_Fastsax_Uno, gid_File_Lib_Slideshow, gid_File_Lib_Recentfile, diff --git a/solenv/gbuild/platform/linux.mk b/solenv/gbuild/platform/linux.mk index d4d7dcc86f23..8b27cc45ecbd 100644 --- a/solenv/gbuild/platform/linux.mk +++ b/solenv/gbuild/platform/linux.mk @@ -277,6 +277,7 @@ endif gb_Library_PLAINLIBS_NONE += \ cairo \ + expat \ fontconfig \ Xrender \ pixman-1 \ diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk index 3716c5d354eb..472f08009a92 100644 --- a/solenv/gbuild/platform/windows.mk +++ b/solenv/gbuild/platform/windows.mk @@ -452,6 +452,7 @@ gb_Library_PLAINLIBS_NONE += \ d3d9 \ d3dx \ ddraw \ + expat \ gdi32 \ gdiplus \ gnu_getopt \ |