diff options
| author | David Tardon <dtardon@redhat.com> | 2012-09-19 12:54:24 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-10-25 14:48:22 +0200 |
| commit | 25113cd050d931b0e195fda6d6da9864a575070e (patch) | |
| tree | 7cc24d82131f0285572519c08c0bd16560fff9c3 /scp2 | |
| parent | 9fcd47b5f6555d368320d6b008cb4645c96de648 (diff) | |
convert java XSL transformer into extension
Change-Id: Ided6c480969764073056830722c8996e0df52285
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/InstallModule_ooo.mk | 3 | ||||
| -rw-r--r-- | scp2/source/ooo/common_brand.scp | 3 | ||||
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 1 | ||||
| -rw-r--r-- | scp2/source/ooo/file_ooo.scp | 6 | ||||
| -rw-r--r-- | scp2/source/ooo/module_hidden_ooo.scp | 1 |
5 files changed, 0 insertions, 14 deletions
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk index 5ca6b6c97408..c1b3c44b9bfc 100644 --- a/scp2/InstallModule_ooo.mk +++ b/scp2/InstallModule_ooo.mk @@ -157,9 +157,6 @@ $(eval $(call gb_InstallModule_add_defs,scp2/ooo,\ $(if $(filter YES,$(SYSTEM_HSQLDB)),\ -DHSQLDB_JAR=\""$(call gb_Helper_make_path,$(HSQLDB_JAR))"\" \ ) \ - $(if $(filter YES,$(SYSTEM_SAXON)),\ - -DSAXON_JAR=\""$(call gb_Helper_make_path,$(SAXON_JAR))"\" \ - ) \ $(if $(filter-out YES,$(WITH_MOZILLA)),\ -DWITHOUT_MOZILLA \ ) \ diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index 5c90285ecbe7..390d5c4d3989 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -1257,9 +1257,6 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Ure_Java_Classpath_Urls #ifdef SYSTEM_HSQLDB ValueList1 = HSQLDB_JAR; #endif -#ifdef SYSTEM_SAXON - ValueList2 = SAXON_JAR; -#endif End ProfileItem gid_Brand_Profileitem_Fundamental_Ure_Bin_Dir diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 66f3a77e59f6..d1c8b48a03b1 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -1442,7 +1442,6 @@ STD_LIB_FILE( gid_File_Lib_Textfd, textfd ) STD_LIB_FILE( gid_File_Lib_Odfflatxml, odfflatxml ) #ifdef SOLAR_JAVA -STD_JAR_FILE( gid_File_Jar_Xsltfilter, XSLTFilter ) STD_JAR_FILE( gid_File_Jar_Xsltvalidate, XSLTValidate ) #endif diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index e98d38f703e7..36ca6d2e3747 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -472,12 +472,6 @@ End #endif -#ifdef SOLAR_JAVA -#ifndef SYSTEM_SAXON -STD_JAR_FILE( gid_File_Jar_Saxon, saxon9 ) -#endif -#endif - #ifndef AIX #ifndef DISABLE_PYUNO diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index 4085de195d89..8a358309620b 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -137,7 +137,6 @@ Module gid_Module_Root_Files_3 Default = YES; Styles = (HIDDEN_ROOT); Files = (gid_File_Dat_Root3, - gid_File_Jar_Saxon, gid_File_Jar_Unoil, gid_File_Jar_Hsqldb, gid_File_Jar_Hsqldb_Sdbc, |