diff options
| -rw-r--r-- | Repository.mk | 10 | ||||
| -rw-r--r-- | scp2/source/canvas/cairocanvas.scp | 12 | ||||
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 44 |
3 files changed, 10 insertions, 56 deletions
diff --git a/Repository.mk b/Repository.mk index 15c34813c550..22e03be752d9 100644 --- a/Repository.mk +++ b/Repository.mk @@ -559,8 +559,13 @@ $(eval $(call gb_Helper_register_libraries,RTVERLIBS, \ )) $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ + cairocanvas \ + msforms \ mtfrenderer \ OGLTrans \ + vbaevents \ + vbaobj \ + vbaswobj \ )) $(eval $(call gb_Helper_register_libraries_for_install,UNOLIBS_OOO,OOO, \ @@ -574,7 +579,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,UNOLIBS_OOO,OOO, \ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \ PresenterScreen \ basprov \ - cairocanvas \ canvasfactory \ cmdmail \ directx5canvas \ @@ -595,7 +599,6 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \ macbe1 \ migrationoo2 \ migrationoo3 \ - msforms \ nullcanvas \ passwordcontainer \ pdfimport \ @@ -613,9 +616,6 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \ ucpgvfs1 \ ucptdoc1 \ updatefeed \ - vbaevents \ - vbaobj \ - vbaswobj \ vclcanvas \ $(if $(filter $(OS),MACOSX), \ fps_aqua \ diff --git a/scp2/source/canvas/cairocanvas.scp b/scp2/source/canvas/cairocanvas.scp index 4b313bce971d..de5742aa9d65 100644 --- a/scp2/source/canvas/cairocanvas.scp +++ b/scp2/source/canvas/cairocanvas.scp @@ -27,14 +27,4 @@ #include "macros.inc" -File gid_File_Lib_CairoCanvas - LIB_FILE_BODY; - Styles = (PACKED); - Dir = SCP2_OOO_BIN_DIR; - #ifdef UNX - Name = STRING(CONCAT2(cairocanvas.uno,UNXSUFFIX)); - #else - Name = "cairocanvas.uno.dll"; - #endif -End - +STD_LIB_FILE(gid_File_Lib_CairoCanvas, cairocanvas) diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 5aafd046585a..a993630ec275 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -55,16 +55,7 @@ File gid_File_Lib_Basprov #endif End -File gid_File_Lib_Vbaevent - LIB_FILE_BODY; - Styles = (PACKED); - Dir = SCP2_OOO_BIN_DIR; - #ifdef UNX - Name = STRING(CONCAT3(vbaevents,.uno,UNXSUFFIX)); - #else - Name = STRING(CONCAT3(vbaevents,.uno,.dll)); - #endif -End +STD_LIB_FILE(gid_File_Lib_Vbaevent, vbaevents) File gid_File_Lib_Scriptframe LIB_FILE_BODY; @@ -306,38 +297,11 @@ File gid_File_Lib_Stringresource #endif End -File gid_File_Lib_Vbaobj - LIB_FILE_BODY; - Styles = (PACKED); - Dir = SCP2_OOO_BIN_DIR; - #ifdef UNX - Name = STRING(CONCAT3(vbaobj,.uno,UNXSUFFIX)); - #else - Name = STRING(CONCAT3(vbaobj,.uno,.dll)); - #endif -End +STD_LIB_FILE(gid_File_Lib_Vbaobj, vbaobj) -File gid_File_Lib_Vbaswobj - LIB_FILE_BODY; - Styles = (PACKED); - Dir = SCP2_OOO_BIN_DIR; - #ifdef UNX - Name = STRING(CONCAT3(vbaswobj,.uno,UNXSUFFIX)); - #else - Name = STRING(CONCAT3(vbaswobj,.uno,.dll)); - #endif -End +STD_LIB_FILE(gid_File_Lib_Vbaswobj, vbaswobj) -File gid_File_Lib_Vbamsforms - LIB_FILE_BODY; - Styles = (PACKED); - Dir = SCP2_OOO_BIN_DIR; - #ifdef UNX - Name = STRING(CONCAT3(msforms,.uno,UNXSUFFIX)); - #else - Name = STRING(CONCAT3(msforms,.uno,.dll)); - #endif -End +STD_LIB_FILE(gid_File_Lib_Vbamsforms, msforms) File gid_File_Lib_Vbahelper LIB_FILE_BODY; |