scp2/source/ooo/file_library_ooo.scp | 38 +++++++++++++++-------------------
scp2/source/ooo/file_ooo.scp | 4 +++
scp2/source/ooo/file_resource_ooo.scp | 4 +++
3 files changed, 25 insertions(+), 21 deletions(-)
New commits:
commit 9c34ac28d6b7a8297674f4334c43d93a064f3f3d
Author: David Ostrovsky <da...@ostrovsky.org>
Date: Sat Mar 2 14:46:43 2013 +0100
fix build with --disable-scripting option
Change-Id: I98dbd3e46c81e1dd056d6e88dc1e526b5af456f5
Reviewed-on: https://gerrit.libreoffice.org/2510
Reviewed-by: Fridrich Strba <fridr...@documentfoundation.org>
Tested-by: Fridrich Strba <fridr...@documentfoundation.org>
diff --git a/scp2/source/ooo/file_library_ooo.scp
b/scp2/source/ooo/file_library_ooo.scp
index 1da3175..292a05f 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -42,6 +42,8 @@ STD_LIB_FILE( gid_File_Lib_Ado, ado)
#ifndef DISABLE_SCRIPTING
+STD_LIB_FILE( gid_File_Lib_Sf_Prothdlr, protocolhandler )
+
File gid_File_Lib_Basprov
LIB_FILE_BODY;
Styles = (PACKED);
@@ -64,6 +66,21 @@ File gid_File_Lib_Vbaevent
#endif
End
+File gid_File_Lib_Scriptframe
+ LIB_FILE_BODY;
+ #ifdef UNX
+ #ifdef MACOSX
+ Name = "libscriptframe.dylib";
+ #else
+ Name = "libscriptframe.so";
+ #endif
+ #else
+ Name = "scriptframe.dll";
+ #endif
+ Dir = SCP2_OOO_BIN_DIR;
+ Styles = (PACKED);
+End
+
#endif
File gid_File_Lib_Cached1
@@ -280,8 +297,6 @@ File gid_File_Lib_Dlgprov
#endif
End
-#endif
-
File gid_File_Lib_Stringresource
LIB_FILE_BODY;
Styles = (PACKED);
@@ -293,8 +308,6 @@ File gid_File_Lib_Stringresource
#endif
End
-#ifndef DISABLE_SCRIPTING
-
File gid_File_Lib_Vbaobj
LIB_FILE_BODY;
Styles = (PACKED);
@@ -1004,21 +1017,6 @@ STD_LIB_FILE( gid_File_Lib_Sb , sb)
STD_LIB_FILE( gid_File_Lib_Scn, scn)
-File gid_File_Lib_Scriptframe
- LIB_FILE_BODY;
- #ifdef UNX
- #ifdef MACOSX
- Name = "libscriptframe.dylib";
- #else
- Name = "libscriptframe.so";
- #endif
- #else
- Name = "scriptframe.dll";
- #endif
- Dir = SCP2_OOO_BIN_DIR;
- Styles = (PACKED);
-End
-
STD_LIB_FILE( gid_File_Lib_Sd , sd)
STD_LIB_FILE( gid_File_Lib_Sdui, sdui)
@@ -1046,8 +1044,6 @@ End
STD_LIB_FILE( gid_File_Lib_Sdd , sdd)
-STD_LIB_FILE( gid_File_Lib_Sf_Prothdlr, protocolhandler )
-
File gid_File_Lib_Sfx
Name = LIBNAME(sfx);
LIB_FILE_BODY;
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 64c7ed9..d687de8 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -57,12 +57,16 @@ File gid_File_Basic_Formwiz
Name = "basicsrvform.zip";
End
+#ifndef DISABLE_SCRIPTING
+
File gid_File_Basic_Scriptbindinglib
Dir = gid_Dir_Basic_Scriptbindinglib;
ARCHIVE_TXT_FILE_BODY;
Name = "scriptbindinglib.zip";
End
+#endif
+
File gid_File_Basic_Template
Dir = gid_Dir_Basic_Template;
ARCHIVE_TXT_FILE_BODY;
diff --git a/scp2/source/ooo/file_resource_ooo.scp
b/scp2/source/ooo/file_resource_ooo.scp
index 29559dc..67a30ed 100644
--- a/scp2/source/ooo/file_resource_ooo.scp
+++ b/scp2/source/ooo/file_resource_ooo.scp
@@ -27,8 +27,12 @@
#include "macros.inc"
+#ifndef DISABLE_SCRIPTING
+
STD_RES_FILE( gid_File_Res_Basctl, basctl)
+#endif
+
STD_RES_FILE( gid_File_Res_Bib, bib )
STD_RES_FILE( gid_File_Res_Chartcontroller, chartcontroller )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
