[Libreoffice-commits] .: 2 commits - xmerge/source xmerge/workben

Bjoern Michaelsen bmichaelsen at kemper.freedesktop.org
Tue Jun 5 06:32:57 PDT 2012


 dev/null                                                                                   |binary
 xmerge/source/palmtests/README                                                             |   50 
 xmerge/source/palmtests/bin/README                                                         |    6 
 xmerge/source/palmtests/bin/rd                                                             |   24 
 xmerge/source/palmtests/bin/spose                                                          |  108 
 xmerge/source/palmtests/bin/verify_sane.pl                                                 |  110 
 xmerge/source/palmtests/qa-wrapper/bin/qa_comparator.pl                                    |  257 -
 xmerge/source/palmtests/qa-wrapper/bin/qa_test_driver.pl                                   |  846 ---
 xmerge/source/palmtests/qa-wrapper/bin/run-convtest                                        |  538 --
 xmerge/source/palmtests/qa-wrapper/env/master.env                                          |   85 
 xmerge/source/palmtests/qa-wrapper/lists/master.list                                       |   55 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/a_animatedgif.pdb             |    6 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/a_bolddoc.pdb                 |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/a_bookmarks.pdb               |   10 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/a_bulletorderedlist.pdb       |    8 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/a_emptydoc.pdb                |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/a_firstlineindent.pdb         |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/a_fontsize.pdb                |    6 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/a_heading.pdb                 |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/a_heading1.pdb                |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/a_heading2.pdb                |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/a_hyperlink.pdb               |    6 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/a_justified.pdb               |    4 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/a_linebreaks.pdb              |    4 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/a_linespacing.pdb             |   12 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/a_numberorderedlist.pdb       |    9 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/a_pagebreak.pdb               |    4 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/a_paragraph.pdb               |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/a_simple01.pdb                |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/a_simple02.pdb                |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/a_simple03.pdb                |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/a_simple04.pdb                |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/a_simple05.pdb                |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/a_standard.pdb                |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/a_subscript.pdb               |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/a_superscript.pdb             |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/a_symbols.pdb                 |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/a_tab.pdb                     |    8 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/a_table.pdb                   |    2 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/a_textspan.pdb                |    3 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/a_unorderedlist.pdb           |   20 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/a_wordwrap.pdb                |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/c_addition-Sheet1.pdb         |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/c_addition-Sheet2.pdb         |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/c_addition-Sheet3.pdb         |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/c_alignment-Sheet1.pdb        |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/c_alignment-Sheet2.pdb        |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/c_alignment-Sheet3.pdb        |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/c_backwardrange-Sheet1.pdb    |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/c_backwardrange-Sheet2.pdb    |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/c_backwardrange-Sheet3.pdb    |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/c_basic-Sheet1.pdb            |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/c_basic-Sheet2.pdb            |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/c_basic-Sheet3.pdb            |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/c_boolean-Sheet1.pdb          |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/c_boolean-Sheet2.pdb          |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/c_boolean-Sheet3.pdb          |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/c_cellcurrencyalue-Sheet1.pdb |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/c_cellcurrencyalue-Sheet2.pdb |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/c_cellcurrencyalue-Sheet3.pdb |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/c_cellpercentvalue-Sheet1.pdb |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/c_cellpercentvalue-Sheet2.pdb |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/c_cellpercentvalue-Sheet3.pdb |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/c_cellstringvalue-Sheet1.pdb  |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/c_cellstringvalue-Sheet2.pdb  |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/c_cellstringvalue-Sheet3.pdb  |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/c_columnswidth-Sheet1.pdb     |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/c_columnswidth-Sheet2.pdb     |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/c_columnswidth-Sheet3.pdb     |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/c_cyclic-Sheet1.pdb           |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/c_cyclic-Sheet2.pdb           |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/c_cyclic-Sheet3.pdb           |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/c_dividefloating-Sheet1.pdb   |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/c_dividefloating-Sheet2.pdb   |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/c_dividefloating-Sheet3.pdb   |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/c_forwardrange-Sheet1.pdb     |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/c_forwardrange-Sheet2.pdb     |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/c_forwardrange-Sheet3.pdb     |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/c_insertimage-Sheet1.pdb      |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/c_insertimage-Sheet2.pdb      |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/c_insertimage-Sheet3.pdb      |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/c_invalidcellref-Sheet1.pdb   |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/c_invalidcellref-Sheet2.pdb   |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/c_invalidcellref-Sheet3.pdb   |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/c_largerange-Sheet1.pdb       |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/c_largerange-Sheet2.pdb       |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/c_largerange-Sheet3.pdb       |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/c_listrange-Sheet1.pdb        |    2 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/c_listrange-Sheet2.pdb        |    2 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/c_listrange-Sheet3.pdb        |    2 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/c_mathematical-Sheet1.pdb     |    2 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/c_mathematical-Sheet2.pdb     |    2 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/c_mathematical-Sheet3.pdb     |    2 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/c_protection-Sheet1.pdb       |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/c_protection-Sheet2.pdb       |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/c_protection-Sheet3.pdb       |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/c_sheetreference-Sheet1.pdb   |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/c_sheetreference-Sheet2.pdb   |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/c_sheetreference-Sheet3.pdb   |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/c_simple01-Sheet1.pdb         |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/c_simple01-Sheet2.pdb         |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/c_simple01-Sheet3.pdb         |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/c_simple02-Sheet1.pdb         |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/c_simple02-Sheet2.pdb         |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/c_simple02-Sheet3.pdb         |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/c_simple03-Sheet1.pdb         |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/c_simple03-Sheet2.pdb         |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/c_simple03-Sheet3.pdb         |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/c_simple04-Sheet1.pdb         |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/c_simple04-Sheet2.pdb         |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/c_simple04-Sheet3.pdb         |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/c_smallrange-Sheet1.pdb       |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/c_smallrange-Sheet2.pdb       |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/c_smallrange-Sheet3.pdb       |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/c_styles-Sheet1.pdb           |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/c_styles-Sheet2.pdb           |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/c_styles-Sheet3.pdb           |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/c_textimage-Sheet1.pdb        |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/c_textimage-Sheet2.pdb        |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/c_textimage-Sheet3.pdb        |    1 
 xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/Blocklist.dtd                 |   34 
 xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/chart.mod                     |  228 -
 xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/datastyl.mod                  |  168 
 xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/drawing.mod                   |  837 ---
 xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/dtypes.mod                    |  143 
 xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/form.mod                      |  308 -
 xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/meta.mod                      |   90 
 xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/nmspace.mod                   |   50 
 xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/office.dtd                    |   54 
 xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/office.mod                    |  234 -
 xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/script.mod                    |   51 
 xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/settings.mod                  |   49 
 xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/style.mod                     |  391 -
 xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/table.mod                     |  493 --
 xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/text.mod                      | 1099 ----
 xmerge/source/palmtests/qa-wrapper/testcases/a_animatedgif.infile                          |    4 
 xmerge/source/palmtests/qa-wrapper/testcases/a_bolddoc.infile                              |    4 
 xmerge/source/palmtests/qa-wrapper/testcases/a_bookmarks.infile                            |    4 
 xmerge/source/palmtests/qa-wrapper/testcases/a_bulletorderedlist.infile                    |    4 
 xmerge/source/palmtests/qa-wrapper/testcases/a_emptydoc-mod.infile                         |    9 
 xmerge/source/palmtests/qa-wrapper/testcases/a_emptydoc.infile                             |    4 
 xmerge/source/palmtests/qa-wrapper/testcases/a_firstlineindent.infile                      |    4 
 xmerge/source/palmtests/qa-wrapper/testcases/a_fontsize.infile                             |    4 
 xmerge/source/palmtests/qa-wrapper/testcases/a_heading.infile                              |    4 
 xmerge/source/palmtests/qa-wrapper/testcases/a_heading1.infile                             |    4 
 xmerge/source/palmtests/qa-wrapper/testcases/a_heading2.infile                             |    4 
 xmerge/source/palmtests/qa-wrapper/testcases/a_hyperlink.infile                            |    4 
 xmerge/source/palmtests/qa-wrapper/testcases/a_justified.infile                            |    4 
 xmerge/source/palmtests/qa-wrapper/testcases/a_linebreaks.infile                           |    4 
 xmerge/source/palmtests/qa-wrapper/testcases/a_linespacing.infile                          |    4 
 xmerge/source/palmtests/qa-wrapper/testcases/a_numberorderedlist.infile                    |    4 
 xmerge/source/palmtests/qa-wrapper/testcases/a_pagebreak.infile                            |    4 
 xmerge/source/palmtests/qa-wrapper/testcases/a_paragraph.infile                            |    4 
 xmerge/source/palmtests/qa-wrapper/testcases/a_simple01.infile                             |    4 
 xmerge/source/palmtests/qa-wrapper/testcases/a_simple02.infile                             |    4 
 xmerge/source/palmtests/qa-wrapper/testcases/a_simple03.infile                             |    4 
 xmerge/source/palmtests/qa-wrapper/testcases/a_simple04.infile                             |    4 
 xmerge/source/palmtests/qa-wrapper/testcases/a_simple05.infile                             |    5 
 xmerge/source/palmtests/qa-wrapper/testcases/a_standard.infile                             |    4 
 xmerge/source/palmtests/qa-wrapper/testcases/a_subscript.infile                            |    4 
 xmerge/source/palmtests/qa-wrapper/testcases/a_superscript.infile                          |    4 
 xmerge/source/palmtests/qa-wrapper/testcases/a_symbols.infile                              |    4 
 xmerge/source/palmtests/qa-wrapper/testcases/a_tab.infile                                  |    4 
 xmerge/source/palmtests/qa-wrapper/testcases/a_table.infile                                |    5 
 xmerge/source/palmtests/qa-wrapper/testcases/a_textspan.infile                             |    4 
 xmerge/source/palmtests/qa-wrapper/testcases/a_unorderedlist.infile                        |    4 
 xmerge/source/palmtests/qa-wrapper/testcases/a_wordwrap.infile                             |    4 
 xmerge/source/palmtests/qa-wrapper/testcases/c_addition01-mod.infile                       |    5 
 xmerge/source/palmtests/qa-wrapper/testcases/c_alignment.infile                            |    4 
 xmerge/source/palmtests/qa-wrapper/testcases/c_backwardrange-mod.infile                    |    6 
 xmerge/source/palmtests/qa-wrapper/testcases/c_basic-mod.infile                            |    5 
 xmerge/source/palmtests/qa-wrapper/testcases/c_bob-mod.infile                              |    5 
 xmerge/source/palmtests/qa-wrapper/testcases/c_boolean-mod.infile                          |    6 
 xmerge/source/palmtests/qa-wrapper/testcases/c_cellcurrencyvalue.infile                    |    5 
 xmerge/source/palmtests/qa-wrapper/testcases/c_cellpercentvalue-mod.infile                 |    8 
 xmerge/source/palmtests/qa-wrapper/testcases/c_cellstringvalue-mod.infile                  |   10 
 xmerge/source/palmtests/qa-wrapper/testcases/c_columnswidth-mod.infile                     |    3 
 xmerge/source/palmtests/qa-wrapper/testcases/c_cyclic-mod.infile                           |   12 
 xmerge/source/palmtests/qa-wrapper/testcases/c_dividefloating-mod.infile                   |    8 
 xmerge/source/palmtests/qa-wrapper/testcases/c_forwardrange-mod.infile                     |    6 
 xmerge/source/palmtests/qa-wrapper/testcases/c_insertimage.infile                          |    4 
 xmerge/source/palmtests/qa-wrapper/testcases/c_insertrow-mod.infile                        |   13 
 xmerge/source/palmtests/qa-wrapper/testcases/c_invalidcellref-mod.infile                   |   10 
 xmerge/source/palmtests/qa-wrapper/testcases/c_largerange-mod.infile                       |    6 
 xmerge/source/palmtests/qa-wrapper/testcases/c_listrange-mod.infile                        |    6 
 xmerge/source/palmtests/qa-wrapper/testcases/c_mathematical-mod.infile                     |   10 
 xmerge/source/palmtests/qa-wrapper/testcases/c_multi_boolean.infile                        |    5 
 xmerge/source/palmtests/qa-wrapper/testcases/c_protection-mod01.infile                     |    6 
 xmerge/source/palmtests/qa-wrapper/testcases/c_sheetreference-mod.infile                   |    6 
 xmerge/source/palmtests/qa-wrapper/testcases/c_simple01-mod.infile                         |   13 
 xmerge/source/palmtests/qa-wrapper/testcases/c_simple02-mod.infile                         |   13 
 xmerge/source/palmtests/qa-wrapper/testcases/c_simple03-mod.infile                         |   22 
 xmerge/source/palmtests/qa-wrapper/testcases/c_simple04-mod.infile                         |   14 
 xmerge/source/palmtests/qa-wrapper/testcases/c_smallrange-mod.infile                       |    6 
 xmerge/source/palmtests/qa-wrapper/testcases/c_styles.infile                               |    3 
 xmerge/source/palmtests/qa-wrapper/testcases/c_textimage.infile                            |   12 
 xmerge/source/palmtests/qa-wrapper/testcases/empty01.infile                                |    3 
 xmerge/source/palmtests/qa-wrapper/testcases/hyperlink01.infile                            |    4 
 xmerge/source/palmtests/qa-wrapper/testcases/image01.infile                                |    4 
 xmerge/source/palmtests/qa-wrapper/testcases/simple01.infile                               |    3 
 xmerge/source/palmtests/qa-wrapper/testcases/simple02.infile                               |    3 
 xmerge/source/palmtests/qa-wrapper/testcases/simple03.infile                               |    3 
 xmerge/source/palmtests/qa-wrapper/testcases/simple04.infile                               |    3 
 xmerge/source/palmtests/qa-wrapper/testcases/simple05.infile                               |    4 
 xmerge/source/palmtests/qa-wrapper/testcases/table01.infile                                |    3 
 xmerge/source/palmtests/qa-wrapper/testcases/table02.infile                                |    3 
 xmerge/source/palmtests/qa-wrapper/testcases/table03.infile                                |    4 
 xmerge/source/palmtests/qa-wrapper/testcases/table04.infile                                |    4 
 xmerge/source/palmtests/qa/bin/mysplit.pl                                                  |   58 
 xmerge/source/palmtests/qa/bin/tappen.pl                                                   |   61 
 xmerge/source/palmtests/qa/bin/template.pl                                                 |   55 
 xmerge/source/palmtests/qa/bin/test_driver.pl                                              |  785 ---
 xmerge/source/palmtests/qa/comparator/OfficeZip.java                                       |  241 -
 xmerge/source/palmtests/qa/comparator/PDBDecoder.java                                      |  135 
 xmerge/source/palmtests/qa/comparator/PDBHeader.java                                       |  153 
 xmerge/source/palmtests/qa/comparator/PDBUtil.java                                         |  100 
 xmerge/source/palmtests/qa/comparator/PalmDB.java                                          |  348 -
 xmerge/source/palmtests/qa/comparator/README                                               |   10 
 xmerge/source/palmtests/qa/comparator/Record.java                                          |  165 
 xmerge/source/palmtests/qa/comparator/SimplePdbCompare.java                                |   86 
 xmerge/source/palmtests/qa/comparator/XmlDiff.java                                         |  464 --
 xmerge/source/palmtests/qa/comparator/XmlDiff.properties                                   |   12 
 xmerge/source/palmtests/qa/comparator/XmlWrapper.java                                      |  144 
 xmerge/source/palmtests/qa/comparator/XmlZipExtract.java                                   |  144 
 xmerge/source/palmtests/qa/comparator/comparator.pl                                        |  248 -
 xmerge/source/palmtests/qa/comparator/dtd/Blocklist.dtd                                    |   34 
 xmerge/source/palmtests/qa/comparator/dtd/chart.mod                                        |  228 -
 xmerge/source/palmtests/qa/comparator/dtd/datastyl.mod                                     |  168 
 xmerge/source/palmtests/qa/comparator/dtd/drawing.mod                                      |  837 ---
 xmerge/source/palmtests/qa/comparator/dtd/dtypes.mod                                       |  143 
 xmerge/source/palmtests/qa/comparator/dtd/form.mod                                         |  308 -
 xmerge/source/palmtests/qa/comparator/dtd/meta.mod                                         |   90 
 xmerge/source/palmtests/qa/comparator/dtd/nmspace.mod                                      |   50 
 xmerge/source/palmtests/qa/comparator/dtd/office.dtd                                       |   54 
 xmerge/source/palmtests/qa/comparator/dtd/office.mod                                       |  234 -
 xmerge/source/palmtests/qa/comparator/dtd/script.mod                                       |   51 
 xmerge/source/palmtests/qa/comparator/dtd/settings.mod                                     |   49 
 xmerge/source/palmtests/qa/comparator/dtd/style.mod                                        |  391 -
 xmerge/source/palmtests/qa/comparator/dtd/table.mod                                        |  493 --
 xmerge/source/palmtests/qa/comparator/dtd/text.mod                                         | 1099 ----
 xmerge/source/palmtests/qa/comparator/pdbcomparison.java                                   |  542 --
 xmerge/source/palmtests/qa/docs/Spreadsheet_descriptions.csv                               |   39 
 xmerge/source/palmtests/qa/lib/converterlib.pm                                             | 1174 -----
 xmerge/source/palmtests/qa/palm-session/session                                            |    8 
 xmerge/source/palmtests/qa/test_spec/convertor_test_spec.html                              | 2274 ----------
 xmerge/workben/XmlDiff.java                                                                |  458 --
 xmerge/workben/XmlDiff.properties                                                          |   40 
 xmerge/workben/jstyle.pl                                                                   |  541 --
 xmerge/workben/makefile.mk                                                                 |   32 
 249 files changed, 19465 deletions(-)

New commits:
commit 82743f6db6607113004498dffa0416b716968e11
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Tue Jun 5 15:30:04 2012 +0200

    remove obsolete (and scary) stuff in xmerge/workben
    
    Change-Id: I34c1f13006da18c6c4601042d3accfdb1979bfab

diff --git a/xmerge/workben/XmlDiff.java b/xmerge/workben/XmlDiff.java
deleted file mode 100644
index e41dbbb..0000000
--- a/xmerge/workben/XmlDiff.java
+++ /dev/null
@@ -1,458 +0,0 @@
-/************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-import java.io.FileWriter;
-import java.io.InputStream;
-import java.io.FileInputStream;
-import java.io.BufferedInputStream;
-import java.io.BufferedWriter;
-import java.io.IOException;
-import java.io.FileNotFoundException;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
-import java.io.PrintWriter;
-import java.util.Vector;
-import java.util.Properties;
-
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.w3c.dom.Node;
-import org.w3c.dom.Document;
-import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-/**
- *  This class will diff 2 Xml files.
- *
- *  @author   Stephen Mak
- */
-
-public final class XmlDiff {
-
-    private static final String PROPSFILE = "XmlDiff.properties";
-    private static final String FILE1 = "XmlDiff.file1";
-    private static final String FILE2 = "XmlDiff.file2";
-    private static final String OUTPUT= "XmlDiff.output";
-    private static final String IGNORE_TAGS= "XmlDiff.tags";
-
-    private Properties props_ = null;
-    private static PrintWriter writer_ = null;
-    private String[] tags_ = null;
-    private String file1_ = null;
-    private String file2_ = null;
-
-    /**
-     *  Constructor.  Load the properties file.
-     */
-
-    public XmlDiff() throws IOException {
-
-        Class c = this.getClass();
-        InputStream is = c.getResourceAsStream(PROPSFILE);
-        BufferedInputStream bis = new BufferedInputStream(is);
-        props_ = new Properties();
-        props_.load(bis);
-        bis.close();
-
-        String file1 = props_.getProperty(FILE1, "");
-        String file2 = props_.getProperty(FILE2, "");
-        String tagsString = props_.getProperty(IGNORE_TAGS, "");
-        String output = props_.getProperty("debug.output", "System.out");
-        setOutput(output);
-        tags_ = parseTags(tagsString);
-    }
-
-    /**
-     * diff 2 xml, but overwrite the property file's file1/2 setting with
-     * the input argument
-     */
-    public boolean diff(String file1, String file2)  throws IOException {
-        file1_ = file1;
-        file2_ = file2;
-        return diff();
-    }
-
-    public boolean diff() throws IOException {
-
-        boolean result = false;
-
-        writer_.println("parsing "+ file1_ + "...");
-        // parse the Xml file
-        Document doc1 = parseXml(file1_);
-
-        writer_.println("parsing "+ file1_ + "...");
-        Document doc2 = parseXml(file2_);
-
-        if (doc1 != null && doc2 != null) {
-          writer_.println("diffing "+ file1_ + " & " + file2_ + "...");
-          result = compareNode(doc1, doc2);
-        }
-        return result;
-    }
-
-    private void diffLog(String errMsg, Node node1, Node node2) {
-
-        String node1Str = "";
-        String node2Str = "";
-
-        if (node1 != null) {
-            node1Str = "[Type]:" + nodeInfo(node1) +
-                       " [Name]:" + node1.getNodeName();
-            if (node1.getNodeValue() != null)
-                node1Str += " [Value]:" + node1.getNodeValue();
-        }
-
-        if (node2 != null) {
-            node2Str = "[Type]:" + nodeInfo(node2) +
-                       " [Name]:" + node2.getNodeName();
-            if (node2.getNodeValue() != null)
-                node2Str += " [Value]:" + node2.getNodeValue();
-        }
-
-        writer_.println(errMsg);
-        writer_.println("  Node1 - " + node1Str);
-        writer_.println("  Node2 - " + node2Str);
-    }
-
-    private String nodeInfo(Node node) {
-
-        String str = null;
-        switch (node.getNodeType()) {
-
-            case Node.ELEMENT_NODE:
-                str = "ELEMENT";
-                break;
-            case Node.ATTRIBUTE_NODE:
-                str = "ATTRIBUTE";
-                break;
-            case Node.TEXT_NODE:
-                str = "TEXT";
-                break;
-            case Node.CDATA_SECTION_NODE:
-                str = "CDATA_SECTION";
-                break;
-            case Node.ENTITY_REFERENCE_NODE:
-                str = "ENTITY_REFERENCE";
-                break;
-            case Node.ENTITY_NODE:
-                str = "ENTITY";
-                break;
-            case Node.PROCESSING_INSTRUCTION_NODE:
-                str = "PROCESSING_INSTRUCTION";
-                break;
-            case Node.COMMENT_NODE:
-                str = "COMMENT";
-                break;
-            case Node.DOCUMENT_NODE:
-                str = "DOCUMENT";
-                break;
-            case Node.DOCUMENT_TYPE_NODE:
-                str = "DOCUMENT_TYPE";
-                break;
-            case Node.DOCUMENT_FRAGMENT_NODE:
-                str = "DOCUMENT_FRAGMENT";
-                break;
-            case Node.NOTATION_NODE:
-                str = "NOTATION";
-                break;
-        }
-        return str;
-    }
-
-    private boolean ignoreTag(String nodeName) {
-
-
-        if (tags_ != null) {
-            for (int i = 0; i < tags_.length; i++) {
-                if (tags_[i].equals(nodeName))
-                    return true;
-            }
-        }
-        return false;
-    }
-
-    // for future use if we want to compare attributes
-    private boolean attributesEqual(Node node1, Node node2) {
-        return true;
-    }
-
-    private boolean compareNode(Node node1, Node node2) {
-        boolean equal = false;
-
-        while (true) {
-
-            if (node1 == null && node2 == null) {
-                equal = true;
-                break;
-            } else if (node1 == null || node2 == null) {
-                diffLog("DIFF: one of the node is null", node1, node2);
-                break;
-            }
-
-            if (node1.getNodeType() != node2.getNodeType()) {
-                diffLog("DIFF: nodetype is different", node1, node2);
-                break;
-            }
-
-            if (node1.getNodeName() == null && node2.getNodeName() == null) {
-                // empty
-            } else if (node1.getNodeName() == null ||
-                       node2.getNodeName() == null) {
-                diffLog("DIFF: one of the nodeName is null", node1, node2);
-                break;
-            } else if (!node1.getNodeName().equals(node2.getNodeName())) {
-                diffLog("DIFF: nodeName is different", node1, node2);
-                break;
-            }
-
-            if (ignoreTag(node1.getNodeName())) {
-                diffLog("DIFF: Some tag(s) is ignored", node1, node2);
-                equal = true;
-                break;
-            }
-
-            if (node1.getNodeValue() == null && node2.getNodeValue() == null) {
-                // empty
-            } else if (node1.getNodeValue() == null ||
-                       node2.getNodeValue() == null) {
-                diffLog("DIFF: one of the nodevalue is null", node1, node2);
-                break;
-            } else if (!node1.getNodeValue().equals(node2.getNodeValue())) {
-                diffLog("DIFF: nodeValue is different", node1, node2);
-                break;
-            }
-
-            // try to compare attributes if necessary
-            if (!attributesEqual(node1, node2))
-                break;
-
-            NodeList node1Children = node1.getChildNodes();
-            NodeList node2Children = node2.getChildNodes();
-
-            // number of children have to be the same
-            if (node1Children == null && node2Children == null) {
-                equal = true;
-                break;
-            }
-
-            if (node1Children == null || node2Children == null) {
-                diffLog("DIFF: one node's children is null", node1, node2);
-                break;
-            }
-
-            if (node1Children.getLength() != node2Children.getLength())  {
-                diffLog("DIFF: num of children is different", node1, node2);
-                break;
-            }
-
-            // compare all the childrens
-            equal = true;
-
-            for (int i = 0; i < node1Children.getLength(); i++) {
-                if (!compareNode(node1Children.item(i),
-                                 node2Children.item(i))) {
-                    equal = false;
-                    break;
-                }
-            }
-            break;
-        }
-
-        return equal;
-    }
-
-    private Document parseXml (String filename) throws IOException {
-
-        Document w3cDocument = null;
-
-        FileInputStream fis;
-
-        try {
-            fis = new FileInputStream(filename);
-        } catch (FileNotFoundException ex) {
-            ex.printStackTrace(writer_);
-            writer_.println(ex.getMessage());
-            return w3cDocument;
-        }
-
-        /** factory for DocumentBuilder objects */
-        DocumentBuilderFactory factory = null;
-        factory = DocumentBuilderFactory.newInstance();
-        factory.setNamespaceAware(true);
-        factory.setValidating(false);
-
-        /** DocumentBuilder object */
-        DocumentBuilder builder = null;
-
-        try {
-            builder = factory.newDocumentBuilder();
-        } catch (ParserConfigurationException ex) {
-            ex.printStackTrace(writer_);
-            writer_.println(ex.getMessage());
-            return null;
-        }
-
-
-        builder.setErrorHandler(
-            new org.xml.sax.ErrorHandler() {
-                // ignore fatal errors (an exception is guaranteed)
-                public void fatalError(SAXParseException e)
-                    throws SAXException {
-                    throw e;
-                }
-
-                public void error(SAXParseException e)
-                    throws SAXParseException {
-                    // make sure validation error is thrown.
-                    throw e;
-                }
-
-                public void warning(SAXParseException e)
-                    throws SAXParseException {
-                }
-            }
-        );
-
-        try {
-            w3cDocument = builder.parse(fis);
-            w3cDocument.getDocumentElement().normalize();
-        } catch (SAXException ex) {
-            ex.printStackTrace(writer_);
-            writer_.println(ex.getMessage());
-            return w3cDocument;
-        }
-
-        return w3cDocument;
-    }
-
-    private String [] parseTags(String tagsString) {
-        Vector tagsVector = new Vector();
-        if (tagsString.length() == 0)
-            return null;
-
-        int start = 0;
-        int end = 0;
-        // break the tag string into a vector of strings by words
-        for (end = tagsString.indexOf(" ", start);
-             end != -1 ;
-             start = end + 1, end = tagsString.indexOf(" ", start)) {
-            tagsVector.add(tagsString.substring(start,end));
-        }
-
-        tagsVector.add(tagsString.substring(start,tagsString.length()));
-
-        // convert the vector to array
-        String[] tags= new String[tagsVector.size()];
-        tagsVector.copyInto(tags);
-
-        return tags;
-    }
-
-
-    /**
-     *  Set the output to the specified argument.
-     *  This method is only used internally to prevent
-     *  invalid string parameter.
-     *
-     *  @param   str   output specifier
-     */
-    private static void setOutput(String str) {
-
-        if (writer_ == null) {
-
-            if (str.equals("System.out")) {
-
-                setOutput(System.out);
-
-            } else if (str.equals("System.err")) {
-
-                setOutput(System.err);
-
-            } else {
-
-                try {
-
-                    setOutput(new FileWriter(str));
-
-                } catch (IOException e) {
-
-                    e.printStackTrace(System.err);
-                }
-            }
-        }
-    }
-
-    /**
-     *  Set the output to an OutputStream object.
-     *
-     *  @param   stream   OutputStream object
-     */
-
-    private static void setOutput(OutputStream stream) {
-
-        setOutput(new OutputStreamWriter(stream));
-    }
-
-    /**
-     *  Set the Writer object to manage the output.
-     *
-     *  @param   w   Writer object to write out
-     */
-
-    private static void setOutput(Writer w) {
-
-        if (writer_ != null) {
-
-            writer_.close();
-        }
-
-        writer_ = new PrintWriter(new BufferedWriter(w), true);
-    }
-
-    public static void main(String args[]) throws IOException {
-
-        if (args.length != 0 && args.length != 2) {
-            System.out.println("Usage: XmlDiff [<file1> <file2>].");
-            return;
-        }
-
-        XmlDiff xmldiff = new XmlDiff();
-
-        boolean same = false;
-        if (args.length == 2) {
-            same = xmldiff.diff(args[0], args[1]);
-        } else {
-            same = xmldiff.diff();
-        }
-
-        System.out.println("Diff result: " + same);
-    }
-}
-
diff --git a/xmerge/workben/XmlDiff.properties b/xmerge/workben/XmlDiff.properties
deleted file mode 100644
index 34483a5..0000000
--- a/xmerge/workben/XmlDiff.properties
+++ /dev/null
@@ -1,40 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-# x-no-translate
-
-
-#
-#  This properties file provides info for XmlDiff program
-#  XmlDiff.file1 is the first input XML file
-#  XmlDiff.file2 is the second input XML file
-#  XmlDiff.output is where the output (err/message) go
-#  XmlDiff.tags are what tagname should ignore (and the subtree under it)
-#
-XmlDiff.file1=test1.xml
-XmlDiff.file2=test2.xml
-XmlDiff.output=System.err
-XmlDiff.tags=
diff --git a/xmerge/workben/jstyle.pl b/xmerge/workben/jstyle.pl
deleted file mode 100644
index 177b1a2..0000000
--- a/xmerge/workben/jstyle.pl
+++ /dev/null
@@ -1,541 +0,0 @@
-#!/bin/sh -- # This comment tells perl not to loop!
-#
-#***************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#***************************************************************************
-
-
-eval 'exec perl -S $0 "$@"'
-if 0;
-#
-# @(#)jstyle 1.2 98/01/08
-#
-# jstyle - check for some common stylistic errors.
-#
-#   jstyle is a sort of "lint" for Java coding style.
-#
-#   There's a lot this can't check for, like proper
-#   indentation of continuation lines.  There's also
-#   a lot more this could check for.
-#
-#   A note to the non perl literate:
-#
-#       perl regular expressions are pretty much like egrep
-#       regular expressions, with the following special symbols
-#
-#       \s  any space character
-#       \S  any non-space character
-#       \w  any "word" character [a-zA-Z0-9_]
-#       \W  any non-word character
-#       \d  a digit [0-9]
-#       \D  a non-digit
-#       \b  word boundary (between \w and \W)
-#       \B  non-word boundary
-#
-#require "getopts.pl";
-# XXX - because some versions of perl can not find the lib directory,
-# we just include this here.
-;# getopts.pl - a better getopt.pl
-
-;# Usage:
-;#      do Getopts("a:bc");  # -a takes arg. -b & -c not. Sets opt_* as a
-;#                           #  side effect.
-
-sub Getopts {
-    local($argumentative) = @_;
-    local(@args,$_,$first,$rest);
-    local($[) = 0;
-    local($errs) = 0;
-
-    @args = split( / */, $argumentative );
-    while(($_ = $ARGV[0]) =~ /^-(.)(.*)/) {
-    ($first,$rest) = ($1,$2);
-    $pos = index($argumentative,$first);
-    if($pos >= $[) {
-        if($args[$pos+1] eq ":") {
-        shift(@ARGV);
-        if($rest eq "") {
-            $rest = shift(@ARGV);
-        }
-        eval "\$opt_$first = \$rest;";
-        }
-        else {
-        eval "\$opt_$first = 1";
-        if($rest eq "") {
-            shift(@ARGV);
-        }
-        else {
-            $ARGV[0] = "-$rest";
-        }
-        }
-    }
-    else {
-        print STDERR "Unknown option: $first\n";
-        ++$errs;
-        if($rest ne "") {
-        $ARGV[0] = "-$rest";
-        }
-        else {
-        shift(@ARGV);
-        }
-    }
-    }
-    $errs == 0;
-}
-
-1;
-# end of getopts.pl
-
-$usage =
-"usage: jstyle [-c] [-h] [-p] [-s] [-t] [-v] [-C] file ...
-    -c  check continuation line indenting
-    -h  perform heuristic checks that are sometimes wrong
-    -p  perform some of the more picky checks
-    -s  check for spaces vs. tabs
-    -t  insist on indenting by tabs
-    -v  verbose
-    -C  don't check anything in header block comments
-    -S  print out overall statistics
-";
-
-if (!&Getopts("chpstvCS")) {
-    print $usage;
-    exit 1;
-}
-
-$check_continuation = $opt_c;
-$heuristic = $opt_h;
-$picky = $opt_p;
-$spaces = $opt_s;
-$tabs = $opt_t;
-$verbose = $opt_v;
-$ignore_hdr_comment = $opt_C;
-$statistics = $opt_S;
-
-if ($verbose) {
-    $fmt = "%s: %d: %s\n%s\n";
-} else {
-    $fmt = "%s: %d: %s\n";
-}
-
-# Note, following must be in single quotes so that \s and \w work right.
-$typename = '(int|char|boolean|byte|short|long|float|double)';
-
-if ($#ARGV >= 0) {
-    foreach $arg (@ARGV) {
-        if (!open(STDIN, $arg)) {
-            printf "%s: can not open\n", $arg;
-        } else {
-            &jstyle($arg);
-            close STDIN;
-        }
-    }
-} else {
-    &jstyle("<stdin>");
-}
-
-if ($statistics != 0) {
-    foreach $key (sort(keys %errcount)) {
-        printf "%6d %s\n", $errcount{$key}, $key;
-    }
-    printf " -----\n";
-    printf "%6d Total warnings\n", $tot_errcount;
-    printf "%6d Lines of code\n", $totlines;
-}
-
-sub err {
-    if ($statistics == 0) {
-        printf $fmt, $filename, $., $_[0], $line;
-    } else {
-        $msg = $_[0];
-        $msg =~ s/ \([0-9][0-9]*\)$//;
-        $errcount{$msg} += 1;
-        $tot_errcount += 1;
-    }
-}
-
-sub jstyle {
-
-$in_comment = 0;
-$in_header_comment = 0;
-$in_continuation = 0;
-$in_class = 0;
-$in_declaration = 0;
-$note_level = 0;
-$nextok = 0;
-$nocheck = 0;
-$expect_continuation = 0;
-$prev = '';
-
-$filename = $_[0];
-
-line: while (<STDIN>) {
-    ++$totlines;
-    s/\r?\n$//; # strip return and newline
-
-    # save the original line, then remove all text from within
-    # double or single quotes, we do not want to check such text.
-
-    $line = $_;
-    s/"[^"]*"/\"\"/g;
-    s/'.'/''/g;
-
-    # an /* END JSTYLED */ comment ends a no-check block.
-    if ($nocheck) {
-        if (/\/\* *END *JSTYLED *\*\//) {
-            $nocheck = 0;
-        } else {
-            next line;
-        }
-    }
-
-    # a /*JSTYLED*/ comment indicates that the next line is ok.
-    if ($nextok) {
-        if ($okmsg) {
-            do err($okmsg);
-        }
-        $nextok = 0;
-        $okmsg = 0;
-        if (/\/\* *JSTYLED.*\*\//) {
-            /^.*\/\* *JSTYLED *(.*) *\*\/.*$/;
-            $okmsg = $1;
-            $nextok = 1;
-        }
-        $prev = $line;
-        next line;
-    }
-
-    # check length of line.
-    # first, a quick check to see if there is any chance of being too long.
-    if ($line =~ tr/\t/\t/ * 7 + length($line) > 100) {
-        # yes, there is a chance.
-        # replace tabs with spaces and check again.
-        $eline = $line;
-        1 while $eline =~
-            s/\t+/' ' x (length($&) * 8 - length($`) % 8)/e;
-        $l = length($eline);
-        if (length($eline) > 100) {
-            do err("line > 100 characters ($l)");
-        }
-    }
-#   this is the fastest way to check line length,
-#   but it doesnt work with perl 3.0.
-#   if ($line =~ tr/\t/\t/ * 7 + length($line) > 80) {
-#       $pos = $oldp = $p = 0;
-#       while (($p = index($line, "\t", $p)) >= 0) {
-#           $pos = ($pos + $p - $oldp + 8) & ~7;
-#           $oldp = ++$p;
-#       }
-#       $pos += length($line) - $oldp;
-#       if ($pos > 80) {
-#           do err("line > 80 characters");
-#       }
-#   }
-
-    # remember whether we expect to be inside a continuation line.
-    $in_continuation = $expect_continuation;
-
-    # check for proper continuation line.  blank lines
-    # in the middle of the
-    # continuation do not count.
-    # XXX - only check within functions.
-    if ($check_continuation && $expect_continuation && $in_class &&
-        !/^\s*$/) {
-        # continuation line must start with whitespace of
-        # previous line, plus either 4 spaces or a tab, but
-        # do not check lines that start with a string constant
-        # since they are often shifted to the left to make them
-        # fit on the line.
-        if (!/^$continuation_indent    \S/ &&
-            !/^$continuation_indent\t\S/ && !/^\s*"/) {
-            do err("continuation line improperly indented");
-        }
-        $expect_continuation = 0;
-    }
-
-    # a /* BEGIN JSTYLED */ comment starts a no-check block.
-    if (/\/\* *BEGIN *JSTYLED *\*\//) {
-        $nocheck = 1;
-    }
-
-    # a /*JSTYLED*/ comment indicates that the next line is ok.
-    if (/\/\* *JSTYLED.*\*\//) {
-        /^.*\/\* *JSTYLED *(.*) *\*\/.*$/;
-        $okmsg = $1;
-        $nextok = 1;
-    }
-    if (/\/\/ *JSTYLED/) {
-        /^.*\/\/ *JSTYLED *(.*)$/;
-        $okmsg = $1;
-        $nextok = 1;
-    }
-
-    # is this the beginning or ending of a class?
-    if (/^(public\s+)*\w(class|interface)\s/) {
-        $in_class = 1;
-        $in_declaration = 1;
-        $prev = $line;
-        next line;
-    }
-    if (/^}\s*(\/\*.*\*\/\s*)*$/) {
-        $in_class = 0;
-        $prev = $line;
-        next line;
-    }
-
-    if (!$spaces) {
-        # strip trailing spaces
-        s/\s*$//;
-    }
-
-    # does this looks like the start of a block comment?
-    if (/^\s*\/\*(\*|)$/) {
-        if (!/^(\t|    )*\/\*(\*|)$/) {
-            do err("block comment not indented properly");
-        }
-        $in_comment = 1;
-        s/\/\*(\*|)/ /;
-        $comment_prefix = $_;
-        if ($comment_prefix eq " ") {
-            $in_header_comment = 1;
-        }
-        $prev = $line;
-        next line;
-    }
-    if (/^\s*\/\*./ && !/^\s*\/\*\*$/ && !/^\s*\/\*.*\*\//) {
-        do err("improper first line of block comment");
-        # it's a bad one, but it still is one.
-        # avoid ripple effect of not recognizing this.
-        if (!/^(\t|    )*\/\*(\*|)/) {
-            do err("block comment not indented properly");
-        }
-        $in_comment = 1;
-        s/\/\*.*/ /;
-        $comment_prefix = $_;
-        if ($comment_prefix eq " ") {
-            $in_header_comment = 1;
-        }
-        $prev = $line;
-        next line;
-    }
-    # are we still in the block comment?
-    if ($in_comment && !/^$comment_prefix\*/) {
-        # assume out of comment
-        $in_comment = 0;
-        $in_header_comment = 0;
-    }
-
-    if ($in_header_comment && $ignore_hdr_comment) {
-        $prev = $line;
-        next line;
-    }
-
-    # check for errors that might occur in comments and in code.
-
-    # allow spaces to be used to draw pictures in header comments.
-    if ($spaces && /[^ ]     / && !/".*     .*"/ && !$in_header_comment) {
-        do err("spaces instead of tabs");
-    }
-    if ($tabs && /^ / && !/^ \*[ \t\/]/ && !/^ \*$/ &&
-        (!/^    \w/ || $in_class != 0)) {
-        do err("indent by spaces instead of tabs");
-    }
-    if (!$in_comment && (/^(\t    )* {1,3}\S/ || /^(\t    )* {5,7}\S/) &&
-        !(/^\s*[-+|&\/?:=]/ || ($prev =~ /,\s*$/))) {
-        do err("indent not a multiple of 4");
-    }
-    if ($spaces && /\s$/) {
-        do err("space or tab at end of line");
-    }
-if (0) {
-    if (/^[\t]+ [^ \t\*]/ || /^[\t]+  \S/ || /^[\t]+   \S/) {
-        do err("continuation line not indented by 4 spaces");
-    }
-}
-    if (/[^ \t(]\/\*/ && !/\w\(\/\*.*\*\/\);/) {
-        do err("comment preceded by non-blank");
-    }
-    if ($spaces && /\t[ ]+\t/) {
-        do err("spaces between tabs");
-    }
-    if ($spaces && / [\t]+ /) {
-        do err("tabs between spaces");
-    }
-
-    if ($in_comment) {  # still in comment
-        $prev = $line;
-        next line;
-    }
-
-    if ((/\/\*\S/ && !/\/\*\*/) || /\/\*\*\S/) {
-        do err("missing blank after open comment");
-    }
-    if (/\S\*\//) {
-        do err("missing blank before close comment");
-    }
-    # allow // at beginning of line, often used to comment out code
-    if (/.\/\/\S/) {        # C++ comments
-        do err("missing blank after start comment");
-    }
-    # check for unterminated single line comments.
-    if (/\S.*\/\*/ && !/\S.*\/\*.*\*\//) {
-        do err("unterminated single line comment");
-    }
-
-    # delete any comments and check everything else.
-    s/\/\*.*\*\///g;
-    s/\/\/.*$//;       # C++ comments
-
-    # delete any trailing whitespace; we have already checked for that.
-    s/\s*$//;
-
-    # following checks do not apply to text in comments.
-
-    # if it looks like an operator at the end of the line, and it is
-    # not really the end of a comment (...*/), and it is not really
-    # a label (done:), and it is not a case label (case FOO:),
-    # or we are not in a function definition (ANSI C style) and the
-    # operator is a "," (to avoid hitting "int\nfoo(\n\tint i,\n\tint j)"),
-    # or we are in a function and the operator is a
-    # "*" (to avoid hitting on "char*\nfunc()").
-    if ((/[-+|&\/?:=]$/ && !/\*\/$/ && !/^\s*\w*:$/ &&
-        !/^\s\s*case\s\s*\w*:$/) ||
-        /,$/ ||
-        ($in_class && /\*$/)) {
-        $expect_continuation = 1;
-        if (!$in_continuation) {
-            /^(\s*)\S/;
-            $continuation_indent = $1;
-        }
-    }
-    if (/[^<>\s][!<>=]=/ || /[^<>][!<>=]=\S/ ||
-        (/[^->]>[^=>\s]/ && !/[^->]>$/) || (/[^<]<[^=<\s]/ && !/[^<]<$/) ||
-        /[^<\s]<[^<]/ || /[^->\s]>[^>]/) {
-        do err("missing space around relational operator");
-    }
-    if (/\S>>=/ || /\S<<=/ || />>=\S/ || /<<=\S/ || /\S[-+*\/&|^%]=/ ||
-        (/[^-+*\/&|^%!<>=\s]=[^=]/ && !/[^-+*\/&|^%!<>=\s]=$/) ||
-        (/[^!<>=]=[^=\s]/ && !/[^!<>=]=$/)) {
-        do err("missing space around assignment operator");
-    }
-    if (/[,;]\S/ && !/\bfor \(;;\)/) {
-        do err("comma or semicolon followed by non-blank");
-    }
-    # allow "for" statements to have empty "while" clauses
-    if (/\s[,;]/ && !/^[\t]+;$/ && !/^\s*for \([^;]*; ;[^;]*\)/) {
-        do err("comma or semicolon preceded by blank");
-    }
-if (0) {
-    if (/^\s*(&&|\|\|)/) {
-        do err("improper boolean continuation");
-    }
-}
-    if ($picky && /\S   *(&&|\|\|)/ || /(&&|\|\|)   *\S/) {
-        do err("more than one space around boolean operator");
-    }
-    if (/\b(for|if|while|switch|return|case|catch|synchronized)\(/) {
-        do err("missing space between keyword and paren");
-    }
-    if (/(\b(for|if|while|switch|return|catch|synchronized)\b.*){2,}/) {
-        # multiple "case" allowed
-        do err("more than one keyword on line");
-    }
-    if (/\b(for|if|while|switch|return|case|catch|synchronized)\s\s+\(/ &&
-        !/^#if\s+\(/) {
-        do err("extra space between keyword and paren");
-    }
-    # try to detect "func (x)" but not "if (x)" or
-    # "int (*func)();"
-    if (/\w\s\(/) {
-        $s = $_;
-        # strip off all keywords on the line
-        s/\b(for|if|while|switch|return|case|catch|synchronized)\s\(/XXX(/g;
-        #s/\b($typename|void)\s+\(+/XXX(/og;
-        if (/\w\s\(/) {
-            do err("extra space between function name and left paren");
-        }
-        $_ = $s;
-    }
-    if (/\(\s/) {
-        do err("whitespace after left paren");
-    }
-    # allow "for" statements to have empty "continue" clauses
-    if (/\s\)/ && !/^\s*for \([^;]*;[^;]*; \)/) {
-        do err("whitespace before right paren");
-    }
-    if (/^\s*\(void\)[^ ]/) {
-        do err("missing space after (void) cast");
-    }
-    if (/\S{/ && !/{{/) {
-        do err("missing space before left brace");
-    }
-    if ($in_class && /^\s+{/ && ($prev =~ /\)\s*$/)) {
-        do err("left brace starting a line");
-    }
-    if (/}(else|while)/) {
-        do err("missing space after right brace");
-    }
-    if (/}\s\s+(else|while)/) {
-        do err("extra space after right brace");
-    }
-    if (/\b$typename\*/o) {
-        do err("missing space between type name and *");
-    }
-    if ($heuristic) {
-        # cannot check this everywhere due to "struct {\n...\n} foo;"
-        if ($in_class && !$in_declaration &&
-            /}./ && !/}\s+=/ && !/{.*}[;,]$/ && !/}(\s|)*$/ &&
-            !/} (else|while)/ && !/}}/) {
-            do err("possible bad text following right brace");
-        }
-        # cannot check this because sub-blocks in
-        # the middle of code are ok
-        if ($in_class && /^\s+{/) {
-            do err("possible left brace starting a line");
-        }
-    }
-    if (/^\s*else\W/) {
-        if ($prev =~ /^\s*}$/) {
-            $str = "else and right brace should be on same line";
-            if ($statistics == 0) {
-                printf $fmt, $filename, $., $str, $prev;
-                if ($verbose) {
-                    printf "%s\n", $line;
-                }
-            } else {
-                $errcount{$str} += 1;
-                $tot_errcount += 1;
-            }
-        }
-    }
-    $prev = $line;
-}
-
-if ($picky && $prev eq "") {
-    do err("last line in file is blank");
-}
-
-}
diff --git a/xmerge/workben/makefile.mk b/xmerge/workben/makefile.mk
deleted file mode 100644
index b3acd72..0000000
--- a/xmerge/workben/makefile.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-#***************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#***************************************************************************
-
-TARGET=xmrg_workben
-PRJ=..
-
-.INCLUDE : ant.mk
-ALLTAR: ANTBUILD
commit 02bdf65a6ea0dfe16e8afd88f710df52adc3307b
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Tue Jun 5 15:27:17 2012 +0200

    remove obsolete palm stuff
    
    Change-Id: I30543bcb2b3d7101964de48a448af351579a5ddf

diff --git a/xmerge/source/palmtests/README b/xmerge/source/palmtests/README
deleted file mode 100644
index 924f32f..0000000
--- a/xmerge/source/palmtests/README
+++ /dev/null
@@ -1,50 +0,0 @@
-The following is an outline of the usage of this test suite.
-
-Requirements
-^^^^^^^^^^^^
-The following are required for these qa scripts to run correctly.
-	1. POSE: the Palm OS Emulator. This is available from the PalmOS website.
-	2. A Palm pilot rom. Also available from Palm.
-	3. Compiled xmerge jar files (xmerge.jar, aportisdoc.jar etc.)
-	4. Xerces.jar: required by the xmerge framework. This is available from org.apache.com.
- 
-
-
-Test directory Contents
-^^^^^^^^^^^^^^^^^^^^^^^
-This test environment consists on 3 directories.
-	1. bin : This contains some helper scripts that are used by the test environment but can be used in a standalone fashion.
-	2. qa : This directory contains the files necessary to run the POSE emulator and to compare this results of tests with a set of verified (golden-data) files.
-	3. qa-wrapper: This directory contains some wrapper scripts and environment files, that allow a user to change the environment settings, without have to change the POSE control code itself.
-	  
-Setting up the environment
-^^^^^^^^^^^^^^^^^^^^^^^^^^
-	The environment can be changes to reflect a particular users environment, by editing or creating an environment file. This files are usually kept in the qa-wrapper/env directory. These environment settings can then be used when running the scripts.
-
-Running the Scripts
-^^^^^^^^^^^^^^^^^^^
-    Once the environment file has been created, the test scripts can be run by executing the "run-convtest" script in the qa-wrapper/bin directory. This file takes the following arguments
-
-	 run-convtest -env <ENVFILE> [-name RUNNAME]
-
-<ENVFILE> is the environment file to use
-optional <RUNNAME> This can be the name of the user running the scripts. This is used to name a directory for the test results to be kept in.
-
-	e.g. run-convtest -env ../env/master.env
-
-
-
-
-		
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/xmerge/source/palmtests/bin/README b/xmerge/source/palmtests/bin/README
deleted file mode 100644
index 36fbcc6..0000000
--- a/xmerge/source/palmtests/bin/README
+++ /dev/null
@@ -1,6 +0,0 @@
-To run the spose script, you must set the following environmental variables:
-	 
-	POSE2_EXE = Directory and name of the POSE executable file.
-	POSE3_EXE = Directory and name of the POSE executable file. 
-	POSE_PRC =  Directory containing the PRC files to be loaded 
-		    into the emulator
diff --git a/xmerge/source/palmtests/bin/rd b/xmerge/source/palmtests/bin/rd
deleted file mode 100755
index db2dc56..0000000
--- a/xmerge/source/palmtests/bin/rd
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/ksh
-#
-# Directories commonly used by this script...
-#
-
-#export LBHOME=$ZPHOME/lib
-#export CVHOME=$ZPHOME/converters
-#export  CVHOME=/export/home/test/qadir/qa-new/classes
-
-# Set up classpath to include needed ZenSync jars.  Honor the users
-# CLASSPATH by leaving it first.  This allows users to specify their
-# own versions of the jar files in their CLASSPATH if they wish to
-# override these defaults.
-#
-
-export CLASSPATH=$CLASSES_DIR/xerces.jar:$CLASSES_DIR/jmc.jar:$CLASSES_DIR/xmerge.jar:$CLASSES_DIR/minicalc.jar:$CLASSES_DIR/aportisdoc.jar:$CLASSES_DIR/wordsmith.jar
-
-echo "The classpath is $CLASSPATH"
-
-# Run the test driver, passing along args.
-#
-# java com.sun.star.comp.documentconversion.test.Driver $*
-java -cp $CLASSPATH org.openoffice.xmerge.test.Driver $*
-
diff --git a/xmerge/source/palmtests/bin/spose b/xmerge/source/palmtests/bin/spose
deleted file mode 100755
index 29f6a9f..0000000
--- a/xmerge/source/palmtests/bin/spose
+++ /dev/null
@@ -1,108 +0,0 @@
-#!/bin/perl
-#
-# spose - start pose
-#
-
-use Getopt::Std;
-
-# Location of needed files
-#
-$pose2_exe = $ENV{'POSE2_EXE'};
-$pose3_exe = $ENV{'POSE3_EXE'};
-$pose_prc = $ENV{'POSE_PRC'};
-
-
-if (getopts('23qmwo:r:d:v') != 1)
-{
-   &usage();
-}
-
-$apps_load = "";
-
-if ($opt_q)
-{
-   &add_app("$pose_prc/Quickword.PRC");
-}
-if ($opt_m)
-{
-   &add_app("$pose_prc/MiniCalc.prc");
-}
-if ($opt_w)
-{
-   &add_app("$pose_prc/WordSmith.PRC");
-}
-if ($opt_o)
-{
-   &add_app("$opt_o");
-}
-if ($opt_r)
-{
-   $run_prog .= "-run_app $opt_r";
-}
-if ($opt_d)
-{
-   $directory = $opt_d;
-   @files = `/bin/ls -1 $directory/*.pdb`;
-
-   for ($i=0; $i <= $#files; $i++)
-   {
-      $add_file = "$files[$i]";
-      chomp $add_file;
-      &add_app("$add_file");
-   }
-}
-
-if ($opt_3)
-{
-   $pose_exe = $pose3_exe;
-}
-else
-{
-   $pose_exe = $pose2_exe;
-}
-if ($pose_exe eq "")
-{
-    print "\nPose not found: Please set \n       POSE2_EXE\n    or POSE3_EXE\n"; 
-    exit 0;
-}
-if ($opt_v)
-{
-   print ("\n$pose_exe $apps_load $run_prog &\n\n");
-}
-else
-{
-   system ("$pose_exe $apps_load $run_prog &");
-}
-
-exit 0;
-
-sub usage
-{
-   print "\nUsage: getopt [ -m ] [ -q ] [ -w ] [ -o <PrcFile> ] [ -r <RunProg> ]\n";
-   print " -2            Runs pose version 3.2 [ current default ]\n";
-   print " -3            Runs pose version 3.3\n";
-   print " -d            Load all PDB files in specified directory\n";
-   print " -m            Load MiniCalc PRC file\n";
-   print " -q            Load QuickWord PRC file\n";
-   print " -w            Load WordSmith PRC file\n";
-   print " -o <PrcFile>  Other PRC files to load\n";
-   print " -r <RunProg>  Program to run on startup\n";
-   print " -v            Display the command instead of running\n\n";
-   exit(-1);
-}
-
-sub add_app
-{
-   my $new_app = $_[0];
-
-   if ($apps_load ne "")
-   {
-      $apps_load .= ",";
-   }
-   else
-   {
-      $apps_load = "-load_apps ";
-   }
-
-   $apps_load .= "$new_app";
-}
diff --git a/xmerge/source/palmtests/bin/verify_sane.pl b/xmerge/source/palmtests/bin/verify_sane.pl
deleted file mode 100755
index dc085f3..0000000
--- a/xmerge/source/palmtests/bin/verify_sane.pl
+++ /dev/null
@@ -1,110 +0,0 @@
-#!/usr/bin/perl
-#########################################################################
-
- #*************************************************************************
- #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
- #*************************************************************************
-
-####################################################################
-# File Name: template.pl
-# Version  : 1.0
-# Project  : XMerge
-# Author   : Brian Cameron
-# Date     : 5th Sept. 2001
-#
-#
-# Takes x and y from the command line and taps the screen there.
-# Assumes pose is already running.
-#
-##########################################################################
-
-use POSIX "sys_wait_h";   # Need this for waitpid with WNOHANG
-use EmRPC;  # EmRPC::OpenConnection, CloseConnection
-use EmFunctions;
-use EmUtils;
-
-if ($#ARGV != 0)
-{
-  print "\nUsage: $0 timeout\n\n";
-  exit -1;
-}
-
-$timeout = $ARGV[0];
-
-if (!defined($up_pid = fork()))
-{
-   print "ERROR, problem forking.\n"
-}
-elsif ($up_pid)
-{
-   print "\nChecking to see if pose is started properly.\n";
-
-   # Parent process
-   #
-   sleep($timeout);
-
-   waitpid($up_pid, WNOHANG);
-
-   if (kill(0, $up_pid))
-   {
-      print "Pose did not start successfully...\n";
-      kill(9, $up_pid);
-      exit(-1);
-   }
-   else
-   {
-      # The child process exited okay, so we know it will not
-      # hang...but the open_connection will just die if pose
-      # isn't started...so try it in the parent.
-      #
-      open_connection();
-      close_connection();
-
-      print "Verified pose started successfully...\n";
-      exit(0);
-   }
-}
-else
-{
-   # Child process - Try to open/close the connection.  This
-   # can hang if pose did not start properly...
-   #
-   open_connection();
-   close_connection();
-}
-
-sub open_connection
-{
-  print "opening connection\n";
-  EmRPC::OpenConnection(6415, "localhost");
-}
-
-sub close_connection
-{
-  print "closing connection\n";
-  EmRPC::CloseConnection();
-}
-
diff --git a/xmerge/source/palmtests/qa-wrapper/bin/qa_comparator.pl b/xmerge/source/palmtests/qa-wrapper/bin/qa_comparator.pl
deleted file mode 100755
index 6cc49da..0000000
--- a/xmerge/source/palmtests/qa-wrapper/bin/qa_comparator.pl
+++ /dev/null
@@ -1,257 +0,0 @@
-#!/usr/bin/perl
-#########################################################################
-
- #*************************************************************************
- #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
- #*************************************************************************
-
-$compare_home = $ENV{'QA_COMPARATOR_HOME'};
-
-if ($ENV{'CLASSPATH'})
-{
-   $classpath_val = "$compare_home:$ENV{'CLASSPATH'}";
-}
-else
-{
-   $classpath_val = "$compare_home";
-}
-
-print "classpath is $classpath_val\n";
-
-$list_file="";
-$orig_dir="";
-$new_dir="";
-$diff_type="";
-
-####### BEGIN MAIN ##############
-$cmdline_len = @ARGV;
-if ($cmdline_len <= 0)
-{
-    print_usage();
-    exit (0);
-}
-
-process_cmdline(@ARGV);
-print_env();
-open (LOGFILE, ">$logfile") || die "Cannot open log file $logfile";
-if ($test_list ne "")
-{
-    open (TESTLIST, $test_list) || die "Couldn't open diff list file $test_list";
-
-    while (<TESTLIST>)
-    {
-        chomp $_;
-        process_diff(get_file_title($_));
-    }
-}
-close TESTLIST;
-close LOGFILE;
-
-####### END MAIN ##############
-
-sub process_diff
-{
-#   $_[0] =~ tr/A-Z/a-z/;
-
-    # chdir to the output directory so the temporary files created by
-    # the java programs are put in the right place.
-    #
-    chdir ($xml_new);
-
-    if ($diff_type eq "xml")
-    {
-        # Ugly hack, probably a way to tell xerces directly that the dtd's
-        # are in $compare_home/dtd.
-        #
-        `cp $compare_home/dtd/* $xml_new`;
-
-#       $cmd = "java -classpath $classpath_val XmlWrapper $xml_orig/$_[0].sxw $xml_new/$_[0].sxw";
-        $cmd = "java -classpath $classpath_val XmlWrapper $xml_orig/$_[0] $xml_new/$_[0]";
-        print "Executing: $cmd\n";
-        $val = system($cmd)/256;
-        if ($val == 2)
-        {
-#           print LOGFILE "$_[0]|TRUE|$xml_orig/$_[0].sxw|$xml_new/$_[0].sxw\n";
-            print LOGFILE "$_[0]|TRUE|$xml_orig/$_[0]|$xml_new/$_[0]\n";
-        }
-        elsif($val == 3)
-        {
-#           print LOGFILE "$_[0]|FALSE|$xml_orig/$_[0].sxw|$xml_new/$_[0].sxw\n";
-            print LOGFILE "$_[0]|FALSE|$xml_orig/$_[0]|$xml_new/$_[0]\n";
-        }
-        else
-        {
-#           print LOGFILE "$_[0]|ERROR|$xml_orig/$_[0].sxw|$xml_new/$_[0].sxw\n";
-            print LOGFILE "$_[0]|ERROR|$xml_orig/$_[0]|$xml_new/$_[0]\n";
-        }
-    }
-    elsif ($diff_type eq "pdb")
-    {
-#       $cmd = "java -classpath $classpath_val SimplePdbCompare $pdb_orig/$_[0].pdb $pdb_new/$_[0].pdb\n";
-        $cmd = "java -classpath $classpath_val SimplePdbCompare $pdb_orig/$_[0] $pdb_new/$_[0]\n";
-        print "Executing: $cmd\n";
-        $val = system($cmd)/256;
-        if ($val == 2)
-        {
-#           print LOGFILE "$_[0]|TRUE|$pdb_orig/$_[0].pdb|$pdb_new/$_[0].pdb\n";
-            print LOGFILE "$_[0]|TRUE|$pdb_orig/$_[0]|$pdb_new/$_[0]\n";
-        }
-        elsif($val == 3)
-        {
-#           print LOGFILE "$_[0]|FALSE|$pdb_orig/$_[0].pdb|$pdb_new/$_[0].pdb\n";
-            print LOGFILE "$_[0]|FALSE|$pdb_orig/$_[0]|$pdb_new/$_[0]\n";
-        }
-        else
-        {
-#           print LOGFILE "$_[0]|ERROR|$pdb_orig/$_[0].pdb|$pdb_new/$_[0].pdb\n";
-            print LOGFILE "$_[0]|ERROR|$pdb_orig/$_[0]|$pdb_new/$_[0]\n";
-        }
-    }
-    else
-    {
-        die "Don't understand test type of $diff_type.";
-    }
-}
-
-sub process_cmdline
-{
-    foreach $i (@_)
-    {
-        @arg= split('=', $i);
-        @arg[0] =~ tr/A-Z/a-z/;
-
-        if (@arg[0] eq "-pdb-orig")
-        {
-            $pdb_orig=$arg[1];
-        }
-        elsif (@arg[0] eq "-pdb-new")
-        {
-            $pdb_new=$arg[1];
-        }
-        elsif (@arg[0] eq "-xml-orig")
-        {
-            $xml_orig=$arg[1];
-        }
-        elsif (@arg[0] eq "-xml-new")
-        {
-            $xml_new=$arg[1];
-        }
-        elsif (@arg[0] eq "-env")
-        {
-            set_env_from_props($arg[1]);
-        }
-        elsif (@arg[0] eq "-list")
-        {
-            $test_list = $arg[1];
-        }
-        elsif (@arg[0] eq "-one")
-        {
-            $infile = $arg[1];
-        }
-        elsif (@arg[0] eq "-type")
-        {
-            $diff_type = $arg[1];
-            chomp $diff_type;
-        }
-        elsif (@arg[0] eq "-log")
-        {
-            $logfile = $arg[1];
-        }
-        else
-        {
-            print_usage();
-            die "Incorrect command line. Don't understand $i";
-        }
-    }
-}
-
-sub set_env_from_props
-{
-    open(PROPSFILE, $_[0]) || die "Could not open properties file";
-
-    while (<PROPSFILE>)
-    {
-        chomp $_;
-        @arg = split('=', $_);
-        @arg[0] =~ tr/a-z/A-Z/;
-        $len = @arg;
-        if ($len != 2)
-        {
-            die "Malformed property in $ARGV[0]";
-        }
-
-        if (@arg[0] eq "PDB_ORIG")
-        {
-            $pdb_orig=$arg[1];
-        }
-        elsif (@arg[0] eq "PDB_NEW")
-        {
-            $pdb_new=$arg[1];
-        }
-        elsif (@arg[0] eq "XML_ORIG")
-        {
-            $xml_orig=$arg[1];
-        }
-        elsif (@arg[0] eq "XML_NEW")
-        {
-            $xml_new=$arg[1];
-        }
-
-    }
-    close PROPSFILE;
-}
-
-sub print_usage
-{
-    print "Usage : compartor.pl - compare Office or pdb files\n";
-    print "\t-one=<file> :\t\t individual test case file to run\n";
-    print "\t-list=<file> :\t\t list of test case files\n";
-    print "\t-env=<file> :\t\t Properites like file defining env\n";
-    print "\t-pdb-orig=<path> :\t directory to hold original pdb files\n";
-    print "\t-pdb-new=<path> :\t directory to hold new pdb files\n";
-    print "\t-xml-orig=<path> :\t directory to hold original office documents\n";
-    print "\t-xml-new=<path> :\t directory to hold new office documents\n";
-    print "\t-type=<xml|pdb> :\t Invokes the merge option when converting\n";
-    print "\t-log=<logfile> :\t Save results to logfile.\n";
-}
-
-sub print_env
-{
-    print "Using the following environment:\n";
-    print "\tPDB_ORIG  = $pdb_orig\n";
-    print "\tPDB_NEW   = $pdb_new\n";
-    print "\tXML_ORIG  = $xml_orig\n";
-    print "\tXML_NEW   = $xml_new\n\n";
-}
-
-sub get_file_title
-{
-    @paths = split('\/', $_[0]);
-    $len = @paths;
-    return @paths[$len-1];
-#   @names = split('\.', @paths[$len-1]);
-#   return $names[0];
-}
diff --git a/xmerge/source/palmtests/qa-wrapper/bin/qa_test_driver.pl b/xmerge/source/palmtests/qa-wrapper/bin/qa_test_driver.pl
deleted file mode 100755
index fd57512..0000000
--- a/xmerge/source/palmtests/qa-wrapper/bin/qa_test_driver.pl
+++ /dev/null
@@ -1,846 +0,0 @@
-#!/usr/bin/perl
-#########################################################################
-
- #*************************************************************************
- #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
- #*************************************************************************
-
-####################################################################
-# File Name: test_driver.pl
-# Version  : 1.0
-# Project  : Xmerge
-# Author   : Brian Cameron
-# Date     : 5th Sept. 2001
-#
-#
-# This script does the following:
-#
-# Processes the input file, and runs the tests specified in that
-# file.  This will do the following for each test:
-#
-# 1. Convert a file from XML to PDB format
-# 2. Starts up the Palm OS emulator with the appropriate program
-#    running and the converted file loaded the program.
-# 3. Makes automated changes as specified in the inputfile to
-#    this script..
-# 4. Returns to the main applications window.
-#
-# Parameter
-#   Filename to convert and change
-#
-##########################################################################
-
-# Turn on auto-flushing
-#
-$|=1;
-
-use EmRPC;
-
-# Directory where converterlib is located...
-#
-#use lib "/export/home/test/qadir/qa/lib";
-use lib $ENV{'QA_LIB_HOME'};
-use converterlib;
-
-#-------------------- Start of main script ------------------------------------
-
-# Environmental Settings
-
-$pose_exe = "";
-$pose_prc = "";
-$test_list = "";
-$infile = "";
-$merge_opt = 0;
-# if testcase hasn't completed in 10 mins, then kill it off
-$testcase_timeout=600;
-
-# You may need to change this from the default if your pose emulator
-# starts faster or slower than mine.
-#
-if ($ENV{'POSE_TIMEOUT'})
-{
-  $pose_timeout  = "$ENV{'POSE_TIMEOUT'}";
-}
-else
-{
-  $pose_timeout = 15;
-}
-
-$cmdline_len = @ARGV;
-if ($cmdline_len <= 0)
-{
-    print_usage();
-    exit (0);
-}
-
-&process_cmdline(@ARGV);
-&print_env();
-&verify_env_options();
-
-# Make the output directories with timestamps included in the
-# directory names.
-#
-mkdir $pdb_orig, 0777 || die "can not create directory <$pdb_orig>.";
-`chmod 777 $pdb_orig`;
-mkdir $pdb_new,  0777 || die "can not create directory <$pdb_new>.";
-`chmod 777 $pdb_new`;
-mkdir $xml_new,  0777 || die "can not create directory <$xml_new>.";
-`chmod 777 $xml_new`;
-
-&verify_prcs_exist("DBExporter.prc");
-
-if ($test_list ne "")
-{
-    open (TESTLIST, $test_list) || die "Couldn't open testcase list file $test_list";
-
-    while (<TESTLIST>)
-    {
-        &process_testcase($_);
-    }
-}
-elsif ($infile ne "")
-{
-    if (!defined($child_pid = fork()))
-    {
-        # there was an error forking a process
-        print "ERROR: Unable to fork process\n";
-        die "ERROR: Unable to fork process\n";
-    }
-    elsif ($child_pid)
-    {
-        # this is the parent process
-        # run the actual test here
-print "********\tPARENT (pid = $$): process_testcase...\n";
-        &process_testcase($infile);
-print "********\tPARENT (pid = $$): ...process_testcase finished normally\n";
-
-        # test finished normally, so kill the monitor
-        # that is running in the child process
-print "********\tPARENT (pid = $$): kill child process ($child_pid)\n";
-print "********\tPARENT Before:\n";
-system( "/usr/bin/ptree" );
-        kill( $child_pid );
-        kill( 9, $child_pid );
-print "********\tPARENT After:\n";
-system( "/usr/bin/ptree" );
-    }
-    else
-    {
-print "********\tCHILD (pid = $$): sleep for $testcase_timeout seconds\n";
-        # this is the child process
-        # wait on the test running in the parent, and
-        # kill it if it hasn't finished on time
-        sleep( $testcase_timeout );
-
-        # if the parent hasn't killed this process before it
-        # gets here, then it's probably hung, so we need to
-        # kill it.
-        print "********\tCHILD (pid = $$): TEST HUNG? still "
-            ."running after [$testcase_timeout] seconds - "
-            ."need to kill test process\n";
-        $parent = getppid;
-
-        if ( $parent != 1 ) {
-            print "********\nCHILD (pid = $$): Killing process ($parent)\n";
-            kill( $parent );
-            kill( 9, $parent );
-        } else {
-            # If we cannot get the ppid, then the parent might
-            # have died abnormally, before it got a chance to
-            # kill this (child) process.
-            print "********\nCHILD (pid = $$): cannot determine ppid - "
-                ."terminating\n";
-system( "/usr/bin/ptree" );
-            exit(2);
-        }
-
-        exit(1);
-    }
-}
-else
-{
-    die ("You didn't supply any test cases to process");
-}
-
-print "Finished.\n";
-exit(0);
-
-#-------------------- End of main script ----------------------------------------
-
-#--------------------------------------------------------------------------------
-# Various sub routines
-#--------------------------------------------------------------------------------
-
-# process_testcase
-# infile - test case file name
-#
-# This is the main driver function
-# Opens the infile, reads it in parses it, runs the appropriate conversion
-# starts pose and load the file into the emulator. It launches the
-# appropriate editor and then runs the commands specified in the test case.
-# It then exports the file and saves it locally. Finally it is converted
-# back to the original office format.
-#
-sub process_testcase
-{
-    my $infile = $_[0];
-    my $convert_file = "";
-    my $rc;
-
-    # Process the inputfile
-    #
-    open (INFILE, $infile) || die "Failed to open test case <$infile>";
-
-    $running_testtype = "";
-
-    # Process the input file.
-    #
-    while ($c_inline = <INFILE>)
-    {
-       chomp $c_inline;
-       @entry = split('\|', $c_inline);
-
-       # Process TEST
-       #
-       if ($c_inline =~ /^ *#/ || $c_inline =~ /^[ \t]*$/)
-       {
-          # skip comments and blank lines.
-          #
-          next;
-       }
-       elsif ("$entry[0]" eq "TEST")
-       {
-          # Close the test if one is running.
-          #
-          &close_program($convert_file);
-          $running_testtype = "";
-
-          $valid_test = 0;
-
-          if ($#entry != 3)
-          {
-             print "\nERROR, $entry[0] invalid number of arguments\n\n";
-          }
-          else
-          {
-             # Start the test.
-             #
-             print "\nStarting test: $entry[1]\n";
-             $convert_file = $entry[3];
-
-             if ("$entry[2]"  =~ /[Qq][Uu][Ii][Cc][Kk][Ww][Oo][Rr][Dd]/)
-             {
-                $xml_extension = "sxw";
-                $convert_to = "application/x-aportisdoc";
-
-                # Convert XML file to pdb format.
-                #
-                $rc = &convert_to_pdb("$xml_orig", $convert_file, $xml_extension ,
-                   $convert_to,"$pdb_orig");
-                if ($rc != 0)
-                {
-                   print "\nERROR, problem converting file $convert_file\n\n";
-                }
-                else
-                {
-                   # Start pose
-                   #
-                   $rc = &start_pose("$pose_exe",
-                     "$pose_prc/Quickword.PRC,$pose_prc/DBExporter.prc,$pdb_orig/$convert_file.pdb",
-                     "Quickword", $pose_timeout);
-
-                   if ($rc == 0)
-                   {
-                      &start_quickword();
-                      $valid_test = 1;
-                      $running_testtype = "QUICKWORD";
-                      print "\npose launched, begin automated test sequence for QuickWord\n";
-                   }
-                   else
-                   {
-                      &kill_pose();
-                      $running_testtype = "";
-                   }
-                }
-             }
-             elsif ("$entry[2]"  =~ /[Mm][Ii][Nn][Ii][Cc][Aa][Ll][Cc]/)
-             {
-                $xml_extension = "sxc";
-                $convert_to = "application/x-minicalc";
-
-                # Convert XML file to pdb format.
-                #
-                $rc = &convert_to_pdb("$xml_orig", $convert_file,
-                  $xml_extension, $convert_to,"$pdb_orig");
-                if ($rc != 0)
-                {
-                   print "\nERROR, problem converting file $convert_file\n\n";
-                }
-                else
-                {
-                   # Get minicalc PDB file names, since an SXC file can
-                   # be converted to more than one.
-                   #
-                   $pdb_files="";
-                   $i = 1;
-                   while (-f "$pdb_orig/$convert_file-Sheet$i.pdb")
-                   {
-                     if ($i > 1)
-                     {
-                       $pdb_files .= ",";
-                     }
-                     $pdb_files .= "$pdb_orig/$convert_file-Sheet$i.pdb";
-                     $i++;
-                   }
-                   $number = $i-1;
-
-                   # Start pose
-                   #
-                   $rc = &start_pose("$pose_exe",
-                      "$pose_prc/MiniCalc.prc,$pose_prc/DBExporter.prc,$pdb_files",
-                      "MiniCalc", $pose_timeout);
-
-                   if ($rc == 0)
-                   {
-                      &start_minicalc();
-                      $valid_test = 1;
-                      $running_testtype = "MINICALC";
-                      print "pose launched, begin automated test sequence for MiniCalc\n";
-                   }
-                   else
-                   {
-                      &kill_pose();
-                      $running_testtype = "";
-                   }
-                }
-             }
-             else
-             {
-                print "\nERROR, invalid extension <$entry[2]>\n\n";
-             }
-          }
-       }
-
-       # Process DB_EXPORT
-       #
-       elsif ("$entry[0]" eq "DB_EXPORT")
-       {
-          if ($#entry != 1)
-          {
-             print "\nERROR, $entry[0] invalid number of arguments\n\n";
-          }
-          else
-          {
-             &db_export($entry[1]);
-          }
-       }
-
-       # Process TAP_APPLICATIONS
-       #
-       elsif ("$entry[0]" eq "TAP_APPLICATIONS")
-       {
-          if ($#entry != 0)
-          {
-             print "\nERROR, $entry[0] invalid number of arguments\n\n";
-          }
-          else
-          {
-             &tap_applications(0);
-          }
-       }
-
-       # Process ENTER_STRING_AT_LOCATION
-       #
-       elsif ("$entry[0]" eq "ENTER_STRING_AT_LOCATION")
-       {
-          if ($#entry != 3)
-          {
-             print "\nERROR, $entry[0] invalid number of arguments\n\n";
-          }
-          elsif ($valid_test == 0)
-          {
-             print "\nERROR, can not process $entry[0] for invalid test\n\n";
-          }
-          else
-          {
-             &enter_string_at_location($entry[1], $entry[2],
-               $entry[3], $running_testtype);
-          }
-       }
-
-       # Process TAP_PEN
-       #
-       elsif ("$entry[0]" eq "TAP_PEN")
-       {
-          if ($#entry != 2)
-          {
-             print "\nERROR, $entry[0] invalid number of arguments\n\n";
-          }
-          elsif ($valid_test == 0)
-          {
-             print "\nERROR, can not process $entry[0] for invalid test\n\n";
-          }
-          else
-          {
-             &pose_tap_pen($entry[1], $entry[2], 0);
-          }
-       }
-
-       # Process TAP_BUTTON
-       #
-       elsif ("$entry[0]" eq "TAP_BUTTON")
-       {
-          if ($#entry != 1)
-          {
-             print "\nERROR, $entry[0] invalid number of arguments\n\n";
-          }
-          elsif ($valid_test == 0)
-          {
-             print "\nERROR, can not process $entry[0] for invalid test\n\n";
-          }
-          else
-          {
-             &pose_tap_button($entry[1], 0);
-          }
-       }
-
-           # Process TAP_PEN_HARD
-           #
-           elsif ("$entry[0]" eq "TAP_PEN_HARD")
-           {
-              if ($#entry != 2)
-              {
-                 print "\nERROR, $entry[0] invalid number of arguments\n\n";
-              }
-              elsif ($valid_test == 0)
-              {
-                 print "\nERROR, can not process $entry[0] for invalid test\n\n";
-              }
-              else
-              {
-                 &pose_tap_pen_hard($entry[1],$entry[2], 0);
-              }
-           }
-
-
-       # Process SLEEP
-       #
-       elsif ("$entry[0]" eq "SLEEP")
-       {
-          if ($#entry != 1)
-          {
-             print "\nERROR, $entry[0] invalid number of arguments\n\n";
-          }
-          else
-          {
-             &pose_sleep($entry[1]);
-          }
-       }
-
-       # Process MINICALC_ENTER_CELL
-       #
-       elsif ("$entry[0]" eq "MINICALC_ENTER_CELL")
-       {
-          if ($#entry != 3)
-          {
-             print "\nERROR, $entry[0] invalid number of arguments\n\n";
-          }
-          elsif ($valid_test == 0)
-          {
-             print "\nERROR, can not process $entry[0] for invalid test\n\n";
-          }
-          else
-          {
-             &minicalc_enter_cell($entry[1], $entry[2], $entry[3]);
-          }
-       }
-
-       # Process QUICKWORD_FIND_REPLACE
-       #
-       elsif ("$entry[0]" eq "QUICKWORD_FIND_REPLACE")
-       {
-          if ($#entry != 2)
-          {
-             print "\nERROR, $entry[0] invalid number of arguments\n\n";
-          }
-          elsif ($valid_test == 0)
-          {
-             print "\nERROR, can not process $entry[0] for invalid test\n\n";
-          }
-          else
-          {
-             &quickword_find_replace($entry[1], $entry[2]);
-          }
-       }
-       else
-       {
-          print "\nERROR, invalid line <$c_inline>\n";
-       }
-    }
-
-    &close_program($convert_file);
-}
-
-# close_program
-# convert_file - file to export
-#
-# closes the program running in pose and kills pose
-#
-sub close_program
-{
-    my $convert_file = $_[0];
-
-    if ($running_testtype eq "QUICKWORD")
-    {
-        print "QuickWord test completed.\n";
-        &close_program_quickword($convert_file);
-    }
-    elsif ($running_testtype eq "MINICALC")
-    {
-        print "MiniCalc test completed.\n";
-        &close_program_minicalc($convert_file, $number);
-    }
-}
-
-# close_program_quickword
-# convert_file - file to export
-#
-# Closes quickword and kills pose
-#
-sub close_program_quickword
-{
-      my $convert_file = $_[0];
-      my $error_file = "./error.txt";
-      my $rc;
-
-      &close_quickword();
-
-      &db_export($convert_file);
-      print "Moving /tmp/$convert_file.pdb to $pdb_new\n";
-      `mv /tmp/$convert_file.pdb $pdb_new`;
-      `chmod 666 $pdb_new/$convert_file.pdb`;
-
-      &close_connection(1);
-      &kill_pose();
-      print "\nFinishing test...\n";
-
-      # The path of where to put the error file should be specified
-      # in the properties file.  Not sure if it is really necessary
-      # to put this out to a separate file.  STDOUT should be fine.
-      #
-      $rc = &convert_to_xml($xml_new, $xml_orig,
-        "$pdb_new/$convert_file.pdb", "application/x-aportisdoc" ,
-          "sxw", $convert_file, $merge_opt);
-      if ($rc != 0)
-      {
-        print "\nERROR, problem converting file $pdb_new/$convert_file.pdb\n\n";
-      }
-}
-
-# close_program_minicalc
-# convert_file - file to export
-#
-# Closes minicalc and kills pose
-#
-sub close_program_minicalc
-{
-      my $convert_file = $_[0];
-      my $num_files   = $_[1];
-      my $list="";
-      my $rc;
-
-      &close_minicalc();
-
-      for ($a=1; $a <= $num_files; $a++)
-      {
-        &db_export("$convert_file-Sheet$a");
-        print "Moving /tmp/$convert_file-Sheet$a.pdb to $pdb_new/\n";
-        `mv /tmp/$convert_file-Sheet$a.pdb $pdb_new/`;
-        `chmod 666 $pdb_new/$convert_file-Sheet$a.pdb`;
-      }
-
-      &close_connection(1);
-      &kill_pose();
-      print "\nFinishing test...\n";
-
-      for ($a=1; $a <= $num_files; $a++)
-      {
-        $list .="$pdb_new/$convert_file-Sheet$a.pdb "
-      }
-
-      $rc = &convert_to_xml($xml_new, $xml_orig, "$list",
-          "application/x-minicalc", "sxc", $convert_file, $merge_opt);
-      if ($rc != 0)
-      {
-        print "\nERROR, problem converting file(s) $list\n\n";
-      }
-
-      &pose_sleep(5);
-}
-
-# print_usage
-#
-# prints the usage for this program.
-#
-sub print_usage
-{
-    print "Usage : test_driver.pl\n";
-    print "\t-test=<file> \t\t: individual test case file to run\n";
-    print "\t-list=<file> \t\t: list of test case files\n";
-    print "\t-env=<file> \t\t: Properites like file defining env\n";
-    print "\t-pose-exe=<fullpath> \t: path to pose executable\n";
-    print "\t-pose-prc=<path> \t: path to directory holding prc files\n";
-    print "\t-pdb-orig=<path> \t: directory to hold original pdb files\n";
-    print "\t-pdb-new=<path> \t: directory to hold new pdb files\n";
-    print "\t-xml-orig=<path> \t: directory to hold original office documents\n";
-    print "\t-xml-new=<path> \t: directory to hold new office documents\n";
-    print "\t-merge          \t: Invokes the merge option when converting\n";
-    print "\t                \t  from PDB back to XML.\n";
-}
-
-# print_env
-#
-# Prints the current environment.
-#
-sub print_env
-{
-    print "\nUsing the following environment:\n";
-    print "\tPOSE_EXE  = $pose_exe\n";
-    print "\tPOSE_PRC  = $pose_prc\n";
-    print "\tPDB_ORIG  = $pdb_orig\n";
-    print "\tPDB_NEW   = $pdb_new\n";
-    print "\tXML_ORIG  = $xml_orig\n";
-    print "\tXML_NEW   = $xml_new\n";
-}
-
-# process_cmdline
-#
-# command line options come in as key/value pairs.
-# read them and set the appropriate global variable
-#
-# Sets these globals: pose_exe, pose_prc, xml_orig, xml_new_dir,
-# xml_new, pdb_orig_dir, pdb_orig, pdb_new_dir, pdb_new.
-#
-sub process_cmdline
-{
-    foreach $i (@_)
-    {
-        my @arg= split('=', $i);
-        @arg[0] =~ tr/A-Z/a-z/;
-
-        if (@arg[0] eq "-pose-exe")
-        {
-            $pose_exe=$arg[1];
-        }
-        elsif (@arg[0] eq "-pose-prc")
-        {
-            $pose_prc=$arg[1];
-        }
-        elsif (@arg[0] eq "-pdb-orig")
-        {
-            $pdb_orig_dir=$arg[1];
-            $pdb_orig=$arg[1];
-        }
-        elsif (@arg[0] eq "-pdb-new")
-        {
-            $pdb_new_dir=$arg[1];
-            $pdb_new=$arg[1];
-        }
-        elsif (@arg[0] eq "-xml-orig")
-        {
-            $xml_orig=$arg[1];
-        }
-        elsif (@arg[0] eq "-xml-new")
-        {
-            $xml_new_dir=$arg[1];
-            $xml_new=$arg[1];
-        }
-        elsif (@arg[0] eq "-env")
-        {
-            &set_env_from_props($arg[1]);
-        }
-        elsif (@arg[0] eq "-list")
-        {
-            $test_list = $arg[1];
-        }
-        elsif (@arg[0] eq "-test")
-        {
-            $infile = $arg[1];
-        }
-        elsif (@arg[0] eq "-merge")
-        {
-             $merge_opt = 1;
-        }
-        else
-        {
-            print_usage();
-            die "Incorrect command line";
-        }
-    }
-}
-
-# set_env_from_props
-# infile - property file
-#
-# Read the properties file, of the form key=value
-# Valid key values are :
-#   POSE_EXE
-#   POSE_PRC
-#   PDB_ORIG
-#   PDB_NEW
-#   XML_ORIG
-#   XML_NEW
-# If a value is found the appropriate global variable is set.
-#
-# Sets these globals: pose_exe, pose_prc, xml_orig, xml_new_dir,
-# xml_new, pdb_orig_dir, pdb_orig, pdb_new_dir, pdb_new.
-#
-sub set_env_from_props
-{
-    my $infile = $_[0];
-
-    open(PROPSFILE, $infile) || die "Could not open properties file <$infile>";
-
-    while (<PROPSFILE>)
-    {
-        chomp $_;
-        my @arg = split('=', $_);
-        @arg[0] =~ tr/a-z/A-Z/;
-        my $len = @arg;
-        if ($len != 2)
-        {
-            die "Malformed property in $arg[0]";
-        }
-        if (@arg[0] eq "POSE_EXE")
-        {
-            $pose_exe=$arg[1];
-        }
-        elsif (@arg[0] eq "POSE_PRC")
-        {
-            $pose_prc=$arg[1];
-        }
-        elsif (@arg[0] eq "PDB_ORIG")
-        {
-            $pdb_orig_dir=$arg[1];
-            $pdb_orig=$arg[1];
-        }
-        elsif (@arg[0] eq "PDB_NEW")
-        {
-            $pdb_new_dir=$arg[1];
-            $pdb_new=$arg[1];
-        }
-        elsif (@arg[0] eq "XML_ORIG")
-        {
-            $xml_orig=$arg[1];
-        }
-        elsif (@arg[0] eq "XML_NEW")
-        {
-            $xml_new_dir=$arg[1];
-            $xml_new=$arg[1];
-        }
-
-    }
-    close PROPSFILE;
-}
-
-# verify_env_options
-#
-# Verify that input options are correctly set.
-# Assumes pose_exe, pose_prc, xml_orig, xml_new_dir,
-# pdb_orig_dir, and pdb_new_dir are already set.
-#
-sub verify_env_options
-{
-    if (!-e "$pose_exe")
-    {
-        die "The pose executable cannot be found at $pose_exe.";
-    }
-    if (!-x $pose_exe)
-    {
-        die "$pose_exe exists but is not executable.";
-    }
-
-    if (!-e "$pose_prc")
-    {
-        die "The PRC directory specified as $pose_prc does not exist.";
-    }
-    if (!-d "$pose_prc")
-    {
-        die "The PRC location specified as $pose_prc exists, but is not a directory.";
-    }
-
-    if (!-e "$pdb_orig_dir")
-    {
-        die "The original PDB directory specified as $pdb_orig_dir does not exist.";
-    }
-    if (!-d "$pdb_orig_dir")
-    {
-        die "The original PDB directory specified as $pdb_orig_dir exists but is not a directory.";
-    }
-
-    if (!-e "$pdb_new_dir")
-    {
-        die "The new PDB directory specified as $pdb_new_dir does not exist.";
-    }
-    if (!-d "$pdb_new_dir")
-    {
-        die "The new PDB directory specified as $pdb_new_dir exists but is not a directory.";
-    }
-
-    if (!-e "$xml_orig")
-    {
-        die "The original Office document directory specified as $xml_orig does not exist.";
-    }
-    if (!-d "$xml_orig")
-    {
-        die "The original Office document location specified as $xml_orig exists but is not a directory.";
-    }
-
-    if (!-e "$xml_new_dir")
-    {
-        die "The new Office document directory specified as $xml_new_dir does not exist.";
-    }
-    if (!-d "$xml_new_dir")
-    {
-        die "The new Office document location specified as $xml_new_dir exists but is not a directory.";
-    }
-}
-
-# verify_prcs_exist
-# prcfile - the PRC file to check
-#
-# Verifies that the specified PRC file exists.
-#
-sub verify_prcs_exist
-{
-    my $prcfile = $_[0];
-
-    if (!-e "$pose_prc/$prcfile")
-    {
-        die "The pose PRC directory ($pose_prc) is correct, but I can't find $prcfile there.";
-    }
-}
-
diff --git a/xmerge/source/palmtests/qa-wrapper/bin/run-convtest b/xmerge/source/palmtests/qa-wrapper/bin/run-convtest
deleted file mode 100755
index 56c1250..0000000
--- a/xmerge/source/palmtests/qa-wrapper/bin/run-convtest
+++ /dev/null
@@ -1,538 +0,0 @@
-#!/bin/ksh
-#########################################################################
-
- #*************************************************************************
- #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
- #*************************************************************************
-
-#set -x
-umask 0
-
-integer TOTAL_PASS=0
-integer TOTAL_FAIL=0
-integer TOTAL_RUN=0
-integer MAX_RETRIES=5
-typeset RUNNAME=`date +%Y%m%d%H%M%S`
-typeset PRINTDATE=`date`
-typeset PDB_INFILE_DIR
-typeset PDB_OUTFILE_DIR
-typeset XML_OUTFILE_DIR
-typeset REPORT
-typeset RESDIR
-typeset LOGFILE
-typeset COMPLOG
-typeset TEST_COMMENTS
-typeset BGCOLOR
-typeset ODD_BGCOLOR='#BBBBBB'
-typeset EVEN_BGCOLOR='#DCDCDC'
-typeset PASS_COLOR='#00ff00'
-typeset FAIL_COLOR='#ff4040'
-
-typeset ENVFILE=""
-# The following variables should be set in the env file
-typeset MASTERLIST=""
-typeset TESTCASEDIR=""
-typeset RESULTSBASE=""
-typeset XMERGE_JAR=""
-typeset APORTIS_JAR=""
-typeset WORDSMITH_JAR=""
-typeset MINICALC_JAR=""
-typeset PERL5LIB=""
-typeset POSE_EXE=""
-typeset POSE_PRC=""
-typeset TEST_DRIVER_PL=""
-typeset COMPARATOR_PL=""
-typeset COMPLIST=""
-typeset XML_INFILE_DIR=""
-typeset PDB_BASELINE_DIR=""
-typeset XML_BASELINE_DIR=""
-typeset EM_SCRIPT_HOME=""
-typeset QAWRAPPER_SCRIPT_HOME=""
-typeset EM_ROM_FILE=""
-typeset EM_SESSION_FILE=""
-typeset QA_LIB_HOME=""
-typeset QA_COMPARATOR_HOME=""
-typeset CLASSES_DIR=""
-
-
-
-################################################################################
-Usage() {
-	echo "Usage: run-convtest -env <ENVFILE> [-name RUNNAME]"
-	exit 1
-}
-
-
-################################################################################
-StartReportFile() {
-	typeset line=`date`
-
-	ReportLine "<HTML>"
-	ReportLine "<HEAD>"
-	ReportLine "<TITLE>XMerge Converters Test Results - ${RUNNAME}</TITLE>"
-	ReportLine "</HEAD>"
-	ReportLine "<BODY BGCOLOR=#ffffff>"
-	ReportLine "<H1 align=center>XMerge Converters Test Results - ${RUNNAME}</H1>"
-	ReportLine "<P>"
-	ReportLine "Test run on: ${PRINTDATE}"
-	ReportLine "<P>"
-	ReportLine "<CENTER>"
-	ReportLine "<TABLE WIDTH='100%' BORDER=1 CELLSPACING=0 CELLPADDING=2>"
-	ReportLine "<TR BGCOLOR='#9999CC'>"
-	ReportLine "<TH>Test Name</TH>"
-	ReportLine "<TH>Test File</TH>"
-	ReportLine "<TH>.ext</TH>"
-	ReportLine "<TH>Result</TH>"
-	ReportLine "<TH>Comments</TH>"
-	ReportLine "</TR>"
-}
-
-
-################################################################################
-EndReportFile() {
-	# remove full path from LOGFILE (link will be to current dir)
-	typeset loglink=${LOGFILE##*/}
-
-	ReportLine "<P>"
-	ReportLine "<CENTER>"
-	ReportLine "<TABLE BORDER=1 CELLSPACING=0 CELLPADDING=2>"
-	ReportLine "<TR>"
-	ReportLine "<TH>Total Tests PASSED</TH>"
-	ReportLine "<TH>${TOTAL_PASS}</TH>"
-	ReportLine "</TR>"
-	ReportLine "<TR>"
-	ReportLine "<TH>Total Tests FAILED</TH>"
-	ReportLine "<TH>${TOTAL_FAIL}</TH>"
-	ReportLine "</TR>"
-	ReportLine "<TR>"
-	ReportLine "<TH>Total Tests Run</TH>"
-	ReportLine "<TH>${TOTAL_RUN}</TH>"
-	ReportLine "</TR>"
-	ReportLine "</TABLE>"
-	ReportLine "</CENTER>"
-	ReportLine "<P>"
-	ReportLine "<A HREF=${loglink}>Full logfile for test run</A>"
-	ReportLine "<P>"
-	ReportLine "<CENTER>"
-	ReportLine "</BODY>"
-	ReportLine "</HTML>"
-}
-
-################################################################################
-ReportLine() {
-	echo $1 >> $REPORT
-}
-
-################################################################################
-LogLine() {
-	echo $1 >> $LOGFILE
-}
-
-################################################################################
-ReportTestComments() {
-	if [[ $TEST_COMMENTS == "" ]] ; then
-		TEST_COMMENTS="&nbsp;"
-	fi
-
-	ReportLine "<TD>${TEST_COMMENTS}</TD>"
-}
-
-################################################################################
-GetParams() {
-	integer argc=$#
-	integer i=0
-
-	if [[ $argc -lt 1 ]] ; then
-		Usage
-	fi
-
-	while (($i < $argc)) ; do
-		arg=$1
-		shift
-    		i=i+1
-
-		if [[ $arg == '-name' ]] ; then
-			if (( $i < $argc )) ; then
-				RUNNAME=$1
-				echo "RUNNAME=[$RUNNAME]"
-				shift
-				i=i+1
-			else
-				Usage
-			fi
-		elif [[ $arg == '-env' ]] ; then
-			if (( $i < $argc )) ; then
-				ENVFILE=$1
-				shift
-				i=i+1
-			else
-				Usage
-			fi
-		else
-			Usage
-		fi
-	done
-
-	if [[ $ENVFILE == "" ]] ; then
-		Usage
-	fi
-}
-
-
-################################################################################
-ReadEnvFile() {
-	. $ENVFILE
-
-	
-	echo ""
-	echo "The following values have been set from $ENVFILE:"
-	echo "MASTERLIST=$MASTERLIST"
-	echo "TESTCASEDIR=$TESTCASEDIR"
-	echo "XMERGE_JAR=$XMERGE_JAR"
-	echo "APORTIS_JAR=$APORTIS_JAR"
-	echo "WORDSMITH_JAR=$WORDSMITH_JAR"
-	echo "MINICALC_JAR=$MINICALC_JAR"
-	echo "RESULTSBASE=$RESULTSBASE"
-	echo "PERL5LIB=$PERL5LIB"
-	echo "POSE_EXE=$POSE_EXE"
-	echo "POSE_PRC=$POSE_PRC"
-	echo "TEST_DRIVER_PL=$TEST_DRIVER_PL"
-	echo "COMPARATOR_PL=$COMPARATOR_PL"
-	echo "XML_INFILE_DIR=$XML_INFILE_DIR"
-	echo "PDB_BASELINE_DIR=$PDB_BASELINE_DIR"
-	echo "XML_BASELINE_DIR=$XML_BASELINE_DIR"
-	echo "EM_SCRIPT_HOME=$EM_SCRIPT_HOME"
-	echo "QAWRAPPER_SCRIPT_HOME=$QAWRAPPER_SCRIPT_HOME"
-	echo "EM_ROM_FILE=$EM_ROM_FILE"
-	echo "EM_SESSION_FILE=$EM_SESSION_FILE"
-	echo "QA_LIB_HOME=$QA_LIB_HOME"
-	echo "QA_COMPARATOR_HOME=$QA_COMPARATOR_HOME"
-	echo "CLASSES_DIR=$CLASSES_DIR"
-	echo "COMPLIST=$COMPLIST"
-}
-
-################################################################################
-POSESetup() {
-	export PERL5LIB
-	export EM_SCRIPT_HOME
-	export QAWRAPPER_SCRIPT_HOME
-	export EM_ROM_FILE
-	export EM_SESSION_FILE
-	export QA_LIB_HOME
-	export QA_COMPARATOR_HOME
-   	export CLASSES_DIR
-	
-}
-
-################################################################################
-TestSetup() {
-	
-
-	POSESetup
-
-	export ZENDEBUG=1   
-
-	COMPLIST="${COMPLIST}/tempcomp.${RUNNAME}.list"
-	# create the directories for the results of this test run
-	RESDIR="${RESULTSBASE}/${RUNNAME}"
-	\rm -Rf $RESDIR
-	mkdir $RESDIR
-
-	# Define the directories for the test input files,
-	# test output files, working directories and baseline files
-	PDB_INFILE_DIR="${RESDIR}/pdb-orig"
-	mkdir "${PDB_INFILE_DIR}"
-	PDB_OUTFILE_DIR="${RESDIR}/pdb-new"
-	mkdir "${PDB_OUTFILE_DIR}"
-	XML_OUTFILE_DIR="${RESDIR}/xml-new"
-	mkdir "${XML_OUTFILE_DIR}"
-
-	LOGFILE="${RESDIR}/logfile"
-	COMPLOG="${RESDIR}/complog"
-	REPORT="${RESDIR}/report.html"
-	StartReportFile
-
-	echo "Results in: $RESDIR"
-	echo "Report file: $REPORT"
-}
-
-################################################################################
-TestCleanup() {
-	EndReportFile
-}
-
-################################################################################
-TestCaseSetup() {
-	# where to pick up converter classes
-	export CLASSPATH=""
-	export CLASSPATH=$CLASSPATH:$XMERGE_JAR
-	export CLASSPATH=$CLASSPATH:$APORTIS_JAR
-	export CLASSPATH=$CLASSPATH:$WORDSMITH_JAR
-	export CLASSPATH=$CLASSPATH:$MINICALC_JAR
-}
-
-################################################################################
-TestCaseCleanup() {
-	# empty function
-	a=42
-}
-
-################################################################################
-RunTestCase() {
-	testcase=$1
-
-	LogLine ""
-	LogLine "test_driver output:"
-
-	# run test_driver in foreground
-	$TEST_DRIVER_PL\
-		-pose-prc=${POSE_PRC}\
-		-pose-exe=${POSE_EXE}\
-		-xml-orig=${XML_INFILE_DIR}\
-		-pdb-orig=${PDB_INFILE_DIR}\
-		-pdb-new=${PDB_OUTFILE_DIR}\
-		-xml-new=${XML_OUTFILE_DIR}\
-		-test=$testcase -merge >> $LOGFILE 2>&1
-
-	# cleanup in case zombie POSE processes are hanging around
-	pkill pose
-	pkill -9 pose
-}
-
-
-################################################################################
-ComparisonSetup() {
-	typeset file=$1
-
-	
-	export CLASSPATH="$CLASSES_DIR/xerces.jar"
-
-	# create temporary comparator list file for this test case
-	echo $file > $COMPLIST
-}
-
-################################################################################
-ComparisonCleanup() {
-	# remove temporary comparator list file used for this test case
-	\rm -f $COMPLIST
-}
-
-################################################################################
-RunComparison() {
-	typeset type=$1
-
-	LogLine ""
-	LogLine "Comparator output:"
-	$COMPARATOR_PL\
-		-xml-orig=${XML_BASELINE_DIR}\
-		-pdb-orig=${PDB_BASELINE_DIR}\
-		-pdb-new=${PDB_INFILE_DIR}\
-		-xml-new=${XML_OUTFILE_DIR}\
-		-list=$COMPLIST -log=$COMPLOG -type=$type >> $LOGFILE 2>&1
-#		-list=$COMPLIST -log=$COMPLOG -type=$type | tee -a $LOGFILE 2>&1
-
-	pass=`grep TRUE $COMPLOG | wc -l`
-
-	LogLine ""
-	LogLine "COMPLIST file:"
-	cat $COMPLIST >> $LOGFILE
-	LogLine ""
-	LogLine "Comparator logfile:"
-	cat $COMPLOG >> $LOGFILE
-
-	if [ $pass -eq 0 ]
-	then
-		TEST_COMMENTS="${TEST_COMMENTS}$type comparison ERROR<BR>"
-		echo "$type comparison ERROR"
-		return 0
-	fi
-
-	echo "$type comparison OK"
-	return 1
-}
-
-################################################################################
-CheckOutput() {
-	typeset xmlfile="${XML_OUTFILE_DIR}/$1"
-	typeset pdbfile="${PDB_INFILE_DIR}/$2"
-
-	if [ ! -f $pdbfile ] ; then
-		TEST_COMMENTS="${TEST_COMMENTS}[$pdbfile] does not exist<BR>"
-		LogLine "ERROR: $pdbfile does not exist"
-		echo "ERROR: $pdbfile does not exist"
-		return 0
-	fi
-
-	if [ ! -f $xmlfile ] ; then
-		TEST_COMMENTS="${TEST_COMMENTS}[$xmlfile] does not exist<BR>"
-		LogLine "ERROR: $xmlfile does not exist"
-		echo "ERROR: $xmlfile does not exist"
-		return 0
-	fi
-
-	return 1
-}
-
-################################################################################
-RunTest() {
-	typeset testcasename
-	typeset testcase
-	typeset testfile
-	typeset pdbfile
-	typeset xmlfile
-	typeset ext
-	integer try
-	integer finished_with_test
-	integer test_pass
-
-	TestSetup
-
-	BGCOLOR=$ODD_BGCOLOR
-
-	while read line ; do
-		# get chars up to 1st space
-		testcasename=${line%% *}
-		testcase="${TESTCASEDIR}/$testcasename"
-
-		# get 2nd word
-		testfile=${line#* }
-		testfile=${testfile%% *}
-
-		# get last word
-		ext=${line##* }
-
-		LogLine "############################################"
-		LogLine "Starting the following testcase"
-		LogLine "testcase = $testcase"
-		LogLine "testfile = $testfile"
-		LogLine "ext = $ext"
-
-		ReportLine "<TR BGCOLOR='${BGCOLOR}'>"
-		ReportLine "<TD valign=top>$testcasename</TD>"
-		ReportLine "<TD valign=top>$testfile</TD>"
-		ReportLine "<TD valign=top>$ext</TD>"
-
-		echo ""
-		echo "testcase = $testcase"
-		echo "testfile = $testfile"
-		echo "ext = $ext"
-
-		try=1
-		finished_with_test=0
-		TEST_COMMENTS=""
-
-		while (($finished_with_test == 0)) ; do
-
-			TestCaseSetup
-			RunTestCase $testcase
-			TestCaseCleanup
-
-			xmlfile="${testfile}.${ext}"
-
-			if [[ $ext == "sxc" ]] ; then
-				pdbfile="${testfile}-Sheet1.pdb"
-			else
-				pdbfile="${testfile}.pdb"
-			fi
-
-			CheckOutput $xmlfile $pdbfile
-			res=$?
-
-			if [[ $res -eq 1 ]] ; then
-				ComparisonSetup $pdbfile
-				RunComparison pdb
-				res=$?
-# ignore result until pdb comparator is fixed...
-res=1
-				ComparisonCleanup
-			fi
-
-			if [[ $res -eq 1 ]] ; then
-				ComparisonSetup $xmlfile
-				RunComparison xml
-				res=$?
-				ComparisonCleanup
-			fi
-
-			if [[ $res -eq 1 ]] ; then
-				TOTAL_PASS=TOTAL_PASS+1
-				ReportLine "<TD valign=top BGCOLOR='${PASS_COLOR}'>PASS</TD>"
-				ReportTestComments
-				ReportLine "</TR>"
-				LogLine "Test PASSED (on try $try)"
-				echo "Test PASSED (on try $try)"
-				finished_with_test=1
-			else
-				TEST_COMMENTS="${TEST_COMMENTS}error on try ${try}<BR>"
-				LogLine "TEST FAILED (on try $try)"
-				echo "TEST FAILED (on try $try)"
-
-				if [[ $try -eq $MAX_RETRIES ]] ; then
-					TOTAL_FAIL=TOTAL_FAIL+1
-					ReportLine "<TD valign=top BGCOLOR='${FAIL_COLOR}'>FAIL</TD>"
-					ReportTestComments
-					ReportLine "</TR>"
-					finished_with_test=1
-				fi
-			fi
-
-			try=try+1
-		done
-
-		TOTAL_RUN=TOTAL_RUN+1
-
-		# toggle BGCOLOR for next report line
-		if [[ $BGCOLOR == $ODD_BGCOLOR ]] ; then
-			BGCOLOR=$EVEN_BGCOLOR
-		else
-			BGCOLOR=$ODD_BGCOLOR
-		fi
-
-	done < $MASTERLIST
-
-	ReportLine "</TABLE>"
-	ReportLine "</CENTER>"
-
-	TestCleanup
-
-	echo "Total Tests PASSED: "${TOTAL_PASS}
-	echo "Total Tests FAILED: "${TOTAL_FAIL}
-	echo "Total Tests RUN: "${TOTAL_RUN}
-	echo "Results in: $RESDIR"
-	echo "Report file: $REPORT"
-}
-
-################################################################################
-################################################################################
-# main
-################################################################################
-################################################################################
-
-GetParams $@
-ReadEnvFile
-RunTest
-
-exit 0
diff --git a/xmerge/source/palmtests/qa-wrapper/env/master.env b/xmerge/source/palmtests/qa-wrapper/env/master.env
deleted file mode 100644
index 8a94627..0000000
--- a/xmerge/source/palmtests/qa-wrapper/env/master.env
+++ /dev/null
@@ -1,85 +0,0 @@
-#The Qa-Test environment is defined in this file. All of the fields are 
-#necessary in order for the scripts to run effectlively
-
-###########################################################
-# MASTERLIST file defines which test to run. These list are usually located in 
-# the qa-wrapper/lists dir 
-
-MASTERLIST=<listdir/list file>
-
-###########################################################
-#The TESTCASE dir is where the testcases to be run are located
-
-TESTCASEDIR=<testcase dir>
-
-###########################################################
-# Results are stored in a new directory at ${RESULTSBASE}/results-${RUNNAME}
-
-RESULTSBASE=/export/home/test/qadir/qa-wrapper/results
-
-###########################################################
-# Where to find the Xmerge JAR files
-
-APORTIS_JAR=/export/home/test/qadir/qa-wrapper/classes/aportisdoc.jar
-WORDSMITH_JAR=/export/home/test/qadir/qa-wrapper/classes/wordsmith.jar
-MINICALC_JAR=/export/home/test/qadir/qa-wrapper/classes/minicalc.jar
-CLASSES_DIR=<qa-wrapperdir>/classes
-
-###########################################################
-# setup which version of POSE to use
-
-PERL5LIB=<Pose directory>/Scripting/Perl
-POSE_EXE=<Pose directory>/posedist/pose
-POSE_PRC=<location of prc files to use for testing>
-
-###########################################################
-
-# Location of files required to run Pose
-
-EM_ROM_FILE=<location and name of palm rom file>
-EM_SESSION_FILE=<location of palm session file>
-
-
-###########################################################
-
-
-# where to get the executables for the test_driver and the comparator
-
-TEST_DRIVER_PL=<qa-wrapperdir>/bin/qa_test_driver.pl
-COMPARATOR_PL=<qa-wrapperdir>/bin/qa_comparator.pl
-COMPLIST=<qa-wrapperdir>/lists
-
-###########################################################
-# where to get the original XML test files
-
-XML_INFILE_DIR=<qa-wrapperdir>/testcases/xml-orig
-
-###########################################################
-# where to find the baseline PDB files
-
-PDB_BASELINE_DIR=<qa-wrapperdir>/results/baseline/pdb-base
-
-###########################################################
-# where to find the baseline XML files
-
-XML_BASELINE_DIR=<qa-wrapperdir>/results/baseline/xml-base
-
-###########################################################
-#Location of script that runs the conversions 
-EM_SCRIPT_HOME=<location of rd script>
-
-###########################################################
-#Location of run-convtest.pl
-QAWRAPPER_SCRIPT_HOME=<qa-wrapperdir>/bin
-
-###########################################################
-#Location of converterlib.pm
-QA_LIB_HOME=<qa dir>/lib
-
-###########################################################
-#Location of comparator.pl
-QA_COMPARATOR_HOME=<qa dir>/comparator/
-
-
-
-
diff --git a/xmerge/source/palmtests/qa-wrapper/lists/master.list b/xmerge/source/palmtests/qa-wrapper/lists/master.list
deleted file mode 100644
index d6be4fb..0000000
--- a/xmerge/source/palmtests/qa-wrapper/lists/master.list
+++ /dev/null
@@ -1,55 +0,0 @@
-c_addition01-mod.infile c_addition sxc
-c_alignment.infile c_alignment sxc
-c_backwardrange-mod.infile c_backwardrange sxc
-c_basic-mod.infile c_basic sxc
-c_boolean-mod.infile c_boolean sxc
-c_cellpercentvalue-mod.infile c_cellpercentvalue sxc
-c_cellstringvalue-mod.infile c_cellstringvalue sxc
-c_columnswidth-mod.infile c_columnswidth sxc
-c_cyclic-mod.infile c_cyclic sxc
-c_dividefloating-mod.infile c_dividefloating sxc
-c_forwardrange-mod.infile c_forwardrange sxc
-c_insertimage.infile c_insertimage sxc
-c_invalidcellref-mod.infile c_invalidcellref sxc
-c_largerange-mod.infile c_largerange sxc
-c_listrange-mod.infile c_listrange sxc
-c_mathematical-mod.infile c_mathematical sxc
-c_protection-mod01.infile c_protection sxc
-c_sheetreference-mod.infile c_sheetreference sxc
-c_simple01-mod.infile c_simple01 sxc
-c_simple02-mod.infile c_simple04 sxc
-c_simple03-mod.infile c_simple02 sxc
-c_simple04-mod.infile c_simple03 sxc
-c_smallrange-mod.infile c_smallrange sxc
-c_styles.infile c_styles sxc
-c_textimage.infile c_textimage sxc
-a_table.infile a_table sxw
-a_animatedgif.infile a_animatedgif sxw
-a_linebreaks.infile a_linebreaks sxw
-a_bulletorderedlist.infile a_bulletorderedlist sxw
-a_superscript.infile a_superscript sxw
-a_subscript.infile a_subscript sxw
-a_emptydoc.infile a_emptydoc sxw
-a_fontsize.infile a_fontsize sxw
-a_heading.infile a_heading sxw
-a_heading1.infile a_heading1 sxw
-a_heading2.infile a_heading2 sxw
-a_hyperlink.infile a_hyperlink sxw
-a_justified.infile a_justified sxw
-a_linespacing.infile a_linespacing sxw
-a_numberorderedlist.infile a_numberorderedlist sxw
-a_pagebreak.infile a_pagebreak sxw
-a_paragraph.infile a_paragraph sxw
-a_standard.infile a_standard sxw
-a_symbols.infile a_symbols sxw
-a_wordwrap.infile a_wordwrap sxw
-a_unorderedlist.infile a_unorderedlist sxw
-a_textspan.infile a_textspan sxw
-a_bolddoc.infile a_bolddoc sxw
-a_tab.infile a_tab sxw
-a_firstlineindent.infile a_firstlineindent sxw
-a_bookmarks.infile a_bookmarks sxw
-
-
-
-
diff --git a/xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/a_animatedgif.pdb b/xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/a_animatedgif.pdb
deleted file mode 100644
index 4bd289a..0000000
--- a/xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/a_animatedgif.pdb
+++ /dev/null
@@ -1,6 +0,0 @@
-a_animatedgif
-Start of animated gif
-  
-
-End of animated gif
-
diff --git a/xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/a_bolddoc.pdb b/xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/a_bolddoc.pdb
deleted file mode 100644
index 5761b33..0000000
--- a/xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/a_bolddoc.pdb
+++ /dev/null
@@ -1 +0,0 @@
-a_bolddoc
\ No newline at end of file
diff --git a/xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/a_bookmarks.pdb b/xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/a_bookmarks.pdb
deleted file mode 100644
index 9bc503e..0000000
--- a/xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/a_bookmarks.pdb
+++ /dev/null
@@ -1,10 +0,0 @@
-a_bookmarksThe above line is bookmarked as 'BK1'.
-In the next paragraph Sthe word Silicon is bookmarked to 'BK2'
-
-12 June 2001) In a CBS Marketwatch article, Scott McNealy says that
-despite the failure of Net start-ups and declining stock prices, Silicon
-Valley is still operating under the same rules and values. He also says, "I
- firmly believe that the Internet revolution is just beginning. Companies
- may be pausing to catch their breath right now, but the benefits of the
- Internet are too profound to hold back for long."
-
diff --git a/xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/a_bulletorderedlist.pdb b/xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/a_bulletorderedlist.pdb
deleted file mode 100644
index 5042141..0000000
--- a/xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/a_bulletorderedlist.pdb
+++ /dev/null
@@ -1,8 +0,0 @@
-a_bulletorderedlist
-Bullet 1
-Bullet 2
-Bullet 3
-Bullet 4
-
-End of bullet Ordered list
-
diff --git a/xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/a_emptydoc.pdb b/xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/a_emptydoc.pdb
deleted file mode 100644
index 5ba1ae5..0000000
--- a/xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/a_emptydoc.pdb
+++ /dev/null
@@ -1 +0,0 @@
-a_emptydoc
\ No newline at end of file
diff --git a/xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/a_firstlineindent.pdb b/xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/a_firstlineindent.pdb
deleted file mode 100644
index b9f4514..0000000
--- a/xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/a_firstlineindent.pdb
+++ /dev/null
@@ -1 +0,0 @@
-a_firstlineindent
\ No newline at end of file
diff --git a/xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/a_fontsize.pdb b/xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/a_fontsize.pdb
deleted file mode 100644
index 48727c5..0000000
--- a/xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/a_fontsize.pdb
+++ /dev/null
@@ -1,6 +0,0 @@
-a_fontsizeText with font size 10
-Text with font size 16
-Text with font size 20
-Text with fontsize 40
-Text with font size 96
-
diff --git a/xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/a_heading.pdb b/xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/a_heading.pdb
deleted file mode 100644
index 6b0e0e8..0000000
--- a/xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/a_heading.pdb
+++ /dev/null
@@ -1 +0,0 @@
-a_heading
\ No newline at end of file
diff --git a/xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/a_heading1.pdb b/xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/a_heading1.pdb
deleted file mode 100644
index 9bfca20..0000000
--- a/xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/a_heading1.pdb
+++ /dev/null
@@ -1 +0,0 @@
-a_heading1
\ No newline at end of file
diff --git a/xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/a_heading2.pdb b/xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/a_heading2.pdb
deleted file mode 100644
index 8b5f9d3..0000000
--- a/xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/a_heading2.pdb
+++ /dev/null
@@ -1 +0,0 @@
-a_heading2
diff --git a/xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/a_hyperlink.pdb b/xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/a_hyperlink.pdb
deleted file mode 100644
index 02f9ee2..0000000
--- a/xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/a_hyperlink.pdb
+++ /dev/null
@@ -1,6 +0,0 @@
-a_hyperlinkThis line is bookmarked to BK1 (Insert-Bookmark)
-
-The line  SunWeb Home Page has a hyperlink to sunweb.central.
-
-This line is  a hyperlink to BK1. Click here will take cursor  to top of page.
-
diff --git a/xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/a_justified.pdb b/xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/a_justified.pdb
deleted file mode 100644
index f4b96b6..0000000
--- a/xmerge/source/palmtests/qa-wrapper/results/baseline/pdb-base/a_justified.pdb
+++ /dev/null
@@ -1,4 +0,0 @@
-a_justifiedCentre aligned
-Right aligned 
-Justified
-

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list