[Libreoffice-commits] core.git: bin/distro-install-desktop-integration bin/distro-install-file-lists filter/Configuration_filter.mk filter/source postprocess/CustomTarget_registry.mk scp2/InstallModule_javafilter.mk scp2/InstallScript_setup_osl.mk scp2/Module_scp2.mk scp2/source setup_native/Library_jfregca.mk setup_native/Module_setup_native.mk setup_native/source solenv/bin sysui/CustomTarget_share.mk sysui/desktop xmerge/Jar_aportisdoc.mk xmerge/Jar_htmlsoff.mk xmerge/Jar_pexcel.mk xmerge/Jar_pocketword.mk xmerge/Module_xmerge.mk xmerge/Package_xmergesync.mk xmerge/source
Andras Timar
atimar at suse.com
Sun Mar 3 10:27:04 PST 2013
bin/distro-install-desktop-integration | 1
bin/distro-install-file-lists | 4
dev/null |binary
filter/Configuration_filter.mk | 27
filter/source/config/fragments/filters/AportisDoc_Palm_DB.xcu | 30
filter/source/config/fragments/filters/MiniCalc__Palm_.xcu | 30
filter/source/config/fragments/filters/PocketWord_File.xcu | 30
filter/source/config/fragments/filters/Pocket_Excel.xcu | 30
filter/source/config/fragments/types/calc_MiniCalc_PalmDB_File.xcu | 29
filter/source/config/fragments/types/calc_Pocket_Excel_File.xcu | 29
filter/source/config/fragments/types/writer_AportisDoc_PalmDB_File.xcu | 29
filter/source/config/fragments/types/writer_PocketWord_File.xcu | 29
postprocess/CustomTarget_registry.mk | 18
scp2/InstallModule_javafilter.mk | 47
scp2/InstallScript_setup_osl.mk | 3
scp2/Module_scp2.mk | 3
scp2/source/javafilter/file_javafilter.scp | 81
scp2/source/javafilter/module_javafilter.scp | 123 -
scp2/source/javafilter/module_javafilter.ulf | 59
scp2/source/javafilter/registryitem_javafilter.scp | 437 -----
scp2/source/javafilter/registryitem_javafilter.ulf | 50
scp2/source/ooo/common_brand.scp | 10
scp2/source/ooo/file_ooo.scp | 2
scp2/source/ooo/windowscustomaction_ooo.scp | 18
setup_native/Library_jfregca.mk | 37
setup_native/Module_setup_native.mk | 1
setup_native/source/packinfo/package_names.txt | 1
setup_native/source/packinfo/packinfo_office.txt | 15
setup_native/source/win32/customactions/javafilter/jfregca.cxx | 323 ---
setup_native/source/win32/customactions/javafilter/jfregca.def | 4
solenv/bin/modules/installer/windows/idtglobal.pm | 1
solenv/bin/modules/installer/windows/registry.pm | 1
sysui/CustomTarget_share.mk | 2
sysui/desktop/freedesktop/freedesktop-menus.spec | 1
sysui/desktop/menus/javafilter.desktop | 26
sysui/desktop/share/launcher_genericname.ulf | 3
sysui/desktop/share/launcher_unityquicklist.ulf | 3
sysui/desktop/suse/suse-menus.spec | 1
xmerge/Jar_aportisdoc.mk | 49
xmerge/Jar_htmlsoff.mk | 37
xmerge/Jar_pexcel.mk | 91 -
xmerge/Jar_pocketword.mk | 51
xmerge/Module_xmerge.mk | 5
xmerge/Package_xmergesync.mk | 34
xmerge/source/activesync/XMergeFactory.cpp | 104 -
xmerge/source/activesync/XMergeFactory.h | 55
xmerge/source/activesync/XMergeFilter.cpp | 501 -----
xmerge/source/activesync/XMergeFilter.h | 94 -
xmerge/source/activesync/XMergeSync.cpp | 850 ----------
xmerge/source/activesync/XMergeSync.def | 9
xmerge/source/activesync/XMergeSync.dsp | 143 -
xmerge/source/activesync/XMergeSync.dsw | 33
xmerge/source/activesync/XMergeSync.h | 49
xmerge/source/activesync/XMergeSync.rc | 66
xmerge/source/activesync/exports.map | 29
xmerge/source/activesync/guids.txt | 60
xmerge/source/activesync/makefile.mk | 62
xmerge/source/activesync/resource.h | 38
xmerge/source/activesync/stdafx.cpp | 27
xmerge/source/activesync/stdafx.h | 48
xmerge/source/aportisdoc/converter.xml | 34
xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/ConverterCapabilitiesImpl.java | 84
xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocConstants.java | 59
xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocDecoder.java | 290 ---
xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocEncoder.java | 201 --
xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentDeserializerImpl.java | 298 ---
xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentMergerImpl.java | 86 -
xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentSerializerImpl.java | 521 ------
xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/PluginFactoryImpl.java | 131 -
xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/package.html | 228 --
xmerge/source/htmlsoff/converter.xml | 41
xmerge/source/htmlsoff/htmltosoff.xsl | 165 -
xmerge/source/htmlsoff/package.html | 56
xmerge/source/htmlsoff/sofftohtml.xsl | 109 -
xmerge/source/minicalc/build.xml | 64
xmerge/source/minicalc/converter.xml | 34
xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/ConverterCapabilitiesImpl.java | 104 -
xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/MinicalcConstants.java | 34
xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/MinicalcDataString.java | 535 ------
xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/MinicalcDecoder.java | 728 --------
xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/MinicalcEncoder.java | 572 ------
xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/PluginFactoryImpl.java | 120 -
xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/SxcDocumentDeserializerImpl.java | 128 -
xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/SxcDocumentSerializerImpl.java | 130 -
xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/package.html | 42
xmerge/source/minicalc/makefile.mk | 24
xmerge/source/minicalc/minicalc.mf | 3
xmerge/source/pexcel/converter.xml | 34
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/ConverterCapabilitiesImpl.java | 104 -
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PluginFactoryImpl.java | 121 -
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PocketExcelConstants.java | 57
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PocketExcelDecoder.java | 428 -----
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PocketExcelEncoder.java | 247 --
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/SxcDocumentDeserializerImpl.java | 117 -
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/SxcDocumentSerializerImpl.java | 119 -
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/package.html | 32
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BIFFRecord.java | 52
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BeginningOfFile.java | 103 -
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BlankCell.java | 105 -
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoolErrCell.java | 115 -
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoundSheet.java | 127 -
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/CellValue.java | 125 -
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/CodePage.java | 97 -
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ColInfo.java | 148 -
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefColWidth.java | 88 -
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefRowHeight.java | 84
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefinedName.java | 217 --
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Eof.java | 61
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ExtendedFormat.java | 375 ----
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/FloatNumber.java | 109 -
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/FontDescription.java | 272 ---
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Formula.java | 250 --
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/LabelCell.java | 126 -
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/NumberFormat.java | 84
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Pane.java | 211 --
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Row.java | 128 -
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Selection.java | 132 -
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/StringValue.java | 114 -
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/UnsupportedFormulaException.java | 32
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Window1.java | 105 -
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Window2.java | 144 -
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Workbook.java | 532 ------
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Worksheet.java | 305 ---
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaCompiler.java | 259 ---
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaHelper.java | 141 -
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaParser.java | 516 ------
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaParsingException.java | 32
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FunctionLookup.java | 195 --
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/OperandLookup.java | 53
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/OperatorLookup.java | 64
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/ParseToken.java | 33
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/PrecedenceTable.java | 75
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/SymbolLookup.java | 72
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/Token.java | 142 -
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenConstants.java | 194 --
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenDecoder.java | 491 -----
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenEncoder.java | 536 ------
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenFactory.java | 109 -
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/UnsupportedFunctionException.java | 30
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/package.html | 30
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/package.html | 35
xmerge/source/pocketword/converter.xml | 37
xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/ConverterCapabilitiesImpl.java | 84
xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentDescriptor.java | 224 --
xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentDeserializerImpl.java | 277 ---
xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentMergerImpl.java | 86 -
xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentSerializerImpl.java | 413 ----
xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/Paragraph.java | 843 ---------
xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/ParagraphTextSegment.java | 192 --
xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PluginFactoryImpl.java | 154 -
xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PocketWordConstants.java | 84
xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PocketWordDocument.java | 390 ----
xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/package.html | 47
xmerge/source/regutil/makefile.mk | 39
xmerge/source/regutil/regutil.cpp | 122 -
xmerge/source/regutil/regutil.dsp | 96 -
xmerge/source/regutil/regutil.dsw | 17
xmerge/source/wordsmith/build.xml | 64
xmerge/source/wordsmith/converter.xml | 34
xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/ConverterCapabilitiesImpl.java | 84
xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/DOCConstants.java | 51
xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/DocumentDeserializerImpl.java | 545 ------
xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/DocumentMergerImpl.java | 85 -
xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/DocumentSerializerImpl.java | 517 ------
xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/PluginFactoryImpl.java | 137 -
xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WSDecoder.java | 337 ---
xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WSEncoder.java | 198 --
xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/Wse.java | 47
xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WseColorTable.java | 225 --
xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WseFontTable.java | 197 --
xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WseHeader.java | 130 -
xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WsePara.java | 261 ---
xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WseTextRun.java | 314 ---
xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/textRecord.java | 102 -
xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/util.java | 58
xmerge/source/wordsmith/makefile.mk | 24
176 files changed, 3 insertions(+), 23813 deletions(-)
New commits:
commit a5783fe922b2419b5b662eb5f544a1f401341dbf
Author: Andras Timar <atimar at suse.com>
Date: Sat Mar 2 21:55:39 2013 +0100
remove stale javafilters
Change-Id: Id0c413d64e6f6fa7ded3c5ff10e764bc2e40f006
diff --git a/bin/distro-install-desktop-integration b/bin/distro-install-desktop-integration
index ab7da92..e925924 100755
--- a/bin/distro-install-desktop-integration
+++ b/bin/distro-install-desktop-integration
@@ -122,7 +122,6 @@ rm -rf $sysui_temp
# we do not want some stuff from the plain packages
rm -f $DESTDIR/$PREFIXDIR/bin/$INSTALLDIRNAME-printeradmin
-rm -f $DESTDIR$PREFIXDIR/share/applications/libreoffice-javafilter.desktop
rm -f $DESTDIR$PREFIXDIR/share/applications/libreoffice-printeradmin.desktop
if test -d $DESTDIR/opt ; then
rm -f $DESTDIR/opt/$INSTALLDIRNAME
diff --git a/bin/distro-install-file-lists b/bin/distro-install-file-lists
index a902107..d83855b 100755
--- a/bin/distro-install-file-lists
+++ b/bin/distro-install-file-lists
@@ -132,7 +132,6 @@ if test "z$OOO_VENDOR" != "zDebian" ; then
if test "z$OOO_VENDOR" = "zMandriva" ; then
merge_flists gid_Module_Optional_Grfflt $FILELISTSDIR/draw_list.txt
merge_flists gid_Module_Optional_Headless $FILELISTSDIR/common_list.txt
- merge_flists gid_Module_Optional_Javafilter $FILELISTSDIR/common_list.txt
merge_flists gid_Module_Optional_Pymailmerge $FILELISTSDIR/pyuno_list.txt
merge_flists gid_Module_Optional_Pyuno $FILELISTSDIR/pyuno_list.txt
merge_flists gid_Module_Optional_Extensions_Script_Provider_For_Python $FILELISTSDIR/pyuno_list.txt
@@ -141,7 +140,6 @@ if test "z$OOO_VENDOR" != "zDebian" ; then
else
merge_flists gid_Module_Optional_Grfflt $FILELISTSDIR/common_list.txt
merge_flists gid_Module_Optional_Headless $FILELISTSDIR/common_list.txt
- merge_flists gid_Module_Optional_Javafilter $FILELISTSDIR/filters_list.txt
merge_flists gid_Module_Optional_Pymailmerge $FILELISTSDIR/mailmerge_list.txt
merge_flists gid_Module_Optional_Pyuno $FILELISTSDIR/pyuno_list.txt
merge_flists gid_Module_Optional_Pyuno_LibreLogo $FILELISTSDIR/pyuno_list.txt
@@ -151,7 +149,6 @@ if test "z$OOO_VENDOR" != "zDebian" ; then
else
merge_flists gid_Module_Optional_Grfflt $FILELISTSDIR/common_list.txt
merge_flists gid_Module_Optional_Headless $FILELISTSDIR/common_list.txt
- merge_flists gid_Module_Optional_Javafilter $FILELISTSDIR/common_list.txt
merge_flists gid_Module_Optional_Pymailmerge $FILELISTSDIR/common_list.txt
merge_flists gid_Module_Optional_Pyuno $FILELISTSDIR/common_list.txt
merge_flists gid_Module_Optional_Pyuno_LibreLogo $FILELISTSDIR/common_list.txt
@@ -403,7 +400,6 @@ else
create_package_directory gid_Module_Root_Files_Images pkg/libreoffice-common
create_package_directory gid_Module_Oo_Linguistic pkg/libreoffice-common
create_package_directory gid_Module_Optional_Xsltfiltersamples pkg/libreoffice-common
- create_package_directory gid_Module_Optional_Javafilter pkg/libreoffice-common
create_package_directory gid_Module_Optional_Grfflt pkg/libreoffice-draw
create_package_directory gid_Module_Prg_Calc_Bin pkg/libreoffice-calc
create_package_directory gid_Module_Prg_Math_Bin pkg/libreoffice-math
diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk
index 4cf025d..c37d4ad 100644
--- a/filter/Configuration_filter.mk
+++ b/filter/Configuration_filter.mk
@@ -878,33 +878,6 @@ $(call filter_Configuration_add_internal_filters,fcfg_langpack,fcfg_internalgrap
xpm_Import \
)
-# fcfg_palm
-$(call filter_Configuration_add_types,fcfg_langpack,fcfg_palm_types.xcu,filter/source/config/fragments/types,\
- writer_AportisDoc_PalmDB_File \
-)
-
-$(call filter_Configuration_add_filters,fcfg_langpack,fcfg_palm_filters.xcu,filter/source/config/fragments/filters,\
- AportisDoc_Palm_DB \
-)
-
-# fcfg_pocketexcel
-$(call filter_Configuration_add_types,fcfg_langpack,fcfg_pocketexcel_types.xcu,filter/source/config/fragments/types,\
- calc_Pocket_Excel_File \
-)
-
-$(call filter_Configuration_add_filters,fcfg_langpack,fcfg_pocketexcel_filters.xcu,filter/source/config/fragments/filters,\
- Pocket_Excel \
-)
-
-# fcfg_pocketword
-$(call filter_Configuration_add_types,fcfg_langpack,fcfg_pocketword_types.xcu,filter/source/config/fragments/types,\
- writer_PocketWord_File \
-)
-
-$(call filter_Configuration_add_filters,fcfg_langpack,fcfg_pocketword_filters.xcu,filter/source/config/fragments/filters,\
- PocketWord_File \
-)
-
# fcfg_xslt
$(call filter_Configuration_add_types,fcfg_langpack,fcfg_xslt_types.xcu,filter/source/config/fragments/types,\
calc_ODS_FlatXML \
diff --git a/filter/source/config/fragments/filters/AportisDoc_Palm_DB.xcu b/filter/source/config/fragments/filters/AportisDoc_Palm_DB.xcu
deleted file mode 100644
index 1ef8017..0000000
--- a/filter/source/config/fragments/filters/AportisDoc_Palm_DB.xcu
+++ /dev/null
@@ -1,30 +0,0 @@
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
- <node oor:name="AportisDoc Palm DB" oor:op="replace">
- <prop oor:name="FileFormatVersion"><value>0</value></prop>
- <prop oor:name="Type"><value>writer_AportisDoc_PalmDB_File</value></prop>
- <prop oor:name="DocumentService"><value>com.sun.star.text.TextDocument</value></prop>
- <prop oor:name="UIComponent"/>
- <prop oor:name="UserData"><value>com.sun.star.documentconversion.XMergeBridge classes/aportisdoc.jar com.sun.star.comp.Writer.XMLImporter com.sun.star.comp.Writer.XMLExporter staroffice/sxw application/x-aportisdoc</value></prop>
- <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.XmlFilterAdaptor</value></prop>
- <prop oor:name="TemplateName"/>
- <prop oor:name="UIName">
- <value>AportisDoc (Palm)</value>
- </prop>
- <prop oor:name="Flags"><value>IMPORT EXPORT ALIEN 3RDPARTYFILTER</value></prop>
- </node>
diff --git a/filter/source/config/fragments/filters/MiniCalc__Palm_.xcu b/filter/source/config/fragments/filters/MiniCalc__Palm_.xcu
deleted file mode 100644
index 6d3797c..0000000
--- a/filter/source/config/fragments/filters/MiniCalc__Palm_.xcu
+++ /dev/null
@@ -1,30 +0,0 @@
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
- <node oor:name="MiniCalc (Palm)" oor:op="replace">
- <prop oor:name="FileFormatVersion"><value>1</value></prop>
- <prop oor:name="Type"><value>calc_MiniCalc_PalmDB_File</value></prop>
- <prop oor:name="DocumentService"><value>com.sun.star.sheet.SpreadsheetDocument</value></prop>
- <prop oor:name="UIComponent"/>
- <prop oor:name="UserData"><value>com.sun.star.documentconversion.XMergeBridge classes/minicalc.jar com.sun.star.comp.Calc.XMLImporter com.sun.star.comp.Calc.XMLExporter staroffice/sxc application/x-minicalc</value></prop>
- <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.XmlFilterAdaptor</value></prop>
- <prop oor:name="TemplateName"/>
- <prop oor:name="UIName">
- <value>MiniCalc (Palm)</value>
- </prop>
- <prop oor:name="Flags"><value>IMPORT EXPORT ALIEN 3RDPARTYFILTER</value></prop>
- </node>
diff --git a/filter/source/config/fragments/filters/PocketWord_File.xcu b/filter/source/config/fragments/filters/PocketWord_File.xcu
deleted file mode 100644
index aeee049..0000000
--- a/filter/source/config/fragments/filters/PocketWord_File.xcu
+++ /dev/null
@@ -1,30 +0,0 @@
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
- <node oor:name="PocketWord File" oor:op="replace">
- <prop oor:name="FileFormatVersion"><value>0</value></prop>
- <prop oor:name="Type"><value>writer_PocketWord_File</value></prop>
- <prop oor:name="DocumentService"><value>com.sun.star.text.TextDocument</value></prop>
- <prop oor:name="UIComponent"/>
- <prop oor:name="UserData"><value>com.sun.star.documentconversion.XMergeBridge classes/pocketword.jar com.sun.star.comp.Writer.XMLImporter com.sun.star.comp.Writer.XMLExporter staroffice/sxw application/x-pocket-word</value></prop>
- <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.XmlFilterAdaptor</value></prop>
- <prop oor:name="TemplateName"/>
- <prop oor:name="UIName">
- <value>Pocket Word</value>
- </prop>
- <prop oor:name="Flags"><value>IMPORT EXPORT ALIEN 3RDPARTYFILTER</value></prop>
- </node>
diff --git a/filter/source/config/fragments/filters/Pocket_Excel.xcu b/filter/source/config/fragments/filters/Pocket_Excel.xcu
deleted file mode 100644
index ae698a6..0000000
--- a/filter/source/config/fragments/filters/Pocket_Excel.xcu
+++ /dev/null
@@ -1,30 +0,0 @@
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
- <node oor:name="Pocket Excel" oor:op="replace">
- <prop oor:name="FileFormatVersion"><value>1</value></prop>
- <prop oor:name="Type"><value>calc_Pocket_Excel_File</value></prop>
- <prop oor:name="DocumentService"><value>com.sun.star.sheet.SpreadsheetDocument</value></prop>
- <prop oor:name="UIComponent"/>
- <prop oor:name="UserData"><value>com.sun.star.documentconversion.XMergeBridge classes/pexcel.jar com.sun.star.comp.Calc.XMLImporter com.sun.star.comp.Calc.XMLExporter staroffice/sxc application/x-pocket-excel</value></prop>
- <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.XmlFilterAdaptor</value></prop>
- <prop oor:name="TemplateName"/>
- <prop oor:name="UIName">
- <value>Pocket Excel</value>
- </prop>
- <prop oor:name="Flags"><value>IMPORT EXPORT ALIEN 3RDPARTYFILTER</value></prop>
- </node>
diff --git a/filter/source/config/fragments/types/calc_MiniCalc_PalmDB_File.xcu b/filter/source/config/fragments/types/calc_MiniCalc_PalmDB_File.xcu
deleted file mode 100644
index 6b94ffd..0000000
--- a/filter/source/config/fragments/types/calc_MiniCalc_PalmDB_File.xcu
+++ /dev/null
@@ -1,29 +0,0 @@
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
- <node oor:name="calc_MiniCalc_PalmDB_File" oor:op="replace" >
- <prop oor:name="DetectService"/>
- <prop oor:name="URLPattern"/>
- <prop oor:name="Extensions"><value>pdb</value></prop>
- <prop oor:name="MediaType"/>
- <prop oor:name="Preferred"><value>false</value></prop>
- <prop oor:name="PreferredFilter"><value>MiniCalc (Palm)</value></prop>
- <prop oor:name="UIName">
- <value>MiniCalc (Palm)</value>
- </prop>
- <prop oor:name="ClipboardFormat"/>
- </node>
diff --git a/filter/source/config/fragments/types/calc_Pocket_Excel_File.xcu b/filter/source/config/fragments/types/calc_Pocket_Excel_File.xcu
deleted file mode 100644
index ed710ab..0000000
--- a/filter/source/config/fragments/types/calc_Pocket_Excel_File.xcu
+++ /dev/null
@@ -1,29 +0,0 @@
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
- <node oor:name="calc_Pocket_Excel_File" oor:op="replace" >
- <prop oor:name="DetectService"/>
- <prop oor:name="URLPattern"/>
- <prop oor:name="Extensions"><value>pxl</value></prop>
- <prop oor:name="MediaType"/>
- <prop oor:name="Preferred"><value>false</value></prop>
- <prop oor:name="PreferredFilter"><value>Pocket Excel</value></prop>
- <prop oor:name="UIName">
- <value>Pocket Excel</value>
- </prop>
- <prop oor:name="ClipboardFormat"/>
- </node>
diff --git a/filter/source/config/fragments/types/writer_AportisDoc_PalmDB_File.xcu b/filter/source/config/fragments/types/writer_AportisDoc_PalmDB_File.xcu
deleted file mode 100644
index 9384437..0000000
--- a/filter/source/config/fragments/types/writer_AportisDoc_PalmDB_File.xcu
+++ /dev/null
@@ -1,29 +0,0 @@
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
- <node oor:name="writer_AportisDoc_PalmDB_File" oor:op="replace" >
- <prop oor:name="DetectService"><value>com.sun.star.comp.filters.XMLFilterDetect</value></prop>
- <prop oor:name="URLPattern"/>
- <prop oor:name="Extensions"><value>pdb</value></prop>
- <prop oor:name="MediaType"><value>application/x-aportisdoc</value></prop>
- <prop oor:name="Preferred"><value>false</value></prop>
- <prop oor:name="PreferredFilter"><value>AportisDoc Palm DB</value></prop>
- <prop oor:name="UIName">
- <value>AportisDoc (Palm)</value>
- </prop>
- <prop oor:name="ClipboardFormat"><value>doctype:TEXt</value></prop>
- </node>
diff --git a/filter/source/config/fragments/types/writer_PocketWord_File.xcu b/filter/source/config/fragments/types/writer_PocketWord_File.xcu
deleted file mode 100644
index d07a362..0000000
--- a/filter/source/config/fragments/types/writer_PocketWord_File.xcu
+++ /dev/null
@@ -1,29 +0,0 @@
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
- <node oor:name="writer_PocketWord_File" oor:op="replace" >
- <prop oor:name="DetectService"><value>com.sun.star.comp.filters.XMLFilterDetect</value></prop>
- <prop oor:name="URLPattern"/>
- <prop oor:name="Extensions"><value>psw</value></prop>
- <prop oor:name="MediaType"><value>application/x-pocket-word</value></prop>
- <prop oor:name="Preferred"><value>false</value></prop>
- <prop oor:name="PreferredFilter"><value>PocketWord File</value></prop>
- <prop oor:name="UIName">
- <value>Pocket Word</value>
- </prop>
- <prop oor:name="ClipboardFormat"><value>doctype:pwi</value></prop>
- </node>
diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk
index b88e4ef..181c782 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -32,9 +32,6 @@ postprocess_XCDS := \
lingucomponent.xcd \
main.xcd \
math.xcd \
- palm.xcd \
- pocketexcel.xcd \
- pocketword.xcd \
pyuno.xcd \
writer.xcd \
xsltfilter.xcd
@@ -366,21 +363,6 @@ postprocess_FILES_math := \
$(postprocess_MOD)/org/openoffice/Office/Embedding-math.xcu \
$(postprocess_MOD)/org/openoffice/Setup-math.xcu
-postprocess_DEPS_palm := main
-postprocess_FILES_palm := \
- $(postprocess_MOD)/fcfg_palm_filters.xcu \
- $(postprocess_MOD)/fcfg_palm_types.xcu
-
-postprocess_DEPS_pocketexcel := main
-postprocess_FILES_pocketexcel := \
- $(postprocess_MOD)/fcfg_pocketexcel_filters.xcu \
- $(postprocess_MOD)/fcfg_pocketexcel_types.xcu
-
-postprocess_DEPS_pocketword := main
-postprocess_FILES_pocketword := \
- $(postprocess_MOD)/fcfg_pocketword_filters.xcu \
- $(postprocess_MOD)/fcfg_pocketword_types.xcu
-
postprocess_DEPS_pyuno := main
postprocess_FILES_pyuno := \
$(postprocess_MOD)/org/openoffice/Office/Scripting-python.xcu
diff --git a/scp2/InstallModule_javafilter.mk b/scp2/InstallModule_javafilter.mk
deleted file mode 100644
index ce22109..0000000
--- a/scp2/InstallModule_javafilter.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon at redhat.com>
-# (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_InstallModule_InstallModule,scp2/javafilter))
-
-$(eval $(call gb_InstallModule_add_defs,scp2/javafilter,\
- $(if $(WINDOWS_SDK_HOME),\
- -DHAVE_WINDOWS_SDK \
- ) \
-))
-
-$(eval $(call gb_InstallModule_add_scpfiles,scp2/javafilter,\
- scp2/source/javafilter/file_javafilter \
-))
-
-$(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/javafilter,\
- scp2/source/javafilter/module_javafilter \
- $(if $(filter WNT,$(OS)),\
- scp2/source/javafilter/registryitem_javafilter \
- ) \
-))
-
-# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/scp2/InstallScript_setup_osl.mk b/scp2/InstallScript_setup_osl.mk
index 166ab42..7dd4759 100644
--- a/scp2/InstallScript_setup_osl.mk
+++ b/scp2/InstallScript_setup_osl.mk
@@ -58,9 +58,6 @@ $(eval $(call gb_InstallScript_use_modules,setup_osl,\
$(if $(filter TRUE,$(ENABLE_EVOAB2) $(ENABLE_GCONF) $(ENABLE_GNOMEVFS) $(ENABLE_GIO) $(ENABLE_GTK) $(ENABLE_GTK3)),\
scp2/gnome \
) \
- $(if $(filter TRUE,$(SOLAR_JAVA)),\
- scp2/javafilter \
- ) \
$(if $(filter TRUE,$(ENABLE_KDE) $(ENABLE_KDE4)),\
scp2/kde \
) \
diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk
index e2b92b4..4d12b8f 100644
--- a/scp2/Module_scp2.mk
+++ b/scp2/Module_scp2.mk
@@ -64,9 +64,6 @@ $(eval $(call gb_Module_add_targets,scp2,\
$(if $(filter TRUE,$(ENABLE_EVOAB2) $(ENABLE_GCONF) $(ENABLE_GNOMEVFS) $(ENABLE_GIO) $(ENABLE_GTK) $(ENABLE_GTK3)),\
InstallModule_gnome \
) \
- $(if $(filter TRUE,$(SOLAR_JAVA)),\
- InstallModule_javafilter \
- ) \
$(if $(filter TRUE,$(ENABLE_KDE) $(ENABLE_KDE4)),\
InstallModule_kde \
) \
diff --git a/scp2/source/javafilter/file_javafilter.scp b/scp2/source/javafilter/file_javafilter.scp
deleted file mode 100644
index 906bf06..0000000
--- a/scp2/source/javafilter/file_javafilter.scp
+++ /dev/null
@@ -1,81 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.inc"
-
-#ifdef WNT
-
-File gid_File_Lib_Xmergesync
- LIB_FILE_BODY;
- Styles = (PACKED);
- Dir = SCP2_OOO_BIN_DIR;
- Name = "xmergesync.dll";
-End
-
-#endif
-
-#if defined(WNT) && defined(HAVE_WINDOWS_SDK)
-
-File gid_File_Lib_Jfregca
- LIB_FILE_BODY;
- Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
- Dir = SCP2_OOO_BIN_DIR;
- Name = "jfregca.dll";
-End
-
-#endif
-
-File gid_File_Share_Registry_Palm_Xcd
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Brand_Dir_Share_Registry;
- Name = "palm.xcd";
-End
-
-File gid_File_Share_Registry_Pocketexcel_Xcd
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Brand_Dir_Share_Registry;
- Name = "pocketexcel.xcd";
-End
-
-File gid_File_Share_Registry_Pocketword_Xcd
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Brand_Dir_Share_Registry;
- Name = "pocketword.xcd";
-End
-
-#ifdef SOLAR_JAVA
-
-STD_JAR_FILE( gid_File_Jar_Aportisdoc, aportisdoc )
-STD_JAR_FILE( gid_File_Jar_Pexcel, pexcel )
-STD_JAR_FILE( gid_File_Jar_Pocketword, pocketword )
-STD_JAR_FILE( gid_File_Jar_Xmerge, xmerge )
-STD_JAR_FILE( gid_File_Jar_Xmergebridge, XMergeBridge )
-
-#endif
diff --git a/scp2/source/javafilter/module_javafilter.scp b/scp2/source/javafilter/module_javafilter.scp
deleted file mode 100644
index dd69d01..0000000
--- a/scp2/source/javafilter/module_javafilter.scp
+++ /dev/null
@@ -1,123 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.inc"
-
-Module gid_Module_Optional_Javafilter
- PackageInfo = "packinfo_office.txt";
- MOD_NAME_DESC(MODULE_OPTIONAL_JAVAFILTER);
- Sortkey = "900";
- ParentID = gid_Module_Optional;
- Files = ( gid_File_Lib_Jfregca );
- Minimal = NO;
- Default = NO;
- Styles (en-US) = ();
- Styles (de) = ();
- Styles (ja) = (HIDDEN_ROOT);
- Styles (ko) = (HIDDEN_ROOT);
- Styles (zh-CN) = (HIDDEN_ROOT);
- Styles (zh-TW) = (HIDDEN_ROOT);
-End
-
-Module gid_Module_Optional_Javafilter_Palm
- MOD_NAME_DESC(MODULE_OPTIONAL_JAVAFILTER_PALM);
- ParentID = gid_Module_Optional_Javafilter;
- Sortkey = "100";
- Minimal = NO;
- Default = NO;
- Styles (en-US) = ();
- Styles (de) = ();
- Styles (ja) = (HIDDEN_ROOT);
- Styles (ko) = (HIDDEN_ROOT);
- Styles (zh-CN) = (HIDDEN_ROOT);
- Styles (zh-TW) = (HIDDEN_ROOT);
-End
-
-Module gid_Module_Optional_Javafilter_Palm_Aportisdoc
- MOD_NAME_DESC(MODULE_OPTIONAL_JAVAFILTER_PALM_APORTISDOC);
- ParentID = gid_Module_Optional_Javafilter_Palm;
- Files = ( gid_File_Jar_Aportisdoc, gid_File_Share_Registry_Palm_Xcd );
- Sortkey = "100";
- Minimal = NO;
- Default = NO;
- Styles (en-US) = ();
- Styles (de) = ();
- Styles (ja) = (HIDDEN_ROOT);
- Styles (ko) = (HIDDEN_ROOT);
- Styles (zh-CN) = (HIDDEN_ROOT);
- Styles (zh-TW) = (HIDDEN_ROOT);
-End
-
-Module gid_Module_Optional_Javafilter_Pocketpc
- ALL_LANG(Name,STR_NAME_MODULE_OPTIONAL_JAVAFILTER_POCKETPC);
- #ifdef WNT
- ALL_LANG(Description,STR_DESC_MODULE_OPTIONAL_JAVAFILTER_POCKETPC_WNT);
- #else
- ALL_LANG(Description,STR_DESC_MODULE_OPTIONAL_JAVAFILTER_POCKETPC_UNIX);
- #endif
- ParentID = gid_Module_Optional_Javafilter;
- Sortkey = "200";
- Files = ( gid_File_Lib_Xmergesync );
- Minimal = NO;
- Default = NO;
- Styles (en-US) = ();
- Styles (de) = ();
- Styles (ja) = (HIDDEN_ROOT);
- Styles (ko) = (HIDDEN_ROOT);
- Styles (zh-CN) = (HIDDEN_ROOT);
- Styles (zh-TW) = (HIDDEN_ROOT);
-End
-
-Module gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word
- MOD_NAME_DESC(MODULE_OPTIONAL_JAVAFILTER_POCKETPC_POCKET_WORD);
- ParentID = gid_Module_Optional_Javafilter_Pocketpc;
- Sortkey = "100";
- Files = ( gid_File_Lib_Xmergesync,gid_File_Jar_Pocketword, gid_File_Share_Registry_Pocketword_Xcd, gid_File_Tmp_Userinstall_Pocketpcword_Inf );
- Minimal = NO;
- Default = NO;
- Styles (en-US) = ();
- Styles (de) = ();
- Styles (ja) = (HIDDEN_ROOT);
- Styles (ko) = (HIDDEN_ROOT);
- Styles (zh-CN) = (HIDDEN_ROOT);
- Styles (zh-TW) = (HIDDEN_ROOT);
-End
-
-Module gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel
- MOD_NAME_DESC(MODULE_OPTIONAL_JAVAFILTER_POCKETPC_POCKET_EXCEL);
- ParentID = gid_Module_Optional_Javafilter_Pocketpc;
- Sortkey = "200";
- Files = ( gid_File_Lib_Xmergesync,gid_File_Jar_Pexcel, gid_File_Share_Registry_Pocketexcel_Xcd, gid_File_Tmp_Userinstall_Pocketpcexcel_Inf );
- Minimal = NO;
- Default = NO;
- Styles (en-US) = ();
- Styles (de) = ();
- Styles (ja) = (HIDDEN_ROOT);
- Styles (ko) = (HIDDEN_ROOT);
- Styles (zh-CN) = (HIDDEN_ROOT);
- Styles (zh-TW) = (HIDDEN_ROOT);
-End
diff --git a/scp2/source/javafilter/module_javafilter.ulf b/scp2/source/javafilter/module_javafilter.ulf
deleted file mode 100644
index cca3a5e..0000000
--- a/scp2/source/javafilter/module_javafilter.ulf
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-[STR_NAME_MODULE_OPTIONAL_JAVAFILTER]
-en-US = "Mobile Device Filters"
-
-[STR_DESC_MODULE_OPTIONAL_JAVAFILTER]
-en-US = "Text and spreadsheet filters to support import/export for Palm handheld or Pocket PC (Java required)."
-
-[STR_NAME_MODULE_OPTIONAL_JAVAFILTER_PALM]
-en-US = "Palm"
-
-[STR_DESC_MODULE_OPTIONAL_JAVAFILTER_PALM]
-en-US = "Filters for Palm OS compatible handhelds"
-
-[STR_NAME_MODULE_OPTIONAL_JAVAFILTER_PALM_APORTISDOC]
-en-US = "AportisDoc"
-
-[STR_DESC_MODULE_OPTIONAL_JAVAFILTER_PALM_APORTISDOC]
-en-US = "Support for the AportisDoc format"
-
-[STR_NAME_MODULE_OPTIONAL_JAVAFILTER_POCKETPC]
-en-US = "Pocket PC"
-
-[STR_DESC_MODULE_OPTIONAL_JAVAFILTER_POCKETPC_WNT]
-en-US = "Filters and ActiveSync support for Pocket PC compatible handhelds"
-
-[STR_DESC_MODULE_OPTIONAL_JAVAFILTER_POCKETPC_UNIX]
-en-US = "Filters for Pocket PC compatible handhelds."
-
-[STR_NAME_MODULE_OPTIONAL_JAVAFILTER_POCKETPC_POCKET_WORD]
-en-US = "Pocket Word"
-
-[STR_DESC_MODULE_OPTIONAL_JAVAFILTER_POCKETPC_POCKET_WORD]
-en-US = "Support for Pocket Word"
-
-[STR_NAME_MODULE_OPTIONAL_JAVAFILTER_POCKETPC_POCKET_EXCEL]
-en-US = "Pocket Excel"
-
-[STR_DESC_MODULE_OPTIONAL_JAVAFILTER_POCKETPC_POCKET_EXCEL]
-en-US = "Support for Pocket Excel"
-
-
-
diff --git a/scp2/source/javafilter/registryitem_javafilter.scp b/scp2/source/javafilter/registryitem_javafilter.scp
deleted file mode 100644
index 3626d91..0000000
--- a/scp2/source/javafilter/registryitem_javafilter.scp
+++ /dev/null
@@ -1,437 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.inc"
-
-RegistryItem gid_Regitem_Clsid__43887c67_4d5d_4127_Baac_87a288494c7c_
- ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
- Subkey = "CLSID\{43887C67-4D5D-4127-BAAC-87A288494C7C}";
- ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
- ALL_LANG_STR_VALUE_LNG(_43887C67_4D5D_4127_BAAC_87A288494C7C_);
-End
-
-
-RegistryItem gid_Regitem_Clsid__43887c67_4d5d_4127_Baac_87a288494c7c__Defaulticon
- ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
- Subkey = "CLSID\{43887C67-4D5D-4127-BAAC-87A288494C7C}\DefaultIcon";
- ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
- Value = "";
-End
-
-RegistryItem gid_Regitem_Clsid__43887c67_4d5d_4127_Baac_87a288494c7c__Inprocserver32
- ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
- Subkey = "CLSID\{43887C67-4D5D-4127-BAAC-87A288494C7C}\InProcServer32";
- ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
- Value = "[INSTALLLOCATION]program\xmergesync.dll";
-End
-
-RegistryItem gid_Regitem_Clsid__43887c67_4d5d_4127_Baac_87a288494c7c__Inprocserver32_Threadingmodel
- ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
- Subkey = "CLSID\{43887C67-4D5D-4127-BAAC-87A288494C7C}\InProcServer32";
- ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
- Name = "ThreadingModel";
- Value = "Apartment";
-End
-
-RegistryItem gid_Regitem_Clsid__43887c67_4d5d_4127_Baac_87a288494c7c__Pegasusfilter
- ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
- Subkey = "CLSID\{43887C67-4D5D-4127-BAAC-87A288494C7C}\PegasusFilter";
- ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
- Value = "";
-End
-
-RegistryItem gid_Regitem_Clsid__43887c67_4d5d_4127_Baac_87a288494c7c__Pegasusfilter_Description
- ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
- Subkey = "CLSID\{43887C67-4D5D-4127-BAAC-87A288494C7C}\PegasusFilter";
- ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
- Name = "Description";
- ALL_LANG_STR_VALUE_LNG(_43887C67_4D5D_4127_BAAC_87A288494C7C__PEGASUSFILTER_DESCRIPTION);
-End
-
-RegistryItem gid_Regitem_Clsid__43887c67_4d5d_4127_Baac_87a288494c7c__Pegasusfilter_Import
- ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
- Subkey = "CLSID\{43887C67-4D5D-4127-BAAC-87A288494C7C}\PegasusFilter";
- ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
- Name = "Import";
- Value = "";
-End
-
-RegistryItem gid_Regitem_Clsid__43887c67_4d5d_4127_Baac_87a288494c7c__Pegasusfilter_Newextension
- ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
- Subkey = "CLSID\{43887C67-4D5D-4127-BAAC-87A288494C7C}\PegasusFilter";
- ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
- Name = "NewExtension";
- Value = "pxl";
-End
-
-RegistryItem gid_Regitem_Clsid__Bdd611c3_7bab_460f_8711_5b9ac9ef6020_
- ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
- Subkey = "CLSID\{BDD611C3-7BAB-460F-8711-5B9AC9EF6020}";
- ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
- ALL_LANG_STR_VALUE_LNG(_BDD611C3_7BAB_460F_8711_5B9AC9EF6020_);
-End
-
-RegistryItem gid_Regitem_Clsid__Bdd611c3_7bab_460f_8711_5b9ac9ef6020__Defaulticon
- ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
- Subkey = "CLSID\{BDD611C3-7BAB-460F-8711-5B9AC9EF6020}\DefaultIcon";
- ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
- Value = "";
-End
-
-RegistryItem gid_Regitem_Clsid__Bdd611c3_7bab_460f_8711_5b9ac9ef6020__Inprocserver32
- ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
- Subkey = "CLSID\{BDD611C3-7BAB-460F-8711-5B9AC9EF6020}\InProcServer32";
- ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
- Value = "[INSTALLLOCATION]program\xmergesync.dll";
-End
-
-RegistryItem gid_Regitem_Clsid__Bdd611c3_7bab_460f_8711_5b9ac9ef6020__Inprocserver32_Threadingmodel
- ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
- Subkey = "CLSID\{BDD611C3-7BAB-460F-8711-5B9AC9EF6020}\InProcServer32";
- ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
- Name = "ThreadingModel";
- Value = "Apartment";
-End
-
-RegistryItem gid_Regitem_Clsid__Bdd611c3_7bab_460f_8711_5b9ac9ef6020__Pegasusfilter
- ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
- Subkey = "CLSID\{BDD611C3-7BAB-460F-8711-5B9AC9EF6020}\PegasusFilter";
- ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
- Value = "";
-End
-
-RegistryItem gid_Regitem_Clsid__Bdd611c3_7bab_460f_8711_5b9ac9ef6020__Pegasusfilter_Description
- ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
- Subkey = "CLSID\{BDD611C3-7BAB-460F-8711-5B9AC9EF6020}\PegasusFilter";
- ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
- Name = "Description";
- ALL_LANG_STR_VALUE_LNG(_BDD611C3_7BAB_460F_8711_5B9AC9EF6020__PEGASUSFILTER_DESCRIPTION);
-End
-
-RegistryItem gid_Regitem_Clsid__Bdd611c3_7bab_460f_8711_5b9ac9ef6020__Pegasusfilter_Export
- ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
- Subkey = "CLSID\{BDD611C3-7BAB-460F-8711-5B9AC9EF6020}\PegasusFilter";
- ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
- Name = "Export";
- Value = "";
-End
-
-RegistryItem gid_Regitem_Clsid__Bdd611c3_7bab_460f_8711_5b9ac9ef6020__Pegasusfilter_Newextension
- ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
- Subkey = "CLSID\{BDD611C3-7BAB-460F-8711-5B9AC9EF6020}\PegasusFilter";
- ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
- Name = "NewExtension";
- Value = "sxw";
-End
-
-RegistryItem gid_Regitem_Clsid__C6ab3e74_9f4f_4370_8120_A8a6fabb7a7c_
- ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
- Subkey = "CLSID\{C6AB3E74-9F4F-4370-8120-A8A6FABB7A7C}";
- ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
- ALL_LANG_STR_VALUE_LNG(_C6AB3E74_9F4F_4370_8120_A8A6FABB7A7C_);
-End
-
-RegistryItem gid_Regitem_Clsid__C6ab3e74_9f4f_4370_8120_A8a6fabb7a7c__Defaulticon
- ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
- Subkey = "CLSID\{C6AB3E74-9F4F-4370-8120-A8A6FABB7A7C}\DefaultIcon";
- ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
- Value = "";
-End
-
-RegistryItem gid_Regitem_Clsid__C6ab3e74_9f4f_4370_8120_A8a6fabb7a7c__Inprocserver32
- ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
- Subkey = "CLSID\{C6AB3E74-9F4F-4370-8120-A8A6FABB7A7C}\InProcServer32";
- ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
- Value = "[INSTALLLOCATION]program\xmergesync.dll";
-End
-
-RegistryItem gid_Regitem_Clsid__C6ab3e74_9f4f_4370_8120_A8a6fabb7a7c__Inprocserver32_Threadingmodel
- ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
- Subkey = "CLSID\{C6AB3E74-9F4F-4370-8120-A8A6FABB7A7C}\InProcServer32";
- ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
- Name = "ThreadingModel";
- Value = "Apartment";
-End
-
-RegistryItem gid_Regitem_Clsid__C6ab3e74_9f4f_4370_8120_A8a6fabb7a7c__Pegasusfilter
- ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
- Subkey = "CLSID\{C6AB3E74-9F4F-4370-8120-A8A6FABB7A7C}\PegasusFilter";
- ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
- Value = "";
-End
-
-RegistryItem gid_Regitem_Clsid__C6ab3e74_9f4f_4370_8120_A8a6fabb7a7c__Pegasusfilter_Description
- ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
- Subkey = "CLSID\{C6AB3E74-9F4F-4370-8120-A8A6FABB7A7C}\PegasusFilter";
- ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
- Name = "Description";
- ALL_LANG_STR_VALUE_LNG(_C6AB3E74_9F4F_4370_8120_A8A6FABB7A7C__PEGASUSFILTER_DESCRIPTION);
-End
-
-RegistryItem gid_Regitem_Clsid__C6ab3e74_9f4f_4370_8120_A8a6fabb7a7c__Pegasusfilter_Export
- ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
- Subkey = "CLSID\{C6AB3E74-9F4F-4370-8120-A8A6FABB7A7C}\PegasusFilter";
- ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
- Name = "Export";
- Value = "";
-End
-
-RegistryItem gid_Regitem_Clsid__C6ab3e74_9f4f_4370_8120_A8a6fabb7a7c__Pegasusfilter_Newextension
- ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
- Subkey = "CLSID\{C6AB3E74-9F4F-4370-8120-A8A6FABB7A7C}\PegasusFilter";
- ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
- Name = "NewExtension";
- Value = "sxc";
-End
-
-RegistryItem gid_Regitem_Clsid__Cb43f086_838d_4fa4_B5f6_3406b9a57439_
- ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
- Subkey = "CLSID\{CB43F086-838D-4FA4-B5F6-3406B9A57439}";
- ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
- ALL_LANG_STR_VALUE_LNG(_CB43F086_838D_4FA4_B5F6_3406B9A57439_);
-End
-
-RegistryItem gid_Regitem_Clsid__Cb43f086_838d_4fa4_B5f6_3406b9a57439__Defaulticon
- ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
- Subkey = "CLSID\{CB43F086-838D-4FA4-B5F6-3406B9A57439}\DefaultIcon";
- ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
- Value = "";
-End
-
-RegistryItem gid_Regitem_Clsid__Cb43f086_838d_4fa4_B5f6_3406b9a57439__Inprocserver32
- ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
- Subkey = "CLSID\{CB43F086-838D-4FA4-B5F6-3406B9A57439}\InProcServer32";
- ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
- Value = "[INSTALLLOCATION]program\xmergesync.dll";
-End
-
-RegistryItem gid_Regitem_Clsid__Cb43f086_838d_4fa4_B5f6_3406b9a57439__Inprocserver32_Threadingmodel
- ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
- Subkey = "CLSID\{CB43F086-838D-4FA4-B5F6-3406B9A57439}\InProcServer32";
- ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
- Name = "ThreadingModel";
- Value = "Apartment";
-End
-
-RegistryItem gid_Regitem_Clsid__Cb43f086_838d_4fa4_B5f6_3406b9a57439__Pegasusfilter
- ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
- Subkey = "CLSID\{CB43F086-838D-4FA4-B5F6-3406B9A57439}\PegasusFilter";
- ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
- Value = "";
-End
-
-RegistryItem gid_Regitem_Clsid__Cb43f086_838d_4fa4_B5f6_3406b9a57439__Pegasusfilter_Description
- ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
- Subkey = "CLSID\{CB43F086-838D-4FA4-B5F6-3406B9A57439}\PegasusFilter";
- ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
- Name = "Description";
- ALL_LANG_STR_VALUE_LNG(_CB43F086_838D_4FA4_B5F6_3406B9A57439__PEGASUSFILTER_DESCRIPTION);
-End
-
-RegistryItem gid_Regitem_Clsid__Cb43f086_838d_4fa4_B5f6_3406b9a57439__Pegasusfilter_Import
- ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
- Subkey = "CLSID\{CB43F086-838D-4FA4-B5F6-3406B9A57439}\PegasusFilter";
- ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
- Name = "Import";
- Value = "";
-End
-
-RegistryItem gid_Regitem_Clsid__Cb43f086_838d_4fa4_B5f6_3406b9a57439__Pegasusfilter_Newextension
- ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
- Subkey = "CLSID\{CB43F086-838D-4FA4-B5F6-3406B9A57439}\PegasusFilter";
- ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
- Name = "NewExtension";
- Value = "psw";
-End
-
-RegistryItem gid_Regitem_Hklm_Soft_Sun_Staroffice_Xmergesync_Msgs_Error_Classpath_Pocket_Excel
- ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
- Subkey = "Software\Sun Microsystems\StarOffice\XMergeSync\Messages\Error";
- ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
- Name = "Classpath";
- ALL_LANG_STR_VALUE_LNG(HKLM_SOFT_SUN_STAROFFICE_XMERGESYNC_MSGS_ERROR_CLASSPATH);
-End
-
-RegistryItem gid_Regitem_Hklm_Soft_Sun_Staroffice_Xmergesync_Msgs_Error_Classpath_Pocket_Word
- ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
- Subkey = "Software\Sun Microsystems\StarOffice\XMergeSync\Messages\Error";
- ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
- Name = "Classpath";
- ALL_LANG_STR_VALUE_LNG(HKLM_SOFT_SUN_STAROFFICE_XMERGESYNC_MSGS_ERROR_CLASSPATH);
-End
-
-RegistryItem gid_Regitem_Hklm_Soft_Sun_Staroffice_Xmergesync_Msgs_Error_Java_Pocket_Excel
- ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
- Subkey = "Software\Sun Microsystems\StarOffice\XMergeSync\Messages\Error";
- ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
- Name = "Java";
- ALL_LANG_STR_VALUE_LNG(HKLM_SOFT_SUN_STAROFFICE_XMERGESYNC_MSGS_ERROR_JAVA);
-End
-
-RegistryItem gid_Regitem_Hklm_Soft_Sun_Staroffice_Xmergesync_Msgs_Error_Java_Pocket_Word
- ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
- Subkey = "Software\Sun Microsystems\StarOffice\XMergeSync\Messages\Error";
- ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
- Name = "Java";
- ALL_LANG_STR_VALUE_LNG(HKLM_SOFT_SUN_STAROFFICE_XMERGESYNC_MSGS_ERROR_JAVA);
-End
-
-RegistryItem gid_Regitem_Hklm_Soft_Sun_Staroffice_Xmergesync_Msgs_Error_Javainit_Pocket_Excel
- ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
- Subkey = "Software\Sun Microsystems\StarOffice\XMergeSync\Messages\Error";
- ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
- Name = "JavaInit";
- ALL_LANG_STR_VALUE_LNG(HKLM_SOFT_SUN_STAROFFICE_XMERGESYNC_MSGS_ERROR_JAVAINIT);
-End
-
-RegistryItem gid_Regitem_Hklm_Soft_Sun_Staroffice_Xmergesync_Msgs_Error_Javainit_Pocket_Word
- ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
- Subkey = "Software\Sun Microsystems\StarOffice\XMergeSync\Messages\Error";
- ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
- Name = "JavaInit";
- ALL_LANG_STR_VALUE_LNG(HKLM_SOFT_SUN_STAROFFICE_XMERGESYNC_MSGS_ERROR_JAVAINIT);
-End
-
-RegistryItem gid_Regitem_Hklm_Soft_Sun_Staroffice_Xmergesync_Msgs_Error_Pocket_Excel
- ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
- Subkey = "Software\Sun Microsystems\StarOffice\XMergeSync\Messages\Error";
- ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
- Value = "";
-End
-
-RegistryItem gid_Regitem_Hklm_Soft_Sun_Staroffice_Xmergesync_Msgs_Error_Pocket_Word
- ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
- Subkey = "Software\Sun Microsystems\StarOffice\XMergeSync\Messages\Error";
- ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
- Value = "";
-End
-
-RegistryItem gid_Regitem_Hklm_Soft_Sun_Staroffice_Xmergesync_Msgs_Pocket_Excel
- ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
- Subkey = "Software\Sun Microsystems\StarOffice\XMergeSync\Messages";
- ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
- Value = "";
-End
-
-RegistryItem gid_Regitem_Hklm_Soft_Sun_Staroffice_Xmergesync_Msgs_Pocket_Word
- ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
- Subkey = "Software\Sun Microsystems\StarOffice\XMergeSync\Messages";
- ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
- Value = "";
-End
-
-RegistryItem gid_Regitem_Wince_Services_Filters_Psw_Writer
- ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
- Subkey = "Software\Microsoft\Windows CE Services\Filters\.psw\InstalledFilters";
- ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
- Name = "{BDD611C3-7BAB-460F-8711-5B9AC9EF6020}";
- Value = "";
-End
-
-RegistryItem gid_Regitem_Wince_Services_Filters_Pxl_Calc
- ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
- Subkey = "Software\Microsoft\Windows CE Services\Filters\.pxl\InstalledFilters";
- ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
- Name = "{C6AB3E74-9F4F-4370-8120-A8A6FABB7A7C}";
- Value = "";
-End
-
-RegistryItem gid_Regitem_Wince_Services_Filters_Sxc
- ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
- Subkey = "Software\Microsoft\Windows CE Services\Filters\.sxc";
- ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
- Value = "";
-End
-
-RegistryItem gid_Regitem_Wince_Services_Filters_Sxc_Default_Export
- ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
- Subkey = "Software\Microsoft\Windows CE Services\Filters\.sxc";
- ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
- Name = "DefaultExport";
- Value = "Binary Copy";
-End
-
-RegistryItem gid_Regitem_Wince_Services_Filters_Sxc_Default_Import
- ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
- Subkey = "Software\Microsoft\Windows CE Services\Filters\.sxc";
- ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
- Name = "DefaultImport";
- Value = "{43887C67-4D5D-4127-BAAC-87A288494C7C}";
-End
-
-RegistryItem gid_Regitem_Wince_Services_Filters_Sxc_Installed_Filters
- ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
- Subkey = "Software\Microsoft\Windows CE Services\Filters\.sxc\InstalledFilters";
- ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
- Value = "";
-End
-
-RegistryItem gid_Regitem_Wince_Services_Filters_Sxc_Installed_Filters_Pxl
- ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
- Subkey = "Software\Microsoft\Windows CE Services\Filters\.sxc\InstalledFilters";
- ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
- Name = "{43887C67-4D5D-4127-BAAC-87A288494C7C}";
- Value = "";
-End
-
-RegistryItem gid_Regitem_Wince_Services_Filters_Sxw
- ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
- Subkey = "Software\Microsoft\Windows CE Services\Filters\.sxw";
- ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
- Value = "";
-End
-
-RegistryItem gid_Regitem_Wince_Services_Filters_Sxw_Default_Export
- ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
- Subkey = "Software\Microsoft\Windows CE Services\Filters\.sxw";
- ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
- Name = "DefaultExport";
- Value = "Binary Copy";
-End
-
-RegistryItem gid_Regitem_Wince_Services_Filters_Sxw_Default_Import
- ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
- Subkey = "Software\Microsoft\Windows CE Services\Filters\.sxw";
- ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
- Name = "DefaultImport";
- Value = "{CB43F086-838D-4FA4-B5F6-3406B9A57439}";
-End
-
-RegistryItem gid_Regitem_Wince_Services_Filters_Sxw_Installed_Filters
- ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
- Subkey = "Software\Microsoft\Windows CE Services\Filters\.sxw\InstalledFilters";
- ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
- Value = "";
-End
-
-RegistryItem gid_Regitem_Wince_Services_Filters_Sxw_Installed_Filters_Psw
- ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
- Subkey = "Software\Microsoft\Windows CE Services\Filters\.sxw\InstalledFilters";
- ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
- Name = "{CB43F086-838D-4FA4-B5F6-3406B9A57439}";
- Value = "";
-End
diff --git a/scp2/source/javafilter/registryitem_javafilter.ulf b/scp2/source/javafilter/registryitem_javafilter.ulf
deleted file mode 100644
index ea0ae37..0000000
--- a/scp2/source/javafilter/registryitem_javafilter.ulf
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-[STR_VALUE__43887C67_4D5D_4127_BAAC_87A288494C7C_]
-en-US = "Pocket Excel"
-
-[STR_VALUE__43887C67_4D5D_4127_BAAC_87A288494C7C__PEGASUSFILTER_DESCRIPTION]
-en-US = "Pocket Excel Workbook"
-
-[STR_VALUE__BDD611C3_7BAB_460F_8711_5B9AC9EF6020_]
-en-US = "%PRODUCTNAME Writer"
-
-[STR_VALUE__BDD611C3_7BAB_460F_8711_5B9AC9EF6020__PEGASUSFILTER_DESCRIPTION]
-en-US = "%PRODUCTNAME Writer XML Document"
-
-[STR_VALUE__C6AB3E74_9F4F_4370_8120_A8A6FABB7A7C_]
-en-US = "%PRODUCTNAME Calc"
-
-[STR_VALUE__C6AB3E74_9F4F_4370_8120_A8A6FABB7A7C__PEGASUSFILTER_DESCRIPTION]
-en-US = "%PRODUCTNAME Calc XML Document"
-
-[STR_VALUE__CB43F086_838D_4FA4_B5F6_3406B9A57439_]
-en-US = "Pocket Word"
-
-[STR_VALUE__CB43F086_838D_4FA4_B5F6_3406B9A57439__PEGASUSFILTER_DESCRIPTION]
-en-US = "Pocket Word Document - Pocket PC"
-
-[STR_VALUE_HKLM_SOFT_SUN_STAROFFICE_XMERGESYNC_MSGS_ERROR_CLASSPATH]
-en-US = "The %PRODUCTNAME mobile device filters cannot be located."
-
-[STR_VALUE_HKLM_SOFT_SUN_STAROFFICE_XMERGESYNC_MSGS_ERROR_JAVA]
-en-US = "A Java 1.4 installation cannot be located."
-
-[STR_VALUE_HKLM_SOFT_SUN_STAROFFICE_XMERGESYNC_MSGS_ERROR_JAVAINIT]
-en-US = "There was an error while initializing the Java Runtime Environment."
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 4194bec..4dfe36f 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -77,7 +77,6 @@ Module gid_Module_Root_Brand
gid_Brand_File_Share_Xdg_Draw,
gid_Brand_File_Share_Xdg_Extension,
gid_Brand_File_Share_Xdg_Impress,
- gid_Brand_File_Share_Xdg_JavaFilter,
gid_Brand_File_Share_Xdg_Math,
gid_Brand_File_Share_Xdg_Printeradmin,
gid_Brand_File_Share_Xdg_QStart,
@@ -736,15 +735,6 @@ End
#endif
#if defined UNX && ! defined MACOSX
-File gid_Brand_File_Share_Xdg_JavaFilter
- TXT_FILE_BODY;
- Dir = gid_Brand_Dir_Share_Xdg;
- Name = "javafilter.desktop";
- Styles = (PACKED,SCPZIP_REPLACE);
-End
-#endif
-
-#if defined UNX && ! defined MACOSX
File gid_Brand_File_Share_Xdg_XsltFilter
TXT_FILE_BODY;
Dir = gid_Brand_Dir_Share_Xdg;
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index a5c2eb9..64c7ed9 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -435,6 +435,8 @@ STD_JAR_FILE( gid_File_Jar_Table, table )
STD_JAR_FILE( gid_File_Jar_Form, form )
STD_JAR_FILE( gid_File_Jar_Query, query )
STD_JAR_FILE( gid_File_Jar_Web, web )
+STD_JAR_FILE( gid_File_Jar_Xmerge, xmerge )
+STD_JAR_FILE( gid_File_Jar_Xmergebridge, XMergeBridge )
#endif
#if defined SOLAR_JAVA && defined WNT
diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp b/scp2/source/ooo/windowscustomaction_ooo.scp
index 4242fcd..31b133f 100644
--- a/scp2/source/ooo/windowscustomaction_ooo.scp
+++ b/scp2/source/ooo/windowscustomaction_ooo.scp
@@ -83,24 +83,6 @@ End
#ifdef HAVE_WINDOWS_SDK
-WindowsCustomAction gid_Customaction_Jfregcadll1
- Name = "Jfregcadll1";
- Typ = "65";
- Source = "jfregca.dll";
- Target = "install_jf";
- Inbinarytable = 1;
- Assignment1 = ("InstallExecuteSequence", "\&FEATURETEMPLATE=3 And Not PATCH", "end");
-End
-
-WindowsCustomAction gid_Customaction_Jfregcadll2
- Name = "Jfregcadll2";
- Typ = "65";
- Source = "jfregca.dll";
- Target = "uninstall_jf";
- Inbinarytable = 1;
- Assignment1 = ("InstallExecuteSequence", "\&FEATURETEMPLATE=2 And \!FEATURETEMPLATE=3 And Not PATCH", "end");
-End
-
WindowsCustomAction gid_Customaction_sdqsmsidll
Name = "sdqsmsidll";
Typ = "65";
diff --git a/setup_native/Library_jfregca.mk b/setup_native/Library_jfregca.mk
deleted file mode 100644
index c213e81..0000000
--- a/setup_native/Library_jfregca.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Library_Library,jfregca))
-
-$(eval $(call gb_Library_add_defs,jfregca,\
- -U_DLL \
-))
-
-$(eval $(call gb_Library_add_cxxflags,jfregca,\
- /MT \
-))
-
-$(eval $(call gb_Library_add_ldflags,jfregca,\
- /DEF:$(SRCDIR)/setup_native/source/win32/customactions/javafilter/jfregca.def \
- /NODEFAULTLIB \
-))
-
-$(eval $(call gb_Library_add_exception_objects,jfregca,\
- setup_native/source/win32/customactions/javafilter/jfregca \
-))
-
-$(eval $(call gb_Library_use_system_win32_libs,jfregca,\
- libcmt \
- libcpmt \
- kernel32 \
- msi \
- advapi32 \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/setup_native/Module_setup_native.mk b/setup_native/Module_setup_native.mk
index 4070657..1f6ad5c 100644
--- a/setup_native/Module_setup_native.mk
+++ b/setup_native/Module_setup_native.mk
@@ -27,7 +27,6 @@ endif
ifeq ($(OS)$(COM),WNTMSC)
$(eval $(call gb_Module_add_targets,setup_native,\
Library_instooofiltmsi \
- Library_jfregca \
Library_qslnkmsi \
Library_reg4allmsdoc \
Library_regactivex \
diff --git a/setup_native/source/packinfo/package_names.txt b/setup_native/source/packinfo/package_names.txt
index 64fa6f5..ec2593d 100644
--- a/setup_native/source/packinfo/package_names.txt
+++ b/setup_native/source/packinfo/package_names.txt
@@ -30,7 +30,6 @@
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-headless Headless display module for LibreOffice %PRODUCTVERSION
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-images Images module for LibreOffice %PRODUCTVERSION
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-impress Impress module for LibreOffice %PRODUCTVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-javafilter Java filter module for LibreOffice %PRODUCTVERSION
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-kde-integration KDE integration module for LibreOffice %PRODUCTVERSION
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-math Math module for LibreOffice %PRODUCTVERSION
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-onlineupdate Online update modul for LibreOffice %PRODUCTVERSION
diff --git a/setup_native/source/packinfo/packinfo_office.txt b/setup_native/source/packinfo/packinfo_office.txt
index 3e8c89e..f67453e 100644
--- a/setup_native/source/packinfo/packinfo_office.txt
+++ b/setup_native/source/packinfo/packinfo_office.txt
@@ -253,21 +253,6 @@ packageversion = "%ABOUTBOXPRODUCTVERSION"
End
Start
-module = "gid_Module_Optional_Javafilter"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-javafilter"
-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01"
-packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-javafilter"
-freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01"
-requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01"
-copyright = "2012 The Document Foundation"
-solariscopyright = "solariscopyrightfile"
-vendor = "The Document Foundation"
-description = "Java filter module for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt"
-packageversion = "%ABOUTBOXPRODUCTVERSION"
-End
-
-Start
module = "gid_Module_Optional_Activexcontrol"
solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-activex"
solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01"
diff --git a/setup_native/source/win32/customactions/javafilter/jfregca.cxx b/setup_native/source/win32/customactions/javafilter/jfregca.cxx
deleted file mode 100644
index 841bdf6..0000000
--- a/setup_native/source/win32/customactions/javafilter/jfregca.cxx
+++ /dev/null
@@ -1,323 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifdef _MSC_VER
-#pragma warning(push, 1) /* disable warnings within system headers */
-#endif
-#include <windows.h>
-#include <msi.h>
-#include <msiquery.h>
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-
-#if defined UNICODE
-#define _UNICODE
-#endif
-#include <tchar.h>
-
-//Simple function prototypes
-bool update_activesync_regvalues(bool, bool, char** );
-void createKeys(HKEY hKey, char **);
-void deleteKeys(HKEY hKey, char **);
-bool isMulti(MSIHANDLE);
-
-//Simple data arrays for registry values
-TCHAR *pxlData[8]= {
- "{C6AB3E74-9F4F-4370-8120-A8A6FABB7A7C}", //CLSID 1 - key name at InstalledFilters Key
- "{43887C67-4D5D-4127-BAAC-87A288494C7C}", //CLSID 2 - key value for Default Export
- ".pxl", //Registry key for device type - already there if ActiveSync installerd
- ".sxc", //New registry key for SO docs
- "InstalledFilters", //Sub-key of device/so doc key
- "DefaultImport", //Key name added at device/so level key
- "DefaultExport", //Key name added at device/so level key
- "Binary Copy", //Key value for DefaultImport
-};
-
-TCHAR *pswData[8] = {
- "{BDD611C3-7BAB-460F-8711-5B9AC9EF6020}", //CLSID 1 - key name at InstalledFilters Key
- "{CB43F086-838D-4FA4-B5F6-3406B9A57439}", //CLSID 2 - key value for Default Export
- ".psw", //Registry key for device type - already there if ActiveSync installe
- ".sxw", //New registry key for SO docs
- "InstalledFilters", //Sub-key of device/so doc key
- "DefaultImport", //Key name added at device/so level key
- "DefaultExport", //Key name added at device/so level key
- "Binary Copy", //Key value for DefaultImport
-};
-
-
-//index into registry value arrays
-#define CLSID1 0
-#define CLSID2 1
-#define DEVICE_PATH 2
-#define SO_PATH 3
-#define IF_PATH 4
-#define DEFIMPORT_KEY 5
-#define DEFEXPORT_KEY 6
-#define BC_VALUE 7
-
-//Constants for Registry buffers
-const int MAX_KEY_LENGTH=255;
-const int MAX_VALUE_NAME=16383;
-
-BOOL APIENTRY DllMain( HANDLE,
- DWORD ul_reason,
- LPVOID
- )
-{
- switch (ul_reason)
- {
- case DLL_PROCESS_ATTACH:
- case DLL_THREAD_ATTACH:
- case DLL_THREAD_DETACH:
- case DLL_PROCESS_DETACH:
- break;
- }
- return TRUE;
-}
-
-extern "C" UINT __declspec(dllexport) install_jf ( MSIHANDLE hModule ) {
- bool bMulti = isMulti(hModule);
-#ifdef _JRGREG_DEBUG
- MessageBox(NULL, bMulti ? "Multi" : "Single", "Install", MB_OK);
-#endif
- update_activesync_regvalues(bMulti, true, pxlData);
- update_activesync_regvalues(bMulti, true, pswData);
-
- return ERROR_SUCCESS;
-}
-
-extern "C" UINT _declspec(dllexport) uninstall_jf ( MSIHANDLE hModule ) {
- bool bMulti = isMulti(hModule);
-#ifdef _JRGREG_DEBUG
- MessageBox(NULL, bMulti ? "Multi" : "Single", "Uninstall", MB_OK);
-#endif
- update_activesync_regvalues(false, bMulti, pxlData);
- update_activesync_regvalues(false, bMulti, pswData);
-
- return ERROR_SUCCESS;
-}
-
-/**
- Determines if this is being installed on a per user or a machine wide basis
- @param hModule
- [in] a valid msi handle.
-
-
- @returns
- <TRUE/>if this is a multi-user install.
-*/
-bool isMulti( MSIHANDLE hModule ) {
- TCHAR* szValueBuf = NULL;
- DWORD cchValueBuf = 0;
- bool bRet = false;
- UINT uiStat = MsiGetProperty(hModule, TEXT("ALLUSERS"), TEXT(""), &cchValueBuf);
- if (ERROR_MORE_DATA == uiStat)
- {
- ++cchValueBuf; // on output does not include terminating null, so add 1
- szValueBuf = new TCHAR[cchValueBuf];
- if (szValueBuf)
- {
- uiStat = MsiGetProperty(hModule, TEXT("ALLUSERS"), szValueBuf, &cchValueBuf);
- }
- }
- if (ERROR_SUCCESS != uiStat)
- {
- return false;
- }
- bRet = _tcscmp(szValueBuf, TEXT("1")) == 0;
- delete [] szValueBuf;
-
- return bRet;
-}
-
-/**
- Add or remove ActiveSync integration entries from the registry
- @param bMultiUser
- [in] <TRUE/>if this is a multiuser install (<FALSE/> for single user install)
-
- @param bInstall
- [in] <TRUE/>if installing
-
- @param data
- [in] an array of string containing names of registry keys and values
-
-
- @returns
- <TRUE/>if this is a multi-user install.
-*/
-
-bool update_activesync_regvalues(bool bMultiUser, bool bInstall, char **data) {
- bool bReturn = false;
- CHAR SUKey[] = "Software\\Microsoft\\Windows CE Services\\Partners";
- CHAR MUKey[] = "Software\\Microsoft\\Windows CE Services\\Filters";
- HKEY hKey;
-
- if (bMultiUser) {
- if (ERROR_SUCCESS != RegOpenKeyEx(HKEY_LOCAL_MACHINE, (LPCSTR)MUKey, 0, KEY_ALL_ACCESS, &hKey)) {
- return false;
- }
- if (bInstall) {
- createKeys(hKey, data);
- } else {
- deleteKeys(hKey, data);
- }
- bReturn = true;
- } else {
- if (ERROR_SUCCESS != RegOpenKeyEx(HKEY_CURRENT_USER, (LPCSTR)SUKey, 0, KEY_ALL_ACCESS, &hKey)) {
- return false;
- }
-
- CHAR achKey[MAX_KEY_LENGTH]; // buffer for subkey name
- DWORD cbName; // size of name string
- CHAR achClass[MAX_PATH] = ""; // buffer for class name
- DWORD cchClassName = MAX_PATH; // size of class string
- DWORD cSubKeys=0; // number of subkeys
- DWORD cbMaxSubKey; // longest subkey size
- DWORD cchMaxClass; // longest class string
- DWORD cValues; // number of values for key
- DWORD cchMaxValue; // longest value name
- DWORD cbMaxValueData; // longest value data
- DWORD cbSecurityDescriptor; // size of security descriptor
- FILETIME ftLastWriteTime; // last write time
-
- // Get the class name and the value count.
- if (ERROR_SUCCESS == RegQueryInfoKey(
- hKey, // key handle
- achClass, // buffer for class name
- &cchClassName, // size of class string
- NULL, // reserved
- &cSubKeys, // number of subkeys
- &cbMaxSubKey, // longest subkey size
- &cchMaxClass, // longest class string
- &cValues, // number of values for this key
- &cchMaxValue, // longest value name
- &cbMaxValueData, // longest value data
- &cbSecurityDescriptor, // security descriptor
- &ftLastWriteTime)) { // last write time
-
- if (cSubKeys) {
- for (DWORD i=0; i<cSubKeys; i++) {
- cbName = 1024;
- if (ERROR_SUCCESS == RegEnumKeyEx(hKey,i,achKey,&cbName,NULL,NULL,NULL,&ftLastWriteTime)) {
- HKEY subKey;
- if (ERROR_SUCCESS == RegOpenKeyEx(hKey, achKey, 0, KEY_ALL_ACCESS, &subKey)) {
- if (ERROR_SUCCESS == RegOpenKeyEx(subKey, "Filters", 0, KEY_ALL_ACCESS, &subKey)) {
- if (bInstall) {
- createKeys(subKey, data);
- } else {
- deleteKeys(subKey, data);
- }
- RegCloseKey(subKey);
- }
- }
- }
- }
- }
-
- bReturn = true;
- }
- }
- if (hKey != NULL) {
- RegCloseKey(hKey);
- }
-
- return bReturn;
-}
-
-/**
- Create Registry Keys
-
- @param hKey
- [in] Handle to the parent registry key
-
- @param data
- [in] an array of string containing names of registry keys and values
-*/
-
-void createKeys(HKEY hKey, char **data) {
-
- LPCSTR clsid1 = data[CLSID1];
- LPCSTR clsid2 = data[CLSID2];
- LPCSTR devicePath = data[DEVICE_PATH];
- LPCSTR soPath = data[SO_PATH];
- LPCSTR defImport = data[DEFIMPORT_KEY];
- LPCSTR defExport = data[DEFEXPORT_KEY];
- LPCSTR binaryCopy = data[BC_VALUE];
- LPCSTR IFPath = data[IF_PATH];
-
- HKEY deviceKey, deviceIFKey, soKey, soIFKey;
-
- if (ERROR_SUCCESS == RegOpenKeyEx(hKey,devicePath,0,KEY_ALL_ACCESS, &deviceKey)) {
- if (ERROR_SUCCESS == RegOpenKeyEx(deviceKey,IFPath,0,KEY_ALL_ACCESS, &deviceIFKey)) {
- RegSetValueEx(deviceIFKey, clsid1, 0, REG_SZ, NULL, NULL);
- }
- }
-
- if (ERROR_SUCCESS == RegCreateKeyEx(hKey, soPath, 0, NULL,
- REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &soKey, NULL)) {
- RegSetValueEx(soKey, defExport, 0, REG_SZ, (LPBYTE)binaryCopy, strlen(binaryCopy));
- RegSetValueEx(soKey, defImport, 0, REG_SZ, (LPBYTE)clsid2, strlen(clsid2));
-
-
- if (ERROR_SUCCESS == RegCreateKeyEx(soKey, IFPath, 0, NULL,
- REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &soIFKey, NULL)) {
- RegSetValueEx(soIFKey, clsid2, 0, REG_SZ, NULL, NULL);
- }
- }
-}
-
-/**
- Delete registry keys
-
- @param hKey
- [in] Handle to the parent registry key
-*/
-void deleteKeys(HKEY hKey, TCHAR **data) {
- LPCSTR clsid1 = data[CLSID1];
- LPCSTR clsid2 = data[CLSID2];
- LPCSTR devicePath = data[DEVICE_PATH];
- LPCSTR soPath = data[SO_PATH];
- LPCSTR defImport = data[DEFIMPORT_KEY];
- LPCSTR defExport = data[DEFEXPORT_KEY];
- LPCSTR IFPath = data[IF_PATH];
-
- HKEY deviceKey, deviceIFKey, soKey, soIFKey;
-
- if (ERROR_SUCCESS == RegOpenKeyEx(hKey,devicePath,0,KEY_ALL_ACCESS, &deviceKey)) {
- if (ERROR_SUCCESS == RegOpenKeyEx(deviceKey,IFPath,0,KEY_ALL_ACCESS, &deviceIFKey)) {
- RegDeleteValue(deviceIFKey, clsid1);
- }
- }
-
- if (ERROR_SUCCESS == RegOpenKeyEx(hKey, soPath, 0, KEY_ALL_ACCESS, &soKey)) {
- RegDeleteValue(soKey, defExport);
- RegDeleteValue(soKey, defImport);
-
- if (ERROR_SUCCESS == RegOpenKeyEx(soKey, IFPath, 0, KEY_ALL_ACCESS, &soIFKey)) {
- RegDeleteValue(soIFKey, clsid2);
- RegCloseKey(soIFKey);
- RegDeleteKey(soKey, IFPath);
- }
- RegCloseKey(soKey);
- RegDeleteKey(hKey, soPath);
- }
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/setup_native/source/win32/customactions/javafilter/jfregca.def b/setup_native/source/win32/customactions/javafilter/jfregca.def
deleted file mode 100644
index 20af538..0000000
--- a/setup_native/source/win32/customactions/javafilter/jfregca.def
+++ /dev/null
@@ -1,4 +0,0 @@
-LIBRARY "jfregca.dll"
-EXPORTS
- install_jf
- uninstall_jf
\ No newline at end of file
diff --git a/solenv/bin/modules/installer/windows/idtglobal.pm b/solenv/bin/modules/installer/windows/idtglobal.pm
index e5ce42d..0c9f55e 100644
--- a/solenv/bin/modules/installer/windows/idtglobal.pm
+++ b/solenv/bin/modules/installer/windows/idtglobal.pm
@@ -54,7 +54,6 @@ sub shorten_feature_gid
$$stringref =~ s/_Optional_/_o_/;
$$stringref =~ s/_Tools_/_tl_/;
$$stringref =~ s/_Wrt_Flt_/_w_f_/;
- $$stringref =~ s/_Javafilter_/_jf_/;
$$stringref =~ s/_Productivity_/_pr_/;
}
diff --git a/solenv/bin/modules/installer/windows/registry.pm b/solenv/bin/modules/installer/windows/registry.pm
index edeb868..54d13d1 100644
--- a/solenv/bin/modules/installer/windows/registry.pm
+++ b/solenv/bin/modules/installer/windows/registry.pm
@@ -66,7 +66,6 @@ sub get_registry_component_name
$componentname =~ s/gid_module_/g_m_/g;
$componentname =~ s/_optional_/_o_/g;
- $componentname =~ s/_javafilter_/_jf_/g;
# This componentname must be more specific
my $addon = "_";
diff --git a/sysui/CustomTarget_share.mk b/sysui/CustomTarget_share.mk
index 7a43a0e..aa1ab2a 100644
--- a/sysui/CustomTarget_share.mk
+++ b/sysui/CustomTarget_share.mk
@@ -11,7 +11,7 @@ share_WORKDIR := $(call gb_CustomTarget_get_workdir,sysui/share)
share_SRCDIR := $(SRCDIR)/sysui/desktop
LAUNCHERLIST_APPS := writer calc draw impress math base printeradmin startcenter
-LAUNCHERLIST := $(LAUNCHERLIST_APPS) qstart javafilter xsltfilter
+LAUNCHERLIST := $(LAUNCHERLIST_APPS) qstart xsltfilter
LAUNCHERS := $(foreach launcher,$(LAUNCHERLIST),$(share_SRCDIR)/menus/$(launcher).desktop)
MIMELIST := \
diff --git a/sysui/desktop/freedesktop/freedesktop-menus.spec b/sysui/desktop/freedesktop/freedesktop-menus.spec
index 76fd7a7..0c1d776 100755
--- a/sysui/desktop/freedesktop/freedesktop-menus.spec
+++ b/sysui/desktop/freedesktop/freedesktop-menus.spec
@@ -402,7 +402,6 @@ done
/usr/share/applications/%unixfilename-printeradmin.desktop
/usr/share/applications/%unixfilename-writer.desktop
/usr/share/applications/%unixfilename-startcenter.desktop
-/usr/share/applications/%unixfilename-javafilter.desktop
/usr/share/applications/%unixfilename-xsltfilter.desktop
/usr/share/icons/gnome/*/apps/*png
/usr/share/icons/gnome/*/mimetypes/*png
diff --git a/sysui/desktop/menus/javafilter.desktop b/sysui/desktop/menus/javafilter.desktop
deleted file mode 100755
index f8681f6..0000000
--- a/sysui/desktop/menus/javafilter.desktop
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed
-# with this work for additional information regarding copyright
-# ownership. The ASF licenses this file to you under the Apache
-# License, Version 2.0 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-[Desktop Entry]
-Version=1.0
-Terminal=false
-Type=Application
-Exec=${UNIXBASISROOTNAME} --writer %U
-MimeType=application/x-aportisdoc;application/x-pocket-word;application/x-pocket-excel;
-Name=%PRODUCTNAME Small Device Format Importer
-GenericName=Small Device Format Importer
-NoDisplay=true
diff --git a/sysui/desktop/share/launcher_genericname.ulf b/sysui/desktop/share/launcher_genericname.ulf
index 492bdf5..108d0e8 100644
--- a/sysui/desktop/share/launcher_genericname.ulf
+++ b/sysui/desktop/share/launcher_genericname.ulf
@@ -19,8 +19,5 @@ en-US = "Drawing Program"
[startcenter]
en-US = "Office"
-[javafilter]
-en-US = "Small Device Format Importer"
-
[xsltfilter]
en-US = "XSLT based filters"
diff --git a/sysui/desktop/share/launcher_unityquicklist.ulf b/sysui/desktop/share/launcher_unityquicklist.ulf
index d1b0c86..0f489bb 100644
--- a/sysui/desktop/share/launcher_unityquicklist.ulf
+++ b/sysui/desktop/share/launcher_unityquicklist.ulf
@@ -18,6 +18,3 @@ en-US = "New Drawing"
[startcenter]
en-US = ""
-
-[javafilter]
-en-US = ""
diff --git a/sysui/desktop/suse/suse-menus.spec b/sysui/desktop/suse/suse-menus.spec
index ec950e6..58dae1d 100755
--- a/sysui/desktop/suse/suse-menus.spec
+++ b/sysui/desktop/suse/suse-menus.spec
@@ -373,7 +373,6 @@ done
/usr/share/applications/%unixfilename-base.desktop
/usr/share/applications/%unixfilename-printeradmin.desktop
/usr/share/applications/%unixfilename-startcenter.desktop
-/usr/share/applications/%unixfilename-javafilter.desktop
/usr/share/applications/%unixfilename-xsltfilter.desktop
/opt/gnome/share/mime-info/*.keys
/opt/gnome/share/mime-info/*.mime
diff --git a/xmerge/Jar_aportisdoc.mk b/xmerge/Jar_aportisdoc.mk
deleted file mode 100644
index 282b3391..0000000
--- a/xmerge/Jar_aportisdoc.mk
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Initial Developer of the Original Code is
-# Peter Foley <pefoley2 at verizon.net>
-# Portions created by the Initial Developer are Copyright (C) 2011 the
-# Initial Developer. All Rights Reserved.
-#
-# Major Contributor(s):
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-#
-
-$(eval $(call gb_Jar_Jar,aportisdoc))
-
-$(eval $(call gb_Jar_add_packagefile,aportisdoc,META-INF/converter.xml,$(SRCDIR)/xmerge/source/aportisdoc/converter.xml))
-
-$(eval $(call gb_Jar_set_packageroot,aportisdoc,org))
-
-$(eval $(call gb_Jar_use_jars,aportisdoc,\
- xmerge \
-))
-
-$(eval $(call gb_Jar_add_sourcefiles,aportisdoc,\
- xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/ConverterCapabilitiesImpl \
- xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocConstants \
- xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocDecoder \
- xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocEncoder \
- xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentDeserializerImpl \
- xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentMergerImpl \
- xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentSerializerImpl \
- xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/PluginFactoryImpl \
-))
diff --git a/xmerge/Jar_htmlsoff.mk b/xmerge/Jar_htmlsoff.mk
deleted file mode 100644
index fca57f6..0000000
--- a/xmerge/Jar_htmlsoff.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Initial Developer of the Original Code is
-# Peter Foley <pefoley2 at verizon.net>
-# Portions created by the Initial Developer are Copyright (C) 2011 the
-# Initial Developer. All Rights Reserved.
-#
-# Major Contributor(s):
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-#
-
-$(eval $(call gb_Jar_Jar,htmlsoff))
-
-$(eval $(call gb_Jar_add_packagefile,htmlsoff,META-INF/converter.xml,$(SRCDIR)/xmerge/source/htmlsoff/converter.xml))
-$(eval $(call gb_Jar_add_packagefile,htmlsoff,htmltosoff.xsl,$(SRCDIR)/xmerge/source/htmlsoff/htmltosoff.xsl))
-$(eval $(call gb_Jar_add_packagefile,htmlsoff,sofftohtml.xsl,$(SRCDIR)/xmerge/source/htmlsoff/sofftohtml.xsl))
-
-$(eval $(call gb_Jar_set_packageroot,htmlsoff,*.xsl))
-
diff --git a/xmerge/Jar_pexcel.mk b/xmerge/Jar_pexcel.mk
deleted file mode 100644
index 0f79852..0000000
--- a/xmerge/Jar_pexcel.mk
+++ /dev/null
@@ -1,91 +0,0 @@
-#
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Initial Developer of the Original Code is
-# Peter Foley <pefoley2 at verizon.net>
-# Portions created by the Initial Developer are Copyright (C) 2011 the
-# Initial Developer. All Rights Reserved.
-#
-# Major Contributor(s):
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-#
-
-$(eval $(call gb_Jar_Jar,pexcel))
-
-$(eval $(call gb_Jar_add_packagefile,pexcel,META-INF/converter.xml,$(SRCDIR)/xmerge/source/pexcel/converter.xml))
-
-$(eval $(call gb_Jar_set_packageroot,pexcel,org))
-
-$(eval $(call gb_Jar_use_jars,pexcel,\
- xmerge \
-))
-
-$(eval $(call gb_Jar_add_sourcefiles,pexcel,\
- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/ConverterCapabilitiesImpl \
- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PluginFactoryImpl \
- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PocketExcelConstants \
- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PocketExcelDecoder \
- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PocketExcelEncoder \
- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BeginningOfFile \
- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BIFFRecord \
- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BlankCell \
- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoolErrCell \
- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoundSheet \
- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/CellValue \
- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/CodePage \
- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ColInfo \
- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefColWidth \
- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefinedName \
- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefRowHeight \
- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Eof \
- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ExtendedFormat \
- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/FloatNumber \
- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/FontDescription \
- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Formula \
- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaCompiler \
- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaHelper \
- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaParser \
- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaParsingException \
- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FunctionLookup \
- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/OperandLookup \
- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/OperatorLookup \
- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/ParseToken \
- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/PrecedenceTable \
- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/SymbolLookup \
- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/Token \
- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenConstants \
- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenDecoder \
- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenEncoder \
- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenFactory \
- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/UnsupportedFunctionException \
- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/LabelCell \
- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/NumberFormat \
- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Pane \
- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Row \
- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Selection \
- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/StringValue \
- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/UnsupportedFormulaException \
- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Window1 \
- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Window2 \
- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Workbook \
- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Worksheet \
- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/SxcDocumentDeserializerImpl \
- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/SxcDocumentSerializerImpl \
-))
diff --git a/xmerge/Jar_pocketword.mk b/xmerge/Jar_pocketword.mk
deleted file mode 100644
index 2aba780..0000000
--- a/xmerge/Jar_pocketword.mk
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Initial Developer of the Original Code is
-# Peter Foley <pefoley2 at verizon.net>
-# Portions created by the Initial Developer are Copyright (C) 2011 the
-# Initial Developer. All Rights Reserved.
-#
-# Major Contributor(s):
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-#
-
-$(eval $(call gb_Jar_Jar,pocketword))
-
-$(eval $(call gb_Jar_add_packagefile,pocketword,META-INF/converter.xml,$(SRCDIR)/xmerge/source/pocketword/converter.xml))
-
-$(eval $(call gb_Jar_set_packageroot,pocketword,org))
-
-$(eval $(call gb_Jar_use_jars,pocketword,\
- xmerge \
-))
-
-$(eval $(call gb_Jar_add_sourcefiles,pocketword,\
- xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/ConverterCapabilitiesImpl \
- xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentDescriptor \
- xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentDeserializerImpl \
- xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentMergerImpl \
- xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentSerializerImpl \
- xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/Paragraph \
- xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/ParagraphTextSegment \
- xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PluginFactoryImpl \
- xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PocketWordConstants \
- xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PocketWordDocument \
-))
diff --git a/xmerge/Module_xmerge.mk b/xmerge/Module_xmerge.mk
index 3b8503c..695d21d 100644
--- a/xmerge/Module_xmerge.mk
+++ b/xmerge/Module_xmerge.mk
@@ -30,12 +30,7 @@ $(eval $(call gb_Module_Module,xmerge))
$(eval $(call gb_Module_add_targets,xmerge,\
$(if $(SOLAR_JAVA), \
- Jar_aportisdoc \
- Jar_htmlsoff \
- Jar_pexcel \
- Jar_pocketword \
Jar_xmerge \
Jar_XMergeBridge \
) \
- Package_xmergesync \
))
diff --git a/xmerge/Package_xmergesync.mk b/xmerge/Package_xmergesync.mk
deleted file mode 100644
index ef08b06..0000000
--- a/xmerge/Package_xmergesync.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Initial Developer of the Original Code is
-# Peter Foley <pefoley2 at verizon.net>
-# Portions created by the Initial Developer are Copyright (C) 2011 the
-# Initial Developer. All Rights Reserved.
-#
-# Major Contributor(s):
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-#
-
-$(eval $(call gb_Package_Package,xmergesync,$(SRCDIR)/xmerge/source/activesync/BIN))
-
-ifeq ($(OS),WNT)
-$(eval $(call gb_Package_add_file,xmergesync,bin/xmergesync.dll,xmergesync.dll))
-endif
diff --git a/xmerge/source/activesync/BIN/xmergesync.dll b/xmerge/source/activesync/BIN/xmergesync.dll
deleted file mode 100644
index 768dea8..0000000
Binary files a/xmerge/source/activesync/BIN/xmergesync.dll and /dev/null differ
diff --git a/xmerge/source/activesync/XMergeFactory.cpp b/xmerge/source/activesync/XMergeFactory.cpp
deleted file mode 100644
index 486d128..0000000
--- a/xmerge/source/activesync/XMergeFactory.cpp
+++ /dev/null
@@ -1,104 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-// XMergeFactory.cpp: implementation of the CXMergeFactory class.
-//
-//////////////////////////////////////////////////////////////////////
-
-#include "stdafx.h"
-
-#include "XMergeFilter.h"
-#include "XMergeFactory.h"
-
-//////////////////////////////////////////////////////////////////////
-// IUnknown implementation
-//////////////////////////////////////////////////////////////////////
-STDMETHODIMP CXMergeFactory::QueryInterface(REFIID riid, void **ppvObject)
-{
- if(ppvObject == NULL)
- return E_INVALIDARG;
-
- if(::IsEqualIID(riid, IID_IUnknown) || ::IsEqualIID(riid, IID_IClassFactory))
- {
- *ppvObject = static_cast<IClassFactory*>(this);
- }
- else
- {
- *ppvObject = NULL;
- return E_NOINTERFACE;
- }
-
- reinterpret_cast<IUnknown*>(*ppvObject)->AddRef();
- return S_OK;
-}
-
-
-STDMETHODIMP_(ULONG) CXMergeFactory::AddRef()
-{
- return ::InterlockedIncrement(&m_cRef);
-}
-
-
-STDMETHODIMP_(ULONG) CXMergeFactory::Release()
-{
- if(::InterlockedDecrement(&m_cRef) == 0)
- {
- delete this;
- return 0;
- }
-
- return m_cRef;
-}
-
-
-//////////////////////////////////////////////////////////////////////
-// IUnknown implementation
-//////////////////////////////////////////////////////////////////////
-STDMETHODIMP CXMergeFactory::CreateInstance(IUnknown *pUnkOuter, REFIID iid, void **ppvObject)
-{
- if (ppvObject == NULL)
- return E_INVALIDARG;
-
- if (pUnkOuter != NULL) // cannot aggregate
- {
- *ppvObject = NULL;
- return CLASS_E_NOAGGREGATION;
- }
-
- if (iid == IID_ICeFileFilter)
- {
- CXMergeFilter *pFilter = new CXMergeFilter();
- HRESULT hr = pFilter->QueryInterface(iid, ppvObject);
- pFilter->Release();
-
- return hr;
- }
-
- return E_INVALIDARG;
-}
-
-
-STDMETHODIMP CXMergeFactory::LockServer(BOOL fLock)
-{
- _Module.LockServer(fLock);
- return S_OK;
-}
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmerge/source/activesync/XMergeFactory.h b/xmerge/source/activesync/XMergeFactory.h
deleted file mode 100644
index 640bc56..0000000
--- a/xmerge/source/activesync/XMergeFactory.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-// XMergeFactory.h: interface for the CXMergeFactory class.
-//
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list