summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-08-05 11:17:25 +0200
committerNoel Grandin <noel@peralex.com>2014-08-08 09:48:16 +0200
commit27459c71ef5f6f27749de36334e8a20fe4731e62 (patch)
tree2f175826d54010fcdfcd75879a67b89a57c96dcb
parent8d6cf7a147acde4e4a4f7600af25ed614b07f90d (diff)
java: remove unused fields
Change-Id: I25fef9590a34ec8d9aab182b3d267ae3cd649a87
-rw-r--r--bean/com/sun/star/beans/LocalOfficeConnection.java6
-rw-r--r--bean/com/sun/star/comp/beans/LocalOfficeConnection.java4
-rw-r--r--bridges/test/java_remote/Bug107753_Test.java3
-rw-r--r--connectivity/qa/complex/connectivity/FlatFileAccess.java5
-rw-r--r--desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/OptionsEventHandler.java3
-rw-r--r--framework/qa/complex/loadAllDocuments/StatusIndicator.java7
-rw-r--r--odk/examples/DevelopersGuide/Components/SimpleLicense/LicenseTest.java18
-rw-r--r--reportdesign/qa/complex/reportdesign/ReportDesignerTest.java2
-rw-r--r--scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java3
-rw-r--r--scripting/java/org/openoffice/idesupport/localoffice/LocalOfficeImpl.java2
-rw-r--r--scripting/workben/installer/Register.java3
-rw-r--r--scripting/workben/installer/Welcome.java1
-rw-r--r--scripting/workben/installer/XmlUpdater.java3
-rw-r--r--smoketest/com/sun/star/comp/smoketest/TestExtension.java18
-rw-r--r--smoketest/org/libreoffice/smoketest/SmoketestCommandEnvironment.java11
-rw-r--r--toolkit/test/accessibility/Canvas.java5
-rw-r--r--wizards/com/sun/star/wizards/document/OfficeDocument.java2
-rw-r--r--wizards/com/sun/star/wizards/report/ReportTextDocument.java2
-rw-r--r--wizards/com/sun/star/wizards/text/TextSectionHandler.java2
-rw-r--r--wizards/com/sun/star/wizards/text/TextTableHandler.java2
20 files changed, 1 insertions, 101 deletions
diff --git a/bean/com/sun/star/beans/LocalOfficeConnection.java b/bean/com/sun/star/beans/LocalOfficeConnection.java
index 7056bb9758f5..b4b59359a32b 100644
--- a/bean/com/sun/star/beans/LocalOfficeConnection.java
+++ b/bean/com/sun/star/beans/LocalOfficeConnection.java
@@ -44,7 +44,6 @@ public class LocalOfficeConnection
public static final String OFFICE_ID_SUFFIX = "_Office";
private Process mProcess;
- private ContainerFactory mContainerFactory;
private XComponentContext mContext;
private String mURL;
@@ -134,14 +133,13 @@ public class LocalOfficeConnection
}
/**
- * Sets an AWT container catory.
+ * Sets an AWT container factory.
*
* @param containerFactory This is a application provided AWT container
* factory.
*/
public void setContainerFactory(ContainerFactory containerFactory)
{
- mContainerFactory = containerFactory;
}
/**
@@ -185,8 +183,6 @@ public class LocalOfficeConnection
catch ( RuntimeException aExc ) {}
}
mComponents.clear();
-
- mContainerFactory = null;
mContext = null;
}
diff --git a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
index 6f87f0d06ea6..7c291072d46e 100644
--- a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
+++ b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
@@ -50,7 +50,6 @@ public class LocalOfficeConnection
public static final String OFFICE_ID_SUFFIX = "_Office";
private Process mProcess;
- private ContainerFactory mContainerFactory;
private XComponentContext mContext;
private XBridge mBridge;
@@ -196,7 +195,6 @@ public class LocalOfficeConnection
*/
public void setContainerFactory(ContainerFactory containerFactory)
{
- mContainerFactory = containerFactory;
}
/**
@@ -258,8 +256,6 @@ public class LocalOfficeConnection
mBridge = null;
}
-
- mContainerFactory = null;
mContext = null;
}
diff --git a/bridges/test/java_remote/Bug107753_Test.java b/bridges/test/java_remote/Bug107753_Test.java
index 59d8e08ca65f..e96152cf9d34 100644
--- a/bridges/test/java_remote/Bug107753_Test.java
+++ b/bridges/test/java_remote/Bug107753_Test.java
@@ -348,7 +348,6 @@ public final class Bug107753_Test extends ComplexTestCase {
private static final class Provider implements XInstanceProvider {
public Provider(TestBed testBed) {
- this.testBed = testBed;
}
public Object getInstance(String instanceName) {
@@ -362,8 +361,6 @@ public final class Bug107753_Test extends ComplexTestCase {
}
};
}
-
- private final TestBed testBed;
}
public interface XTransport extends XInterface {
diff --git a/connectivity/qa/complex/connectivity/FlatFileAccess.java b/connectivity/qa/complex/connectivity/FlatFileAccess.java
index 81d460611b59..bd2416fd9382 100644
--- a/connectivity/qa/complex/connectivity/FlatFileAccess.java
+++ b/connectivity/qa/complex/connectivity/FlatFileAccess.java
@@ -86,11 +86,6 @@ public class FlatFileAccess extends ComplexTestCase
super( i_day, i_month, i_year );
}
- EqualityDate( Date i_date )
- {
- super( i_date.Day, i_date.Month, i_date.Year );
- }
-
@Override
public boolean equals( Object i_compare )
{
diff --git a/desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/OptionsEventHandler.java b/desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/OptionsEventHandler.java
index 2c420ab2a00d..383eee59d4c6 100644
--- a/desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/OptionsEventHandler.java
+++ b/desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/OptionsEventHandler.java
@@ -52,8 +52,6 @@ public class OptionsEventHandler {
private XComponentContext m_cmpCtx;
- private XMultiComponentFactory m_xMCF;
-
private XNameAccess m_xAccessLeaves;
/**Names of supported options pages.
@@ -71,7 +69,6 @@ public class OptionsEventHandler {
public _OptionsEventHandler(XComponentContext xCompContext) {
m_cmpCtx = xCompContext;
- m_xMCF = m_cmpCtx.getServiceManager();
//Create the com.sun.star.configuration.ConfigurationUpdateAccess
//for the registry node which contains the data for our option
diff --git a/framework/qa/complex/loadAllDocuments/StatusIndicator.java b/framework/qa/complex/loadAllDocuments/StatusIndicator.java
index eb96e2d428a1..d83651ed861d 100644
--- a/framework/qa/complex/loadAllDocuments/StatusIndicator.java
+++ b/framework/qa/complex/loadAllDocuments/StatusIndicator.java
@@ -45,10 +45,6 @@ public class StatusIndicator implements com.sun.star.task.XStatusIndicator
- /**
- * @member m_nRange max value for any progress
- */
- private int m_nRange ;
private boolean m_bWasUsed ;
@@ -59,7 +55,6 @@ public class StatusIndicator implements com.sun.star.task.XStatusIndicator
*/
public StatusIndicator( int nOut)
{
- m_nRange = 100 ;
m_bWasUsed = false;
}
@@ -79,7 +74,6 @@ public class StatusIndicator implements com.sun.star.task.XStatusIndicator
synchronized(this)
{
m_bWasUsed = true;
- m_nRange = nRange;
}
impl_show();
}
@@ -94,7 +88,6 @@ public class StatusIndicator implements com.sun.star.task.XStatusIndicator
synchronized(this)
{
m_bWasUsed = true;
- m_nRange = 100;
}
impl_show();
}
diff --git a/odk/examples/DevelopersGuide/Components/SimpleLicense/LicenseTest.java b/odk/examples/DevelopersGuide/Components/SimpleLicense/LicenseTest.java
index d02c9672be55..0c8495c80e33 100644
--- a/odk/examples/DevelopersGuide/Components/SimpleLicense/LicenseTest.java
+++ b/odk/examples/DevelopersGuide/Components/SimpleLicense/LicenseTest.java
@@ -55,29 +55,11 @@ public class LicenseTest {
static private final String __serviceName =
"org.openoffice.LicenseTest";
- /** The initial component contextr, that gives access to
- * the service manager, supported singletons, ...
- * It's often later used
- */
- private XComponentContext m_cmpCtx;
-
- /** The service manager, that gives access to all registered services.
- * It's often later used
- */
- private XMultiComponentFactory m_xMCF;
-
/** The constructor of the inner class has a XMultiServiceFactory parameter.
* @param xmultiservicefactoryInitialization A special service factory
* could be introduced while initializing.
*/
public _LicenseTest(XComponentContext xCompContext) {
- try {
- m_cmpCtx = xCompContext;
- m_xMCF = m_cmpCtx.getServiceManager();
- }
- catch( Exception e ) {
- e.printStackTrace();
- }
}
/** This method returns an array of all supported service names.
diff --git a/reportdesign/qa/complex/reportdesign/ReportDesignerTest.java b/reportdesign/qa/complex/reportdesign/ReportDesignerTest.java
index 4c7b5275f059..ba2dd9b6db6b 100644
--- a/reportdesign/qa/complex/reportdesign/ReportDesignerTest.java
+++ b/reportdesign/qa/complex/reportdesign/ReportDesignerTest.java
@@ -179,8 +179,6 @@ public class ReportDesignerTest
}
- private OfficeProvider m_aProvider = null;
-
private String m_sMailAddress = null;
private String m_sUPDMinor;
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 4f6f88bdb065..830c58a53faa 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
@@ -488,16 +488,13 @@ XInitialization {
}
public class ActionListenerImpl implements com.sun.star.awt.XActionListener {
- private XControlContainer _xControlCont;
private String _buttonName;
public ActionListenerImpl( XControlContainer xControlCont, String buttonName ) {
- _xControlCont = xControlCont;
_buttonName = buttonName;
}
// XEventListener
public void disposing( EventObject eventObject ) {
- _xControlCont = null;
}
// XActionListener
diff --git a/scripting/java/org/openoffice/idesupport/localoffice/LocalOfficeImpl.java b/scripting/java/org/openoffice/idesupport/localoffice/LocalOfficeImpl.java
index c94b3c29803c..0cd6091f3552 100644
--- a/scripting/java/org/openoffice/idesupport/localoffice/LocalOfficeImpl.java
+++ b/scripting/java/org/openoffice/idesupport/localoffice/LocalOfficeImpl.java
@@ -46,7 +46,6 @@ public final class LocalOfficeImpl
private final static String STORAGE_MRG_SINGLETON =
"/singletons/drafts.com.sun.star.script.framework.storage.theScriptStorageManager";
- private transient String mOfficePath;
private transient XMultiComponentFactory mComponentFactory;
private transient XComponentContext mComponentContext;
/**
@@ -66,7 +65,6 @@ public final class LocalOfficeImpl
protected void connect(String officePath, int port)
throws ConnectException
{
- mOfficePath = officePath;
try {
bootstrap(port);
} catch (java.lang.Exception ex) {
diff --git a/scripting/workben/installer/Register.java b/scripting/workben/installer/Register.java
index 079f7522c61e..d9bca56d7261 100644
--- a/scripting/workben/installer/Register.java
+++ b/scripting/workben/installer/Register.java
@@ -22,9 +22,6 @@ import java.lang.String;
import java.io.*;
import javax.swing.*;
public class Register{
- private static String[] singletonDefParams = { "drafts.com.sun.star.script.framework.theScriptRuntimeForJava=drafts.com.sun.star.script.framework.ScriptRuntimeForJava",
- "drafts.com.sun.star.script.framework.storage.theScriptStorageManager=drafts.com.sun.star.script.framework.storage.ScriptStorageManager",
- "drafts.com.sun.star.script.framework.theScriptRuntimeManager=drafts.com.sun.star.script.framework.ScriptRuntimeManager"};
public static boolean register(String path, JLabel statusLabel) {
diff --git a/scripting/workben/installer/Welcome.java b/scripting/workben/installer/Welcome.java
index 8c99ca1919c0..8f1786c90f9d 100644
--- a/scripting/workben/installer/Welcome.java
+++ b/scripting/workben/installer/Welcome.java
@@ -79,7 +79,6 @@ public class Welcome extends javax.swing.JPanel implements ActionListener {
private javax.swing.JPanel welcomePanel;
private javax.swing.JTextArea area;
private InstallWizard wizard;
- private static final String [] versions = { "StarOffice 6.1" };
private boolean nextButtonEnable = true;
// End of variables declaration//GEN-END:variables
diff --git a/scripting/workben/installer/XmlUpdater.java b/scripting/workben/installer/XmlUpdater.java
index 384f90a088ad..30ef794fbe0e 100644
--- a/scripting/workben/installer/XmlUpdater.java
+++ b/scripting/workben/installer/XmlUpdater.java
@@ -24,7 +24,6 @@ import javax.swing.*;
public class XmlUpdater extends Thread {
- private String classesPath = null;
private String installPath;
private boolean netInstall;
private boolean bindingsInstall;
@@ -154,8 +153,6 @@ public class XmlUpdater extends Thread {
internalThread = Thread.currentThread();
- classesPath= installPath.concat(File.separator+"program"+File.separator+"classes"+File.separator);
-
String progpath=installPath;
progpath= progpath.concat(File.separator+"program"+File.separator);
diff --git a/smoketest/com/sun/star/comp/smoketest/TestExtension.java b/smoketest/com/sun/star/comp/smoketest/TestExtension.java
index f62147df8643..0311a9c96037 100644
--- a/smoketest/com/sun/star/comp/smoketest/TestExtension.java
+++ b/smoketest/com/sun/star/comp/smoketest/TestExtension.java
@@ -42,29 +42,11 @@ public class TestExtension {
static private final String __serviceName =
"com.sun.star.comp.smoketest.TestExtension";
- /** The initial component contextr, that gives access to
- * the service manager, supported singletons, ...
- * It's often later used
- */
- private XComponentContext m_cmpCtx;
-
- /** The service manager, that gives access to all registered services.
- * It's often later used
- */
- private XMultiComponentFactory m_xMCF;
-
/** The constructor of the inner class has a XMultiServiceFactory parameter.
* @param xmultiservicefactoryInitialization A special service factory
* could be introduced while initializing.
*/
public _TestExtension(XComponentContext xCompContext) {
- try {
- m_cmpCtx = xCompContext;
- m_xMCF = m_cmpCtx.getServiceManager();
- }
- catch( Exception e ) {
- e.printStackTrace();
- }
}
/** This method returns an array of all supported service names.
diff --git a/smoketest/org/libreoffice/smoketest/SmoketestCommandEnvironment.java b/smoketest/org/libreoffice/smoketest/SmoketestCommandEnvironment.java
index 14a5c4a6b69e..5b41e25058c0 100644
--- a/smoketest/org/libreoffice/smoketest/SmoketestCommandEnvironment.java
+++ b/smoketest/org/libreoffice/smoketest/SmoketestCommandEnvironment.java
@@ -35,18 +35,7 @@ public class SmoketestCommandEnvironment extends WeakBase
static private final String __serviceName =
"com.sun.star.deployment.test.SmoketestCommandEnvironment";
- private XComponentContext m_cmpCtx;
- private XMultiComponentFactory m_xMCF;
-
-
public SmoketestCommandEnvironment(XComponentContext xCompContext) {
- try {
- m_cmpCtx = xCompContext;
- m_xMCF = m_cmpCtx.getServiceManager();
- }
- catch( Exception e ) {
- e.printStackTrace();
- }
}
public static String[] getServiceNames() {
diff --git a/toolkit/test/accessibility/Canvas.java b/toolkit/test/accessibility/Canvas.java
index 876a713c14b7..c1e2bdf74d25 100644
--- a/toolkit/test/accessibility/Canvas.java
+++ b/toolkit/test/accessibility/Canvas.java
@@ -70,7 +70,6 @@ class Canvas
setShowDescriptions (true);
setShowNames (true);
setAntialiasing (true);
- maLastWidgetSize = new Dimension (0,0);
}
/** Tell the canvas which tree view to use to highlight accessible
@@ -340,7 +339,6 @@ class Canvas
mnVOffset = 0;
}
}
- maLastWidgetSize = aWidgetSize;
}
@@ -463,7 +461,4 @@ class Canvas
maBoundingBox;
private JTree
maTree;
- // The size of the widget at the last call of setupTransformation()
- private Dimension
- maLastWidgetSize;
}
diff --git a/wizards/com/sun/star/wizards/document/OfficeDocument.java b/wizards/com/sun/star/wizards/document/OfficeDocument.java
index b2ca63020948..540c503bdf0f 100644
--- a/wizards/com/sun/star/wizards/document/OfficeDocument.java
+++ b/wizards/com/sun/star/wizards/document/OfficeDocument.java
@@ -60,12 +60,10 @@ public class OfficeDocument
{
private XWindowPeer xWindowPeer;
- private XMultiServiceFactory xMSF;
/** Creates a new instance of OfficeDocument */
public OfficeDocument(XMultiServiceFactory _xMSF)
{
- xMSF = _xMSF;
}
public static void attachEventCall(XComponent xComponent, String EventName, String EventType, String EventURL)
diff --git a/wizards/com/sun/star/wizards/report/ReportTextDocument.java b/wizards/com/sun/star/wizards/report/ReportTextDocument.java
index 7db1ff85e56f..cd6af8c937f8 100644
--- a/wizards/com/sun/star/wizards/report/ReportTextDocument.java
+++ b/wizards/com/sun/star/wizards/report/ReportTextDocument.java
@@ -57,7 +57,6 @@ class ReportTextDocument extends com.sun.star.wizards.text.TextDocument implemen
private String sMsgTableNotExisting;
private String sMsgCommonReportError;
private String ContentTemplatePath;
- private String LayoutTemplatePath;
private String sMsgEndAutopilot;
public boolean bIsCurLandscape;
public TextTableHandler oTextTableHandler;
@@ -160,7 +159,6 @@ class ReportTextDocument extends com.sun.star.wizards.text.TextDocument implemen
{
try
{
- this.LayoutTemplatePath = LayoutTemplatePath;
boolean bOldIsCurLandscape = AnyConverter.toBoolean(Helper.getUnoPropertyValue(ReportPageStyle, ISLANDSCAPE));
oTextStyleHandler.loadStyleTemplates(LayoutTemplatePath, "LoadPageStyles");
changePageOrientation(bOldIsCurLandscape);
diff --git a/wizards/com/sun/star/wizards/text/TextSectionHandler.java b/wizards/com/sun/star/wizards/text/TextSectionHandler.java
index 931a0f30dd17..0500e60f6031 100644
--- a/wizards/com/sun/star/wizards/text/TextSectionHandler.java
+++ b/wizards/com/sun/star/wizards/text/TextSectionHandler.java
@@ -41,14 +41,12 @@ public class TextSectionHandler
public XTextSectionsSupplier xTextSectionsSupplier;
private XMultiServiceFactory xMSFDoc;
- private XTextDocument xTextDocument;
private XText xText;
/** Creates a new instance of TextSectionHandler */
public TextSectionHandler(XMultiServiceFactory xMSF, XTextDocument xTextDocument)
{
this.xMSFDoc = xMSF;
- this.xTextDocument = xTextDocument;
xText = xTextDocument.getText();
xTextSectionsSupplier = UnoRuntime.queryInterface(XTextSectionsSupplier.class, xTextDocument);
}
diff --git a/wizards/com/sun/star/wizards/text/TextTableHandler.java b/wizards/com/sun/star/wizards/text/TextTableHandler.java
index b61a080319fb..5b926145b0b7 100644
--- a/wizards/com/sun/star/wizards/text/TextTableHandler.java
+++ b/wizards/com/sun/star/wizards/text/TextTableHandler.java
@@ -48,7 +48,6 @@ public class TextTableHandler
public XMultiServiceFactory xMSFDoc;
public XTextDocument xTextDocument;
public XSimpleText xSimpleText;
- private XText xText;
private NumberFormatter oNumberFormatter;
private Locale aCharLocale;
@@ -59,7 +58,6 @@ public class TextTableHandler
{
this.xMSFDoc = xMSF;
this.xTextDocument = xTextDocument;
- xText = xTextDocument.getText();
xTextTablesSupplier = UnoRuntime.queryInterface(XTextTablesSupplier.class, xTextDocument);
xSimpleText = UnoRuntime.queryInterface(XSimpleText.class, xTextDocument.getText());
XNumberFormatsSupplier xNumberFormatsSupplier = UnoRuntime.queryInterface(XNumberFormatsSupplier.class, xTextDocument);