java: reduce visibility of fields and methods

found by PMD

Change-Id: Id6737916b68ccbdbdeec5d314747a38410923ac6
Reviewed-on: https://gerrit.libreoffice.org/13409
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>

58 files changed, 136 insertions, 136 deletions

diff --git a/qadevOOo/runner/complexlib/Assurance.java b/qadevOOo/runner/complexlib/Assurance.java
index 53d287e9dc48..0cbc1e0aaf20 100644
--- a/qadevOOo/runner/complexlib/Assurance.java
+++ b/qadevOOo/runner/complexlib/Assurance.java
@@ -170,7 +170,7 @@ public class Assurance
 
     public class AssureException extends RuntimeException {
 
-        public AssureException(String msg) {
+        private AssureException(String msg) {
             super(msg);
         }
         public AssureException(Throwable cause) {
diff --git a/qadevOOo/runner/convwatch/GraphicalTestArguments.java b/qadevOOo/runner/convwatch/GraphicalTestArguments.java
index 2d35b9669eed..669083bd0778 100644
--- a/qadevOOo/runner/convwatch/GraphicalTestArguments.java
+++ b/qadevOOo/runner/convwatch/GraphicalTestArguments.java
@@ -329,7 +329,7 @@ public class GraphicalTestArguments
         }
 
     // set methods
-    public void setReferenceType(String _sType)
+    private void setReferenceType(String _sType)
         {
             // special casse, null is not allowed, set to default.
             if (_sType == null)
@@ -342,10 +342,10 @@ public class GraphicalTestArguments
             }
         }
     public void setTargetFrameName(String _sTargetFrameName) {m_sTargetFrameName = _sTargetFrameName;}
-    public void setPrinterName(String _sName) {m_sPrinterName = _sName;}
+    private void setPrinterName(String _sName) {m_sPrinterName = _sName;}
     private void setHidden() { m_bHidden = true;}
     private void setViewable() {m_bHidden = false;}
-    public void setDefaultXMLFormatApp(String _sNameOfApp) {m_sDefaultXMLFormatApplication = _sNameOfApp;}
+    private void setDefaultXMLFormatApp(String _sNameOfApp) {m_sDefaultXMLFormatApplication = _sNameOfApp;}
 
     // get methods
     public XMultiServiceFactory getMultiServiceFactory()
diff --git a/qadevOOo/runner/convwatch/MSOfficePrint.java b/qadevOOo/runner/convwatch/MSOfficePrint.java
index 9ed3b4b60727..e6235bed9716 100644
--- a/qadevOOo/runner/convwatch/MSOfficePrint.java
+++ b/qadevOOo/runner/convwatch/MSOfficePrint.java
@@ -42,7 +42,7 @@ public class MSOfficePrint
 {
     private String m_sPrinterName;               // within Windows the tools need a printer name;
 
-    public void setPrinterName(String _s) {m_sPrinterName = _s;}
+    private void setPrinterName(String _s) {m_sPrinterName = _s;}
 
 
     private static boolean isWordDocument(String _sSuffix)
diff --git a/qadevOOo/runner/convwatch/PerformanceContainer.java b/qadevOOo/runner/convwatch/PerformanceContainer.java
index 0590ef37fc23..2f32bdeaeb06 100644
--- a/qadevOOo/runner/convwatch/PerformanceContainer.java
+++ b/qadevOOo/runner/convwatch/PerformanceContainer.java
@@ -26,7 +26,7 @@ public class PerformanceContainer {
     /*
       simple helper functions to start/stop a timer, to know how long a process need in milliseconds
      */
-    public long getStartTime()
+    private long getStartTime()
         {
             return System.currentTimeMillis();
         }
diff --git a/qadevOOo/runner/graphical/MSOfficePostscriptCreator.java b/qadevOOo/runner/graphical/MSOfficePostscriptCreator.java
index ba9a7ba25c64..a909651bc5f0 100644
--- a/qadevOOo/runner/graphical/MSOfficePostscriptCreator.java
+++ b/qadevOOo/runner/graphical/MSOfficePostscriptCreator.java
@@ -36,7 +36,7 @@ public class MSOfficePostscriptCreator implements IOffice
 {
     private String m_sPrinterName;               // within Windows the tools need a printer name;
 
-    public void setPrinterName(String _s)
+    private void setPrinterName(String _s)
     {
         m_sPrinterName = _s;
     }
diff --git a/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java b/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java
index dfbdfd8a648c..efba9a86cfe8 100644
--- a/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java
+++ b/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java
@@ -622,7 +622,7 @@ public class OpenOfficePostscriptCreator implements IOffice
 
 
 
-    public boolean isStoreAllowed()
+    private boolean isStoreAllowed()
         {
         return false;
         }
diff --git a/qadevOOo/runner/graphical/PerformanceContainer.java b/qadevOOo/runner/graphical/PerformanceContainer.java
index 5812f59d7f71..0ebda690f5c5 100644
--- a/qadevOOo/runner/graphical/PerformanceContainer.java
+++ b/qadevOOo/runner/graphical/PerformanceContainer.java
@@ -27,7 +27,7 @@ public class PerformanceContainer {
     /*
       simple helper functions to start/stop a timer, to know how long a process need in milliseconds
      */
-    public long getStartTime()
+    private long getStartTime()
         {
             return System.currentTimeMillis();
         }
diff --git a/qadevOOo/runner/helper/ComplexDescGetter.java b/qadevOOo/runner/helper/ComplexDescGetter.java
index 1c2099cce8d9..e92cce05d77c 100644
--- a/qadevOOo/runner/helper/ComplexDescGetter.java
+++ b/qadevOOo/runner/helper/ComplexDescGetter.java
@@ -33,7 +33,7 @@ import complexlib.ComplexTestCase;
 public class ComplexDescGetter extends DescGetter
 {
 
-    ComplexTest testClass;
+    private ComplexTest testClass;
 
     /** Creates new ComplexDescGetter */
     public ComplexDescGetter()
diff --git a/qadevOOo/runner/helper/ProcessHandler.java b/qadevOOo/runner/helper/ProcessHandler.java
index 332eb52f5a83..9e0b352e55eb 100644
--- a/qadevOOo/runner/helper/ProcessHandler.java
+++ b/qadevOOo/runner/helper/ProcessHandler.java
@@ -729,7 +729,7 @@ public class ProcessHandler
      * @return <code>true</code> if the external command was
      * found and successfully started.
      */
-    public boolean isStarted()
+    private boolean isStarted()
     {
         return isStarted;
     }
@@ -741,7 +741,7 @@ public class ProcessHandler
      * @return <code>true</code> if the command correctly starts,
      * exits and was not interrupted due to timeout.
      */
-    public boolean isFinished()
+    private boolean isFinished()
     {
         return isFinished;
     }
diff --git a/qadevOOo/runner/lib/MultiMethodTest.java b/qadevOOo/runner/lib/MultiMethodTest.java
index c1f0b308f07b..aabd919054e3 100644
--- a/qadevOOo/runner/lib/MultiMethodTest.java
+++ b/qadevOOo/runner/lib/MultiMethodTest.java
@@ -290,7 +290,7 @@ public class MultiMethodTest
      * @param methName the method name to set status
      * @param methStatus the status to set to the method
      */
-    protected void setStatus(String methName, Status methStatus)
+    private void setStatus(String methName, Status methStatus)
     {
         tRes.tested(methName, methStatus);
     }
@@ -298,7 +298,7 @@ public class MultiMethodTest
     /**
      * sets the substates
      */
-    protected void setSubStates(String msg)
+    private void setSubStates(String msg)
     {
         for (int k = 0; k < entry.SubEntryCount; k++)
         {
@@ -332,7 +332,7 @@ public class MultiMethodTest
     /**
      * Checks if the <code>method</code> test has been already called.
      */
-    protected boolean isCalled(String method)
+    private boolean isCalled(String method)
     {
         return methCalled.contains(method);
     }
@@ -373,7 +373,7 @@ public class MultiMethodTest
     /**
      * Just calls the <code>method</code> test.
      */
-    protected void callMethod(String method)
+    private void callMethod(String method)
     {
         methCalled.add(method);
         invokeTestMethod(getMethodFor(method), method);
@@ -440,7 +440,7 @@ public class MultiMethodTest
      *
      * @return the testing method, if found, <tt>null</tt> otherwise
      */
-    protected Method getMethodFor(String method)
+    private Method getMethodFor(String method)
     {
         String mName = "_" + method;
 
diff --git a/qadevOOo/runner/lib/TestParameters.java b/qadevOOo/runner/lib/TestParameters.java
index 1ca6a5c5b638..57501c140c06 100644
--- a/qadevOOo/runner/lib/TestParameters.java
+++ b/qadevOOo/runner/lib/TestParameters.java
@@ -199,7 +199,7 @@ public class TestParameters extends HashMap<String,Object> {
      * to OOo rules.
      * @return A valid OS name, or "" if the name is not known.
      */
-    String getSOCompatibleOSName() {
+    private String getSOCompatibleOSName() {
         String osname = System.getProperty ("os.name").toLowerCase ();
         String osarch = System.getProperty ("os.arch");
         String operatingSystem = "";
diff --git a/qadevOOo/runner/lib/TestResult.java b/qadevOOo/runner/lib/TestResult.java
index a6c964f258ee..eb7a469cdc99 100644
--- a/qadevOOo/runner/lib/TestResult.java
+++ b/qadevOOo/runner/lib/TestResult.java
@@ -27,7 +27,7 @@ public class TestResult {
     /**
      * Contains methods having been tested and their results.
      */
-    protected HashMap<String, Status> testedMethods = new HashMap<String, Status>();
+    private HashMap<String, Status> testedMethods = new HashMap<String, Status>();
 
     /**
      * The method makes method tested with the result, i.e. it adds to its
diff --git a/qadevOOo/testdocs/backend/org/openoffice/JavaSystemBackend.java b/qadevOOo/testdocs/backend/org/openoffice/JavaSystemBackend.java
index 91aa80848c6b..ab739aeb3595 100644
--- a/qadevOOo/testdocs/backend/org/openoffice/JavaSystemBackend.java
+++ b/qadevOOo/testdocs/backend/org/openoffice/JavaSystemBackend.java
@@ -198,7 +198,7 @@ public class JavaSystemBackend implements XSingleLayerStratum, XTypeProvider,
     public void removeEventListener(com.sun.star.lang.XEventListener xEventListener) {
     }
 
-    protected class CommonLayer implements XLayer, XTimeStamped {
+    private class CommonLayer implements XLayer, XTimeStamped {
         public void readData(XLayerHandler xLayerHandler)
                       throws com.sun.star.lang.NullPointerException,
                              com.sun.star.lang.WrappedTargetException,
diff --git a/qadevOOo/testdocs/qadevlibs/source/test/Job.java b/qadevOOo/testdocs/qadevlibs/source/test/Job.java
index 950eee89cfbc..c2aae762bddd 100644
--- a/qadevOOo/testdocs/qadevlibs/source/test/Job.java
+++ b/qadevOOo/testdocs/qadevlibs/source/test/Job.java
@@ -31,13 +31,13 @@ import com.sun.star.comp.loader.FactoryHelper;
 
 public class Job {
 
-    static public class _Implementation implements XServiceInfo, XTypeProvider,
+    static private class _Implementation implements XServiceInfo, XTypeProvider,
             XJob, XNamed {
     static private final String __serviceName = "test.Job";
         Object oDoc = null;
         String actionType = null;
         String actionParm = null;
-        XMultiServiceFactory oMSF = null;
+        private XMultiServiceFactory oMSF = null;
 
 
     public _Implementation(XMultiServiceFactory xMSF) {
@@ -57,7 +57,7 @@ public class Job {
         return new String[] {__serviceName};
     }
 
-        public static int executed = 0;
+        private static int executed = 0;
         public Object execute(NamedValue[] args) {
             executed++;
 
diff --git a/qadevOOo/tests/java/mod/_dbaccess/ORowSet.java b/qadevOOo/tests/java/mod/_dbaccess/ORowSet.java
index 5a6d42c972b5..fe3b94bc3a41 100644
--- a/qadevOOo/tests/java/mod/_dbaccess/ORowSet.java
+++ b/qadevOOo/tests/java/mod/_dbaccess/ORowSet.java
@@ -567,7 +567,7 @@ public class ORowSet extends TestCase {
      * for the XCompletedExecution test
      * @see ifc.sdb._XCompletedExecution
      */
-    public class InteractionHandlerImpl implements _XCompletedExecution.CheckInteractionHandler {
+    private class InteractionHandlerImpl implements _XCompletedExecution.CheckInteractionHandler {
         private boolean handlerWasUsed = false;
         private PrintWriter log = new PrintWriter(System.out);
 
diff --git a/qadevOOo/tests/java/mod/_forms/GenericModelTest.java b/qadevOOo/tests/java/mod/_forms/GenericModelTest.java
index ed7ba409d2ed..0a0f7b3c4233 100644
--- a/qadevOOo/tests/java/mod/_forms/GenericModelTest.java
+++ b/qadevOOo/tests/java/mod/_forms/GenericModelTest.java
@@ -493,12 +493,12 @@ public class GenericModelTest extends TestCase {
     } // finish method getTestEnvironment
 
 
-    static class Checker implements ifc.form._XUpdateBroadcaster.UpdateChecker {
+    private static class Checker implements ifc.form._XUpdateBroadcaster.UpdateChecker {
             private Object lastValue = null;
-            XLoadable formLoaderF = null;
-            XPropertySet ps = null;
-            XInterface ctrl = null;
-            String ChangePropertyName = null;
+            private XLoadable formLoaderF = null;
+            private XPropertySet ps = null;
+            private XInterface ctrl = null;
+            private String ChangePropertyName = null;
             Object ChangePropertyValue = null;
 
             public Checker(XLoadable xl, XPropertySet ps, XInterface ctrl, String ChangePropertyName, Object ChangePropertyValue) {
diff --git a/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java b/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java
index 8a1b43c88f56..72755f0cc449 100644
--- a/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java
+++ b/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java
@@ -783,9 +783,9 @@ public class ODatabaseForm extends TestCase {
      * for the XDatabaseParameterBroadcaster test
      * @see ifc.form._XDatabaseParameterBroadcaster
      */
-    public class ParameterListenerImpl implements _XDatabaseParameterBroadcaster.CheckParameterListener {
-        boolean listenerWasCalled = false;
-        PrintWriter log = new PrintWriter(System.out);
+    private class ParameterListenerImpl implements _XDatabaseParameterBroadcaster.CheckParameterListener {
+        private boolean listenerWasCalled = false;
+        private PrintWriter log = new PrintWriter(System.out);
 
         /**
          * Return true, if the listener was called, false otherwise.
@@ -845,7 +845,7 @@ public class ODatabaseForm extends TestCase {
      * for the XCompletedExecution test
      * @see ifc.sdb._XCompletedExecution
      */
-    public class InteractionHandlerImpl implements _XCompletedExecution.CheckInteractionHandler {
+    private class InteractionHandlerImpl implements _XCompletedExecution.CheckInteractionHandler {
         private boolean handlerWasUsed = false;
         private PrintWriter log = new PrintWriter(System.out);
 
diff --git a/qadevOOo/tests/java/mod/_forms/OListBoxModel.java b/qadevOOo/tests/java/mod/_forms/OListBoxModel.java
index c5d61c79f4ad..69db57197b1e 100644
--- a/qadevOOo/tests/java/mod/_forms/OListBoxModel.java
+++ b/qadevOOo/tests/java/mod/_forms/OListBoxModel.java
@@ -183,12 +183,12 @@ public class OListBoxModel extends GenericModelTest {
         return tEnv;
     }
 
-    static class Checker implements UpdateChecker {
+    private static class Checker implements UpdateChecker {
             private short lastItem = (short) 0;
-            XLoadable formLoaderF = null;
-            XPropertySet ps = null;
-            XInterface ctrl = null;
-            String ChangePropertyName = null;
+            private XLoadable formLoaderF = null;
+            private XPropertySet ps = null;
+            private XInterface ctrl = null;
+            private String ChangePropertyName = null;
             Object ChangePropertyValue = null;
 
             public Checker(XLoadable xl, XPropertySet ps, XInterface ctrl, String ChangePropertyName, Object ChangePropertyValue) {
diff --git a/qadevOOo/tests/java/mod/_forms/OTimeModel.java b/qadevOOo/tests/java/mod/_forms/OTimeModel.java
index e2caa810892c..4e1525bed3fd 100644
--- a/qadevOOo/tests/java/mod/_forms/OTimeModel.java
+++ b/qadevOOo/tests/java/mod/_forms/OTimeModel.java
@@ -176,11 +176,11 @@ public class OTimeModel extends GenericModelTest {
         return tEnv;
     }
 
-    static class Checker implements UpdateChecker {
-            XLoadable formLoaderF = null;
-            XPropertySet ps = null;
-            XInterface ctrl = null;
-            String ChangePropertyName = null;
+    private static class Checker implements UpdateChecker {
+            private XLoadable formLoaderF = null;
+            private XPropertySet ps = null;
+            private XInterface ctrl = null;
+            private String ChangePropertyName = null;
             Object ChangePropertyValue = null;
 
             public Checker(XLoadable xl, XPropertySet ps, XInterface ctrl, String ChangePropertyName, Object ChangePropertyValue) {
diff --git a/qadevOOo/tests/java/mod/_fwk/JobExecutor.java b/qadevOOo/tests/java/mod/_fwk/JobExecutor.java
index 8cf372db98c2..8816fe136ea6 100644
--- a/qadevOOo/tests/java/mod/_fwk/JobExecutor.java
+++ b/qadevOOo/tests/java/mod/_fwk/JobExecutor.java
@@ -273,8 +273,8 @@ class Job implements
         }
     }
 
-    public static final String __serviceName = "test.Job";
-    static Impl impl = new Impl();
+    private static final String __serviceName = "test.Job";
+    private static Impl impl = new Impl();
 
     public Object createInstanceWithArguments(Object[] args) {
     return impl;
diff --git a/qadevOOo/tests/java/mod/_fwk/ModuleUIConfigurationManager.java b/qadevOOo/tests/java/mod/_fwk/ModuleUIConfigurationManager.java
index e572e3dfa953..13dd31170d42 100644
--- a/qadevOOo/tests/java/mod/_fwk/ModuleUIConfigurationManager.java
+++ b/qadevOOo/tests/java/mod/_fwk/ModuleUIConfigurationManager.java
@@ -122,13 +122,13 @@ public class ModuleUIConfigurationManager extends TestCase {
      * interface to trigger the event for a listener call.
      * @see ifc.ui._XUIConfiguration
      */
-    public static class ConfigurationListener implements _XUIConfiguration.XUIConfigurationListenerImpl {
+    private static class ConfigurationListener implements _XUIConfiguration.XUIConfigurationListenerImpl {
         private boolean triggered = false;
         private final PrintWriter log;
         private final XUIConfigurationManager xUIManager;
         private final XMultiServiceFactory xMSF;
 
-        public ConfigurationListener(PrintWriter _log, XUIConfigurationManager xUIManager, XMultiServiceFactory xMSF) {
+        private ConfigurationListener(PrintWriter _log, XUIConfigurationManager xUIManager, XMultiServiceFactory xMSF) {
             log = _log;
             this.xUIManager = xUIManager;
             this.xMSF = xMSF;
diff --git a/qadevOOo/tests/java/mod/_fwk/UIConfigurationManager.java b/qadevOOo/tests/java/mod/_fwk/UIConfigurationManager.java
index 75d78cdc71be..d32fb8d237d8 100644
--- a/qadevOOo/tests/java/mod/_fwk/UIConfigurationManager.java
+++ b/qadevOOo/tests/java/mod/_fwk/UIConfigurationManager.java
@@ -114,14 +114,14 @@ public class UIConfigurationManager extends TestCase {
      * interface to trigger the event for a listener call.
      * @see ifc.ui._XUIConfiguration
      */
-    public static class ConfigurationListener implements _XUIConfiguration.XUIConfigurationListenerImpl {
+    private static class ConfigurationListener implements _XUIConfiguration.XUIConfigurationListenerImpl {
         private boolean triggered = false;
         private final PrintWriter log;
         private final XUIConfigurationManager xUIManager;
         private final XMultiServiceFactory xMSF;
         private static int iUniqueCounter;
 
-        public ConfigurationListener(PrintWriter _log, XUIConfigurationManager xUIManager, XMultiServiceFactory xMSF) {
+        private ConfigurationListener(PrintWriter _log, XUIConfigurationManager xUIManager, XMultiServiceFactory xMSF) {
             log = _log;
             this.xUIManager = xUIManager;
             this.xMSF = xMSF;
diff --git a/qadevOOo/tests/java/mod/_remotebridge/uno/various.java b/qadevOOo/tests/java/mod/_remotebridge/uno/various.java
index 7c132745cd9d..d23af9a14174 100644
--- a/qadevOOo/tests/java/mod/_remotebridge/uno/various.java
+++ b/qadevOOo/tests/java/mod/_remotebridge/uno/various.java
@@ -80,7 +80,7 @@ public class various extends TestCase {
      *
      * @see com.sun.star.bridge.XInstanceProvider
      */
-    protected class MyInstanceProvider implements XInstanceProvider {
+    private class MyInstanceProvider implements XInstanceProvider {
         /**
          * a MultiServiceFactory for creating instances
          *
@@ -93,7 +93,7 @@ public class various extends TestCase {
          *
          * @see com.sun.star.lang.MultiServiceFactory
          */
-        public MyInstanceProvider(XMultiServiceFactory xMSF) {
+        private MyInstanceProvider(XMultiServiceFactory xMSF) {
             this.xMSF = xMSF;
         }
 
@@ -118,25 +118,25 @@ public class various extends TestCase {
     * Then stores exception thrown by call if it occurred, or
     * return value.
     */
-    protected class AcceptorThread extends Thread {
+    private class AcceptorThread extends Thread {
         /**
         * If exception occurred during method call it is
         * stored in this field.
         */
-        public Exception ex = null ;
+        private Exception ex = null ;
         private final XAcceptor acc;
         private final XInstanceProvider xInstProv;
         private final XBridgeFactory xBrdgFctr;
         /**
         * If method call returns some value it stores in this field.
         */
-        public XConnection acceptedCall = null ;
+        private XConnection acceptedCall = null ;
 
         /**
         * Creates object which can call <code>accept</code> method
         * of the Acceptor object specified.
         */
-        public AcceptorThread(XAcceptor acc, XInstanceProvider xInstProv,
+        private AcceptorThread(XAcceptor acc, XInstanceProvider xInstProv,
                 XBridgeFactory xBrdgFctr) {
             this.acc = acc ;
             this.xInstProv = xInstProv;
diff --git a/qadevOOo/tests/java/mod/_remotebridge/various.java b/qadevOOo/tests/java/mod/_remotebridge/various.java
index 0bd2b95e7107..a00f98f16582 100644
--- a/qadevOOo/tests/java/mod/_remotebridge/various.java
+++ b/qadevOOo/tests/java/mod/_remotebridge/various.java
@@ -81,7 +81,7 @@ public class various extends TestCase {
      *
      * @see com.sun.star.bridge.XInstanceProvider
      */
-    protected class MyInstanceProvider implements XInstanceProvider {
+    private class MyInstanceProvider implements XInstanceProvider {
         /**
          * a MultiServiceFactory for creating instances
          *
@@ -94,7 +94,7 @@ public class various extends TestCase {
          *
          * @see com.sun.star.lang.MultiServiceFactory
          */
-        public MyInstanceProvider(XMultiServiceFactory xMSF) {
+        private MyInstanceProvider(XMultiServiceFactory xMSF) {
             this.xMSF = xMSF;
         }
 
@@ -119,23 +119,23 @@ public class various extends TestCase {
     * Then stores exception thrown by call if it occurred, or
     * return value.
     */
-    protected class AcceptorThread extends Thread {
+    private class AcceptorThread extends Thread {
         /**
         * If exception occurred during method call it is
         * stored in this field.
         */
-        public Exception ex = null ;
+        private Exception ex = null ;
         private final XAcceptor acc;
         /**
         * If method call returns some value it stores in this field.
         */
-        public XConnection acceptedCall = null ;
+        private XConnection acceptedCall = null ;
 
         /**
         * Creates object which can call <code>accept</code> method
         * of the Acceptor object specified.
         */
-        public AcceptorThread(XAcceptor acc) {
+        private AcceptorThread(XAcceptor acc) {
             this.acc = acc ;
         }
 
diff --git a/qadevOOo/tests/java/mod/_sc/AccessibleEditableTextPara_HeaderFooter.java b/qadevOOo/tests/java/mod/_sc/AccessibleEditableTextPara_HeaderFooter.java
index 97efd9ed1a2c..01a80ea65460 100644
--- a/qadevOOo/tests/java/mod/_sc/AccessibleEditableTextPara_HeaderFooter.java
+++ b/qadevOOo/tests/java/mod/_sc/AccessibleEditableTextPara_HeaderFooter.java
@@ -167,11 +167,11 @@ public class AccessibleEditableTextPara_HeaderFooter extends TestCase {
     /**
      * Thread for opening modal dialog 'Print Settings'.
      */
-    public class DiagThread extends Thread {
-        public XComponent xCalcDoc = null;
-        public XMultiServiceFactory msf = null;
+    private class DiagThread extends Thread {
+        private XComponent xCalcDoc = null;
+        private XMultiServiceFactory msf = null;
 
-        public DiagThread(XComponent xCalcDoc, XMultiServiceFactory msf) {
+        private DiagThread(XComponent xCalcDoc, XMultiServiceFactory msf) {
             this.xCalcDoc = xCalcDoc;
             this.msf = msf;
         }
diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvCell.java b/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvCell.java
index 13f53b277378..bd525d7f0961 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvCell.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvCell.java
@@ -168,13 +168,13 @@ public class ScAccessibleCsvCell extends TestCase {
         }
     }
 
-    public class loadThread extends Thread {
+    private class loadThread extends Thread {
 
         private final SOfficeFactory SOF;
         private final PropertyValue[] args;
         public XComponent xSpreadSheedDoc = null;
 
-        public loadThread(SOfficeFactory SOF, PropertyValue[] Args) {
+        private loadThread(SOfficeFactory SOF, PropertyValue[] Args) {
             this.SOF = SOF;
             this.args = Args;
         }
diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvGrid.java b/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvGrid.java
index 1237e9817f11..8d6687cf01dd 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvGrid.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvGrid.java
@@ -154,13 +154,13 @@ public class ScAccessibleCsvGrid extends TestCase {
         }
     }
 
-    public class loadThread extends Thread {
+    private class loadThread extends Thread {
 
         private final SOfficeFactory SOF;
         private final PropertyValue[] args;
         public XComponent xSpreadSheedDoc = null;
 
-        public loadThread(SOfficeFactory SOF, PropertyValue[] Args) {
+        private loadThread(SOfficeFactory SOF, PropertyValue[] Args) {
             this.SOF = SOF;
             this.args = Args;
         }
diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvRuler.java b/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvRuler.java
index 45c3f9e4e16e..549c8cb4985c 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvRuler.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvRuler.java
@@ -189,13 +189,13 @@ public class ScAccessibleCsvRuler extends TestCase {
         }
     }
 
-    public class loadThread extends Thread {
+    private class loadThread extends Thread {
 
         private final SOfficeFactory SOF;
         private final PropertyValue[] args;
         public XComponent xSpreadSheedDoc = null;
 
-        public loadThread(SOfficeFactory SOF, PropertyValue[] Args) {
+        private loadThread(SOfficeFactory SOF, PropertyValue[] Args) {
             this.SOF = SOF;
             this.args = Args;
         }
diff --git a/qadevOOo/tests/java/mod/_sc/XMLContentExporter.java b/qadevOOo/tests/java/mod/_sc/XMLContentExporter.java
index 5d2979d2a8d6..aed4929d9233 100644
--- a/qadevOOo/tests/java/mod/_sc/XMLContentExporter.java
+++ b/qadevOOo/tests/java/mod/_sc/XMLContentExporter.java
@@ -182,14 +182,14 @@ public class XMLContentExporter extends TestCase {
      * to log specified.
      * @see ifc.document._XFilter
      */
-    protected class ContentFilterChecker extends XMLTools.XMLTagsChecker
+    private class ContentFilterChecker extends XMLTools.XMLTagsChecker
       implements ifc.document._XFilter.FilterChecker {
 
         /**
          * Creates a class which will write information
          * into log specified.
          */
-        public ContentFilterChecker(PrintWriter log) {
+        private ContentFilterChecker(PrintWriter log) {
             super(log) ;
         }
 
diff --git a/qadevOOo/tests/java/mod/_sc/XMLExporter.java b/qadevOOo/tests/java/mod/_sc/XMLExporter.java
index d8b9b329e21f..cfc85e4e0719 100644
--- a/qadevOOo/tests/java/mod/_sc/XMLExporter.java
+++ b/qadevOOo/tests/java/mod/_sc/XMLExporter.java
@@ -190,14 +190,14 @@ public class XMLExporter extends TestCase {
      * to log specified.
      * @see ifc.document._XFilter
      */
-    protected class FilterChecker extends XMLTools.XMLChecker
+    private class FilterChecker extends XMLTools.XMLChecker
         implements ifc.document._XFilter.FilterChecker {
 
         /**
          * Creates a class which will write information
          * into log specified.
          */
-        public FilterChecker(PrintWriter log) {
+        private FilterChecker(PrintWriter log) {
             super(log, false) ;
         }
         /**
diff --git a/qadevOOo/tests/java/mod/_sc/XMLMetaExporter.java b/qadevOOo/tests/java/mod/_sc/XMLMetaExporter.java
index f2e9e88a6176..6446afde67d0 100644
--- a/qadevOOo/tests/java/mod/_sc/XMLMetaExporter.java
+++ b/qadevOOo/tests/java/mod/_sc/XMLMetaExporter.java
@@ -172,14 +172,14 @@ public class XMLMetaExporter extends TestCase {
      * to log specified.
      * @see ifc.document._XFilter
      */
-    protected class FilterChecker extends XMLTools.XMLChecker
+    private class FilterChecker extends XMLTools.XMLChecker
         implements ifc.document._XFilter.FilterChecker {
 
         /**
          * Creates a class which will write information
          * into log specified.
          */
-        public FilterChecker(PrintWriter log) {
+        private FilterChecker(PrintWriter log) {
             super(log,false) ;
         }
         /**
diff --git a/qadevOOo/tests/java/mod/_sc/XMLSettingsExporter.java b/qadevOOo/tests/java/mod/_sc/XMLSettingsExporter.java
index f2b80392ed16..287049d7e3bb 100644
--- a/qadevOOo/tests/java/mod/_sc/XMLSettingsExporter.java
+++ b/qadevOOo/tests/java/mod/_sc/XMLSettingsExporter.java
@@ -173,14 +173,14 @@ public class XMLSettingsExporter extends TestCase {
      * to log specified.
      * @see ifc.document._XFilter
      */
-    protected class SettingsFilterChecker extends XMLTools.XMLChecker
+    private class SettingsFilterChecker extends XMLTools.XMLChecker
       implements ifc.document._XFilter.FilterChecker {
 
         /**
          * Creates a class which will write information
          * into log specified.
          */
-        public SettingsFilterChecker(PrintWriter log) {
+        private SettingsFilterChecker(PrintWriter log) {
             super(log, false) ;
         }
         /**
diff --git a/qadevOOo/tests/java/mod/_sc/XMLStylesExporter.java b/qadevOOo/tests/java/mod/_sc/XMLStylesExporter.java
index d105a475fa4b..24c2dcde9cba 100644
--- a/qadevOOo/tests/java/mod/_sc/XMLStylesExporter.java
+++ b/qadevOOo/tests/java/mod/_sc/XMLStylesExporter.java
@@ -177,14 +177,14 @@ public class XMLStylesExporter extends TestCase {
      * to log specified.
      * @see ifc.document._XFilter
      */
-    protected class FilterChecker extends XMLTools.XMLChecker
+    private class FilterChecker extends XMLTools.XMLChecker
         implements ifc.document._XFilter.FilterChecker {
 
         /**
          * Creates a class which will write information
          * into log specified.
          */
-        public FilterChecker(PrintWriter log) {
+        private FilterChecker(PrintWriter log) {
             super(log,false) ;
         }
         /**
diff --git a/qadevOOo/tests/java/mod/_sm/XMLExporter.java b/qadevOOo/tests/java/mod/_sm/XMLExporter.java
index d44f26f57906..05a406dcd920 100644
--- a/qadevOOo/tests/java/mod/_sm/XMLExporter.java
+++ b/qadevOOo/tests/java/mod/_sm/XMLExporter.java
@@ -165,14 +165,14 @@ public class XMLExporter extends TestCase {
      * to log specified.
      * @see ifc.document._XFilter
      */
-    protected class FilterChecker extends XMLTools.XMLChecker
+    private class FilterChecker extends XMLTools.XMLChecker
         implements ifc.document._XFilter.FilterChecker {
 
         /**
          * Creates a class which will write information
          * into log specified.
          */
-        public FilterChecker(PrintWriter log) {
+        private FilterChecker(PrintWriter log) {
             super(log, true) ;
         }
         /**
diff --git a/qadevOOo/tests/java/mod/_sm/XMLMetaExporter.java b/qadevOOo/tests/java/mod/_sm/XMLMetaExporter.java
index 0a2e7d431f6d..7f360330fe90 100644
--- a/qadevOOo/tests/java/mod/_sm/XMLMetaExporter.java
+++ b/qadevOOo/tests/java/mod/_sm/XMLMetaExporter.java
@@ -168,14 +168,14 @@ public class XMLMetaExporter extends TestCase {
      * to log specified.
      * @see ifc.document._XFilter
      */
-    protected class FilterChecker extends XMLTools.XMLChecker
+    private class FilterChecker extends XMLTools.XMLChecker
         implements ifc.document._XFilter.FilterChecker {
 
         /**
          * Creates a class which will write information
          * into log specified.
          */
-        public FilterChecker(PrintWriter log) {
+        private FilterChecker(PrintWriter log) {
             super(log, true) ;
         }
         /**
diff --git a/qadevOOo/tests/java/mod/_sm/XMLSettingsExporter.java b/qadevOOo/tests/java/mod/_sm/XMLSettingsExporter.java
index 501e2b82d873..f18762960b72 100644
--- a/qadevOOo/tests/java/mod/_sm/XMLSettingsExporter.java
+++ b/qadevOOo/tests/java/mod/_sm/XMLSettingsExporter.java
@@ -166,14 +166,14 @@ public class XMLSettingsExporter extends TestCase {
      * to log specified.
      * @see ifc.document._XFilter
      */
-    protected class FilterChecker extends XMLTools.XMLChecker
+    private class FilterChecker extends XMLTools.XMLChecker
         implements ifc.document._XFilter.FilterChecker {
 
         /**
          * Creates a class which will write information
          * into log specified.
          */
-        public FilterChecker(PrintWriter log) {
+        private FilterChecker(PrintWriter log) {
             super(log, true) ;
         }
         /**
diff --git a/qadevOOo/tests/java/mod/_sw/XMLContentExporter.java b/qadevOOo/tests/java/mod/_sw/XMLContentExporter.java
index 901249737d1c..3ada74f5fe89 100644
--- a/qadevOOo/tests/java/mod/_sw/XMLContentExporter.java
+++ b/qadevOOo/tests/java/mod/_sw/XMLContentExporter.java
@@ -164,14 +164,14 @@ public class XMLContentExporter extends TestCase {
      * to log specified.
      * @see ifc.document._XFilter
      */
-    protected class ContentFilterChecker extends XMLTools.XMLTagsChecker
+    private class ContentFilterChecker extends XMLTools.XMLTagsChecker
         implements ifc.document._XFilter.FilterChecker {
 
         /**
          * Creates a class which will write information
          * into log specified.
          */
-        public ContentFilterChecker(PrintWriter log) {
+        private ContentFilterChecker(PrintWriter log) {
             super(log) ;
         }
 
diff --git a/qadevOOo/tests/java/mod/_sw/XMLExporter.java b/qadevOOo/tests/java/mod/_sw/XMLExporter.java
index 967389feaa71..f3c8d43c2101 100644
--- a/qadevOOo/tests/java/mod/_sw/XMLExporter.java
+++ b/qadevOOo/tests/java/mod/_sw/XMLExporter.java
@@ -168,14 +168,14 @@ public class XMLExporter extends TestCase {
      * to log specified.
      * @see ifc.document._XFilter
      */
-    protected class FilterChecker extends XMLTools.XMLTagsChecker
+    private class FilterChecker extends XMLTools.XMLTagsChecker
         implements ifc.document._XFilter.FilterChecker {
 
         /**
          * Creates a class which will write information
          * into log specified.
          */
-        public FilterChecker(PrintWriter log) {
+        private FilterChecker(PrintWriter log) {
             super(log) ;
         }
         /**
diff --git a/qadevOOo/tests/java/mod/_sw/XMLMetaExporter.java b/qadevOOo/tests/java/mod/_sw/XMLMetaExporter.java
index 3bc515977f49..c8553ab72bfb 100644
--- a/qadevOOo/tests/java/mod/_sw/XMLMetaExporter.java
+++ b/qadevOOo/tests/java/mod/_sw/XMLMetaExporter.java
@@ -165,14 +165,14 @@ public class XMLMetaExporter extends TestCase {
      * to log specified.
      * @see ifc.document._XFilter
      */
-    protected class MetaFilterChecker extends XMLTools.XMLTagsChecker
+    private class MetaFilterChecker extends XMLTools.XMLTagsChecker
       implements ifc.document._XFilter.FilterChecker {
 
         /**
          * Creates a class which will write information
          * into log specified.
          */
-        public MetaFilterChecker(PrintWriter log) {
+        private MetaFilterChecker(PrintWriter log) {
             super(log) ;
         }
 
diff --git a/qadevOOo/tests/java/mod/_sw/XMLSettingsExporter.java b/qadevOOo/tests/java/mod/_sw/XMLSettingsExporter.java
index d0943ae08160..7b408a5276a7 100644
--- a/qadevOOo/tests/java/mod/_sw/XMLSettingsExporter.java
+++ b/qadevOOo/tests/java/mod/_sw/XMLSettingsExporter.java
@@ -176,14 +176,14 @@ public class XMLSettingsExporter extends TestCase {
      * to log specified.
      * @see ifc.document._XFilter
      */
-    protected class SettingsFilterChecker extends XMLTools.XMLChecker
+    private class SettingsFilterChecker extends XMLTools.XMLChecker
       implements ifc.document._XFilter.FilterChecker {
 
         /**
          * Creates a class which will write information
          * into log specified.
          */
-        public SettingsFilterChecker(PrintWriter log) {
+        private SettingsFilterChecker(PrintWriter log) {
             super(log, false) ;
         }
 
diff --git a/qadevOOo/tests/java/mod/_sw/XMLStylesExporter.java b/qadevOOo/tests/java/mod/_sw/XMLStylesExporter.java
index 9196d13e026c..7fb992152743 100644
--- a/qadevOOo/tests/java/mod/_sw/XMLStylesExporter.java
+++ b/qadevOOo/tests/java/mod/_sw/XMLStylesExporter.java
@@ -170,14 +170,14 @@ public class XMLStylesExporter extends TestCase {
      * to log specified.
      * @see ifc.document._XFilter
      */
-    protected class FilterChecker extends XMLTools.XMLChecker
+    private class FilterChecker extends XMLTools.XMLChecker
         implements ifc.document._XFilter.FilterChecker {
 
         /**
          * Creates a class which will write information
          * into log specified.
          */
-        public FilterChecker(PrintWriter log) {
+        private FilterChecker(PrintWriter log) {
             super(log,false) ;
         }
 
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleButton.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleButton.java
index 07340ad82f3c..2a0e703a1498 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleButton.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleButton.java
@@ -192,11 +192,11 @@ public class AccessibleButton extends lib.TestCase {
     /**
      * Thread for opening modal dialog 'Print Settings'.
      */
-    public class DiagThread extends Thread {
-        public XTextDocument xTextDoc = null;
-        public XMultiServiceFactory msf = null;
+    private class DiagThread extends Thread {
+        private XTextDocument xTextDoc = null;
+        private XMultiServiceFactory msf = null;
 
-        public DiagThread(XTextDocument xTextDoc, XMultiServiceFactory msf) {
+        private DiagThread(XTextDocument xTextDoc, XMultiServiceFactory msf) {
             this.xTextDoc = xTextDoc;
             this.msf = msf;
         }
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleCheckBox.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleCheckBox.java
index 6c90c96f0c93..25fa9a7798d3 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleCheckBox.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleCheckBox.java
@@ -208,11 +208,11 @@ public class AccessibleCheckBox extends TestCase {
     /**
      * Thread for opening modal dialog 'Insert Table'.
      */
-    public class DiagThread extends Thread {
-        public XTextDocument xTextDoc = null;
-        public XMultiServiceFactory msf = null;
+    private class DiagThread extends Thread {
+        private XTextDocument xTextDoc = null;
+        private XMultiServiceFactory msf = null;
 
-        public DiagThread(XTextDocument xTextDoc, XMultiServiceFactory msf) {
+        private DiagThread(XTextDocument xTextDoc, XMultiServiceFactory msf) {
             this.xTextDoc = xTextDoc;
             this.msf = msf;
         }
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleComboBox.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleComboBox.java
index 527770386fe2..0174c0094b1d 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleComboBox.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleComboBox.java
@@ -193,11 +193,11 @@ public class AccessibleComboBox extends TestCase {
     /**
      * Thread for opening modal dialog 'Character style'.
      */
-    public class DiagThread extends Thread {
-        public XTextDocument xTextDoc = null;
-        public XMultiServiceFactory msf = null;
+    private class DiagThread extends Thread {
+        private XTextDocument xTextDoc = null;
+        private XMultiServiceFactory msf = null;
 
-        public DiagThread(XTextDocument xTextDoc, XMultiServiceFactory msf) {
+        private DiagThread(XTextDocument xTextDoc, XMultiServiceFactory msf) {
             this.xTextDoc = xTextDoc;
             this.msf = msf;
         }
diff --git a/qadevOOo/tests/java/mod/_toolkit/MutableTreeDataModel.java b/qadevOOo/tests/java/mod/_toolkit/MutableTreeDataModel.java
index aaa9f987a781..5a403d252550 100644
--- a/qadevOOo/tests/java/mod/_toolkit/MutableTreeDataModel.java
+++ b/qadevOOo/tests/java/mod/_toolkit/MutableTreeDataModel.java
@@ -80,7 +80,7 @@ public class MutableTreeDataModel extends TestCase {
         return tEnv;
     } // finish method getTestEnvironment
 
-    public class XTreeDataModelListenerEvent implements ifc.awt.tree._XTreeDataModel.XTreeDataModelListenerEvent{
+    private class XTreeDataModelListenerEvent implements ifc.awt.tree._XTreeDataModel.XTreeDataModelListenerEvent{
 
         public void fireEvent(){
 
diff --git a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentExporter.java b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentExporter.java
index 08511618e68d..cb90ae98eee4 100644
--- a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentExporter.java
+++ b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentExporter.java
@@ -170,14 +170,14 @@ public class XMLContentExporter extends TestCase {
      * to log specified.
      * @see ifc.document._XFilter
      */
-    protected class FilterChecker extends XMLTools.XMLChecker
+    private class FilterChecker extends XMLTools.XMLChecker
         implements ifc.document._XFilter.FilterChecker {
 
         /**
          * Creates a class which will write information
          * into log specified.
          */
-        public FilterChecker(PrintWriter log) {
+        private FilterChecker(PrintWriter log) {
             super(log, true) ;
         }
         /**
diff --git a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLExporter.java b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLExporter.java
index 4ec04319ca6b..18047d2591d8 100644
--- a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLExporter.java
+++ b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLExporter.java
@@ -172,14 +172,14 @@ public class XMLExporter extends TestCase {
      * to log specified.
      * @see ifc.document._XFilter
      */
-    protected class FilterChecker extends XMLTools.XMLChecker
+    private class FilterChecker extends XMLTools.XMLChecker
         implements ifc.document._XFilter.FilterChecker {
 
         /**
          * Creates a class which will write information
          * into log specified.
          */
-        public FilterChecker(PrintWriter log) {
+        private FilterChecker(PrintWriter log) {
             super(log, true) ;
         }
         /**
diff --git a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLStylesExporter.java b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLStylesExporter.java
index f5247f3cb182..c672f1467011 100644
--- a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLStylesExporter.java
+++ b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLStylesExporter.java
@@ -160,14 +160,14 @@ public class XMLStylesExporter extends TestCase {
      * to log specified.
      * @see ifc.document._XFilter
      */
-    protected class FilterChecker extends XMLTools.XMLChecker
+    private class FilterChecker extends XMLTools.XMLChecker
         implements ifc.document._XFilter.FilterChecker {
 
         /**
          * Creates a class which will write information
          * into log specified.
          */
-        public FilterChecker(PrintWriter log) {
+        private FilterChecker(PrintWriter log) {
             super(log, true) ;
         }
         /**
diff --git a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLContentExporter.java b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLContentExporter.java
index a2009b40ffcc..2e6bd3bfca2e 100644
--- a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLContentExporter.java
+++ b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLContentExporter.java
@@ -176,14 +176,14 @@ public class XMLContentExporter extends TestCase {
      * to log specified.
      * @see ifc.document._XFilter
      */
-    protected class FilterChecker extends XMLTools.XMLChecker
+    private class FilterChecker extends XMLTools.XMLChecker
         implements ifc.document._XFilter.FilterChecker {
 
         /**
          * Creates a class which will write information
          * into log specified.
          */
-        public FilterChecker(PrintWriter log) {
+        private FilterChecker(PrintWriter log) {
             super(log,true) ;
         }
         /**
diff --git a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLExporter.java b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLExporter.java
index 022a2f6132fe..30542b4a0442 100644
--- a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLExporter.java
+++ b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLExporter.java
@@ -178,14 +178,14 @@ public class XMLExporter extends TestCase {
      * to log specified.
      * @see ifc.document._XFilter
      */
-    protected class FilterChecker extends XMLTools.XMLChecker
+    private class FilterChecker extends XMLTools.XMLChecker
         implements ifc.document._XFilter.FilterChecker {
 
         /**
          * Creates a class which will write information
          * into log specified.
          */
-        public FilterChecker(PrintWriter log) {
+        private FilterChecker(PrintWriter log) {
             super(log,true) ;
         }
         /**
diff --git a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLMetaExporter.java b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLMetaExporter.java
index a4edaa81c105..56c82e97af04 100644
--- a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLMetaExporter.java
+++ b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLMetaExporter.java
@@ -171,14 +171,14 @@ public class XMLMetaExporter extends TestCase {
      * to log specified.
      * @see ifc.document._XFilter
      */
-    protected class FilterChecker extends XMLTools.XMLChecker
+    private class FilterChecker extends XMLTools.XMLChecker
         implements ifc.document._XFilter.FilterChecker {
 
         /**
          * Creates a class which will write information
          * into log specified.
          */
-        public FilterChecker(PrintWriter log) {
+        private FilterChecker(PrintWriter log) {
             super(log, true) ;
         }
 
diff --git a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLSettingsExporter.java b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLSettingsExporter.java
index 29c2c3b398e1..34a162fe067d 100644
--- a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLSettingsExporter.java
+++ b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLSettingsExporter.java
@@ -177,14 +177,14 @@ public class XMLSettingsExporter extends TestCase {
      * to log specified.
      * @see ifc.document._XFilter
      */
-    protected class FilterChecker extends XMLTools.XMLChecker
+    private class FilterChecker extends XMLTools.XMLChecker
         implements ifc.document._XFilter.FilterChecker {
 
         /**
          * Creates a class which will write information
          * into log specified.
          */
-        public FilterChecker(PrintWriter log) {
+        private FilterChecker(PrintWriter log) {
             super(log, false) ;
         }
 
diff --git a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLStylesExporter.java b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLStylesExporter.java
index 59b3aded3543..8ecbb470895d 100644
--- a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLStylesExporter.java
+++ b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLStylesExporter.java
@@ -179,14 +179,14 @@ public class XMLStylesExporter extends TestCase {
      * to log specified.
      * @see ifc.document._XFilter
      */
-    protected class FilterChecker extends XMLTools.XMLChecker
+    private class FilterChecker extends XMLTools.XMLChecker
         implements ifc.document._XFilter.FilterChecker {
 
         /**
          * Creates a class which will write information
          * into log specified.
          */
-        public FilterChecker(PrintWriter log) {
+        private FilterChecker(PrintWriter log) {
             super(log, false) ;
         }
 
diff --git a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLContentExporter.java b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLContentExporter.java
index ae7572eb0d4b..aca41f9f42af 100644
--- a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLContentExporter.java
+++ b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLContentExporter.java
@@ -175,14 +175,14 @@ public class XMLContentExporter extends TestCase {
      * to log specified.
      * @see ifc.document._XFilter
      */
-    protected class FilterChecker extends XMLTools.XMLChecker
+    private class FilterChecker extends XMLTools.XMLChecker
         implements ifc.document._XFilter.FilterChecker {
 
         /**
          * Creates a class which will write information
          * into log specified.
          */
-        public FilterChecker(PrintWriter log) {
+        private FilterChecker(PrintWriter log) {
             super(log, true) ;
         }
         /**
diff --git a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLExporter.java b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLExporter.java
index 28c277af29c2..61b1898760ce 100644
--- a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLExporter.java
+++ b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLExporter.java
@@ -177,14 +177,14 @@ public class XMLExporter extends TestCase {
      * to log specified.
      * @see ifc.document._XFilter
      */
-    protected class FilterChecker extends XMLTools.XMLChecker
+    private class FilterChecker extends XMLTools.XMLChecker
         implements ifc.document._XFilter.FilterChecker {
 
         /**
          * Creates a class which will write information
          * into log specified.
          */
-        public FilterChecker(PrintWriter log) {
+        private FilterChecker(PrintWriter log) {
             super(log, true) ;
         }
         /**
diff --git a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLMetaExporter.java b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLMetaExporter.java
index 0d59606af15f..a9894f5f6068 100644
--- a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLMetaExporter.java
+++ b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLMetaExporter.java
@@ -173,14 +173,14 @@ public class XMLMetaExporter extends TestCase {
     * to log specified.
     * @see ifc.document._XFilter
     */
-    protected class FilterChecker extends XMLTools.XMLChecker
+    private class FilterChecker extends XMLTools.XMLChecker
             implements ifc.document._XFilter.FilterChecker {
 
         /**
         * Creates a class which will write information
         * into log specified.
         */
-        public FilterChecker(PrintWriter log) {
+        private FilterChecker(PrintWriter log) {
             super(log, true);
         }
         /**
diff --git a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLSettingsExporter.java b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLSettingsExporter.java
index 22769601cc5f..b3a5205e9000 100644
--- a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLSettingsExporter.java
+++ b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLSettingsExporter.java
@@ -176,14 +176,14 @@ public class XMLSettingsExporter extends TestCase {
     * to log specified.
     * @see ifc.document._XFilter
     */
-    protected class FilterChecker extends XMLTools.XMLChecker
+    private class FilterChecker extends XMLTools.XMLChecker
         implements ifc.document._XFilter.FilterChecker {
 
         /**
         * Creates a class which will write information
         * into log specified.
         */
-        public FilterChecker(PrintWriter log) {
+        private FilterChecker(PrintWriter log) {
             super(log,false) ;
         }
         /**
diff --git a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLStylesExporter.java b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLStylesExporter.java
index 2567b7b2230c..23f8cefed8f7 100644
--- a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLStylesExporter.java
+++ b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLStylesExporter.java
@@ -175,14 +175,14 @@ public class XMLStylesExporter extends TestCase {
      * to log specified.
      * @see ifc.document._XFilter
      */
-    protected class FilterChecker extends XMLTools.XMLChecker
+    private class FilterChecker extends XMLTools.XMLChecker
         implements ifc.document._XFilter.FilterChecker {
 
         /**
          * Creates a class which will write information
          * into log specified.
          */
-        public FilterChecker(PrintWriter log) {
+        private FilterChecker(PrintWriter log) {
             super(log, false) ;
         }
         /**