From ef08518fcfdab0e5fd5c61aa4fb4f7907fcb8355 Mon Sep 17 00:00:00 2001 From: Marcos Paulo de Souza Date: Thu, 18 Apr 2013 16:47:02 -0300 Subject: fdo#60949: Move some libs to OOOLIBS Compile test only :) Change-Id: I1e546b824ec027bb1321e36fb060af5b4cfd1bf1 Reviewed-on: https://gerrit.libreoffice.org/3476 Tested-by: LibreOffice gerrit bot Reviewed-by: David Tardon Tested-by: David Tardon --- scp2/source/canvas/cairocanvas.scp | 12 +--------- scp2/source/ooo/file_library_ooo.scp | 44 ++++-------------------------------- 2 files changed, 5 insertions(+), 51 deletions(-) (limited to 'scp2') 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; -- cgit v1.2.3