summaryrefslogtreecommitdiff
path: root/xmerge/source/wordsmith
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2012-08-21 08:58:57 +0200
committerStephan Bergmann <sbergman@redhat.com>2012-08-28 16:15:43 +0200
commit0439c5189a81aa74e2e998b773cf7a4b1271c83f (patch)
tree44ac85dc15e09c73b248680543a976bd84f0dc70 /xmerge/source/wordsmith
parent59c05d030e6e95924ef442b23b86b674518e593b (diff)
Java cleanup - remove unused local fields and variables and parameters
Change-Id: I5114bf2e390f3f5052819710329a789fc78c60f2
Diffstat (limited to 'xmerge/source/wordsmith')
-rw-r--r--xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WSDecoder.java2
-rw-r--r--xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WSEncoder.java1
-rw-r--r--xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/Wse.java31
-rw-r--r--xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WseHeader.java3
-rw-r--r--xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WsePara.java3
5 files changed, 3 insertions, 37 deletions
diff --git a/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WSDecoder.java b/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WSDecoder.java
index 9441c81cde8c..c5b12ce0e354 100644
--- a/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WSDecoder.java
+++ b/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WSDecoder.java
@@ -140,7 +140,7 @@ final class WSDecoder implements DOCConstants {
while (curIndex < rawData.length) {
if (WsePara.isValid(rawData, curIndex)) {
v.add(new WsePara(rawData, curIndex));
- curIndex = WsePara.computeNewIndex(rawData, curIndex);
+ curIndex = WsePara.computeNewIndex(curIndex);
} else if (WseTextRun.isValid(rawData, curIndex)) {
v.add(new WseTextRun(rawData, curIndex, fontTable, colorTable));
curIndex = WseTextRun.computeNewIndex(rawData, curIndex);
diff --git a/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WSEncoder.java b/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WSEncoder.java
index 3d7cec7b259b..e8136328bde5 100644
--- a/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WSEncoder.java
+++ b/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WSEncoder.java
@@ -51,7 +51,6 @@ final class WSEncoder {
private short version;
private int textLen;
private short maxRecSize;
- private int textRecCount = 0;
/* WordSmith document elements. */
diff --git a/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/Wse.java b/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/Wse.java
index b50d3e50f6ad..dc860584f291 100644
--- a/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/Wse.java
+++ b/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/Wse.java
@@ -29,37 +29,6 @@ package org.openoffice.xmerge.converter.xml.sxw.wordsmith;
abstract class Wse {
/**
- * Return true if <code>dataArray[startIndex]</code> is the start
- * of a valid element of this type.
- *
- * @param dataArray <code>byte</code> array.
- * @param startIndex The start index.
- *
- * @return true if <code>dataArray[startIndex]</code> is the
- * start of a valid element of this type, false otherwise.
- */
- static boolean isValid(byte dataArray[], int startIndex) {
- return false;
- }
-
-
- /**
- * Compute and return the index of the first <code>byte</code>
- * following this element. It is assumed that the element
- * starting at <code>dataArray[startIndex]</code> is valid.
- *
- * @param dataArray <code>byte</code> array.
- * @param startIndex The start index.
- *
- * @return The index of the first <code>byte</code> following
- * this element.
- */
- static int computeNewIndex(byte dataArray[], int startIndex) {
- return 0;
- }
-
-
- /**
* Return the total number of bytes needed to represent this
* object.
*
diff --git a/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WseHeader.java b/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WseHeader.java
index 3e18805557e9..c620f2127f9e 100644
--- a/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WseHeader.java
+++ b/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WseHeader.java
@@ -84,12 +84,11 @@ class WseHeader extends Wse {
* following this element. It is assumed that the element
* starting at <code>dataArray[startIndex]</code> is valid.
*
- * @param dataArray <code>byte</code> array.
* @param startIndex The start index.
*
* @return The first <code>byte</code> following this element.
*/
- static int computeNewIndex(byte dataArray[], int startIndex) {
+ static int computeNewIndex(int startIndex) {
return startIndex + 18;
}
diff --git a/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WsePara.java b/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WsePara.java
index 166f55088b01..e9b33d69788c 100644
--- a/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WsePara.java
+++ b/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WsePara.java
@@ -155,13 +155,12 @@ class WsePara extends Wse {
* <code>dataArray[startIndex]</code> is the beginning of a valid
* paragraph descriptor.
*
- * @param dataArray <code>byte</code> array.
* @param startIndex The start index.
*
* @return The index of the first <code>byte</code> following the
* paragraph description.
*/
- static int computeNewIndex(byte dataArray[], int startIndex) {
+ static int computeNewIndex(int startIndex) {
return startIndex + 13;
}