java: reduce scope, make fields private

found by UCDetector

Change-Id: I7f97e15667159cf8ee776e8f32fdcdec8ec00ed6

65 files changed, 384 insertions, 384 deletions

diff --git a/wizards/com/sun/star/wizards/common/FileAccess.java b/wizards/com/sun/star/wizards/common/FileAccess.java
index 1b762f761349..106f5bd33346 100644
--- a/wizards/com/sun/star/wizards/common/FileAccess.java
+++ b/wizards/com/sun/star/wizards/common/FileAccess.java
@@ -685,7 +685,7 @@ public class FileAccess
         return LocLayoutFiles;
     }
     public XSimpleFileAccess2 fileAccess;
-    public XFileIdentifierConverter filenameConverter;
+    private XFileIdentifierConverter filenameConverter;
 
     public FileAccess(XMultiServiceFactory xmsf) throws com.sun.star.uno.Exception
     {
diff --git a/wizards/com/sun/star/wizards/common/NumberFormatter.java b/wizards/com/sun/star/wizards/common/NumberFormatter.java
index 42c4689a42ee..b05b7624d39e 100644
--- a/wizards/com/sun/star/wizards/common/NumberFormatter.java
+++ b/wizards/com/sun/star/wizards/common/NumberFormatter.java
@@ -36,17 +36,17 @@ import com.sun.star.util.XNumberFormatter;
 public class NumberFormatter
 {
 
-    public int iDateFormatKey = -1;
-    public int iDateTimeFormatKey = -1;
-    public int iNumberFormatKey = -1;
-    public int iTextFormatKey = -1;
-    public int iTimeFormatKey = -1;
-    public int iLogicalFormatKey = -1;
-    public long lDateCorrection;
-    public XNumberFormatter xNumberFormatter;
-    public XNumberFormats xNumberFormats;
-    public XNumberFormatTypes xNumberFormatTypes;
-    public XPropertySet xNumberFormatSettings;
+    private int iDateFormatKey = -1;
+    private int iDateTimeFormatKey = -1;
+    private int iNumberFormatKey = -1;
+    private int iTextFormatKey = -1;
+    private int iTimeFormatKey = -1;
+    private int iLogicalFormatKey = -1;
+    private long lDateCorrection;
+    private XNumberFormatter xNumberFormatter;
+    private XNumberFormats xNumberFormats;
+    private XNumberFormatTypes xNumberFormatTypes;
+    private XPropertySet xNumberFormatSettings;
     private boolean bNullDateCorrectionIsDefined = false;
     private Locale aLocale;
 
diff --git a/wizards/com/sun/star/wizards/common/ParaStyled.java b/wizards/com/sun/star/wizards/common/ParaStyled.java
index e1eedfdfd2d3..31d7327ca320 100644
--- a/wizards/com/sun/star/wizards/common/ParaStyled.java
+++ b/wizards/com/sun/star/wizards/common/ParaStyled.java
@@ -25,7 +25,7 @@ import com.sun.star.text.*;
 class ParaStyled implements TemplateElement
 {
 
-    String paraStyle;
+    private String paraStyle;
 
     ParaStyled(String paraStyle_)
     {
diff --git a/wizards/com/sun/star/wizards/common/PlaceholderTextElement.java b/wizards/com/sun/star/wizards/common/PlaceholderTextElement.java
index ea5a7617d276..ea0a84cbd983 100644
--- a/wizards/com/sun/star/wizards/common/PlaceholderTextElement.java
+++ b/wizards/com/sun/star/wizards/common/PlaceholderTextElement.java
@@ -29,9 +29,9 @@ import com.sun.star.wizards.common.PlaceholderTextElement;
 public class PlaceholderTextElement extends TextElement
 {
 
-    String hint;
-    String placeHolderText;
-    XMultiServiceFactory xmsf;
+    private String hint;
+    private String placeHolderText;
+    private XMultiServiceFactory xmsf;
     TextDocument templateDocument;
 
     public PlaceholderTextElement(XTextRange textRange, String placeHolderText_, String hint_, XMultiServiceFactory xmsf_)
diff --git a/wizards/com/sun/star/wizards/common/PropertySetHelper.java b/wizards/com/sun/star/wizards/common/PropertySetHelper.java
index 5862300ea316..304b6e58b1bc 100644
--- a/wizards/com/sun/star/wizards/common/PropertySetHelper.java
+++ b/wizards/com/sun/star/wizards/common/PropertySetHelper.java
@@ -29,7 +29,7 @@ import java.util.HashMap;
 public class PropertySetHelper
 {
 
-    protected XPropertySet m_xPropertySet;
+    private XPropertySet m_xPropertySet;
     private HashMap<String, Object> m_aHashMap;
 
     public PropertySetHelper(Object _aObj)
diff --git a/wizards/com/sun/star/wizards/common/Resource.java b/wizards/com/sun/star/wizards/common/Resource.java
index 0ea3f5dd3de7..33e3557ac263 100644
--- a/wizards/com/sun/star/wizards/common/Resource.java
+++ b/wizards/com/sun/star/wizards/common/Resource.java
@@ -28,10 +28,10 @@ import com.sun.star.uno.UnoRuntime;
 public class Resource
 {
 
-    XMultiServiceFactory xMSF;
-    String Module;
-    XIndexAccess xStringIndexAccess;
-    XIndexAccess xStringListIndexAccess;
+    private XMultiServiceFactory xMSF;
+    private String Module;
+    private XIndexAccess xStringIndexAccess;
+    private XIndexAccess xStringListIndexAccess;
 
     /** Creates a new instance of Resource
      */
diff --git a/wizards/com/sun/star/wizards/common/SystemDialog.java b/wizards/com/sun/star/wizards/common/SystemDialog.java
index 25cee169add4..5e03edb45126 100644
--- a/wizards/com/sun/star/wizards/common/SystemDialog.java
+++ b/wizards/com/sun/star/wizards/common/SystemDialog.java
@@ -34,16 +34,16 @@ import com.sun.star.beans.PropertyValue;
 public class SystemDialog
 {
 
-    Object systemDialog;
-    XFilePicker xFilePicker;
-    XFolderPicker2 xFolderPicker;
-    XFilterManager xFilterManager;
-    XInitialization xInitialize;
-    XExecutableDialog xExecutable;
-    XComponent xComponent;
-    XFilePickerControlAccess xFilePickerControlAccess;
-    XMultiServiceFactory xMSF;
-    public XStringSubstitution xStringSubstitution;
+    private Object systemDialog;
+    private XFilePicker xFilePicker;
+    private XFolderPicker2 xFolderPicker;
+    private XFilterManager xFilterManager;
+    private XInitialization xInitialize;
+    private XExecutableDialog xExecutable;
+    private XComponent xComponent;
+    private XFilePickerControlAccess xFilePickerControlAccess;
+    private XMultiServiceFactory xMSF;
+    private XStringSubstitution xStringSubstitution;
     public String sStorePath;
 
     /**
diff --git a/wizards/com/sun/star/wizards/db/ColumnPropertySet.java b/wizards/com/sun/star/wizards/db/ColumnPropertySet.java
index 10458ac87204..ef0b0ec2e4c5 100644
--- a/wizards/com/sun/star/wizards/db/ColumnPropertySet.java
+++ b/wizards/com/sun/star/wizards/db/ColumnPropertySet.java
@@ -27,7 +27,7 @@ import com.sun.star.wizards.common.PropertyNames;
 public class ColumnPropertySet
 {
 
-    TypeInspector oTypeInspector;
+    private TypeInspector oTypeInspector;
     public XPropertySet xPropertySet;
     private int nType;
     private String sTypeName = PropertyNames.EMPTY_STRING;
diff --git a/wizards/com/sun/star/wizards/db/CommandMetaData.java b/wizards/com/sun/star/wizards/db/CommandMetaData.java
index 6b1f256c3021..973345a7a882 100644
--- a/wizards/com/sun/star/wizards/db/CommandMetaData.java
+++ b/wizards/com/sun/star/wizards/db/CommandMetaData.java
@@ -66,10 +66,10 @@ public class CommandMetaData extends DBMetaData
     public String[] NonAggregateFieldNames;
     private int CommandType;
     private String Command;
-    boolean bCatalogAtStart = true;
-    String sCatalogSep = PropertyNames.EMPTY_STRING;
-    String sIdentifierQuote = PropertyNames.EMPTY_STRING;
-    boolean bCommandComposerAttributesalreadyRetrieved = false;
+    private boolean bCatalogAtStart = true;
+    private String sCatalogSep = PropertyNames.EMPTY_STRING;
+    private String sIdentifierQuote = PropertyNames.EMPTY_STRING;
+    private boolean bCommandComposerAttributesalreadyRetrieved = false;
     private XIndexAccess xIndexKeys;
 
     public CommandMetaData(XMultiServiceFactory xMSF, Locale _aLocale, NumberFormatter oNumberFormatter)
diff --git a/wizards/com/sun/star/wizards/db/CommandName.java b/wizards/com/sun/star/wizards/db/CommandName.java
index 2621b96e167b..5dda8ef4f3aa 100644
--- a/wizards/com/sun/star/wizards/db/CommandName.java
+++ b/wizards/com/sun/star/wizards/db/CommandName.java
@@ -25,17 +25,17 @@ import com.sun.star.wizards.common.PropertyNames;
 public class CommandName
 {
 
-    protected CommandMetaData oCommandMetaData;
-    protected String CatalogName = PropertyNames.EMPTY_STRING;
-    protected String SchemaName = PropertyNames.EMPTY_STRING;
-    protected String TableName = PropertyNames.EMPTY_STRING;
-    protected String DisplayName = PropertyNames.EMPTY_STRING;
-    protected String ComposedName = PropertyNames.EMPTY_STRING;
-    protected String AliasName = PropertyNames.EMPTY_STRING;
-    protected boolean bCatalogAtStart;
-    protected String sCatalogSep;
-    protected String sIdentifierQuote;
-    protected boolean baddQuotation = true;
+    private CommandMetaData oCommandMetaData;
+    private String CatalogName = PropertyNames.EMPTY_STRING;
+    private String SchemaName = PropertyNames.EMPTY_STRING;
+    private String TableName = PropertyNames.EMPTY_STRING;
+    private String DisplayName = PropertyNames.EMPTY_STRING;
+    private String ComposedName = PropertyNames.EMPTY_STRING;
+    private String AliasName = PropertyNames.EMPTY_STRING;
+    private boolean bCatalogAtStart;
+    private String sCatalogSep;
+    private String sIdentifierQuote;
+    private boolean baddQuotation = true;
 
     public CommandName(CommandMetaData _CommandMetaData, String _DisplayName)
     {
diff --git a/wizards/com/sun/star/wizards/db/DBMetaData.java b/wizards/com/sun/star/wizards/db/DBMetaData.java
index 5a2660c24236..4204ebcc48f8 100644
--- a/wizards/com/sun/star/wizards/db/DBMetaData.java
+++ b/wizards/com/sun/star/wizards/db/DBMetaData.java
@@ -85,16 +85,16 @@ public class DBMetaData
     private XPropertySet m_dataSourceSettings;
     private XOfficeDatabaseDocument xModel;
     private XPropertySet xDataSourcePropertySet;
-    public String[] DataSourceNames;
+    private String[] DataSourceNames;
     public String[] CommandNames;
-    public java.util.ArrayList<CommandObject> CommandObjects = new ArrayList<CommandObject>(1);
-    public Locale aLocale;
-    public int[] CommandTypes;
+    private java.util.ArrayList<CommandObject> CommandObjects = new ArrayList<CommandObject>(1);
+    private Locale aLocale;
+    private int[] CommandTypes;
     public String DataSourceName;
     public com.sun.star.sdbc.XConnection DBConnection;
     private com.sun.star.sdb.tools.XConnectionTools m_connectionTools;
     public com.sun.star.lang.XMultiServiceFactory xMSF;
-    public XComponent xConnectionComponent;
+    private XComponent xConnectionComponent;
 
     private XNameAccess xNameAccess;
     private XInterface xDatabaseContext;
diff --git a/wizards/com/sun/star/wizards/db/QueryMetaData.java b/wizards/com/sun/star/wizards/db/QueryMetaData.java
index 3db987015417..31a443dd1619 100644
--- a/wizards/com/sun/star/wizards/db/QueryMetaData.java
+++ b/wizards/com/sun/star/wizards/db/QueryMetaData.java
@@ -36,7 +36,7 @@ public class QueryMetaData extends CommandMetaData
     public PropertyValue[][] GroupByFilterConditions = new PropertyValue[][]
     {
     };
-    public String[] UniqueAggregateFieldNames = new String[]
+    private String[] UniqueAggregateFieldNames = new String[]
     {
     };
     public int Type = QueryType.SODETAILQUERY;
diff --git a/wizards/com/sun/star/wizards/db/RecordParser.java b/wizards/com/sun/star/wizards/db/RecordParser.java
index 1887751af855..946bf8838db4 100644
--- a/wizards/com/sun/star/wizards/db/RecordParser.java
+++ b/wizards/com/sun/star/wizards/db/RecordParser.java
@@ -40,15 +40,15 @@ import com.sun.star.wizards.common.PropertyNames;
 public class RecordParser extends QueryMetaData
 {
 
-    XNameAccess xColumns;
+    private XNameAccess xColumns;
     com.sun.star.sdbc.XRow xRow;
-    com.sun.star.sdbc.XRow xResultSetRow;
+    private com.sun.star.sdbc.XRow xResultSetRow;
     public XResultSet ResultSet;
-    XInterface xRowSet;
-    XCompletedExecution xExecute;
-    XColumnsSupplier xRowSetColumnsSupplier;
-    XComponent xRowSetComponent;
-    XInteractionHandler xInteraction;
+    private XInterface xRowSet;
+    private XCompletedExecution xExecute;
+    private XColumnsSupplier xRowSetColumnsSupplier;
+    private XComponent xRowSetComponent;
+    private XInteractionHandler xInteraction;
     public FieldColumn[] GroupFieldColumns;
     public FieldColumn[] RecordFieldColumns;
 
diff --git a/wizards/com/sun/star/wizards/db/SQLQueryComposer.java b/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
index 49e1db3842cf..16abe115d3fa 100644
--- a/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
+++ b/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
@@ -41,12 +41,12 @@ public class SQLQueryComposer
 {
 
     public XColumnsSupplier xColSuppl;
-    QueryMetaData CurDBMetaData;
+    private QueryMetaData CurDBMetaData;
     public XSingleSelectQueryAnalyzer m_xQueryAnalyzer;
-    ArrayList<CommandName> composedCommandNames = new ArrayList<CommandName>(1);
+    private ArrayList<CommandName> composedCommandNames = new ArrayList<CommandName>(1);
     private XSingleSelectQueryComposer m_queryComposer;
-    XMultiServiceFactory xMSF;
-    boolean bincludeGrouping = true;
+    private XMultiServiceFactory xMSF;
+    private boolean bincludeGrouping = true;
 
     public SQLQueryComposer(QueryMetaData _CurDBMetaData)
     {
diff --git a/wizards/com/sun/star/wizards/db/TableDescriptor.java b/wizards/com/sun/star/wizards/db/TableDescriptor.java
index 8657b636aec7..7de631020ced 100644
--- a/wizards/com/sun/star/wizards/db/TableDescriptor.java
+++ b/wizards/com/sun/star/wizards/db/TableDescriptor.java
@@ -52,14 +52,14 @@ import com.sun.star.wizards.common.PropertyNames;
 public class TableDescriptor extends CommandMetaData implements XContainerListener
 {
 
-    XDataDescriptorFactory xTableDataDescriptorFactory;
-    XPropertySet xPropTableDataDescriptor;
+    private XDataDescriptorFactory xTableDataDescriptorFactory;
+    private XPropertySet xPropTableDataDescriptor;
     private XNameAccess xNameAccessColumns;
     private XIndexAccess xIndexAccessKeys;
-    public XDataDescriptorFactory xColumnDataDescriptorFactory;
-    XContainer xTableContainer;
-    XAppend xTableAppend;
-    XDrop xTableDrop;
+    private XDataDescriptorFactory xColumnDataDescriptorFactory;
+    private XContainer xTableContainer;
+    private XAppend xTableAppend;
+    private XDrop xTableDrop;
     private XAppend xKeyAppend;
     private XDrop xKeyDrop;
     private String[] sTableFilters = null;
diff --git a/wizards/com/sun/star/wizards/db/TypeInspector.java b/wizards/com/sun/star/wizards/db/TypeInspector.java
index b7930bd0f492..fa08c1737e93 100644
--- a/wizards/com/sun/star/wizards/db/TypeInspector.java
+++ b/wizards/com/sun/star/wizards/db/TypeInspector.java
@@ -47,13 +47,13 @@ public class TypeInspector
         DataType.INTEGER, DataType.FLOAT, DataType.REAL, DataType.DOUBLE, DataType.NUMERIC, DataType.DECIMAL
     };
     final int INVALID = 999999;
-    XResultSet xResultSet;
+    private XResultSet xResultSet;
 
     public class TypeInfo
     {
 
-        public int nDataType;
-        public String sDataTypeName;
+        private int nDataType;
+        private String sDataTypeName;
         public boolean bisAutoIncrementable;
 
         private TypeInfo(int _nDataType, String _sDataTypeName, boolean _bisAutoIncrementable)
diff --git a/wizards/com/sun/star/wizards/document/Control.java b/wizards/com/sun/star/wizards/document/Control.java
index e1d6d7aed911..3ba66acbff60 100644
--- a/wizards/com/sun/star/wizards/document/Control.java
+++ b/wizards/com/sun/star/wizards/document/Control.java
@@ -41,18 +41,18 @@ public class Control extends Shape
 {
 
     XControlModel xControlModel;
-    XControl xControl;
+    private XControl xControl;
     public XPropertySet xPropertySet;
-    XPropertySet xControlPropertySet;
+    private XPropertySet xControlPropertySet;
     XWindowPeer xWindowPeer;
     Object oDefaultValue;
     GridControl oGridControl;
-    String sServiceName;
+    private String sServiceName;
     XNamed xNamed;
-    final int SOMAXTEXTSIZE = 50;
+    private final int SOMAXTEXTSIZE = 50;
     private int icontroltype;
-    protected XNameContainer xFormName;
-    protected final int IIMGFIELDWIDTH = 3000;
+    private XNameContainer xFormName;
+    private final int IIMGFIELDWIDTH = 3000;
 
     public Control()
     {
diff --git a/wizards/com/sun/star/wizards/document/FormHandler.java b/wizards/com/sun/star/wizards/document/FormHandler.java
index e1dceaa98f98..8aa88ba608f6 100644
--- a/wizards/com/sun/star/wizards/document/FormHandler.java
+++ b/wizards/com/sun/star/wizards/document/FormHandler.java
@@ -61,7 +61,7 @@ public class FormHandler
     private static final String TEXTFIELD = "TextField";
     private static final String TIMEFIELD = "TimeField";
 
-    public XFormsSupplier xFormsSupplier;
+    private XFormsSupplier xFormsSupplier;
     public XMultiServiceFactory xMSFDoc;
     public XMultiServiceFactory xMSF;
     public XDrawPage xDrawPage;
@@ -78,28 +78,28 @@ public class FormHandler
     public final static int SOGRIDCONTROL = 6;
     public final static int SOIMAGECONTROL = 7;
     public final static int SODATETIMECONTROL = 8;
-    int iImageControlHeight = 2000;
+    private int iImageControlHeight = 2000;
     public static String SOSIZETEXT = "The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog.";
-    int iXPixelFactor = -1;
-    int iYPixelFactor = -1;
-    int iXNirwanaPos = 50000;
-    int iYNirwanaPos = 50000;
-    public int nLabelHeight = -1;
-    public int nDBRefHeight = -1;
-    public int BasicLabelDiffHeight = -1;
-    XNameAccess xNamedForms;
+    private int iXPixelFactor = -1;
+    private int iYPixelFactor = -1;
+    private int iXNirwanaPos = 50000;
+    private int iYNirwanaPos = 50000;
+    private int nLabelHeight = -1;
+    private int nDBRefHeight = -1;
+    private int BasicLabelDiffHeight = -1;
+    private XNameAccess xNamedForms;
     XControlAccess xControlAccess;
     XShapeGrouper xShapeGrouper;
-    XNameContainer xNamedFormContainer;
+    private XNameContainer xNamedFormContainer;
 
     public class ControlData
     {
 
         int DataType;
-        int ControlType;
-        String ControlService;
+        private int ControlType;
+        private String ControlService;
         String GridColumnName;
-        boolean bIsText;
+        private boolean bIsText;
     }
 
     /** Creates a new instance of FormHandler */
diff --git a/wizards/com/sun/star/wizards/document/GridControl.java b/wizards/com/sun/star/wizards/document/GridControl.java
index ab78017c397b..13436ee5eebc 100644
--- a/wizards/com/sun/star/wizards/document/GridControl.java
+++ b/wizards/com/sun/star/wizards/document/GridControl.java
@@ -35,13 +35,13 @@ import com.sun.star.lang.XMultiServiceFactory;
 public class GridControl extends Shape
 {
 
-    FieldColumn[] fieldcolumns;
+    private FieldColumn[] fieldcolumns;
     public XNameContainer xNameContainer;
     public XGridColumnFactory xGridColumnFactory;
     public XPropertySet xPropertySet;
     XNameAccess xNameAccess;
     final String SODEFAULTNAME = "Grid1";
-    XControlModel xControlModel;
+    private XControlModel xControlModel;
     public XComponent xComponent;
 
     public GridControl(XMultiServiceFactory _xMSF, String _sname, FormHandler _oFormHandler, XNameContainer _xFormName, FieldColumn[] _fieldcolumns, Point _aPoint, Size _aSize)
diff --git a/wizards/com/sun/star/wizards/document/Shape.java b/wizards/com/sun/star/wizards/document/Shape.java
index 93f0606a4207..d6e03f3449b1 100644
--- a/wizards/com/sun/star/wizards/document/Shape.java
+++ b/wizards/com/sun/star/wizards/document/Shape.java
@@ -41,9 +41,9 @@ public class Shape
     protected FormHandler oFormHandler;
     public XServiceInfo xServiceInfo;
     protected Point aPoint;
-    protected Size aSize;
+    private Size aSize;
     protected XControlShape xControlShape;
-    public XMultiServiceFactory xMSF;
+    private XMultiServiceFactory xMSF;
     public XShapes xShapes;
 
     public Shape(FormHandler _oFormHandler, Point _aPoint, Size _aSize)
diff --git a/wizards/com/sun/star/wizards/document/TimeStampControl.java b/wizards/com/sun/star/wizards/document/TimeStampControl.java
index 00e0bb28f326..b627c7ed8baf 100644
--- a/wizards/com/sun/star/wizards/document/TimeStampControl.java
+++ b/wizards/com/sun/star/wizards/document/TimeStampControl.java
@@ -35,19 +35,19 @@ import com.sun.star.drawing.XShapes;
 public class TimeStampControl extends DatabaseControl
 {
 
-    DatabaseControl oDateControl;
-    DatabaseControl oTimeControl;
+    private DatabaseControl oDateControl;
+    private DatabaseControl oTimeControl;
 //  XShape xGroupShape;
-    Resource oResource;
+    private Resource oResource;
     private String sDateAppendix; // = GetResText(RID_FORM + 4)
     private String sTimeAppendix; // = GetResText(RID_FORM + 5)
     XShapes xGroupShapes = null;
-    double nreldatewidth;
-    double nreltimewidth;
-    int nTimeWidth;
-    int nDBWidth;
-    int nDateWidth;
-    XShape xShapeGroup;
+    private double nreldatewidth;
+    private double nreltimewidth;
+    private int nTimeWidth;
+    private int nDBWidth;
+    private int nDateWidth;
+    private XShape xShapeGroup;
 
     public TimeStampControl(Resource _oResource, FormHandler _oFormHandler, XNameContainer _xFormName, String _curFieldName, Point _aPoint)
     {
diff --git a/wizards/com/sun/star/wizards/form/Finalizer.java b/wizards/com/sun/star/wizards/form/Finalizer.java
index 6a4cf5902b84..81f3d87e3b58 100644
--- a/wizards/com/sun/star/wizards/form/Finalizer.java
+++ b/wizards/com/sun/star/wizards/form/Finalizer.java
@@ -31,12 +31,12 @@ import com.sun.star.wizards.ui.*;
 public class Finalizer
 {
 
-    WizardDialog CurUnoDialog;
-    short curtabindex;
-    XRadioButton optModifyForm;
+    private WizardDialog CurUnoDialog;
+    private short curtabindex;
+    private XRadioButton optModifyForm;
     XRadioButton optWorkWithForm;
-    XTextComponent txtFormName;
-    FormDocument oFormDocument;
+    private XTextComponent txtFormName;
+    private FormDocument oFormDocument;
 
     public Finalizer(WizardDialog _CurUnoDialog)
     {
diff --git a/wizards/com/sun/star/wizards/form/FormConfiguration.java b/wizards/com/sun/star/wizards/form/FormConfiguration.java
index 52ce66cfe113..1159888fae34 100644
--- a/wizards/com/sun/star/wizards/form/FormConfiguration.java
+++ b/wizards/com/sun/star/wizards/form/FormConfiguration.java
@@ -36,21 +36,21 @@ import com.sun.star.wizards.db.RelationController;
 public class FormConfiguration
 {
 
-    WizardDialog CurUnoDialog;
-    short curtabindex;
-    XRadioButton optOnExistingRelation;
-    XCheckBox chkcreateSubForm;
-    XRadioButton optSelectManually;
-    XFixedText lblSubFormDescription;
-    XFixedText lblRelations;
-    XListBox lstRelations;
-    String[] sreferencedTables;
-    CommandFieldSelection CurSubFormFieldSelection;
-    String SSUBFORMMODE = "toggleSubFormMode";
-    String STOGGLESTEPS = "toggleSteps";
-    String SONEXISTINGRELATIONSELECTION = "onexistingRelationSelection";
-    boolean bsupportsRelations;
-    RelationController oRelationController = null;
+    private WizardDialog CurUnoDialog;
+    private short curtabindex;
+    private XRadioButton optOnExistingRelation;
+    private XCheckBox chkcreateSubForm;
+    private XRadioButton optSelectManually;
+    private XFixedText lblSubFormDescription;
+    private XFixedText lblRelations;
+    private XListBox lstRelations;
+    private String[] sreferencedTables;
+    private CommandFieldSelection CurSubFormFieldSelection;
+    private String SSUBFORMMODE = "toggleSubFormMode";
+    private String STOGGLESTEPS = "toggleSteps";
+    private String SONEXISTINGRELATIONSELECTION = "onexistingRelationSelection";
+    private boolean bsupportsRelations;
+    private RelationController oRelationController = null;
 
     public FormConfiguration(WizardDialog _CurUnoDialog)
     {
diff --git a/wizards/com/sun/star/wizards/form/FormDocument.java b/wizards/com/sun/star/wizards/form/FormDocument.java
index f24cbe4d01f9..583953e37d77 100644
--- a/wizards/com/sun/star/wizards/form/FormDocument.java
+++ b/wizards/com/sun/star/wizards/form/FormDocument.java
@@ -336,16 +336,16 @@ public class FormDocument extends TextDocument
     public class ControlForm
     {
 
-        XNameContainer xFormContainer;
+        private XNameContainer xFormContainer;
         GridControl oGridControl;
-        FormControlArranger oFormController;
-        int curArrangement;
-        FormDocument oFormDocument;
-        String Name;
-        Point aStartPoint;
+        private FormControlArranger oFormController;
+        private int curArrangement;
+        private FormDocument oFormDocument;
+        private String Name;
+        private Point aStartPoint;
         private Size aFormSize;
-        CommandMetaData oDBMetaData;
-        XPropertySet xPropertySet;
+        private CommandMetaData oDBMetaData;
+        private XPropertySet xPropertySet;
 
         private ControlForm(FormDocument _oFormDocument, String _sname, Point _astartPoint, Size _aFormSize)
         {
diff --git a/wizards/com/sun/star/wizards/form/FormWizard.java b/wizards/com/sun/star/wizards/form/FormWizard.java
index d6351398d1df..fc613019f10d 100644
--- a/wizards/com/sun/star/wizards/form/FormWizard.java
+++ b/wizards/com/sun/star/wizards/form/FormWizard.java
@@ -388,7 +388,7 @@ public class FormWizard extends DatabaseObjectWizard
     public class FieldSelectionListener implements com.sun.star.wizards.ui.XFieldSelectionListener
     {
 
-        protected int ID;
+        private int ID;
 
         // @Override
         public int getID()
diff --git a/wizards/com/sun/star/wizards/query/CallQueryWizard.java b/wizards/com/sun/star/wizards/query/CallQueryWizard.java
index 204fe281dd66..611556951fa1 100644
--- a/wizards/com/sun/star/wizards/query/CallQueryWizard.java
+++ b/wizards/com/sun/star/wizards/query/CallQueryWizard.java
@@ -56,7 +56,7 @@ public class CallQueryWizard
     public static class QueryWizardImplementation extends com.sun.star.lib.uno.helper.PropertySet implements com.sun.star.lang.XInitialization, com.sun.star.lang.XServiceInfo, com.sun.star.task.XJobExecutor
     {
         private PropertyValue[] m_wizardContext;
-        public String           Command;
+        private String           Command;
         public final Integer    CommandType = com.sun.star.sdb.CommandType.QUERY;
 
         /** The constructor of the inner class has a XMultiServiceFactory parameter.
diff --git a/wizards/com/sun/star/wizards/query/QuerySummary.java b/wizards/com/sun/star/wizards/query/QuerySummary.java
index 47dc89fa2432..b8048a577eae 100644
--- a/wizards/com/sun/star/wizards/query/QuerySummary.java
+++ b/wizards/com/sun/star/wizards/query/QuerySummary.java
@@ -29,10 +29,10 @@ import com.sun.star.wizards.ui.FilterComponent;
 public class QuerySummary extends QueryMetaData
 {
 
-    final protected int RID_QUERY = 2300;
+    final private int RID_QUERY = 2300;
     final protected int RID_REPORT = 2400;
-    String sSummary;
-    Resource oResource;
+    private String sSummary;
+    private Resource oResource;
     private String sSeparator;
     private String sReturnChar;
     private String sAnd;
diff --git a/wizards/com/sun/star/wizards/query/QueryWizard.java b/wizards/com/sun/star/wizards/query/QueryWizard.java
index cd51e78de6ea..78709f14ea00 100644
--- a/wizards/com/sun/star/wizards/query/QueryWizard.java
+++ b/wizards/com/sun/star/wizards/query/QueryWizard.java
@@ -396,7 +396,7 @@ public class QueryWizard extends DatabaseObjectWizard
     public class FieldSelectionListener implements com.sun.star.wizards.ui.XFieldSelectionListener
     {
 
-        protected int ID;
+        private int ID;
 
         public int getID()
         {
diff --git a/wizards/com/sun/star/wizards/report/CallReportWizard.java b/wizards/com/sun/star/wizards/report/CallReportWizard.java
index 91da0b0846bb..f59dbefdab50 100644
--- a/wizards/com/sun/star/wizards/report/CallReportWizard.java
+++ b/wizards/com/sun/star/wizards/report/CallReportWizard.java
@@ -33,7 +33,7 @@ import java.util.logging.Logger;
 public class CallReportWizard
 {
 
-    static boolean bWizardstartedalready;
+    private static boolean bWizardstartedalready;
 
     /** Gives a factory for creating the service.
      * This method is called by the <code>JavaLoader</code>
diff --git a/wizards/com/sun/star/wizards/report/DBColumn.java b/wizards/com/sun/star/wizards/report/DBColumn.java
index 4c5884cf3f00..9da1ed770379 100644
--- a/wizards/com/sun/star/wizards/report/DBColumn.java
+++ b/wizards/com/sun/star/wizards/report/DBColumn.java
@@ -44,19 +44,19 @@ import com.sun.star.wizards.text.TextFieldHandler;
 public class DBColumn
 {
 
-    public XCell xValCell;
-    public XTextRange xValTextCell;
-    public XTextCursor xValCellCursor;
+    private XCell xValCell;
+    private XTextRange xValTextCell;
+    private XTextCursor xValCellCursor;
     public XNumberFormats xValCellNumberFormats;
     public XCell xNameCell;
-    public XTextRange xNameTextCell;
-    public boolean bAlignLeft;
+    private XTextRange xNameTextCell;
+    private boolean bAlignLeft;
     public Object DefaultValue;
-    public String CharFontName;
+    private String CharFontName;
     public int FormatKey;
-    public PropertyState PropertyState;
+    private PropertyState PropertyState;
     public int ValColumn = 1;
-    public int ValRow = 0;
+    private int ValRow = 0;
     public FieldColumn CurDBField;
     private XTextTable xTextTable;
     private XTableColumns xTableColumns;
@@ -64,9 +64,9 @@ public class DBColumn
     public XNamed xTableName;
     private boolean bIsGroupColumn;
     TextDocument oTextDocument;
-    RecordParser CurDBMetaData;
-    RecordTable CurRecordTable;
-    TextTableHandler oTextTableHandler;
+    private RecordParser CurDBMetaData;
+    private RecordTable CurRecordTable;
+    private TextTableHandler oTextTableHandler;
 
     public DBColumn(TextTableHandler _oTextTableHandler, RecordParser _CurDBMetaData, int i)
     {
diff --git a/wizards/com/sun/star/wizards/report/Dataimport.java b/wizards/com/sun/star/wizards/report/Dataimport.java
index 77ed2f34e8ad..df11132d8371 100644
--- a/wizards/com/sun/star/wizards/report/Dataimport.java
+++ b/wizards/com/sun/star/wizards/report/Dataimport.java
@@ -35,12 +35,12 @@ public class Dataimport extends UnoDialog2 implements com.sun.star.awt.XActionLi
     IReportDocument CurReportDocument;
 
     static boolean bStopProcess;
-    static String sProgressDBConnection;
-    static String sProgressDataImport;
-    static String sProgressBaseCurRecord;
+    private static String sProgressDBConnection;
+    private static String sProgressDataImport;
+    private static String sProgressBaseCurRecord;
     static String sProgressCurRecord;
-    static String sProgressTitle;
-    static String sStop;
+    private static String sProgressTitle;
+    private static String sStop;
 
     public Dataimport(XMultiServiceFactory _xMSF)
     {
diff --git a/wizards/com/sun/star/wizards/report/RecordTable.java b/wizards/com/sun/star/wizards/report/RecordTable.java
index 7b4cd1a76e78..14c9c6baa711 100644
--- a/wizards/com/sun/star/wizards/report/RecordTable.java
+++ b/wizards/com/sun/star/wizards/report/RecordTable.java
@@ -40,7 +40,7 @@ public class RecordTable
     public XTextTable xTextTable;
     private TextTableHandler oTextTableHandler;
     public XTableColumns xTableColumns;
-    public XTableRows xTableRows;
+    private XTableRows xTableRows;
 
     public RecordTable(TextTableHandler _oTextTableHandler)
     {
diff --git a/wizards/com/sun/star/wizards/report/ReportFinalizer.java b/wizards/com/sun/star/wizards/report/ReportFinalizer.java
index dbd01df3cc05..9f750692ec1c 100644
--- a/wizards/com/sun/star/wizards/report/ReportFinalizer.java
+++ b/wizards/com/sun/star/wizards/report/ReportFinalizer.java
@@ -30,18 +30,18 @@ import com.sun.star.wizards.db.RecordParser;
 public class ReportFinalizer
 {
 
-    WizardDialog CurUnoDialog;
-    XTextComponent xTitleTextBox;
+    private WizardDialog CurUnoDialog;
+    private XTextComponent xTitleTextBox;
     XTextComponent[] xSaveTextBox = new XTextComponent[2];
     Object chkTemplate;
-    String CHANGEREPORTTITLE_FUNCNAME = "changeReportTitle";
-    String TOGGLESUBTEMPLATECONTROLS_FUNCNAME = "toggleSubTemplateControls";
+    private String CHANGEREPORTTITLE_FUNCNAME = "changeReportTitle";
+    private String TOGGLESUBTEMPLATECONTROLS_FUNCNAME = "toggleSubTemplateControls";
     String TemplatePath;
-    String StoreName;
+    private String StoreName;
     boolean bfinalaskbeforeOverwrite;
-    String DefaultName;
-    String OldDefaultName;
-    IReportDocument CurReportDocument;
+    private String DefaultName;
+    private String OldDefaultName;
+    private IReportDocument CurReportDocument;
     public static final int SOCREATEDOCUMENT = 1;
     public static final int SOCREATETEMPLATE = 2;
     public static final int SOUSETEMPLATE = 3;
diff --git a/wizards/com/sun/star/wizards/report/ReportLayouter.java b/wizards/com/sun/star/wizards/report/ReportLayouter.java
index 598b74a8d0dd..1028747ceedd 100644
--- a/wizards/com/sun/star/wizards/report/ReportLayouter.java
+++ b/wizards/com/sun/star/wizards/report/ReportLayouter.java
@@ -36,20 +36,20 @@ import java.util.ArrayList;
 public class ReportLayouter
 {
 
-    UnoDialog CurUnoDialog;
+    private UnoDialog CurUnoDialog;
     final int SOTXTTITLE = 28;
-    final int SOCONTENTLST = 29;
+    private final int SOCONTENTLST = 29;
     final static public int SOOPTLANDSCAPE = 30;
     final static public int SOOPTPORTRAIT = 31;
-    final int SOLAYOUTLST = 32;
-    XListBox xContentListBox;
-    XListBox xLayoutListBox;
-    int iOldContentPos;
-    int iOldLayoutPos;
-    IReportDocument CurReportDocument;
-    public String[][] LayoutFiles;
-    public String[][] ContentFiles;
-    Object aOrientationImage;
+    private final int SOLAYOUTLST = 32;
+    private XListBox xContentListBox;
+    private XListBox xLayoutListBox;
+    private int iOldContentPos;
+    private int iOldLayoutPos;
+    private IReportDocument CurReportDocument;
+    private String[][] LayoutFiles;
+    private String[][] ContentFiles;
+    private Object aOrientationImage;
     private XMultiServiceFactory m_xMSF;
     private XTextRange          trTitleconst, trAuthorconst, trDateconst, trPageconst;
     private TextElement         teTitleconst, teAuthorconst, teDateconst, tePageconst;
diff --git a/wizards/com/sun/star/wizards/report/ReportTextDocument.java b/wizards/com/sun/star/wizards/report/ReportTextDocument.java
index c0871b942754..67036c7437a2 100644
--- a/wizards/com/sun/star/wizards/report/ReportTextDocument.java
+++ b/wizards/com/sun/star/wizards/report/ReportTextDocument.java
@@ -58,14 +58,14 @@ class ReportTextDocument extends com.sun.star.wizards.text.TextDocument implemen
     private String sMsgCommonReportError;
     private String ContentTemplatePath;
     private String sMsgEndAutopilot;
-    public boolean bIsCurLandscape;
+    private boolean bIsCurLandscape;
     public TextTableHandler oTextTableHandler;
     public TextSectionHandler oTextSectionHandler;
     public FormHandler oFormHandler;
-    public TextStyleHandler oTextStyleHandler;
+    private TextStyleHandler oTextStyleHandler;
     public TextFieldHandler oTextFieldHandler;
     public ViewHandler oViewHandler;
-    public NumberFormatter oNumberFormatter;
+    private NumberFormatter oNumberFormatter;
     public static final String TBLRECORDSECTION = "Tbl_RecordSection";
     public static final String TBLGROUPSECTION = "Tbl_GroupField";
     public static final String RECORDSECTION = "RecordSection";
diff --git a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
index 09d319210672..da5089f5fe4e 100644
--- a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
+++ b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
@@ -125,12 +125,12 @@ public class ReportTextImplementation extends ReportImplementationHelper impleme
     {
         return getDoc().xWindowPeer;
     }
-    static String sMsgQueryCreationImpossible;
-    static String sReportFormNotExisting;
-    static String sMsgHiddenControlMissing;
-    static String sMsgEndAutopilot;
+    private static String sMsgQueryCreationImpossible;
+    private static String sReportFormNotExisting;
+    private static String sMsgHiddenControlMissing;
+    private static String sMsgEndAutopilot;
     static String sMsgConnectionImpossible;
-    static String sMsgNoConnection;
+    private static String sMsgNoConnection;
     static String[] ReportMessages = new String[4];
 
     private void initialResources()
diff --git a/wizards/com/sun/star/wizards/report/ReportWizard.java b/wizards/com/sun/star/wizards/report/ReportWizard.java
index e76f93c0cf50..b9de1d542545 100644
--- a/wizards/com/sun/star/wizards/report/ReportWizard.java
+++ b/wizards/com/sun/star/wizards/report/ReportWizard.java
@@ -55,7 +55,7 @@ import java.util.Map;
 public class ReportWizard extends DatabaseObjectWizard implements XTextListener
 {
 
-    protected FieldSelection CurGroupFieldSelection;
+    private FieldSelection CurGroupFieldSelection;
     private SortingComponent CurSortingComponent;
     private TitlesComponent CurTitlesComponent;
     private CommandFieldSelection CurDBCommandFieldSelection;
@@ -648,7 +648,7 @@ public class ReportWizard extends DatabaseObjectWizard implements XTextListener
     public class FieldSelectionListener implements com.sun.star.wizards.ui.XFieldSelectionListener
     {
 
-        protected int m_nID;
+        private int m_nID;
 
         public int getID()
         {
diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/DesignTemplate.java b/wizards/com/sun/star/wizards/reportbuilder/layout/DesignTemplate.java
index 2315ea5bead9..cbf4ee93d76b 100644
--- a/wizards/com/sun/star/wizards/reportbuilder/layout/DesignTemplate.java
+++ b/wizards/com/sun/star/wizards/reportbuilder/layout/DesignTemplate.java
@@ -33,8 +33,8 @@ public class DesignTemplate
 {
 
     private XReportDefinition m_xReportDefinition;
-    XMultiServiceFactory m_xGlobalMSF;
-    String m_sFilename;
+    private XMultiServiceFactory m_xGlobalMSF;
+    private String m_sFilename;
 
     private DesignTemplate()
     {
diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java b/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java
index ac1f431e4998..c7c34c68cb06 100644
--- a/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java
+++ b/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java
@@ -232,7 +232,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter
         return nIndent;
     }
 
-    int m_nLeftIndent = -1;
+    private int m_nLeftIndent = -1;
 
     /**
      * Get left page indent.
@@ -249,7 +249,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter
         return m_nLeftIndent;
     }
 
-    int m_nRightIndent = -1;
+    private int m_nRightIndent = -1;
 
     /**
      * Get right page indent.
@@ -320,7 +320,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter
         }
     }
 
-    int m_nPageWidth = -1;
+    private int m_nPageWidth = -1;
 
     /**
      * Get page width. The default is 21000 1/100mm what is 21cm of DIN A4.
@@ -831,7 +831,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter
         getReportDefinition().setCommandType(_aType);
         getReportDefinition().setCommand(_sTableName);
     }
-    protected XMultiServiceFactory m_xMSF;
+    private XMultiServiceFactory m_xMSF;
 
     protected XMultiServiceFactory getMSFofReportDefinition()
     {
@@ -1397,13 +1397,13 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter
     {
         return m_aResource;
     }
-    protected int m_aCommandType; // Table or Query
-    protected String m_sTableName;
-    protected String[] m_aGroupNames;
-    protected String[] m_aFieldNames;
-    protected String[] m_aFieldTitleNames;
-    protected int[] m_aFieldWidths;
-    protected int[] m_aFieldTypes;
+    private int m_aCommandType; // Table or Query
+    private String m_sTableName;
+    private String[] m_aGroupNames;
+    private String[] m_aFieldNames;
+    private String[] m_aFieldTitleNames;
+    private int[] m_aFieldWidths;
+    private int[] m_aFieldTypes;
     private DesignTemplate m_xDesignTemplate = null;
 
     public void initializeData(IReportBuilderLayouter _aOther)
@@ -1466,8 +1466,8 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter
     {
         return getLabelWidth(_sLabel, 0.0f, 0.0f);
     }
-    XFixedText m_aFixedTextHelper = null;
-    HashMap<String, Integer> m_aLabelWidthMap;
+    private XFixedText m_aFixedTextHelper = null;
+    private HashMap<String, Integer> m_aLabelWidthMap;
 
     protected int getLabelWidth(String _sLabel, FontDescriptor _aFD)
     {
diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/SectionObject.java b/wizards/com/sun/star/wizards/reportbuilder/layout/SectionObject.java
index de2d1cd4aded..c6d3887cccaf 100644
--- a/wizards/com/sun/star/wizards/reportbuilder/layout/SectionObject.java
+++ b/wizards/com/sun/star/wizards/reportbuilder/layout/SectionObject.java
@@ -25,7 +25,7 @@ abstract public class SectionObject
 {
 
     Object m_aParentObject; // this could be FixedText or FormattedField or null
-    PropertySetHelper m_aPropertySetHelper;
+    private PropertySetHelper m_aPropertySetHelper;
 
     public SectionObject()
     {
diff --git a/wizards/com/sun/star/wizards/table/CGCategory.java b/wizards/com/sun/star/wizards/table/CGCategory.java
index bdcad65db0f2..bbc244a6e922 100644
--- a/wizards/com/sun/star/wizards/table/CGCategory.java
+++ b/wizards/com/sun/star/wizards/table/CGCategory.java
@@ -33,10 +33,10 @@ public class CGCategory
     public String Name;
     public int Index;
     private final String CGROOTPATH = "/org.openoffice.Office.TableWizard/TableWizard/";
-    XMultiServiceFactory xMSF;
+    private XMultiServiceFactory xMSF;
     XNameAccess xNameAccessTablesNode;
-    XNameAccess xNameAccessCurBusinessNode;
-    Object oconfigView;
+    private XNameAccess xNameAccessCurBusinessNode;
+    private Object oconfigView;
 
     public CGCategory(XMultiServiceFactory _xMSF)
     {
diff --git a/wizards/com/sun/star/wizards/table/CGTable.java b/wizards/com/sun/star/wizards/table/CGTable.java
index 21f8a9136666..c86718cd5081 100644
--- a/wizards/com/sun/star/wizards/table/CGTable.java
+++ b/wizards/com/sun/star/wizards/table/CGTable.java
@@ -26,9 +26,9 @@ import com.sun.star.wizards.common.PropertyNames;
 public class CGTable
 {
 
-    XMultiServiceFactory xMSF;
+    private XMultiServiceFactory xMSF;
     XNameAccess xNameAccessFieldsNode;
-    XNameAccess xNameAccessTableNode;
+    private XNameAccess xNameAccessTableNode;
     public String Index;
     public String Name;
 
diff --git a/wizards/com/sun/star/wizards/table/CallTableWizard.java b/wizards/com/sun/star/wizards/table/CallTableWizard.java
index 8c994e862115..aa1fb214a6b1 100644
--- a/wizards/com/sun/star/wizards/table/CallTableWizard.java
+++ b/wizards/com/sun/star/wizards/table/CallTableWizard.java
@@ -57,7 +57,7 @@ public class CallTableWizard
 
         private PropertyValue[] m_wizardContext;
         // <properties>
-        public String           Command;
+        private String           Command;
         public final Integer    CommandType = com.sun.star.sdb.CommandType.TABLE;
         // </properties>
 
diff --git a/wizards/com/sun/star/wizards/table/FieldFormatter.java b/wizards/com/sun/star/wizards/table/FieldFormatter.java
index f5ceb87fed1b..aeb091300444 100644
--- a/wizards/com/sun/star/wizards/table/FieldFormatter.java
+++ b/wizards/com/sun/star/wizards/table/FieldFormatter.java
@@ -37,23 +37,23 @@ import com.sun.star.wizards.ui.UnoDialog;
 public class FieldFormatter implements XItemListener
 {
 
-    TableWizard CurUnoDialog;
-    TableDescriptor curTableDescriptor;
-    Object oColumnDescriptorModel;
-    XTextComponent txtfieldname;
-    XListBox xlstFieldNames;
-    XButton btnplus;
-    XButton btnminus;
-    XButton btnShiftUp;
-    XButton btnShiftDown;
-    short curtabindex;
+    private TableWizard CurUnoDialog;
+    private TableDescriptor curTableDescriptor;
+    private Object oColumnDescriptorModel;
+    private XTextComponent txtfieldname;
+    private XListBox xlstFieldNames;
+    private XButton btnplus;
+    private XButton btnminus;
+    private XButton btnShiftUp;
+    private XButton btnShiftDown;
+    private short curtabindex;
     String TOGGLEBUTTONS = "toggleButtons";
     String ADDFIELDNAME = "addFieldName";
     String REMOVEFIELDNAME = "removeFieldName";
-    String MODIFYFIELDNAME = "modifyFieldName";
+    private String MODIFYFIELDNAME = "modifyFieldName";
     String[] fieldnames;
-    String suntitled;
-    Integer IFieldFormatStep;
+    private String suntitled;
+    private Integer IFieldFormatStep;
 
     public FieldFormatter(TableWizard _CurUnoDialog)
     {
diff --git a/wizards/com/sun/star/wizards/table/Finalizer.java b/wizards/com/sun/star/wizards/table/Finalizer.java
index 17883abbfb78..684055f3ee96 100644
--- a/wizards/com/sun/star/wizards/table/Finalizer.java
+++ b/wizards/com/sun/star/wizards/table/Finalizer.java
@@ -30,17 +30,17 @@ import com.sun.star.wizards.ui.*;
 public class Finalizer
 {
 
-    TableWizard CurUnoDialog;
-    short curtabindex;
-    XRadioButton optModifyTable;
-    XRadioButton optWorkWithTable;
-    XRadioButton optStartFormWizard;
-    XTextComponent txtTableName;
-    XListBox xCatalogListBox;
-    XListBox xSchemaListBox;
-    TableDescriptor curtabledescriptor;
-    public String SETCOMPLETIONFLAG = "setCompletionFlag";
-    public static int WORKWITHTABLEMODE = 0;
+    private TableWizard CurUnoDialog;
+    private short curtabindex;
+    private XRadioButton optModifyTable;
+    private XRadioButton optWorkWithTable;
+    private XRadioButton optStartFormWizard;
+    private XTextComponent txtTableName;
+    private XListBox xCatalogListBox;
+    private XListBox xSchemaListBox;
+    private TableDescriptor curtabledescriptor;
+    private String SETCOMPLETIONFLAG = "setCompletionFlag";
+    private static int WORKWITHTABLEMODE = 0;
     public static int MODIFYTABLEMODE = 1;
     public static int STARTFORMWIZARDMODE = 2;
 
diff --git a/wizards/com/sun/star/wizards/table/ScenarioSelector.java b/wizards/com/sun/star/wizards/table/ScenarioSelector.java
index 77e063e87197..bfa079651e25 100644
--- a/wizards/com/sun/star/wizards/table/ScenarioSelector.java
+++ b/wizards/com/sun/star/wizards/table/ScenarioSelector.java
@@ -292,7 +292,7 @@ public class ScenarioSelector extends FieldSelection implements XItemListener, X
     public void disposing(EventObject arg0)
     {
     }
-    protected int ID;
+    private int ID;
 
     public int getID()
     {
diff --git a/wizards/com/sun/star/wizards/table/TableWizard.java b/wizards/com/sun/star/wizards/table/TableWizard.java
index 8ee556da7e22..16e90eb59c3c 100644
--- a/wizards/com/sun/star/wizards/table/TableWizard.java
+++ b/wizards/com/sun/star/wizards/table/TableWizard.java
@@ -38,20 +38,20 @@ import com.sun.star.wizards.ui.*;
 public class TableWizard extends DatabaseObjectWizard implements XTextListener
 {
 
-    static String slblFields;
-    static String slblSelFields;
-    Finalizer curFinalizer;
-    ScenarioSelector curScenarioSelector;
-    FieldFormatter curFieldFormatter;
-    PrimaryKeyHandler curPrimaryKeyHandler;
-    String sMsgWizardName = PropertyNames.EMPTY_STRING;
+    private static String slblFields;
+    private static String slblSelFields;
+    private Finalizer curFinalizer;
+    private ScenarioSelector curScenarioSelector;
+    private FieldFormatter curFieldFormatter;
+    private PrimaryKeyHandler curPrimaryKeyHandler;
+    private String sMsgWizardName = PropertyNames.EMPTY_STRING;
     public HashMap<String, FieldDescription> fielditems;
-    int wizardmode;
-    String tablename;
-    String serrToManyFields;
-    String serrTableNameexists;
-    String scomposedtablename;
-    TableDescriptor curTableDescriptor;
+    private int wizardmode;
+    private String tablename;
+    private String serrToManyFields;
+    private String serrTableNameexists;
+    private String scomposedtablename;
+    private TableDescriptor curTableDescriptor;
     public static final int SONULLPAGE = 0;
     public static final int SOMAINPAGE = 1;
     public static final int SOFIELDSFORMATPAGE = 2;
diff --git a/wizards/com/sun/star/wizards/text/TextDocument.java b/wizards/com/sun/star/wizards/text/TextDocument.java
index 6fb26b50e404..dfc48860a9b3 100644
--- a/wizards/com/sun/star/wizards/text/TextDocument.java
+++ b/wizards/com/sun/star/wizards/text/TextDocument.java
@@ -80,14 +80,14 @@ public class TextDocument
     public XText xText;
     public XMultiServiceFactory xMSFDoc;
     public XMultiServiceFactory xMSF;
-    public com.sun.star.util.XNumberFormatsSupplier xNumberFormatsSupplier;
+    private com.sun.star.util.XNumberFormatsSupplier xNumberFormatsSupplier;
     public com.sun.star.awt.XWindowPeer xWindowPeer;
     public int PageWidth;
     public int ScaleWidth;
-    public Size DocSize;
+    private Size DocSize;
     public com.sun.star.awt.Rectangle PosSize;
-    public com.sun.star.lang.Locale CharLocale;
-    public XStorable xStorable;
+    private com.sun.star.lang.Locale CharLocale;
+    private XStorable xStorable;
 
     // creates an instance of TextDocument and creates a named frame. No document is actually loaded into this frame.
     public TextDocument(XMultiServiceFactory xMSF, XTerminateListener listener, String FrameName)
diff --git a/wizards/com/sun/star/wizards/text/TextFieldHandler.java b/wizards/com/sun/star/wizards/text/TextFieldHandler.java
index eb3b25e63a28..8d3bf6f91c2e 100644
--- a/wizards/com/sun/star/wizards/text/TextFieldHandler.java
+++ b/wizards/com/sun/star/wizards/text/TextFieldHandler.java
@@ -45,7 +45,7 @@ import com.sun.star.wizards.common.PropertyNames;
 public class TextFieldHandler
 {
 
-    public XTextFieldsSupplier xTextFieldsSupplier;
+    private XTextFieldsSupplier xTextFieldsSupplier;
     private XMultiServiceFactory xMSFDoc;
 
     /**
diff --git a/wizards/com/sun/star/wizards/text/TextTableHandler.java b/wizards/com/sun/star/wizards/text/TextTableHandler.java
index bc37487274ad..c4b40eacdc1e 100644
--- a/wizards/com/sun/star/wizards/text/TextTableHandler.java
+++ b/wizards/com/sun/star/wizards/text/TextTableHandler.java
@@ -44,9 +44,9 @@ public class TextTableHandler
 {
 
     public XTextTablesSupplier xTextTablesSupplier;
-    public XMultiServiceFactory xMSFDoc;
-    public XTextDocument xTextDocument;
-    public XSimpleText xSimpleText;
+    private XMultiServiceFactory xMSFDoc;
+    private XTextDocument xTextDocument;
+    private XSimpleText xSimpleText;
     private NumberFormatter oNumberFormatter;
     private Locale aCharLocale;
 
diff --git a/wizards/com/sun/star/wizards/ui/AggregateComponent.java b/wizards/com/sun/star/wizards/ui/AggregateComponent.java
index 67f17ec39950..9261ee7cc9b0 100644
--- a/wizards/com/sun/star/wizards/ui/AggregateComponent.java
+++ b/wizards/com/sun/star/wizards/ui/AggregateComponent.java
@@ -38,25 +38,25 @@ import com.sun.star.wizards.db.QueryMetaData;
 public class AggregateComponent extends ControlScroller
 {
 
-    String[] sFunctions;
-    String[] sFunctionOperators = new String[]
+    private String[] sFunctions;
+    private String[] sFunctionOperators = new String[]
     {
         "SUM", "AVG", "MIN", "MAX"
     };
-    QueryMetaData CurDBMetaData;
-    XButton optDetailQuery;
-    XButton optSummaryQuery;
-    String soptDetailQuery;
-    String soptSummaryQuery;
-    String slblAggregate;
-    String slblFieldNames;
-    String sDuplicateAggregateFunction;
-    int Count;
+    private QueryMetaData CurDBMetaData;
+    private XButton optDetailQuery;
+    private XButton optSummaryQuery;
+    private String soptDetailQuery;
+    private String soptSummaryQuery;
+    private String slblAggregate;
+    private String slblFieldNames;
+    private String sDuplicateAggregateFunction;
+    private int Count;
     int iQueryType;
-    final int SOADDROW = 1;
-    final int SOREMOVEROW = 2;
+    private final int SOADDROW = 1;
+    private final int SOREMOVEROW = 2;
     final int CONTROLROWDIST = 18;
-    ArrayList<ControlRow> ControlRowVector;
+    private ArrayList<ControlRow> ControlRowVector;
     String OPTIONBUTTONDETAILQUERY_ITEM_CHANGED = "toggleComponent";
     String OPTIONBUTTONSUMMARYQUERY_ITEM_CHANGED = "toggleComponent";
     String LISTBOXFUNCTIONS_ACTION_PERFORMED;
@@ -66,8 +66,8 @@ public class AggregateComponent extends ControlScroller
     String COMMANDBUTTONPLUS_ACTION_PERFORMED = "addRow";
     String COMMANDBUTTONMINUS_ACTION_PERFORMED = "removeRow";
     ArrayList<String> ControlRows;
-    int curHelpID;
-    int lastHelpIndex;
+    private int curHelpID;
+    private int lastHelpIndex;
 
     /** Creates a new instance of AggrgateComponent */
     public AggregateComponent(WizardDialog _CurUnoDialog, QueryMetaData _CurDBMetaData, int _iStep, int _iPosX, int _iPosY, int _iWidth, int _uitextfieldcount, int _firstHelpID)
diff --git a/wizards/com/sun/star/wizards/ui/ButtonList.java b/wizards/com/sun/star/wizards/ui/ButtonList.java
index 0f17303dc95a..bfe0d3e93688 100644
--- a/wizards/com/sun/star/wizards/ui/ButtonList.java
+++ b/wizards/com/sun/star/wizards/ui/ButtonList.java
@@ -65,7 +65,7 @@ public class ButtonList implements XItemEventBroadcaster, XActionListener
     public int helpURL = 0;
     private IImageRenderer renderer;
     private ListModel listModel;
-    public IRenderer counterRenderer = new SimpleCounterRenderer();
+    private IRenderer counterRenderer = new SimpleCounterRenderer();
     private final static int LINE_HEIGHT = 8;
 
     /** Getter for property m_aButtonSize.
@@ -622,7 +622,7 @@ public class ButtonList implements XItemEventBroadcaster, XActionListener
     public static class Counter
     {
 
-        public int start,  end,  max;
+        private int start,  end,  max;
 
         private Counter(int start_, int end_, int max_)
         {
diff --git a/wizards/com/sun/star/wizards/ui/ControlScroller.java b/wizards/com/sun/star/wizards/ui/ControlScroller.java
index 7c2193fb6e70..179d787bf391 100644
--- a/wizards/com/sun/star/wizards/ui/ControlScroller.java
+++ b/wizards/com/sun/star/wizards/ui/ControlScroller.java
@@ -28,31 +28,31 @@ public abstract class ControlScroller
 {
 
     protected WizardDialog CurUnoDialog;
-    protected XMultiServiceFactory xMSF;
+    private XMultiServiceFactory xMSF;
     protected int ncurfieldcount;
-    protected int nblockincrement;
+    private int nblockincrement;
     private int nlineincrement;
-    protected int nscrollvalue = 0;
-    protected int ntotfieldcount;
-    XScrollBar xScrollBar;
-    protected ArrayList<PropertyValue[]> scrollfields;
-    protected Integer ICompPosX;
+    private int nscrollvalue = 0;
+    private int ntotfieldcount;
+    private XScrollBar xScrollBar;
+    private ArrayList<PropertyValue[]> scrollfields;
+    private Integer ICompPosX;
     protected int iCompPosX;
-    protected Integer ICompPosY;
+    private Integer ICompPosY;
     protected int iCompPosY;
-    protected Integer ICompWidth;
+    private Integer ICompWidth;
     protected int iCompWidth;
     protected Integer ICompHeight;
     protected int iCompHeight;
-    protected int iStartPosY;
+    private int iStartPosY;
     protected short curtabindex;
-    int iStep;
+    private int iStep;
     protected Integer IStep;
-    protected int linedistance;
+    private int linedistance;
     int iScrollBarWidth = 10;
-    int SORELFIRSTPOSY = 3;
+    private int SORELFIRSTPOSY = 3;
     protected int curHelpIndex;
-    String sIncSuffix;
+    private String sIncSuffix;
     protected ArrayList<Object> ControlGroupVector = new ArrayList<Object>();
     protected PeerConfig oTitlePeerConfig;
 
diff --git a/wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java b/wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java
index ce2d5383de40..2aad4c6706de 100644
--- a/wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java
+++ b/wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java
@@ -30,19 +30,19 @@ import com.sun.star.wizards.common.PropertyNames;
 public abstract class DBLimitedFieldSelection
 {
 
-    protected XMultiServiceFactory xMSF;
+    private XMultiServiceFactory xMSF;
     protected WizardDialog CurUnoDialog;
-    protected String sNoField;
+    private String sNoField;
     protected Integer IStep;
-    protected Integer ICompPosX;
-    protected Integer ICompPosY;
-    protected Integer ICompWidth;
+    private Integer ICompPosX;
+    private Integer ICompPosY;
+    private Integer ICompWidth;
     protected final int rowcount = 4;
-    protected final int MAXSELINDEX = rowcount - 1;
+    private final int MAXSELINDEX = rowcount - 1;
     protected short curtabindex;
     protected int iCurPosY;
     protected int FirstHelpIndex;
-    protected int iCompPosX;
+    private int iCompPosX;
 
     public DBLimitedFieldSelection(WizardDialog _CurUnoDialog, int iStep, int _iCompPosX, int iCompPosY, int iCompWidth, int _FirstHelpIndex)
     {
diff --git a/wizards/com/sun/star/wizards/ui/FieldSelection.java b/wizards/com/sun/star/wizards/ui/FieldSelection.java
index f3217bc363b8..3b0a4c6ee188 100644
--- a/wizards/com/sun/star/wizards/ui/FieldSelection.java
+++ b/wizards/com/sun/star/wizards/ui/FieldSelection.java
@@ -35,10 +35,10 @@ public class FieldSelection
     protected boolean AppendMode = false;
     protected Integer IStep;
 
-    protected int CompPosX;
-    protected int CompPosY;
-    protected int CompHeight;
-    protected int CompWidth;
+    private int CompPosX;
+    private int CompPosY;
+    private int CompHeight;
+    private int CompWidth;
 
     private XFieldSelectionListener xFieldSelection;
     private int maxfieldcount = 10000000;
diff --git a/wizards/com/sun/star/wizards/ui/FilterComponent.java b/wizards/com/sun/star/wizards/ui/FilterComponent.java
index c1420c683938..6f5d8358d281 100644
--- a/wizards/com/sun/star/wizards/ui/FilterComponent.java
+++ b/wizards/com/sun/star/wizards/ui/FilterComponent.java
@@ -59,48 +59,48 @@ public class FilterComponent
     private String slblFieldNames;
     private String slblOperators;
     private String slblValue;
-    WizardDialog CurUnoDialog;
+    private WizardDialog CurUnoDialog;
     private int BaseID = 2300;
     private String sIncSuffix;
     private ControlRow[] oControlRows;
     private String sDuplicateCondition;
-    final int SOOPTORMODE = 100;
-    final int SOOPTANDMODE = 101;
-    QueryMetaData oQueryMetaData;
-    int iDateTimeFormat;
-    int iDateFormat;
-    int iTimeFormat;
+    private final int SOOPTORMODE = 100;
+    private final int SOOPTANDMODE = 101;
+    private QueryMetaData oQueryMetaData;
+    private int iDateTimeFormat;
+    private int iDateFormat;
+    private int iTimeFormat;
     private PropertyValue[][] filterconditions;
     private short curtabindex;
-    XMultiServiceFactory xMSF;
-    final int SO_FIRSTFIELDNAME = 1;
-    final int SO_SECONDFIELDNAME = 2;
-    final int SO_THIRDFIELDNAME = 3;
-    final int SO_FOURTHFIELDNAME = 4;
-    int[] SO_FIELDNAMELIST = new int[]
+    private XMultiServiceFactory xMSF;
+    private final int SO_FIRSTFIELDNAME = 1;
+    private final int SO_SECONDFIELDNAME = 2;
+    private final int SO_THIRDFIELDNAME = 3;
+    private final int SO_FOURTHFIELDNAME = 4;
+    private int[] SO_FIELDNAMELIST = new int[]
     {
         SO_FIRSTFIELDNAME, SO_SECONDFIELDNAME, SO_THIRDFIELDNAME, SO_FOURTHFIELDNAME
     };
-    final int SO_FIRSTCONDITION = 5;
-    final int SO_SECONDCONDITION = 6;
-    final int SO_THIRDCONDITION = 7;
-    final int SO_FOURTHCONDITION = 8;
-    int[] SO_CONDITIONLIST = new int[]
+    private final int SO_FIRSTCONDITION = 5;
+    private final int SO_SECONDCONDITION = 6;
+    private final int SO_THIRDCONDITION = 7;
+    private final int SO_FOURTHCONDITION = 8;
+    private int[] SO_CONDITIONLIST = new int[]
     {
         SO_FIRSTCONDITION, SO_SECONDCONDITION, SO_THIRDCONDITION, SO_FOURTHCONDITION
     };
-    final int SO_FIRSTTEXTFIELD = 1;
-    final int SO_SECONDTEXTFIELD = 2;
-    final int SO_THIRDTEXTFIELD = 3;
-    final int SO_FOURTHTEXTFIELD = 4;
-    int[] SO_TEXTFIELDLIST = new int[]
+    private final int SO_FIRSTTEXTFIELD = 1;
+    private final int SO_SECONDTEXTFIELD = 2;
+    private final int SO_THIRDTEXTFIELD = 3;
+    private final int SO_FOURTHTEXTFIELD = 4;
+    private int[] SO_TEXTFIELDLIST = new int[]
     {
         SO_FIRSTTEXTFIELD, SO_SECONDTEXTFIELD, SO_THIRDTEXTFIELD, SO_FOURTHTEXTFIELD
     };
-    final int SO_FIRSTBOOLFIELDNAME = 256 + 1;
-    final int SO_SECONDBOOLFIELDNAME = 256 + 2;
-    final int SO_THIRDBOOLFIELDNAME = 256 + 3;
-    final int SO_FOURTHBOOLFIELDNAME = 256 + 4;
+    private final int SO_FIRSTBOOLFIELDNAME = 256 + 1;
+    private final int SO_SECONDBOOLFIELDNAME = 256 + 2;
+    private final int SO_THIRDBOOLFIELDNAME = 256 + 3;
+    private final int SO_FOURTHBOOLFIELDNAME = 256 + 4;
     int SO_BOOLEANLIST[] =
 
 
@@ -108,9 +108,9 @@ public class FilterComponent
         SO_FIRSTBOOLFIELDNAME, SO_SECONDBOOLFIELDNAME, SO_THIRDBOOLFIELDNAME, SO_FOURTHBOOLFIELDNAME
     };
     final int SO_OPTQUERYMODE = 5;
-    int SOI_MATCHALL = 0;
-    int SOI_MATCHANY = 1;
-    int curHelpID;
+    private int SOI_MATCHALL = 0;
+    private int SOI_MATCHANY = 1;
+    private int curHelpID;
 
     class ItemListenerImpl implements com.sun.star.awt.XItemListener
     {
@@ -514,9 +514,9 @@ public class FilterComponent
         private final static int SOLSTFIELDNAME = 3;
         private final static int SOLSTOPERATOR = 4;
         private final static int SOTXTVALUE = 5;
-        protected XInterface[] ControlElements = new XInterface[6];
+        private XInterface[] ControlElements = new XInterface[6];
         private boolean m_bEnabled;
-        String[] FieldNames;
+        private String[] FieldNames;
 
         private ControlRow(int iCompPosX, int iCompPosY, int Index, boolean _bEnabled, int _firstRowHelpID)
         {
diff --git a/wizards/com/sun/star/wizards/ui/ImageList.java b/wizards/com/sun/star/wizards/ui/ImageList.java
index 4ca02a4612d8..0fe4af1b54bd 100644
--- a/wizards/com/sun/star/wizards/ui/ImageList.java
+++ b/wizards/com/sun/star/wizards/ui/ImageList.java
@@ -811,7 +811,7 @@ public class ImageList implements XItemEventBroadcaster, ListDataListener
     public static class Counter
     {
 
-        public int start,  end,  max;
+        private int start,  end,  max;
 
         private Counter(int start_, int end_, int max_)
         {
diff --git a/wizards/com/sun/star/wizards/ui/PeerConfig.java b/wizards/com/sun/star/wizards/ui/PeerConfig.java
index 689c0dd92700..b836221851f6 100644
--- a/wizards/com/sun/star/wizards/ui/PeerConfig.java
+++ b/wizards/com/sun/star/wizards/ui/PeerConfig.java
@@ -33,9 +33,9 @@ public class PeerConfig implements XWindowListener
 {
 
     private ArrayList<PeerTask> m_aPeerTasks = new ArrayList<PeerTask>();
-    ArrayList<ControlTask> aControlTasks = new ArrayList<ControlTask>();
-    ArrayList<ImageUrlTask> aImageUrlTasks = new ArrayList<ImageUrlTask>();
-    UnoDialog oUnoDialog = null;
+    private ArrayList<ControlTask> aControlTasks = new ArrayList<ControlTask>();
+    private ArrayList<ImageUrlTask> aImageUrlTasks = new ArrayList<ImageUrlTask>();
+    private UnoDialog oUnoDialog = null;
 
     public PeerConfig(UnoDialog _oUnoDialog)
     {
@@ -46,9 +46,9 @@ public class PeerConfig implements XWindowListener
     class PeerTask
     {
 
-        XControl xControl;
-        String[] propnames;
-        Object[] propvalues;
+        private XControl xControl;
+        private String[] propnames;
+        private Object[] propvalues;
 
         private PeerTask(XControl _xControl, String[] propNames_, Object[] propValues_)
         {
@@ -61,9 +61,9 @@ public class PeerConfig implements XWindowListener
     class ControlTask
     {
 
-        Object oModel;
-        String propname;
-        Object propvalue;
+        private Object oModel;
+        private String propname;
+        private Object propvalue;
 
         private ControlTask(Object _oModel, String _propName, Object _propValue)
         {
@@ -76,9 +76,9 @@ public class PeerConfig implements XWindowListener
     class ImageUrlTask
     {
 
-        Object oModel;
-        Object oResource;
-        Object oHCResource;
+        private Object oModel;
+        private Object oResource;
+        private Object oHCResource;
 
         private ImageUrlTask(Object _oModel, Object _oResource, Object _oHCResource)
         {
diff --git a/wizards/com/sun/star/wizards/ui/SortingComponent.java b/wizards/com/sun/star/wizards/ui/SortingComponent.java
index 3f55cdc38044..b8d7237d864b 100644
--- a/wizards/com/sun/star/wizards/ui/SortingComponent.java
+++ b/wizards/com/sun/star/wizards/ui/SortingComponent.java
@@ -26,26 +26,26 @@ import java.util.ArrayList;
 public class SortingComponent
 {
 
-    com.sun.star.lang.XMultiServiceFactory xMSF;
-    WizardDialog CurUnoDialog;
-    int MaxSortIndex = -1;
+    private com.sun.star.lang.XMultiServiceFactory xMSF;
+    private WizardDialog CurUnoDialog;
+    private int MaxSortIndex = -1;
     public String[][] FieldNames;
-    static String sNoSorting;
-    static String sSortCriteriaisduplicate;
-    static String[] sSortHeader = new String[4];
-    static String[] sSortAscend = new String[4];
-    static String[] sSortDescend = new String[4];
+    private static String sNoSorting;
+    private static String sSortCriteriaisduplicate;
+    private static String[] sSortHeader = new String[4];
+    private static String[] sSortAscend = new String[4];
+    private static String[] sSortDescend = new String[4];
     static short[] bOldSortValues = new short[4];
-    public int MAXSORTCRITERIAINDEX = 3;
-    final int SOFIRSTSORTLST = 0;
-    final int SOSECSORTLST = 1;
-    final int SOTHIRDSORTLST = 2;
-    final int SOFOURTHSORTLST = 3;
-    final int[] SOSORTLST = new int[]
+    private int MAXSORTCRITERIAINDEX = 3;
+    private final int SOFIRSTSORTLST = 0;
+    private final int SOSECSORTLST = 1;
+    private final int SOTHIRDSORTLST = 2;
+    private final int SOFOURTHSORTLST = 3;
+    private final int[] SOSORTLST = new int[]
     {
         SOFIRSTSORTLST, SOSECSORTLST, SOTHIRDSORTLST, SOFOURTHSORTLST
     };
-    XListBox[] xSortListBox = new XListBox[4];
+    private XListBox[] xSortListBox = new XListBox[4];
 
     class ItemListenerImpl implements com.sun.star.awt.XItemListener
     {
diff --git a/wizards/com/sun/star/wizards/ui/TitlesComponent.java b/wizards/com/sun/star/wizards/ui/TitlesComponent.java
index c279e6f329bd..2e15ebabafe4 100644
--- a/wizards/com/sun/star/wizards/ui/TitlesComponent.java
+++ b/wizards/com/sun/star/wizards/ui/TitlesComponent.java
@@ -29,14 +29,14 @@ import java.util.*;
 public class TitlesComponent extends ControlScroller
 {
 
-    int iLabelPosX;
-    final int iRelLabelPosXDist = 6;
-    public String[] fieldnames;
-    public Map<String, String> fieldtitleset;
-    public String[] fieldtitles;
+    private int iLabelPosX;
+    private final int iRelLabelPosXDist = 6;
+    private String[] fieldnames;
+    private Map<String, String> fieldtitleset;
+    private String[] fieldtitles;
     public XTextListener xTextListener;
-    final String SOLABELPREFIX = "lblColumnName_";
-    final String SOTITLEPREFIX = "lblTitleName_";
+    private final String SOLABELPREFIX = "lblColumnName_";
+    private final String SOTITLEPREFIX = "lblTitleName_";
 
     public TitlesComponent(WizardDialog _CurUnoDialog, int _iStep, int _iCompPosX, int _iCompPosY, int _iCompWidth, int _uitextfieldcount, String _slblColumnNames, String _slblColumnTitles, int _firsthelpindex)
     {
@@ -90,7 +90,7 @@ public class TitlesComponent extends ControlScroller
     {
 
         PropertyValue[] regproperties;
-        XTextComponent xTextComponent;
+        private XTextComponent xTextComponent;
 
         private ControlRow(int _index, int _iCompPosY)
         {
diff --git a/wizards/com/sun/star/wizards/ui/UnoDialog.java b/wizards/com/sun/star/wizards/ui/UnoDialog.java
index c6b82a6ef9fc..4d91bbd3d988 100644
--- a/wizards/com/sun/star/wizards/ui/UnoDialog.java
+++ b/wizards/com/sun/star/wizards/ui/UnoDialog.java
@@ -40,7 +40,7 @@ public class UnoDialog implements EventNames
 
     public XMultiServiceFactory xMSF;
     public XMultiServiceFactory MSFDialogModel;
-    public XNameContainer xDlgNames;
+    private XNameContainer xDlgNames;
     public XControlContainer xDlgContainer;
     private XNameAccess m_xDlgNameAccess;
     public XControl xControl;
@@ -49,9 +49,9 @@ public class UnoDialog implements EventNames
     public XWindow xWindow;
     public XComponent xComponent;
     public XInterface xDialogModel;
-    public XInterface xUnoDialog;
-    public XPropertySet xPSetDlg;
-    public XVclWindowPeer xVclWindowPeer;
+    private XInterface xUnoDialog;
+    private XPropertySet xPSetDlg;
+    private XVclWindowPeer xVclWindowPeer;
     public HashMap<String, Integer> ControlList;
     public Resource m_oResource;
     public XWindowPeer xWindowPeer = null;
diff --git a/wizards/com/sun/star/wizards/ui/WizardDialog.java b/wizards/com/sun/star/wizards/ui/WizardDialog.java
index 68c1d3a2da0f..c014dfa605d1 100644
--- a/wizards/com/sun/star/wizards/ui/WizardDialog.java
+++ b/wizards/com/sun/star/wizards/ui/WizardDialog.java
@@ -55,14 +55,14 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL
     private int nOldStep = 1;
     private int nMaxStep = 1;
     protected XItemListener RoadmapItemListener;
-    protected XControl xRoadmapControl;
-    XItemEventBroadcaster xRoadmapBroadcaster;
-    String[] sRMItemLabels;
+    private XControl xRoadmapControl;
+    private XItemEventBroadcaster xRoadmapBroadcaster;
+    private String[] sRMItemLabels;
     private Object oRoadmap;
     private XSingleServiceFactory xSSFRoadmap;
     public XIndexContainer xIndexContRoadmap;
     private Resource oWizardResource;
-    public String sMsgEndAutopilot;
+    private String sMsgEndAutopilot;
     private int hid;
     private boolean bTerminateListenermustberemoved = true;
 
diff --git a/wizards/com/sun/star/wizards/ui/event/DataAware.java b/wizards/com/sun/star/wizards/ui/event/DataAware.java
index 6deb0adbb5a0..1ba8db1a13f7 100644
--- a/wizards/com/sun/star/wizards/ui/event/DataAware.java
+++ b/wizards/com/sun/star/wizards/ui/event/DataAware.java
@@ -43,12 +43,12 @@ public abstract class DataAware {
     /**
      * this is the data object.
      */
-    protected Object dataObject;
+    private Object dataObject;
     /**
      * A Value Object knows how to get/set a value
      * from/to the data object.
      */
-    protected Value value;
+    private Value value;
 
     /**
      * creates a DataAware object for the given data object and Value object.
diff --git a/wizards/com/sun/star/wizards/ui/event/MethodInvocation.java b/wizards/com/sun/star/wizards/ui/event/MethodInvocation.java
index 4218c07ffdef..b7e8209ea8a3 100644
--- a/wizards/com/sun/star/wizards/ui/event/MethodInvocation.java
+++ b/wizards/com/sun/star/wizards/ui/event/MethodInvocation.java
@@ -33,11 +33,11 @@ import java.lang.reflect.Method;
 public class MethodInvocation
 {
     //the method to invoke.
-    Method mMethod;
+    private Method mMethod;
     //the object to invoke the method on.
-    Object mObject;
+    private Object mObject;
     //with one Parameter / without
-    boolean mWithParam;
+    private boolean mWithParam;
 
     /** Creates a new instance of MethodInvokation */
     public MethodInvocation(String methodName, Object obj) throws NoSuchMethodException
diff --git a/wizards/com/sun/star/wizards/ui/event/UnoDataAware.java b/wizards/com/sun/star/wizards/ui/event/UnoDataAware.java
index cf21494c4cf9..779c02122900 100644
--- a/wizards/com/sun/star/wizards/ui/event/UnoDataAware.java
+++ b/wizards/com/sun/star/wizards/ui/event/UnoDataAware.java
@@ -35,11 +35,11 @@ import com.sun.star.wizards.common.PropertyNames;
 public class UnoDataAware extends DataAware
 {
 
-    protected Object unoControl;
-    protected Object unoModel;
-    protected String unoPropName;
-    protected Object[] disableObjects = new Object[0];
-    protected boolean inverse = false;
+    private Object unoControl;
+    private Object unoModel;
+    private String unoPropName;
+    private Object[] disableObjects = new Object[0];
+    private boolean inverse = false;
 
     private UnoDataAware(Object dataObject, Value value, Object unoObject_, String unoPropName_)
     {