java: reduce scope, make member classes private

found by UCDetector

Change-Id: Ief32d078090102b14b60b35fc36542f8d4fb252b

64 files changed, 86 insertions, 86 deletions

diff --git a/bean/com/sun/star/beans/LocalOfficeWindow.java b/bean/com/sun/star/beans/LocalOfficeWindow.java
index 290c53e8727a..776b77404707 100644
--- a/bean/com/sun/star/beans/LocalOfficeWindow.java
+++ b/bean/com/sun/star/beans/LocalOfficeWindow.java
@@ -154,7 +154,7 @@ public class LocalOfficeWindow
 
        /// callback handler to get to know when we become visible
         //@deprecated
-       class ComponentEventHandler
+       private class ComponentEventHandler
                extends java.awt.event.ComponentAdapter
        {
         @Override
@@ -258,7 +258,7 @@ public class LocalOfficeWindow
         /** Helper class to watch calls into OOo with a timeout.
          * @deprecated
          */
-        class CallWatchThread extends Thread
+        private class CallWatchThread extends Thread
         {
                 private Thread aWatchedThread;
                 private long nTimeout;
diff --git a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
index 9fb9452d8610..b33e32edc1a9 100644
--- a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
+++ b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
@@ -727,7 +727,7 @@ public class LocalOfficeConnection
 
 
 
-    class StreamProcessor extends Thread
+    private class StreamProcessor extends Thread
     {
         private java.io.InputStream m_in;
         private java.io.PrintStream m_print;
diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java b/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java
index fd9a6b5b90bc..e71c42a9963c 100644
--- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java
+++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java
@@ -70,7 +70,7 @@ public class StorageFileAccess implements org.hsqldb.lib.FileAccess{
        }
     }
 
-    public class FileSync implements FileAccess.FileSync
+    private class FileSync implements FileAccess.FileSync
     {
         private NativeOutputStreamHelper os;
         private FileSync(NativeOutputStreamHelper _os)
diff --git a/dbaccess/qa/complex/dbaccess/CopyTableWizard.java b/dbaccess/qa/complex/dbaccess/CopyTableWizard.java
index 5bb494b025df..2539d92506df 100644
--- a/dbaccess/qa/complex/dbaccess/CopyTableWizard.java
+++ b/dbaccess/qa/complex/dbaccess/CopyTableWizard.java
@@ -89,7 +89,7 @@ public class CopyTableWizard extends CRMBasedTestCase
     }
 
 
-    class CopyThread implements Runnable
+    private class CopyThread implements Runnable
     {
 
         private final XCopyTableWizard copyWizard;
diff --git a/dbaccess/qa/complex/dbaccess/RowSet.java b/dbaccess/qa/complex/dbaccess/RowSet.java
index a506f516f6f0..683902279349 100644
--- a/dbaccess/qa/complex/dbaccess/RowSet.java
+++ b/dbaccess/qa/complex/dbaccess/RowSet.java
@@ -70,7 +70,7 @@ public class RowSet extends TestCase
     XParametersSupplier m_paramsSupplier;
 
 
-    class ResultSetMovementStress implements Runnable
+    private class ResultSetMovementStress implements Runnable
     {
 
         private XResultSet m_resultSet;
diff --git a/forms/qa/complex/forms/CheckOGroupBoxModel.java b/forms/qa/complex/forms/CheckOGroupBoxModel.java
index a1a983c47f19..c5274625e44a 100644
--- a/forms/qa/complex/forms/CheckOGroupBoxModel.java
+++ b/forms/qa/complex/forms/CheckOGroupBoxModel.java
@@ -160,7 +160,7 @@ public class CheckOGroupBoxModel
      * Listener implementation which sets a flag when
      * listener was called.
      */
-    public class MyChangeListener implements XPropertiesChangeListener
+    private class MyChangeListener implements XPropertiesChangeListener
     {
 
         private boolean propertiesChanged = false;
diff --git a/framework/qa/complex/framework/autosave/AutoSave.java b/framework/qa/complex/framework/autosave/AutoSave.java
index d82f97363125..868dd63a3d45 100644
--- a/framework/qa/complex/framework/autosave/AutoSave.java
+++ b/framework/qa/complex/framework/autosave/AutoSave.java
@@ -62,7 +62,7 @@ import static org.junit.Assert.*;
 public class AutoSave
 {
 
-    class AutoSaveListener implements XStatusListener
+    private class AutoSaveListener implements XStatusListener
     {
         private XDispatch m_xAutoSave;
         private URL m_aRegistration;
@@ -356,7 +356,7 @@ public class AutoSave
         m_aLog.log(Protocol.TYPE_SCOPE_CLOSE, "closeDoc() finished.");
     }
 
-    class DocThread extends Thread
+    private class DocThread extends Thread
     {
         DocThread()
         {}
diff --git a/framework/qa/complex/framework/autosave/Protocol.java b/framework/qa/complex/framework/autosave/Protocol.java
index c985a951c1b2..63f1e79fb755 100644
--- a/framework/qa/complex/framework/autosave/Protocol.java
+++ b/framework/qa/complex/framework/autosave/Protocol.java
@@ -156,7 +156,7 @@ public class Protocol extends JComponent
      * Such line can be specified as a special one (ERROR, WARNING ...).
      * That makes it possible to analyze the whole protocol using tools.
      */
-    class ProtocolLine
+    private class ProtocolLine
     {
         /// the line number of this protocol line (size of the vector of all protocol lines cn be used to count such lines!)
         private long m_nLine;
diff --git a/framework/qa/complex/imageManager/CheckImageManager.java b/framework/qa/complex/imageManager/CheckImageManager.java
index d5004c477928..ac71c6923f7e 100644
--- a/framework/qa/complex/imageManager/CheckImageManager.java
+++ b/framework/qa/complex/imageManager/CheckImageManager.java
@@ -141,7 +141,7 @@ public class CheckImageManager  {
     }
 
 
-    class OXUIConfigurationListenerImpl implements _XUIConfiguration.XUIConfigurationListenerImpl {
+    private class OXUIConfigurationListenerImpl implements _XUIConfiguration.XUIConfigurationListenerImpl {
         private boolean triggered = false;
 
         public boolean actionWasTriggered() {
diff --git a/framework/qa/complex/imageManager/_XComponent.java b/framework/qa/complex/imageManager/_XComponent.java
index 3e1dddf9378c..54ac164a6f34 100644
--- a/framework/qa/complex/imageManager/_XComponent.java
+++ b/framework/qa/complex/imageManager/_XComponent.java
@@ -48,7 +48,7 @@ public class _XComponent {
     * Listener which added but not removed, and its method must be called
     * on <code>dispose</code> call.
     */
-    public class MyEventListener implements XEventListener {
+    private class MyEventListener implements XEventListener {
         private int number = 0;
         private String message = null;
         private MyEventListener(int number, String message) {
diff --git a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/BaseEvolutionarySolver.java b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/BaseEvolutionarySolver.java
index a1a9cf29faea..e3db5d16fa2f 100644
--- a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/BaseEvolutionarySolver.java
+++ b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/BaseEvolutionarySolver.java
@@ -60,7 +60,7 @@ public abstract class BaseEvolutionarySolver extends BaseNLPSolver {
         registerProperty(m_enhancedSolverStatus);
     }
 
-    protected class Variable {
+    private class Variable {
         private CellMap CellMap;
         private int OriginalVariable;
         private double MinValue;
@@ -76,7 +76,7 @@ public abstract class BaseEvolutionarySolver extends BaseNLPSolver {
         }
     }
 
-    protected class CalcProblemEncoder extends ProblemEncoder {
+    private class CalcProblemEncoder extends ProblemEncoder {
 
         private ArrayList<Variable> m_variables;
         private ArrayList<ExtSolverConstraint> m_constraints;
diff --git a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/BaseNLPSolver.java b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/BaseNLPSolver.java
index 34338123c2dd..ef7ae96debef 100644
--- a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/BaseNLPSolver.java
+++ b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/BaseNLPSolver.java
@@ -164,7 +164,7 @@ public abstract class BaseNLPSolver extends WeakBase
         return m_variables;
     }
 
-    protected class RowInfo {
+    private class RowInfo {
         private short Sheet;
         private int Row;
         private int StartCol;
diff --git a/odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java b/odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java
index 67c2d26bac9b..c320cc3455b4 100644
--- a/odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java
+++ b/odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java
@@ -65,7 +65,7 @@ import com.sun.star.test.XTestDialogHandler;
 // ComponentBase, see implementation of TestComponentA.
 public class DialogComponent {
 
-    public static class _DialogComponent
+    private static class _DialogComponent
         implements XTypeProvider, XServiceInfo, XTestDialogHandler, XDialogEventHandler {
 
         private static final String __serviceName= "com.sun.star.test.TestDialogHandler";
diff --git a/odk/examples/DevelopersGuide/Config/ConfigExamples.java b/odk/examples/DevelopersGuide/Config/ConfigExamples.java
index ba1e7034af24..6c070476e00b 100644
--- a/odk/examples/DevelopersGuide/Config/ConfigExamples.java
+++ b/odk/examples/DevelopersGuide/Config/ConfigExamples.java
@@ -355,7 +355,7 @@ public class ConfigExamples
 
 // READ example
     /// class to hold information about grid settings
-    public static class GridOptions
+    private static class GridOptions
     {
         private boolean visible;
         private int resolution_x;
diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/CustomizeView.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/CustomizeView.java
index c06dcce3bde3..68524136d84a 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/CustomizeView.java
+++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/CustomizeView.java
@@ -172,7 +172,7 @@ public class CustomizeView extends    JPanel
      * But such update doesn't force (hopefully) an action event. Otherwhise
      * we can produce a never ending recursion!
      */
-    class ClickListener implements ActionListener,
+    private class ClickListener implements ActionListener,
                                    com.sun.star.lang.XEventListener
     {
         /// URL, to toogle the requested UI item
diff --git a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/AsciiReplaceFilter.java b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/AsciiReplaceFilter.java
index bfbf3d1a7c39..c09e7ce8057d 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/AsciiReplaceFilter.java
+++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/AsciiReplaceFilter.java
@@ -67,7 +67,7 @@ import com.sun.star.document.XFilter;
 
 public class AsciiReplaceFilter
 {
-    public static class _AsciiReplaceFilter extends     WeakBase
+    private static class _AsciiReplaceFilter extends     WeakBase
                                             implements  XInitialization ,
                                                         XServiceInfo    ,
                                                         XNamed          ,
diff --git a/odk/examples/DevelopersGuide/OfficeDev/Linguistic/LinguisticExamples.java b/odk/examples/DevelopersGuide/OfficeDev/Linguistic/LinguisticExamples.java
index 63b13da77fa2..c7099bb19ef4 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/Linguistic/LinguisticExamples.java
+++ b/odk/examples/DevelopersGuide/OfficeDev/Linguistic/LinguisticExamples.java
@@ -333,7 +333,7 @@ public class LinguisticExamples
     /** simple sample implementation of a clients XLinguServiceEventListener
      *  interface implementation
      */
-    public class Client
+    private class Client
             implements XLinguServiceEventListener
     {
         public void disposing ( EventObject aEventObj )
diff --git a/odk/examples/DevelopersGuide/Spreadsheet/ExampleAddIn.java b/odk/examples/DevelopersGuide/Spreadsheet/ExampleAddIn.java
index cd0c7c767960..109335f3cbea 100644
--- a/odk/examples/DevelopersGuide/Spreadsheet/ExampleAddIn.java
+++ b/odk/examples/DevelopersGuide/Spreadsheet/ExampleAddIn.java
@@ -108,7 +108,7 @@ class ExampleAddInThread extends Thread
 
 public class ExampleAddIn
 {
-    static public class _ExampleAddIn extends com.sun.star.lib.uno.helper.WeakBase
+    static private class _ExampleAddIn extends com.sun.star.lib.uno.helper.WeakBase
            implements org.openoffice.sheet.addin.XExampleAddIn,
                       com.sun.star.sheet.XAddIn,
                       com.sun.star.lang.XServiceName,
diff --git a/odk/examples/DevelopersGuide/Spreadsheet/ExampleDataPilotSource.java b/odk/examples/DevelopersGuide/Spreadsheet/ExampleDataPilotSource.java
index bb4655056cd7..41b0929b5403 100644
--- a/odk/examples/DevelopersGuide/Spreadsheet/ExampleDataPilotSource.java
+++ b/odk/examples/DevelopersGuide/Spreadsheet/ExampleDataPilotSource.java
@@ -752,7 +752,7 @@ public class ExampleDataPilotSource
 {
     //  implementation of com.sun.star.sheet.DataPilotSource
 
-    static public class _ExampleDataPilotSource implements
+    static private class _ExampleDataPilotSource implements
                         com.sun.star.sheet.XDimensionsSupplier,
                         com.sun.star.sheet.XDataPilotResults,
                         com.sun.star.util.XRefreshable,
diff --git a/odk/examples/java/Inspector/InspectorAddon.java b/odk/examples/java/Inspector/InspectorAddon.java
index ace1b69ded53..3846085d2521 100644
--- a/odk/examples/java/Inspector/InspectorAddon.java
+++ b/odk/examples/java/Inspector/InspectorAddon.java
@@ -53,7 +53,7 @@ public class InspectorAddon {
     /** This class implements the component. At least the interfaces XServiceInfo,
      * XTypeProvider, and XInitialization should be provided by the service.
      */
-    public static class InspectorAddonImpl extends WeakBase implements XDispatchProvider, XInitialization, XServiceInfo {
+    private static class InspectorAddonImpl extends WeakBase implements XDispatchProvider, XInitialization, XServiceInfo {
     private org.openoffice.XInstanceInspector xInstInspector = null;
 //    Dispatcher oDispatcher = null;
     private XFrame m_xFrame = null;
@@ -96,7 +96,7 @@ public class InspectorAddon {
             }
         }
 
-        public class Dispatcher implements XDispatch{
+        private class Dispatcher implements XDispatch{
             private XFrame m_xFrame = null;
             private XModel xModel = null;
 
diff --git a/odk/examples/java/Inspector/ProtocolHandlerAddon.java b/odk/examples/java/Inspector/ProtocolHandlerAddon.java
index 58dd04ff35bf..37dfc1411c39 100644
--- a/odk/examples/java/Inspector/ProtocolHandlerAddon.java
+++ b/odk/examples/java/Inspector/ProtocolHandlerAddon.java
@@ -57,7 +57,7 @@ public class ProtocolHandlerAddon {
     /** This class implements the component. At least the interfaces XServiceInfo,
      * XTypeProvider, and XInitialization should be provided by the service.
      */
-    public static class ProtocolHandlerAddonImpl extends WeakBase implements
+    private static class ProtocolHandlerAddonImpl extends WeakBase implements
                                                  XDispatchProvider,
                                                  XDispatch,
                                                  XInitialization,
diff --git a/odk/examples/java/Inspector/SourceCodeGenerator.java b/odk/examples/java/Inspector/SourceCodeGenerator.java
index ca8bb688486d..2ba84790ac95 100644
--- a/odk/examples/java/Inspector/SourceCodeGenerator.java
+++ b/odk/examples/java/Inspector/SourceCodeGenerator.java
@@ -543,7 +543,7 @@ public class SourceCodeGenerator {
     }
 
 
-class UnoObjectDefinition{
+private class UnoObjectDefinition{
         private Object m_oUnoObject = null;
         Type aType = null;
         private String sVariableStemName = "";
@@ -838,7 +838,7 @@ class UnoObjectDefinition{
     }
 
 
-    public class JavaCodeGenerator implements XLanguageSourceCodeGenerator{
+    private class JavaCodeGenerator implements XLanguageSourceCodeGenerator{
         String sStatementsCode = "";
         private boolean bAddAnyConverter = false;
         private boolean bIsPropertyUnoObjectDefined = false;
@@ -1185,7 +1185,7 @@ class UnoObjectDefinition{
     }
 
 
-    public class BasicCodeGenerator implements XLanguageSourceCodeGenerator{
+    private class BasicCodeGenerator implements XLanguageSourceCodeGenerator{
         String sStatementsCode = "";
 
         public BasicCodeGenerator(){
@@ -1389,7 +1389,7 @@ class UnoObjectDefinition{
 
     }
 
-    public class CPlusPlusCodeGenerator implements XLanguageSourceCodeGenerator{
+    private class CPlusPlusCodeGenerator implements XLanguageSourceCodeGenerator{
         String sStatementsCode = "";
         private boolean bIncludeStringHeader = false;
         private boolean bIncludeAny = false;
diff --git a/odk/examples/java/MinimalComponent/MinimalComponent.java b/odk/examples/java/MinimalComponent/MinimalComponent.java
index 21ff7060b16f..c96eb816999b 100644
--- a/odk/examples/java/MinimalComponent/MinimalComponent.java
+++ b/odk/examples/java/MinimalComponent/MinimalComponent.java
@@ -49,7 +49,7 @@ public class MinimalComponent {
     /** This class implements the component. At least the interfaces XServiceInfo,
      * XTypeProvider, and XInitialization should be provided by the service.
      */
-    public static class _MinimalComponent extends WeakBase
+    private static class _MinimalComponent extends WeakBase
         implements XInitialization, XServiceInfo {
         /** The service name, that must be used to get an instance of this service.
          */
diff --git a/odk/examples/java/Spreadsheet/CalcAddins.java b/odk/examples/java/Spreadsheet/CalcAddins.java
index 5353bcd11c11..b044eac50e2a 100644
--- a/odk/examples/java/Spreadsheet/CalcAddins.java
+++ b/odk/examples/java/Spreadsheet/CalcAddins.java
@@ -60,7 +60,7 @@ public class CalcAddins {
  * of the service description. It implements the needed interfaces.
  * @implements XCalcAddins, XAddIn, XServiceName, XServiceInfo, XTypeProvider
  */
-    static public class _CalcAddins extends WeakBase implements
+    static private class _CalcAddins extends WeakBase implements
                                             XCalcAddins,
                                             XAddIn,
                                             XServiceName,
diff --git a/odk/examples/java/ToDo/ToDo.java b/odk/examples/java/ToDo/ToDo.java
index d40acabff95e..2da2ded22f84 100644
--- a/odk/examples/java/ToDo/ToDo.java
+++ b/odk/examples/java/ToDo/ToDo.java
@@ -75,7 +75,7 @@ public class ToDo {
      * XInterface, XTypeProvider, and XWeak implemented by the helper class
      * WeakBase and XServiceInfo should be provided by the service.
      */
-    public static class ToDoImpl extends WeakBase implements XServiceInfo, XToDo {
+    private static class ToDoImpl extends WeakBase implements XServiceInfo, XToDo {
 
         /** The service name, that must be used to get an instance of this service.
          */
diff --git a/qadevOOo/runner/helper/ProcessHandler.java b/qadevOOo/runner/helper/ProcessHandler.java
index 03f9bf130d6c..042f0d6132ed 100644
--- a/qadevOOo/runner/helper/ProcessHandler.java
+++ b/qadevOOo/runner/helper/ProcessHandler.java
@@ -822,7 +822,7 @@ public class ProcessHandler
         bUseOutput = false;
     }
 
-    class ProcessWatcher extends Thread
+    private class ProcessWatcher extends Thread
     {
 
         private int m_nTimeoutInSec;
diff --git a/qadevOOo/runner/util/XMLTools.java b/qadevOOo/runner/util/XMLTools.java
index f4d7fbf0f515..1b8ccf183ea2 100644
--- a/qadevOOo/runner/util/XMLTools.java
+++ b/qadevOOo/runner/util/XMLTools.java
@@ -170,7 +170,7 @@ public class XMLTools {
     * This class writes all XML data handled into a stream specified
     * in the constructor.
     */
-    public static class XMLWriter implements XDocumentHandler {
+    private static class XMLWriter implements XDocumentHandler {
         private PrintWriter _log = null ;
         private String align = "" ;
 
@@ -251,7 +251,7 @@ public class XMLTools {
     * After document is completed there is a way to cehck
     * if the XML data and structure was valid.
     */
-    public static class XMLWellFormChecker extends XMLWriter {
+    private static class XMLWellFormChecker extends XMLWriter {
         private boolean docStarted = false ;
         private boolean docEnded = false ;
         ArrayList<String> tagStack = new ArrayList<String>() ;
diff --git a/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java b/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java
index 7dcc7bba878e..9e8998978b06 100644
--- a/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java
+++ b/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java
@@ -132,7 +132,7 @@ public class SDBCReportDataFactory implements DataSourceFactory
         }
     }
 
-    class ParameterDefinition
+    private class ParameterDefinition
     {
         private int parameterCount = 0;
         private ArrayList<Integer> parameterIndex = new ArrayList<Integer>();
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/SOReportJobFactory.java b/reportbuilder/java/org/libreoffice/report/pentaho/SOReportJobFactory.java
index 01d71c205c87..a67a3d026143 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/SOReportJobFactory.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/SOReportJobFactory.java
@@ -76,7 +76,7 @@ public class SOReportJobFactory
     {
     }
 
-    public static class _SOReportJobFactory extends WeakBase implements XInitialization, XServiceInfo, XJob, XPropertySet, ReportJobFactory
+    private static class _SOReportJobFactory extends WeakBase implements XInitialization, XServiceInfo, XJob, XPropertySet, ReportJobFactory
     {
 
         private static final Log LOGGER = LogFactory.getLog(_SOReportJobFactory.class);
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeStyles.java b/reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeStyles.java
index 4fd9ebdf642b..167188daaab6 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeStyles.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeStyles.java
@@ -42,7 +42,7 @@ import org.jfree.report.structure.Element;
 public class OfficeStyles extends Element
 {
 
-    public static class StyleKey implements Serializable
+    private static class StyleKey implements Serializable
     {
 
         private static final long serialVersionUID = 4931878927362887477L;
diff --git a/sc/qa/complex/dataPilot/_XPropertySet.java b/sc/qa/complex/dataPilot/_XPropertySet.java
index ea2cd95ddb7d..9fd8f3b8bf80 100644
--- a/sc/qa/complex/dataPilot/_XPropertySet.java
+++ b/sc/qa/complex/dataPilot/_XPropertySet.java
@@ -72,7 +72,7 @@ public class _XPropertySet {
     /**
     * Listener that must be called on bound property changing.
     */
-    public class MyChangeListener implements XPropertyChangeListener {
+    private class MyChangeListener implements XPropertyChangeListener {
          /**
          * Just set <code>propertyChanged</code> flag to true.
          */
@@ -96,7 +96,7 @@ public class _XPropertySet {
     /**
     * Listener that must be called on constrained property changing.
     */
-    public class MyVetoListener implements XVetoableChangeListener {
+    private class MyVetoListener implements XVetoableChangeListener {
          /**
          * Just set <code>vetoableChanged</code> flag to true.
          */
diff --git a/scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java b/scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java
index 31bb3b3c4af7..57e72843203c 100644
--- a/scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java
+++ b/scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java
@@ -487,7 +487,7 @@ XInitialization {
        xComponent.removeEventListener( aListener );
    }
 
-    public class ActionListenerImpl implements com.sun.star.awt.XActionListener {
+    private class ActionListenerImpl implements com.sun.star.awt.XActionListener {
         private String _buttonName;
         private ActionListenerImpl( String buttonName ) {
             _buttonName = buttonName;
@@ -506,7 +506,7 @@ XInitialization {
         }
     }
 
-    public class ItemListenerImpl implements com.sun.star.awt.XItemListener {
+    private class ItemListenerImpl implements com.sun.star.awt.XItemListener {
         private XCheckBox _xCheckBox;
         private ItemListenerImpl( XControlContainer xControlCont ) {
             Object objectCheckBox = xControlCont.getControl( _checkBoxName );
diff --git a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java
index 7df4f5cf645e..82f2aff4469d 100644
--- a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java
+++ b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java
@@ -49,7 +49,7 @@ import com.sun.star.script.framework.container.ScriptMetaData;
 
 public class ScriptProviderForBeanShell
 {
-    public static class ScriptProviderForBeanShell_2 extends ScriptProvider
+    private static class ScriptProviderForBeanShell_2 extends ScriptProvider
     {
         public ScriptProviderForBeanShell_2(XComponentContext ctx)
         {
diff --git a/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java b/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java
index 0ae4247bb982..66fe5a03719b 100644
--- a/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java
+++ b/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java
@@ -43,7 +43,7 @@ import com.sun.star.script.framework.log.LogUtils;
 
 public class ScriptProviderForJava
 {
-    public static class _ScriptProviderForJava extends ScriptProvider
+    private static class _ScriptProviderForJava extends ScriptProvider
     {
         private Resolver m_resolutionPolicy = new StrictResolver();
 
diff --git a/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java b/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java
index b18325d47d46..ce909f0c45d2 100644
--- a/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java
+++ b/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java
@@ -323,7 +323,7 @@ public class ScriptEditorForJavaScript implements ScriptEditor
         return scope;
     }
 
-    class closeHandler implements Runnable
+    private class closeHandler implements Runnable
     {
         private URL url;
         private closeHandler( URL url )
diff --git a/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java b/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java
index b8625a6bc804..6f1e136959b5 100644
--- a/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java
+++ b/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java
@@ -50,7 +50,7 @@ import org.mozilla.javascript.JavaScriptException;
 
 public class ScriptProviderForJavaScript
 {
-    public static class ScriptProviderForJavaScript_2 extends ScriptProvider
+    private static class ScriptProviderForJavaScript_2 extends ScriptProvider
     {
         public ScriptProviderForJavaScript_2(XComponentContext ctx)
         {
diff --git a/sfx2/qa/complex/sfx2/DocumentMetadataAccess.java b/sfx2/qa/complex/sfx2/DocumentMetadataAccess.java
index 4ed026c09efa..d0753ba3a14c 100644
--- a/sfx2/qa/complex/sfx2/DocumentMetadataAccess.java
+++ b/sfx2/qa/complex/sfx2/DocumentMetadataAccess.java
@@ -969,7 +969,7 @@ public class DocumentMetadataAccess
         return ret;
     }
 
-    static class BindingComp implements java.util.Comparator<XNode[]>
+    private static class BindingComp implements java.util.Comparator<XNode[]>
     {
         public int compare(XNode[] left, XNode[] right)
         {
@@ -989,7 +989,7 @@ public class DocumentMetadataAccess
         }
     }
 
-    static class StmtComp implements java.util.Comparator<Statement>
+    private static class StmtComp implements java.util.Comparator<Statement>
     {
         public int compare(Statement left, Statement right)
         {
diff --git a/sfx2/qa/complex/sfx2/DocumentProperties.java b/sfx2/qa/complex/sfx2/DocumentProperties.java
index b953d8bc19df..6686cd96959b 100644
--- a/sfx2/qa/complex/sfx2/DocumentProperties.java
+++ b/sfx2/qa/complex/sfx2/DocumentProperties.java
@@ -63,7 +63,7 @@ public class DocumentProperties
     }
 
     // for testing modifications
-    class Listener implements XModifyListener {
+    private class Listener implements XModifyListener {
         private boolean m_Called;
 
         Listener() {
diff --git a/sfx2/qa/complex/sfx2/GlobalEventBroadcaster.java b/sfx2/qa/complex/sfx2/GlobalEventBroadcaster.java
index 96901bd783f8..754e0da1aa65 100644
--- a/sfx2/qa/complex/sfx2/GlobalEventBroadcaster.java
+++ b/sfx2/qa/complex/sfx2/GlobalEventBroadcaster.java
@@ -230,7 +230,7 @@ public class GlobalEventBroadcaster {
         return !failure;
     }
 
-    public class EventListenerImpl implements XEventListener {
+    private class EventListenerImpl implements XEventListener {
         public void disposing(com.sun.star.lang.EventObject eventObject) {
             System.out.println("disposing: " + eventObject.Source.toString());
         }
diff --git a/toolkit/qa/complex/toolkit/accessibility/_XAccessibleEventBroadcaster.java b/toolkit/qa/complex/toolkit/accessibility/_XAccessibleEventBroadcaster.java
index f6cb56170e0b..510b1b268a26 100644
--- a/toolkit/qa/complex/toolkit/accessibility/_XAccessibleEventBroadcaster.java
+++ b/toolkit/qa/complex/toolkit/accessibility/_XAccessibleEventBroadcaster.java
@@ -58,7 +58,7 @@ public class _XAccessibleEventBroadcaster {
     /**
      * An event producer
      */
-    public static class EventProducer {
+    private static class EventProducer {
         private XWindow xWindow;
         private EventProducer(XWindow window) {
             xWindow = window;
diff --git a/ucb/qa/complex/tdoc/_XComponent.java b/ucb/qa/complex/tdoc/_XComponent.java
index 63adb1fe50cc..dc09c04f6440 100644
--- a/ucb/qa/complex/tdoc/_XComponent.java
+++ b/ucb/qa/complex/tdoc/_XComponent.java
@@ -47,7 +47,7 @@ public class _XComponent {
     * Listener which added but not removed, and its method must be called
     * on <code>dispose</code> call.
     */
-    public class MyEventListener implements XEventListener {
+    private class MyEventListener implements XEventListener {
         public void disposing ( EventObject oEvent ) {
             Loutput[0] = Thread.currentThread() + " is DISPOSING EV1" + this;
             listenerDisposed[0] = true;
@@ -58,7 +58,7 @@ public class _XComponent {
     * Listener which added and then removed, and its method must <b>not</b>
     * be called on <code>dispose</code> call.
     */
-    public class MyEventListener2 implements XEventListener {
+    private class MyEventListener2 implements XEventListener {
         public void disposing ( EventObject oEvent ) {
             Loutput[0] = Thread.currentThread() + " is DISPOSING EV2" + this;
             listenerDisposed[1] = true;
diff --git a/wizards/com/sun/star/wizards/document/FormHandler.java b/wizards/com/sun/star/wizards/document/FormHandler.java
index 8aa88ba608f6..72306436c1ca 100644
--- a/wizards/com/sun/star/wizards/document/FormHandler.java
+++ b/wizards/com/sun/star/wizards/document/FormHandler.java
@@ -92,7 +92,7 @@ public class FormHandler
     XShapeGrouper xShapeGrouper;
     private XNameContainer xNamedFormContainer;
 
-    public class ControlData
+    class ControlData
     {
 
         int DataType;
diff --git a/wizards/com/sun/star/wizards/form/CallFormWizard.java b/wizards/com/sun/star/wizards/form/CallFormWizard.java
index 4bec58437111..fc3177c26268 100644
--- a/wizards/com/sun/star/wizards/form/CallFormWizard.java
+++ b/wizards/com/sun/star/wizards/form/CallFormWizard.java
@@ -51,7 +51,7 @@ public class CallFormWizard
     /** This class implements the component. At least the interfaces XServiceInfo,
      * XTypeProvider, and XInitialization should be provided by the service.
      */
-    public static class FormWizardImplementation 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 static class FormWizardImplementation 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;
 
diff --git a/wizards/com/sun/star/wizards/form/FieldLinker.java b/wizards/com/sun/star/wizards/form/FieldLinker.java
index 2dd3ab33c09a..53456ff8615c 100644
--- a/wizards/com/sun/star/wizards/form/FieldLinker.java
+++ b/wizards/com/sun/star/wizards/form/FieldLinker.java
@@ -282,7 +282,7 @@ public class FieldLinker extends DBLimitedFieldSelection
         CurUnoDialog.setStepEnabled(IStep.intValue(), _bdoenable);
     }
 
-    class ItemListenerImpl implements com.sun.star.awt.XItemListener
+    private class ItemListenerImpl implements com.sun.star.awt.XItemListener
     {
 
         public void itemStateChanged(ItemEvent EventObject)
diff --git a/wizards/com/sun/star/wizards/form/FormWizard.java b/wizards/com/sun/star/wizards/form/FormWizard.java
index fc613019f10d..661b86eed06b 100644
--- a/wizards/com/sun/star/wizards/form/FormWizard.java
+++ b/wizards/com/sun/star/wizards/form/FormWizard.java
@@ -385,7 +385,7 @@ public class FormWizard extends DatabaseObjectWizard
         return true;
     }
 
-    public class FieldSelectionListener implements com.sun.star.wizards.ui.XFieldSelectionListener
+    private class FieldSelectionListener implements com.sun.star.wizards.ui.XFieldSelectionListener
     {
 
         private int ID;
diff --git a/wizards/com/sun/star/wizards/query/CallQueryWizard.java b/wizards/com/sun/star/wizards/query/CallQueryWizard.java
index 611556951fa1..60fc8f61a481 100644
--- a/wizards/com/sun/star/wizards/query/CallQueryWizard.java
+++ b/wizards/com/sun/star/wizards/query/CallQueryWizard.java
@@ -53,7 +53,7 @@ public class CallQueryWizard
     /** This class implements the component. At least the interfaces XServiceInfo,
      * XTypeProvider, and XInitialization should be provided by the service.
      */
-    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 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;
         private String           Command;
diff --git a/wizards/com/sun/star/wizards/query/QueryWizard.java b/wizards/com/sun/star/wizards/query/QueryWizard.java
index 78709f14ea00..4e9c1ee40a20 100644
--- a/wizards/com/sun/star/wizards/query/QueryWizard.java
+++ b/wizards/com/sun/star/wizards/query/QueryWizard.java
@@ -393,7 +393,7 @@ public class QueryWizard extends DatabaseObjectWizard
         enableRoadmapItems(bEnabled); // Note: Performancewise this could be improved
     }
 
-    public class FieldSelectionListener implements com.sun.star.wizards.ui.XFieldSelectionListener
+    private class FieldSelectionListener implements com.sun.star.wizards.ui.XFieldSelectionListener
     {
 
         private int ID;
diff --git a/wizards/com/sun/star/wizards/report/CallReportWizard.java b/wizards/com/sun/star/wizards/report/CallReportWizard.java
index f59dbefdab50..df934cd1eb9c 100644
--- a/wizards/com/sun/star/wizards/report/CallReportWizard.java
+++ b/wizards/com/sun/star/wizards/report/CallReportWizard.java
@@ -63,7 +63,7 @@ public class CallReportWizard
     /** This class implements the component. At least the interfaces XServiceInfo,
      * XTypeProvider, and XInitialization should be provided by the service.
      */
-    public static class ReportWizardImplementation 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 static class ReportWizardImplementation 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;
diff --git a/wizards/com/sun/star/wizards/report/GroupFieldHandler.java b/wizards/com/sun/star/wizards/report/GroupFieldHandler.java
index 31c68ed2aa24..d0e2c1ee0a29 100644
--- a/wizards/com/sun/star/wizards/report/GroupFieldHandler.java
+++ b/wizards/com/sun/star/wizards/report/GroupFieldHandler.java
@@ -137,7 +137,7 @@ public class GroupFieldHandler extends FieldSelection
 
     }
 
-    /* protected */ class FieldSelectionListener implements com.sun.star.wizards.ui.XFieldSelectionListener
+    /* protected */ private class FieldSelectionListener implements com.sun.star.wizards.ui.XFieldSelectionListener
     {
 
         public void moveItemDown(String Selitem)
diff --git a/wizards/com/sun/star/wizards/report/ReportLayouter.java b/wizards/com/sun/star/wizards/report/ReportLayouter.java
index 1028747ceedd..15f8d4b99b63 100644
--- a/wizards/com/sun/star/wizards/report/ReportLayouter.java
+++ b/wizards/com/sun/star/wizards/report/ReportLayouter.java
@@ -217,7 +217,7 @@ public class ReportLayouter
         CurUnoDialog.setFocus("lblContent");
     }
 
-    class ItemListenerImpl implements com.sun.star.awt.XItemListener
+    private class ItemListenerImpl implements com.sun.star.awt.XItemListener
     {
 
         public void itemStateChanged(com.sun.star.awt.ItemEvent EventObject)
@@ -302,7 +302,7 @@ public class ReportLayouter
         }
     }
 
-    class ActionListenerImpl implements com.sun.star.awt.XActionListener
+    private class ActionListenerImpl implements com.sun.star.awt.XActionListener
     {
 
         public void disposing(EventObject eventObject)
diff --git a/wizards/com/sun/star/wizards/report/ReportWizard.java b/wizards/com/sun/star/wizards/report/ReportWizard.java
index b9de1d542545..3798bba8637e 100644
--- a/wizards/com/sun/star/wizards/report/ReportWizard.java
+++ b/wizards/com/sun/star/wizards/report/ReportWizard.java
@@ -645,7 +645,7 @@ public class ReportWizard extends DatabaseObjectWizard implements XTextListener
         super.setStepEnabled(SOSORTPAGE, bdoenable);
     }
 
-    public class FieldSelectionListener implements com.sun.star.wizards.ui.XFieldSelectionListener
+    private class FieldSelectionListener implements com.sun.star.wizards.ui.XFieldSelectionListener
     {
 
         private int m_nID;
diff --git a/wizards/com/sun/star/wizards/table/CallTableWizard.java b/wizards/com/sun/star/wizards/table/CallTableWizard.java
index aa1fb214a6b1..b7693a102f34 100644
--- a/wizards/com/sun/star/wizards/table/CallTableWizard.java
+++ b/wizards/com/sun/star/wizards/table/CallTableWizard.java
@@ -52,7 +52,7 @@ public class CallTableWizard
     /** This class implements the component. At least the interfaces XServiceInfo,
      * XTypeProvider, and XInitialization should be provided by the service.
      */
-    public static class TableWizardImplementation 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 static class TableWizardImplementation 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;
diff --git a/wizards/com/sun/star/wizards/ui/AggregateComponent.java b/wizards/com/sun/star/wizards/ui/AggregateComponent.java
index 9261ee7cc9b0..6b78a39d01c2 100644
--- a/wizards/com/sun/star/wizards/ui/AggregateComponent.java
+++ b/wizards/com/sun/star/wizards/ui/AggregateComponent.java
@@ -159,7 +159,7 @@ public class AggregateComponent extends ControlScroller
         }
     }
 
-    class ActionListenerImpl implements com.sun.star.awt.XActionListener
+    private class ActionListenerImpl implements com.sun.star.awt.XActionListener
     {
 
         public void disposing(EventObject eventObject)
@@ -507,7 +507,7 @@ public class AggregateComponent extends ControlScroller
         }
     }
 
-    protected class ControlRow
+    private class ControlRow
     {
 
         private XListBox xFieldListBox;
@@ -570,7 +570,7 @@ public class AggregateComponent extends ControlScroller
             UnoDialog.deselectListBox(xFunctionListBox);
         }
 
-        protected class ItemListenerImpl implements com.sun.star.awt.XItemListener
+        private class ItemListenerImpl implements com.sun.star.awt.XItemListener
         {
 
             public void itemStateChanged(com.sun.star.awt.ItemEvent EventObject)
diff --git a/wizards/com/sun/star/wizards/ui/ButtonList.java b/wizards/com/sun/star/wizards/ui/ButtonList.java
index bfe0d3e93688..f15f7d26e4ba 100644
--- a/wizards/com/sun/star/wizards/ui/ButtonList.java
+++ b/wizards/com/sun/star/wizards/ui/ButtonList.java
@@ -619,7 +619,7 @@ public class ButtonList implements XItemEventBroadcaster, XActionListener
         }
     }
 
-    public static class Counter
+    private static class Counter
     {
 
         private int start,  end,  max;
diff --git a/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java b/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java
index 80656adc9655..2bb9d607d536 100644
--- a/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java
+++ b/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java
@@ -44,7 +44,7 @@ public class CommandFieldSelection extends FieldSelection implements Comparator<
     private WizardDialog oWizardDialog;
     private Collator aCollator = null;
 
-    class ItemListenerImpl implements com.sun.star.awt.XItemListener
+    private class ItemListenerImpl implements com.sun.star.awt.XItemListener
     {
 
         public void itemStateChanged(com.sun.star.awt.ItemEvent EventObject)
diff --git a/wizards/com/sun/star/wizards/ui/ControlScroller.java b/wizards/com/sun/star/wizards/ui/ControlScroller.java
index 179d787bf391..46ffd48cbdd9 100644
--- a/wizards/com/sun/star/wizards/ui/ControlScroller.java
+++ b/wizards/com/sun/star/wizards/ui/ControlScroller.java
@@ -56,7 +56,7 @@ public abstract class ControlScroller
     protected ArrayList<Object> ControlGroupVector = new ArrayList<Object>();
     protected PeerConfig oTitlePeerConfig;
 
-    class AdjustmentListenerImpl implements com.sun.star.awt.XAdjustmentListener
+    private class AdjustmentListenerImpl implements com.sun.star.awt.XAdjustmentListener
     {
 
         public void disposing(com.sun.star.lang.EventObject eventObject)
diff --git a/wizards/com/sun/star/wizards/ui/FieldSelection.java b/wizards/com/sun/star/wizards/ui/FieldSelection.java
index 3b0a4c6ee188..fd2ba4bd17c1 100644
--- a/wizards/com/sun/star/wizards/ui/FieldSelection.java
+++ b/wizards/com/sun/star/wizards/ui/FieldSelection.java
@@ -59,7 +59,7 @@ public class FieldSelection
     private final static int SOSELFLDSLST = 8;
 
 
-    class ItemListenerImpl implements com.sun.star.awt.XItemListener
+    private class ItemListenerImpl implements com.sun.star.awt.XItemListener
     {
 
         public void itemStateChanged(com.sun.star.awt.ItemEvent EventObject)
@@ -87,7 +87,7 @@ public class FieldSelection
         }
     }
 
-    class ActionListenerImpl implements com.sun.star.awt.XActionListener
+    private class ActionListenerImpl implements com.sun.star.awt.XActionListener
     {
 
         public void disposing(com.sun.star.lang.EventObject eventObject)
diff --git a/wizards/com/sun/star/wizards/ui/FilterComponent.java b/wizards/com/sun/star/wizards/ui/FilterComponent.java
index 6f5d8358d281..364d304cd410 100644
--- a/wizards/com/sun/star/wizards/ui/FilterComponent.java
+++ b/wizards/com/sun/star/wizards/ui/FilterComponent.java
@@ -112,7 +112,7 @@ public class FilterComponent
     private int SOI_MATCHANY = 1;
     private int curHelpID;
 
-    class ItemListenerImpl implements com.sun.star.awt.XItemListener
+    private class ItemListenerImpl implements com.sun.star.awt.XItemListener
     {
 
         public void itemStateChanged(com.sun.star.awt.ItemEvent EventObject)
@@ -167,7 +167,7 @@ public class FilterComponent
         }
     }
 
-    class TextListenerImpl implements com.sun.star.awt.XTextListener
+    private class TextListenerImpl implements com.sun.star.awt.XTextListener
     {
 
         public void textChanged(TextEvent EventObject)
@@ -508,7 +508,7 @@ public class FilterComponent
 
 
 
-    final class ControlRow
+    private final class ControlRow
     {
 
         private final static int SOLSTFIELDNAME = 3;
diff --git a/wizards/com/sun/star/wizards/ui/ImageList.java b/wizards/com/sun/star/wizards/ui/ImageList.java
index 673bc64c4d96..011c9ecce72a 100644
--- a/wizards/com/sun/star/wizards/ui/ImageList.java
+++ b/wizards/com/sun/star/wizards/ui/ImageList.java
@@ -99,7 +99,7 @@ public class ImageList implements XItemEventBroadcaster, ListDataListener
         this.imageSize = imageSize;
     }
 
-    class OMouseListener implements XMouseListener
+    private class OMouseListener implements XMouseListener
     {
         public OMouseListener()
         {}
@@ -808,7 +808,7 @@ public class ImageList implements XItemEventBroadcaster, ListDataListener
         }
     }
 
-    public static class Counter
+    private static class Counter
     {
 
         private int start,  end,  max;
diff --git a/wizards/com/sun/star/wizards/ui/PathSelection.java b/wizards/com/sun/star/wizards/ui/PathSelection.java
index 7ccf5f7b24c1..e3b14186d3f4 100644
--- a/wizards/com/sun/star/wizards/ui/PathSelection.java
+++ b/wizards/com/sun/star/wizards/ui/PathSelection.java
@@ -38,14 +38,14 @@ public class PathSelection
     public XPathSelectionListener xAction;
     public XTextComponent xSaveTextBox;
 
-    public static class DialogTypes
+    private static class DialogTypes
     {
 
         private static final int FOLDER = 0;
         private static final int FILE = 1;
     }
 
-    public static class TransferMode
+    private static class TransferMode
     {
 
         private static final int SAVE = 0;
diff --git a/wizards/com/sun/star/wizards/ui/PeerConfig.java b/wizards/com/sun/star/wizards/ui/PeerConfig.java
index b836221851f6..89a10f04f5ce 100644
--- a/wizards/com/sun/star/wizards/ui/PeerConfig.java
+++ b/wizards/com/sun/star/wizards/ui/PeerConfig.java
@@ -43,7 +43,7 @@ public class PeerConfig implements XWindowListener
         oUnoDialog.xWindow.addWindowListener(this);
     }
 
-    class PeerTask
+    private class PeerTask
     {
 
         private XControl xControl;
@@ -58,7 +58,7 @@ public class PeerConfig implements XWindowListener
         }
     }
 
-    class ControlTask
+    private class ControlTask
     {
 
         private Object oModel;
@@ -73,7 +73,7 @@ public class PeerConfig implements XWindowListener
         }
     }
 
-    class ImageUrlTask
+    private class ImageUrlTask
     {
 
         private Object oModel;
diff --git a/wizards/com/sun/star/wizards/ui/SortingComponent.java b/wizards/com/sun/star/wizards/ui/SortingComponent.java
index b8d7237d864b..b6f00a0e3f54 100644
--- a/wizards/com/sun/star/wizards/ui/SortingComponent.java
+++ b/wizards/com/sun/star/wizards/ui/SortingComponent.java
@@ -47,7 +47,7 @@ public class SortingComponent
     };
     private XListBox[] xSortListBox = new XListBox[4];
 
-    class ItemListenerImpl implements com.sun.star.awt.XItemListener
+    private class ItemListenerImpl implements com.sun.star.awt.XItemListener
     {
 
         public void itemStateChanged(ItemEvent EventObject)
diff --git a/wizards/com/sun/star/wizards/ui/TitlesComponent.java b/wizards/com/sun/star/wizards/ui/TitlesComponent.java
index 2e15ebabafe4..0b379f1ec637 100644
--- a/wizards/com/sun/star/wizards/ui/TitlesComponent.java
+++ b/wizards/com/sun/star/wizards/ui/TitlesComponent.java
@@ -86,7 +86,7 @@ public class TitlesComponent extends ControlScroller
         }
     }
 
-    class ControlRow
+    private class ControlRow
     {
 
         PropertyValue[] regproperties;
diff --git a/xmerge/source/bridge/java/XMergeBridge.java b/xmerge/source/bridge/java/XMergeBridge.java
index 347c239c5c02..888308d31a47 100644
--- a/xmerge/source/bridge/java/XMergeBridge.java
+++ b/xmerge/source/bridge/java/XMergeBridge.java
@@ -82,7 +82,7 @@ public class XMergeBridge {
     /** This inner class provides the component as a concrete implementation
      * of the service description. It implements the needed interfaces.
      */
-    static public class _XMergeBridge implements
+    static private class _XMergeBridge implements
                                                XImportFilter,
      XExportFilter,
         XServiceName,