summaryrefslogtreecommitdiff
path: root/qadevOOo/runner/util
diff options
context:
space:
mode:
Diffstat (limited to 'qadevOOo/runner/util')
-rw-r--r--qadevOOo/runner/util/BookmarkDsc.java4
-rw-r--r--qadevOOo/runner/util/DBTools.java8
-rw-r--r--qadevOOo/runner/util/DefaultDsc.java4
-rw-r--r--qadevOOo/runner/util/FootnoteDsc.java4
-rw-r--r--qadevOOo/runner/util/FrameDsc.java4
-rw-r--r--qadevOOo/runner/util/InstCreator.java10
-rw-r--r--qadevOOo/runner/util/ParagraphDsc.java4
-rw-r--r--qadevOOo/runner/util/ReferenceMarkDsc.java4
-rw-r--r--qadevOOo/runner/util/SOfficeFactory.java2
-rw-r--r--qadevOOo/runner/util/ShapeDsc.java6
-rw-r--r--qadevOOo/runner/util/SysUtils.java2
-rw-r--r--qadevOOo/runner/util/TableDsc.java4
-rw-r--r--qadevOOo/runner/util/TextSectionDsc.java4
-rw-r--r--qadevOOo/runner/util/XLayerHandlerImpl.java4
-rw-r--r--qadevOOo/runner/util/XLayerImpl.java2
-rw-r--r--qadevOOo/runner/util/XMLTools.java30
-rw-r--r--qadevOOo/runner/util/XSchemaHandlerImpl.java4
-rw-r--r--qadevOOo/runner/util/compare/GraphicalComparator.java2
18 files changed, 51 insertions, 51 deletions
diff --git a/qadevOOo/runner/util/BookmarkDsc.java b/qadevOOo/runner/util/BookmarkDsc.java
index 5eb821318380..6772f1ce4cc1 100644
--- a/qadevOOo/runner/util/BookmarkDsc.java
+++ b/qadevOOo/runner/util/BookmarkDsc.java
@@ -27,8 +27,8 @@ import com.sun.star.text.XTextContent;
*/
public class BookmarkDsc extends InstDescr {
- final String service = "com.sun.star.text.Bookmark";
- String ifcName = "com.sun.star.text.XTextContent";
+ private final String service = "com.sun.star.text.Bookmark";
+ private String ifcName = "com.sun.star.text.XTextContent";
private String name = null;
diff --git a/qadevOOo/runner/util/DBTools.java b/qadevOOo/runner/util/DBTools.java
index 43aa834cb1d7..e0bf47016e6e 100644
--- a/qadevOOo/runner/util/DBTools.java
+++ b/qadevOOo/runner/util/DBTools.java
@@ -137,19 +137,19 @@ public class DBTools {
/**
* Representation of <code>'SuppressVersionColumns'</code> property.
*/
- public Boolean SuppressVersionColumns = null ;
+ private Boolean SuppressVersionColumns = null ;
/**
* Representation of <code>'IsReadOnly'</code> property.
*/
- public Boolean IsReadOnly = null ;
+ private Boolean IsReadOnly = null ;
/**
* Representation of <code>'TableFilter'</code> property.
*/
- public String[] TableFilter = null ;
+ private String[] TableFilter = null ;
/**
* Representation of <code>'TableTypeFilter'</code> property.
*/
- public String[] TableTypeFilter = null ;
+ private String[] TableTypeFilter = null ;
/**
* Creates an empty instance.
diff --git a/qadevOOo/runner/util/DefaultDsc.java b/qadevOOo/runner/util/DefaultDsc.java
index 9aedebb11008..8090fad5c2a2 100644
--- a/qadevOOo/runner/util/DefaultDsc.java
+++ b/qadevOOo/runner/util/DefaultDsc.java
@@ -29,8 +29,8 @@ import com.sun.star.uno.UnoRuntime;
public class DefaultDsc extends InstDescr {
private String name = null;
- String ifcName = null;
- String service = null;
+ private String ifcName = null;
+ private String service = null;
public DefaultDsc( String Interface, String kind ) {
service = kind;
diff --git a/qadevOOo/runner/util/FootnoteDsc.java b/qadevOOo/runner/util/FootnoteDsc.java
index 3e9fb89f2867..7ff9f6b7a42a 100644
--- a/qadevOOo/runner/util/FootnoteDsc.java
+++ b/qadevOOo/runner/util/FootnoteDsc.java
@@ -27,8 +27,8 @@ import com.sun.star.text.XTextContent;
*/
public class FootnoteDsc extends InstDescr {
- final String service = "com.sun.star.text.Footnote";
- String ifcName = "com.sun.star.text.XTextContent";
+ private final String service = "com.sun.star.text.Footnote";
+ private String ifcName = "com.sun.star.text.XTextContent";
private String name = null;
diff --git a/qadevOOo/runner/util/FrameDsc.java b/qadevOOo/runner/util/FrameDsc.java
index 0af97f9eedf6..147ed14a0423 100644
--- a/qadevOOo/runner/util/FrameDsc.java
+++ b/qadevOOo/runner/util/FrameDsc.java
@@ -34,8 +34,8 @@ public class FrameDsc extends InstDescr {
private int height = 2000;
private int width = 2000;
private String name = null;
- final String ifcName = "com.sun.star.text.XTextFrame";
- final String service = "com.sun.star.text.TextFrame";
+ private final String ifcName = "com.sun.star.text.XTextFrame";
+ private final String service = "com.sun.star.text.TextFrame";
public FrameDsc() {
initFrame();
diff --git a/qadevOOo/runner/util/InstCreator.java b/qadevOOo/runner/util/InstCreator.java
index 2f131a263fea..5259b4340558 100644
--- a/qadevOOo/runner/util/InstCreator.java
+++ b/qadevOOo/runner/util/InstCreator.java
@@ -33,11 +33,11 @@ import com.sun.star.container.XIndexAccess;
public class InstCreator implements XInstCreator {
- XInterface xParent;
- XMultiServiceFactory xMSF;
- XInterface xInstance;
- XIndexAccess xIA;
- InstDescr iDsc;
+ private XInterface xParent;
+ private XMultiServiceFactory xMSF;
+ private XInterface xInstance;
+ private XIndexAccess xIA;
+ private InstDescr iDsc;
public InstCreator( XInterface xParent, InstDescr iDsc ) {
this.xParent = xParent;
diff --git a/qadevOOo/runner/util/ParagraphDsc.java b/qadevOOo/runner/util/ParagraphDsc.java
index 65ec021b2d52..16508836f107 100644
--- a/qadevOOo/runner/util/ParagraphDsc.java
+++ b/qadevOOo/runner/util/ParagraphDsc.java
@@ -28,8 +28,8 @@ import com.sun.star.text.XTextContent;
*/
public class ParagraphDsc extends InstDescr {
- final String service = "com.sun.star.text.Paragraph";
- String ifcName = "com.sun.star.text.XTextContent";
+ private final String service = "com.sun.star.text.Paragraph";
+ private String ifcName = "com.sun.star.text.XTextContent";
private String name = null;
diff --git a/qadevOOo/runner/util/ReferenceMarkDsc.java b/qadevOOo/runner/util/ReferenceMarkDsc.java
index 0441a89d0e1e..8185bd9ae774 100644
--- a/qadevOOo/runner/util/ReferenceMarkDsc.java
+++ b/qadevOOo/runner/util/ReferenceMarkDsc.java
@@ -27,8 +27,8 @@ import com.sun.star.text.XTextContent;
*/
public class ReferenceMarkDsc extends InstDescr {
- final String service = "com.sun.star.text.ReferenceMark";
- String ifcName = "com.sun.star.text.XTextContent";
+ private final String service = "com.sun.star.text.ReferenceMark";
+ private String ifcName = "com.sun.star.text.XTextContent";
private String name = null;
diff --git a/qadevOOo/runner/util/SOfficeFactory.java b/qadevOOo/runner/util/SOfficeFactory.java
index dec23a20f8ae..f6db1c696bcd 100644
--- a/qadevOOo/runner/util/SOfficeFactory.java
+++ b/qadevOOo/runner/util/SOfficeFactory.java
@@ -45,7 +45,7 @@ import com.sun.star.awt.*;
public class SOfficeFactory {
private static HashMap<String, SOfficeFactory> lookup = new HashMap<String, SOfficeFactory>(10);
- protected XComponentLoader oCLoader;
+ private XComponentLoader oCLoader;
private SOfficeFactory(XMultiServiceFactory xMSF) {
// get XInterface of Desktop service
diff --git a/qadevOOo/runner/util/ShapeDsc.java b/qadevOOo/runner/util/ShapeDsc.java
index faea91984842..c8f970e50701 100644
--- a/qadevOOo/runner/util/ShapeDsc.java
+++ b/qadevOOo/runner/util/ShapeDsc.java
@@ -32,9 +32,9 @@ public class ShapeDsc extends InstDescr {
private int y = 0;
private int height = 0;
private int width = 0;
- private String name = null;
- final String ifcName = "com.sun.star.drawing.XShape";
- String service = "com.sun.star.drawing.RectangleShape";
+ private String name = null;
+ private final String ifcName = "com.sun.star.drawing.XShape";
+ private String service = "com.sun.star.drawing.RectangleShape";
public ShapeDsc( int nheight, int nwidth, int nx, int ny, String kind ) {
x=nx;
diff --git a/qadevOOo/runner/util/SysUtils.java b/qadevOOo/runner/util/SysUtils.java
index 68166bb3e3bf..0d289f4d68da 100644
--- a/qadevOOo/runner/util/SysUtils.java
+++ b/qadevOOo/runner/util/SysUtils.java
@@ -41,7 +41,7 @@ public class SysUtils {
return jh;
}
- static ArrayList<String> files = new ArrayList<String>();
+ private static ArrayList<String> files = new ArrayList<String>();
public static Object[] traverse( String afileDirectory ) {
diff --git a/qadevOOo/runner/util/TableDsc.java b/qadevOOo/runner/util/TableDsc.java
index bfeabf615492..0821fd20ee20 100644
--- a/qadevOOo/runner/util/TableDsc.java
+++ b/qadevOOo/runner/util/TableDsc.java
@@ -30,8 +30,8 @@ public class TableDsc extends InstDescr {
private int rows = 0;
private int columns = 0;
private String name = null;
- final String ifcName = "com.sun.star.text.XTextTable";
- final String service = "com.sun.star.text.TextTable";
+ private final String ifcName = "com.sun.star.text.XTextTable";
+ private final String service = "com.sun.star.text.TextTable";
public TableDsc() {
initTable();
diff --git a/qadevOOo/runner/util/TextSectionDsc.java b/qadevOOo/runner/util/TextSectionDsc.java
index bb1a1b13cad7..2a435e5395ab 100644
--- a/qadevOOo/runner/util/TextSectionDsc.java
+++ b/qadevOOo/runner/util/TextSectionDsc.java
@@ -27,8 +27,8 @@ import com.sun.star.text.XTextContent;
*/
public class TextSectionDsc extends InstDescr {
- final String service = "com.sun.star.text.TextSection";
- String ifcName = "com.sun.star.text.XTextContent";
+ private final String service = "com.sun.star.text.TextSection";
+ private String ifcName = "com.sun.star.text.XTextContent";
private String name = null;
diff --git a/qadevOOo/runner/util/XLayerHandlerImpl.java b/qadevOOo/runner/util/XLayerHandlerImpl.java
index 262bebd841ed..2f7dcaf50857 100644
--- a/qadevOOo/runner/util/XLayerHandlerImpl.java
+++ b/qadevOOo/runner/util/XLayerHandlerImpl.java
@@ -19,8 +19,8 @@ package util;
public class XLayerHandlerImpl
implements com.sun.star.configuration.backend.XLayerHandler {
- protected String calls = "";
- protected String ls = System.getProperty("line.separator");
+ private String calls = "";
+ private String ls = System.getProperty("line.separator");
public void addOrReplaceNode(String str, short param)
throws com.sun.star.configuration.backend.MalformedDataException,
diff --git a/qadevOOo/runner/util/XLayerImpl.java b/qadevOOo/runner/util/XLayerImpl.java
index 62ac73c749b2..351450292536 100644
--- a/qadevOOo/runner/util/XLayerImpl.java
+++ b/qadevOOo/runner/util/XLayerImpl.java
@@ -20,7 +20,7 @@ package util;
public class XLayerImpl implements com.sun.star.configuration.backend.XLayer {
- protected boolean wasCalled = false;
+ private boolean wasCalled = false;
public XLayerImpl() {
}
diff --git a/qadevOOo/runner/util/XMLTools.java b/qadevOOo/runner/util/XMLTools.java
index 7516d4b8c895..f4d7fbf0f515 100644
--- a/qadevOOo/runner/util/XMLTools.java
+++ b/qadevOOo/runner/util/XMLTools.java
@@ -252,13 +252,13 @@ public class XMLTools {
* if the XML data and structure was valid.
*/
public static class XMLWellFormChecker extends XMLWriter {
- protected boolean docStarted = false ;
- protected boolean docEnded = false ;
- protected ArrayList<String> tagStack = new ArrayList<String>() ;
- protected boolean wellFormed = true ;
- protected boolean noOtherErrors = true ;
- protected PrintWriter log = null ;
- protected boolean printXMLData = false ;
+ private boolean docStarted = false ;
+ private boolean docEnded = false ;
+ ArrayList<String> tagStack = new ArrayList<String>() ;
+ private boolean wellFormed = true ;
+ private boolean noOtherErrors = true ;
+ PrintWriter log = null ;
+ private boolean printXMLData = false ;
private XMLWellFormChecker(PrintWriter log) {
super() ;
@@ -371,9 +371,9 @@ public class XMLTools {
* appropriate message is output.
*/
public static class XMLTagsChecker extends XMLWellFormChecker {
- protected HashMap<String,String> tags = new HashMap<String,String>() ;
- protected HashMap<String,String> chars = new HashMap<String,String>() ;
- protected boolean allOK = true ;
+ private HashMap<String,String> tags = new HashMap<String,String>() ;
+ private HashMap<String,String> chars = new HashMap<String,String>() ;
+ private boolean allOK = true ;
public XMLTagsChecker(PrintWriter log) {
super(log) ;
@@ -627,11 +627,11 @@ public class XMLTools {
* character data exists inside any tag specified.
*/
public static class XMLChecker extends XMLWellFormChecker {
- protected HashSet<String> tagSet = new HashSet<String>() ;
- protected ArrayList<Tag[]> tags = new ArrayList<Tag[]>() ;
- protected ArrayList<Object[]> chars = new ArrayList<Object[]>() ;
- protected ArrayList<String> tagStack = new ArrayList<String>() ;
- protected ArrayList<AttributeList> attrStack = new ArrayList<AttributeList>() ;
+ private HashSet<String> tagSet = new HashSet<String>() ;
+ private ArrayList<Tag[]> tags = new ArrayList<Tag[]>() ;
+ private ArrayList<Object[]> chars = new ArrayList<Object[]>() ;
+ private ArrayList<String> tagStack = new ArrayList<String>() ;
+ private ArrayList<AttributeList> attrStack = new ArrayList<AttributeList>() ;
public XMLChecker(PrintWriter log, boolean writeXML) {
super(log, writeXML) ;
diff --git a/qadevOOo/runner/util/XSchemaHandlerImpl.java b/qadevOOo/runner/util/XSchemaHandlerImpl.java
index fb308ac921a1..06758014bbc7 100644
--- a/qadevOOo/runner/util/XSchemaHandlerImpl.java
+++ b/qadevOOo/runner/util/XSchemaHandlerImpl.java
@@ -19,8 +19,8 @@ package util;
public class XSchemaHandlerImpl
implements com.sun.star.configuration.backend.XSchemaHandler {
- protected String calls = "";
- protected String ls = System.getProperty("line.separator");
+ private String calls = "";
+ private String ls = System.getProperty("line.separator");
public void addInstance(String str,
com.sun.star.configuration.backend.TemplateIdentifier templateIdentifier)
diff --git a/qadevOOo/runner/util/compare/GraphicalComparator.java b/qadevOOo/runner/util/compare/GraphicalComparator.java
index 420f0249c16f..47b99b8aa218 100644
--- a/qadevOOo/runner/util/compare/GraphicalComparator.java
+++ b/qadevOOo/runner/util/compare/GraphicalComparator.java
@@ -33,7 +33,7 @@ import convwatch.ConvWatchException;
class GraphicalComparator implements DocComparator
{
- GraphicalTestArguments m_aArguments;
+ private GraphicalTestArguments m_aArguments;
protected GraphicalComparator(TestParameters aParams)
{