From a5783fe922b2419b5b662eb5f544a1f401341dbf Mon Sep 17 00:00:00 2001
From: Andras Timar
Date: Sat, 2 Mar 2013 21:55:39 +0100
Subject: remove stale javafilters
Change-Id: Id0c413d64e6f6fa7ded3c5ff10e764bc2e40f006
---
bin/distro-install-desktop-integration | 1 -
bin/distro-install-file-lists | 4 -
filter/Configuration_filter.mk | 27 -
.../fragments/filters/AportisDoc_Palm_DB.xcu | 30 -
.../config/fragments/filters/MiniCalc__Palm_.xcu | 30 -
.../config/fragments/filters/PocketWord_File.xcu | 30 -
.../config/fragments/filters/Pocket_Excel.xcu | 30 -
.../fragments/types/calc_MiniCalc_PalmDB_File.xcu | 29 -
.../fragments/types/calc_Pocket_Excel_File.xcu | 29 -
.../types/writer_AportisDoc_PalmDB_File.xcu | 29 -
.../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 -
.../win32/customactions/javafilter/jfregca.cxx | 323 --------
.../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/BIN/xmergesync.dll | Bin 86016 -> 0 bytes
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 -
.../sxw/aportisdoc/ConverterCapabilitiesImpl.java | 84 --
.../converter/xml/sxw/aportisdoc/DocConstants.java | 59 --
.../converter/xml/sxw/aportisdoc/DocDecoder.java | 290 -------
.../converter/xml/sxw/aportisdoc/DocEncoder.java | 201 -----
.../sxw/aportisdoc/DocumentDeserializerImpl.java | 298 --------
.../xml/sxw/aportisdoc/DocumentMergerImpl.java | 86 ---
.../xml/sxw/aportisdoc/DocumentSerializerImpl.java | 521 -------------
.../xml/sxw/aportisdoc/PluginFactoryImpl.java | 131 ----
.../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 -
.../sxc/minicalc/ConverterCapabilitiesImpl.java | 104 ---
.../xml/sxc/minicalc/MinicalcConstants.java | 34 -
.../xml/sxc/minicalc/MinicalcDataString.java | 535 -------------
.../xml/sxc/minicalc/MinicalcDecoder.java | 728 ------------------
.../xml/sxc/minicalc/MinicalcEncoder.java | 572 --------------
.../xml/sxc/minicalc/PluginFactoryImpl.java | 120 ---
.../sxc/minicalc/SxcDocumentDeserializerImpl.java | 128 ----
.../sxc/minicalc/SxcDocumentSerializerImpl.java | 130 ----
.../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 -
.../xml/sxc/pexcel/ConverterCapabilitiesImpl.java | 104 ---
.../xml/sxc/pexcel/PluginFactoryImpl.java | 121 ---
.../xml/sxc/pexcel/PocketExcelConstants.java | 57 --
.../xml/sxc/pexcel/PocketExcelDecoder.java | 428 -----------
.../xml/sxc/pexcel/PocketExcelEncoder.java | 247 ------
.../sxc/pexcel/SxcDocumentDeserializerImpl.java | 117 ---
.../xml/sxc/pexcel/SxcDocumentSerializerImpl.java | 119 ---
.../xmerge/converter/xml/sxc/pexcel/package.html | 32 -
.../xml/sxc/pexcel/records/BIFFRecord.java | 52 --
.../xml/sxc/pexcel/records/BeginningOfFile.java | 103 ---
.../xml/sxc/pexcel/records/BlankCell.java | 105 ---
.../xml/sxc/pexcel/records/BoolErrCell.java | 115 ---
.../xml/sxc/pexcel/records/BoundSheet.java | 127 ---
.../xml/sxc/pexcel/records/CellValue.java | 125 ---
.../converter/xml/sxc/pexcel/records/CodePage.java | 97 ---
.../converter/xml/sxc/pexcel/records/ColInfo.java | 148 ----
.../xml/sxc/pexcel/records/DefColWidth.java | 88 ---
.../xml/sxc/pexcel/records/DefRowHeight.java | 84 --
.../xml/sxc/pexcel/records/DefinedName.java | 217 ------
.../converter/xml/sxc/pexcel/records/Eof.java | 61 --
.../xml/sxc/pexcel/records/ExtendedFormat.java | 375 ---------
.../xml/sxc/pexcel/records/FloatNumber.java | 109 ---
.../xml/sxc/pexcel/records/FontDescription.java | 272 -------
.../converter/xml/sxc/pexcel/records/Formula.java | 250 ------
.../xml/sxc/pexcel/records/LabelCell.java | 126 ---
.../xml/sxc/pexcel/records/NumberFormat.java | 84 --
.../converter/xml/sxc/pexcel/records/Pane.java | 211 -----
.../converter/xml/sxc/pexcel/records/Row.java | 128 ----
.../xml/sxc/pexcel/records/Selection.java | 132 ----
.../xml/sxc/pexcel/records/StringValue.java | 114 ---
.../records/UnsupportedFormulaException.java | 32 -
.../converter/xml/sxc/pexcel/records/Window1.java | 105 ---
.../converter/xml/sxc/pexcel/records/Window2.java | 144 ----
.../converter/xml/sxc/pexcel/records/Workbook.java | 532 -------------
.../xml/sxc/pexcel/records/Worksheet.java | 305 --------
.../pexcel/records/formula/FormulaCompiler.java | 259 -------
.../sxc/pexcel/records/formula/FormulaHelper.java | 141 ----
.../sxc/pexcel/records/formula/FormulaParser.java | 516 -------------
.../records/formula/FormulaParsingException.java | 32 -
.../sxc/pexcel/records/formula/FunctionLookup.java | 195 -----
.../sxc/pexcel/records/formula/OperandLookup.java | 53 --
.../sxc/pexcel/records/formula/OperatorLookup.java | 64 --
.../xml/sxc/pexcel/records/formula/ParseToken.java | 33 -
.../pexcel/records/formula/PrecedenceTable.java | 75 --
.../sxc/pexcel/records/formula/SymbolLookup.java | 72 --
.../xml/sxc/pexcel/records/formula/Token.java | 142 ----
.../sxc/pexcel/records/formula/TokenConstants.java | 194 -----
.../sxc/pexcel/records/formula/TokenDecoder.java | 491 ------------
.../sxc/pexcel/records/formula/TokenEncoder.java | 536 -------------
.../sxc/pexcel/records/formula/TokenFactory.java | 109 ---
.../formula/UnsupportedFunctionException.java | 30 -
.../xml/sxc/pexcel/records/formula/package.html | 30 -
.../converter/xml/sxc/pexcel/records/package.html | 35 -
xmerge/source/pocketword/converter.xml | 37 -
.../sxw/pocketword/ConverterCapabilitiesImpl.java | 84 --
.../xml/sxw/pocketword/DocumentDescriptor.java | 224 ------
.../sxw/pocketword/DocumentDeserializerImpl.java | 277 -------
.../xml/sxw/pocketword/DocumentMergerImpl.java | 86 ---
.../xml/sxw/pocketword/DocumentSerializerImpl.java | 413 ----------
.../converter/xml/sxw/pocketword/Paragraph.java | 843 --------------------
.../xml/sxw/pocketword/ParagraphTextSegment.java | 192 -----
.../xml/sxw/pocketword/PluginFactoryImpl.java | 154 ----
.../xml/sxw/pocketword/PocketWordConstants.java | 84 --
.../xml/sxw/pocketword/PocketWordDocument.java | 390 ----------
.../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 -
.../sxw/wordsmith/ConverterCapabilitiesImpl.java | 84 --
.../converter/xml/sxw/wordsmith/DOCConstants.java | 51 --
.../sxw/wordsmith/DocumentDeserializerImpl.java | 545 -------------
.../xml/sxw/wordsmith/DocumentMergerImpl.java | 85 ---
.../xml/sxw/wordsmith/DocumentSerializerImpl.java | 517 -------------
.../xml/sxw/wordsmith/PluginFactoryImpl.java | 137 ----
.../converter/xml/sxw/wordsmith/WSDecoder.java | 337 --------
.../converter/xml/sxw/wordsmith/WSEncoder.java | 198 -----
.../xmerge/converter/xml/sxw/wordsmith/Wse.java | 47 --
.../converter/xml/sxw/wordsmith/WseColorTable.java | 225 ------
.../converter/xml/sxw/wordsmith/WseFontTable.java | 197 -----
.../converter/xml/sxw/wordsmith/WseHeader.java | 130 ----
.../converter/xml/sxw/wordsmith/WsePara.java | 261 -------
.../converter/xml/sxw/wordsmith/WseTextRun.java | 314 --------
.../converter/xml/sxw/wordsmith/textRecord.java | 102 ---
.../xmerge/converter/xml/sxw/wordsmith/util.java | 58 --
xmerge/source/wordsmith/makefile.mk | 24 -
176 files changed, 3 insertions(+), 23813 deletions(-)
delete mode 100644 filter/source/config/fragments/filters/AportisDoc_Palm_DB.xcu
delete mode 100644 filter/source/config/fragments/filters/MiniCalc__Palm_.xcu
delete mode 100644 filter/source/config/fragments/filters/PocketWord_File.xcu
delete mode 100644 filter/source/config/fragments/filters/Pocket_Excel.xcu
delete mode 100644 filter/source/config/fragments/types/calc_MiniCalc_PalmDB_File.xcu
delete mode 100644 filter/source/config/fragments/types/calc_Pocket_Excel_File.xcu
delete mode 100644 filter/source/config/fragments/types/writer_AportisDoc_PalmDB_File.xcu
delete mode 100644 filter/source/config/fragments/types/writer_PocketWord_File.xcu
delete mode 100644 scp2/InstallModule_javafilter.mk
delete mode 100644 scp2/source/javafilter/file_javafilter.scp
delete mode 100644 scp2/source/javafilter/module_javafilter.scp
delete mode 100644 scp2/source/javafilter/module_javafilter.ulf
delete mode 100644 scp2/source/javafilter/registryitem_javafilter.scp
delete mode 100644 scp2/source/javafilter/registryitem_javafilter.ulf
delete mode 100644 setup_native/Library_jfregca.mk
delete mode 100644 setup_native/source/win32/customactions/javafilter/jfregca.cxx
delete mode 100644 setup_native/source/win32/customactions/javafilter/jfregca.def
delete mode 100755 sysui/desktop/menus/javafilter.desktop
delete mode 100644 xmerge/Jar_aportisdoc.mk
delete mode 100644 xmerge/Jar_htmlsoff.mk
delete mode 100644 xmerge/Jar_pexcel.mk
delete mode 100644 xmerge/Jar_pocketword.mk
delete mode 100644 xmerge/Package_xmergesync.mk
delete mode 100644 xmerge/source/activesync/BIN/xmergesync.dll
delete mode 100644 xmerge/source/activesync/XMergeFactory.cpp
delete mode 100644 xmerge/source/activesync/XMergeFactory.h
delete mode 100644 xmerge/source/activesync/XMergeFilter.cpp
delete mode 100644 xmerge/source/activesync/XMergeFilter.h
delete mode 100644 xmerge/source/activesync/XMergeSync.cpp
delete mode 100644 xmerge/source/activesync/XMergeSync.def
delete mode 100644 xmerge/source/activesync/XMergeSync.dsp
delete mode 100644 xmerge/source/activesync/XMergeSync.dsw
delete mode 100644 xmerge/source/activesync/XMergeSync.h
delete mode 100644 xmerge/source/activesync/XMergeSync.rc
delete mode 100644 xmerge/source/activesync/exports.map
delete mode 100644 xmerge/source/activesync/guids.txt
delete mode 100644 xmerge/source/activesync/makefile.mk
delete mode 100644 xmerge/source/activesync/resource.h
delete mode 100644 xmerge/source/activesync/stdafx.cpp
delete mode 100644 xmerge/source/activesync/stdafx.h
delete mode 100644 xmerge/source/aportisdoc/converter.xml
delete mode 100644 xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/ConverterCapabilitiesImpl.java
delete mode 100644 xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocConstants.java
delete mode 100644 xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocDecoder.java
delete mode 100644 xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocEncoder.java
delete mode 100644 xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentDeserializerImpl.java
delete mode 100644 xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentMergerImpl.java
delete mode 100644 xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentSerializerImpl.java
delete mode 100644 xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/PluginFactoryImpl.java
delete mode 100644 xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/package.html
delete mode 100644 xmerge/source/htmlsoff/converter.xml
delete mode 100644 xmerge/source/htmlsoff/htmltosoff.xsl
delete mode 100644 xmerge/source/htmlsoff/package.html
delete mode 100644 xmerge/source/htmlsoff/sofftohtml.xsl
delete mode 100644 xmerge/source/minicalc/build.xml
delete mode 100644 xmerge/source/minicalc/converter.xml
delete mode 100644 xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/ConverterCapabilitiesImpl.java
delete mode 100644 xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/MinicalcConstants.java
delete mode 100644 xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/MinicalcDataString.java
delete mode 100644 xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/MinicalcDecoder.java
delete mode 100644 xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/MinicalcEncoder.java
delete mode 100644 xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/PluginFactoryImpl.java
delete mode 100644 xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/SxcDocumentDeserializerImpl.java
delete mode 100644 xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/SxcDocumentSerializerImpl.java
delete mode 100644 xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/package.html
delete mode 100644 xmerge/source/minicalc/makefile.mk
delete mode 100644 xmerge/source/minicalc/minicalc.mf
delete mode 100644 xmerge/source/pexcel/converter.xml
delete mode 100644 xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/ConverterCapabilitiesImpl.java
delete mode 100644 xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PluginFactoryImpl.java
delete mode 100644 xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PocketExcelConstants.java
delete mode 100644 xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PocketExcelDecoder.java
delete mode 100644 xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PocketExcelEncoder.java
delete mode 100644 xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/SxcDocumentDeserializerImpl.java
delete mode 100644 xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/SxcDocumentSerializerImpl.java
delete mode 100644 xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/package.html
delete mode 100644 xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BIFFRecord.java
delete mode 100644 xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BeginningOfFile.java
delete mode 100644 xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BlankCell.java
delete mode 100644 xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoolErrCell.java
delete mode 100644 xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoundSheet.java
delete mode 100644 xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/CellValue.java
delete mode 100644 xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/CodePage.java
delete mode 100644 xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ColInfo.java
delete mode 100644 xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefColWidth.java
delete mode 100644 xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefRowHeight.java
delete mode 100644 xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefinedName.java
delete mode 100644 xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Eof.java
delete mode 100644 xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ExtendedFormat.java
delete mode 100644 xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/FloatNumber.java
delete mode 100644 xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/FontDescription.java
delete mode 100644 xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Formula.java
delete mode 100644 xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/LabelCell.java
delete mode 100644 xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/NumberFormat.java
delete mode 100644 xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Pane.java
delete mode 100644 xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Row.java
delete mode 100644 xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Selection.java
delete mode 100644 xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/StringValue.java
delete mode 100644 xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/UnsupportedFormulaException.java
delete mode 100644 xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Window1.java
delete mode 100644 xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Window2.java
delete mode 100644 xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Workbook.java
delete mode 100644 xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Worksheet.java
delete mode 100644 xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaCompiler.java
delete mode 100644 xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaHelper.java
delete mode 100644 xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaParser.java
delete mode 100644 xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaParsingException.java
delete mode 100644 xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FunctionLookup.java
delete mode 100644 xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/OperandLookup.java
delete mode 100644 xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/OperatorLookup.java
delete mode 100644 xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/ParseToken.java
delete mode 100644 xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/PrecedenceTable.java
delete mode 100644 xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/SymbolLookup.java
delete mode 100644 xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/Token.java
delete mode 100644 xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenConstants.java
delete mode 100644 xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenDecoder.java
delete mode 100644 xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenEncoder.java
delete mode 100644 xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenFactory.java
delete mode 100644 xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/UnsupportedFunctionException.java
delete mode 100644 xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/package.html
delete mode 100644 xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/package.html
delete mode 100644 xmerge/source/pocketword/converter.xml
delete mode 100644 xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/ConverterCapabilitiesImpl.java
delete mode 100644 xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentDescriptor.java
delete mode 100644 xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentDeserializerImpl.java
delete mode 100644 xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentMergerImpl.java
delete mode 100644 xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentSerializerImpl.java
delete mode 100644 xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/Paragraph.java
delete mode 100644 xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/ParagraphTextSegment.java
delete mode 100644 xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PluginFactoryImpl.java
delete mode 100644 xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PocketWordConstants.java
delete mode 100644 xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PocketWordDocument.java
delete mode 100644 xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/package.html
delete mode 100644 xmerge/source/regutil/makefile.mk
delete mode 100644 xmerge/source/regutil/regutil.cpp
delete mode 100644 xmerge/source/regutil/regutil.dsp
delete mode 100644 xmerge/source/regutil/regutil.dsw
delete mode 100644 xmerge/source/wordsmith/build.xml
delete mode 100644 xmerge/source/wordsmith/converter.xml
delete mode 100644 xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/ConverterCapabilitiesImpl.java
delete mode 100644 xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/DOCConstants.java
delete mode 100644 xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/DocumentDeserializerImpl.java
delete mode 100644 xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/DocumentMergerImpl.java
delete mode 100644 xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/DocumentSerializerImpl.java
delete mode 100644 xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/PluginFactoryImpl.java
delete mode 100644 xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WSDecoder.java
delete mode 100644 xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WSEncoder.java
delete mode 100644 xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/Wse.java
delete mode 100644 xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WseColorTable.java
delete mode 100644 xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WseFontTable.java
delete mode 100644 xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WseHeader.java
delete mode 100644 xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WsePara.java
delete mode 100644 xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WseTextRun.java
delete mode 100644 xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/textRecord.java
delete mode 100644 xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/util.java
delete mode 100644 xmerge/source/wordsmith/makefile.mk
diff --git a/bin/distro-install-desktop-integration b/bin/distro-install-desktop-integration
index ab7da92f173b..e925924d0f0e 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 a902107a6f1b..d83855b738cc 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 4cf025d2c0c6..c37d4ad50f90 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 1ef8017faa41..000000000000
--- a/filter/source/config/fragments/filters/AportisDoc_Palm_DB.xcu
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
- 0
- writer_AportisDoc_PalmDB_File
- com.sun.star.text.TextDocument
-
- 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
- com.sun.star.comp.Writer.XmlFilterAdaptor
-
-
- AportisDoc (Palm)
-
- IMPORT EXPORT ALIEN 3RDPARTYFILTER
-
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 6d3797c994bc..000000000000
--- a/filter/source/config/fragments/filters/MiniCalc__Palm_.xcu
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
- 1
- calc_MiniCalc_PalmDB_File
- com.sun.star.sheet.SpreadsheetDocument
-
- 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
- com.sun.star.comp.Writer.XmlFilterAdaptor
-
-
- MiniCalc (Palm)
-
- IMPORT EXPORT ALIEN 3RDPARTYFILTER
-
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 aeee0494e1a8..000000000000
--- a/filter/source/config/fragments/filters/PocketWord_File.xcu
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
- 0
- writer_PocketWord_File
- com.sun.star.text.TextDocument
-
- 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
- com.sun.star.comp.Writer.XmlFilterAdaptor
-
-
- Pocket Word
-
- IMPORT EXPORT ALIEN 3RDPARTYFILTER
-
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 ae698a62f0ef..000000000000
--- a/filter/source/config/fragments/filters/Pocket_Excel.xcu
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
- 1
- calc_Pocket_Excel_File
- com.sun.star.sheet.SpreadsheetDocument
-
- 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
- com.sun.star.comp.Writer.XmlFilterAdaptor
-
-
- Pocket Excel
-
- IMPORT EXPORT ALIEN 3RDPARTYFILTER
-
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 6b94ffdae596..000000000000
--- a/filter/source/config/fragments/types/calc_MiniCalc_PalmDB_File.xcu
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
- pdb
-
- false
- MiniCalc (Palm)
-
- MiniCalc (Palm)
-
-
-
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 ed710ab7e2c7..000000000000
--- a/filter/source/config/fragments/types/calc_Pocket_Excel_File.xcu
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
- pxl
-
- false
- Pocket Excel
-
- Pocket Excel
-
-
-
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 9384437d2531..000000000000
--- a/filter/source/config/fragments/types/writer_AportisDoc_PalmDB_File.xcu
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
- com.sun.star.comp.filters.XMLFilterDetect
-
- pdb
- application/x-aportisdoc
- false
- AportisDoc Palm DB
-
- AportisDoc (Palm)
-
- doctype:TEXt
-
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 d07a362ea369..000000000000
--- a/filter/source/config/fragments/types/writer_PocketWord_File.xcu
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
- com.sun.star.comp.filters.XMLFilterDetect
-
- psw
- application/x-pocket-word
- false
- PocketWord File
-
- Pocket Word
-
- doctype:pwi
-
diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk
index b88e4ef44db2..181c78247ab1 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 ce2210937b3c..000000000000
--- 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
-# (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 166ab4268d5f..7dd47590d080 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 e2b92b4c9af7..4d12b8f8a3f9 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 906bf06fe604..000000000000
--- 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
- *
- * 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 dd69d014caf7..000000000000
--- 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
- *
- * 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 cca3a5ef9be5..000000000000
--- 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 3626d914bef4..000000000000
--- 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
- *
- * 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 ea0ae370c077..000000000000
--- 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 4194becac3bb..4dfe36f810f6 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,
@@ -735,15 +734,6 @@ File gid_Brand_File_Share_Xdg_StartCenter
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;
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index a5c2eb952943..64c7ed967794 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 4242fcdf5d04..31b133f79d9f 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 c213e81d1eb2..000000000000
--- 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 407065704d2f..1f6ad5c4cdf5 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 64fa6f52fef2..ec2593d6b615 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 3e8c89eb489a..f67453e72e5d 100644
--- a/setup_native/source/packinfo/packinfo_office.txt
+++ b/setup_native/source/packinfo/packinfo_office.txt
@@ -252,21 +252,6 @@ destpath = "/opt"
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"
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 841bdf6e066e..000000000000
--- 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
-#include
-#include
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-
-#if defined UNICODE
-#define _UNICODE
-#endif
-#include
-
-//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
- 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] if this is a multiuser install ( for single user install)
-
- @param bInstall
- [in] if installing
-
- @param data
- [in] an array of string containing names of registry keys and values
-
-
- @returns
- 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
-# 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 fca57f670e9f..000000000000
--- 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
-# 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 0f79852aa0b3..000000000000
--- 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
-# 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 2aba7807438a..000000000000
--- 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
-# 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 3b8503c5536b..695d21d1b1e9 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 ef08b060a436..000000000000
--- 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
-# 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 768dea87d2bd..000000000000
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 486d128fc3a3..000000000000
--- 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(this);
- }
- else
- {
- *ppvObject = NULL;
- return E_NOINTERFACE;
- }
-
- reinterpret_cast(*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 640bc5638c3e..000000000000
--- 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.
-//
-//////////////////////////////////////////////////////////////////////
-
-#if !defined(AFX_XMERGEFACTORY_H__3150043C_57FB_4BC8_9104_379506FA6B9F__INCLUDED_)
-#define AFX_XMERGEFACTORY_H__3150043C_57FB_4BC8_9104_379506FA6B9F__INCLUDED_
-
-#if _MSC_VER > 1000
-#pragma once
-#endif // _MSC_VER > 1000
-
-
-class CXMergeFactory : public IClassFactory
-{
-private:
- LONG m_cRef;
- virtual ~CXMergeFactory() {};
-
-public:
- CXMergeFactory() : m_cRef(1) {}; // Set reference count when first created
-
-
- /********** IUnknown methods **********/
- STDMETHODIMP QueryInterface(REFIID riid, void **ppvObject);
- STDMETHODIMP_(ULONG) AddRef(void);
- STDMETHODIMP_(ULONG) Release();
-
-
- /********** IUnknown methods **********/
- STDMETHODIMP CreateInstance(IUnknown* pUnkOuter, REFIID riid, void **ppvObject);
- STDMETHODIMP LockServer(BOOL fLock);
-};
-
-#endif // !defined(AFX_XMERGEFACTORY_H__3150043C_57FB_4BC8_9104_379506FA6B9F__INCLUDED_)
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmerge/source/activesync/XMergeFilter.cpp b/xmerge/source/activesync/XMergeFilter.cpp
deleted file mode 100644
index e7d1a91e2cce..000000000000
--- a/xmerge/source/activesync/XMergeFilter.cpp
+++ /dev/null
@@ -1,501 +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 .
- */
-// XMergeFilter.cpp: implementation of the CXMergeFilter class.
-//
-//////////////////////////////////////////////////////////////////////
-
-
-#include "stdafx.h"
-
-#include "XMergeFilter.h"
-
-#include
-
-
-#define ERR_NOJAVA 1
-#define ERR_BADCLASSPATH 2
-#define ERR_INITJAVA 3
-
-
-const LPTSTR CXMergeFilter::m_pszPSWExportCLSID = _T("{BDD611C3-7BAB-460F-8711-5B9AC9EF6020}");
-const LPTSTR CXMergeFilter::m_pszPSWExportExt = _T("sxw");
-const LPTSTR CXMergeFilter::m_pszPSWExportDesc = _T("OpenOffice.org Writer XML Document");
-const LPTSTR CXMergeFilter::m_pszPSWExportShortDesc = _T("OpenOffice.org Writer");
-
-const LPTSTR CXMergeFilter::m_pszPSWImportCLSID = _T("{CB43F086-838D-4FA4-B5F6-3406B9A57439}");
-const LPTSTR CXMergeFilter::m_pszPSWImportExt = _T("psw");
-const LPTSTR CXMergeFilter::m_pszPSWImportDesc = _T("Pocket Word Document - Pocket PC");
-const LPTSTR CXMergeFilter::m_pszPSWImportShortDesc = _T("Pocket Word");
-
-const LPTSTR CXMergeFilter::m_pszPXLExportCLSID = _T("{C6AB3E74-9F4F-4370-8120-A8A6FABB7A7C}");
-const LPTSTR CXMergeFilter::m_pszPXLExportExt = _T("sxc");
-const LPTSTR CXMergeFilter::m_pszPXLExportDesc = _T("OpenOffice.org Calc XML Document");
-const LPTSTR CXMergeFilter::m_pszPXLExportShortDesc = _T("OpenOffice.org Calc");
-
-const LPTSTR CXMergeFilter::m_pszPXLImportCLSID = _T("{43887C67-4D5D-4127-BAAC-87A288494C7C}");
-const LPTSTR CXMergeFilter::m_pszPXLImportExt = _T("pxl");
-const LPTSTR CXMergeFilter::m_pszPXLImportDesc = _T("Pocket Excel Document - Pocket PC");
-const LPTSTR CXMergeFilter::m_pszPXLImportShortDesc = _T("Pocket Excel");
-
-
-//////////////////////////////////////////////////////////////////////
-// Construction/Destruction
-//////////////////////////////////////////////////////////////////////
-
-CXMergeFilter::CXMergeFilter() : m_cRef(1)
-{
- m_bHaveExcel = FALSE;
- m_bHaveWord = FALSE;
-
- m_szClasspath = NULL;
- m_szJavaBaseDir = NULL;
-}
-
-CXMergeFilter::~CXMergeFilter()
-{
- if (m_szClasspath != NULL)
- {
- delete m_szClasspath;
- }
-
- if (m_szJavaBaseDir != NULL)
- {
- delete m_szJavaBaseDir;
- }
-
-}
-
-
-//////////////////////////////////////////////////////////////////////
-// IUnknown Methods
-//////////////////////////////////////////////////////////////////////
-
-STDMETHODIMP CXMergeFilter::QueryInterface(REFIID riid, void **ppvObject)
-{
- if(ppvObject == NULL)
- return E_INVALIDARG;
-
- if (::IsEqualIID(riid, IID_IUnknown))
- {
- *ppvObject = static_cast(this);
- }
- else if (::IsEqualIID(riid, IID_ICeFileFilter))
- {
- *ppvObject = static_cast(this);
- }
- else
- {
- *ppvObject = NULL;
- return E_NOINTERFACE;
- }
-
- reinterpret_cast(*ppvObject)->AddRef();
- return S_OK;
-}
-
-
-STDMETHODIMP_(ULONG) CXMergeFilter::AddRef()
-{
- return ::InterlockedIncrement(&m_cRef);
-}
-
-
-STDMETHODIMP_(ULONG) CXMergeFilter::Release()
-{
- if(::InterlockedDecrement(&m_cRef) == 0)
- {
- delete this;
- return 0;
- }
- return m_cRef;
-}
-
-
-//////////////////////////////////////////////////////////////////////
-// ICeFileFilter
-//////////////////////////////////////////////////////////////////////
-
-STDMETHODIMP CXMergeFilter::FilterOptions(HWND hwndParent)
-{
- // We don't currently allow any options
- return HRESULT_FROM_WIN32(NOERROR);
-}
-
-STDMETHODIMP CXMergeFilter::FormatMessage(DWORD dwFlags, DWORD dwMessageId,
- DWORD dwLanguageId, LPTSTR lpBuffer, DWORD nSize,
- va_list *Arguments, DWORD *pcb)
-{
- TCHAR errMsg[1024];
-
- HKEY hKey = NULL;
- DWORD dwSize = 1024;
-
-
- long lRet = 0;
-
- // Attempt to find the messages in the registry
- lRet = ::RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("SOFTWARE\\Sun Microsystems\\StarOffice\\XMergeSync\\Messages\\Error"),
- 0, KEY_READ, &hKey);
- if (lRet != ERROR_SUCCESS)
- {
- // Try the user's portion of the registry
- lRet = ::RegOpenKeyEx(HKEY_CURRENT_USER, _T("Software\\Sun Microsystems\\StarOffice\\XMergeSync\\Messages\\Error"),
- 0, KEY_READ, &hKey);
- if (lRet != ERROR_SUCCESS)
- {
- hKey = NULL;
- }
- }
-
-
- switch(dwMessageId)
- {
- case ERR_NOJAVA:
- lRet = ::RegQueryValueEx(hKey, _T("Java"), 0, NULL, (LPBYTE)errMsg, &dwSize);
- if (lRet != ERROR_SUCCESS)
- {
- lstrcpy(errMsg, "Unable to locate Java 1.4/1.5 installation.");
- }
- break;
-
- case ERR_BADCLASSPATH:
- lRet = ::RegQueryValueEx(hKey, _T("Classpath"), 0, NULL, (LPBYTE)errMsg, &dwSize);
- if (lRet != ERROR_SUCCESS)
- {
- lstrcpy(errMsg, "Unable to locate XMerge Jar files.");
- }
- break;
-
- case ERR_INITJAVA:
- lRet = ::RegQueryValueEx(hKey, _T("JavaInit"), 0, NULL, (LPBYTE)errMsg, &dwSize);
- if (lRet != ERROR_SUCCESS)
- {
- lstrcpy(errMsg, "Error initialising the Java Runtime Environment.");
- }
- break;
- }
-
- char* buf = (char*)LocalAlloc(LMEM_FIXED | LMEM_ZEROINIT, (lstrlen(errMsg) + 1) * sizeof(TCHAR));
- lstrcpyn(buf, errMsg, lstrlen(errMsg));
-
- *(char**)lpBuffer = buf;
- *pcb = strlen(errMsg);
-
- return HRESULT_FROM_WIN32(NOERROR);
-}
-
-
-STDMETHODIMP CXMergeFilter::NextConvertFile(int nConversion, CFF_CONVERTINFO *pci,
- CFF_SOURCEFILE *psf, CFF_DESTINATIONFILE *pdf,
- volatile BOOL *pbCancel, CF_ERROR *perr)
-{
- std::string appArgs;
- std::string appName;
-
- STARTUPINFO si;
- PROCESS_INFORMATION pi;
-
- ZeroMemory( &si, sizeof(si) );
- ZeroMemory( &pi, sizeof(pi) );
-
- si.cb = sizeof(si);
-
-
- /*
- * First step: Locate Java and establish the classpath. If these can't
- * be done successfully, then avoid all further processing.
- */
-
- // Locate Java Home if it hasn't already been done.
- if (m_szJavaBaseDir == NULL)
- {
- m_szJavaBaseDir = GetJavaBaseDir();
-
- if (m_szJavaBaseDir == NULL)
- {
- *perr = ERR_NOJAVA;
- return HRESULT_FROM_WIN32(E_FAIL);
- }
- }
-
- // Get the StarOffice/OpenOffice class directory
- if (m_szClasspath == NULL)
- {
- m_szClasspath = GetXMergeClassPath();
-
- if (m_szClasspath == NULL)
- {
- *perr = ERR_BADCLASSPATH;
- return HRESULT_FROM_WIN32(E_FAIL);
- }
- }
-
-
- /*
- * Second step: Check the files we're going to process. If we don't have
- * an XMerge plugin for the file then we can't convert.
- */
- if ((!lstrcmp(psf->szExtension, "sxw") || !lstrcmp(psf->szExtension, "psw"))
- && !m_bHaveWord)
- {
- *perr = ERR_BADCLASSPATH;
- return HRESULT_FROM_WIN32(E_FAIL);
- }
- else if ((!lstrcmp(psf->szExtension, "sxc") || !lstrcmp(psf->szExtension, "pxl"))
- && !m_bHaveExcel)
- {
- *perr = ERR_BADCLASSPATH;
- return HRESULT_FROM_WIN32(E_FAIL);
- }
-
-
- /*
- * Third step: Locate the Java executable and build and execute the command
- * line to carry out the conversion.
- */
-
- // Find the Java executable and make sure it exists
- appName += m_szJavaBaseDir;
- appName += "\\bin\\javaw.exe";
-
- if (GetFileAttributes(appName.c_str()) == INVALID_FILE_SIZE)
- {
- *perr = ERR_NOJAVA;
- return HRESULT_FROM_WIN32(E_FAIL);
- }
-
- // Wrap the executable path in quotes in case of spaces
- appName.insert(0, "\"");
- appName.append("\"");
-
-
-
- // Need to build the entire command line for calling out to Java
- appArgs = appName + " -Djava.class.path=";
- appArgs += m_szClasspath;
- appArgs += " org.openoffice.xmerge.util.ActiveSyncDriver ";
-
- if (!lstrcmp(psf->szExtension, "sxw"))
- {
- appArgs += "staroffice/sxw ";
- appArgs += "application/x-pocket-word ";
- }
- else if(!lstrcmp(psf->szExtension, "psw"))
- {
- appArgs += "application/x-pocket-word ";
- appArgs += "staroffice/sxw ";
- }
- else if(!lstrcmp(psf->szExtension, "sxc"))
- {
- appArgs += "staroffice/sxc ";
- appArgs += "application/x-pocket-excel ";
- }
- else if(!lstrcmp(psf->szExtension, "pxl"))
- {
- appArgs += "application/x-pocket-excel ";
- appArgs += "staroffice/sxc ";
- }
-
-
- // ActiveSync sometimes gives out long file names, especially when automatically syncing
- appArgs += "\"";
- appArgs += psf->szFullpath;
- appArgs += "\" \"";
- appArgs += pdf->szFullpath;
- appArgs += "\"";
-
- if(!CreateProcess(NULL,
- (char*)appArgs.c_str(),
- NULL, // No Process Attributes
- NULL, // No Thread Attributes
- FALSE, // Don't want this process getting handles
- CREATE_NO_WINDOW, // No console
- NULL, // No special environment
- NULL, // Current Working Directory is okay
- &si,
- &pi))
- {
- *perr = ERR_INITJAVA;
- return HRESULT_FROM_WIN32(E_FAIL);
- }
-
- // Wait for the new process to work
- WaitForSingleObject(pi.hProcess, INFINITE);
-
- CloseHandle(pi.hProcess);
- CloseHandle(pi.hThread);
-
- return HRESULT_FROM_WIN32(ERROR_NO_MORE_ITEMS);
-}
-
-
-typedef HRESULT (WINAPI *SHGETFOLDERPATH)( HWND, int, HANDLE, DWORD, LPTSTR );
-
-
-TCHAR* CXMergeFilter::GetJavaBaseDir()
-{
- HRESULT lRet;
-
- HKEY hKey = NULL;
- HKEY hDataKey = NULL;
-
- TCHAR szCurrentJava[_MAX_PATH] = "\0";
- DWORD dwClassName = _MAX_PATH;
- DWORD dwKeyName = _MAX_PATH;
-
- /*
- * Java leaves registry keys at HKLM\SOFTWARE\JavaSoft.
- *
- * Check for a JRE installation first
- */
- lRet = ::RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("SOFTWARE\\JavaSoft\\Java Runtime Environment"), 0, KEY_READ, &hKey);
- if (lRet != ERROR_SUCCESS)
- return NULL;
-
- // Locations shouldn't be greater than _MAX_PATH
- TCHAR* szJavaHome = new TCHAR[_MAX_PATH + 1];
- DWORD dwSize = _MAX_PATH + 1;
-
- /* use current version */
- lRet = ::RegQueryValueEx(hKey, _T("CurrentVersion"), 0, NULL, (LPBYTE)szCurrentJava, &dwSize);
-
- lRet = ::RegOpenKeyEx(hKey, _T(szCurrentJava), 0, KEY_READ, &hDataKey);
- if (lRet != ERROR_SUCCESS)
- {
- RegCloseKey(hKey);
- delete [] szJavaHome;
- return NULL;
- }
-
-
- // Now read the JavaHome value
- dwSize = _MAX_PATH + 1;
- lRet = ::RegQueryValueEx(hDataKey, _T("JavaHome"), 0, NULL, (LPBYTE)szJavaHome, &dwSize);
- if (lRet != ERROR_SUCCESS)
- {
- RegCloseKey(hDataKey);
- RegCloseKey(hKey);
- delete [] szJavaHome;
- return NULL;
- }
-
- RegCloseKey(hDataKey);
- RegCloseKey(hKey);
-
-
- // Check that the directory exists before returning it
- DWORD dwAttrs = GetFileAttributes(szJavaHome);
-
- if (((dwAttrs & FILE_ATTRIBUTE_DIRECTORY) != FILE_ATTRIBUTE_DIRECTORY) || dwAttrs == INVALID_FILE_SIZE)
- {
- delete [] szJavaHome;
- return NULL;
- }
-
- return szJavaHome;
-}
-
-
-
-TCHAR* CXMergeFilter::GetXMergeClassPath()
-{
- /*
- * The DLL will be installed by setup in the program directory of
- * the installation. The XMerge Jar files, if present, will be
- * located in the classes directory below program.
- */
-
- TCHAR szJarPath[MAX_PATH];
- TCHAR szTmpPath[MAX_PATH];
-
- ZeroMemory(szJarPath, MAX_PATH);
- ZeroMemory(szTmpPath, MAX_PATH);
-
- WIN32_FILE_ATTRIBUTE_DATA fInfo;
-
- std::string clsPath;
-
-
- // Get the location of the module.
- GetModuleFileName(_Module.m_hInst, szTmpPath, MAX_PATH);
-
- // Strip off the xmergesync.dll component
- _strlwr(szTmpPath);
- char* modName = strstr(szTmpPath, "xmergesync.dll");
- strncpy(szJarPath, szTmpPath, modName - szTmpPath);
-
- // Append the classes directory
- strncat(szJarPath, "classes\\", 8);
-
-
- // The core xmerge.jar must be present
- ZeroMemory(szTmpPath, MAX_PATH);
- _snprintf(szTmpPath, MAX_PATH, "%s%s\0", szJarPath, "xmerge.jar");
-
- if (!GetFileAttributesEx(szTmpPath, GetFileExInfoStandard, &fInfo))
- {
- return NULL;
- }
- else
- {
- clsPath += szTmpPath;
- clsPath += ";";
- }
-
-
- // Now check for Pocket Word
- ZeroMemory(szTmpPath, MAX_PATH);
- _snprintf(szTmpPath, MAX_PATH, "%s%s\0", szJarPath, "pocketword.jar");
-
- if (!GetFileAttributesEx(szTmpPath, GetFileExInfoStandard, &fInfo))
- {
- m_bHaveWord = FALSE;
- }
- else
- {
- m_bHaveWord = TRUE;
- clsPath += szTmpPath;
- clsPath += ";";
- }
-
- // Now check for Pocket Excel
- ZeroMemory(szTmpPath, MAX_PATH);
- _snprintf(szTmpPath, MAX_PATH, "%s%s\0", szJarPath, "pexcel.jar");
-
- if (!GetFileAttributesEx(szTmpPath, GetFileExInfoStandard, &fInfo))
- {
- m_bHaveExcel = FALSE;
- }
- else
- {
- m_bHaveExcel = TRUE;
- clsPath += szTmpPath;
- clsPath += ";";
- }
-
- // Quotes may be need around the ClassPath
- clsPath.insert(0, "\"");
- clsPath += "\"";
-
-
- // Return the data
- return _strdup(clsPath.c_str());
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmerge/source/activesync/XMergeFilter.h b/xmerge/source/activesync/XMergeFilter.h
deleted file mode 100644
index 9c120500d029..000000000000
--- a/xmerge/source/activesync/XMergeFilter.h
+++ /dev/null
@@ -1,94 +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 .
- */
-
-// XMergeFilter.h: interface for the CXMergeFilter class.
-//
-//////////////////////////////////////////////////////////////////////
-
-#if !defined(AFX_XMERGEFILTER_H__25C39F6B_A1D7_408E_8F58_9CBEE9A666CC__INCLUDED_)
-#define AFX_XMERGEFILTER_H__25C39F6B_A1D7_408E_8F58_9CBEE9A666CC__INCLUDED_
-
-#if _MSC_VER > 1000
-#pragma once
-#endif // _MSC_VER > 1000
-
-
-
-
-
-class CXMergeFilter : public ICeFileFilter
-{
-protected:
- long m_cRef;
-
-private:
- TCHAR* GetXMergeClassPath();
- TCHAR* GetJavaBaseDir();
-
- TCHAR* m_szJavaBaseDir;
- TCHAR* m_szClasspath;
-
- BOOL m_bHaveExcel;
- BOOL m_bHaveWord;
-
-
-public:
- static const LPTSTR m_pszPSWExportCLSID;
- static const LPTSTR m_pszPSWExportExt;
- static const LPTSTR m_pszPSWExportDesc;
- static const LPTSTR m_pszPSWExportShortDesc;
-
- static const LPTSTR m_pszPSWImportCLSID;
- static const LPTSTR m_pszPSWImportExt;
- static const LPTSTR m_pszPSWImportDesc;
- static const LPTSTR m_pszPSWImportShortDesc;
-
- static const LPTSTR m_pszPXLExportCLSID;
- static const LPTSTR m_pszPXLExportExt;
- static const LPTSTR m_pszPXLExportDesc;
- static const LPTSTR m_pszPXLExportShortDesc;
-
- static const LPTSTR m_pszPXLImportCLSID;
- static const LPTSTR m_pszPXLImportExt;
- static const LPTSTR m_pszPXLImportDesc;
- static const LPTSTR m_pszPXLImportShortDesc;
-
-public:
- CXMergeFilter();
- virtual ~CXMergeFilter();
-
-
- /********** IUnknown methods **********/
- STDMETHODIMP QueryInterface(REFIID iid, void **ppvObject);
- STDMETHODIMP_(ULONG) AddRef();
- STDMETHODIMP_(ULONG) Release();
-
- /********** ICeFileFilter methods *********/
- STDMETHODIMP FilterOptions(HWND hwndParent);
- STDMETHODIMP FormatMessage(DWORD dwFlags, DWORD dwMessageId, DWORD dwLanguageId,
- LPTSTR lpBuffer, DWORD nSize, va_list *Arguments, DWORD *pcb);
- STDMETHODIMP NextConvertFile(int nConversion, CFF_CONVERTINFO *pci,
- CFF_SOURCEFILE *psf, CFF_DESTINATIONFILE *pdf,
- volatile BOOL *pbCancel, CF_ERROR *perr);
-
-};
-
-#endif // !defined(AFX_XMERGEFILTER_H__25C39F6B_A1D7_408E_8F58_9CBEE9A666CC__INCLUDED_)
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmerge/source/activesync/XMergeSync.cpp b/xmerge/source/activesync/XMergeSync.cpp
deleted file mode 100644
index 8c8178c8e613..000000000000
--- a/xmerge/source/activesync/XMergeSync.cpp
+++ /dev/null
@@ -1,850 +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 .
- */
-
-#include "stdafx.h"
-
-#include "XMergeFilter.h"
-#include "XMergeFactory.h"
-
-
-CXMergeSyncModule _Module;
-
-
-//////////////////////////////////////////////////////////////////////
-// DLL Functions
-//////////////////////////////////////////////////////////////////////
-BOOL WINAPI DllMain(HANDLE hInst, ULONG ulReason, LPVOID lpReserved)
-{
- switch (ulReason)
- {
- case DLL_PROCESS_ATTACH:
- _Module.m_hInst = reinterpret_cast(hInst);
- break;
-
- case DLL_PROCESS_DETACH:
- _Module.m_hInst = NULL;
- break;
-
- case DLL_THREAD_ATTACH:
- break;
-
- case DLL_THREAD_DETACH:
- break;
- }
-
- return TRUE;
-}
-
-
-STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
-{
- // Create the factory object
- CXMergeFactory *pFactory = new CXMergeFactory();
- HRESULT hr = pFactory->QueryInterface(riid, ppv);
- pFactory->Release();
-
- return hr;
-}
-
-
-STDAPI DllCanUnloadNow()
-{
- if (_Module.GetLockCount() == 0)
- return S_OK;
-
- return S_FALSE;
-}
-
-
-// Utility function to close open keys during registration
-static _signalRegError(long lRet, HKEY hKey, HKEY hDataKey)
-{
- if (hKey)
- ::RegCloseKey(hKey);
-
-
- if (hDataKey)
- ::RegCloseKey(hDataKey);
-
- return HRESULT_FROM_WIN32(lRet);
-}
-
-
-STDAPI DllRegisterServer()
-{
- HKEY hKey = NULL;
- HKEY hDataKey = NULL;
-
- long lRet = 0;
- TCHAR sTemp[_MAX_PATH + 1] = "\0";
-
-
- /*
- * Following calls create the HKEY_CLASSES_ROOT\CLSID entry for the Writer export filter.
- *
- * Note that import are export are relative to the WinCE device, so files are
- * exported to the desktop format.
- */
-
- // Get a handle to the CLSID key
- lRet = ::RegOpenKeyEx(HKEY_CLASSES_ROOT, _T("CLSID"), 0, KEY_ALL_ACCESS, &hKey);
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
-
- // Create the CLSID key for the XMergeFilter
- lRet = ::RegCreateKeyEx(hKey, CXMergeFilter::m_pszPSWExportCLSID, 0, _T(""), 0, KEY_ALL_ACCESS, NULL, &hKey, NULL);
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
-
- lRet = ::RegSetValueEx(hKey, _T(""), 0, REG_SZ, (LPBYTE)CXMergeFilter::m_pszPSWExportShortDesc,
- (::_tcslen(CXMergeFilter::m_pszPSWExportShortDesc) * sizeof(TCHAR) + (1 * sizeof(TCHAR))));
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
-
-
- // Create the DefaultIcon key. For the moment, use one of the Async supplied ones
- lRet = ::RegCreateKeyEx(hKey, _T("DefaultIcon"), 0, _T(""), 0, KEY_ALL_ACCESS, NULL, &hDataKey, NULL);
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
-
- lRet = ::RegSetValueEx(hDataKey, NULL, 0, REG_SZ, (LPBYTE)_T("C:\\Program Files\\Microsoft ActiveSync\\pwdcnv.dll,0"),
- (::_tcslen(_T("C:\\Program Files\\Microsoft ActiveSync\\pwdcnv.dll,0"))
- * sizeof(TCHAR) + (1 * sizeof(TCHAR))));
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
- ::RegCloseKey(hDataKey); hDataKey = NULL;
-
- // Create the InprocServer32 key
- lRet = ::RegCreateKeyEx(hKey, _T("InProcServer32"), 0, _T(""), 0, KEY_ALL_ACCESS, NULL, &hDataKey, NULL);
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
-
- lRet = ::RegSetValueEx(hDataKey, _T("ThreadingModel"), 0, REG_SZ, (LPBYTE)_T("Apartment"), 10);
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
-
- // Create the key for the DLL file. First find the filename of the dll
- if (!::GetModuleFileName((HMODULE)_Module.m_hInst, sTemp, (_MAX_PATH + 1)))
- {
- lRet = ::GetLastError();
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
- }
-
-
- lRet = ::RegSetValueEx(hDataKey, NULL, 0, REG_SZ, (LPBYTE)sTemp,
- (::_tcslen(sTemp) * sizeof(TCHAR) + (1 * sizeof(TCHAR))));
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
- ::RegCloseKey(hDataKey); hDataKey = NULL;
-
-
- // Setup the PegasusFilter key values
- lRet = ::RegCreateKeyEx(hKey, _T("PegasusFilter"), 0, _T(""), 0, KEY_ALL_ACCESS, NULL, &hDataKey, NULL);
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
-
- lRet = ::RegSetValueEx(hDataKey, _T("Description"), 0, REG_SZ, (LPBYTE)CXMergeFilter::m_pszPSWExportDesc,
- (::_tcslen(CXMergeFilter::m_pszPSWExportDesc) * sizeof(TCHAR) + (1 * sizeof(TCHAR))));
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
-
-
- lRet = ::RegSetValueEx(hDataKey, _T("Export"), 0, REG_SZ, (LPBYTE)_T(""), (1 * sizeof(TCHAR)));
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
-
-
- lRet = ::RegSetValueEx(hDataKey, _T("NewExtension"), 0, REG_SZ, (LPBYTE)CXMergeFilter::m_pszPSWExportExt,
- (::_tcslen(CXMergeFilter::m_pszPSWExportExt) * sizeof(TCHAR) + (1 * sizeof(TCHAR))));
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
-
-
- ::RegCloseKey(hKey); hKey = NULL;
- ::RegCloseKey(hDataKey); hDataKey = NULL;
-
-
-
-
- /*
- * Following calls create the entries for the filter in
- * HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows CE Services\Filters
- */
-
- lRet = ::RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("SOFTWARE\\Microsoft\\Windows CE Services\\Filters"),
- 0, KEY_ALL_ACCESS, &hKey);
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
-
- _snprintf(sTemp, _MAX_PATH + 1, "%c%s\\InstalledFilters\0", '.', CXMergeFilter::m_pszPSWImportExt);
- lRet = ::RegCreateKeyEx(hKey, _T(sTemp),
- 0, _T(""), 0, KEY_ALL_ACCESS, NULL, &hDataKey, NULL);
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
-
- lRet = ::RegSetValueEx(hDataKey, CXMergeFilter::m_pszPSWExportCLSID, 0, REG_SZ, (LPBYTE)_T(""), (1 * sizeof(TCHAR)));
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
-
- ::RegCloseKey(hKey); hKey = NULL;
- ::RegCloseKey(hDataKey); hDataKey = NULL;
-
-
-
- /*
- * Following calls create the HKEY_CLASSES_ROOT\CLSID entry for the Writer import filter.
- *
- * Note that import are export are relative to the WinCE device, so files are
- * exported to the desktop format.
- */
- // Get a handle to the CLSID key
- lRet = ::RegOpenKeyEx(HKEY_CLASSES_ROOT, _T("CLSID"), 0, KEY_ALL_ACCESS, &hKey);
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
-
- // Create the CLSID key for the XMergeFilter
- lRet = ::RegCreateKeyEx(hKey, CXMergeFilter::m_pszPSWImportCLSID, 0, _T(""), 0, KEY_ALL_ACCESS, NULL, &hKey, NULL);
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
-
- lRet = ::RegSetValueEx(hKey, _T(""), 0, REG_SZ, (LPBYTE)CXMergeFilter::m_pszPSWImportShortDesc,
- (::_tcslen(CXMergeFilter::m_pszPSWImportShortDesc) * sizeof(TCHAR) + (1 * sizeof(TCHAR))));
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
-
-
- // Create the DefaultIcon key. For the moment, use one of the Async supplied ones
- lRet = ::RegCreateKeyEx(hKey, _T("DefaultIcon"), 0, _T(""), 0, KEY_ALL_ACCESS, NULL, &hDataKey, NULL);
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
-
- lRet = ::RegSetValueEx(hDataKey, NULL, 0, REG_SZ, (LPBYTE)_T("C:\\Program Files\\Microsoft ActiveSync\\pwdcnv.dll,0"),
- (::_tcslen(_T("C:\\Program Files\\Microsoft ActiveSync\\pwdcnv.dll,0"))
- * sizeof(TCHAR) + (1 * sizeof(TCHAR))));
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
- ::RegCloseKey(hDataKey); hDataKey = NULL;
-
-
- // Create the InprocServer32 key
- lRet = ::RegCreateKeyEx(hKey, _T("InProcServer32"), 0, _T(""), 0, KEY_ALL_ACCESS, NULL, &hDataKey, NULL);
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
-
- lRet = ::RegSetValueEx(hDataKey, _T("ThreadingModel"), 0, REG_SZ, (LPBYTE)_T("Apartment"), 10);
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
-
-
- // Create the key for the DLL file. First find the filename of the dll
- if (!::GetModuleFileName((HMODULE)_Module.m_hInst, sTemp, (_MAX_PATH + 1)))
- {
- lRet = ::GetLastError();
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
- }
-
-
- lRet = ::RegSetValueEx(hDataKey, NULL, 0, REG_SZ, (LPBYTE)sTemp,
- (::_tcslen(sTemp) * sizeof(TCHAR) + (1 * sizeof(TCHAR))));
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
- ::RegCloseKey(hDataKey); hDataKey = NULL;
-
-
- // Setup the PegasusFilter key values
- lRet = ::RegCreateKeyEx(hKey, _T("PegasusFilter"), 0, _T(""), 0, KEY_ALL_ACCESS, NULL, &hDataKey, NULL);
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
-
- lRet = ::RegSetValueEx(hDataKey, _T("Description"), 0, REG_SZ, (LPBYTE)CXMergeFilter::m_pszPSWImportDesc,
- (::_tcslen(CXMergeFilter::m_pszPSWImportDesc) * sizeof(TCHAR) + (1 * sizeof(TCHAR))));
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
-
-
- lRet = ::RegSetValueEx(hDataKey, _T("Import"), 0, REG_SZ, (LPBYTE)_T(""), (1 * sizeof(TCHAR)));
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
-
-
- lRet = ::RegSetValueEx(hDataKey, _T("NewExtension"), 0, REG_SZ, (LPBYTE)CXMergeFilter::m_pszPSWImportExt,
- (::_tcslen(CXMergeFilter::m_pszPSWImportExt) * sizeof(TCHAR) + (1 * sizeof(TCHAR))));
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
-
-
- ::RegCloseKey(hKey); hKey = NULL;
- ::RegCloseKey(hDataKey); hDataKey = NULL;
-
-
- /*
- * Following calls create the entries for the filter in
- * HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows CE Services\Filters
- */
- lRet = ::RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("SOFTWARE\\Microsoft\\Windows CE Services\\Filters"),
- 0, KEY_ALL_ACCESS, &hKey);
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
-
- // Add in defaults for import and export
- _snprintf(sTemp, _MAX_PATH +1, "%c%s\0", '.', CXMergeFilter::m_pszPSWExportExt);
- lRet = ::RegCreateKeyEx(hKey, _T(sTemp), 0, _T(""), 0, KEY_ALL_ACCESS, NULL, &hDataKey, NULL);
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
-
- lRet = ::RegSetValueEx(hDataKey, _T("DefaultImport"), 0, REG_SZ,
- (LPBYTE)CXMergeFilter::m_pszPSWImportCLSID,
- (::_tcslen(CXMergeFilter::m_pszPSWImportDesc) * sizeof(TCHAR) + (1 * sizeof(TCHAR))));
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
-
-
- lRet = ::RegSetValueEx(hDataKey, _T("DefaultExport"), 0, REG_SZ, (LPBYTE)_T("Binary Copy"),
- (::_tcslen(_T("Binary Copy")) * sizeof(TCHAR) + (1 * sizeof(TCHAR))));
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
-
- ::RegCloseKey(hDataKey);
-
- // Update registered filters
- _snprintf(sTemp, _MAX_PATH + 1, "%c%s\\InstalledFilters\0", '.', CXMergeFilter::m_pszPSWExportExt);
- lRet = ::RegCreateKeyEx(hKey, _T(sTemp),
- 0, _T(""), 0, KEY_ALL_ACCESS, NULL, &hDataKey, NULL);
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
-
-
- lRet = ::RegSetValueEx(hDataKey, CXMergeFilter::m_pszPSWImportCLSID, 0, REG_SZ, (LPBYTE)_T(""), (1 * sizeof(TCHAR)));
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
-
- ::RegCloseKey(hKey); hKey = NULL;
- ::RegCloseKey(hDataKey); hDataKey = NULL;
-
-
-
- /*
- * Following calls create the HKEY_CLASSES_ROOT\CLSID entry for the Calc export filter.
- *
- * Note that import are export are relative to the WinCE device, so files are
- * exported to the desktop format.
- */
-
- // Get a handle to the CLSID key
- lRet = ::RegOpenKeyEx(HKEY_CLASSES_ROOT, _T("CLSID"), 0, KEY_ALL_ACCESS, &hKey);
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
-
- // Create the CLSID key for the XMerge Filter
- lRet = ::RegCreateKeyEx(hKey, CXMergeFilter::m_pszPXLExportCLSID, 0, _T(""),
- 0, KEY_ALL_ACCESS, NULL, &hKey, NULL);
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
-
- lRet = ::RegSetValueEx(hKey, _T(""), 0, REG_SZ, (LPBYTE)CXMergeFilter::m_pszPXLExportShortDesc,
- (::_tcslen(CXMergeFilter::m_pszPXLExportShortDesc) * sizeof(TCHAR) + (1 * sizeof(TCHAR))));
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
-
-
- // Create the DefaultIcon key. For the moment, use one of the Async supplied ones
- lRet = ::RegCreateKeyEx(hKey, _T("DefaultIcon"), 0, _T(""), 0, KEY_ALL_ACCESS, NULL, &hDataKey, NULL);
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
-
- lRet = ::RegSetValueEx(hDataKey, NULL, 0, REG_SZ, (LPBYTE)_T("C:\\Program Files\\Microsoft ActiveSync\\pwdcnv.dll,0"),
- (::_tcslen(_T("C:\\Program Files\\Microsoft ActiveSync\\pwdcnv.dll,0"))
- * sizeof(TCHAR) + (1 * sizeof(TCHAR))));
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
- ::RegCloseKey(hDataKey); hDataKey = NULL;
-
-
- // Create the InprocServer32 key
- lRet = ::RegCreateKeyEx(hKey, _T("InProcServer32"), 0, _T(""), 0, KEY_ALL_ACCESS, NULL, &hDataKey, NULL);
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
-
- lRet = ::RegSetValueEx(hDataKey, _T("ThreadingModel"), 0, REG_SZ, (LPBYTE)_T("Apartment"), 10);
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
-
-
- // Create the key for the DLL file. First find the filename of the dll
- if (!::GetModuleFileName((HMODULE)_Module.m_hInst, sTemp, (_MAX_PATH + 1)))
- {
- lRet = ::GetLastError();
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
- }
-
-
- lRet = ::RegSetValueEx(hDataKey, NULL, 0, REG_SZ, (LPBYTE)sTemp,
- (::_tcslen(sTemp) * sizeof(TCHAR) + (1 * sizeof(TCHAR))));
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
- ::RegCloseKey(hDataKey); hDataKey = NULL;
-
-
- // Setup the PegasusFilter key values
- lRet = ::RegCreateKeyEx(hKey, _T("PegasusFilter"), 0, _T(""), 0, KEY_ALL_ACCESS, NULL, &hDataKey, NULL);
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
-
- lRet = ::RegSetValueEx(hDataKey, _T("Description"), 0, REG_SZ, (LPBYTE)CXMergeFilter::m_pszPXLExportDesc,
- (::_tcslen(CXMergeFilter::m_pszPXLExportDesc) * sizeof(TCHAR) + (1 * sizeof(TCHAR))));
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
-
-
- lRet = ::RegSetValueEx(hDataKey, _T("Export"), 0, REG_SZ, (LPBYTE)_T(""), (1 * sizeof(TCHAR)));
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
-
-
- lRet = ::RegSetValueEx(hDataKey, _T("NewExtension"), 0, REG_SZ, (LPBYTE)CXMergeFilter::m_pszPXLExportExt,
- (::_tcslen(CXMergeFilter::m_pszPXLExportExt) * sizeof(TCHAR) + (1 * sizeof(TCHAR))));
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
-
-
- ::RegCloseKey(hKey); hKey = NULL;
- ::RegCloseKey(hDataKey); hDataKey = NULL;
-
-
-
-
- /*
- * Following calls create the entries for the filter in
- * HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows CE Services\Filters
- */
-
- lRet = ::RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("SOFTWARE\\Microsoft\\Windows CE Services\\Filters"),
- 0, KEY_ALL_ACCESS, &hKey);
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
-
- _snprintf(sTemp, _MAX_PATH + 1, "%c%s\\InstalledFilters\0", '.', CXMergeFilter::m_pszPXLImportExt);
- lRet = ::RegCreateKeyEx(hKey, _T(sTemp),
- 0, _T(""), 0, KEY_ALL_ACCESS, NULL, &hDataKey, NULL);
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
-
- lRet = ::RegSetValueEx(hDataKey, CXMergeFilter::m_pszPXLExportCLSID, 0, REG_SZ, (LPBYTE)_T(""), (1 * sizeof(TCHAR)));
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
-
- ::RegCloseKey(hKey); hKey = NULL;
- ::RegCloseKey(hDataKey); hDataKey = NULL;
-
-
-
- /*
- * Following calls create the HKEY_CLASSES_ROOT\CLSID entry for the Calc import filter.
- *
- * Note that import are export are relative to the WinCE device, so files are
- * exported to the desktop format.
- */
- // Get a handle to the CLSID key
- lRet = ::RegOpenKeyEx(HKEY_CLASSES_ROOT, _T("CLSID"), 0, KEY_ALL_ACCESS, &hKey);
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
-
-
- // Create the CLSID key for the XMergeFilter
- lRet = ::RegCreateKeyEx(hKey, CXMergeFilter::m_pszPXLImportCLSID, 0, _T(""), 0, KEY_ALL_ACCESS, NULL, &hKey, NULL);
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
-
- lRet = ::RegSetValueEx(hKey, _T(""), 0, REG_SZ, (LPBYTE)CXMergeFilter::m_pszPXLImportShortDesc,
- (::_tcslen(CXMergeFilter::m_pszPXLImportShortDesc) * sizeof(TCHAR) + (1 * sizeof(TCHAR))));
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
-
- // Create the DefaultIcon key. For the moment, use one of the Async supplied ones
- lRet = ::RegCreateKeyEx(hKey, _T("DefaultIcon"), 0, _T(""), 0, KEY_ALL_ACCESS, NULL, &hDataKey, NULL);
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
-
- lRet = ::RegSetValueEx(hDataKey, NULL, 0, REG_SZ, (LPBYTE)_T("C:\\Program Files\\Microsoft ActiveSync\\pwdcnv.dll,0"),
- (::_tcslen(_T("C:\\Program Files\\Microsoft ActiveSync\\pwdcnv.dll,0"))
- * sizeof(TCHAR) + (1 * sizeof(TCHAR))));
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
- ::RegCloseKey(hDataKey); hDataKey = NULL;
-
-
- // Create the InprocServer32 key
- lRet = ::RegCreateKeyEx(hKey, _T("InProcServer32"), 0, _T(""), 0, KEY_ALL_ACCESS, NULL, &hDataKey, NULL);
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
-
- lRet = ::RegSetValueEx(hDataKey, _T("ThreadingModel"), 0, REG_SZ, (LPBYTE)_T("Apartment"), 10);
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
-
-
- // Create the key for the DLL file. First find the filename of the dll
- if (!::GetModuleFileName((HMODULE)_Module.m_hInst, sTemp, (_MAX_PATH + 1)))
- {
- lRet = ::GetLastError();
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
- }
-
-
- lRet = ::RegSetValueEx(hDataKey, NULL, 0, REG_SZ, (LPBYTE)sTemp,
- (::_tcslen(sTemp) * sizeof(TCHAR) + (1 * sizeof(TCHAR))));
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
- ::RegCloseKey(hDataKey); hDataKey = NULL;
-
-
- // Setup the PegasusFilter key values
- lRet = ::RegCreateKeyEx(hKey, _T("PegasusFilter"), 0, _T(""), 0, KEY_ALL_ACCESS, NULL, &hDataKey, NULL);
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
-
- lRet = ::RegSetValueEx(hDataKey, _T("Description"), 0, REG_SZ, (LPBYTE)CXMergeFilter::m_pszPXLImportDesc,
- (::_tcslen(CXMergeFilter::m_pszPXLImportDesc) * sizeof(TCHAR) + (1 * sizeof(TCHAR))));
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
-
-
- lRet = ::RegSetValueEx(hDataKey, _T("Import"), 0, REG_SZ, (LPBYTE)_T(""), (1 * sizeof(TCHAR)));
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
-
-
- lRet = ::RegSetValueEx(hDataKey, _T("NewExtension"), 0, REG_SZ, (LPBYTE)CXMergeFilter::m_pszPXLImportExt,
- (::_tcslen(CXMergeFilter::m_pszPXLImportExt) * sizeof(TCHAR) + (1 * sizeof(TCHAR))));
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
-
-
- ::RegCloseKey(hKey); hKey = NULL;
- ::RegCloseKey(hDataKey); hDataKey = NULL;
-
-
-
- /*
- * Following calls create the entries for the filter in
- * HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows CE Services\Filters
- */
- lRet = ::RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("SOFTWARE\\Microsoft\\Windows CE Services\\Filters"),
- 0, KEY_ALL_ACCESS, &hKey);
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
-
- // Add in defaults for import and export
- _snprintf(sTemp, _MAX_PATH +1, "%c%s\0", '.', CXMergeFilter::m_pszPXLExportExt);
- lRet = ::RegCreateKeyEx(hKey, _T(sTemp), 0, _T(""), 0, KEY_ALL_ACCESS, NULL, &hDataKey, NULL);
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
-
- lRet = ::RegSetValueEx(hDataKey, _T("DefaultImport"), 0, REG_SZ,
- (LPBYTE)CXMergeFilter::m_pszPXLImportCLSID,
- (::_tcslen(CXMergeFilter::m_pszPSWImportDesc) * sizeof(TCHAR) + (1 * sizeof(TCHAR))));
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
-
-
- lRet = ::RegSetValueEx(hDataKey, _T("DefaultExport"), 0, REG_SZ, (LPBYTE)_T("Binary Copy"),
- (::_tcslen(_T("Binary Copy")) * sizeof(TCHAR) + (1 * sizeof(TCHAR))));
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
-
- ::RegCloseKey(hDataKey);
-
- // Update registered filters
-
-
- _snprintf(sTemp, _MAX_PATH + 1, "%c%s\\InstalledFilters\0", '.', CXMergeFilter::m_pszPXLExportExt);
- lRet = ::RegCreateKeyEx(hKey, _T(sTemp),
- 0, _T(""), 0, KEY_ALL_ACCESS, NULL, &hDataKey, NULL);
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
-
- lRet = ::RegSetValueEx(hDataKey, CXMergeFilter::m_pszPXLImportCLSID, 0, REG_SZ, (LPBYTE)_T(""), (1 * sizeof(TCHAR)));
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
-
- ::RegCloseKey(hKey); hKey = NULL;
- ::RegCloseKey(hDataKey); hDataKey = NULL;
-
-
-
- return HRESULT_FROM_WIN32(lRet);
-}
-
-
-STDAPI DllUnregisterServer()
-{
- long lRet = 0;
- HKEY hKey = NULL;
- HKEY hDataKey = NULL;
-
- TCHAR szClassName[_MAX_PATH] = "\0";
- TCHAR szKeyName[_MAX_PATH] = "\0";
- DWORD dwClassName = _MAX_PATH;
- DWORD dwKeyName = _MAX_PATH;
-
- /*
- * Remove HKEY_CLASS_ROOT\CLSID\{XXX} entry for the export and import filters
- *
- * Windows 95/98/Me allow one step deletion of a key and all subkeys.
- * Windows NT/2000/XP do not so the subkeys must be deleted individually.
- */
- lRet = ::RegOpenKeyEx(HKEY_CLASSES_ROOT, _T("CLSID"), 0, KEY_ALL_ACCESS, &hKey);
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
-
-
- // First up, the Writer export filter
- lRet = ::RegOpenKeyEx(hKey, CXMergeFilter::m_pszPSWExportCLSID, 0, KEY_ALL_ACCESS, &hDataKey);
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
-
-
- while ((lRet = ::RegEnumKeyEx(hDataKey, 0, szKeyName, &dwKeyName, 0, szClassName, &dwClassName, NULL))
- != ERROR_NO_MORE_ITEMS)
- {
- lRet = ::RegDeleteKey(hDataKey, szKeyName);
-
- ::lstrcpy(szKeyName, "\0");
- ::lstrcpy(szClassName, "\0");
-
- dwClassName = _MAX_PATH;
- dwKeyName = _MAX_PATH;
- }
-
- ::RegCloseKey(hDataKey); hDataKey = NULL;
-
- lRet = ::RegDeleteKey(hKey, CXMergeFilter::m_pszPSWExportCLSID);
- if (lRet != ERROR_SUCCESS && lRet != ERROR_FILE_NOT_FOUND)
- return _signalRegError(lRet, hKey, hDataKey);
-
-
-
- // Next, the Writer import filter
- lRet = ::RegOpenKeyEx(hKey, CXMergeFilter::m_pszPSWImportCLSID, 0, KEY_ALL_ACCESS, &hDataKey);
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
-
-
- while ((lRet = ::RegEnumKeyEx(hDataKey, 0, szKeyName, &dwKeyName, 0, szClassName, &dwClassName, NULL))
- != ERROR_NO_MORE_ITEMS)
- {
- lRet = ::RegDeleteKey(hDataKey, szKeyName);
-
- ::lstrcpy(szKeyName, "\0");
- ::lstrcpy(szClassName, "\0");
-
- dwClassName = _MAX_PATH;
- dwKeyName = _MAX_PATH;
- }
-
- ::RegCloseKey(hDataKey); hDataKey = NULL;
-
- lRet = ::RegDeleteKey(hKey, CXMergeFilter::m_pszPSWImportCLSID);
- if (lRet != ERROR_SUCCESS && lRet != ERROR_FILE_NOT_FOUND)
- return _signalRegError(lRet, hKey, hDataKey);
-
-
- // Next up, the Calc export filter
- lRet = ::RegOpenKeyEx(hKey, CXMergeFilter::m_pszPXLExportCLSID, 0, KEY_ALL_ACCESS, &hDataKey);
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
-
-
- while ((lRet = ::RegEnumKeyEx(hDataKey, 0, szKeyName, &dwKeyName, 0, szClassName, &dwClassName, NULL))
- != ERROR_NO_MORE_ITEMS)
- {
- lRet = ::RegDeleteKey(hDataKey, szKeyName);
-
- ::lstrcpy(szKeyName, "\0");
- ::lstrcpy(szClassName, "\0");
-
- dwClassName = _MAX_PATH;
- dwKeyName = _MAX_PATH;
- }
-
- ::RegCloseKey(hDataKey); hDataKey = NULL;
-
- lRet = ::RegDeleteKey(hKey, CXMergeFilter::m_pszPXLExportCLSID);
- if (lRet != ERROR_SUCCESS && lRet != ERROR_FILE_NOT_FOUND)
- return _signalRegError(lRet, hKey, hDataKey);
-
-
- // Next, the Calc import filter
- lRet = ::RegOpenKeyEx(hKey, CXMergeFilter::m_pszPXLImportCLSID, 0, KEY_ALL_ACCESS, &hDataKey);
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
-
-
- while ((lRet = ::RegEnumKeyEx(hDataKey, 0, szKeyName, &dwKeyName, 0, szClassName, &dwClassName, NULL))
- != ERROR_NO_MORE_ITEMS)
- {
- lRet = ::RegDeleteKey(hDataKey, szKeyName);
-
- ::lstrcpy(szKeyName, "\0");
- ::lstrcpy(szClassName, "\0");
-
- dwClassName = _MAX_PATH;
- dwKeyName = _MAX_PATH;
- }
-
- ::RegCloseKey(hDataKey); hDataKey = NULL;
-
- lRet = ::RegDeleteKey(hKey, CXMergeFilter::m_pszPXLImportCLSID);
- if (lRet != ERROR_SUCCESS && lRet != ERROR_FILE_NOT_FOUND)
- return _signalRegError(lRet, hKey, hDataKey);
-
- ::RegCloseKey(hKey); hKey = NULL;
-
-
-
- /*
- * Remove the HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows CE Services\Filters
- */
- lRet = ::RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("SOFTWARE\\Microsoft\\Windows CE Services\\Filters"),
- 0, KEY_ALL_ACCESS, &hKey);
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
-
-
- // Remove the Writer export filter from the Writer import file extension subkey.
- _snprintf(szKeyName, _MAX_PATH, ".%s\\InstalledFilters", CXMergeFilter::m_pszPSWImportExt);
- lRet = ::RegOpenKeyEx(hKey, _T(szKeyName), 0, KEY_ALL_ACCESS, &hDataKey);
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
-
- lRet = ::RegDeleteValue(hDataKey, CXMergeFilter::m_pszPSWExportCLSID);
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
-
- ::lstrcpyn(szKeyName, "\0", _MAX_PATH);
- ::RegCloseKey(hDataKey); hDataKey = NULL;
-
-
- // Remove the Writer import filter from the Writer export file extension subkey.
- _snprintf(szKeyName, _MAX_PATH, ".%s\\InstalledFilters", CXMergeFilter::m_pszPSWExportExt);
- lRet = ::RegOpenKeyEx(hKey, _T(szKeyName), 0, KEY_ALL_ACCESS, &hDataKey);
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
-
- lRet = ::RegDeleteValue(hDataKey, CXMergeFilter::m_pszPSWImportCLSID);
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
-
- ::lstrcpyn(szKeyName, "\0", _MAX_PATH);
- ::RegCloseKey(hDataKey); hDataKey = NULL;
-
-
- // Make Binary Copy the default for Writer export file extension subkey DefaultImport
- _snprintf(szKeyName, _MAX_PATH, ".%s\0", CXMergeFilter::m_pszPSWExportExt);
- lRet = ::RegOpenKeyEx(hKey, _T(szKeyName), 0, KEY_ALL_ACCESS, &hDataKey);
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
-
- lRet = ::RegSetValueEx(hDataKey, _T("DefaultImport"), 0, REG_SZ, (LPBYTE)_T("Binary Copy"),
- (::_tcslen(_T("Binary Copy")) * sizeof(TCHAR) + (1 * sizeof(TCHAR))));
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
-
- ::lstrcpyn(szKeyName, "\0", _MAX_PATH);
- ::RegCloseKey(hDataKey); hDataKey = NULL;
-
-
- // Remove the Calc export filter from the Calc import file extension subkey.
- _snprintf(szKeyName, _MAX_PATH, ".%s\\InstalledFilters", CXMergeFilter::m_pszPXLImportExt);
- lRet = ::RegOpenKeyEx(hKey, _T(szKeyName), 0, KEY_ALL_ACCESS, &hDataKey);
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
-
- lRet = ::RegDeleteValue(hDataKey, CXMergeFilter::m_pszPXLExportCLSID);
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
-
- ::lstrcpyn(szKeyName, "\0", _MAX_PATH);
- ::RegCloseKey(hDataKey); hDataKey = NULL;
-
- // Remove the Calc import filter from the Calc export file extension subkey.
- _snprintf(szKeyName, _MAX_PATH, ".%s\\InstalledFilters", CXMergeFilter::m_pszPXLExportExt);
- lRet = ::RegOpenKeyEx(hKey, _T(szKeyName), 0, KEY_ALL_ACCESS, &hDataKey);
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
-
- lRet = ::RegDeleteValue(hDataKey, CXMergeFilter::m_pszPXLImportCLSID);
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
-
- ::lstrcpyn(szKeyName, "\0", _MAX_PATH);
- ::RegCloseKey(hDataKey); hDataKey = NULL;
-
-
- // Make Binary Copy the default for Calc export file extension subkey DefaultImport
- _snprintf(szKeyName, _MAX_PATH, ".%s\0", CXMergeFilter::m_pszPXLExportExt);
- lRet = ::RegOpenKeyEx(hKey, _T(szKeyName), 0, KEY_ALL_ACCESS, &hDataKey);
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
-
- lRet = ::RegSetValueEx(hDataKey, _T("DefaultImport"), 0, REG_SZ, (LPBYTE)_T("Binary Copy"),
- (::_tcslen(_T("Binary Copy")) * sizeof(TCHAR) + (1 * sizeof(TCHAR))));
- if (lRet != ERROR_SUCCESS)
- return _signalRegError(lRet, hKey, hDataKey);
-
- ::lstrcpyn(szKeyName, "\0", _MAX_PATH);
- ::RegCloseKey(hDataKey); hDataKey = NULL;
-
-
-
- ::RegCloseKey(hKey); hKey = NULL;
-
- return HRESULT_FROM_WIN32(lRet);
-}
-
-
-//////////////////////////////////////////////////////////////////////
-// CXMergeSyncModule methods
-//////////////////////////////////////////////////////////////////////
-CXMergeSyncModule::CXMergeSyncModule () : m_lLocks(0), m_lObjs(0)
-{
-}
-
-CXMergeSyncModule::~CXMergeSyncModule ()
-{
-}
-
-long CXMergeSyncModule::LockServer(BOOL fLock)
-{
- if(fLock)
- return ::InterlockedIncrement(&m_lLocks);
- else
- return ::InterlockedDecrement(&m_lLocks);
-}
-
-long CXMergeSyncModule::GetLockCount() const
-{
- return m_lLocks + m_lObjs;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmerge/source/activesync/XMergeSync.def b/xmerge/source/activesync/XMergeSync.def
deleted file mode 100644
index 89de774085f8..000000000000
--- a/xmerge/source/activesync/XMergeSync.def
+++ /dev/null
@@ -1,9 +0,0 @@
-
-LIBRARY "XMERGESYNC.DLL"
-DESCRIPTION 'XMerge Desktop Synchronization Module'
-
-EXPORTS
- DllCanUnloadNow PRIVATE
- DllGetClassObject PRIVATE
- DllRegisterServer PRIVATE
- DllUnregisterServer PRIVATE
diff --git a/xmerge/source/activesync/XMergeSync.dsp b/xmerge/source/activesync/XMergeSync.dsp
deleted file mode 100644
index 3c13e028e50b..000000000000
--- a/xmerge/source/activesync/XMergeSync.dsp
+++ /dev/null
@@ -1,143 +0,0 @@
-# Microsoft Developer Studio Project File - Name="XMergeSync" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=XMergeSync - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "XMergeSync.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "XMergeSync.mak" CFG="XMergeSync - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "XMergeSync - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "XMergeSync - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""$/XMergeSync", BAAAAAAA"
-# PROP Scc_LocalPath "."
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "XMergeSync - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XMERGESYNC_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "C:\Program Files\Windows CE Tools\wce300\Pocket PC 2002\support\ActiveSync\inc" /I "C:\Java\j2sdk1.4.0\include" /I "C:\Java\j2sdk1.4.0\include\win32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XMERGESYNC_EXPORTS" /YX /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x1809 /d "NDEBUG"
-# ADD RSC /l 0x1809 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-
-!ELSEIF "$(CFG)" == "XMergeSync - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XMERGESYNC_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "C:\Program Files\Windows CE Tools\wce300\Pocket PC 2002\support\ActiveSync\inc" /I "C:\Java\j2sdk1.4.0\include" /I "C:\Java\j2sdk1.4.0\include\win32" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XMERGESYNC_EXPORTS" /FR /YX /FD /GZ /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x1809 /d "_DEBUG"
-# ADD RSC /l 0x1809 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"C:\Java\j2sdk1.4.0\lib"
-
-!ENDIF
-
-# Begin Target
-
-# Name "XMergeSync - Win32 Release"
-# Name "XMergeSync - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\stdafx.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\XMergeFactory.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\XMergeFilter.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\XMergeSync.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\XMergeSync.def
-# End Source File
-# Begin Source File
-
-SOURCE=.\XMergeSync.rc
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=.\stdafx.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\XMergeFactory.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\XMergeFilter.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\XMergeSync.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/xmerge/source/activesync/XMergeSync.dsw b/xmerge/source/activesync/XMergeSync.dsw
deleted file mode 100644
index eca2ade60ac1..000000000000
--- a/xmerge/source/activesync/XMergeSync.dsw
+++ /dev/null
@@ -1,33 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "XMergeSync"=.\XMergeSync.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
- begin source code control
- "$/XMergeSync", BAAAAAAA
- .
- end source code control
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/xmerge/source/activesync/XMergeSync.h b/xmerge/source/activesync/XMergeSync.h
deleted file mode 100644
index b5779c2ed0d0..000000000000
--- a/xmerge/source/activesync/XMergeSync.h
+++ /dev/null
@@ -1,49 +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 .
- */
-// XMergeSyncModule.h: interface for the CXMergeSyncModule class.
-//
-//////////////////////////////////////////////////////////////////////
-
-#if !defined(AFX_XMERGESYNCMODULE_H__0788DA0C_4DCB_4876_9722_F9EAF1EB5462__INCLUDED_)
-#define AFX_XMERGESYNCMODULE_H__0788DA0C_4DCB_4876_9722_F9EAF1EB5462__INCLUDED_
-
-#if _MSC_VER > 1000
-#pragma once
-#endif // _MSC_VER > 1000
-
-
-// Used to keep track of the dll
-
-class CXMergeSyncModule
-{
-protected:
- long m_lLocks;
- long m_lObjs;
-
-public:
- long GetLockCount() const;
- long LockServer(BOOL fLock);
- HINSTANCE m_hInst;
- CXMergeSyncModule();
- virtual ~CXMergeSyncModule();
-};
-
-#endif // !defined(AFX_XMERGESYNCMODULE_H__0788DA0C_4DCB_4876_9722_F9EAF1EB5462__INCLUDED_)
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmerge/source/activesync/XMergeSync.rc b/xmerge/source/activesync/XMergeSync.rc
deleted file mode 100644
index 3e9d24dd9207..000000000000
--- a/xmerge/source/activesync/XMergeSync.rc
+++ /dev/null
@@ -1,66 +0,0 @@
-//Microsoft Developer Studio generated resource script.
-//
-#include "resource.h"
-
-/////////////////////////////////////////////////////////////////////////////
-// English (Ireland) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENI)
-#ifdef _WIN32
-//LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_EIRE
-LANGUAGE 0x9, 0x1
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE DISCARDABLE
-BEGIN
- "resource.h\0"
-END
-
-2 TEXTINCLUDE DISCARDABLE
-BEGIN
- "#include ""afxres.h""\r\n"
- "\0"
-END
-
-3 TEXTINCLUDE DISCARDABLE
-BEGIN
- "\r\n"
- "\0"
-END
-
-#endif // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
-STRINGTABLE DISCARDABLE
-BEGIN
- IDS_NOJAVA "Unable to find JRE 1.4 installation."
- IDS_BADCLASSPATH "Unable to locate necessary Jar files."
-END
-
-#endif // English (Ireland) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif // not APSTUDIO_INVOKED
-
diff --git a/xmerge/source/activesync/exports.map b/xmerge/source/activesync/exports.map
deleted file mode 100644
index e78067c51ff5..000000000000
--- a/xmerge/source/activesync/exports.map
+++ /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 .
-#
-
-UDK_3_0_0 {
- global:
- DllCanUnloadNow;
- DllGetClassObject;
- DllRegisterServer;
- DllUnregisterServer;
-
- local:
- *;
-};
-
diff --git a/xmerge/source/activesync/guids.txt b/xmerge/source/activesync/guids.txt
deleted file mode 100644
index 1bde5587c169..000000000000
--- a/xmerge/source/activesync/guids.txt
+++ /dev/null
@@ -1,60 +0,0 @@
-INTERFACENAME = { /* bdd611c3-7bab-460f-8711-5b9ac9ef6020 - StarWriter Export*/
- 0xbdd611c3,
- 0x7bab,
- 0x460f,
- {0x87, 0x11, 0x5b, 0x9a, 0xc9, 0xef, 0x60, 0x20}
- };
-INTERFACENAME = { /* cb43f086-838d-4fa4-b5f6-3406b9a57439 - Pocket Word Import */
- 0xcb43f086,
- 0x838d,
- 0x4fa4,
- {0xb5, 0xf6, 0x34, 0x06, 0xb9, 0xa5, 0x74, 0x39}
- };
-INTERFACENAME = { /* c6ab3e74-9f4f-4370-8120-a8a6fabb7a7c - StarCalc Export*/
- 0xc6ab3e74,
- 0x9f4f,
- 0x4370,
- {0x81, 0x20, 0xa8, 0xa6, 0xfa, 0xbb, 0x7a, 0x7c}
- };
-INTERFACENAME = { /* 43887c67-4d5d-4127-baac-87a288494c7c - Pocket Excel Import*/
- 0x43887c67,
- 0x4d5d,
- 0x4127,
- {0xba, 0xac, 0x87, 0xa2, 0x88, 0x49, 0x4c, 0x7c}
- };
-INTERFACENAME = { /* 300b7580-50f6-448b-aabb-9b823cab6e88 */
- 0x300b7580,
- 0x50f6,
- 0x448b,
- {0xaa, 0xbb, 0x9b, 0x82, 0x3c, 0xab, 0x6e, 0x88}
- };
-INTERFACENAME = { /* e88b223c-ffb4-456f-b93b-0f59594b228e */
- 0xe88b223c,
- 0xffb4,
- 0x456f,
- {0xb9, 0x3b, 0x0f, 0x59, 0x59, 0x4b, 0x22, 0x8e}
- };
-INTERFACENAME = { /* 8a538ec1-7d68-4ad0-9cf9-6e4d9f8c6ff0 */
- 0x8a538ec1,
- 0x7d68,
- 0x4ad0,
- {0x9c, 0xf9, 0x6e, 0x4d, 0x9f, 0x8c, 0x6f, 0xf0}
- };
-INTERFACENAME = { /* 7b613acf-9d1b-4bb9-b58e-15e0f5e21765 */
- 0x7b613acf,
- 0x9d1b,
- 0x4bb9,
- {0xb5, 0x8e, 0x15, 0xe0, 0xf5, 0xe2, 0x17, 0x65}
- };
-INTERFACENAME = { /* fbf4de58-cfe8-4244-bf73-6162035ae0c6 */
- 0xfbf4de58,
- 0xcfe8,
- 0x4244,
- {0xbf, 0x73, 0x61, 0x62, 0x03, 0x5a, 0xe0, 0xc6}
- };
-INTERFACENAME = { /* 62bf28c1-ce42-4b56-a218-980e8c4ba080 */
- 0x62bf28c1,
- 0xce42,
- 0x4b56,
- {0xa2, 0x18, 0x98, 0x0e, 0x8c, 0x4b, 0xa0, 0x80}
- };
diff --git a/xmerge/source/activesync/makefile.mk b/xmerge/source/activesync/makefile.mk
deleted file mode 100644
index 45714ce3a4fa..000000000000
--- a/xmerge/source/activesync/makefile.mk
+++ /dev/null
@@ -1,62 +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 .
-#
-
-PRJ = ..$/..
-PRJNAME = xmerge
-TARGET = xmergesync
-ENABLE_EXCEPTIONS=TRUE
-LIBTARGET=NO
-.IF "$(POCKETPCSDK_HOME)" != ""
-SOLARINC+=-I$(POCKETPCSDK_HOME)$/support$/ActiveSync$/inc
-.ENDIF # "$(POCKETPCSDK_HOME)" != ""
-
-# --- Settings -----------------------------------------------------
-.INCLUDE: settings.mk
-
-.IF 0
-.IF "$(OS)" == "WNT"
-.IF "$(POCKETPCSDK_HOME)" != ""
-
-RCFILES=XMergeSync.rc
-
-SLOFILES= \
- $(SLO)$/XMergeFactory.obj \
- $(SLO)$/XMergeSync.obj \
- $(SLO)$/XMergeFilter.obj
-LIBNAME=$(TARGET)
-SHL1TARGETDEPN=makefile.mk
-SHL1OBJS=$(SLOFILES) $(RES)$/xmergesync.res
-SHL1TARGET=$(LIBNAME)
-SHL1IMPLIB=i$(LIBNAME)
-SHL1DEF=XMergeSync.def
-USE_DEFFILE=true
-
-SHL1STDLIBS= uuid.lib Advapi32.lib
-
-.ENDIF # "$(POCKETPCSDK_HOME)" != ""
-.ENDIF
-.ENDIF
-
-
-# --- Targets ------------------------------------------------------
-.INCLUDE : target.mk
-
-ALLTAR :
- .IF "$(OS)" == "WNT"
- $(COPY) BIN$/xmergesync.dll $(BIN)
- .ENDIF
diff --git a/xmerge/source/activesync/resource.h b/xmerge/source/activesync/resource.h
deleted file mode 100644
index aceaa7f803cb..000000000000
--- a/xmerge/source/activesync/resource.h
+++ /dev/null
@@ -1,38 +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 .
- */
-
-//{{NO_DEPENDENCIES}}
-// Microsoft Developer Studio generated include file.
-// Used by XMergeSync.rc
-//
-#define IDS_NOJAVA 1
-#define IDS_BADCLASSPATH 2
-
-// Next default values for new objects
-//
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE 101
-#define _APS_NEXT_COMMAND_VALUE 40001
-#define _APS_NEXT_CONTROL_VALUE 1000
-#define _APS_NEXT_SYMED_VALUE 101
-#endif
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmerge/source/activesync/stdafx.cpp b/xmerge/source/activesync/stdafx.cpp
deleted file mode 100644
index af75dd22d522..000000000000
--- a/xmerge/source/activesync/stdafx.cpp
+++ /dev/null
@@ -1,27 +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 .
- */
-
-//
-// stdafx.cpp : source file that includes just the standard includes
-// stdafx.pch will be the pre-compiled header
-// stdafx.obj will contain the pre-compiled type information
-//
-#include "stdafx.h"
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmerge/source/activesync/stdafx.h b/xmerge/source/activesync/stdafx.h
deleted file mode 100644
index fd781710b688..000000000000
--- a/xmerge/source/activesync/stdafx.h
+++ /dev/null
@@ -1,48 +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 .
- */
-
-//
-// stdafx.h : include file for standard system include files,
-// or project specific include files that are used frequently,
-// but are changed infrequently
-//
-#pragma once
-
-#include
-#include
-#include
-#include
-#include
-
-#define INITGUIDS
-#include
-
-#include
-#include
-
-#include "XMergeSync.h"
-
-//
-// This declares the one & only instance of the CXMergeSyncModule class.
-// You can access any public members of this class through the
-// global _Module. (Its definition is in XMergeSync.cpp.)
-//
-extern CXMergeSyncModule _Module;
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmerge/source/aportisdoc/converter.xml b/xmerge/source/aportisdoc/converter.xml
deleted file mode 100644
index 01a2e05ed2b3..000000000000
--- a/xmerge/source/aportisdoc/converter.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-
-
- AportisDoc
-
-
- StarWriter XML to/from AportisDoc conversion
-
- OpenOffice.org
-
- org.openoffice.xmerge.converter.xml.sxw.aportisdoc.PluginFactoryImpl
-
-
-
-
-
diff --git a/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/ConverterCapabilitiesImpl.java b/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/ConverterCapabilitiesImpl.java
deleted file mode 100644
index 169a9dc69ecd..000000000000
--- a/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/ConverterCapabilitiesImpl.java
+++ /dev/null
@@ -1,84 +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 .
- */
-
-package org.openoffice.xmerge.converter.xml.sxw.aportisdoc;
-
-import org.openoffice.xmerge.ConverterCapabilities;
-import org.openoffice.xmerge.converter.xml.OfficeConstants;
-
-/**
- *
AportisDoc implementation of ConverterCapabilities for
- * the {@link
- * org.openoffice.xmerge.converter.xml.sxw.aportisdoc.PluginFactoryImpl
- * PluginFactoryImpl}.
- *
- *
Used with StarWriter XML to/from AportisDoc conversions. The
- * ConverterCapibilies specify which "Office"
- * Document tags and attributes are supported on the
- * "Device" Document format.
- */
-public final class ConverterCapabilitiesImpl
- implements ConverterCapabilities {
-
- public boolean canConvertTag(String tag) {
-
- if (OfficeConstants.TAG_OFFICE_DOCUMENT.equals(tag))
- return true;
- else if (OfficeConstants.TAG_OFFICE_DOCUMENT_CONTENT.equals(tag))
- return true;
- else if (OfficeConstants.TAG_OFFICE_BODY.equals(tag))
- return true;
- else if (OfficeConstants.TAG_PARAGRAPH.equals(tag))
- return true;
- else if (OfficeConstants.TAG_HEADING.equals(tag))
- return true;
- else if (OfficeConstants.TAG_ORDERED_LIST.equals(tag))
- return true;
- else if (OfficeConstants.TAG_UNORDERED_LIST.equals(tag))
- return true;
- else if (OfficeConstants.TAG_LIST_ITEM.equals(tag))
- return true;
- else if (OfficeConstants.TAG_LIST_HEADER.equals(tag))
- return true;
- else if (OfficeConstants.TAG_SPAN.equals(tag))
- return true;
- else if (OfficeConstants.TAG_HYPERLINK.equals(tag))
- return true;
- else if (OfficeConstants.TAG_LINE_BREAK.equals(tag))
- return true;
- else if (OfficeConstants.TAG_SPACE.equals(tag))
- return true;
- else if (OfficeConstants.TAG_TAB_STOP.equals(tag))
- return true;
-
- return false;
- }
-
- public boolean canConvertAttribute(String tag,
- String attribute) {
-
- if (OfficeConstants.TAG_SPACE.equals(tag)) {
-
- if (OfficeConstants.ATTRIBUTE_SPACE_COUNT.equals(attribute))
- return true;
- }
-
- return false;
- }
-}
-
diff --git a/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocConstants.java b/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocConstants.java
deleted file mode 100644
index c5e0c1a99833..000000000000
--- a/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocConstants.java
+++ /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 .
- */
-
-package org.openoffice.xmerge.converter.xml.sxw.aportisdoc;
-
-import org.openoffice.xmerge.converter.palm.PdbUtil;
-
-/**
- * Constants used for encoding and decoding the AportisDoc format.
- *
- */
-interface DocConstants {
-
- /** Creator id. */
- public static final int CREATOR_ID = PdbUtil.intID("REAd");
-
- /** Type id. */
- public static final int TYPE_ID = PdbUtil.intID("TEXt");
-
- /** Constant for uncompressed version. */
- public static final short UNCOMPRESSED = 1;
-
- /** Constant for compressed version. */
- public static final short COMPRESSED = 2;
-
- /** Constant used for spare fields. */
- public static final int SPARE = 0;
-
- /** AportisDoc record size. */
- public static final short TEXT_RECORD_SIZE = 4096;
-
- /** Constant for encoding scheme. */
- public static final String ENCODING = "8859_1";
-
- /** Constant for TAB character. */
- public final static char TAB_CHAR = '\t';
-
- /** Constant for EOL character. */
- public final static char EOL_CHAR = '\n';
-
- /** Constant for SPACE character. */
- public final static char SPACE_CHAR = ' ';
-}
-
diff --git a/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocDecoder.java b/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocDecoder.java
deleted file mode 100644
index f6b203b68af7..000000000000
--- a/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocDecoder.java
+++ /dev/null
@@ -1,290 +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 .
- */
-
-package org.openoffice.xmerge.converter.xml.sxw.aportisdoc;
-
-import java.io.ByteArrayInputStream;
-import java.io.DataInputStream;
-import java.io.IOException;
-
-import org.openoffice.xmerge.converter.palm.Record;
-import org.openoffice.xmerge.util.Resources;
-import org.openoffice.xmerge.util.Debug;
-
-/**
- * This class is used by {@link DocumentDeserializerImpl}
- * to decode the AportisDoc format. It currently decodes
- * the text content into a single String object.
- *
- */
-final class DocDecoder implements DocConstants {
-
- /** For decoding purposes. */
- private final static int COUNT_BITS = 3;
-
- /** Resources object for I18N. */
- private Resources res = null;
-
-
- /**
- * Default constructor creates a header and a text buffer
- * for holding all the text in the AportisDoc database.
- */
- DocDecoder() {
- res = Resources.getInstance();
- }
-
-
- /**
- * Decode the text records into a single String
- * of text content.
- *
- * @param recs Record array holding AportisDoc
- * contents.
- *
- * @throws IOException If any I/O error occurs.
- */
- String parseRecords(Record[] recs) throws IOException {
-
- // read the header record
- HeaderInfo header = readHeader(recs[0].getBytes());
-
- dumpHeader(header);
-
- // store all the characters in textBuffer
- StringBuffer textBuffer = new StringBuffer(header.textLen);
-
- switch (header.version) {
-
- case COMPRESSED:
- for (int i = 1; i <= header.textRecordCount; i++) {
-
- byte[] bytes = decompress(recs[i].getBytes(),
- header.textRecordSize);
- log("processing " + bytes.length + " bytes");
- String str = new String(bytes, ENCODING);
- textBuffer.append(str);
- }
-
- break;
-
- case UNCOMPRESSED:
- for (int i = 1; i <= header.textRecordCount; i++) {
-
- byte[] bytes = recs[i].getBytes();
- log("processing " + bytes.length + " bytes");
- String str = new String(bytes, ENCODING);
- textBuffer.append(str);
- }
-
- break;
-
- default:
- throw new IOException(res.getString("UNKNOWN_DOC_VERSION"));
-
- }
-
- return textBuffer.toString();
- }
-
-
- /**
- *
Decompress the byte array.
- *
- *
The resulting uncompressed byte array should
- * be within textRecordSize length, definitely
- * within twice the size it claims, else treat it as a problem
- * with the encoding of that PDB and throw
- * IOException.
- *
- * @param cBytes Compressed byte array.
- * @param textRecordSize Size of uncompressed
- * byte array.
- *
- * @throws IOException If textRecordSize <
- * cBytes.length.
- */
- private byte[] decompress(byte[] cBytes, int textRecordSize)
- throws IOException {
-
- // create byte array for storing uncompressed bytes
- // it should be within textRecordSize range, definitely
- // within twice of textRecordSize! if not, then
- // an ArrayIndexOutOfBoundsException will get thrown,
- // and it should be converted into an IOException, and
- // treat it as a conversion error.
- byte[] uBytes = new byte[textRecordSize*2];
-
- int up = 0;
- int cp = 0;
-
- try {
-
- while (cp < cBytes.length) {
-
- int c = cBytes[cp++] & 0xff;
-
- // codes 1...8 mean copy that many bytes
- if (c > 0 && c < 9) {
-
- while (c-- > 0)
- uBytes[up++] = cBytes[cp++];
- }
-
- // codes 0, 9...0x7F represent themselves
- else if (c < 0x80) {
- uBytes[up++] = (byte) c;
- }
-
- // codes 0xC0...0xFF represent "space + ascii char"
- else if (c >= 0xC0) {
- uBytes[up++] = (byte) ' ';
- uBytes[up++] = (byte) (c ^ 0x80);
- }
-
- // codes 0x80...0xBf represent sequences
- else {
- c <<= 8;
- c += cBytes[cp++] & 0xff;
- int m = (c & 0x3fff) >> COUNT_BITS;
- int n = c & ((1 << COUNT_BITS) - 1);
- n += COUNT_BITS;
- while (n-- > 0) {
- uBytes[up] = uBytes[up - m];
- up++;
- }
- }
- }
-
- } catch (ArrayIndexOutOfBoundsException e) {
-
- throw new IOException(
- res.getString("DOC_TEXT_RECORD_SIZE_EXCEEDED"));
- }
-
- // note that ubytes may be larger that the amount of
- // uncompressed bytes, so trim it to another byte array
- // with the exact size.
- byte[] textBytes = new byte[up];
- System.arraycopy(uBytes, 0, textBytes, 0, up);
-
- return textBytes;
- }
-
-
- /**
- * Read the header byte array.
- *
- * @param bytes byte array containing header
- * record data.
- *
- * @return HeaderInfo object.
- *
- * @throws IOException If any I/O error occurs.
- */
- private HeaderInfo readHeader(byte[] bytes) throws IOException {
-
- HeaderInfo header = new HeaderInfo();
-
- ByteArrayInputStream bis = new ByteArrayInputStream(bytes);
- DataInputStream dis = new DataInputStream(bis);
-
- // Normally the first 2 bytes comprised of the version
- // which should either be COMPRESSED or UNCOMPRESSED
- // SmartDoc/Quickword would add a 0x01 to the first
- // byte, thus their version would be 0x0101 for UNCOMPRESSED
- // instead of 0x0001 and 0x0102 for UNCOMPRESSED instead of
- // 0x0002.
-
- dis.readByte();
- header.version = dis.readByte();
-
- // read extra 2 unused bytes
- dis.readShort();
-
- // Read the text length, this should be unsigned 4 bytes.
- // We could store the read value into a long, but then
- // our current buffer limit is the max positive of an int.
- // That is a large enough limit, thus we shall stay with
- // storing the value in an int. If it exceeds, then
- // an IOException should be thrown.
- header.textLen = dis.readInt();
- if (header.textLen < 0) {
- throw new IOException(res.getString("DOC_TEXT_LENGTH_EXCEEDED"));
- }
-
- // read the number of records - unsigned 2 bytes
- header.textRecordCount = dis.readShort() & 0x0000ffff;
-
- // read the record size - unsigned 2 bytes
- header.textRecordSize = dis.readShort() & 0x0000ffff;
-
- // read extra 4 unused bytes
- dis.readInt();
-
- return header;
- }
-
-
- /**
- * Prints out header info into log. Used for debugging purposes only.
- *
- * @param header HeaderInfo structure.
- */
- private void dumpHeader(HeaderInfo header) {
-
- log("");
- }
-
-
- /**
- * Sends message to the log object.
- *
- * @param str Debug string message.
- */
- private void log(String str) {
- Debug.log(Debug.TRACE, str);
- }
-
-
- /**
- * Inner class to store AportisDoc header information.
- */
- private class HeaderInfo {
-
- /** length of text section */
- int textLen = 0;
-
- /** number of text records */
- int textRecordCount = 0;
-
- /**
- * size of a text record. This is normally the same as
- * TEXT_RECORD_SIZE, but some applications may modify this.
- */
- int textRecordSize = 0;
-
- /** compression type */
- int version = 0;
- }
-}
-
diff --git a/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocEncoder.java b/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocEncoder.java
deleted file mode 100644
index 70035bfa61f9..000000000000
--- a/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocEncoder.java
+++ /dev/null
@@ -1,201 +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 .
- */
-
-package org.openoffice.xmerge.converter.xml.sxw.aportisdoc;
-
-import java.io.ByteArrayOutputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.util.List;
-import java.util.ArrayList;
-
-import org.openoffice.xmerge.converter.palm.Record;
-
-/**
- * This class is used by {@link DocumentSerializerImpl} to encode the AportisDoc format.
- * It does not deal with any XML tags. It only knows how to encode
- * from String.
- *
- */
-final class DocEncoder implements DocConstants {
-
- /** Text buffer to contain text section. */
- private StringBuffer textBuffer = null;
-
- /** Length of text section. */
- private int textLen = 0;
-
- /** Number of text records. */
- private int textRecCount = 0;
-
-
- /**
- * Default constructor creates a header and
- * a text buffer for holding all the text in
- * the AportisDoc database.
- */
- DocEncoder() {
-
- textBuffer = new StringBuffer(TEXT_RECORD_SIZE);
- }
-
-
- /**
- * This method appends text into the text section of
- * the AportisDoc database.
- *
- * @param text String to append.
- */
- void addText(String text) {
-
- textBuffer.append(text);
- }
-
-
- /**
- * This method appends text into the text section of
- * the AportisDoc database.
- *
- * @param text char array to append.
- */
- void addText(char[] text) {
-
- textBuffer.append(text);
- }
-
-
- /**
- * This method appends text character into the text
- * section of the AportisDoc database.
- *
- * @param text char to append.
- */
- void addText(char text) {
-
- textBuffer.append(text);
- }
-
-
- /**
- * This method encodes the information given to a
- * palm Record array in the AportisDoc
- * database format.
- *
- * @return Record array holding AportisDoc
- * contents.
- *
- * @throws IOException If any I/O error occurs.
- */
- Record[] getRecords() throws IOException {
-
- byte textBytes[] = processTextBuffer();
- textLen = textBytes.length;
- textRecCount = (short) (textBytes.length / TEXT_RECORD_SIZE);
-
- // recBytes to hold a record of bytes at a time
- byte recBytes[] = new byte[TEXT_RECORD_SIZE];
- int pos = 0;
-
- List textRecords = new ArrayList(textRecCount + 1);
-
- // split textBytes into chunks of Record objects
- // and store in textRecords object.
- for (int i = 0; i < textRecCount; i++) {
-
- System.arraycopy(textBytes, pos, recBytes, 0, recBytes.length);
- pos += recBytes.length;
- Record zRec = new Record(recBytes);
- textRecords.add(zRec);
- }
-
- // there's more if ...
-
- if (pos < textLen) {
-
- textRecCount++;
-
- recBytes = new byte[textLen - pos];
- System.arraycopy(textBytes, pos, recBytes, 0, recBytes.length);
- Record rec = new Record(recBytes);
- textRecords.add(rec);
- }
-
- // construct the Record array and copy
- // references from textRecords.
-
- Record[] allRecords = new Record[textRecords.size() + 1];
-
- allRecords[0] = new Record(getHeaderBytes());
-
- for (int i = 1; i < allRecords.length; i++) {
-
- allRecords[i] = textRecords.get(i-1);
- }
-
- return allRecords;
- }
-
-
- /**
- * This method converts the text buffer into a byte
- * array with the proper encoding of the text section of the
- * AportisDoc format.
- *
- * TODO: do compression.
- *
- * @return byte[] Converted byte array of text
- * section.
- *
- * @throws IOException If any I/O error occurs.
- */
- private byte[] processTextBuffer() throws IOException
- {
- String str = textBuffer.toString();
- byte bytes[] = str.getBytes(ENCODING);
-
- return bytes;
- }
-
-
- /**
- * This method produces the byte array for the header.
- *
- * @return byte array containing header record data.
- *
- * @throws IOException If any I/O error occurs.
- */
- private byte[] getHeaderBytes() throws IOException
- {
- ByteArrayOutputStream bos = new ByteArrayOutputStream();
- DataOutputStream dos = new DataOutputStream(bos);
-
- // TODO: for now, we shall use UNCOMPRESSED.
- // later, we need to use COMPRESSED or a setting.
- dos.writeShort(UNCOMPRESSED);
- dos.writeShort(SPARE);
- dos.writeInt(textLen);
- dos.writeShort(textRecCount);
- dos.writeShort(TEXT_RECORD_SIZE);
- dos.writeInt(SPARE);
-
- byte[] bytes = bos.toByteArray();
-
- return bytes;
- }
-}
-
diff --git a/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentDeserializerImpl.java b/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentDeserializerImpl.java
deleted file mode 100644
index 2765aad24682..000000000000
--- a/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentDeserializerImpl.java
+++ /dev/null
@@ -1,298 +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 .
- */
-
-package org.openoffice.xmerge.converter.xml.sxw.aportisdoc;
-
-import java.io.IOException;
-import java.util.Iterator;
-
-import org.openoffice.xmerge.ConvertData;
-import org.openoffice.xmerge.ConvertException;
-import org.openoffice.xmerge.Document;
-import org.openoffice.xmerge.DocumentDeserializer;
-import org.openoffice.xmerge.converter.palm.PalmDB;
-import org.openoffice.xmerge.converter.palm.PalmDocument;
-import org.openoffice.xmerge.converter.palm.Record;
-import org.openoffice.xmerge.converter.xml.OfficeConstants;
-import org.openoffice.xmerge.converter.xml.sxw.SxwDocument;
-import org.openoffice.xmerge.util.Debug;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Text;
-
-/**
- *
AportisDoc implementation of DocumentDeserializer
- * for the {@link
- * org.openoffice.xmerge.converter.xml.sxw.aportisdoc.PluginFactoryImpl
- * PluginFactoryImpl}.
- *
- *
This converts an file in AportisDoc PDB format to StarOffice
- * XML format.
- *
- *
The deserialize method uses a DocDecoder
- * to read the AportisDoc format into a String object, then
- * it calls buildDocument to create a SxwDocument
- * object from it.
- *
- */
-public final class DocumentDeserializerImpl
- implements OfficeConstants, DocConstants, DocumentDeserializer {
-
- /** A ConvertData object assigned to this object. */
- private ConvertData cd = null;
-
-
- /**
- * Constructor that assigns the given ConvertData
- * to this object as input.
- *
- * @param cd A ConvertData object to read data for
- * the conversion process by the deserialize
- * method.
- */
- public DocumentDeserializerImpl(ConvertData cd) {
- this.cd = cd;
- }
-
-
- /**
- * Convert the given ConvertData object
- * into a SxwDocument object.
- *
- * @return Resulting SxwDocument object.
- *
- * @throws ConvertException If any conversion error occurs.
- * @throws IOException If any I/O error occurs.
- */
- public Document deserialize() throws IOException, ConvertException {
-
- Document doc = null;
- Iterator
- */
-public class DocumentMergerImpl implements DocumentMerger {
-
- private ConverterCapabilities cc_;
- private org.openoffice.xmerge.Document orig = null;
-
- public DocumentMergerImpl(org.openoffice.xmerge.Document doc, ConverterCapabilities cc) {
- cc_ = cc;
- this.orig = doc;
- }
-
- public void merge(org.openoffice.xmerge.Document modifiedDoc) throws MergeException {
-
- SxwDocument wdoc1 = (SxwDocument) orig;
- SxwDocument wdoc2 = (SxwDocument) modifiedDoc;
-
- Document doc1 = wdoc1.getContentDOM();
- Document doc2 = wdoc2.getContentDOM();
-
- Iterator i1 = new ParaNodeIterator(cc_, doc1.getDocumentElement());
- Iterator i2 = new ParaNodeIterator(cc_, doc2.getDocumentElement());
-
- DiffAlgorithm diffAlgo = new IteratorLCSAlgorithm();
-
- // find out the paragrah level diffs
- Difference[] diffTable = diffAlgo.computeDiffs(i1, i2);
-
- if (Debug.isFlagSet(Debug.INFO)) {
- Debug.log(Debug.INFO, "Diff Result: ");
-
- for (int i = 0; i < diffTable.length; i++) {
- Debug.log(Debug.INFO, diffTable[i].debug());
- }
- }
-
- // merge the paragraphs
- NodeMergeAlgorithm charMerge = new CharacterBaseParagraphMerge();
- DocumentMerge docMerge = new DocumentMerge(cc_, charMerge);
-
- docMerge.applyDifference(i1, i2, diffTable);
- }
-}
-
-
diff --git a/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentSerializerImpl.java b/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentSerializerImpl.java
deleted file mode 100644
index 45bd15832f8e..000000000000
--- a/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentSerializerImpl.java
+++ /dev/null
@@ -1,521 +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 .
- */
-
-package org.openoffice.xmerge.converter.xml.sxw.aportisdoc;
-
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Node;
-import org.w3c.dom.NamedNodeMap;
-
-import java.io.IOException;
-import java.net.URLDecoder;
-
-import org.openoffice.xmerge.Document;
-import org.openoffice.xmerge.ConvertData;
-import org.openoffice.xmerge.ConvertException;
-import org.openoffice.xmerge.DocumentSerializer;
-import org.openoffice.xmerge.converter.xml.OfficeConstants;
-import org.openoffice.xmerge.converter.xml.sxw.SxwDocument;
-import org.openoffice.xmerge.converter.xml.sxw.aportisdoc.DocConstants;
-import org.openoffice.xmerge.converter.palm.PalmDB;
-import org.openoffice.xmerge.converter.palm.Record;
-import org.openoffice.xmerge.converter.palm.PalmDocument;
-import org.openoffice.xmerge.util.Debug;
-import org.openoffice.xmerge.util.XmlUtil;
-
-/**
- *
AportisDoc implementation of
- * org.openoffice.xmerge.DocumentSerializer
- * for the {@link
- * org.openoffice.xmerge.converter.xml.sxw.aportisdoc.PluginFactoryImpl
- * PluginFactoryImpl}.
- *
- *
The serialize method traverses the DOM
- * document from the given Document object. It uses a
- * DocEncoder object for the actual conversion of
- * contents to the AportisDoc format.
- *
- */
-
-
-public final class DocumentSerializerImpl
- implements OfficeConstants, DocConstants, DocumentSerializer {
-
- /** A DocEncoder object for encoding to AportisDoc. */
- private DocEncoder encoder = null;
-
- /** SXW Document object that this converter processes. */
- private SxwDocument sxwDoc = null;
-
-
- /**
- * Constructor.
- *
- * @param doc A SXW Document to be converted.
- */
- public DocumentSerializerImpl(Document doc) {
- sxwDoc = (SxwDocument) doc;
- }
-
-
- /**
- *
Method to convert a Document into a PDB.
- * It passes back the converted data as a ConvertData
- * object.
- *
- *
This method is not thread safe for performance reasons.
- * This method should not be called from within two threads.
- * It would be best to call this method only once per object
- * instance.
- *
- * @return The ConvertData object containing the output.
- *
- * @throws ConvertException If any conversion error occurs.
- * @throws IOException If any I/O error occurs.
- */
- public ConvertData serialize() throws ConvertException, IOException {
-
-
- // get the server document name
-
- String docName = URLDecoder.decode(sxwDoc.getName(), DocConstants.ENCODING);
-
- // get DOM document
-
- org.w3c.dom.Document domDoc = sxwDoc.getContentDOM();
-
- encoder = new DocEncoder();
-
- // Traverse to the office:body element.
- // There should only be one.
-
- NodeList list = domDoc.getElementsByTagName(TAG_OFFICE_BODY);
- int len = list.getLength();
-
- if (len > 0) {
- Node node = list.item(0);
- traverseBody(node);
- }
-
- // create a ConvertData object.
- //
- Record records[] = encoder.getRecords();
- ConvertData cd = new ConvertData();
-
- PalmDocument palmDoc = new PalmDocument(docName,
- DocConstants.CREATOR_ID, DocConstants.TYPE_ID,
- 0, PalmDB.PDB_HEADER_ATTR_BACKUP, records);
-
- cd.addDocument(palmDoc);
- return cd;
- }
-
-
- /**
- * This method traverses office:body element.
- *
- * @param node office:bodyNode.
- *
- * @throws IOException If any I/O error occurs.
- */
- private void traverseBody(Node node) throws IOException {
-
- log("");
- log("");
-
- if (node.hasChildNodes()) {
-
- NodeList nodeList = node.getChildNodes();
- int len = nodeList.getLength();
-
- for (int i = 0; i < len; i++) {
- Node child = nodeList.item(i);
-
- if (child.getNodeType() == Node.ELEMENT_NODE) {
- String nodeName = child.getNodeName();
-
- if (nodeName.equals(TAG_PARAGRAPH) ||
- nodeName.equals(TAG_HEADING)) {
-
- traverseParagraph(child);
-
- } else if (nodeName.equals(TAG_UNORDERED_LIST)) {
-
- traverseList(child);
-
- } else if (nodeName.equals(TAG_ORDERED_LIST)) {
-
- traverseList(child);
-
- } else {
-
- log("");
- }
- }
- }
- }
-
- log("");
- }
-
-
- /**
- * This method traverses the text:p and text:h
- * element Node objects.
- *
- * @param node A text:p or text:h
- * Node.
- *
- * @throws IOException If any I/O error occurs.
- */
- private void traverseParagraph(Node node) throws IOException {
-
- log("");
- traverseParaContents(node);
- encoder.addText(EOL_CHAR);
- log("");
- }
-
-
- /**
- * This method traverses a paragraph content.
- * It uses the traverseParaElem method to
- * traverse into Element Node objects.
- *
- * @param node A paragraph or content Node.
- *
- * @throws IOException If any I/O error occurs.
- */
- private void traverseParaContents(Node node) throws IOException {
-
- if (node.hasChildNodes()) {
-
- NodeList nodeList = node.getChildNodes();
- int len = nodeList.getLength();
-
- for (int i = 0; i < len; i++) {
-
- Node child = nodeList.item(i);
- short nodeType = child.getNodeType();
-
- switch (nodeType) {
-
- case Node.TEXT_NODE:
- // this is for grabbing text nodes.
- String s = child.getNodeValue();
-
- if (s.length() > 0) {
- encoder.addText(s);
- }
-
- log("");
- log(s);
- log("");
-
- break;
-
- case Node.ELEMENT_NODE:
-
- traverseParaElem(child);
- break;
-
- case Node.ENTITY_REFERENCE_NODE:
-
- log("");
- traverseParaContents(child);
- log("");
- break;
-
- default:
- log("");
- }
- }
- }
- }
-
-
- /**
- * This method traverses an ElementNode
- * within a paragraph.
- *
- * @param node ElementNode within a
- * paragraph.
- *
- * @throws IOException If any I/O error occurs.
- */
- private void traverseParaElem(Node node) throws IOException {
-
- String nodeName = node.getNodeName();
-
- if (nodeName.equals(TAG_SPACE)) {
-
- // this is for text:s tags.
- NamedNodeMap map = node.getAttributes();
- Node attr = map.getNamedItem(ATTRIBUTE_SPACE_COUNT);
- StringBuffer space = new StringBuffer(SPACE_CHAR);
- int count = 1;
-
- if (attr != null) {
-
- try {
-
- String countStr = attr.getNodeValue();
- count = Integer.parseInt(countStr.trim());
-
- } catch (NumberFormatException e) {
-
- // TODO: for now, throw IOException.
- // later, perhaps will have to throw
- // some other conversion exception instead.
- throw new IOException(e.getMessage());
- }
- }
-
- for (int j = 0; j < count; j++) {
-
- space.append(SPACE_CHAR);
- }
-
- encoder.addText(space.toString());
-
- log("");
-
- } else if (nodeName.equals(TAG_TAB_STOP)) {
-
- // this is for text:tab-stop
- encoder.addText(TAB_CHAR);
-
- log("");
-
- } else if (nodeName.equals(TAG_LINE_BREAK)) {
-
- // commented out by Csaba: There is no point to convert a linebreak
- // into a EOL, because it messes up the number of XML nodes and the
- // merge won't work properly. Other solution would be to implement such
- // nodemerger, which would be able to merge embedded tags in a paragraph
-
- // this is for text:line-break
- // encoder.addText(EOL_CHAR);
-
- log("skipped ");
-
- } else if (nodeName.equals(TAG_SPAN)) {
-
- // this is for text:span
- log("");
- traverseParaContents(node);
- log("");
-
- } else if (nodeName.equals(TAG_HYPERLINK)) {
-
- // this is for text:a
- log("");
- traverseParaContents(node);
- log("");
-
- } else if (nodeName.equals(TAG_BOOKMARK) ||
- nodeName.equals(TAG_BOOKMARK_START)) {
-
- log("");
-
- } else if (nodeName.equals(TAG_TEXT_VARIABLE_SET)
- || nodeName.equals(TAG_TEXT_VARIABLE_GET)
- || nodeName.equals(TAG_TEXT_EXPRESSION)
- || nodeName.equals(TAG_TEXT_USER_FIELD_GET)
- || nodeName.equals(TAG_TEXT_PAGE_VARIABLE_GET)
- || nodeName.equals(TAG_TEXT_SEQUENCE)
- || nodeName.equals( TAG_TEXT_VARIABLE_INPUT)
- || nodeName.equals(TAG_TEXT_TIME)
- || nodeName.equals( TAG_TEXT_PAGE_COUNT)
- || nodeName.equals(TAG_TEXT_PAGE_NUMBER )
- || nodeName.equals(TAG_TEXT_SUBJECT)
- || nodeName.equals(TAG_TEXT_TITLE)
- || nodeName.equals(TAG_TEXT_CREATION_TIME)
- || nodeName.equals(TAG_TEXT_DATE)
- || nodeName.equals(TAG_TEXT_TEXT_INPUT)
- || nodeName.equals(TAG_TEXT_AUTHOR_INITIALS)) {
- log("");
- traverseParaContents(node);
- log("");
-
- }else if (nodeName.startsWith(TAG_TEXT)) {
- log("");
- traverseParaContents(node);
- log("");
-
- }else {
-
- log("");
- }
- }
-
-
- /**
- * This method traverses list tags text:unordered-list and
- * text:ordered-list. A list can only contain one optional
- * text:list-header and one or more text:list-item
- * elements.
- *
- * @param node A list Node.
- *
- * @throws IOException If any I/O error occurs.
- */
- private void traverseList(Node node) throws IOException {
-
- log("");
-
- if (node.hasChildNodes()) {
-
- NodeList nodeList = node.getChildNodes();
- int len = nodeList.getLength();
-
- for (int i = 0; i < len; i++) {
-
- Node child = nodeList.item(i);
-
- if (child.getNodeType() == Node.ELEMENT_NODE) {
-
- String nodeName = child.getNodeName();
-
- if (nodeName.equals(TAG_LIST_ITEM)) {
-
- traverseListItem(child);
-
- } else if (nodeName.equals(TAG_LIST_HEADER)) {
-
- traverseListHeader(child);
-
- } else {
-
- log("");
- }
- }
- }
- }
-
- log("");
- }
-
-
- /**
- * This method traverses a text:list-header element.
- * It contains one or more text:p elements.
- *
- * @param node A list header Node.
- *
- * @throws IOException If any I/O error occurs.
- */
- private void traverseListHeader(Node node) throws IOException {
-
- log("");
-
- if (node.hasChildNodes()) {
-
- NodeList nodeList = node.getChildNodes();
- int len = nodeList.getLength();
-
- for (int i = 0; i < len; i++) {
-
- Node child = nodeList.item(i);
-
- if (child.getNodeType() == Node.ELEMENT_NODE) {
-
- String nodeName = child.getNodeName();
-
- if (nodeName.equals(TAG_PARAGRAPH)) {
-
- traverseParagraph(child);
-
- } else {
-
- log("");
- }
- }
- }
- }
-
- log("");
- }
-
-
- /**
- *
This method will traverse a text:list-item.
- * A list item may contain one or more of text:p,
- * text:h, text:section, text:ordered-list
- * and text:unordered-list.
- *
- *
This method currently only implements grabbing text:p,
- * text:h, text:unordered-list and
- * text:ordered-list.
- *
- * @param node The Node.
- *
- * @throws IOException If any I/O error occurs.
- */
- private void traverseListItem(Node node) throws IOException {
-
- log("");
-
- if (node.hasChildNodes()) {
-
- NodeList nodeList = node.getChildNodes();
- int len = nodeList.getLength();
-
- for (int i = 0; i < len; i++) {
-
- Node child = nodeList.item(i);
-
- if (child.getNodeType() == Node.ELEMENT_NODE) {
-
- String nodeName = child.getNodeName();
-
- if (nodeName.equals(TAG_PARAGRAPH)) {
-
- traverseParagraph(child);
-
- } else if (nodeName.equals(TAG_UNORDERED_LIST)) {
-
- traverseList(child);
-
- } else if (nodeName.equals(TAG_ORDERED_LIST)) {
-
- traverseList(child);
-
- } else {
-
- log("");
- }
- }
- }
- }
-
- log("");
- }
-
-
- /**
- * Logs debug messages.
- *
- * @param str The debug message.
- */
- private void log(String str) {
-
- Debug.log(Debug.TRACE, str);
- }
-}
-
diff --git a/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/PluginFactoryImpl.java b/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/PluginFactoryImpl.java
deleted file mode 100644
index 19bc67ba2983..000000000000
--- a/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/PluginFactoryImpl.java
+++ /dev/null
@@ -1,131 +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 .
- */
-
-package org.openoffice.xmerge.converter.xml.sxw.aportisdoc;
-
-import org.openoffice.xmerge.Document;
-import org.openoffice.xmerge.ConvertData;
-import org.openoffice.xmerge.DocumentMerger;
-import org.openoffice.xmerge.DocumentMergerFactory;
-import org.openoffice.xmerge.DocumentSerializer;
-import org.openoffice.xmerge.DocumentSerializerFactory;
-import org.openoffice.xmerge.DocumentDeserializer;
-import org.openoffice.xmerge.DocumentDeserializerFactory;
-import org.openoffice.xmerge.ConverterCapabilities;
-import org.openoffice.xmerge.converter.xml.sxw.SxwPluginFactory;
-import org.openoffice.xmerge.converter.palm.PalmDocument;
-import org.openoffice.xmerge.util.registry.ConverterInfo;
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- *
AportisDoc implementation of the PluginFactory.
- * This encapsulates conversion of StarWriter XML format to and from
- * AportisDoc format.
- *
- *
The superclass produces a particular
- * {@link org.openoffice.xmerge.Document Document}
- * object, i.e. {@link
- * org.openoffice.xmerge.converter.xml.sxw.SxwDocument
- * SxwDocument} that the converters in this class works with. Thus,
- * this class only implements the methods that produces the converters,
- * i.e. {@link
- * org.openoffice.xmerge.DocumentSerializer
- * DocumentSerializer} and {@link
- * org.openoffice.xmerge.DocumentDeserializer
- * DocumentDeserializer};
- * as well as the {@link
- * org.openoffice.xmerge.ConverterCapabilities
- * ConverterCapabilities} object that is specific to this format
- * conversion. That superclass also produces a {@link
- * org.openoffice.xmerge.DocumentMerger DocumentMerger}
- * object, i.e. {@link
- * org.openoffice.xmerge.converter.xml.sxw.aportisdoc.DocumentMergerImpl
- * DocumentMergerImpl} which this class derives the functionality.
- *
- */
-public final class PluginFactoryImpl extends SxwPluginFactory
- implements DocumentDeserializerFactory, DocumentSerializerFactory,
- DocumentMergerFactory {
-
- public PluginFactoryImpl (ConverterInfo ci) {
- super(ci);
- }
-
- /** ConverterCapabilities object for this type of conversion. */
- private final static ConverterCapabilities converterCap =
- new ConverterCapabilitiesImpl();
-
-
- /**
- * Returns an instance of DocumentSerializerImpl,
- * which is an implementation of the DocumentSerializer
- * interface.
- *
- * @param doc Document object to be
- * converted/serialized.
- *
- * @return A DocumentSerializerImpl object.
- */
- public DocumentSerializer createDocumentSerializer(Document doc) {
-
- return new DocumentSerializerImpl(doc);
- }
-
-
- /**
- * Returns an instance of DocumentDeserializerImpl,
- * which is an implementation of the DocumentDeserializer
- * interface.
- *
- * @param cd ConvertData object for reading data
- * which will be converted back to a
- * Document object.
- *
- * @return A DocumentDeserializerImpl object.
- */
- public DocumentDeserializer createDocumentDeserializer(ConvertData cd) {
-
- return new DocumentDeserializerImpl(cd);
- }
-
-
- /**
- * Returns an instance of DocumentMergerImpl,
- * which is an implementation of the DocumentMerger
- * interface.
- *
- * @param doc Document to merge.
- *
- * @return A DocumentMergerImpl object.
- */
- public DocumentMerger createDocumentMerger(Document doc) {
-
- ConverterCapabilities cc = converterCap;
- DocumentMergerImpl merger = new DocumentMergerImpl(doc, cc);
- return merger;
- }
-
- public Document createDeviceDocument(String name, InputStream is)
- throws IOException {
-
- PalmDocument palmDoc = new PalmDocument(is);
- return palmDoc;
- }
-}
-
diff --git a/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/package.html b/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/package.html
deleted file mode 100644
index 124b4666e842..000000000000
--- a/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/package.html
+++ /dev/null
@@ -1,228 +0,0 @@
-
-
-
-
-org.openoffice.xmerge.converter.xml.sxw.aportisdoc package
-
-
-
-
-
Provides the tools for doing the conversion of StarWriter XML to
-and from AportisDoc format.
-
-
It follows the org.openoffice.xmerge framework for the conversion process.
-
-
Since it converts to/from a Palm application format, these converters
-follow the
-PalmDB stream format for writing out to the Palm sync client or
-reading in from the Palm sync client.
-
-
Note that PluginFactoryImpl also provides a
-DocumentMerger object, i.e. {@link org.openoffice.xmerge.converter.xml.sxw.aportisdoc.DocumentMergerImpl DocumentMergerImpl}.
-This functionality was derived from its superclass
-{@link org.openoffice.xmerge.converter.xml.sxw.SxwPluginFactory
-SxwPluginFactory}.
-
-
AportisDoc pdb format - Doc
-
-
The AportisDoc pdb format is widely used by different Palm applications,
-e.g. QuickWord, AportisDoc Reader, MiniWrite, etc. Note that some
-of these applications put tweaks into the format. The converters will only
-support the default AportisDoc format, plus some very minor tweaks to accommodate
-other applications.
-
-
The text content of the format is plain text, i.e. there are no styles
-or structures. There is no notion of lists, list items, paragraphs,
-headings, etc. The format does have support for bookmarks.
-
-
For most Doc applications, the default character encoding supported is
-the extended ASCII character set, i.e. ISO-8859-1. StarWriter XML is in
-UTF-8 encoding scheme. Since UTF-8 encoding scheme covers more characters,
-converting UTF-8 strings into extended ASCII would mean that there can be
-possible loss of character mappings.
-
-
Using JAXP, XML files can be parsed and read in as Java Strings
-which is in Unicode format, there is no loss of character mapping from UTF-8
-to Java Strings. There is possible loss of character mapping in
-converting Java Strings to ASCII bytes. Java characters that
-cannot be represented in extended ASCII are converted into the ASCII
-character '?' or x3F in hex digit via the String.getBytes(encoding)
-API.
-
-
SXW to DOC Conversion
-
-
The DocumentSerializerImpl class implements the
-org.openoffice.xmerge.DocumentSerializer.
-This class specifically provides the conversion process from a given
-SxwDocument object to DOC formatted records, which are
-then passed back to the client via the ConvertData object.
-
-
The following XML tags are handled. [Note that some may not be implemented yet.]
-
-
-
Paragraphs <text:p> and Headings <text:h>
-
-
Heading elements are classified the same as paragraph
- elements since both have the same possible elements inside.
- Their main difference is that they refer to different types
- of style information, which is outside of their element tags.
- Since there are no styles on the DOC format, headings should
- be treated the same way a paragraph is converted.
-
-
For paragraph elements, convert and transfer text nodes
- that are essential. Text nodes directly contained within paragraph
- nodes are such. There are also a number of elements that
- a paragraph element may contain. These are explained in their
- own context.
-
-
At the end of the paragraph, an EOL character is added by
- the converter to provide a separation for each paragraph,
- since the Doc format does not have a notion of a paragraph.
-
-
-
White spaces <text:s> and Tabs <text:tab-stop>
-
-
In SXW, normally 2 or more white-space characters are collapsed into
- a single space character. In order to make sure that the document
- content really contains those white-space characters, there are special
- elements assigned to them.
-
-
The space element specifies the number of spaces are in it.
- Thus, converting it just means providing the specific number of spaces
- that the element requires.
-
-
There is also the tab-stop element. This is a bit tricky. In a
- StarWriter document, tab-stops are specified by a column position.
- A tab is not an exact number of space, but rather a specific column
- positioning. Say, regular tab-stops are set at every 5th column.
- At column 4, if I hit a tab, it goes to column 5. At column 1, hitting
- a tab would put the cursor at column 5 as well. SmartDoc and AporticDoc
- applications goes by columns for the ASCII tab character. The only problem
- is that in StarWriter, one could specify a different tab-stop, but not
- in most of these Doc applications, at least I have not seen one.
- Solution for this is just to go with the converting to the ASCII tab
- character and not do anything for different tab-stop positioning.
-
-
-
Line breaks <text:line-break>
-
-
To represent line breaks, it is simpliest to just put an ASCII LF
- character. Note that the side effect of this is that an end of paragraph
- also contains an ASCII LF character. Thus, for the DOC to SXW conversion,
- line breaks are not distinguishable from specifying the end of a
- paragraph.
-
-
-
Text spans <text:span>
-
-
Text spans contain text that have different style attributes
- from the paragraphs'. Text spans can be embedded within another
- text span. Since it is purely for style tagging, we only needed
- to convert and transfer the text elements within these.
In SXW, bookmark elements are embedded inside paragraph elements.
- Bookmarks can either mark a text position or a text range. <text:bookmark>
- marks a position while the pair <text:bookmark-start> and
- <text:bookmark-end>
marks a text range. The DOC format only
- supports bookmarking a text position. Thus, for the conversion,
- <text:bookmark> and <text:bookmark-start> will both mark
- a text position.
-
Change tracking elements are not supported yet on the current
- OpenOffice XML filters, will have to watch out on this. The text
- within these elements have to be interpreted properly during the
- conversion process.
-
-
-
Lists <text:unordered-list> and
- <text:ordered-lists>
-
-
A list can only contain one optional <text:list-header>
- and one or more <text:list-item> elements.
-
-
A <text:list-header> contains one or more paragraph
- elements. Since there are no styles, the conversion process does not
- do anything special for list headers, conversion for the paragraphs
- within list headers are the same as explained above.
-
-
A <text:list-item> may contain one or more of paragraphs,
- headings, list, etc. Since the Doc format does not support any list
- structure, there will not be any special handling for this element.
- Conversion for elements within it shall be applied according to the
- element type. Thus, lists with paragraphs within it will result in just
- plain paragraphs. Sublists will not be identifiable. Paragraphs in
- sublists will still appear.
-
-
-
<text:section>
-
-
I am not sure what this is yet, will need to investigate more on this.
-
-
-
There may be other tags that will still need to be addressed for this conversion.
-
-
Refer to {@link org.openoffice.xmerge.converter.xml.sxw.aportisdoc.DocumentSerializerImpl DocumentSerializerImpl}
-for details of implementation. It uses DocEncoder class to do the encoding
-part.
-
-
DOC to SXW Conversion
-
-
The DocumentDeserializerImpl class implements the
-org.openoffice.xmerge.DocumentDeserializer. It is
-passed the device document in the form of a ConvertData object.
-It will then create a SxwDocument object from the conversion of
-the DOC formatted records.
-
-
The text content of the Doc format will be transferred as text. Paragraph
-elements will be formed based on the existence of an ASCII LF character. There
-will be at least one paragraph element.
-
-
Bookmarks in the Doc format will be converted to the bookmark element
-<text:bookmark> [Not implemented yet].
-
-
-
Merging changes
-
-
As mentioned above, the DocumentMerger object produced by
-PluginFactoryImpl is DocumentMergerImpl.
-Refer to the javadocs for that package/class on its merging specifications.
-
-
-
TODO list
-
-
-
Investigate Palm's with different character encodings.
Provides the tools for doing the conversion of StarWriter XML to
-and from supported formats, through the use of an XSLT
-transformation.
-
It follows the {@link org.openoffice.xmerge}
-framework for the conversion process.
-
This converter does not currently support merge.
-
XSLT
-Transformation
-
The converter makes use
-of one or more XSLT style sheets, which are used in the
-DocumentSerializer and DocumentDeserializer, to perform the actual
-translations. The location of these stylesheets is extracted from the {@link org.openoffice.xmerge.util.registry.ConverterInfo ConverterInfo} data structure, and are specified using the optional converter-xslt-serialize and converter-xsltdeserialize tags in a plugins converter.xml file. Please refer to the SDK document for more information about how to implement a Plugin Configuration XML File for a specific plugin.
-A sample OpenOffice to Html stylesheet and Html to
-Openffice stylesheet, has been provided as a sample implementation.
-The converter also makes use of an XsltPlugin.properties file, which may be edited by the user to provide MIME-TYPE to file extension mappings. This file is used by the {@link org.openoffice.xmerge.converter.xml.xslt.PluginFactoryImpl getDeviceFileExtension} method.
-
-
-
TODO list
-
-
-
Expand XSLT style sheets to support more office/html
- capabilities
-
Add support for certain character codes, such as  
- which currently causes the transformer to break.
-
Change the DocumentDeserializer transformer, so that the DOMResult is serialized using the xalan serializer and create an SxwDocument from the result
-
-
- <td class="
-
- ">
-
-
- </td>
-
-
-
-
-
-
-
-
- <p class="
-
- Table-Heading
-
-
-
-
- ">
-
- </p>
-
-
-
-
-
diff --git a/xmerge/source/minicalc/build.xml b/xmerge/source/minicalc/build.xml
deleted file mode 100644
index 52ec0deb2595..000000000000
--- a/xmerge/source/minicalc/build.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/xmerge/source/minicalc/converter.xml b/xmerge/source/minicalc/converter.xml
deleted file mode 100644
index 1d9d404f51db..000000000000
--- a/xmerge/source/minicalc/converter.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-
-
- Minicalc 6.4
-
-
- StarCalc XML to/from Minicalc 6.4 conversion
-
- OpenOffice.org
-
- org.openoffice.xmerge.converter.xml.sxc.minicalc.PluginFactoryImpl
-
-
-
-
-
diff --git a/xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/ConverterCapabilitiesImpl.java b/xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/ConverterCapabilitiesImpl.java
deleted file mode 100644
index cb9d224e11ee..000000000000
--- a/xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/ConverterCapabilitiesImpl.java
+++ /dev/null
@@ -1,104 +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 .
- */
-
-package org.openoffice.xmerge.converter.xml.sxc.minicalc;
-
-import org.openoffice.xmerge.ConverterCapabilities;
-import org.openoffice.xmerge.converter.xml.OfficeConstants;
-
-
-/**
- *
MiniCalc implementation of ConverterCapabilities for
- * the {@link
- * org.openoffice.xmerge.converter.xml.sxc.minicalc.PluginFactoryImpl
- * PluginFactoryImpl}.
- *
- *
Used with StarCalc SXC to/from MiniCalc conversions. The
- * ConverterCapibilies specify which "Office"
- * Document tags and attributes are supported on the
- * "Device" Document format.
- */
-public final class ConverterCapabilitiesImpl
- implements ConverterCapabilities {
-
- public boolean canConvertTag(String tag) {
-
- if (OfficeConstants.TAG_OFFICE_BODY.equals(tag))
- return true;
- else if (OfficeConstants.TAG_PARAGRAPH.equals(tag))
- return true;
- else if (OfficeConstants.TAG_TABLE.equals(tag))
- return true;
- else if (OfficeConstants.TAG_TABLE_ROW.equals(tag))
- return true;
- else if (OfficeConstants.TAG_TABLE_COLUMN.equals(tag))
- return false;
- // TODO - we currently do not handle the table column tag
- else if (OfficeConstants.TAG_TABLE_SCENARIO.equals(tag))
- return false;
- // TODO - we currently do not handle the table scenario tag
- else if (OfficeConstants.TAG_TABLE_CELL.equals(tag))
- return true;
-
- return false;
- }
-
- public boolean canConvertAttribute(String tag,
- String attribute) {
-
- if (OfficeConstants.TAG_TABLE.equals(tag)) {
-
- if (OfficeConstants.ATTRIBUTE_TABLE_NAME.equals(attribute))
- return true;
-
- } else if (OfficeConstants.TAG_TABLE_CELL.equals(tag)) {
-
- if (OfficeConstants.ATTRIBUTE_TABLE_VALUE_TYPE.equals(attribute))
- return true;
- else if (OfficeConstants.ATTRIBUTE_TABLE_FORMULA.
- equals(attribute))
- return true;
- else if (OfficeConstants.ATTRIBUTE_TABLE_VALUE.equals(attribute))
- return true;
- else if (OfficeConstants.ATTRIBUTE_TABLE_BOOLEAN_VALUE.
- equals(attribute))
- return true;
- else if (OfficeConstants.ATTRIBUTE_TABLE_CURRENCY.
- equals(attribute))
- return true;
- else if (OfficeConstants.ATTRIBUTE_TABLE_TIME_VALUE.
- equals(attribute))
- return true;
- else if (OfficeConstants.ATTRIBUTE_TABLE_DATE_VALUE.
- equals(attribute))
- return true;
- else if (OfficeConstants.ATTRIBUTE_TABLE_NUM_COLUMNS_REPEATED.
- equals(attribute))
- return true;
-
- } else if (OfficeConstants.TAG_TABLE_ROW.equals(tag)) {
-
- if (OfficeConstants.ATTRIBUTE_TABLE_NUM_ROWS_REPEATED.
- equals(attribute))
- return true;
- }
-
- return false;
- }
-}
-
diff --git a/xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/MinicalcConstants.java b/xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/MinicalcConstants.java
deleted file mode 100644
index 4c5e7df21a77..000000000000
--- a/xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/MinicalcConstants.java
+++ /dev/null
@@ -1,34 +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 .
- */
-
-package org.openoffice.xmerge.converter.xml.sxc.minicalc;
-
-import org.openoffice.xmerge.converter.palm.PdbUtil;
-
-/**
- * Constants used for encoding and decoding the MiniCalc format.
- */
-interface MinicalcConstants {
-
- /** Creator ID. */
- public static final int CREATOR_ID = PdbUtil.intID("PiMC");
-
- /** Type ID. */
- public static final int TYPE_ID = PdbUtil.intID("Data");
-}
-
diff --git a/xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/MinicalcDataString.java b/xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/MinicalcDataString.java
deleted file mode 100644
index aac23c7f4daf..000000000000
--- a/xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/MinicalcDataString.java
+++ /dev/null
@@ -1,535 +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 .
- */
-
-package org.openoffice.xmerge.converter.xml.sxc.minicalc;
-
-/**
- * This class is used by MinicalcDecoder to manipulate a
- * String containing MiniCalc cell data.
- *
- */
-public class MinicalcDataString {
-
- /** The String representation of the MiniCalc data. */
- private String data = null;
-
-
- /**
- * Constructor stores the MiniCalc data String.
- *
- * @param data A String containing MiniCalc
- * cell data.
- */
- public MinicalcDataString(String data) {
- this.data = data;
- }
-
-
- /**
- * Checks if the MiniCalc data String is a formula.
- *
- * @return true if the MiniCalc data String is a
- * formula, false if the MiniCalc data String
- * is not a formula.
- */
- public boolean isFormula() {
-
- if (data.startsWith("=")) {
- return true;
- }
-
- return false;
- }
-
-
- /**
- * Checks if the MiniCalc data String is a percentage.
- *
- * @return true if the MiniCalc data String is a
- * percentage, false if the MiniCalc data
- * String is not a percentage.
- */
- public boolean isPercent() {
-
- if (data.endsWith("%")) {
- return true;
- }
-
- return false;
- }
-
-
- /**
- * Checks if the MiniCalc data String is a
- * boolean value.
- *
- * @return true if the MiniCalc data String is
- * a boolean, false if the MiniCalc data
- * String is not a boolean.
- */
- public boolean isBoolean() {
-
- if (data.equalsIgnoreCase("false") ||
- data.equalsIgnoreCase("true")) {
- return true;
- }
-
- return false;
- }
-
-
- /**
- * Checks if the MiniCalc data String is a date.
- *
- * @return true if the MiniCalc data String is
- * a date, false if the MiniCalc data String
- * is not a date.
- */
- public boolean isDate() {
-
- // Starting index into the date string - month
- int start = 0;
-
- // Search for "/", which separates month from day
- int end = data.indexOf("/");
-
- // Separator was found
- if (end > 0) {
-
- String monthString = data.substring(start, end);
-
- try {
- Float f = Float.valueOf(monthString);
- if ((f.intValue() < 0) || (f.intValue() > 12)) {
- return false;
- }
- }
- catch (NumberFormatException e) {
-
- // no, it is not a currency type
- return false;
- }
-
- // start is now the starting index of day
- start = end+1;
-
- // Search for "/", which separates day from year
- end = data.indexOf("/", start);
-
- // Separator was found
- if (end > 0) {
-
- String dayString = data.substring(start, end);
-
- try {
- Float f = Float.valueOf(dayString);
- if ((f.intValue() < 0) || (f.intValue() > 31))
- return false;
- }
- catch (NumberFormatException e) {
- // no, it is not a currency type
- return false;
- }
- } else {
- return false;
- }
-
- // start is now at the starting index of the year
- start = end + 1;
-
- String yearString = data.substring(start);
- try {
- Float f = Float.valueOf(yearString);
- if (f.intValue() < 0) {
- return false;
- }
- }
- catch (NumberFormatException e) {
- // no, it is not a currency type
- return false;
- }
-
- } else {
- return false;
- }
-
- return true;
- }
-
-
- /**
- * Checks if the MiniCalc data String is a time.
- *
- * @return true if the MiniCalc data String
- * is a time, false if the MiniCalc data
- * String is not a time.
- */
- public boolean isTime() {
-
- // Starting index into the time string - hour
- int start = 0;
-
- // Search for ":", which separates hour from minute
- int end = data.indexOf(":");
-
-
- // Separator was found
- if (end > 0) {
-
- String hourString = data.substring(start, end);
- try {
- Float f = Float.valueOf(hourString);
- if ((f.intValue() < 0) || (f.intValue() > 24))
- return false;
- }
- catch (NumberFormatException e) {
- // no, it is not a time type
- return false;
- }
-
- // start is now the starting index of minute
- start = end+1;
-
- // Search for ":", which separates minute from second
- end = data.indexOf(":", start);
-
- // Separator was found
- if (end > 0) {
-
- String minuteString = data.substring(start, end);
-
- try {
- Float f = Float.valueOf(minuteString);
- if ((f.intValue() < 0) || (f.intValue() > 60))
- return false;
- }
- catch (NumberFormatException e) {
- // no, it is not a time type
- return false;
- }
-
- // start is now at the starting index of the seconds
- start = end+1;
-
- // The seconds are in the string
- if (data.length() > start) {
-
- String secondString = data.substring(start);
-
-
- try {
- Float f = Float.valueOf(secondString);
- if ((f.intValue() < 0) || (f.intValue() > 60))
- return false;
- }
- catch (NumberFormatException e) {
- // no, it is not a time type
- return false;
- }
- }
-
- }
-
- return true;
-
- }
-
- return false;
- }
-
-
- /**
- * Checks if the MiniCalc data String is a currency
- * value.
- *
- * @return true if the MiniCalc data String is
- * a currency, false if the MiniCalc data
- * String is not a currency.
- */
- public boolean isCurrency() {
-
- boolean result = false;
-
- // TODO - we currently only check for US currencies
-
- if (data.endsWith("$")) {
- String number = data.substring(0, data.length()-1);
- try {
- Float f = Float.valueOf(number);
- result = true;
- }
- catch (NumberFormatException e) {
- // no, it is not a currency type
- result = false;
- }
- }
-
- else if (data.startsWith("$")) {
- String number = data.substring(1, data.length());
- try {
- Float f = Float.valueOf(number);
- result = true;
- }
- catch (NumberFormatException e) {
- // no, it is not a currency type
- result = false;
- }
- }
-
- return result;
-
- }
-
-
- /**
- * This method removes the percent sign from the MiniCalc data
- * String. If the percent sign is not the last
- * character of the MiniCalc data String, the
- * MiniCalc data String is returned.
- *
- * @return The MiniCalc data String minus the
- * percent sign. If the MiniCalc data String
- * does not begin with a percent sign, the MiniCalc data
- * String is returned.
- */
- public String percentRemoveSign() {
-
- String number = data;
-
- if (data.endsWith("%")) {
- // "%" is the last character, so remove
- number = data.substring(0, data.length()-1);
-
- try {
- Float f = Float.valueOf(number);
- float f1 = f.floatValue()/100f;
- Float f2 = new Float(f1);
- number = f2.toString();
- }
- catch (NumberFormatException e) {
- // no, it is not a float type
- }
- }
-
- return number;
- }
-
-
- /**
- * This method removes the currency sign from the MiniCalc data
- * String. If the currency sign is not the first or
- * last character of the MiniCalc data String, the
- * MiniCalc data String is returned.
- *
- * @return The MiniCalc data String minus the currency
- * sign. If the MiniCalc data String does not
- * begin or end with a currency sign, the MiniCalc
- * data String is returned.
- */
- public String currencyRemoveSign() {
-
- String number = data;
-
- // TODO - only works with US currencies
-
- if (data.endsWith("$")) {
-
- number = data.substring(0, data.length()-1);
-
- } else if (data.startsWith("$")) {
-
- number = data.substring(1, data.length());
- }
-
- return number;
-
- }
-
-
- /**
- *
This method converts a MiniCalc date from MiniCalc
- * format to StarOffice XML format.
- *
- *
MiniCalc format:
- *
- *
- * MM/DD/YY or MM/DD/YYYY
- *
- *
- *
StarOffice XML format:
- *
- *
- * YYYY-MM-DD
- *
- *
- * @return The MiniCalc date converted to StarOffice XML
- * format.
- */
- public String convertToStarDate() {
-
- // The output date string
- String out;
-
- String monthString = "01";
- String dayString = "01";
- String yearString = "1900";
-
- // Starting index into the date string - month
- int start = 0;
-
- // Search for "/", which separates month from day
- int end = data.indexOf("/");
-
- // Separator was found
- if (end > 0) {
-
- monthString = data.substring(start, end);
-
- Integer monthInt = new Integer(monthString);
-
- // Make sure month is 2 digits
- if (monthInt.intValue() < 10) {
- monthString = "0" + monthString;
- }
-
- // start is now the starting index of day
- start = end+1;
-
- // Search for "/", which separates day from year
- end = data.indexOf("/", start);
-
- // Separator was found
- if (end > 0) {
-
- dayString = data.substring(start, end);
-
- Integer dayInt = new Integer(dayString);
-
- // Make sure day is 2 digits
- if (dayInt.intValue() < 10) {
- dayString = "0" + dayString;
- }
-
- // start is now at the starting index of the year
- start = end + 1;
-
- // The year is in the string
- if (data.length() > start) {
-
- yearString = data.substring(start);
-
- Integer yearInt = new Integer(yearString);
- int year = yearInt.intValue();
-
- if (year < 31) {
-
- // MiniCalc years between 0 and 30 correspond to
- // 2000 - 2030
- year += 2000;
-
- } else if (year < 100) {
-
- // MiniCalc years between 31 and 99 correspond
- // to 1931 - 1999
- year += 1900;
- }
-
- yearString = Integer.toString(year);
- }
- }
- }
-
- // Set out to StarOffice XML date format
- out = yearString + "-" + monthString + "-" + dayString;
-
- return out;
- }
-
-
- /**
- * This method converts the MiniCalc time from MiniCalc
- * format to StarOffice XML format.
- *
- *
MiniCalc format:
- *
- *
- * hh:mm:ss
- *
- *
- *
StarOffice XML format:
- *
- *
- * PThhHmmMssS
- *
- *
- * @return The MiniCalc time converted to StarOffice XML
- * format.
- */
- public String convertToStarTime() {
-
- // The output time string
- String out;
-
- String hourString = "00";
- String minuteString = "00";
- String secondString = "00";
-
- // Starting index into the time string - hour
- int start = 0;
-
- // Search for ":", which separates hour from minute
- int end = data.indexOf(":");
-
- // Separator was found
- if (end > 0) {
-
- hourString = data.substring(start, end);
-
- // start is now the starting index of minute
- start = end+1;
-
- // Search for ":", which separates minute from second
- end = data.indexOf(":", start);
-
- // Separator was found
- if (end > 0) {
-
- minuteString = data.substring(start, end);
-
- // start is now at the starting index of the seconds
- start = end+1;
-
- // The seconds are in the string
- if (data.length() > start) {
-
- secondString = data.substring(start);
- }
-
- }
- }
-
- // TODO - PT is for pacific time, where can we get the
- // localized value from?
-
- // Set to StarOffice XML time format
- out = "PT"+hourString+"H"+minuteString+"M"+secondString+"S";
-
- return out;
- }
-}
-
diff --git a/xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/MinicalcDecoder.java b/xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/MinicalcDecoder.java
deleted file mode 100644
index feeac91042d0..000000000000
--- a/xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/MinicalcDecoder.java
+++ /dev/null
@@ -1,728 +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 .
- */
-
-package org.openoffice.xmerge.converter.xml.sxc.minicalc;
-
-import jmc.Workbook;
-import jmc.Worksheet;
-import jmc.CellAttributes;
-import jmc.CellDescriptor;
-import jmc.JMCconstants;
-import jmc.JMCException;
-
-import java.io.ByteArrayOutputStream;
-import java.io.ByteArrayInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Enumeration;
-
-import org.openoffice.xmerge.ConvertData;
-import org.openoffice.xmerge.converter.xml.OfficeConstants;
-import org.openoffice.xmerge.converter.palm.PalmDB;
-import org.openoffice.xmerge.converter.palm.Record;
-import org.openoffice.xmerge.converter.palm.PalmDocument;
-import org.openoffice.xmerge.util.Debug;
-import org.openoffice.xmerge.converter.xml.sxc.SxcDocumentDeserializer;
-import org.openoffice.xmerge.converter.xml.sxc.SpreadsheetDecoder;
-import org.openoffice.xmerge.converter.xml.sxc.Format;
-
-/**
- * This class is used by {@link
- * org.openoffice.xmerge.converter.xml.sxc.SxcDocumentDeserializerImpl}
- * SxcDocumentDeserializerImpl} to decode the MiniCalc format.
- *
- */
-final class MinicalcDecoder extends SpreadsheetDecoder {
-
- /** MiniCalc WorkBook to store sheets. */
- private Workbook wb;
-
- /** MiniCalc sheet - only one sheet can be open at a time. */
- private Worksheet ws;
-
- /** The current cell - only one cell can be active at a time. */
- private CellDescriptor cell = null;
-
- /** Format object describing the current cell. */
- private Format fmt = null;
-
- /** The password for the WorkBook. */
- private String password = null;
-
- /** The number of rows in the current WorkSheet. */
- private int maxRows = 0;
-
- /** The number of columns in the current WorkSheet. */
- private int maxCols = 0;
-
- /** The names of the worksheets. */
- private String[] worksheetNames = null;
-
- /**
- * Constructor creates a MiniCalc WorkBook.
- *
- * @param name The name of the WorkBook.
- * @param password The password for the workBook.
- *
- * @throws IOException If any I/O error occurs.
- */
- MinicalcDecoder(String name, String[] worksheetNames, String password) throws IOException {
-
- super(name, password);
-
- fmt = new Format();
-
- this.password = password;
- this.worksheetNames = worksheetNames;
-
- try {
-
- wb = new Workbook(name, password);
-
- }
- catch (JMCException e) {
-
- Debug.log(Debug.ERROR, "MinicalcDecoder.constructor:" + e.getMessage());
-
- throw new IOException(e.getMessage());
- }
- }
-
-
- /**
- * This method takes a ConvertData as input and
- * converts it into a MiniCalc WorkSheet. The WorkSheet is then
- * added to the WorkBook.
- *
- * @param InputStream An ConvertData containing a
- * MiniCalc WorkSheet.
- *
- * @throws IOException If any I/O error occurs.
- */
- public void addDeviceContent(ConvertData cd) throws IOException {
-
- try {
- PalmDocument palmDoc;
- int j = 0;
-
- Enumeration e = cd.getDocumentEnumeration();
- while(e.hasMoreElements()) {
-
- palmDoc = (PalmDocument) e.nextElement();
- // Convert PDB to WorkBook/WorkSheet format
- PalmDB pdb = palmDoc.getPdb();
-
- // This will be done at least once
- String sheetName = worksheetNames[j];
-
- // Get number of records in the pdb
- int numRecords = pdb.getRecordCount();
-
- // sheetName does not contain the WorkBook name, but we need the
- // full name.
- String fullSheetName = new String(wb.getWorkbookName() + "-" + sheetName);
-
- // Create a new (empty) WorkSheet
- ws = new Worksheet();
-
- // Initialize the WorkSheet
- ws.initWorksheet(fullSheetName, numRecords);
-
- // Loop over the number of records in the PDB
- for (int i = 0; i < numRecords; i++) {
-
- // Read record i from the PDB
- Record rec = pdb.getRecord(i);
-
- byte cBytes[] = rec.getBytes();
-
- // Create an InputStream
- ByteArrayInputStream bis = new ByteArrayInputStream(cBytes);
-
- // Get the size of the stream
- int bisSize = cBytes.length;
-
- // Add each record to the WorkSheet
- ws.readNextRecord(bis, bisSize);
- }
-
-
- // Add the WorkSheet to the WorkBook
- wb.addWorksheet(ws);
- j++;
- }
- }
- catch (JMCException e) {
-
- Debug.log(Debug.ERROR, "MinicalcDecoder.addPDB:" + e.getMessage());
-
- throw new IOException(e.getMessage());
- }
- }
-
-
- /**
- * This method returns the number of spreadsheets
- * stored in the WorkBook.
- *
- * @return The number of sheets in the WorkBook.
- */
- public int getNumberOfSheets() {
-
- return wb.getNumberOfSheets();
- }
-
-
- /**
- * This method gets the requested WorkSheet from the
- * WorkBook and sets it as the selected WorkSheet. All
- * other "get" methods will now get data from this WorkSheet.
- *
- * @param sheetIndex The index number of the sheet to open.
- *
- * @throws IOException If any I/O error occurs.
- */
- public void setWorksheet(int sheetIndex) throws IOException {
-
- try {
-
- ws = wb.getWorksheet(sheetIndex);
-
- // Initialize access to the WorkSheet so that we can calculate
- // the number of rows and columns
- ws.initAccess(password);
-
- maxRows = 0;
- maxCols = 0;
-
- while (goToNextCell()) {
- maxRows = Math.max(maxRows, cell.getRowNumber());
- maxCols = Math.max(maxCols, cell.getColNumber());
- }
-
- // Re-initialize access to the WorkSheet
- ws.initAccess(password);
-
- }
- catch (JMCException e) {
-
- Debug.log(Debug.ERROR, "MinicalcDecoder.setWorksheet:" + e.getMessage());
-
- throw new IOException(e.getMessage());
- }
- }
-
-
- /**
- * This method returns the name of the current spreadsheet.
- *
- * @return The name of the current WorkSheet.
- */
- public String getSheetName() {
-
- String sheetName = ws.getName();
-
- return sheetName;
- }
-
-
- /**
- * This method gets the next cell from the WorkSheet
- * and sets it as the selected cell. All other "get"
- * methods will now get data from this cell.
- *
- * @return True if we were able to go to another cell
- * in the sheet, false if there were no cells
- * left.
- *
- * @throws IOException If any I/O error occurs.
- */
- public boolean goToNextCell() throws IOException {
-
- boolean gotCell = false;
-
- try {
- cell = ws.getNextCell();
-
- if (cell != null) {
- gotCell = true;
- }
-
- // As we read each cell, get its formatting info
- readCellFormat();
- }
- catch (JMCException e) {
-
- Debug.log(Debug.ERROR, "MinicalcDecoder.goToNextCell:" + e.getMessage());
-
- throw new IOException(e.getMessage());
- }
-
- return gotCell;
- }
-
-
- /**
- * This method returns the row number of the current cell.
- *
- * @return The row number of the current cell. Returns
- * -1 if no cell is currently selected.
- */
- public int getRowNumber() {
-
- int row = -1;
-
- if (cell != null) {
-
- row = cell.getRowNumber();
- }
-
- return row;
- }
-
- /**
- * This method returns the number of rows in the current sheet.
- *
- * @return The number of rows in the current sheet.
- */
- public int getNumberOfRows() {
-
- return maxRows;
- }
-
- /**
- * This method returns the number of columns in the current sheet.
- *
- * @return The number of columns in the current sheet.
- */
- public int getNumberOfColumns() {
- return maxCols;
- }
-
-
- /**
- * This method returns the col number of the current cell.
- *
- * @return The col number of the current cell. Returns
- * -1 if no cell is currently selected.
- */
- public int getColNumber() {
-
- int col = -1;
-
- if (cell != null) {
-
- col = cell.getColNumber();
- }
-
- return col;
- }
-
-
- /**
- * This method returns the contents of the current cell.
- *
- * @return The contents of the current cell. Returns
- * null if no cell is currently selected.
- */
- public String getCellContents() {
-
- String contents = null;
-
- if (cell != null) {
- contents = cell.getCellContents();
-
- // Active cell, but no content
- if (contents == null)
- return new String("");
-
- // Does the cell contain a formula?
- if (contents.startsWith("=")) {
- contents = parseFormula(contents);
- }
- // Make sure that any MiniCalc peculiarities are stripped off
- if (fmt.getCategory().equalsIgnoreCase(OfficeConstants.CELLTYPE_CURRENCY)) {
- contents = currencyRemoveSign(contents);
- }
- else if (fmt.getCategory().equalsIgnoreCase(OfficeConstants.CELLTYPE_PERCENT)) {
- contents = percentRemoveSign(contents);
- }
- else if (fmt.getCategory().equalsIgnoreCase(OfficeConstants.CELLTYPE_DATE)) {
- contents = convertToStarDate(contents);
- }
- else if (fmt.getCategory().equalsIgnoreCase(OfficeConstants.CELLTYPE_TIME)) {
- contents = convertToStarTime(contents);
- }
- }
-
- return contents;
- }
-
- /**
- * This method is meant to return the value of the formula cell. However
- * in minicalc this value is not used so hence the stubbed function
- *
- * @return the value fo the formula cell
- */
- public String getCellValue() {
- return null;
- }
-
- /**
- *
This method takes a formula and parses it into
- * StarOffice XML formula format.
- *
- *
Many spreadsheets use ',' as a separator.
- * StarOffice XML format uses ';' as a separator instead.
- *
- *
Many spreadsheets use '!' as a separator when refencing
- * a cell in a different sheet.
- *
- *
- * Example: =sheet1!A1
- *
- *
- *
StarOffice XML format uses '.' as a separator instead.
- *
- *
- * Example: =sheet1.A1
- *
- *
- * @param formula A formula string.
- *
- * @return A StarOffice XML format formula string.
- */
- protected String parseFormula(String formula) {
-
- formula = formula.replace(',', ';');
- formula = formula.replace('!', '.');
-
- return formula;
- }
-
- /**
- *
This method returns the type of the data in the current cell.
- *
- *
Possible Data Types:
- *
- *
- * Percent - MiniCalc can store as a number or as a string.
- *
- * When stored as a string, the % sign is stored in the
- * string . The MiniCalc format is "string".
- * Example 10.1% is stored as the string "10.1%"
- *
- * When stored as a number, the decimal representation
- * is stored. The MiniCalc format is "percentage".
- * Example: 10.1% is stored as "0.101"
- *
- * Currency - MiniCalc stores currency as a number with the format
- * set to "currency".
- * A user can also enter a value with a dollar sign
- * (example $18.56) into MiniCalc and not set the format
- * as currency. We treat this type of data as a
- * currency data type.
- *
- * Boolean - MiniCalc stores in a string as "true" or "false"
- *
- *
- * Date - MiniCalc stores a date in a string as either
- * MM/DD/YY or MM/DD/YYYY. Any variation from the above
- * format will not be considered a date.
- *
- * Time - MiniCalc stores a time in a string as hh:mm:ss. Any
- * variation from this format will not be considered a time.
- *
- * Float - MiniCalc stores as a number and it is not percent
- * or currency.
- *
- * String - MiniCalc stores as a string (surprise). Doesn't parse
- * to any of the other data types.
- *
- * @return The type of the data in the current cell.
- *
- */
- public String getCellDataType() {
-
- boolean isNumber = false;
-
- // Get format value set on the cell in MiniCalc
- String format = getCellFormatType();
-
- // Initialize the data type to the format
- String type = format;
-
- String contents = getCellContents();
-
- if (contents != null) {
-
- MinicalcDataString data = new MinicalcDataString(contents);
-
- // Check if it is a formula
- if (data.isFormula()) {
- Debug.log(Debug.INFO, " " + contents + " Is a Function Format = "
- + format + "\n");
- return type;
- }
-
- try {
- // Check to see if it is a number
- Double d = Double.valueOf(contents);
- isNumber = true;
- Debug.log(Debug.INFO, " " + contents + " Is a Number Format = " + format);
-
- } catch (NumberFormatException e) {
- Debug.log(Debug.INFO, " " + contents + " Not a Number Format= " + format);
- // no, it is not a number
- isNumber = false;
- }
-
-
- if (isNumber) {
-
- // Numbers are Float, Currency, and Percent
- if (format.equals(OfficeConstants.CELLTYPE_CURRENCY)) {
-
- type = OfficeConstants.CELLTYPE_CURRENCY;
-
- } else if (format.equals(OfficeConstants.CELLTYPE_PERCENT)) {
-
- type = OfficeConstants.CELLTYPE_PERCENT;
-
- } else {
-
- type = OfficeConstants.CELLTYPE_FLOAT;
- }
-
- } else if (data.isBoolean()) {
-
- // Data is a Boolean type
- type = OfficeConstants.CELLTYPE_BOOLEAN;
-
- } else if (data.isDate()) {
-
- // Data is a Date type
- type = OfficeConstants.CELLTYPE_DATE;
-
- } else if (data.isTime()) {
-
- // Data is a Time type
- type = OfficeConstants.CELLTYPE_TIME;
-
- } else if (data.isPercent()) {
-
- // Data is percent
- type = OfficeConstants.CELLTYPE_PERCENT;
-
- } else if (data.isCurrency()) {
-
- // Data is a Currency type
- type = OfficeConstants.CELLTYPE_CURRENCY;
-
- } else {
-
- // Data can't be float, since it isn't a number
-
- // We've already tried parsing it as all other data
- // types, the only remaining option is a string
- type = OfficeConstants.CELLTYPE_STRING;
- }
- }
-
- Debug.log(Debug.INFO, " TYPE = " + type + "\n");
-
- return type;
- }
-
-
- /**
- * This method returns the format of the data in the current cell.
- *
- * @return The format of the data in the current cell.
- */
- String getCellFormatType() {
-
- // Set type to default data type
- String type = OfficeConstants.CELLTYPE_FLOAT;
-
- if (cell != null) {
-
- // Get the attributes for the current cell
- CellAttributes att = cell.getCellAttributes();
-
- if (att != null) {
-
- // Extract the format info from the attributes
- long format = att.getFormat();
-
- // The cell type is stored in bits 5-8
- long cellType = format & 0x000000F0L;
-
- // The number of decimal places is stored in bits 1-4
- long decimals = format & 0x0000000FL;
-
- if (cellType == JMCconstants.FF_FORMAT_GENERIC) {
-
- // MiniCalc stores both Strings and Booleans
- // in the generic type. We must check the contents
- // to differentiate between the two.
-
- // Get cell's contents
- String contents = getCellContents();
-
- if (contents.equalsIgnoreCase("false") ||
- contents.equalsIgnoreCase("true")) {
-
- type = OfficeConstants.CELLTYPE_BOOLEAN;
-
-
- } else {
-
- type = OfficeConstants.CELLTYPE_STRING;
-
- }
-
- } else if (cellType == JMCconstants.FF_FORMAT_DECIMAL) {
-
- type = OfficeConstants.CELLTYPE_FLOAT;
-
- } else if (cellType == JMCconstants.FF_FORMAT_TIME) {
-
- type = OfficeConstants.CELLTYPE_TIME;
-
- } else if (cellType == JMCconstants.FF_FORMAT_DATE) {
-
- type = OfficeConstants.CELLTYPE_DATE;
-
- } else if (cellType == JMCconstants.FF_FORMAT_CURRENCY) {
-
- type = OfficeConstants.CELLTYPE_CURRENCY;
-
- } else if (cellType == JMCconstants.FF_FORMAT_PERCENT) {
-
- type = OfficeConstants.CELLTYPE_PERCENT;
- }
-
- }
- }
-
- return type;
- }
-
-
- /**
- * This method takes a String that contains a
- * currency value and removes the $ from the String.
- * If the dollar sign is not the first or last character of the
- * input String, the input String is
- * simply returned.
- *
- * @param contents The input String from which to
- * remove the dollar sign.
- *
- * @return The input String minus the dollar sign.
- * If the input String did not begin or end
- * with a dollar sign, contents is returned.
- */
- private String currencyRemoveSign(String contents) {
- MinicalcDataString mcString = new MinicalcDataString(contents);
- String currencyString = mcString.currencyRemoveSign();
- return currencyString;
- }
-
-
- /**
- * This method takes a String that contains a percent
- * value and removes the % from the String. If the
- * percent sign is not the last character of the input
- * String, the input String is simply
- * returned.
- *
- * @param contents The input String from which to remove the
- * percent sign.
- *
- * @return The input String minus the percent sign.
- * If the input String did not begin with
- * a percent sign, contents is returned.
- */
- private String percentRemoveSign(String contents) {
- MinicalcDataString mcString = new MinicalcDataString(contents);
- String percentString = mcString.percentRemoveSign();
- return percentString;
- }
-
-
- /**
- * This method returns takes a String that contains
- * a time value and converts it from MiniCalc format to StarOffice
- * XML time format.
- *
- * @param contents The input String containing a
- * MiniCalc time.
- *
- * @return The input String converted to StarOffice
- * XML time format.
- */
- private String convertToStarTime(String contents) {
- MinicalcDataString mcString = new MinicalcDataString(contents);
- String timeString = mcString.convertToStarTime();
- return timeString;
- }
-
- /**
- * This method returns takes a String that contains
- * a date value and converts it from MiniCalc format to StarOffice
- * XML date format.
- *
- * @param contents The input String containing a
- * MiniCalc date.
- *
- * @return The input String converted to StarOffice
- * XML date format.
- */
- private String convertToStarDate(String contents) {
- MinicalcDataString mcString = new MinicalcDataString(contents);
- String dateString = mcString.convertToStarDate();
- return dateString;
- }
-
-
- /**
- * Return the Format object describing the active cell formatting.
- *
- * @return The Format object describing the active cell formatting.
- */
- public Format getCellFormat() {
- return new Format(fmt);
- }
-
-
- /**
- * Create the format data for the new cell.
- */
- private void readCellFormat() {
- // Make sure there are no remnants from the last time
- fmt.clearFormatting();
-
- fmt.setCategory(getCellFormatType());
-
- // TODO - Get any more formatting data here
- }
-}
-
diff --git a/xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/MinicalcEncoder.java b/xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/MinicalcEncoder.java
deleted file mode 100644
index 532d598ebbf7..000000000000
--- a/xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/MinicalcEncoder.java
+++ /dev/null
@@ -1,572 +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 .
- */
-
-package org.openoffice.xmerge.converter.xml.sxc.minicalc;
-
-import jmc.Workbook;
-import jmc.Worksheet;
-import jmc.CellAttributes;
-import jmc.CellDescriptor;
-import jmc.JMCconstants;
-import jmc.JMCException;
-
-import java.awt.Color;
-
-import java.io.ByteArrayOutputStream;
-import java.io.ByteArrayInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-import org.openoffice.xmerge.converter.palm.Record;
-import org.openoffice.xmerge.util.Debug;
-import org.openoffice.xmerge.util.IntArrayList;
-
-import org.openoffice.xmerge.converter.xml.sxc.SpreadsheetEncoder;
-import org.openoffice.xmerge.converter.xml.sxc.Format;
-import org.openoffice.xmerge.converter.xml.OfficeConstants;
-
-/**
- * This class is used by {@link
- * org.openoffice.xmerge.converter.xml.sxc.SxcDocumentSerializerImpl
- * SxcDocumentSerializerImpl} to encode the MiniCalc format.
- *
- */
-final class MinicalcEncoder extends SpreadsheetEncoder {
-
- /** MiniCalc WorkBook to store sheets. */
- private Workbook wb;
-
- /** MiniCalc sheet - only one sheet can be open at a time. */
- private Worksheet ws;
-
- /**
- * Estimate of the number of Palm pixels per character. Used for
- * estimating the width of a cell on a Palm device.
- */
- private final static int pixelsPerChar = 6;
-
- /**
- * The minimum width (in pixels) that we allow a column to be set to
- * on a Palm device.
- */
- private final static int minWidth = 10;
-
- /**
- * The maximum width (in pixels) that we allow a column to be set to
- * on a Palm device.
- */
- private final static int maxWidth = 80;
-
-
- /**
- * Constructor creates a MiniCalc WorkBook.
- *
- * @param log Log object for logging.
- * @param name The name of the WorkBook.
- * @param password The password for the WorkBook.
- *
- * @throws IOException If any I/O error occurs.
- */
- MinicalcEncoder(String name, String password) throws IOException {
-
- super(name, password);
-
- try {
- wb = new Workbook(name, password);
- }
- catch (JMCException e) {
- Debug.log(Debug.ERROR, "new Workbook threw exception:" + e.getMessage());
- throw new IOException(e.getMessage());
- }
- }
-
-
- /**
- * This method creates a WorkSheet belonging to the
- * WorkBook.
- *
- * @param sheetName The name of the WorkSheet.
- *
- * @throws IOException If any I/O error occurs.
- */
- public void createWorksheet(String sheetName) throws IOException {
-
- try {
- ws = wb.createWorksheet(sheetName);
- }
- catch (JMCException e) {
- Debug.log(Debug.ERROR, "wb.createWorksheet threw exception:" + e.getMessage());
- throw new IOException(e.getMessage());
- }
- }
-
-
- /**
- * This method gets the number of sheets in the WorkBook.
- *
- * @return The number of sheets in the WorkBook.
- */
- public int getNumberOfSheets() {
-
- int numSheets = wb.getNumberOfSheets();
- return numSheets;
- }
-
-
- /**
- * This method encodes the MiniCalc WorkBook information
- * into an palm Record array in MiniCalc
- * database format.
- *
- * @return Array of Record holding MiniCalc
- * contents.
- *
- * @throws IOException If any I/O error occurs.
- */
- public Record[] getRecords(int sheetID) throws IOException {
-
- // Get the WorkSheet for the input sheetID
- ws = wb.getWorksheet(sheetID);
-
- // Need to call ws.initWrite() before we start querying the WorkSheet
- try {
- ws.initWrite();
- }
- catch (JMCException e) {
- Debug.log(Debug.ERROR, "ws.initWrite in getRecords:" + e.getMessage());
- throw new IOException(e.getMessage());
- }
-
- // Get the number of records in the WorkSheet
- int numRecords = ws.getNumberOfRecords();
-
- // Create the Record array
- Record[] allRecords = new Record[numRecords];
-
-
- // Get each record from the WorkSheet and store in allRecords[]
- try {
- for (int i = 0; i < allRecords.length; i++) {
-
- ByteArrayOutputStream bos = new ByteArrayOutputStream();
-
- int length = ws.writeNextRecord(bos);
-
- byte cBytes[] = bos.toByteArray();
-
- allRecords[i] = new Record(cBytes);
- }
- }
- catch (Exception e) {
- Debug.log(Debug.ERROR, "ws.writeNextRecord in getRecords:" + e.getMessage());
- throw new IOException(e.getMessage());
- }
-
- return allRecords;
- }
-
-
- /**
- * A cell reference in a StarOffice formula looks like
- * [.C2] (for cell C2). MiniCalc is expecting cell references
- * to look like C2. This method strips out the braces and
- * the period.
- *
- * @param formula A StarOffice formula String.
- *
- * @return A MiniCalc formula String.
- */
- protected String parseFormula(String formula) {
-
- StringBuffer inFormula = new StringBuffer(formula);
- StringBuffer outFormula = new StringBuffer();
-
- boolean inBrace = false;
- boolean firstCharAfterBrace = false;
- boolean firstCharAfterColon = false;
-
- int len = inFormula.length();
-
- for (int in = 0; in < len; in++) {
- switch (inFormula.charAt(in)) {
- case '[':
- // We are now inside a StarOffice cell reference.
- // We also need to strip out the '['
- inBrace = true;
-
- // If the next character is a '.', we want to strip it out
- firstCharAfterBrace = true;
- break;
-
- case ']':
- // We are exiting a StarOffice cell reference
- // We are stripping out the ']'
- inBrace = false;
- break;
-
- case ':':
- // We have a cell range reference.
- // May need to strip out the leading '.'
- if (inBrace)
- firstCharAfterColon = true;
- outFormula.append(inFormula.charAt(in));
- break;
-
- case '.':
- if (inBrace == true) {
- if (firstCharAfterBrace == false &&
- firstCharAfterColon == false) {
- // Not the first character after the open brace.
- // We have hit a separator between a sheet reference
- // and a cell reference. MiniCalc uses a ! as
- // this type of separator.
- outFormula.append('!');
- }
- else {
- firstCharAfterBrace = false;
- firstCharAfterColon = false;
- // Since we are in a StarOffice cell reference,
- // and we are the first character, we need to
- // strip out the '.'
- }
- break;
- } else {
- // We hit valid data, lets add it to the formula string
- outFormula.append(inFormula.charAt(in));
- break;
- }
-
- case ';':
- // StarOffice XML format uses ';' as a separator. MiniCalc (and
- // many spreadsheets) use ',' as a separator instead.
- outFormula.append(',');
- break;
-
- default:
- // We hit valid data, lets add it to the formula string
- outFormula.append(inFormula.charAt(in));
-
- // Need to make sure that firstCharAfterBrace is not true.
- firstCharAfterBrace = false;
- break;
- }
- }
-
- return outFormula.toString();
- }
-
- /**
- * Add a cell to the current WorkSheet.
- *
- * @param row The row number of the cell.
- * @param column The column number of the cell.
- * @param fmt The Format object describing
- * the appearance of this cell.
- * @param cellContents The text or formula of the cell's contents.
- *
- * @throws IOException If any I/O error occurs.
- */
- public void addCell(int row, int column, Format fmt, String cellContents) throws IOException {
-
- CellAttributes ca = new CellAttributes(getFormat(fmt),
- fmt.getForeground(),
- fmt.getBackground());
- if (cellContents.startsWith("=")) {
- cellContents = parseFormula(cellContents);
- Debug.log(Debug.INFO, "YAHOO Found Formula" + cellContents);
- }
-
- CellDescriptor cellDes = new CellDescriptor(row, column, ca, cellContents);
-
- try {
- ws.putCell(cellDes);
- }
- catch (JMCException jmce) {
- Debug.log(Debug.ERROR, "ws.putCell threw exception: " + jmce.getMessage());
- throw new IOException(jmce.getMessage());
- }
- }
-
-
- /**
- * Set the width of the columns in the WorkBook.
- *
- * @param columnWidths An IntArrayList of column
- * widths.
- */
- public void setColumnWidths(IntArrayList columnWidths) throws IOException {
- // Get the number of columns
- int numColumns = columnWidths.size();
-
- // Return if there are no columns in the listr
- if (numColumns == 0) {
- return;
- }
-
- // Need to set the FORM_FLAGS_NONDEFAULT flag for the column widths
- // to be used in MiniCalc
- long format = JMCconstants.FORM_FLAGS_NONDEFAULT;
-
- CellAttributes ca = new CellAttributes(format);
-
- try {
- for (int i = 0; i < numColumns; i++) {
- // Get the column width in Palm pixels
- int width = columnWidths.get(i) * pixelsPerChar;
-
- // Check limits on column width
- if (width < minWidth) {
- width = minWidth;
- } else if (width > maxWidth) {
- width = maxWidth;
- }
-
- // Add the column descriptor to the WorkSheet
- ws.putColumn(i + 1, width, ca);
- }
- }
- catch (JMCException jmce) {
- Debug.log(Debug.ERROR, "ws.putColumn threw exception: " + jmce.getMessage());
- throw new IOException(jmce.getMessage());
- }
- }
-
-
- /**
- * This method sets the format of a cell to string.
- *
- * @param format The cell format-may already contain display info,
- * such as alignment or font type.
- *
- * @return The updated format of the cell.
- */
- private long setFormatString(long format) {
-
- format = clearCellFormatType(format);
-
- // Set format to generic, since MiniCalc does not have a string type.
- format = format | JMCconstants.FF_FORMAT_GENERIC;
-
- return format;
- }
-
-
- /**
- * This method sets the format of a cell to floating point.
- *
- * @param format The cell format. May already contain
- * display info, such as alignment or
- * font type.
- * @param decimalPlaces The number of decimal places to
- * set in the floating point number.
- *
- * @return The updated format of the cell.
- */
- private long setFormatFloat(long format, int decimalPlaces) {
-
- format = clearCellFormatType(format);
-
- // Set format to floating point with correct number of decimal places
- format = format | JMCconstants.FF_FORMAT_DECIMAL | decimalPlaces;
-
- return format;
- }
-
-
- /**
- * This method sets the format of a cell to time.
- *
- * @param format The cell format-may already contain display info,
- * such as alignment or font type.
- *
- * @return The updated format of the cell.
- */
- private long setFormatTime(long format) {
-
- format = clearCellFormatType(format);
-
- // Set format to time.
- format = format | JMCconstants.FF_FORMAT_TIME;
-
- return format;
- }
-
-
- /**
- * This method sets the format of a cell to date.
- *
- * @param format The cell format-may already contain display info,
- * such as alignment or font type.
- *
- * @return The updated format of the cell.
- */
- private long setFormatDate(long format) {
-
- format = clearCellFormatType(format);
-
- // Set format to date.
- format = format | JMCconstants.FF_FORMAT_DATE;
-
- return format;
- }
-
-
- /**
- * This method sets the format of a cell to currency.
- *
- * @param format The cell format-may already contain
- * display info, such as alignment or
- * font type.
- * @param decimalPlaces The number of decimal places to set.
- *
- * @return The updated format of the cell.
- */
- private long setFormatCurrency(long format, int decimalPlaces) {
-
- format = clearCellFormatType(format);
-
- // Set format to Currency with correct number of decimal places
- format = format | JMCconstants.FF_FORMAT_CURRENCY | decimalPlaces;
-
- return format;
- }
-
-
- /**
- * This method sets the format of a cell to boolean.
- *
- * @param format The cell format-may already contain display info,
- * such as alignment or font type.
- *
- * @return The updated format of the cell.
- */
- private long setFormatBoolean(long format) {
-
- format = clearCellFormatType(format);
-
- // Set format to generic, since MiniCalc does not have a Boolean type.
- format = format | JMCconstants.FF_FORMAT_GENERIC;
-
- return format;
- }
-
-
- /**
- * This method sets the format of a cell to percent.
- *
- * @param format The cell format-may already contain
- * display info, such as alignment or
- * font type.
- * @param decimalPlaces The number of decimal places to set.
- *
- * @return The updated format of the cell.
- */
- private long setFormatPercent(long format, int decimalPlaces) {
-
- format = clearCellFormatType(format);
-
- // Set format to Percent with correct number of decimal places
- format = format | JMCconstants.FF_FORMAT_PERCENT | decimalPlaces;
-
- return format;
- }
-
-
- /**
- * This method clears out the format bits associated with
- * the type of data (float, time, etc...) in
- * a cell.
- *
- * @param format The original format for the cell.
- *
- * @return The updated cell format with the bits associated
- * with the type of data (float, time, etc...)
- * zeroed out.
- */
- private long clearCellFormatType(long format) {
-
- // First 4 bits are for the number of decimal places
- // bits 5-8 are for the data format (float, time, etc...)
-
- // Clear out first 8 bits
- format = format & 0xFFFFFFFFFFFFFF00L;
-
- return format;
- }
-
-
- /**
- * Set a cell's formatting options via a separately create
- * Format object.
- *
- * @param row The row number of the cell to be changed.
- * @param column The column number of the cell to be changed.
- * @param fmt Object containing formatting settings for
- * this cell.
- */
- public void setCellFormat(int row, int column, Format fmt) {
- }
-
-
- /**
- * Get the names of the sheets in the WorkBook.
- *
- * @param sheet The required sheet.
- */
- public String getSheetName(int sheet) {
- return wb.getWorksheet(sheet).getName();
- }
-
-
- /*
- * This method returns a MiniCalc style format from the
- * Format object.
- */
- private long getFormat(Format fmt)
- {
- String category = fmt.getCategory();
-
- if (category.equalsIgnoreCase(OfficeConstants.CELLTYPE_BOOLEAN)) {
- return setFormatBoolean(0);
- }
- else if (category.equalsIgnoreCase(OfficeConstants.CELLTYPE_CURRENCY)) {
- return setFormatCurrency(0, fmt.getDecimalPlaces());
- }
- else if (category.equalsIgnoreCase(OfficeConstants.CELLTYPE_DATE)) {
- return setFormatDate(0);
- }
- else if (category.equalsIgnoreCase(OfficeConstants.CELLTYPE_FLOAT)) {
- return setFormatFloat(0, fmt.getDecimalPlaces());
- }
- else if (category.equalsIgnoreCase(OfficeConstants.CELLTYPE_PERCENT)) {
- return setFormatPercent(0, fmt.getDecimalPlaces());
- }
- else if (category.equalsIgnoreCase(OfficeConstants.CELLTYPE_STRING)) {
- return setFormatString(0);
- }
- else if (category.equalsIgnoreCase(OfficeConstants.CELLTYPE_TIME)) {
- return setFormatTime(0);
- }
- else {
- // Should never get here, but just in case
- System.out.println("XXXXX Formatting information not found");
- return 0;
- }
- }
-}
-
diff --git a/xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/PluginFactoryImpl.java b/xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/PluginFactoryImpl.java
deleted file mode 100644
index 26ef06dd3f92..000000000000
--- a/xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/PluginFactoryImpl.java
+++ /dev/null
@@ -1,120 +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 .
- */
-
-package org.openoffice.xmerge.converter.xml.sxc.minicalc;
-
-import org.openoffice.xmerge.ConvertData;
-import org.openoffice.xmerge.Document;
-import org.openoffice.xmerge.DocumentSerializer;
-import org.openoffice.xmerge.DocumentSerializerFactory;
-import org.openoffice.xmerge.DocumentDeserializer;
-import org.openoffice.xmerge.DocumentDeserializerFactory;
-import org.openoffice.xmerge.DocumentMerger;
-import org.openoffice.xmerge.ConverterCapabilities;
-import org.openoffice.xmerge.converter.xml.sxc.DocumentMergerImpl;
-import org.openoffice.xmerge.converter.xml.sxc.SxcPluginFactory;
-import org.openoffice.xmerge.converter.palm.PalmDocument;
-import org.openoffice.xmerge.util.registry.ConverterInfo;
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- *
MiniCalc implementation of the PluginFactory.
- * This encapsulates conversion of StarCalc XML format to and from
- * MiniCalc format.
- *
- *
The superclass produces a particular
- * {@link org.openoffice.xmerge.Document Document}
- * object, i.e. {@link
- * org.openoffice.xmerge.converter.xml.sxc.SxcDocument
- * SxcDocument} that the converters in this class works with. Thus,
- * this class only implements the methods that produces the converters,
- * i.e. {@link
- * org.openoffice.xmerge.DocumentSerializer
- * DocumentSerializer} and {@link
- * org.openoffice.xmerge.DocumentDeserializer
- * DocumentDeserializer};
- * as well as the {@link
- * org.openoffice.xmerge.ConverterCapabilities
- * ConverterCapabilities} object that is specific to this format
- * conversion. That superclass also produces a {@link
- * org.openoffice.xmerge.DocumentMerger DocumentMerger}
- * object, i.e. {@link
- * org.openoffice.xmerge.converter.xml.sxc.DocumentMergerImpl
- * DocumentMergerImpl} which this class derives the functionality.
- */
-public final class PluginFactoryImpl extends SxcPluginFactory
- implements DocumentDeserializerFactory, DocumentSerializerFactory {
-
- /** ConverterCapabilities object for this type of conversion. */
- private final static ConverterCapabilities converterCap =
- new ConverterCapabilitiesImpl();
-
-
- public PluginFactoryImpl(ConverterInfo ci) {
- super(ci);
- }
-
-
- /**
- * Returns an instance of DocumentSerializerImpl,
- * which is an implementation of DocumentSerializer
- * interface.
- *
- * @param doc Document object to be
- * converted/serialized.
- *
- * @return A DocumentSerializerImpl object.
- */
- public DocumentSerializer createDocumentSerializer(Document doc) {
-
- return new SxcDocumentSerializerImpl(doc);
- }
-
-
- /**
- * Returns an instance of DocumentDeserializerImpl,
- * which is an implementation of DocumentDeserializer
- * interface.
- *
- * @param cd ConvertData object for reading data
- * which will be converted back to a
- * Document object.
- *
- * @return A DocumentDeserializerImpl object.
- */
- public DocumentDeserializer createDocumentDeserializer(ConvertData cd) {
-
- return new SxcDocumentDeserializerImpl(cd);
- }
-
-
- public Document createDeviceDocument(String name, InputStream is)
- throws IOException {
-
- PalmDocument palmDoc = new PalmDocument(is);
- return palmDoc;
- }
-
- public DocumentMerger createDocumentMerger(Document doc) {
-
- DocumentMergerImpl merger = new DocumentMergerImpl(doc, converterCap);
- return merger;
- }
-}
-
diff --git a/xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/SxcDocumentDeserializerImpl.java b/xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/SxcDocumentDeserializerImpl.java
deleted file mode 100644
index c4e825eca055..000000000000
--- a/xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/SxcDocumentDeserializerImpl.java
+++ /dev/null
@@ -1,128 +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 .
- */
-
-package org.openoffice.xmerge.converter.xml.sxc.minicalc;
-
-import org.openoffice.xmerge.converter.xml.sxc.SxcDocumentDeserializer;
-import org.openoffice.xmerge.converter.xml.sxc.SpreadsheetDecoder;
-import org.openoffice.xmerge.converter.palm.PalmDB;
-import org.openoffice.xmerge.ConvertData;
-import org.openoffice.xmerge.converter.palm.PalmDocument;
-
-import java.io.IOException;
-import java.util.Enumeration;
-
-/**
- *
MiniCalc implementation of DocumentDeserializer
- * for the {@link
- * org.openoffice.xmerge.converter.xml.sxc.minicalc.PluginFactoryImpl
- * PluginFactoryImpl}.
- *
- *
This converts a set of files in MiniCalc PDB format to a StarOffice DOM.
- *
- */
-public final class SxcDocumentDeserializerImpl extends SxcDocumentDeserializer {
-
- /**
- * Creates new SxcDocumentDeserializerImpl.
- *
- * @param cd ConvertData Input data to convert.
- */
- public SxcDocumentDeserializerImpl(ConvertData cd) {
- super(cd);
- }
-
-
- /**
- * This method will be implemented by concrete subclasses and will
- * return an application-specific decoder.
- *
- * @param workbook The WorkBook name.
- * @param worksheetNames An array of WorkSheet names.
- * @param password The password.
- *
- * @return An application-specific SpreadsheetDecoder.
- */
- public SpreadsheetDecoder createDecoder(String workbook,
- String[] worksheetNames, String password) throws IOException {
-
- return new MinicalcDecoder(workbook, worksheetNames, password);
- }
-
-
- /**
- * This method will return the name of the WorkBook from the
- * ConvertData. Allows for situations where the
- * WorkBook name differs from the PDB name.
- *
- * Implemented in the Deserializer as the Decoder's constructor
- * requires a name.
- *
- * @param cd The ConvertData.
- *
- * @return The name of the WorkBook.
- */
- protected String getWorkbookName(ConvertData cd)
- throws IOException {
-
- Enumeration e = cd.getDocumentEnumeration();
- PalmDocument palmDoc = (PalmDocument) e.nextElement();
- String workbookName = palmDoc.getName();
-
- // Search for "-", which separates workbook from worksheet
- int end = workbookName.indexOf("-");
-
- if (end > 0) {
- workbookName = workbookName.substring(0, end);
- }
-
- return workbookName;
- }
-
-
- /**
- * This method will return an array of WorkSheet names from the
- * ConvertData.
- *
- * @param cd The ConvertData.
- *
- * @return The name of the WorkSheet.
- */
- protected String[] getWorksheetNames(ConvertData cd)
- throws IOException {
- int numberOfPDBs = cd.getNumDocuments();
- String worksheetName[] = new String[numberOfPDBs];
- int i=0;
- Enumeration e = cd.getDocumentEnumeration();
- while (e.hasMoreElements()) {
- PalmDocument palmDoc = (PalmDocument) e.nextElement();
- worksheetName[i] = palmDoc.getName();
-
- // Search for the "-", which seperates workbook from worksheet
- int start = worksheetName[i].indexOf("-");
-
- if (start != -1) {
- worksheetName[i] = worksheetName[i].substring(start + 1);
- }
- i++;
- }
-
- return worksheetName;
- }
-}
-
diff --git a/xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/SxcDocumentSerializerImpl.java b/xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/SxcDocumentSerializerImpl.java
deleted file mode 100644
index dfe51efb46b2..000000000000
--- a/xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/SxcDocumentSerializerImpl.java
+++ /dev/null
@@ -1,130 +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 .
- */
-
-package org.openoffice.xmerge.converter.xml.sxc.minicalc;
-
-import java.awt.Color;
-
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Node;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Element;
-
-import java.io.IOException;
-
-import org.openoffice.xmerge.Document;
-import org.openoffice.xmerge.ConvertData;
-import org.openoffice.xmerge.ConvertException;
-import org.openoffice.xmerge.converter.palm.PalmDB;
-import org.openoffice.xmerge.converter.palm.Record;
-import org.openoffice.xmerge.converter.palm.PalmDocument;
-
-import jmc.JMCconstants;
-
-import org.openoffice.xmerge.converter.xml.sxc.Format;
-import org.openoffice.xmerge.converter.xml.sxc.SxcDocumentSerializer;
-
-/**
- *
MiniCalc implementation of SxcDocumentDeserializer
- * for the {@link
- * org.openoffice.xmerge.converter.xml.sxc.minicalc.PluginFactoryImpl
- * PluginFactoryImpl}.
- *
- *
This converts StarOffice XML format to a set of files in
- * MiniCalc PDB format.
- *
- */
-public final class SxcDocumentSerializerImpl extends SxcDocumentSerializer {
-
-
- /**
- * Constructor.
- *
- * @param document The Document to convert.
- */
- public SxcDocumentSerializerImpl(Document document) {
- super(document);
- }
-
-
- public ConvertData serialize() throws ConvertException, IOException {
-
-
- // Get the server side document name. This value should not
- // contain a path or the file extension.
- String docName = sxcDoc.getName();
-
- // TODO - get real values for password when implemnted in XML
- // Passwords are not currently stored in StarCalc XML format.
- String password = null;
-
- encoder = new MinicalcEncoder(docName, password);
-
- // get dom document
- org.w3c.dom.Document domDoc = sxcDoc.getContentDOM();
-
- // Traverse to the office:body element.
- // There should only be one.
- NodeList list = domDoc.getElementsByTagName(TAG_OFFICE_BODY);
- int len = list.getLength();
-
- if (len > 0) {
- Node node = list.item(0);
- traverseBody(node);
- }
-
- // Get the number of sheets in the workbook
- // This will equal the number of PDBs we need
- ConvertData cd = new ConvertData();
- int numSheets = encoder.getNumberOfSheets();
-
- for (int i = 0; i < numSheets; i++) {
-
- // Get records for sheet i
- Record records[] = ((MinicalcEncoder) encoder).getRecords(i);
-
- // Get the sheet name for sheet i
- String fullSheetName = new String(docName
- + "-"
- + encoder.getSheetName(i));
-
- // Create a PalmDB object
- PalmDocument palmDoc = new PalmDocument(fullSheetName,
- MinicalcConstants.CREATOR_ID,
- MinicalcConstants.TYPE_ID, JMCconstants.AppVersion,
- PalmDB.PDB_HEADER_ATTR_BACKUP, records);
-
- cd.addDocument(palmDoc);
- }
-
-
- // OutputStream os = new FileOutputStream(docName);
-
- //pdbSet.write(os);
- //os.flush();
-
- //ConvertDataEntry cde = new ConvertDataOutputStream(os, docName);
- //cd.addCDE(cde);
-
- return cd;
- }
-
-
-
-}
-
diff --git a/xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/package.html b/xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/package.html
deleted file mode 100644
index cd5469181034..000000000000
--- a/xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/package.html
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
-
-
-org.openoffice.xmerge.converter.xml.sxc.minicalc package
-
-
-
-
-
Provides the tools for doing the conversion of StarWriter XML to
-and from MiniCalc format.
-
-
It follows the {@link org.openoffice.xmerge} framework for the conversion process.
-
-
Since it converts to/from a Palm application format, these converters
-follow the
-PalmDB stream format for writing out to the Palm sync client or reading
-in from the Palm sync client.
-
-
Note that PluginFactoryImpl also provides a
-DocumentMerger object, i.e. {@link org.openoffice.xmerge.converter.xml.sxw.aportisdoc.DocumentMergerImpl DocumentMergerImpl}.
-This functionality was derived from its superclass
-{@link org.openoffice.xmerge.converter.xml.sxw.SxwPluginFactory SxwPluginFactory}.
-
-
-
diff --git a/xmerge/source/minicalc/makefile.mk b/xmerge/source/minicalc/makefile.mk
deleted file mode 100644
index 9ceb3233f9a0..000000000000
--- a/xmerge/source/minicalc/makefile.mk
+++ /dev/null
@@ -1,24 +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 .
-#
-
-TARGET=minicalc
-PRJ=../..
-PRJNAME=xmerge
-
-.INCLUDE : ant.mk
-ALLTAR: ANTBUILD
diff --git a/xmerge/source/minicalc/minicalc.mf b/xmerge/source/minicalc/minicalc.mf
deleted file mode 100644
index 1f0a0e35e276..000000000000
--- a/xmerge/source/minicalc/minicalc.mf
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path: jmc.jar
-
diff --git a/xmerge/source/pexcel/converter.xml b/xmerge/source/pexcel/converter.xml
deleted file mode 100644
index 2e77ae9018ce..000000000000
--- a/xmerge/source/pexcel/converter.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-
-
- Pocket Excel 2.0
-
-
- StarCalc XML to/from Pocket Excel 2.0 conversion
-
- OpenOffice.org
-
- org.openoffice.xmerge.converter.xml.sxc.pexcel.PluginFactoryImpl
-
-
-
-
-
diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/ConverterCapabilitiesImpl.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/ConverterCapabilitiesImpl.java
deleted file mode 100644
index d33b7e02bfd1..000000000000
--- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/ConverterCapabilitiesImpl.java
+++ /dev/null
@@ -1,104 +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 .
- */
-
-package org.openoffice.xmerge.converter.xml.sxc.pexcel;
-
-import org.openoffice.xmerge.ConverterCapabilities;
-import org.openoffice.xmerge.converter.xml.OfficeConstants;
-
-
-/**
- *
Pocket Excel implementation of ConverterCapabilities for
- * the {@link
- * org.openoffice.xmerge.converter.xml.sxc.pexcel.PluginFactoryImpl
- * PluginFactoryImpl}.
- *
- *
Used with StarCalc SXC to/from Pocket Excel conversions. The
- * ConverterCapibilies specify which "Office"
- * Document tags and attributes are supported on the
- * "Device" Document format.
- */
-public final class ConverterCapabilitiesImpl
- implements ConverterCapabilities {
-
- public boolean canConvertTag(String tag) {
-
- if (OfficeConstants.TAG_OFFICE_BODY.equals(tag))
- return true;
- else if (OfficeConstants.TAG_PARAGRAPH.equals(tag))
- return true;
- else if (OfficeConstants.TAG_TABLE.equals(tag))
- return true;
- else if (OfficeConstants.TAG_TABLE_ROW.equals(tag))
- return true;
- else if (OfficeConstants.TAG_TABLE_COLUMN.equals(tag))
- return false;
- // TODO - we currently do not handle the table column tag
- else if (OfficeConstants.TAG_TABLE_SCENARIO.equals(tag))
- return false;
- // TODO - we currently do not handle the table scenario tag
- else if (OfficeConstants.TAG_TABLE_CELL.equals(tag))
- return true;
-
- return false;
- }
-
- public boolean canConvertAttribute(String tag,
- String attribute) {
-
- if (OfficeConstants.TAG_TABLE.equals(tag)) {
-
- if (OfficeConstants.ATTRIBUTE_TABLE_NAME.equals(attribute))
- return true;
-
- } else if (OfficeConstants.TAG_TABLE_CELL.equals(tag)) {
-
- if (OfficeConstants.ATTRIBUTE_TABLE_VALUE_TYPE.equals(attribute))
- return true;
- else if (OfficeConstants.ATTRIBUTE_TABLE_FORMULA.
- equals(attribute))
- return true;
- else if (OfficeConstants.ATTRIBUTE_TABLE_VALUE.equals(attribute))
- return true;
- else if (OfficeConstants.ATTRIBUTE_TABLE_BOOLEAN_VALUE.
- equals(attribute))
- return true;
- else if (OfficeConstants.ATTRIBUTE_TABLE_CURRENCY.
- equals(attribute))
- return true;
- else if (OfficeConstants.ATTRIBUTE_TABLE_TIME_VALUE.
- equals(attribute))
- return true;
- else if (OfficeConstants.ATTRIBUTE_TABLE_DATE_VALUE.
- equals(attribute))
- return true;
- else if (OfficeConstants.ATTRIBUTE_TABLE_NUM_COLUMNS_REPEATED.
- equals(attribute))
- return true;
-
- } else if (OfficeConstants.TAG_TABLE_ROW.equals(tag)) {
-
- if (OfficeConstants.ATTRIBUTE_TABLE_NUM_ROWS_REPEATED.
- equals(attribute))
- return true;
- }
-
- return false;
- }
-}
-
diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PluginFactoryImpl.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PluginFactoryImpl.java
deleted file mode 100644
index 690f2f3dd540..000000000000
--- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PluginFactoryImpl.java
+++ /dev/null
@@ -1,121 +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 .
- */
-
-package org.openoffice.xmerge.converter.xml.sxc.pexcel;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.openoffice.xmerge.ConvertData;
-import org.openoffice.xmerge.Document;
-import org.openoffice.xmerge.DocumentSerializer;
-import org.openoffice.xmerge.DocumentSerializerFactory;
-import org.openoffice.xmerge.DocumentDeserializer;
-import org.openoffice.xmerge.DocumentDeserializerFactory;
-import org.openoffice.xmerge.DocumentMerger;
-import org.openoffice.xmerge.ConverterCapabilities;
-import org.openoffice.xmerge.converter.xml.sxc.DocumentMergerImpl;
-import org.openoffice.xmerge.converter.xml.sxc.SxcPluginFactory;
-import org.openoffice.xmerge.converter.xml.sxc.pexcel.records.Workbook;
-import org.openoffice.xmerge.util.registry.ConverterInfo;
-
-/**
- *
Pocket Excel implementation of the PluginFactory.
- * This encapsulates conversion of StarCalc XML format to and from
- * Pocket Excel format.
- *
- *
The superclass produces a particular
- * {@link org.openoffice.xmerge.Document Document}
- * object, i.e. {@link
- * org.openoffice.xmerge.converter.xml.sxc.SxcDocument
- * SxcDocument} that the converters in this class works with. Thus,
- * this class only implements the methods that produces the converters,
- * i.e. {@link
- * org.openoffice.xmerge.DocumentSerializer
- * DocumentSerializer} and {@link
- * org.openoffice.xmerge.DocumentDeserializer
- * DocumentDeserializer};
- * as well as the {@link
- * org.openoffice.xmerge.ConverterCapabilities
- * ConverterCapabilities} object that is specific to this format
- * conversion. That superclass also produces a {@link
- * org.openoffice.xmerge.DocumentMerger DocumentMerger}
- * object, i.e. {@link
- * org.openoffice.xmerge.converter.xml.sxc.DocumentMergerImpl
- * DocumentMergerImpl} which this class derives the functionality.
- */
-public final class PluginFactoryImpl extends SxcPluginFactory
- implements DocumentDeserializerFactory, DocumentSerializerFactory {
-
- /** ConverterCapabilities object for this type of conversion. */
- private final static ConverterCapabilities converterCap =
- new ConverterCapabilitiesImpl();
-
-
- public PluginFactoryImpl(ConverterInfo ci) {
- super(ci);
- }
-
-
- /**
- * Returns an instance of DocumentSerializerImpl,
- * which is an implementation of DocumentSerializer
- * interface.
- *
- * @param doc Document object to be
- * converted/serialized.
- *
- * @return A DocumentSerializerImpl object.
- */
- public DocumentSerializer createDocumentSerializer(Document doc) {
-
- return new SxcDocumentSerializerImpl(doc);
- }
-
-
- /**
- * Returns an instance of DocumentDeserializerImpl,
- * which is an implementation of DocumentDeserializer
- * interface.
- *
- * @param cd ConvertData object for reading data
- * which will be converted back to a
- * Document object.
- *
- * @return A DocumentDeserializerImpl object.
- */
- public DocumentDeserializer createDocumentDeserializer(ConvertData cd) {
-
- return new SxcDocumentDeserializerImpl(cd);
- }
-
-
- public Document createDeviceDocument(String name, InputStream is)
- throws IOException {
-
- Workbook wb = new Workbook(name, is);
- return wb;
- }
-
- public DocumentMerger createDocumentMerger(Document doc) {
-
- DocumentMergerImpl merger = new DocumentMergerImpl(doc, converterCap);
- return merger;
- }
-}
-
diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PocketExcelConstants.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PocketExcelConstants.java
deleted file mode 100644
index e5565868908c..000000000000
--- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PocketExcelConstants.java
+++ /dev/null
@@ -1,57 +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 .
- */
-
-package org.openoffice.xmerge.converter.xml.sxc.pexcel;
-
-
-/**
- * Interface defining constants for Pocket Excel attributes.
- *
- */
-public interface PocketExcelConstants {
- /** File extension for Pocket Word files. */
- public static final String FILE_EXTENSION = ".pxl";
-
- /** Constants for pexcel BIFF records */
- public static final int BLANK_CELL = 0x01;
- public static final int NUMBER_CELL = 0x03;
- public static final int LABEL_CELL = 0x04;
- public static final int BOOLERR_CELL = 0x05;
- public static final int FORMULA_CELL = 0x06;
- public static final int FORMULA_STRING = 0x07;
- public static final int ROW_DESCRIPTION = 0x08;
- public static final int BOF_RECORD = 0x09;
- public static final int EOF_MARKER = 0x0A;
- public static final int DEFINED_NAME = 0x18;
- public static final int CURRENT_SELECTION = 0x1D;
- public static final int NUMBER_FORMAT = 0x1E;
- public static final int DEFAULT_ROW_HEIGHT = 0x25;
- public static final int FONT_DESCRIPTION = 0x31;
- public static final int WINDOW_INFO = 0x3D;
- public static final int SHEET_WINDOW_INFO = 0x3E;
- public static final int PANE_INFO = 0x41;
- public static final int CODEPAGE = 0x42;
- public static final int DEF_COL_WIDTH = 0x55;
- public static final int COLINFO = 0x7D;
- public static final int BOUND_SHEET = 0x85;
- public static final int EXTENDED_FORMAT = 0xE0;
-
- /** Colour lookup table for mapping pexcel color values
- (See util/ColourConverter.java */
- public short cLookup[] = { 0, 14, 15, 1, 2, 3, 4, 7, 6, 5, 8, 9, 10, 13, 12, 11 };
-}
diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PocketExcelDecoder.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PocketExcelDecoder.java
deleted file mode 100644
index efbdbee06a93..000000000000
--- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PocketExcelDecoder.java
+++ /dev/null
@@ -1,428 +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 .
- */
-
-package org.openoffice.xmerge.converter.xml.sxc.pexcel;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.NoSuchElementException;
-
-import org.openoffice.xmerge.ConvertData;
-import org.openoffice.xmerge.converter.xml.OfficeConstants;
-import org.openoffice.xmerge.converter.xml.sxc.BookSettings;
-import org.openoffice.xmerge.converter.xml.sxc.ColumnRowInfo;
-import org.openoffice.xmerge.converter.xml.sxc.Format;
-import org.openoffice.xmerge.converter.xml.sxc.NameDefinition;
-import org.openoffice.xmerge.converter.xml.sxc.SpreadsheetDecoder;
-import org.openoffice.xmerge.converter.xml.sxc.pexcel.records.BIFFRecord;
-import org.openoffice.xmerge.converter.xml.sxc.pexcel.records.CellValue;
-import org.openoffice.xmerge.converter.xml.sxc.pexcel.records.ColInfo;
-import org.openoffice.xmerge.converter.xml.sxc.pexcel.records.DefinedName;
-import org.openoffice.xmerge.converter.xml.sxc.pexcel.records.ExtendedFormat;
-import org.openoffice.xmerge.converter.xml.sxc.pexcel.records.FloatNumber;
-import org.openoffice.xmerge.converter.xml.sxc.pexcel.records.FontDescription;
-import org.openoffice.xmerge.converter.xml.sxc.pexcel.records.Formula;
-import org.openoffice.xmerge.converter.xml.sxc.pexcel.records.Row;
-import org.openoffice.xmerge.converter.xml.sxc.pexcel.records.Workbook;
-import org.openoffice.xmerge.converter.xml.sxc.pexcel.records.Worksheet;
-import org.openoffice.xmerge.util.Debug;
-
-/**
- * This class is used by {@link SxcDocumentDeserializerImpl}
- * SxcDocumentDeserializerImpl} to decode the Pocket Excel format.
- *
- */
-final class PocketExcelDecoder extends SpreadsheetDecoder {
-
- private Workbook wb;
- private Worksheet ws;
- private CellValue cell;
- private int maxRows = 0;
- private int maxCols = 0;
- private int wsIndex;
- private Iterator cellValue;
- private Format fmt = null;
-
- /**
- * Constructor creates a Pocket Excel WorkBook.
- */
- PocketExcelDecoder() {
- fmt = new Format();
- }
-
-
- /**
- * This method takes a ConvertData as input and
- * converts it into a PocketWord WorkSheet. The WorkSheet is then
- * added to the WorkBook.
- *
- * @param cd An ConvertData containing a
- * Pocket Excel WorkSheet.
- *
- * @throws IOException If any I/O error occurs.
- */
- public void addDeviceContent(ConvertData cd) throws IOException {
-
- Iterator