Repository.mk
| 2
RepositoryModule_host.mk
| 1
bin/find-unusedheaders.sh
| 1
osx/soffice.xcodeproj/project.pbxproj
| 2
solenv/qa/python/gbuildtojson.py
| 2
xmerge/Jar_XMergeBridge.mk
| 26
xmerge/Jar_xmerge.mk
| 118 -
xmerge/Makefile
| 14
xmerge/Module_xmerge.mk
| 17
xmerge/README.md
| 9
xmerge/source/bridge/XMergeBridge.component
| 25
xmerge/source/bridge/java/XMergeBridge.java
| 579 -----
xmerge/source/bridge/manifest.mf
| 2
xmerge/source/xmerge/converter.dtd
| 84
xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java
| 233 --
xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertData.java
| 101
xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertException.java
| 34
xmerge/source/xmerge/java/org/openoffice/xmerge/ConverterCapabilities.java
| 54
xmerge/source/xmerge/java/org/openoffice/xmerge/ConverterFactory.java
| 85
xmerge/source/xmerge/java/org/openoffice/xmerge/Document.java
| 79
xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentDeserializer.java
| 53
xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentDeserializer2.java
| 61
xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentDeserializerFactory.java
| 51
xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentMerger.java
| 74
xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentMergerFactory.java
| 50
xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentSerializer.java
| 54
xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentSerializer2.java
| 63
xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentSerializerFactory.java
| 50
xmerge/source/xmerge/java/org/openoffice/xmerge/MergeException.java
| 34
xmerge/source/xmerge/java/org/openoffice/xmerge/PluginFactory.java
| 163 -
xmerge/source/xmerge/java/org/openoffice/xmerge/Version.java
| 68
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java
| 342 --
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/package-info.java
| 40
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDB.java
| 360 ---
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDocument.java
| 148 -
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbDecoder.java
| 128 -
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbEncoder.java
| 168 -
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbHeader.java
| 145 -
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbUtil.java
| 35
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/Record.java
| 176 -
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/package-info.java
| 122 -
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedBinaryObject.java
| 109
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedObject.java
| 101
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedXMLObject.java
| 280 --
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeConstants.java
| 333 --
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java
| 1143 ----------
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocumentException.java
| 112
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeZip.java
| 424 ---
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java
| 528 ----
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/Style.java
| 191 -
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/StyleCatalog.java
| 284 --
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java
| 575 -----
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/package-info.java
| 23
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/BookSettings.java
| 208 -
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/CellStyle.java
| 471 ----
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnRowInfo.java
| 180 -
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnStyle.java
| 244 --
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/DocumentMergerImpl.java
| 183 -
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/Format.java
| 426 ---
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/NameDefinition.java
| 205 -
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/RowStyle.java
| 244 --
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SheetSettings.java
| 346 ---
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SpreadsheetDecoder.java
| 152 -
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SpreadsheetEncoder.java
| 81
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcConstants.java
| 37
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocument.java
| 80
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentDeserializer.java
| 746 ------
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentSerializer.java
| 885 -------
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcPluginFactory.java
| 69
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/package-info.java
| 23
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxw/SxwDocument.java
| 80
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxw/SxwPluginFactory.java
| 67
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxw/package-info.java
| 23
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/ConverterCapabilitiesImpl.java
| 74
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java
| 221 -
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentMergerImpl.java
| 80
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java
| 299 --
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/GenericOfficeDocument.java
| 81
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java
| 174 -
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/XsltPlugin.properties
| 27
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/package-info.java
| 58
xmerge/source/xmerge/java/org/openoffice/xmerge/merger/DiffAlgorithm.java
| 43
xmerge/source/xmerge/java/org/openoffice/xmerge/merger/Difference.java
| 223 -
xmerge/source/xmerge/java/org/openoffice/xmerge/merger/Iterator.java
| 85
xmerge/source/xmerge/java/org/openoffice/xmerge/merger/MergeAlgorithm.java
| 46
xmerge/source/xmerge/java/org/openoffice/xmerge/merger/NodeMergeAlgorithm.java
| 40
xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CellNodeIterator.java
| 96
xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CharArrayLCSAlgorithm.java
| 188 -
xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CharacterParser.java
| 127 -
xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/IteratorLCSAlgorithm.java
| 210 -
xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/IteratorRowCompare.java
| 229 --
xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/NodeIterator.java
| 358 ---
xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/ObjectArrayIterator.java
| 179 -
xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/ParaNodeIterator.java
| 69
xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/RowIterator.java
| 66
xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/TextNodeEntry.java
| 75
xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/TextNodeIterator.java
| 69
xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/package-info.java
| 26
xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/CharacterBaseParagraphMerge.java
| 281 --
xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/DocumentMerge.java
| 218 -
xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/PositionBaseRowMerge.java
| 242 --
xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/SheetMerge.java
| 76
xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/SheetUtil.java
| 99
xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/package-info.java
| 25
xmerge/source/xmerge/java/org/openoffice/xmerge/merger/package-info.java
| 56
xmerge/source/xmerge/java/org/openoffice/xmerge/package-info.java
| 89
xmerge/source/xmerge/java/org/openoffice/xmerge/test/ConverterInfoList.java
| 91
xmerge/source/xmerge/java/org/openoffice/xmerge/test/ConverterInfoList.properties
| 28
xmerge/source/xmerge/java/org/openoffice/xmerge/test/Driver.java
| 300 --
xmerge/source/xmerge/java/org/openoffice/xmerge/util/ActiveSyncDriver.java
| 137 -
xmerge/source/xmerge/java/org/openoffice/xmerge/util/ColourConverter.java
| 421 ---
xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java
| 230 --
xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.properties
| 29
xmerge/source/xmerge/java/org/openoffice/xmerge/util/EndianConverter.java
| 128 -
xmerge/source/xmerge/java/org/openoffice/xmerge/util/IntArrayList.java
| 125 -
xmerge/source/xmerge/java/org/openoffice/xmerge/util/OfficeUtil.java
| 123 -
xmerge/source/xmerge/java/org/openoffice/xmerge/util/Resources.java
| 74
xmerge/source/xmerge/java/org/openoffice/xmerge/util/TwipsConverter.java
| 84
xmerge/source/xmerge/java/org/openoffice/xmerge/util/XmlUtil.java
| 171 -
xmerge/source/xmerge/java/org/openoffice/xmerge/util/package-info.java
| 22
xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfo.java
| 406 ---
xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java
| 477 ----
xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoReader.java
| 277 --
xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/RegistryException.java
| 38
xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/package-info.java
| 59
xmerge/source/xmerge/java/org/openoffice/xmerge/util/resources.properties
| 59
xmerge/source/xmerge/xmerge.mf
| 6
127 files changed, 1 insertion(+), 20219 deletions(-)
New commits:
commit b1ecafb2400672a894e4b8724bdaaa4c7a69b2b4
Author: Caolán McNamara <[email protected]>
AuthorDate: Sun Oct 6 16:41:24 2024 +0100
Commit: Caolán McNamara <[email protected]>
CommitDate: Thu Oct 24 16:28:18 2024 +0200
Remove archaic xmerge
Formats like Aportisdoc can be opened via
org.libreoffice.comp.Writer.EBookImportFilter instead.
It doesn't look like there will be any support implemented for Nokia
9210 Communicator PsiWord. No particular burning demand for that
anymore apparently.
Removal of the filters that used xmerge took place at:
commit a5783fe922b2419b5b662eb5f544a1f401341dbf
CommitDate: Sun Mar 3 19:19:26 2013 +0100
remove stale javafilters
Change-Id: I0a0087fb2ee015de42c1802b5e9bc6dc42a5efe1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174563
Reviewed-by: Caolán McNamara <[email protected]>
Tested-by: Jenkins
diff --git a/Repository.mk b/Repository.mk
index 336452487890..74d734c32865 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -809,7 +809,6 @@ $(eval $(call gb_Helper_register_jars_for_install,URE,ure, \
$(eval $(call gb_Helper_register_jars_for_install,OOO,ooo, \
ScriptFramework \
ScriptProviderForJava \
- XMergeBridge \
commonwizards \
form \
$(if $(filter-out MACOSX,$(OS)),officebean) \
@@ -819,7 +818,6 @@ $(eval $(call gb_Helper_register_jars_for_install,OOO,ooo, \
smoketest \
table \
unoil \
- xmerge \
))
$(eval $(call gb_Helper_register_jars_for_install,OOO,reportbuilder, \
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index 429df464023f..b37ebd4fd02e 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -188,7 +188,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
vcl \
wizards \
writerperfect \
- xmerge \
$(call gb_Helper_optional,XMLHELP,xmlhelp) \
xmloff \
xmlreader \
diff --git a/bin/find-unusedheaders.sh b/bin/find-unusedheaders.sh
index 0a27696cc161..ca9dd45b2679 100755
--- a/bin/find-unusedheaders.sh
+++ b/bin/find-unusedheaders.sh
@@ -54,7 +54,6 @@ for subdir in $(ls -d */ | grep -v \
-e unotest/ \
-e ure/ \
-e wizards/ \
- -e xmerge/ \
-e xmlreader/ \
-e instdir/ `# Skip typical build-related
temporaries` \
-e workdir/ \
diff --git a/osx/soffice.xcodeproj/project.pbxproj
b/osx/soffice.xcodeproj/project.pbxproj
index eb75e9124779..bc4cb09c9647 100644
--- a/osx/soffice.xcodeproj/project.pbxproj
+++ b/osx/soffice.xcodeproj/project.pbxproj
@@ -67,7 +67,6 @@
29F88FB22A554D6F00C77A3F /* udkapi */ = {isa =
PBXFileReference; lastKnownFileType = folder; name = udkapi; path = ../udkapi;
sourceTree = "<group>"; };
29F88FB32A554D7000C77A3F /* shell */ = {isa = PBXFileReference;
lastKnownFileType = folder; name = shell; path = ../shell; sourceTree =
"<group>"; };
29F88FB42A554D7000C77A3F /* sdext */ = {isa = PBXFileReference;
lastKnownFileType = folder; name = sdext; path = ../sdext; sourceTree =
"<group>"; };
- 29F88FB52A554D7000C77A3F /* xmerge */ = {isa =
PBXFileReference; lastKnownFileType = folder; name = xmerge; path = ../xmerge;
sourceTree = "<group>"; };
29F88FB62A554D7000C77A3F /* qadevOOo */ = {isa =
PBXFileReference; lastKnownFileType = folder; name = qadevOOo; path =
../qadevOOo; sourceTree = "<group>"; };
29F88FB72A554D7000C77A3F /* setup_native */ = {isa =
PBXFileReference; lastKnownFileType = folder; name = setup_native; path =
../setup_native; sourceTree = "<group>"; };
29F88FB82A554D7000C77A3F /* sysui */ = {isa = PBXFileReference;
lastKnownFileType = folder; name = sysui; path = ../sysui; sourceTree =
"<group>"; };
@@ -285,7 +284,6 @@
29F88FA92A554D6F00C77A3F /* wizards */,
29F88F8D2A554D6C00C77A3F /* writerfilter */,
29F88FE22A554D7600C77A3F /* writerperfect */,
- 29F88FB52A554D7000C77A3F /* xmerge */,
29F88F972A554D6D00C77A3F /* xmlhelp */,
29F88FEB2A554D7800C77A3F /* xmloff */,
29F88FF02A554D7800C77A3F /* xmlreader */,
diff --git a/solenv/qa/python/gbuildtojson.py b/solenv/qa/python/gbuildtojson.py
index d8434acc5216..92029bb4e728 100644
--- a/solenv/qa/python/gbuildtojson.py
+++ b/solenv/qa/python/gbuildtojson.py
@@ -124,7 +124,7 @@ class CheckGbuildToJsonModules(unittest.TestCase):
shutil.rmtree(self.tempwork)
def test_gbuildtojson(self):
- modules = ['accessibility', 'android', 'animations', 'apple_remote',
'avmedia', 'basctl', 'basegfx', 'basic', 'bean', 'canvas', 'chart2',
'codemaker', 'comphelper', 'cppcanvas', 'cui', 'dbaccess', 'desktop',
'docmodel', 'drawinglayer', 'editeng', 'embeddedobj', 'embedserv',
'eventattacher', 'extras', 'filter', 'forms', 'formula', 'fpicker',
'framework', 'hwpfilter', 'i18nlangtag', 'i18nutil', 'idl', 'instsetoo_native',
'io', 'ios', 'jvmaccess', 'jvmfwk', 'l10ntools', 'librelogo', 'libreofficekit',
'linguistic', 'lotuswordpro', 'nlpsolver', 'o3tl', 'offapi', 'officecfg',
'oovbaapi', 'oox', 'opencl', 'package', 'postprocess', 'pyuno', 'registry',
'remotebridges', 'reportbuilder', 'reportdesign', 'ridljar', 'salhelper',
'sax', 'sc', 'sccomp', 'scp2', 'scripting', 'sd', 'sdext', 'setup_native',
'sfx2', 'slideshow', 'smoketest', 'soltools', 'sot', 'starmath', 'store',
'svgio', 'emfio', 'svl', 'svtools', 'svx', 'sw', 'swext', 'sysui', 'test',
'testtools', 'toolkit', 'ucb', 'ucbhel
per', 'udkapi', 'uitest', 'UnoControls', 'unodevtools', 'unoidl', 'unoil',
'unotest', 'unotools', 'unoxml', 'ure', 'uui', 'vbahelper', 'vcl',
'winaccessibility', 'wizards', 'writerperfect', 'xmerge', 'xmlhelp', 'xmloff',
'xmlreader', 'xmlscript', 'xmlsecurity']
+ modules = ['accessibility', 'android', 'animations', 'apple_remote',
'avmedia', 'basctl', 'basegfx', 'basic', 'bean', 'canvas', 'chart2',
'codemaker', 'comphelper', 'cppcanvas', 'cui', 'dbaccess', 'desktop',
'docmodel', 'drawinglayer', 'editeng', 'embeddedobj', 'embedserv',
'eventattacher', 'extras', 'filter', 'forms', 'formula', 'fpicker',
'framework', 'hwpfilter', 'i18nlangtag', 'i18nutil', 'idl', 'instsetoo_native',
'io', 'ios', 'jvmaccess', 'jvmfwk', 'l10ntools', 'librelogo', 'libreofficekit',
'linguistic', 'lotuswordpro', 'nlpsolver', 'o3tl', 'offapi', 'officecfg',
'oovbaapi', 'oox', 'opencl', 'package', 'postprocess', 'pyuno', 'registry',
'remotebridges', 'reportbuilder', 'reportdesign', 'ridljar', 'salhelper',
'sax', 'sc', 'sccomp', 'scp2', 'scripting', 'sd', 'sdext', 'setup_native',
'sfx2', 'slideshow', 'smoketest', 'soltools', 'sot', 'starmath', 'store',
'svgio', 'emfio', 'svl', 'svtools', 'svx', 'sw', 'swext', 'sysui', 'test',
'testtools', 'toolkit', 'ucb', 'ucbhel
per', 'udkapi', 'uitest', 'UnoControls', 'unodevtools', 'unoidl', 'unoil',
'unotest', 'unotools', 'unoxml', 'ure', 'uui', 'vbahelper', 'vcl',
'winaccessibility', 'wizards', 'writerperfect', 'xmlhelp', 'xmloff',
'xmlreader', 'xmlscript', 'xmlsecurity']
if os.environ['OS'] == 'WNT':
# for now, use a limited subset for testing on windows as it is so
annoyingly slow on this
modules = ['chart2', 'cui', 'dbaccess', 'framework', 'oox',
'sfx2', 'svl', 'svtools', 'svx', 'toolkit', 'vcl', 'xmloff']
diff --git a/xmerge/Jar_XMergeBridge.mk b/xmerge/Jar_XMergeBridge.mk
deleted file mode 100644
index 2ca6fede5f25..000000000000
--- a/xmerge/Jar_XMergeBridge.mk
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-#
-
-$(eval $(call gb_Jar_Jar,XMergeBridge))
-
-$(eval $(call
gb_Jar_set_componentfile,XMergeBridge,xmerge/source/bridge/XMergeBridge,OOO,services))
-
-$(eval $(call
gb_Jar_set_manifest,XMergeBridge,$(SRCDIR)/xmerge/source/bridge/manifest.mf))
-
-$(eval $(call gb_Jar_set_packageroot,XMergeBridge,*.class))
-
-$(eval $(call gb_Jar_use_jars,XMergeBridge,\
- xmerge \
- libreoffice \
-))
-
-$(eval $(call gb_Jar_add_sourcefiles,XMergeBridge,\
- xmerge/source/bridge/java/XMergeBridge \
-))
diff --git a/xmerge/Jar_xmerge.mk b/xmerge/Jar_xmerge.mk
deleted file mode 100644
index f90139ca32be..000000000000
--- a/xmerge/Jar_xmerge.mk
+++ /dev/null
@@ -1,118 +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/.
-#
-#
-
-$(eval $(call gb_Jar_Jar,xmerge))
-
-$(eval $(call
gb_Jar_set_manifest,xmerge,$(SRCDIR)/xmerge/source/xmerge/xmerge.mf))
-
-$(eval $(call gb_Jar_use_jars,xmerge,\
- libreoffice \
-))
-
-$(eval $(call gb_Jar_set_packageroot,xmerge,org))
-
-$(eval $(call gb_Jar_add_sourcefiles,xmerge,\
- xmerge/source/xmerge/java/org/openoffice/xmerge/Convert \
- xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertData \
- xmerge/source/xmerge/java/org/openoffice/xmerge/ConverterCapabilities \
- xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument \
- xmerge/source/xmerge/java/org/openoffice/xmerge/ConverterFactory \
- xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDB \
-
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDocument \
- xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbDecoder \
- xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbEncoder \
- xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbHeader \
- xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbUtil \
- xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/Record \
-
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedBinaryObject
\
-
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedObject \
-
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedXMLObject
\
-
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeConstants \
-
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument \
-
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocumentException
\
- xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeZip \
- xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle \
- xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/Style \
- xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/StyleCatalog
\
-
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/BookSettings \
-
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/CellStyle \
-
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnRowInfo
\
-
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnStyle \
-
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/DocumentMergerImpl
\
- xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/Format \
-
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/NameDefinition
\
- xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/RowStyle
\
-
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SheetSettings
\
-
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SpreadsheetDecoder
\
-
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SpreadsheetEncoder
\
-
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcConstants \
-
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocument \
-
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentDeserializer
\
-
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentSerializer
\
-
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcPluginFactory
\
-
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxw/SxwDocument \
-
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxw/SxwPluginFactory
\
- xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle \
-
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/ConverterCapabilitiesImpl
\
-
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl
\
-
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentMergerImpl
\
-
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl
\
-
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/GenericOfficeDocument
\
-
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl
\
- xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertException \
- xmerge/source/xmerge/java/org/openoffice/xmerge/Document \
- xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentDeserializer \
- xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentDeserializer2 \
-
xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentDeserializerFactory \
- xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentMerger \
- xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentMergerFactory \
- xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentSerializer \
- xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentSerializer2 \
- xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentSerializerFactory \
- xmerge/source/xmerge/java/org/openoffice/xmerge/MergeException \
- xmerge/source/xmerge/java/org/openoffice/xmerge/merger/DiffAlgorithm \
-
xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CellNodeIterator \
-
xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CharacterParser \
-
xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CharArrayLCSAlgorithm
\
- xmerge/source/xmerge/java/org/openoffice/xmerge/merger/Difference \
-
xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/IteratorLCSAlgorithm
\
-
xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/IteratorRowCompare \
- xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/NodeIterator \
-
xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/ObjectArrayIterator
\
-
xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/ParaNodeIterator \
- xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/RowIterator \
- xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/TextNodeEntry \
-
xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/TextNodeIterator \
- xmerge/source/xmerge/java/org/openoffice/xmerge/merger/Iterator \
- xmerge/source/xmerge/java/org/openoffice/xmerge/merger/MergeAlgorithm \
-
xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/CharacterBaseParagraphMerge
\
- xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/DocumentMerge
\
-
xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/PositionBaseRowMerge
\
- xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/SheetMerge \
- xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/SheetUtil \
- xmerge/source/xmerge/java/org/openoffice/xmerge/merger/NodeMergeAlgorithm \
- xmerge/source/xmerge/java/org/openoffice/xmerge/PluginFactory \
- xmerge/source/xmerge/java/org/openoffice/xmerge/test/ConverterInfoList \
- xmerge/source/xmerge/java/org/openoffice/xmerge/test/Driver \
- xmerge/source/xmerge/java/org/openoffice/xmerge/util/ActiveSyncDriver \
- xmerge/source/xmerge/java/org/openoffice/xmerge/util/ColourConverter \
- xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug \
- xmerge/source/xmerge/java/org/openoffice/xmerge/util/EndianConverter \
- xmerge/source/xmerge/java/org/openoffice/xmerge/util/IntArrayList \
- xmerge/source/xmerge/java/org/openoffice/xmerge/util/OfficeUtil \
-
xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfo \
-
xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr \
-
xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoReader
\
-
xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/RegistryException
\
- xmerge/source/xmerge/java/org/openoffice/xmerge/util/Resources \
- xmerge/source/xmerge/java/org/openoffice/xmerge/util/TwipsConverter \
- xmerge/source/xmerge/java/org/openoffice/xmerge/util/XmlUtil \
- xmerge/source/xmerge/java/org/openoffice/xmerge/Version \
-))
diff --git a/xmerge/Makefile b/xmerge/Makefile
deleted file mode 100644
index 0997e628485b..000000000000
--- a/xmerge/Makefile
+++ /dev/null
@@ -1,14 +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/.
-#
-
-module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
-
-include $(module_directory)/../solenv/gbuild/partial_build.mk
-
-# vim: set noet sw=4 ts=4:
diff --git a/xmerge/Module_xmerge.mk b/xmerge/Module_xmerge.mk
deleted file mode 100644
index e92da2ae9cb5..000000000000
--- a/xmerge/Module_xmerge.mk
+++ /dev/null
@@ -1,17 +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/.
-#
-#
-$(eval $(call gb_Module_Module,xmerge))
-
-$(eval $(call gb_Module_add_targets,xmerge,\
- $(if $(ENABLE_JAVA), \
- Jar_xmerge \
- Jar_XMergeBridge \
- ) \
-))
diff --git a/xmerge/README.md b/xmerge/README.md
deleted file mode 100644
index aa7183dd44d8..000000000000
--- a/xmerge/README.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Document Conversion and Merging
-
-For converting documents among from and into formats and also for merging them.
-
-Uses Java and plug-in architecture.
-
-## See also
-
-<https://www.openoffice.org/xml/xmerge/>
diff --git a/xmerge/source/bridge/XMergeBridge.component
b/xmerge/source/bridge/XMergeBridge.component
deleted file mode 100644
index bea9a8d75437..000000000000
--- a/xmerge/source/bridge/XMergeBridge.component
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * 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 .
- -->
-
-<component loader="com.sun.star.loader.Java2"
- xmlns="http://openoffice.org/2010/uno-components";>
- <implementation name="XMergeBridge$_XMergeBridge">
- <service name="com.sun.star.documentconversion.XMergeBridge"/>
- </implementation>
-</component>
diff --git a/xmerge/source/bridge/java/XMergeBridge.java
b/xmerge/source/bridge/java/XMergeBridge.java
deleted file mode 100644
index 6506326c4046..000000000000
--- a/xmerge/source/bridge/java/XMergeBridge.java
+++ /dev/null
@@ -1,579 +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 .
- */
-
-/** You can find more
- * information on the following web page:
- * https://api.libreoffice.org/docs/common/ref/com/sun/star/module-ix.html
- */
-
-/*Java Uno Helper Classes*/
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.net.URI;
-import java.util.Iterator;
-
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.openoffice.xmerge.Convert;
-import org.openoffice.xmerge.ConvertData;
-import org.openoffice.xmerge.ConverterFactory;
-import org.openoffice.xmerge.Document;
-import org.openoffice.xmerge.converter.xml.OfficeDocument;
-import org.openoffice.xmerge.util.registry.ConverterInfo;
-import org.openoffice.xmerge.util.registry.ConverterInfoMgr;
-import org.openoffice.xmerge.util.registry.ConverterInfoReader;
-
-import com.sun.star.comp.loader.FactoryHelper;
-import com.sun.star.frame.XConfigManager;
-import com.sun.star.io.XInputStream;
-import com.sun.star.io.XOutputStream;
-import com.sun.star.lang.XMultiServiceFactory;
-import com.sun.star.lang.XServiceInfo;
-import com.sun.star.lang.XServiceName;
-import com.sun.star.lang.XSingleServiceFactory;
-import com.sun.star.lang.XTypeProvider;
-import com.sun.star.lib.uno.adapter.XInputStreamToInputStreamAdapter;
-import com.sun.star.lib.uno.adapter.XOutputStreamToOutputStreamAdapter;
-import com.sun.star.registry.XRegistryKey;
-import com.sun.star.uno.AnyConverter;
-import com.sun.star.uno.Type;
-import com.sun.star.uno.UnoRuntime;
-import com.sun.star.xml.XExportFilter;
-import com.sun.star.xml.XImportFilter;
-import com.sun.star.xml.sax.InputSource;
-import com.sun.star.xml.sax.XDocumentHandler;
-import com.sun.star.xml.sax.XParser;
-
-/** This outer class provides an inner class to implement the service
- * description and a method to instantiate the
- * component on demand (__getServiceFactory()).
- */
-public class XMergeBridge {
-
- private static XMultiServiceFactory xMSF;
- private static XInputStream xInStream =null;
- private static XOutputStream xOutStream=null;
- private static String udJarPath=null;
- private static XOutputStream xos = null;
- private static String offMime=null;
- private static String sdMime=null;
- private static String sFileName=null;
- private static String sURL="";
-
- /** This inner class provides the component as a concrete implementation
- * of the service description. It implements the needed interfaces.
- */
- public static class _XMergeBridge implements
- XImportFilter,
- XExportFilter,
- XServiceName,
- XServiceInfo,
- XDocumentHandler,
- XTypeProvider {
-
- /** The component will be registered under this name.
- */
- private static final String __serviceName =
"com.sun.star.documentconversion.XMergeBridge";
-
- public com.sun.star.uno.Type[] getTypes() {
- Type[] typeReturn = {};
-
- try {
- typeReturn = new Type[] {
- new Type( XTypeProvider.class ),
- new Type( XImportFilter.class ),
- new Type( XExportFilter.class ),
- new Type( XServiceName.class ),
- new Type( XServiceInfo.class ) };
- }
- catch( Exception exception ) {
-
- }
-
- return typeReturn;
- }
-
- private String getFileName(String origName)
- {
- String name;
- if (origName !=null)
- {
- if(origName.equalsIgnoreCase(""))
- name = "OutFile";
- else {
- if (origName.lastIndexOf("/")>=0){
-
origName=origName.substring(origName.lastIndexOf("/")+1,origName.length());
- }
- if (origName.lastIndexOf(".")>=0){
- name = origName.substring(0,
origName.lastIndexOf("."));
- }
- else{
- name=origName;
- }
- }
- }
- else{
- name = "OutFile";
- }
- return name;
- }
-
- public boolean importer(com.sun.star.beans.PropertyValue[] aSourceData,
- com.sun.star.xml.sax.XDocumentHandler
xDocHandler,
- String[] msUserData) throws
com.sun.star.uno.RuntimeException {
-
- sFileName="";
- sURL="";
- udJarPath=msUserData[1];
- offMime =msUserData[4];
- sdMime = msUserData[5];
- com.sun.star.io.XInputStream xis=null;
- com.sun.star.beans.PropertyValue[] pValue = aSourceData;
-
- for (int i = 0 ; i < pValue.length; i++)
- {
-
- try{
- if (pValue[i].Name.equals("InputStream")){
-
xis=(com.sun.star.io.XInputStream)AnyConverter.toObject(new
Type(com.sun.star.io.XInputStream.class), pValue[i].Value);
- }
- if (pValue[i].Name.equals("FileName")){
- sFileName=(String)AnyConverter.toObject(new
Type(String.class), pValue[i].Value);
- }
-
- }
- catch(com.sun.star.lang.IllegalArgumentException AnyExec){
- System.out.println("
IllegalArgumentException "+AnyExec);
- }
-
- }
-
- try{
-
- Object
xCfgMgrObj=xMSF.createInstance("com.sun.star.config.SpecialConfigManager");
- XConfigManager xCfgMgr = UnoRuntime.queryInterface(
- XConfigManager.class , xCfgMgrObj );
- String PathString=xCfgMgr.substituteVariables("$(progurl)" );
- PathString= PathString.concat("/");
- udJarPath= PathString.concat(udJarPath);
-
- Object xPipeObj=xMSF.createInstance("com.sun.star.io.Pipe");
- xInStream = UnoRuntime.queryInterface(
- XInputStream.class , xPipeObj );
- xOutStream = UnoRuntime.queryInterface(
- XOutputStream.class , xPipeObj );
- convert
(xis,xOutStream,false,udJarPath,sFileName,offMime,sdMime);
- Object
xSaxParserObj=xMSF.createInstance("com.sun.star.xml.sax.Parser");
-
- XParser xParser = UnoRuntime.queryInterface(
- XParser.class , xSaxParserObj );
- xOutStream.closeOutput();
- InputSource aInput = new InputSource();
- if (sFileName==null){
- sFileName="";
- }
- aInput.sSystemId = sFileName;
- aInput.aInputStream =xInStream;
- xParser.setDocumentHandler ( xDocHandler );
-
- xParser.parseStream ( aInput );
- xOutStream.closeOutput();
- xInStream.closeInput();
-
- }
- catch (IOException e){
- return false;
- }
- catch (Exception e){
- return false;
- }
- return true;
- }
-
- public boolean exporter(com.sun.star.beans.PropertyValue[] aSourceData,
- String[] msUserData) throws
com.sun.star.uno.RuntimeException{
-
- sFileName=null;
- sURL=null;
- udJarPath=msUserData[1];
- offMime =msUserData[4];
- sdMime = msUserData[5];
-
- com.sun.star.beans.PropertyValue[] pValue = aSourceData;
- for (int i = 0 ; i < pValue.length; i++)
- {
-
- try{
- if (pValue[i].Name.equals("OutputStream")){
-
xos=(com.sun.star.io.XOutputStream)AnyConverter.toObject(new
Type(com.sun.star.io.XOutputStream.class), pValue[i].Value);
- }
-
- if (pValue[i].Name.equals("FileName")){
- sFileName=(String)AnyConverter.toObject(new
Type(String.class), pValue[i].Value);
- }
-
- if (pValue[i].Name.equals("URL")){
- sURL=(String)AnyConverter.toObject(new
Type(String.class), pValue[i].Value);
- }
- }
- catch(com.sun.star.lang.IllegalArgumentException AnyExec){
- System.out.println("
IllegalArgumentException "+AnyExec);
- }
- }
-
- if (sURL==null){
- sURL="";
- }
-
- try{
-
- Object
xCfgMgrObj=xMSF.createInstance("com.sun.star.config.SpecialConfigManager");
- XConfigManager xCfgMgr = UnoRuntime.queryInterface(
- XConfigManager.class , xCfgMgrObj );
-
- String PathString=xCfgMgr.substituteVariables("$(progurl)" );
- PathString= PathString.concat("/");
- udJarPath= PathString.concat(udJarPath);
-
- Object xPipeObj=xMSF.createInstance("com.sun.star.io.Pipe");
- xInStream = UnoRuntime.queryInterface(
- XInputStream.class , xPipeObj );
- xOutStream = UnoRuntime.queryInterface(
- XOutputStream.class , xPipeObj );
- }
- catch (Exception e){
- System.out.println("Exception "+e);
- return false;
- }
-
- return true;
- }
-
- private String needsMask(String origString){
- if (origString.contains("&")) {
- origString = origString.replace("&","&");
- }
- if (origString.contains("\"")) {
- origString = origString.replace("\"",""");
- }
- if (origString.contains("<")) {
- origString = origString.replace("<","<");
- }
- if (origString.contains(">")) {
- origString = origString.replace(">",">");
- }
- return origString;
- }
-
- public void startDocument () {
- }
-
- public void endDocument()throws com.sun.star.uno.RuntimeException
- {
-
- try{
- xOutStream.closeOutput();
- convert (xInStream,xos,true,udJarPath,sURL,offMime,sdMime);
-
- }
- catch (IOException e){
- throw new com.sun.star.uno.RuntimeException(e);
-
- }
- catch (Exception e){
- throw new com.sun.star.uno.RuntimeException(e);
-
- }
- }
-
- public void startElement (String str,
com.sun.star.xml.sax.XAttributeList xattribs)
- {
-
- str="<".concat(str);
- if (xattribs !=null)
- {
- str= str.concat(" ");
- int len=xattribs.getLength();
- for (short i=0;i<len;i++)
- {
- str=str.concat(xattribs.getNameByIndex(i));
- str=str.concat("=\"");
- str=str.concat(needsMask(xattribs.getValueByIndex(i)));
- str=str.concat("\" ");
- }
- }
- str=str.concat(">");
-
- try{
- xOutStream.writeBytes(str.getBytes("UTF-8"));
- }
- catch (Exception e){
- System.out.println("
"+e);
- }
-
- }
-
- public void endElement(String str){
-
- str="</".concat(str);
- str=str.concat(">");
- try{
- xOutStream.writeBytes(str.getBytes("UTF-8"));
-
- }
- catch (Exception e){
- System.out.println("
"+e);
- }
-
- }
- public void characters(String str){
- str=needsMask(str);
- try{
- xOutStream.writeBytes(str.getBytes("UTF-8"));
- }
- catch (Exception e){
- System.out.println("
"+e);
- }
-
- }
-
- public void ignorableWhitespace(String str){
-
- }
- public void processingInstruction(String aTarget, String aData){
-
- }
-
- public void setDocumentLocator(com.sun.star.xml.sax.XLocator xLocator){
-
- }
-
- private static void close(FileOutputStream c) throws IOException {
- if (c == null) return;
- c.close();
- }
-
- private void convert (com.sun.star.io.XInputStream
xml,com.sun.star.io.XOutputStream device,
- boolean convertFromOffice,String
pluginUrl,String FileName,String offMime,String sdMime) throws
com.sun.star.uno.RuntimeException, IOException {
-
- String jarName = pluginUrl;
- String name= getFileName(FileName);
-
- Iterator<ConverterInfo> ciEnum= null;
-
- XInputStreamToInputStreamAdapter xis =new
XInputStreamToInputStreamAdapter(xml);
-
- XOutputStreamToOutputStreamAdapter newxos =new
XOutputStreamToOutputStreamAdapter(device);
-
- /* make sure newxos and xis get closed */
- try{
- try{
- ConverterInfoReader cir = new
ConverterInfoReader(jarName,false);
- ciEnum =cir.getConverterInfoEnumeration();
- }
- catch (ParserConfigurationException pexc){
- System.out.println("Error:"+pexc);
- }
- catch ( org.xml.sax.SAXException pexc){
- System.out.println("Error:"+pexc);
- }
- catch(Exception e){
- System.out.println("Error:"+e);
- }
- ConverterInfoMgr. removeByJar(jarName);
- if (convertFromOffice)
- {
-
- try {
-
- //Check to see if jar contains a plugin Impl
-
- ConverterInfoMgr.addPlugIn(ciEnum);
- ConverterFactory cf = new ConverterFactory();
-
- Convert cv =
cf.getConverter(ConverterInfoMgr.findConverterInfo(sdMime,offMime),false);
- if (cv == null) {
- System.out.println("
No plug-in exists to convert from <staroffice/sxw> to <specified format> ");
-
- }
- else
- {
- cv.addInputStream(name,xis,false);
- ConvertData dataOut = cv.convert();
-
- Iterator<Object> docEnum =
dataOut.getDocumentEnumeration();
-
- if (docEnum.hasNext()){
- Document docOut =
(Document)docEnum.next();
- docOut.write(newxos);
-
- newxos.flush();
- newxos.close();
- newxos = null;
-
- int i=1;
- while (docEnum.hasNext() &&
sURL.startsWith("file:")) {
-
- URI uri=new URI(sURL);
- String newFileName= getPath(uri);
-
- File newFile;
- if (newFileName.lastIndexOf(".")!=-1){
- newFile =new
File(newFileName.substring(0,newFileName.lastIndexOf("."))+String.valueOf(i)+newFileName.substring(newFileName.lastIndexOf(".")));
- }
- else{
- newFile =new
File(newFileName.concat(String.valueOf(i)));
- }
-
- FileOutputStream fos = null;
- try {
- fos = new FileOutputStream(newFile);
- docOut = (Document)docEnum.next();
- docOut.write(fos);
- fos.flush();
- } finally {
- close(fos);
- }
- i++;
-
- }
-
- }
- }
- ConverterInfoMgr.removeByJar(jarName);
- }
- catch (Exception ex1) {
- IOException ex2 = new IOException();
- ex2.initCause(ex1);
- throw ex2;
- }
- }
- else{
-
- try {
- //Check to see if jar contains a plugin Impl
- ConverterInfoMgr.addPlugIn(ciEnum);
- ConverterFactory cf = new ConverterFactory();
- Convert cv =
cf.getConverter(ConverterInfoMgr.findConverterInfo(sdMime,offMime),true);
- if (cv == null) {
- System.out.println("
No plug-in exists to convert to <staroffice/sxw> from <specified format>");
- }
- else
- {
-
- cv.addInputStream(name,xis,false);
- ConvertData dataIn = cv.convert();
- Iterator<Object> docEnum =
dataIn.getDocumentEnumeration();
- while (docEnum.hasNext()) {
- OfficeDocument docIn =
(OfficeDocument)docEnum.next();
-
- docIn.write(newxos,false);
- }
- newxos.close();
- newxos = null;
- }
- ConverterInfoMgr.removeByJar(jarName);
- }
- catch (StackOverflowError sOE){
- System.out.println("
ERROR : Stack Overflow.
Increase of the JRE by adding the following line to the end of the javarc file
\"-Xss1m\"
");
- }
- catch (Exception ex1) {
- IOException ex2 = new IOException();
- ex2.initCause(ex1);
- throw ex2;
- }
-
- }
- }
- finally{
- if (newxos != null){
- try {
- newxos.flush();
- } catch (IOException e) {
- }
- newxos.close();
- }
- xis.close();
- }
- }
-
- private String getPath(URI uri){
- String path = uri.getPath();
- String opSys=System.getProperty("os.name");
- if(opSys.contains("Windows")){
- path= path.replace('/','\');
- path = path.substring(1);
- }
- return path;
- }
-
- // Implement methods from interface XTypeProvider
- public byte[] getImplementationId() {
- return new byte[0];
- }
-
- // Implement method from interface XServiceName
- public String getServiceName() {
- return __serviceName;
- }
-
- // Implement methods from interface XServiceInfo
- public boolean supportsService(String stringServiceName) {
- return stringServiceName.equals( __serviceName );
- }
-
- public String getImplementationName() {
- return _XMergeBridge.class.getName();
- }
-
- public String[] getSupportedServiceNames() {
- String[] stringSupportedServiceNames = { __serviceName };
- return stringSupportedServiceNames;
- }
- }
-
- /**
- * Returns a factory for creating the service.
- * This method is called by the <code>JavaLoader</code>
- *
- * @return returns a <code>XSingleServiceFactory</code> for creating the
- * component
- *
- * @param implName the name of the implementation for which a
- * service is desired
- * @param multiFactory the service manager to be used if needed
- * @param regKey the registryKey
- *
- * @see com.sun.star.comp.loader.JavaLoader
- */
- public static XSingleServiceFactory __getServiceFactory(String implName,
-
XMultiServiceFactory multiFactory,
- XRegistryKey
regKey) {
- xMSF= multiFactory;
- XSingleServiceFactory xSingleServiceFactory = null;
- if (implName.equals(_XMergeBridge.class.getName()) ) {
- xSingleServiceFactory =
FactoryHelper.getServiceFactory(_XMergeBridge.class,
-
_XMergeBridge.__serviceName,
-
multiFactory,
- regKey);
- }
-
- return xSingleServiceFactory;
- }
-}
diff --git a/xmerge/source/bridge/manifest.mf b/xmerge/source/bridge/manifest.mf
deleted file mode 100644
index 1c63d9e6d76f..000000000000
--- a/xmerge/source/bridge/manifest.mf
+++ /dev/null
@@ -1,2 +0,0 @@
-RegistrationClassName: XMergeBridge
-UNO-Type-Path:
diff --git a/xmerge/source/xmerge/converter.dtd
b/xmerge/source/xmerge/converter.dtd
deleted file mode 100644
index 81ecbe69d80e..000000000000
--- a/xmerge/source/xmerge/converter.dtd
+++ /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 .
--->
-
-<!-- converter.dtd
-
- Author: Brian Cameron
-
- This DTD file is provided for documentation and development
- purposes, the converter does not actually validate the
- converter.xml files that it processes. Plug-ins will not
- work properly, though, if the converter.xml does not
- conform to this DTD specification. -->
-
-<!-- The root node, converters, must contain one or more
- converter nodes, each corresponds to a converter plug-in. -->
-
-<!ELEMENT converters (converter)+>
-
-<!-- The converter node must contain two elements:
- type - The convert-from mime-type.
- version - The version of the plug-in.
-
- Each converter node must contain these child nodes:
- converter-display-name - Name of the converter
- converter-class-impl - The PluginFactory implementation for
- the plugin
- converter-targets - Can be one or more of these nodes. Each
- contains only a "type" element. This
- "type" element specifies the convert-to
- mime-type.
-
- Each converter node may contain these child nodes:
- converter-description - Descriptive description of the plug-in.
- converter-vendor - Plug-in vendor name
- converter-xslt-serialize - The URL of the xsl stylesheet for
- serialization. This stylesheet must
- exist if the xslt plugin implementation
- is to be used. It is assumed that the
- plug-in specified via converter-class-impl
- will make use of this value.
- converter-xslt-deserialize - The URL of the xsl stylesheet for
- deserialization. This stylesheet must
- exist if the xslt plugin implementation
- is to be used. It is assumed that the
- plug-in specified via converter-class-impl
- will make use of this value.
- -->
-
-<!ELEMENT converter (converter-display-name,
- converter-description?,
- converter-vendor?,
- converter-class-impl,
- converter-xslt-serialize?,
- converter-xslt-deserialize?,
- converter-target+)>
-
-<!ATTLIST converter type CDATA #REQUIRED>
-<!ATTLIST converter version CDATA #REQUIRED>
-
-<!ELEMENT converter-display-name (#PCDATA)>
-<!ELEMENT converter-description (#PCDATA)>
-<!ELEMENT converter-vendor (#PCDATA)>
-<!ELEMENT converter-class-impl (#PCDATA)>
-<!ELEMENT converter-xslt-serialize (#PCDATA)>
-<!ELEMENT converter-xslt-deserialize (#PCDATA)>
-
-<!ELEMENT converter-target EMPTY>
-
-<!ATTLIST converter-target type CDATA #REQUIRED>
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java
b/xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java
deleted file mode 100644
index 728aa05ae120..000000000000
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java
+++ /dev/null
@@ -1,233 +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;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Iterator;
-
-import org.openoffice.xmerge.util.registry.ConverterInfo;
-
-/**
- * The {@code Convert} class manages a conversion from one mime-type to
another.
- *
- * <p>The {@code ConvertFactory} is responsible for returning the appropriate
- * {@code Convert} class for a specified conversion. This class is responsible
- * for all interactions with the {@code PluginFactory} implementation.</p>
- *
- * @see ConverterFactory
- * @see PluginFactory
- * @see org.openoffice.xmerge.util.registry.ConverterInfo
- */
-public class Convert implements Cloneable {
-
- /** ConvertInfo that corresponds to the from-mime/to-mime conversion. */
- private final ConverterInfo ci;
-
- /**
- * {@code true} if converting to the Office format, {@code false} if
- * converting to the device format.
- */
- private final boolean toOffice;
-
- /** Holds the convert input data. */
- private final ConvertData inputCD = new ConvertData();
-
- /**
- * Construct a Convert class with specified {@code ConvertInfo} registry
- * information.
- *
- * @param ci A {@code ConvertInfo} object containing registry
- * information corresponding to a specific plug-in.
- * @param toOffice {@code true} if converting to the Office format,
- * {@code false} if converting to the device format.
- */
- public Convert(ConverterInfo ci, boolean toOffice) {
- this.ci = ci;
- this.toOffice = toOffice;
- }
-
- /**
- * Adds an {@code InputStream} to be used as input by the {@code Convert}
- * class.
- *
- * <p>It is possible that many files need to be converted into a single
- * output {@code Document}, so this function may be called more than one
- * time. It is the plug-in's responsibility to know how to handle the
input.
- * </p>
- *
- * @param name The name corresponding to the {@code InputStream}.
- * @param is {@code InputStream} to be used as input.
- *
- * @throws IOException If any I/O error occurs.
- */
- public void addInputStream(String name, InputStream is)
- throws IOException {
-
- Document inputDoc;
-
- if (toOffice) {
- inputDoc = ci.getPluginFactory().createDeviceDocument(name, is);
- } else {
- inputDoc = ci.getPluginFactory().createOfficeDocument(name, is);
- }
- inputCD.addDocument(inputDoc);
- }
-
- /**
- * Adds an {@code InputStream} to be used as input by the {@code Convert}
- * class.
- *
- * <p>It is possible that many files need to be converted into a single
- * output {@code Document}, so this function may be called more than one
- * time. It is the plug-in's responsibility to know how to handle the
input.
- * </p>
- *
- * @param name The name corresponding to the {@code InputStream}.
- * @param is {@code InputStream} to be used as input.
- * @param isZip {@code boolean} to identify that incoming stream is *
zipped.
- *
- * @throws IOException If any I/O error occurs.
- */
- public void addInputStream(String name, InputStream is,boolean isZip)
- throws IOException {
-
- Document inputDoc;
-
- if (toOffice) {
- inputDoc = ci.getPluginFactory().createDeviceDocument(name, is);
- } else {
- inputDoc = ci.getPluginFactory().createOfficeDocument(name, is,
isZip);
- }
- inputCD.addDocument(inputDoc);
- }
-
-
- /**
- * Returns a {@code DocumentMerger} for the given {@code Document}.
- *
- * @param origDoc The {@code Document} were later changes will be merged
to.
- *
- * @return The {@code DocumentMerger} object for the given document.
- *
- * @throws IOException If any I/O error occurs.
- */
- public DocumentMerger getDocumentMerger(Document origDoc) throws
IOException {
- DocumentMergerFactory myDocMergerFactory = ci.getDocMergerFactory();
- DocumentMerger merger =
myDocMergerFactory.createDocumentMerger(origDoc);
- return merger;
- }
-
- /**
- * Resets the input queue, so that the user can use this class to perform
- * another conversion.
- *
- * <p>This causes the {@code addInputStream} method to accept input for the
- * next conversion.</p>
- */
- private void reset() {
- inputCD.reset();
- }
-
- /**
- * Clones a {@code Convert} object so another Convert object can do the
same
- * conversion.
- *
- * <p>{@code InputStream} objects passed in via calls to the
- * {@code addInputStream} method are not copied.</p>
- *
- * @return The cloned {@code Convert} object.
- */
- @Override
- public Object clone() {
-
- Convert aClone = null;
-
- try {
- aClone = (Convert) super.clone();
- aClone.reset();
- }
- catch (CloneNotSupportedException e) {
- System.out.println("Convert clone could not be created");
- }
- return aClone;
- }
-
- /**
- * Convert the input specified in calls to the {@code addInputStream}
- * method to the output format specified by this {@code Convert} class.
- *
- * @return The output data.
- *
- * @throws ConvertException If any conversion error occurs.
- * @throws IOException If any I/O error occurs.
- */
- public ConvertData convert() throws ConvertException, IOException {
-
- ConvertData dataOut = new ConvertData();
-
- if (toOffice) {
-
- // From device format to Office format
-
- DocumentDeserializerFactory myDocDeserializerFactory =
- ci.getDocDeserializerFactory();
- DocumentDeserializer deser =
- myDocDeserializerFactory.createDocumentDeserializer(inputCD);
- Document deviceDoc = deser.deserialize();
-
-
- dataOut.addDocument(deviceDoc);
- return dataOut;
-
- } else {
-
- // From Office format to device format
-
- DocumentSerializerFactory myDocSerializerFactory =
- ci.getDocSerializerFactory();
-
- Iterator<Object> e = inputCD.getDocumentEnumeration();
-
- Document doc = (Document) e.next();
- DocumentSerializer ser =
myDocSerializerFactory.createDocumentSerializer(doc);
- dataOut = ser.serialize();
-
- return dataOut;
- }
- }
-
- /**
- * Returns the appropriate "Office" {@code Document} object for
- * this plug-in.
- *
- * @param name The name of the {@code Document} to create.
- * @param is The {@code InputStream} corresponding to the
- * {@code Document} to create.
- *
- * @return The appropriate "Office" {@code Document} object for
- * this plug-in.
- *
- * @throws IOException If any I/O error occurs.
- */
- public Document getOfficeDocument(String name, InputStream is)
- throws IOException {
- return ci.getPluginFactory().createOfficeDocument(name, is);
- }
-}
\ No newline at end of file
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertData.java
b/xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertData.java
deleted file mode 100644
index d8f276bc3610..000000000000
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertData.java
+++ /dev/null
@@ -1,101 +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;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-
-/**
- * {@code ConvertData} is used as a container for passing {@code Document}
- * objects in and out of the {@code Convert} class.
- *
- * <p>The {@code ConvertData} contains a {@code String} name and a
- * {@code Vector} of {@code Document} objects.</p>
- */
-public class ConvertData {
-
- /**
- * Vector of {@code Document} objects.
- */
- private final ArrayList<Object> v = new ArrayList<Object>();
-
- /**
- * Name of the {@code ConvertData} object.
- */
- private String name;
-
- /**
- * Resets ConvertData.
- *
- * <p>This empties all {@code Document} objects from this class. This
allows
- * reuse of a {@code ConvertData}.</p>
- */
- public void reset() {
- name = null;
- v.clear();
- }
-
- /**
- * Returns the {@code Document} name.
- *
- * @return The {@code Document} name.
- */
- public String getName() {
- return name;
- }
-
- /**
- * Sets the {@code Document} name.
- *
- * @param docName The name of the {@code Document}.
- */
- public void setName(String docName) {
- name = docName;
- }
-
- /**
- * Adds a {@code Document} to the vector.
- *
- * @param doc The {@code Document} to add.
- */
- public void addDocument(Document doc) {
- v.add(doc);
- }
-
- /**
- * Gets an {@code Enumeration} to access the {@code Vector} of
- * {@code Document} objects.
- *
- * @return The {@code Enumeration} to access the {@code Vector} of
- * {@code Document} objects.
- */
- public Iterator<Object> getDocumentEnumeration() {
- Iterator<Object> enumerate = v.iterator();
- return enumerate;
- }
-
- /**
- * Gets the number of {@code Document} objects currently stored.
- *
- * @return The number of {@code Document} objects currently stored.
- */
- public int getNumDocuments() {
- return v.size();
- }
-}
diff --git
a/xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertException.java
b/xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertException.java
deleted file mode 100644
index 6d05e8d26f5f..000000000000
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertException.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;
-
-/**
- * This {@code Exception} is thrown by convert algorithms.
- */
-public class ConvertException extends Exception {
-
- /**
- * Exception thrown by convert algorithms.
- *
- * @param message Message to be included in the {@code Exception}.
- */
- public ConvertException(String message) {
- super(message);
- }
-}
\ No newline at end of file
diff --git
a/xmerge/source/xmerge/java/org/openoffice/xmerge/ConverterCapabilities.java
b/xmerge/source/xmerge/java/org/openoffice/xmerge/ConverterCapabilities.java
deleted file mode 100644
index da36f7da2cb4..000000000000
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/ConverterCapabilities.java
+++ /dev/null
@@ -1,54 +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;
-
-/**
- * A {@code ConverterCapabilities} object is used by {@code DocumentMerger}
- * implementations.
- *
- * <p>The {@code ConverterCapabilities} indicates which "Office" XML
- * tags are supported by the "Device" format.</p>
- *
- * @see org.openoffice.xmerge.PluginFactory
- * @see org.openoffice.xmerge.DocumentMerger
- */
-public interface ConverterCapabilities {
-
- /**
- * Test to see if the device document format supports the tag in question.
- *
- * @param tag The tag to check.
- *
- * @return {@code true} if the device format supports the tag,
- * {@code false} otherwise.
- */
- boolean canConvertTag(String tag);
-
- /**
- * Test to see if the device document format supports the tag attribute in
- * question.
- *
- * @param tag The tag to check.
- * @param attribute The tag attribute to check.
- *
- * @return {@code true} if the device format supports the attribute,
- * {@code false} otherwise.
- */
- boolean canConvertAttribute(String tag, String attribute);
-}
\ No newline at end of file
diff --git
a/xmerge/source/xmerge/java/org/openoffice/xmerge/ConverterFactory.java
b/xmerge/source/xmerge/java/org/openoffice/xmerge/ConverterFactory.java
deleted file mode 100644
index 5c1c246cb066..000000000000
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/ConverterFactory.java
+++ /dev/null
@@ -1,85 +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;
-
-import org.openoffice.xmerge.util.registry.ConverterInfo;
-import org.openoffice.xmerge.util.registry.ConverterInfoMgr;
-
-/**
- * Factory that provides access to {@code Convert} objects, which are used to
do
- * a conversion.
- *
- * <p>The {@code ConvertFactory} does this via the {@code ConvertInfoMgr} which
- * maintains a list of which {@code Convert} objects are available and their
- * capabilities.</p>
- *
- * @see Convert
- * @see org.openoffice.xmerge.util.registry.ConverterInfoMgr
- */
-public class ConverterFactory {
-
- /**
- * Returns the {@code Convert} object that converts the specified
device/office
- * mime type conversion.
- *
- * <p>If there are multiple {@code Converter} objects registered that
support
- * this conversion, only the first is returned.</p>
- *
- * @param mimeTypeIn The mime input type.
- * @param mimeTypeOut The mime output type.
- *
- * @return The first {@code Convert} object that supports the specified
- * conversion.
- */
- public Convert getConverter(String mimeTypeIn, String mimeTypeOut) {
-
- ConverterInfo foundInfo;
- boolean toOffice;
-
- toOffice = ConverterInfo.isValidOfficeType(mimeTypeOut);
-
- // findConverterInfo expects the second parameter to be the
- // destination MimeType
- if (toOffice)
- foundInfo = ConverterInfoMgr.findConverterInfo(mimeTypeIn,
mimeTypeOut);
- else
- foundInfo = ConverterInfoMgr.findConverterInfo(mimeTypeOut,
mimeTypeIn);
-
- if (foundInfo != null)
- return getConverter(foundInfo, toOffice);
- else
- return null;
- }
-
- /**
- * Returns the {@code Convert} object that is described by the
- * {@code ConverterInfo} parameter.
- *
- * @param ci The {@code ConverterInfo} describing the converter.
- * @param toOffice {@code true} to convert to office, {@code false} to
- * convert to device.
- *
- * @return The {@code Convert} object
- */
- public Convert getConverter(ConverterInfo ci, boolean toOffice) {
-
- Convert myConvert = new Convert(ci, toOffice);
- return myConvert;
- }
-}
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/Document.java
b/xmerge/source/xmerge/java/org/openoffice/xmerge/Document.java
deleted file mode 100644
index 851c1539dfba..000000000000
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/Document.java
+++ /dev/null
@@ -1,79 +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;
-
-import java.io.OutputStream;
-import java.io.InputStream;
-import java.io.IOException;
-
-/**
- * A {@code Document} represents any {@code Document} to be converted and the
- * resulting {@code Document} from any conversion.
- *
- * <p>It is created by the {@code PluginFactory} object's {@link
- * org.openoffice.xmerge.PluginFactory#createOfficeDocument
createOfficeDocument}
- * method or the {@link
org.openoffice.xmerge.PluginFactory#createDeviceDocument
- * createDeviceDocument} method.</p>
- *
- * @see org.openoffice.xmerge.PluginFactory
- */
-public interface Document {
-
- /**
- * Writes out the {@code Document} content to the specified
- * {@code OutputStream}.
- *
- * <p>This method may not be thread-safe. Implementations may or may not
- * synchronize this method. User code (i.e. caller) must make sure that
- * calls to this method are thread-safe.</p>
- *
- * @param os {@code OutputStream} to write out the {@code Document}
- * content.
- *
- * @throws IOException If any I/O error occurs.
- */
- void write(OutputStream os) throws IOException;
-
- /**
- * Reads the content from the {@code InputStream} into the {@code
Document}.
- *
- * <p>This method may not be thread-safe. Implementations may or may not
- * synchronize this method. User code (i.e. caller) must make sure that
- * calls to this method are thread-safe.</p>
- *
- * @param is {@code InputStream} to read in the {@code Document}
content.
- *
- * @throws IOException If any I/O error occurs.
- */
- void read(InputStream is) throws IOException;
-
- /**
- * Returns the {@code Document} name with no file extension.
- *
- * @return The {@code Document} name with no file extension.
- */
- String getName();
-
- /**
- * Returns the {@code Document} name with file extension.
- *
- * @return The {@code Document} name with file extension.
- */
- String getFileName();
-}
\ No newline at end of file
diff --git
a/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentDeserializer.java
b/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentDeserializer.java
deleted file mode 100644
index 1bfadfcfef28..000000000000
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentDeserializer.java
+++ /dev/null
@@ -1,53 +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;
-
-import java.io.IOException;
-
-/**
- * A {@code DocumentDeserializer} represents a converter that converts
- * "Device" {@code Document} objects into the "Office"
- * {@code Document} format.
- *
- * <p>The {@code DocumentDeserializer} object is created by the
- * {@code PluginFactory} {@link
- * org.openoffice.xmerge.DocumentDeserializerFactory#createDocumentDeserializer
- * createDocumentDeserializer} method. When it is constructed, a
- * {@code ConvertData} object is passed in to be used as input.</p>
- *
- * @see org.openoffice.xmerge.PluginFactory
- * @see org.openoffice.xmerge.DocumentDeserializerFactory
- */
-public interface DocumentDeserializer {
-
- /**
- * Convert the data passed into the {@code DocumentDeserializer}
constructor
- * into the "Office" {@code Document} format.
- *
- * <p>This method may or may not be thread-safe. It is expected that the
- * user code does not call this method in more than one thread. And for
- * most cases, this method is only done once.</p>
- *
- * @return The resulting {@code Document} object from conversion.
- *
- * @throws ConvertException If any Convert error occurs.
- * @throws IOException If any I/O error occurs.
- */
- Document deserialize() throws ConvertException, IOException;
-}
\ No newline at end of file
diff --git
a/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentDeserializer2.java
b/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentDeserializer2.java
deleted file mode 100644
index 95f34413ef31..000000000000
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentDeserializer2.java
+++ /dev/null
@@ -1,61 +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;
-
-import java.io.IOException;
-
-/**
- * A {@code DocumentDeserializer} represents a converter that converts
- * "Device" {@code Document} objects into the "Office"
- * {@code Document} format.
- *
- * <p>The {@code PluginFactory} {@link
- * org.openoffice.xmerge.DocumentDeserializerFactory#createDocumentDeserializer
- * createDocumentDeserializer} method creates a {@code DocumentDeserializer},
- * which may or may not implement {@code DocumentDeserializer2}. When it is
- * constructed, a {@code ConvertData} object is passed in to be used as input.
- * </p>
- *
- * @see org.openoffice.xmerge.PluginFactory
- * @see org.openoffice.xmerge.DocumentDeserializerFactory
- */
-public interface DocumentDeserializer2 extends DocumentSerializer {
-
- /**
- * Convert the data passed into the {@code DocumentDeserializer2}
- * constructor into the "Office" {@code Document} format.
- *
- * <p>The URL's passed may be used to resolve links and to choose the name
- * of the output office document.</p>
- *
- * <p>This method may or may not be thread-safe. It is expected that the
- * user code does not call this method in more than one thread. And for
- * most cases, this method is only done once.</p>
- *
- * @return The resulting {@code Document} object from conversion.
- *
- * @param deviceURL URL of the device document (may be null if
unknown)
- * @param officeURL URL of the office document (may be null if
unknown)
- *
- * @throws ConvertException If any Convert error occurs.
- * @throws IOException If any I/O error occurs.
- */
- Document deserialize(String deviceURL, String officeURL) throws
- ConvertException, IOException;
-}
\ No newline at end of file
diff --git
a/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentDeserializerFactory.java
b/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentDeserializerFactory.java
deleted file mode 100644
index 3d10d03bfe5d..000000000000
---
a/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentDeserializerFactory.java
+++ /dev/null
@@ -1,51 +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;
-
-/**
- * A {@code DocumentDeserializer} object is used to convert from the
- * "Device" {@code Document} format to the "Office"
- * {@code Document} format.
- *
- * <p>All plug-in implementations of the {@code PluginFactory} interface that
- * also support deserialization must also implement this interface.</p>
- *
- * @see PluginFactory
- * @see DocumentDeserializer
- */
-public interface DocumentDeserializerFactory {
-
- /**
- * The {@code DocumentDeserializer} is used to convert from the
- * "Device" {@code Document} format to the "Office"
- * {@code Document} format.
- *
- * <p>The {@code ConvertData} object is passed along to the created
- * {@code DocumentDeserializer} via its constructor. The {@code
ConvertData}
- * is read and converted when the {@code DocumentDeserializer} object's
- * {@code deserialize} method is called.</p>
- *
- * @param cd {@code ConvertData} object that the created
- * {@code DocumentDeserializer} object uses as input.
- *
- * @return A {@code DocumentDeserializer} object.
- */
-
- DocumentDeserializer createDocumentDeserializer(ConvertData cd);
-}
\ No newline at end of file
diff --git
a/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentMerger.java
b/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentMerger.java
deleted file mode 100644
index 3ec19e7484be..000000000000
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentMerger.java
+++ /dev/null
@@ -1,74 +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;
-
-/**
- * A {@code DocumentMerger} can merge changes from a modified
"Device"
- * {@code Document} to the assigned original "Office" {@code
Document}.
- *
- * <p>Merge is useful when an {@code OfficeDocument} is converted to a
- * "Device" {@code Document} format, and the "Device"
- * {@code Document} version is modified. Those changes can be merged back into
- * the original {@code OfficeDocument} with the merger. The merger is capable
- * of doing this even if the "Device" format is lossy in
- * comparison to the {@code OfficeDocument} format.</p>
- *
- * <p>The {@code ConverterCapabilities} object is what the DocumentMerger
- * utilizes to know how the "Office" {@code Document} tags are
- * supported in the "Device" format.</p>
- *
- * <p>The {@code DocumentMerger} object is created by the
- * {@code DocumentMergerFactory} {@link
- * org.openoffice.xmerge.DocumentMergerFactory#createDocumentMerger
- * createDocumenMerger} method. When it is constructed, the "Original
- * Office" {@code Document} object is passed in to be used as input.</p>
- *
- * @see org.openoffice.xmerge.PluginFactory
- * @see org.openoffice.xmerge.DocumentMergerFactory
- * @see org.openoffice.xmerge.ConverterCapabilities
- */
-public interface DocumentMerger {
-
- /**
- * This method will find the changes that had happened in the
- * {@code modifiedDoc} {@code Document} object given the designated
original
- * {@code Document}.
- *
- * <p>Note that this process may need the knowledge of the conversion
- * process since some conversion process are lossy. Items/Data that are
- * lost during the conversion process are not classified as changes. The
- * main target of this method is to apply the changes done in
- * {@code modifiedDoc} into the assigned original {@code Document} object,
- * thus it also will try to preserve items that were originally in the
- * original {@code Document}, but never got transferred during the
- * {@link org.openoffice.xmerge.DocumentSerializer#serialize serialize}
- * process/method call. After this method call, the original
- * {@code Document} object will contain the changes applied.</p>
- *
- * <p>This method may or may not be thread-safe. Also, it is expected that
- * the user uses only one instance of a {@code DocumentMerger} object per
- * merge process. Create another {@code DocumentMerger} object for another
- * merge process.</p>
- *
- * @param modifiedDoc device {@code Document} object.
- *
- * @throws MergeException If any merge error occurs.
- */
- void merge(Document modifiedDoc) throws MergeException;
-}
diff --git
a/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentMergerFactory.java
b/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentMergerFactory.java
deleted file mode 100644
index e665d662a50c..000000000000
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentMergerFactory.java
+++ /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 .
- */
-
-package org.openoffice.xmerge;
-
-/**
- * All plug-in implementations of the {@code PluginFactory} interface that also
- * support merging must also implement this interface.
- *
- * <p>Merge is useful when an {@code OfficeDocument} is converted to a
- * "Device" {@code Document} format, and the "Device"
- * {@code Document} version is modified.</p>
- *
- * <p>Those changes can be merged back into the original {@code OfficeDocument}
- * with the merger. The merger is capable of doing this even if the
- * "Device" format is lossy in comparison to the {@code
OfficeDocument}
- * format.</p>
- *
- * @see PluginFactory
- * @see DocumentMerger
- * @see ConverterCapabilities
- */
-public interface DocumentMergerFactory {
-
- /**
- * Create a {@code DocumentMerger} object given a {@code Document} object.
- *
- * @param doc {@code Document} object that the created
- * {@code DocumentMerger} object uses as a base {@code
Document}
- * for merging changes into.
- *
- * @return A {@code DocumentMerger} object or {@code null} if none exists.
- */
- DocumentMerger createDocumentMerger(Document doc);
-}
\ No newline at end of file
diff --git
a/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentSerializer.java
b/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentSerializer.java
deleted file mode 100644
index 87f5da1c2fe4..000000000000
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentSerializer.java
+++ /dev/null
@@ -1,54 +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;
-
-import java.io.IOException;
-
-/**
- * A {@code DocumentSerializer} represents a converter that converts a
- * "Office" {@code Document} to a "Device" {@code Document}
- * format.
- *
- * <p>The {@code DocumentSerializer} object is created by the
- * {@code PluginFactory} {@link
- * org.openoffice.xmerge.DocumentSerializerFactory#createDocumentSerializer
- * createDocumentSerializer} method. When it is constructed, an
- * "Office" {@code Document} object is passed in to be used as input.
- * </p>
- *
- * @see org.openoffice.xmerge.PluginFactory
- * @see org.openoffice.xmerge.DocumentSerializerFactory
- */
-public interface DocumentSerializer {
-
- /**
- * Convert the data passed into the {@code DocumentSerializer} constructor
- * into the "Device" {@code Document} format.
- *
- * <p>This method may or may not be thread-safe. It is expected that the
- * user code does not call this method in more than one thread. And for
- * most cases, this method is only done once.</p>
- *
- * @return {@code ConvertData} object to pass back the converted data.
- *
- * @throws ConvertException If any conversion error occurs.
- * @throws IOException If any I/O error occurs.
- */
- ConvertData serialize() throws ConvertException, IOException;
-}
diff --git
a/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentSerializer2.java
b/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentSerializer2.java
deleted file mode 100644
index 56a1a1116411..000000000000
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentSerializer2.java
+++ /dev/null
@@ -1,63 +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;
-
-import java.io.IOException;
-
-/**
- * A {@code DocumentSerializer2} represents a converter that converts a
- * "Office" {@code Document} to a "Device" {@code Document}
- * format.
- *
- * <p>The {@code PluginFactory} {@link
- * org.openoffice.xmerge.DocumentSerializerFactory#createDocumentSerializer
- * createDocumentSerializer} method creates a {@code DocumentSerializer}, which
- * may or may not implement {@code DocumentSerializer2}. When it is
constructed,
- * a "Office" {@code Document} object is passed in to be used as
- * input.</p>
- *
- * @see org.openoffice.xmerge.PluginFactory
- * @see org.openoffice.xmerge.DocumentSerializerFactory
- */
-public interface DocumentSerializer2 extends DocumentSerializer {
-
- /**
- * Convert the data passed into the {@code DocumentSerializer2} constructor
- * into the "Device" {@code Document} format.
- *
- * <p>The URL's passed may be used to resolve links and to name the output
- * device document(s).</p>
- *
- * <p>This method may or may not be thread-safe. It is expected that the
- * user code does not call this method in more than one thread. And for
- * most cases, this method is only done once.</p>
- *
- * @return {@code ConvertData} object to pass back the converted data.
- *
- * @param officeURL URL of the office document (may be null if
- * unknown)
- * @param deviceURL URL of the device document (may be null if
- * unknown)
- *
- * @throws ConvertException If any conversion error occurs.
- * @throws IOException If any I/O error occurs.
- */
- ConvertData serialize(String officeURL, String deviceURL) throws
- ConvertException, IOException;
-}
\ No newline at end of file
diff --git
a/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentSerializerFactory.java
b/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentSerializerFactory.java
deleted file mode 100644
index e4852ff1e182..000000000000
---
a/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentSerializerFactory.java
+++ /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 .
- */
-
-package org.openoffice.xmerge;
-
-/**
- * A {@code DocumentSerializer} object is used to convert from the
- * "Office" {@code Document} format to the "Device"
- * {@code Document} format.
- *
- * <p>All plug-in implementations of the {@code PluginFactory} interface that
- * also support serialization must also implement this interface.</p>
- *
- * @see PluginFactory
- * @see DocumentSerializer
- */
-public interface DocumentSerializerFactory {
-
- /**
- * The {@code DocumentSerializer} is used to convert from the
- * "Office" {@code Document} format to the "Device"
- * {@code Document} format.
- *
- * <p>The {@code ConvertData} object is passed along to the created
- * {@code DocumentSerializer} via its constructor. The {@code ConvertData}
- * is read and converted when the {@code DocumentSerializer} object's
- * {@code serialize} method is called.</p>
- *
- * @param doc {@code Document} object that the created
- * {@code DocumentSerializer} object uses as input.
- *
- * @return A <code>DocumentSerializer</code> object.
- */
- DocumentSerializer createDocumentSerializer(Document doc);
-}
diff --git
a/xmerge/source/xmerge/java/org/openoffice/xmerge/MergeException.java
b/xmerge/source/xmerge/java/org/openoffice/xmerge/MergeException.java
deleted file mode 100644
index c592bfb6504d..000000000000
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/MergeException.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;
-
-/**
- * This {@code Exception} is thrown by merge algorithms.
- */
-public class MergeException extends Exception {
-
- /**
- * Exception thrown by merge algorithms.
- *
- * @param message Message to be included in the {@code Exception}.
- */
- public MergeException(String message) {
- super(message);
- }
-}
\ No newline at end of file
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/PluginFactory.java
b/xmerge/source/xmerge/java/org/openoffice/xmerge/PluginFactory.java
deleted file mode 100644
index cb2e07a4a788..000000000000
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/PluginFactory.java
+++ /dev/null
@@ -1,163 +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;
-
-import org.openoffice.xmerge.util.registry.ConverterInfo;
-import java.io.InputStream;
-import java.io.IOException;
-
-/**
- * A {@code PluginFactory} encapsulates the conversions from one {@code
Document}
- * format to another.
- *
- * <p>It provides conversions in both directions. Refer to the
- * <a href="package-summary.html#package_description"> package description</a>
- * for its usage.</p>
- *
- * <p>Conversion from the "Office" {@code Document} format to a
- * "Device" {@code Document} format may be lossy, i.e. some
- * information may be lost. If a plug-in implements the
- * {@code DocumentMergerFactory} interface, then there is the possibility for
- * merging the changes done on the "Device" {@code Document} back to
- * the original "Office" {@code Document} via the {@code
DocumentMerger}
- * interface.</p>
- *
- * <p>Plug-ins that convert from the "Device" {@code Document} format
- * to the "Office" {@code Document} format must implement the
- * {@code DocumentDeserializerFactory} interface. Plug-ins that convert from
- * the "Office" {@code Document} format to the "Device"
- * format must implement the {@code DocumentSerializerFactory} interface.</p>
- *
- * <p>All plug-ins should have an associated Plug-in Configuration XML File
which
- * describes the capabilities of the plug-in. If the plug-in is bundled in a
- * jarfile, then this XML file is also bundled with the jarfile. The data in
- * the XML file is managed by the {@code ConverterInfo} object. The
- * {@code ConverterInfoMgr} manages a registry of all {@code ConverterInfo}
- * objects. For more information about this XML file, refer to
- * <a
href="converter/xml/sxc/package-summary.html">org.openoffice.xmerge.util.registry</a>.
- * </p>
- *
- * @see Document
- * @see DocumentSerializer
- * @see DocumentSerializerFactory
- * @see DocumentDeserializer
- * @see DocumentDeserializerFactory
- * @see DocumentMerger
- * @see DocumentMergerFactory
- * @see ConverterInfo
- * @see org.openoffice.xmerge.util.registry.ConverterInfoMgr
- */
-
-public abstract class PluginFactory {
-
- /**
- * Cached {@code ConvertInfo} object.
- */
- private final ConverterInfo ciCache;
-
- /**
- * Constructor that caches the {@code ConvertInfo} that corresponds to the
- * registry information for this plug-in.
- *
- * @param ci {@code ConvertInfo} object.
- */
- public PluginFactory(ConverterInfo ci) {
- ciCache=ci;
- }
-
- /**
- * Returns the {@code ConvertInfo} that corresponds to this plug-in.
- *
- * @return The {@code ConvertInfo} that corresponds to this plug-in.
- */
- public ConverterInfo getConverterInfo () {
- return ciCache;
- }
-
- /**
- * Create a {@code Document} object that corresponds to the Office data
- * passed in via the {@code InputStream} object.
- *
- * <p>This abstract method must be implemented for each plug-in.</p>
- *
- * <p>This method will read from the given {@code InputStream} object. The
- * returned {@code Document} object will contain the necessary data for the
- * other objects created by the {@code PluginFactory} to process, like a
- * {@code DocumentSerializer} object and a {@code DocumentMerger}
object.</p>
- *
- * @param name The {@code Document} name.
- * @param is {@code InputStream} object corresponding to the
- * {@code Document}.
- *
- * @return A {@code Document} object representing the particular
- * {@code Document} format for the {@code PluginFactory}.
- *
- * @throws IOException If any I/O error occurs.
- */
- public abstract Document createOfficeDocument(String name, InputStream is)
- throws IOException;
-
- /**
- * Create a {@code Document} object that corresponds to the Office data
- * passed in via the {@code InputStream} object.
- *
- * <p>This abstract method must be implemented for each plug-in.</p>
- *
- * <p>This method will read from the given {@code InputStream} object. The
- * returned {@code Document} object will contain the necessary data for the
- * other objects created by the {@code PluginFactory} to process, like a
- * {@code DocumentSerializer} object and a {@code DocumentMerger}
object.</p>
- *
- * @param name The {@code Document} name.
- * @param is {@code InputStream} object corresponding to the
- * {@code Document}.
- * @param isZip {@code boolean} to show that the created office document
- * is to be zipped.
- *
- * @return A {@code Document} object representing the particular
- * {@code Document} format for the {@code PluginFactory}.
- *
- * @throws IOException If any I/O error occurs.
- */
- public abstract Document createOfficeDocument(String name, InputStream is,
- boolean isZip) throws IOException;
-
- /**
- * Create a {@code Document} object that corresponds to the device data
- * passed in via the {@code InputStream} object.
- *
- * <p>This abstract method must be implemented for each plug-in.</p>
- *
- * <p>This method will read from the given {@code InputStream} object. The
- * returned {@code Document} object will contain the necessary data for the
- * other objects created by the {@code PluginFactory} to process, like a
-e
... etc. - the rest is truncated
