summaryrefslogtreecommitdiff
path: root/xmerge
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-08-08 11:14:08 +0200
committerNoel Grandin <noel@peralex.com>2014-08-12 12:16:37 +0200
commite701b3f732fa7f70cb273183e9ae8dbfd840f5e4 (patch)
tree8bcf687f10ccd70be0882360d2155378993cef26 /xmerge
parentcc4d76145f7b92992b885cdc58b4534e8c024ac5 (diff)
java: reduce scope, make constants private
found by UCDetector Change-Id: Ide9975e361ed17ac8cdcbe67ba74c563a9392d57
Diffstat (limited to 'xmerge')
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java10
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java12
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SheetSettings.java4
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java2
4 files changed, 14 insertions, 14 deletions
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java
index 53d5202a7c5b..529b1cf93dd3 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java
@@ -151,14 +151,14 @@ public class ParaStyle extends Style implements Cloneable {
/** The bottom margin property. */
public static final int MARGIN_BOTTOM = 3;
/** Indent left property. */
- public static final int TEXT_INDENT = 4;
+ private static final int TEXT_INDENT = 4;
/** Indent right property. */
- public static final int LINE_HEIGHT = 5;
+ private static final int LINE_HEIGHT = 5;
/** Align text property. */
- public static final int TEXT_ALIGN = 6;
+ private static final int TEXT_ALIGN = 6;
// This must always be one more than highest property
/** Total number of properties. */
- protected static final int NR_PROPERTIES = 7;
+ private static final int NR_PROPERTIES = 7;
/**
* Array of flags indicating which attributes are set for this
@@ -203,7 +203,7 @@ public class ParaStyle extends Style implements Cloneable {
/** Line height minimum value. */
public static final int LH_ATLEAST = 0x20000000;
/** Line height mask. */
- public static final int LH_VALUEMASK = 0x00FFFFFF;
+ private static final int LH_VALUEMASK = 0x00FFFFFF;
/** Ignored tags. */
private static String[] ignored = {
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java
index 3f9e6b9fb7da..5024d8ffd827 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java
@@ -37,17 +37,17 @@ public class TextStyle extends Style implements Cloneable {
final protected static int FIRST_ATTR = 0x01;
/** Indicates <i>bold</i> text. */
- final public static int BOLD = 0x01;
+ final private static int BOLD = 0x01;
/** Indicates <i>italic</i> text. */
- final public static int ITALIC = 0x02;
+ final private static int ITALIC = 0x02;
/** Indicates <i>underlined</i> text. */
- final public static int UNDERLINE = 0x04;
+ final private static int UNDERLINE = 0x04;
/** Indicates <i>strike-through</i> in the text. */
- final public static int STRIKETHRU = 0x08;
+ final private static int STRIKETHRU = 0x08;
/** Indicates <i>superscripted</i> text. */
- final public static int SUPERSCRIPT = 0x10;
+ final private static int SUPERSCRIPT = 0x10;
/** Indicates <i>subscripted</i> text. */
- final public static int SUBSCRIPT = 0x20;
+ final private static int SUBSCRIPT = 0x20;
/** Indicates the last attribute. */
final protected static int LAST_ATTR = 0x20;
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SheetSettings.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SheetSettings.java
index b5d3a13c8d22..05b078cd2958 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SheetSettings.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SheetSettings.java
@@ -47,8 +47,8 @@ public class SheetSettings implements OfficeConstants {
private int paneNumber = 2;
final public static int NONE = 0x00;
- final public static int SPLIT = 0x01;
- final public static int FREEZE = 0x02;
+ final private static int SPLIT = 0x01;
+ final private static int FREEZE = 0x02;
/**
* Default Constructor for a <code>SheetSettings</code>
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java
index b476ea344abd..a04f72c6a5d0 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java
@@ -50,7 +50,7 @@ public final class Debug {
public final static int TRACE = 0x0004;
/** To set a flag. */
- public final static boolean SET = true;
+ private final static boolean SET = true;
/** To unset a flag. */
public final static boolean UNSET = false;