cid#1327023 to cid#1327077 SIC: Inner class could be made static

Change-Id: I41f89c4feefe4e012d72c663ebb9bbcb4aa7f163

50 files changed, 62 insertions, 63 deletions

diff --git a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
index 43e91fbaf389..70d51dfd497e 100644
--- a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
+++ b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
@@ -739,7 +739,7 @@ public class LocalOfficeConnection
 
 
 
-    private class StreamProcessor extends Thread
+    private static class StreamProcessor extends Thread
     {
         private final java.io.InputStream m_in;
         private final 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 3e8a687f1e9f..0dd640c4ec57 100644
--- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java
+++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java
@@ -66,7 +66,7 @@ public class StorageFileAccess implements org.hsqldb.lib.FileAccess{
        }
     }
 
-    private class FileSync implements FileAccess.FileSync
+    private static class FileSync implements FileAccess.FileSync
     {
         private final NativeOutputStreamHelper os;
         private FileSync(NativeOutputStreamHelper _os)
diff --git a/jurt/com/sun/star/comp/servicemanager/ServiceManager.java b/jurt/com/sun/star/comp/servicemanager/ServiceManager.java
index 54c53493d2c6..99746f3a335c 100644
--- a/jurt/com/sun/star/comp/servicemanager/ServiceManager.java
+++ b/jurt/com/sun/star/comp/servicemanager/ServiceManager.java
@@ -590,7 +590,7 @@ public class ServiceManager implements XMultiServiceFactory,
      * @see         com.sun.star.lang.XServiceInfo
      * @since       UDK1.0
      */
-    class ServiceEnumerationImpl implements XEnumeration {
+    static class ServiceEnumerationImpl implements XEnumeration {
         java.util.Iterator<Object> enumeration = null;
 
         /**
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 2d93dca6e4bf..701e6ba63226 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);
     }
 
-    private class Variable {
+    private static class Variable {
         private final CellMap CellMap;
         private final int OriginalVariable;
         private double MinValue;
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 0143b3a06c0b..fbb53f9b64ed 100644
--- a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/BaseNLPSolver.java
+++ b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/BaseNLPSolver.java
@@ -185,7 +185,7 @@ public abstract class BaseNLPSolver extends WeakBase
         }
     }
 
-    protected class CellMap {
+    protected static class CellMap {
         protected int Range;
         protected int Col;
         protected int Row;
diff --git a/qadevOOo/runner/helper/OfficeProvider.java b/qadevOOo/runner/helper/OfficeProvider.java
index 76e6e2671012..3f37c57fc747 100644
--- a/qadevOOo/runner/helper/OfficeProvider.java
+++ b/qadevOOo/runner/helper/OfficeProvider.java
@@ -712,7 +712,7 @@ public class OfficeProvider implements AppProvider
 
     }
 
-    private class OfficeWatcherPing extends Thread
+    private static class OfficeWatcherPing extends Thread
     {
 
         private final OfficeWatcher ow;
diff --git a/qadevOOo/runner/helper/ProcessHandler.java b/qadevOOo/runner/helper/ProcessHandler.java
index e32eb796c78f..999a0097fd8e 100644
--- a/qadevOOo/runner/helper/ProcessHandler.java
+++ b/qadevOOo/runner/helper/ProcessHandler.java
@@ -625,7 +625,7 @@ public class ProcessHandler
         bUseOutput = false;
     }
 
-    private class ProcessWatcher extends Thread
+    private static class ProcessWatcher extends Thread
     {
 
         private int m_nTimeoutInSec;
diff --git a/qadevOOo/tests/java/ifc/awt/_XButton.java b/qadevOOo/tests/java/ifc/awt/_XButton.java
index 3a237a2ebd3e..444fcd591b68 100644
--- a/qadevOOo/tests/java/ifc/awt/_XButton.java
+++ b/qadevOOo/tests/java/ifc/awt/_XButton.java
@@ -42,7 +42,7 @@ public class _XButton extends MultiMethodTest {
     /**
     * Listener implementation which sets flags on appropriate method calls
     */
-    protected class TestActionListener implements com.sun.star.awt.XActionListener {
+    protected static class TestActionListener implements com.sun.star.awt.XActionListener {
         public boolean disposingCalled = false ;
         public boolean actionPerformedCalled = false ;
 
diff --git a/qadevOOo/tests/java/ifc/awt/_XCheckBox.java b/qadevOOo/tests/java/ifc/awt/_XCheckBox.java
index 305c54d38efe..a675f3551c45 100644
--- a/qadevOOo/tests/java/ifc/awt/_XCheckBox.java
+++ b/qadevOOo/tests/java/ifc/awt/_XCheckBox.java
@@ -44,7 +44,7 @@ public class _XCheckBox extends MultiMethodTest {
     /**
     * Listener implementation which sets flags on appropriate method calls
     */
-    protected class TestItemListener implements com.sun.star.awt.XItemListener {
+    protected static class TestItemListener implements com.sun.star.awt.XItemListener {
         public boolean disposingCalled = false ;
         public boolean itemStateChangedCalled = false ;
 
diff --git a/qadevOOo/tests/java/ifc/awt/_XComboBox.java b/qadevOOo/tests/java/ifc/awt/_XComboBox.java
index 094bcf18c52a..e487f9829285 100644
--- a/qadevOOo/tests/java/ifc/awt/_XComboBox.java
+++ b/qadevOOo/tests/java/ifc/awt/_XComboBox.java
@@ -50,7 +50,7 @@ public class _XComboBox extends MultiMethodTest {
     /**
     * Listener implementation which sets flags on appropriate method calls
     */
-    protected class TestActionListener
+    protected static class TestActionListener
         implements com.sun.star.awt.XActionListener {
         public boolean disposingCalled = false;
         public boolean actionPerformedCalled = false;
@@ -68,7 +68,7 @@ public class _XComboBox extends MultiMethodTest {
     /**
     * Listener implementation which sets flags on appropriate method calls
     */
-    protected class TestItemListener
+    protected static class TestItemListener
         implements com.sun.star.awt.XItemListener {
         public boolean disposingCalled = false;
         public boolean itemStateChangedCalled = false;
diff --git a/qadevOOo/tests/java/ifc/awt/_XImageProducer.java b/qadevOOo/tests/java/ifc/awt/_XImageProducer.java
index b18253b4082e..bdcfb444b032 100644
--- a/qadevOOo/tests/java/ifc/awt/_XImageProducer.java
+++ b/qadevOOo/tests/java/ifc/awt/_XImageProducer.java
@@ -45,7 +45,7 @@ public class _XImageProducer extends MultiMethodTest {
     * Consumer implementation which sets flags on appropriate
     * method calls.
     */
-    protected class TestImageConsumer implements XImageConsumer {
+    protected static class TestImageConsumer implements XImageConsumer {
         PrintWriter log = null ;
         public boolean initCalled = false ;
         public boolean setColorModelCalled = false ;
diff --git a/qadevOOo/tests/java/ifc/awt/_XListBox.java b/qadevOOo/tests/java/ifc/awt/_XListBox.java
index 53531a3df459..62809b6e6271 100644
--- a/qadevOOo/tests/java/ifc/awt/_XListBox.java
+++ b/qadevOOo/tests/java/ifc/awt/_XListBox.java
@@ -61,7 +61,7 @@ public class _XListBox extends MultiMethodTest {
     /**
     * Listener implementation which sets flags on appropriate method calls
     */
-    protected class TestActionListener implements com.sun.star.awt.XActionListener {
+    protected static class TestActionListener implements com.sun.star.awt.XActionListener {
         public boolean disposingCalled = false ;
         public boolean actionPerformedCalled = false ;
 
@@ -80,7 +80,7 @@ public class _XListBox extends MultiMethodTest {
     /**
     * Listener implementation which sets flags on appropriate method calls
     */
-    protected class TestItemListener implements com.sun.star.awt.XItemListener {
+    protected static class TestItemListener implements com.sun.star.awt.XItemListener {
         public boolean disposingCalled = false ;
         public boolean itemStateChangedCalled = false ;
 
diff --git a/qadevOOo/tests/java/ifc/awt/_XRadioButton.java b/qadevOOo/tests/java/ifc/awt/_XRadioButton.java
index a23f83d7dc67..5bec1f848417 100644
--- a/qadevOOo/tests/java/ifc/awt/_XRadioButton.java
+++ b/qadevOOo/tests/java/ifc/awt/_XRadioButton.java
@@ -45,7 +45,7 @@ public class _XRadioButton extends MultiMethodTest {
     /**
     * Listener implementation which sets flags on appropriate method calls
     */
-    protected class TestItemListener implements com.sun.star.awt.XItemListener {
+    protected static class TestItemListener implements com.sun.star.awt.XItemListener {
         public boolean disposingCalled = false ;
         public boolean itemStateChangedCalled = false ;
         private final java.io.PrintWriter log;
diff --git a/qadevOOo/tests/java/ifc/awt/_XSpinField.java b/qadevOOo/tests/java/ifc/awt/_XSpinField.java
index e30c320719f1..e658d40e6bad 100644
--- a/qadevOOo/tests/java/ifc/awt/_XSpinField.java
+++ b/qadevOOo/tests/java/ifc/awt/_XSpinField.java
@@ -48,7 +48,7 @@ public class _XSpinField extends MultiMethodTest {
     * Listener implementation which set flags on appropriate
     * listener methods calls.
     */
-    protected class TestListener implements XSpinListener {
+    protected static class TestListener implements XSpinListener {
         public boolean upFl = false ;
         public boolean downFl = false ;
         public boolean firstFl = false ;
diff --git a/qadevOOo/tests/java/ifc/awt/_XTopWindow.java b/qadevOOo/tests/java/ifc/awt/_XTopWindow.java
index 56f0a5aa2a29..c33f4ccc9a38 100644
--- a/qadevOOo/tests/java/ifc/awt/_XTopWindow.java
+++ b/qadevOOo/tests/java/ifc/awt/_XTopWindow.java
@@ -50,7 +50,7 @@ public class _XTopWindow extends MultiMethodTest {
     * Listener implementation which sets flags on different
     * method calls.
     */
-    protected class TestListener implements XTopWindowListener {
+    protected static class TestListener implements XTopWindowListener {
         private final PrintWriter log;
         public boolean activated = false ;
         public boolean deactivated = false ;
diff --git a/qadevOOo/tests/java/ifc/awt/_XWindow.java b/qadevOOo/tests/java/ifc/awt/_XWindow.java
index 2638cb7bd000..b418a2b76078 100644
--- a/qadevOOo/tests/java/ifc/awt/_XWindow.java
+++ b/qadevOOo/tests/java/ifc/awt/_XWindow.java
@@ -162,7 +162,7 @@ public class _XWindow extends MultiMethodTest {
     * A class we use to test addWindowListener() and
     * removeWindowListener()
     */
-    public class TestWindowListener implements XWindowListener {
+    public static class TestWindowListener implements XWindowListener {
         public boolean resized = false ;
         public boolean moved = false ;
         public boolean hidden = false ;
@@ -323,7 +323,7 @@ public class _XWindow extends MultiMethodTest {
     * A class we use to test addFocusListener() and
     * removeFocusListener()
     */
-    public class TestFocusListener implements XFocusListener {
+    public static class TestFocusListener implements XFocusListener {
         public boolean gained = false ;
         public boolean lost = false ;
 
@@ -405,7 +405,7 @@ public class _XWindow extends MultiMethodTest {
     * A class we use to test addKeyListener() and
     * removeKeyListener()
     */
-    public class TestKeyListener implements XKeyListener {
+    public static class TestKeyListener implements XKeyListener {
         public boolean pressed = false;
         public boolean released = false;
         public void keyPressed(KeyEvent e) { pressed = true; }
@@ -444,7 +444,7 @@ public class _XWindow extends MultiMethodTest {
     * A class we use to test addMouseListener() and
     * removeMouseListener()
     */
-    public class TestMouseListener implements XMouseListener {
+    public static class TestMouseListener implements XMouseListener {
         public boolean pressed = false;
         public boolean released = false;
         public boolean entered = false;
@@ -507,7 +507,7 @@ public class _XWindow extends MultiMethodTest {
     * A class we use to test addMouseMotionListener() and
     * removeMouseMotionListener()
     */
-    public class TestMouseMotionListener implements XMouseMotionListener {
+    public static class TestMouseMotionListener implements XMouseMotionListener {
         public boolean dragged = false;
         public boolean moved = false;
 
@@ -558,7 +558,7 @@ public class _XWindow extends MultiMethodTest {
     * A class we use to test addPaintListener() and
     * removePaintListener()
     */
-    public class TestPaintListener implements XPaintListener {
+    public static class TestPaintListener implements XPaintListener {
         public boolean paint = false;
 
         public void windowPaint(PaintEvent e) {
diff --git a/qadevOOo/tests/java/ifc/beans/_XPropertySet.java b/qadevOOo/tests/java/ifc/beans/_XPropertySet.java
index 8ef74afa209d..0fe6b259348e 100644
--- a/qadevOOo/tests/java/ifc/beans/_XPropertySet.java
+++ b/qadevOOo/tests/java/ifc/beans/_XPropertySet.java
@@ -95,7 +95,7 @@ public class _XPropertySet extends MultiMethodTest {
     * Structure that collects the properties of different types to test :
     * Constrained, Bound and Normal.
     */
-    private final class PropsToTest {
+    private static final class PropsToTest {
         ArrayList< String > constrained = new ArrayList< String >();
         ArrayList< String > bound = new ArrayList< String >();
         ArrayList< String > normal = new ArrayList< String >();
diff --git a/qadevOOo/tests/java/ifc/bridge/_XUnoUrlResolver.java b/qadevOOo/tests/java/ifc/bridge/_XUnoUrlResolver.java
index db2cd8c9727a..f8f32686ed56 100644
--- a/qadevOOo/tests/java/ifc/bridge/_XUnoUrlResolver.java
+++ b/qadevOOo/tests/java/ifc/bridge/_XUnoUrlResolver.java
@@ -55,7 +55,7 @@ public class _XUnoUrlResolver extends MultiMethodTest {
      *
      * @see com.sun.star.bridge.XInstanceProvider
      */
-    class MyInstanceProvider implements XInstanceProvider {
+    static class MyInstanceProvider implements XInstanceProvider {
         /**
          * a MultiServiceFactory for creating instances
          *
diff --git a/qadevOOo/tests/java/ifc/datatransfer/clipboard/_XClipboard.java b/qadevOOo/tests/java/ifc/datatransfer/clipboard/_XClipboard.java
index d486472f76e1..dbb6b10c1c59 100644
--- a/qadevOOo/tests/java/ifc/datatransfer/clipboard/_XClipboard.java
+++ b/qadevOOo/tests/java/ifc/datatransfer/clipboard/_XClipboard.java
@@ -50,7 +50,7 @@ public class _XClipboard extends MultiMethodTest {
      * <code>XClipboardOwner</code> interface implementation which
      * stores parameters passed to <code>lostOwnership</code> method.
      */
-    class MyOwner implements XClipboardOwner {
+    static class MyOwner implements XClipboardOwner {
         XClipboard board;
         XTransferable contents;
 
@@ -64,7 +64,7 @@ public class _XClipboard extends MultiMethodTest {
     /**
      * Simpliest <code>XTransferable</code> interface implementation.
      */
-    class MyTransferable implements XTransferable {
+    static class MyTransferable implements XTransferable {
         public Object getTransferData(DataFlavor dataFlavor) {
             return "";
         }
diff --git a/qadevOOo/tests/java/ifc/datatransfer/clipboard/_XClipboardNotifier.java b/qadevOOo/tests/java/ifc/datatransfer/clipboard/_XClipboardNotifier.java
index de60d1b879b2..dc14f7da9948 100644
--- a/qadevOOo/tests/java/ifc/datatransfer/clipboard/_XClipboardNotifier.java
+++ b/qadevOOo/tests/java/ifc/datatransfer/clipboard/_XClipboardNotifier.java
@@ -53,7 +53,7 @@ public class _XClipboardNotifier extends MultiMethodTest {
      * <code>XClipboardOwner</code> interface implementation which
      * stores parameters passed to <code>lostOwnership</code> method.
      */
-    class MyOwner implements XClipboardOwner {
+    static class MyOwner implements XClipboardOwner {
         XClipboard board;
         XTransferable contents;
 
@@ -67,7 +67,7 @@ public class _XClipboardNotifier extends MultiMethodTest {
      * Simpliest <code>XTransferable</code> interface implementation
      * which supports "text/html" data type.
      */
-    class MyTransferable implements XTransferable {
+    static class MyTransferable implements XTransferable {
         DataFlavor[] supportedFlavors;
 
         public MyTransferable() {
diff --git a/qadevOOo/tests/java/ifc/document/_XFilter.java b/qadevOOo/tests/java/ifc/document/_XFilter.java
index 3f4779721296..37a8c2b68ea9 100644
--- a/qadevOOo/tests/java/ifc/document/_XFilter.java
+++ b/qadevOOo/tests/java/ifc/document/_XFilter.java
@@ -155,7 +155,7 @@ public class _XFilter extends MultiMethodTest {
     * Calls <code>filter()</code> method in a separate thread.
     * Necessary to check if the cancel method works
     */
-    protected class FilterThread extends Thread {
+    protected static class FilterThread extends Thread {
 
         public boolean filterRes = true;
         private final XFilter Filter;
diff --git a/qadevOOo/tests/java/ifc/form/_XFormController.java b/qadevOOo/tests/java/ifc/form/_XFormController.java
index 8ae4aa4af495..eb0393985f9b 100644
--- a/qadevOOo/tests/java/ifc/form/_XFormController.java
+++ b/qadevOOo/tests/java/ifc/form/_XFormController.java
@@ -53,7 +53,7 @@ public class _XFormController extends MultiMethodTest {
     /**
      * Listener which determines and stores events occurred.
      */
-    protected class MyListener implements XFormControllerListener {
+    protected static class MyListener implements XFormControllerListener {
         public boolean activated = false ;
         public boolean deactivated = false ;
         public void disposing ( EventObject oEvent ) {}
diff --git a/qadevOOo/tests/java/ifc/form/_XLoadable.java b/qadevOOo/tests/java/ifc/form/_XLoadable.java
index 9ef20e4cd1ef..7f89388f7cf4 100644
--- a/qadevOOo/tests/java/ifc/form/_XLoadable.java
+++ b/qadevOOo/tests/java/ifc/form/_XLoadable.java
@@ -44,7 +44,7 @@ public class _XLoadable extends MultiMethodTest {
     /**
     * Listener implementation which sets flags on appropriate method calls
     */
-    protected class TestLoadListener implements com.sun.star.form.XLoadListener {
+    protected static class TestLoadListener implements com.sun.star.form.XLoadListener {
         public boolean disposingCalled = false ;
         public boolean loadedCalled = false ;
         public boolean reloadedCalled = false ;
diff --git a/qadevOOo/tests/java/ifc/form/_XSubmit.java b/qadevOOo/tests/java/ifc/form/_XSubmit.java
index 35d9eea6c460..2d068a1ae237 100644
--- a/qadevOOo/tests/java/ifc/form/_XSubmit.java
+++ b/qadevOOo/tests/java/ifc/form/_XSubmit.java
@@ -61,7 +61,7 @@ public class _XSubmit extends MultiMethodTest {
 
     public static XSubmit oObj = null;
 
-    public class MySubmitListener implements XSubmitListener {
+    public static class MySubmitListener implements XSubmitListener {
         public int called = 0 ;
         public void disposing ( EventObject oEvent ) {
         }
diff --git a/qadevOOo/tests/java/ifc/form/_XUpdateBroadcaster.java b/qadevOOo/tests/java/ifc/form/_XUpdateBroadcaster.java
index c482af5ef615..3df9eecd69b1 100644
--- a/qadevOOo/tests/java/ifc/form/_XUpdateBroadcaster.java
+++ b/qadevOOo/tests/java/ifc/form/_XUpdateBroadcaster.java
@@ -87,7 +87,7 @@ public class _XUpdateBroadcaster extends MultiMethodTest {
     * Listener implementation, which can accept or reject update
     * requests and store event calls.
     */
-    protected class TestListener implements XUpdateListener {
+    protected static class TestListener implements XUpdateListener {
         /**
         * Indicates must listener approve update requests or not.
         */
diff --git a/qadevOOo/tests/java/ifc/form/binding/_XBindableValue.java b/qadevOOo/tests/java/ifc/form/binding/_XBindableValue.java
index 11bcb3476842..da35e5cc7c97 100644
--- a/qadevOOo/tests/java/ifc/form/binding/_XBindableValue.java
+++ b/qadevOOo/tests/java/ifc/form/binding/_XBindableValue.java
@@ -81,7 +81,7 @@ public class _XBindableValue extends MultiMethodTest {
         return res;
     }
 
-    class MyValueBinding implements XValueBinding {
+    static class MyValueBinding implements XValueBinding {
         private final ArrayList<Type> types = new ArrayList<Type>();
 
         public com.sun.star.uno.Type[] getSupportedValueTypes() {
diff --git a/qadevOOo/tests/java/ifc/form/validation/_XValidatable.java b/qadevOOo/tests/java/ifc/form/validation/_XValidatable.java
index 3d0bd6111eb1..eec5315ed4c7 100644
--- a/qadevOOo/tests/java/ifc/form/validation/_XValidatable.java
+++ b/qadevOOo/tests/java/ifc/form/validation/_XValidatable.java
@@ -56,7 +56,7 @@ public class _XValidatable extends MultiMethodTest {
         tRes.tested("setValidator()", res);
     }
 
-    public class MyValidator implements XValidator {
+    public static class MyValidator implements XValidator {
         public void addValidityConstraintListener(com.sun.star.form.validation.XValidityConstraintListener xValidityConstraintListener)
             throws com.sun.star.lang.NullPointerException {
         }
diff --git a/qadevOOo/tests/java/ifc/frame/_XDispatch.java b/qadevOOo/tests/java/ifc/frame/_XDispatch.java
index 2fd127036f7b..e059e347e7d0 100644
--- a/qadevOOo/tests/java/ifc/frame/_XDispatch.java
+++ b/qadevOOo/tests/java/ifc/frame/_XDispatch.java
@@ -55,7 +55,7 @@ public class _XDispatch extends MultiMethodTest {
     /**
     * Listener implementation which sets flags on appropriate method calls
     */
-    protected class TestStatusListener implements
+    protected static class TestStatusListener implements
             com.sun.star.frame.XStatusListener {
         public boolean disposingCalled = false ;
         public boolean statusChangedCalled = false ;
@@ -85,7 +85,7 @@ public class _XDispatch extends MultiMethodTest {
     /**
     * Listener implementation which sets flags on appropriate method calls
     */
-    protected class TestNotificationListener implements
+    protected static class TestNotificationListener implements
             com.sun.star.frame.XDispatchResultListener {
         public boolean disposingCalled = false ;
         public boolean finishedDispatch = false ;
diff --git a/qadevOOo/tests/java/ifc/frame/_XDispatchProviderInterception.java b/qadevOOo/tests/java/ifc/frame/_XDispatchProviderInterception.java
index a627fa13911b..ada2a936c02f 100644
--- a/qadevOOo/tests/java/ifc/frame/_XDispatchProviderInterception.java
+++ b/qadevOOo/tests/java/ifc/frame/_XDispatchProviderInterception.java
@@ -48,7 +48,7 @@ public class _XDispatchProviderInterception extends MultiMethodTest {
      * slave interceptors, and redirect all dispatch queries to the master
      * provider.
      */
-    public class TestInterceptor implements XDispatchProviderInterceptor {
+    public static class TestInterceptor implements XDispatchProviderInterceptor {
         private final PrintWriter log;
         public XDispatchProvider master = null, slave = null ;
 
diff --git a/qadevOOo/tests/java/ifc/frame/_XFrameLoader.java b/qadevOOo/tests/java/ifc/frame/_XFrameLoader.java
index ec7a366412bb..d6194e447d4f 100644
--- a/qadevOOo/tests/java/ifc/frame/_XFrameLoader.java
+++ b/qadevOOo/tests/java/ifc/frame/_XFrameLoader.java
@@ -67,7 +67,7 @@ public class _XFrameLoader extends MultiMethodTest {
     /**
     * Implemetation of load listener which geristers all its calls.
     */
-    protected class TestListener implements XLoadEventListener {
+    protected static class TestListener implements XLoadEventListener {
         public boolean finished = false ;
         public boolean cancelled = false ;
 
diff --git a/qadevOOo/tests/java/ifc/frame/_XNotifyingDispatch.java b/qadevOOo/tests/java/ifc/frame/_XNotifyingDispatch.java
index af8621d53bd6..f1d2f12c098a 100644
--- a/qadevOOo/tests/java/ifc/frame/_XNotifyingDispatch.java
+++ b/qadevOOo/tests/java/ifc/frame/_XNotifyingDispatch.java
@@ -53,7 +53,7 @@ public class _XNotifyingDispatch extends MultiMethodTest {
     /**
     * Listener implementation which sets flags on appropriate method calls
     */
-    protected class TestNotificationListener implements
+    protected static class TestNotificationListener implements
             com.sun.star.frame.XDispatchResultListener {
         public boolean disposingCalled = false ;
         public boolean finishedDispatch = false ;
diff --git a/qadevOOo/tests/java/ifc/frame/_XPopupMenuController.java b/qadevOOo/tests/java/ifc/frame/_XPopupMenuController.java
index be8c32da4cf0..8a6d0e397928 100644
--- a/qadevOOo/tests/java/ifc/frame/_XPopupMenuController.java
+++ b/qadevOOo/tests/java/ifc/frame/_XPopupMenuController.java
@@ -43,7 +43,7 @@ public class _XPopupMenuController extends MultiMethodTest {
         tRes.tested("updatePopupMenu()", true);
     }
 
-    private class PopupMenuImpl implements XPopupMenu {
+    private static class PopupMenuImpl implements XPopupMenu {
 
         public void addMenuListener(com.sun.star.awt.XMenuListener xMenuListener) {
             System.out.println("addMenuListener called.");
diff --git a/qadevOOo/tests/java/ifc/script/_XEventAttacherManager.java b/qadevOOo/tests/java/ifc/script/_XEventAttacherManager.java
index bc079652fba3..140cb008ae05 100644
--- a/qadevOOo/tests/java/ifc/script/_XEventAttacherManager.java
+++ b/qadevOOo/tests/java/ifc/script/_XEventAttacherManager.java
@@ -476,7 +476,7 @@ public class _XEventAttacherManager extends MultiMethodTest {
      * No functionality implemented.
      * @see com.sun.star.script.XScriptListener
      */
-    class MyScriptListener implements XScriptListener {
+    static class MyScriptListener implements XScriptListener {
         public void firing(ScriptEvent evt) {
         }
 
diff --git a/qadevOOo/tests/java/ifc/sdb/_XRowSetApproveBroadcaster.java b/qadevOOo/tests/java/ifc/sdb/_XRowSetApproveBroadcaster.java
index 9ac091b607e1..8a7cf52e182b 100644
--- a/qadevOOo/tests/java/ifc/sdb/_XRowSetApproveBroadcaster.java
+++ b/qadevOOo/tests/java/ifc/sdb/_XRowSetApproveBroadcaster.java
@@ -79,7 +79,7 @@ public class _XRowSetApproveBroadcaster extends MultiMethodTest {
     * which just detects and stores approve requipements. They are checked
     * later.
     */
-    private class TestListener implements XRowSetApproveListener {
+    private static class TestListener implements XRowSetApproveListener {
         public boolean approveRequests = true ;
         public boolean approveCursorMoveCalled = false ;
         public boolean approveRowChangeCalled = false ;
diff --git a/qadevOOo/tests/java/ifc/sdbc/_XRowSet.java b/qadevOOo/tests/java/ifc/sdbc/_XRowSet.java
index 771d51ca062a..cda9da30b92f 100644
--- a/qadevOOo/tests/java/ifc/sdbc/_XRowSet.java
+++ b/qadevOOo/tests/java/ifc/sdbc/_XRowSet.java
@@ -55,7 +55,7 @@ public class _XRowSet extends MultiMethodTest {
     private _XRowSetApproveBroadcaster.RowSetApproveChecker checker = null ;
     private final TestListener listener = new TestListener() ;
 
-    private class TestListener implements XRowSetListener {
+    private static class TestListener implements XRowSetListener {
         public boolean cursorMoved = false ;
         public boolean rowChanged = false ;
         public boolean rowSetChanged = false ;
diff --git a/qadevOOo/tests/java/ifc/sheet/_SpreadsheetDocumentSettings.java b/qadevOOo/tests/java/ifc/sheet/_SpreadsheetDocumentSettings.java
index 2a371500e128..81f63666a646 100644
--- a/qadevOOo/tests/java/ifc/sheet/_SpreadsheetDocumentSettings.java
+++ b/qadevOOo/tests/java/ifc/sheet/_SpreadsheetDocumentSettings.java
@@ -109,7 +109,7 @@ public class _SpreadsheetDocumentSettings extends MultiPropertyTest {
      * for russian locale.
      * @see com.sun.star.i18n.XForbiddenCharacters
      */
-    protected class ForbiddenChrTest implements XForbiddenCharacters {
+    protected static class ForbiddenChrTest implements XForbiddenCharacters {
         protected Locale locale = new Locale("ru", "RU", "");
         protected ForbiddenCharacters chrs = new ForbiddenCharacters("q", "w");
 
diff --git a/qadevOOo/tests/java/ifc/sheet/_XDataPilotTable2.java b/qadevOOo/tests/java/ifc/sheet/_XDataPilotTable2.java
index 9845349dd83c..541e0d07e1dd 100644
--- a/qadevOOo/tests/java/ifc/sheet/_XDataPilotTable2.java
+++ b/qadevOOo/tests/java/ifc/sheet/_XDataPilotTable2.java
@@ -68,7 +68,7 @@ public class _XDataPilotTable2 extends MultiMethodTest
      * exception to be thrown when obtaining a result data for a cell fails
      * (probably because the cell is not a result cell).
      */
-    private class ResultCellFailure extends com.sun.star.uno.Exception {}
+    private static class ResultCellFailure extends com.sun.star.uno.Exception {}
 
     @Override
     protected void before()
diff --git a/qadevOOo/tests/java/ifc/style/_CharacterProperties.java b/qadevOOo/tests/java/ifc/style/_CharacterProperties.java
index b2c51a8d38f8..c1c651ce02b4 100644
--- a/qadevOOo/tests/java/ifc/style/_CharacterProperties.java
+++ b/qadevOOo/tests/java/ifc/style/_CharacterProperties.java
@@ -482,7 +482,7 @@ public class _CharacterProperties extends MultiPropertyTest {
         tRes.tested("TextUserDefinedAttributes", res);
     }
 
-    private class OwnUserDefinedAttributes implements XNameContainer{
+    private static class OwnUserDefinedAttributes implements XNameContainer{
         HashMap<String, Object> members = null;
 
 
diff --git a/qadevOOo/tests/java/ifc/style/_ParagraphProperties.java b/qadevOOo/tests/java/ifc/style/_ParagraphProperties.java
index 27f5788caf51..178f6e2ca3f4 100644
--- a/qadevOOo/tests/java/ifc/style/_ParagraphProperties.java
+++ b/qadevOOo/tests/java/ifc/style/_ParagraphProperties.java
@@ -453,7 +453,7 @@ public class _ParagraphProperties extends MultiPropertyTest {
         tRes.tested("ParaUserDefinedAttributes", res);
     }
 
-    private class OwnUserDefinedAttributes implements XNameContainer{
+    private static class OwnUserDefinedAttributes implements XNameContainer{
         HashMap<String, Object> members = null;
 
 
diff --git a/qadevOOo/tests/java/ifc/ucb/_XRemoteContentProviderAcceptor.java b/qadevOOo/tests/java/ifc/ucb/_XRemoteContentProviderAcceptor.java
index 2a4d1a25b543..63e41ab9d7d9 100644
--- a/qadevOOo/tests/java/ifc/ucb/_XRemoteContentProviderAcceptor.java
+++ b/qadevOOo/tests/java/ifc/ucb/_XRemoteContentProviderAcceptor.java
@@ -41,7 +41,7 @@ public class _XRemoteContentProviderAcceptor extends MultiMethodTest {
      * The simple <code>XRemoteContentProviderDoneListener</code>
      * implementation.
      */
-    public class DoneListener implements XRemoteContentProviderDoneListener {
+    public static class DoneListener implements XRemoteContentProviderDoneListener {
 
         public void doneWithRemoteContentProviders
                 (XRemoteContentProviderAcceptor xRCPA) {
diff --git a/qadevOOo/tests/java/ifc/util/_XFlushable.java b/qadevOOo/tests/java/ifc/util/_XFlushable.java
index d96e075e95e5..d8a56bd8d616 100644
--- a/qadevOOo/tests/java/ifc/util/_XFlushable.java
+++ b/qadevOOo/tests/java/ifc/util/_XFlushable.java
@@ -43,7 +43,7 @@ public class _XFlushable extends MultiMethodTest {
      * Simple <code>XFlushListener</code> implementation which
      * just registers if any calls to its methods were made.
      */
-    private class MyFlushListener implements XFlushListener{
+    private static class MyFlushListener implements XFlushListener{
         boolean called = false ;
         public void flushed(com.sun.star.lang.EventObject e) {
             called = true ;
diff --git a/qadevOOo/tests/java/mod/_dbaccess/ORowSet.java b/qadevOOo/tests/java/mod/_dbaccess/ORowSet.java
index 602687e755ed..2cb340ed3182 100644
--- a/qadevOOo/tests/java/mod/_dbaccess/ORowSet.java
+++ b/qadevOOo/tests/java/mod/_dbaccess/ORowSet.java
@@ -532,7 +532,7 @@ public class ORowSet extends TestCase {
      * for the XCompletedExecution test
      * @see ifc.sdb._XCompletedExecution
      */
-    private class InteractionHandlerImpl implements _XCompletedExecution.CheckInteractionHandler {
+    private static class InteractionHandlerImpl implements _XCompletedExecution.CheckInteractionHandler {
         private boolean handlerWasUsed = false;
         private PrintWriter log = new PrintWriter(System.out);
 
diff --git a/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java b/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java
index ac1b8e7c06cd..7ab7235f423d 100644
--- a/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java
+++ b/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java
@@ -819,7 +819,7 @@ public class ODatabaseForm extends TestCase {
      * for the XCompletedExecution test
      * @see ifc.sdb._XCompletedExecution
      */
-    private class InteractionHandlerImpl implements _XCompletedExecution.CheckInteractionHandler {
+    private static class InteractionHandlerImpl implements _XCompletedExecution.CheckInteractionHandler {
         private boolean handlerWasUsed = false;
         private PrintWriter log = new PrintWriter(System.out);
 
diff --git a/qadevOOo/tests/java/mod/_remotebridge/various.java b/qadevOOo/tests/java/mod/_remotebridge/various.java
index 2393efb397ec..c18d6a4ef1eb 100644
--- a/qadevOOo/tests/java/mod/_remotebridge/various.java
+++ b/qadevOOo/tests/java/mod/_remotebridge/various.java
@@ -80,7 +80,7 @@ public class various extends TestCase {
      *
      * @see com.sun.star.bridge.XInstanceProvider
      */
-    private class MyInstanceProvider implements XInstanceProvider {
+    private static class MyInstanceProvider implements XInstanceProvider {
         /**
          * a MultiServiceFactory for creating instances
          *
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoTreeControl.java b/qadevOOo/tests/java/mod/_toolkit/UnoTreeControl.java
index bb488febd00e..3a12103babe9 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoTreeControl.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoTreeControl.java
@@ -248,7 +248,7 @@ public class UnoTreeControl extends TestCase {
         }
     }
 
-    private class execurteDialog extends Thread{
+    private static class execurteDialog extends Thread{
         private final XDialog mXDialog;
 
         public execurteDialog(XDialog xDialog){
diff --git a/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java b/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java
index 3596413c0b7f..99aa6d43d231 100644
--- a/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java
+++ b/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java
@@ -130,7 +130,7 @@ public class SDBCReportDataFactory implements DataSourceFactory
         }
     }
 
-    private class ParameterDefinition
+    private static class ParameterDefinition
     {
         private int parameterCount = 0;
         private final ArrayList<Integer> parameterIndex = new ArrayList<Integer>();
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 c0c69051f4f6..7c28efb96e48 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
@@ -195,7 +195,7 @@ public class ScriptEditorForJavaScript implements ScriptEditor {
     private ScriptEditorForJavaScript(XScriptContext context, URL url) {
         initUI();
         Scriptable scope = getScope(context);
-        rhinoWindow.openFile(url, scope, new closeHandler(url));
+        rhinoWindow.openFile(url, scope, new CloseHandler(url));
         this.scriptURL = url;
     }
 
@@ -294,11 +294,11 @@ public class ScriptEditorForJavaScript implements ScriptEditor {
         return scope;
     }
 
-    private class closeHandler implements Runnable {
+    private static class CloseHandler implements Runnable {
 
         private final URL url;
 
-        private closeHandler(URL url) {
+        private CloseHandler(URL url) {
             this.url = url;
         }
 
diff --git a/wizards/com/sun/star/wizards/db/TableDescriptor.java b/wizards/com/sun/star/wizards/db/TableDescriptor.java
index f844d59bc3a6..ee9c427ba6f2 100644
--- a/wizards/com/sun/star/wizards/db/TableDescriptor.java
+++ b/wizards/com/sun/star/wizards/db/TableDescriptor.java
@@ -83,9 +83,8 @@ public class TableDescriptor extends CommandMetaData implements XContainerListen
         xWindow = _xWindow;
     }
 
-    private class ColumnDescriptor
+    private static class ColumnDescriptor
     {
-
         String Name;
         XPropertySet xColPropertySet;
 
diff --git a/wizards/com/sun/star/wizards/db/TypeInspector.java b/wizards/com/sun/star/wizards/db/TypeInspector.java
index a555078a0385..0067b5906fed 100644
--- a/wizards/com/sun/star/wizards/db/TypeInspector.java
+++ b/wizards/com/sun/star/wizards/db/TypeInspector.java
@@ -46,7 +46,7 @@ public class TypeInspector
     };
     static final int INVALID = 999999;
 
-    public class TypeInfo
+    public static class TypeInfo
     {
         public boolean bisAutoIncrementable;
 
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeZip.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeZip.java
index 0345ac79ef2e..4965885b4a22 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeZip.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeZip.java
@@ -411,7 +411,7 @@ class OfficeZip {
      *
      * <p>These are stored in {@code entryList}.</p>
      */
-    private class Entry {
+    private static class Entry {
 
         ZipEntry zipEntry = null;
         byte bytes[] = null;