remove obsolete (and scary) stuff in xmerge/workben

Change-Id: I34c1f13006da18c6c4601042d3accfdb1979bfab

4 files changed, 0 insertions, 1071 deletions

diff --git a/xmerge/workben/XmlDiff.java b/xmerge/workben/XmlDiff.java
deleted file mode 100644
index e41dbbb6b9b0..000000000000
--- 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 34483a5bd230..000000000000
--- 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 177b1a2aff94..000000000000
--- 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 b3acd7240f57..000000000000
--- 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