summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-12-18 11:43:40 +0200
committerNoel Grandin <noel@peralex.com>2015-01-05 09:59:03 +0200
commit10039462dfebdf6727529ca38b4105fcd7dd5727 (patch)
treedae25c3bdfa24dac171b10a2ac095f169b883fe5
parent82257e9087dc405fdc45cba7d6867be53b5ec9b3 (diff)
java: remove more dead code
found by looking for unused parameters (in Eclipse) Change-Id: I03cf9bc8312e59747b2d0ac153ee2fc8d76be893
-rw-r--r--bridges/test/java_remote/Bug107753_Test.java4
-rw-r--r--bridges/test/testclient.java3
-rw-r--r--connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java4
-rw-r--r--connectivity/org/hsqldb/lib/FileSystemRuntimeException.java5
-rw-r--r--connectivity/qa/complex/connectivity/HsqlDriverTest.java4
-rw-r--r--connectivity/qa/complex/connectivity/hsqldb/TestCacheSize.java3
-rw-r--r--framework/qa/complex/imageManager/CheckImageManager.java4
-rw-r--r--framework/qa/complex/imageManager/_XImageManager.java3
-rw-r--r--framework/qa/complex/imageManager/_XTypeProvider.java3
-rw-r--r--javaunohelper/test/com/sun/star/lib/uno/helper/ProxyProvider.java4
-rw-r--r--qadevOOo/testdocs/qadevlibs/source/test/Job.java79
-rw-r--r--qadevOOo/tests/java/mod/_forms/OListBoxModel.java4
-rw-r--r--qadevOOo/tests/java/mod/_forms/OTimeModel.java4
-rw-r--r--reportbuilder/Jar_reportbuilder.mk1
-rw-r--r--reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/VariablesCollection.java5
-rw-r--r--reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java19
-rw-r--r--reportbuilder/java/org/libreoffice/report/pentaho/parser/AttributeSpecification.java27
-rw-r--r--reportdesign/qa/complex/reportdesign/ReportDesignerTest.java4
-rw-r--r--swext/mediawiki/src/com/sun/star/wiki/Settings.java4
-rw-r--r--swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java1
-rw-r--r--toolkit/test/accessibility/AccTreeNode.java2
-rw-r--r--toolkit/test/accessibility/AccessibleTreeNode.java7
-rw-r--r--toolkit/test/accessibility/NodeFactory.java2
-rw-r--r--toolkit/test/accessibility/StringNode.java5
-rw-r--r--unotest/source/java/org/openoffice/test/tools/OfficeDocument.java4
-rw-r--r--unotest/source/java/org/openoffice/test/tools/OfficeDocumentView.java2
-rw-r--r--unotest/source/java/org/openoffice/test/tools/SpreadsheetView.java4
-rw-r--r--wizards/com/sun/star/wizards/form/FieldLinker.java4
-rw-r--r--wizards/com/sun/star/wizards/form/FormWizard.java2
-rw-r--r--wizards/com/sun/star/wizards/form/UIControlArranger.java1
-rw-r--r--wizards/com/sun/star/wizards/report/ReportFinalizer.java3
-rw-r--r--wizards/com/sun/star/wizards/report/ReportWizard.java2
-rw-r--r--wizards/com/sun/star/wizards/ui/ButtonList.java4
-rw-r--r--wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java2
34 files changed, 83 insertions, 146 deletions
diff --git a/bridges/test/java_remote/Bug107753_Test.java b/bridges/test/java_remote/Bug107753_Test.java
index 06e764b0ebb3..34e51126808d 100644
--- a/bridges/test/java_remote/Bug107753_Test.java
+++ b/bridges/test/java_remote/Bug107753_Test.java
@@ -48,7 +48,7 @@ public final class Bug107753_Test extends ComplexTestCase {
public void test() throws Exception {
TestBed t = new TestBed();
- assure("test", t.execute(new Provider(t), false, Client.class, 0));
+ assure("test", t.execute(new Provider(), false, Client.class, 0));
}
public static final class Client extends TestBed.Client {
@@ -350,8 +350,6 @@ public final class Bug107753_Test extends ComplexTestCase {
}
private static final class Provider implements XInstanceProvider {
- public Provider(TestBed testBed) {
- }
public Object getInstance(String instanceName) {
return new XTransport() {
diff --git a/bridges/test/testclient.java b/bridges/test/testclient.java
index 933b2ebdd451..3194a5b0286a 100644
--- a/bridges/test/testclient.java
+++ b/bridges/test/testclient.java
@@ -57,9 +57,6 @@ class MyCallMe implements XCallMe
{
return "";
}
- public void setsAttribute( String _sattribute ) throws com.sun.star.uno.RuntimeException
- {
- }
// Methods
public void call( /*IN*/String s, /*IN*/int nToDo ) throws com.sun.star.uno.RuntimeException
diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java b/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java
index 9c184750aa92..3e8a687f1e9f 100644
--- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java
+++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java
@@ -51,7 +51,7 @@ public class StorageFileAccess implements org.hsqldb.lib.FileAccess{
if ( isStreamElement(key,filename) )
removeElement(key,filename);
} catch (java.io.IOException e) {
- throw new FileSystemRuntimeException( e, FileSystemRuntimeException.fileAccessRemoveElementFailed );
+ throw new FileSystemRuntimeException( e );
}
}
@@ -62,7 +62,7 @@ public class StorageFileAccess implements org.hsqldb.lib.FileAccess{
renameElement(key,oldName, newName);
}
} catch (java.io.IOException e) {
- throw new FileSystemRuntimeException( e, FileSystemRuntimeException.fileAccessRenameElementFailed );
+ throw new FileSystemRuntimeException( e );
}
}
diff --git a/connectivity/org/hsqldb/lib/FileSystemRuntimeException.java b/connectivity/org/hsqldb/lib/FileSystemRuntimeException.java
index 6b3d289a6d4d..b3598ad30af0 100644
--- a/connectivity/org/hsqldb/lib/FileSystemRuntimeException.java
+++ b/connectivity/org/hsqldb/lib/FileSystemRuntimeException.java
@@ -31,10 +31,7 @@ package org.hsqldb.lib;
*/
public class FileSystemRuntimeException extends java.lang.RuntimeException {
- public static final int fileAccessRemoveElementFailed = 1;
- public static final int fileAccessRenameElementFailed = 2;
-
- public FileSystemRuntimeException(java.lang.Throwable _cause, int _errorCode) {
+ public FileSystemRuntimeException(java.lang.Throwable _cause) {
super(_cause);
}
diff --git a/connectivity/qa/complex/connectivity/HsqlDriverTest.java b/connectivity/qa/complex/connectivity/HsqlDriverTest.java
index 747b2ac870b8..aba01fad939b 100644
--- a/connectivity/qa/complex/connectivity/HsqlDriverTest.java
+++ b/connectivity/qa/complex/connectivity/HsqlDriverTest.java
@@ -99,7 +99,7 @@ public class HsqlDriverTest extends ComplexTestCase {
XDriver drv = UnoRuntime.queryInterface(XDriver.class,param.getMSF().createInstance("com.sun.star.sdbcx.comp.hsqldb.Driver"));
- TestCacheSize test = new TestCacheSize((param.getMSF()),info,drv);
+ TestCacheSize test = new TestCacheSize(info,drv);
StopWatch sw = new StopWatch();
@@ -127,7 +127,7 @@ public class HsqlDriverTest extends ComplexTestCase {
,new com.sun.star.beans.PropertyValue("ParameterNameSubstitution",0, false,PropertyState.DIRECT_VALUE)
};
XDriver drv = UnoRuntime.queryInterface(XDriver.class,param.getMSF().createInstance("com.sun.star.comp.sdbc.JDBCDriver"));
- TestCacheSize test = new TestCacheSize((param.getMSF()),info,drv);
+ TestCacheSize test = new TestCacheSize(info,drv);
test.setURL("jdbc:hsqldb:g:\\hsql\\db");
diff --git a/connectivity/qa/complex/connectivity/hsqldb/TestCacheSize.java b/connectivity/qa/complex/connectivity/hsqldb/TestCacheSize.java
index b2b5944f0fa9..d3c802e15a40 100644
--- a/connectivity/qa/complex/connectivity/hsqldb/TestCacheSize.java
+++ b/connectivity/qa/complex/connectivity/hsqldb/TestCacheSize.java
@@ -39,7 +39,6 @@ package complex.connectivity.hsqldb;
import org.hsqldb.lib.StopWatch;
import java.util.Random;
-import com.sun.star.lang.*;
import com.sun.star.uno.UnoRuntime;
import com.sun.star.sdbc.*;
@@ -111,7 +110,7 @@ public class TestCacheSize {
private XDriver drv;
private com.sun.star.beans.PropertyValue[] info;
- public TestCacheSize(XMultiServiceFactory _xmulti,com.sun.star.beans.PropertyValue[] _info,XDriver _drv){
+ public TestCacheSize(com.sun.star.beans.PropertyValue[] _info,XDriver _drv){
drv = _drv;
info = _info;
}
diff --git a/framework/qa/complex/imageManager/CheckImageManager.java b/framework/qa/complex/imageManager/CheckImageManager.java
index 0efb6ed036f5..21f24b634c22 100644
--- a/framework/qa/complex/imageManager/CheckImageManager.java
+++ b/framework/qa/complex/imageManager/CheckImageManager.java
@@ -103,7 +103,7 @@ public class CheckImageManager {
assertTrue(testObjectName + "::XInitialization.initialize", _xInit._initialize());
// xImageManager is already there, just write a test ;-)
- _XImageManager _xImage = new _XImageManager(param, xImageManager);
+ _XImageManager _xImage = new _XImageManager(xImageManager);
assertTrue(testObjectName + "::XImageManager.getAllImageNames", _xImage._getAllImageNames());
assertTrue(testObjectName + "::XImageManager.getImages", _xImage._getImages());
assertTrue(testObjectName + "::XImageManager.hasImage", _xImage._hasImage());
@@ -113,7 +113,7 @@ public class CheckImageManager {
assertTrue(testObjectName + "::XImageManager.reset", _xImage._reset());
XTypeProvider xType = UnoRuntime.queryInterface(XTypeProvider.class, xImageManager);
- _XTypeProvider _xType = new _XTypeProvider(param, xType);
+ _XTypeProvider _xType = new _XTypeProvider(xType);
assertTrue(testObjectName + "::XTypeProvider.getImplementationId", _xType._getImplementationId());
assertTrue(testObjectName + "::XTypeProvider.getTypes", _xType._getTypes());
diff --git a/framework/qa/complex/imageManager/_XImageManager.java b/framework/qa/complex/imageManager/_XImageManager.java
index 42d8055c4679..c077bbf265d2 100644
--- a/framework/qa/complex/imageManager/_XImageManager.java
+++ b/framework/qa/complex/imageManager/_XImageManager.java
@@ -20,7 +20,6 @@ package complex.imageManager;
import com.sun.star.graphic.XGraphic;
import com.sun.star.ui.ImageType;
import com.sun.star.ui.XImageManager;
-import lib.TestParameters;
/**
@@ -33,7 +32,7 @@ public class _XImageManager {
private XGraphic[] xGraphicArray = null;
private final XImageManager oObj;
- public _XImageManager( TestParameters tEnv, XImageManager oObj) {
+ public _XImageManager( XImageManager oObj) {
this.oObj = oObj;
}
diff --git a/framework/qa/complex/imageManager/_XTypeProvider.java b/framework/qa/complex/imageManager/_XTypeProvider.java
index 0e5e9e6bf92d..318c056c8849 100644
--- a/framework/qa/complex/imageManager/_XTypeProvider.java
+++ b/framework/qa/complex/imageManager/_XTypeProvider.java
@@ -22,7 +22,6 @@ package complex.imageManager;
import com.sun.star.lang.XTypeProvider;
import com.sun.star.uno.Type;
-import lib.TestParameters;
/**
* Testing <code>com.sun.star.lang.XTypeProvider</code>
@@ -40,7 +39,7 @@ public class _XTypeProvider {
private XTypeProvider oObj = null;
- public _XTypeProvider(TestParameters tEnv, XTypeProvider oObj) {
+ public _XTypeProvider(XTypeProvider oObj) {
this.oObj = oObj;
}
diff --git a/javaunohelper/test/com/sun/star/lib/uno/helper/ProxyProvider.java b/javaunohelper/test/com/sun/star/lib/uno/helper/ProxyProvider.java
index c021d52defaa..43decf30f388 100644
--- a/javaunohelper/test/com/sun/star/lib/uno/helper/ProxyProvider.java
+++ b/javaunohelper/test/com/sun/star/lib/uno/helper/ProxyProvider.java
@@ -50,7 +50,7 @@ public class ProxyProvider
// if retVal == null then probably not registered
if (retVal == null)
{
- Object aProxy = new Proxy(sOid, type);
+ Object aProxy = new Proxy(sOid);
String[] arOid = new String[]
{sOid};
retVal= env.registerInterface(aProxy, arOid, type);
@@ -62,7 +62,7 @@ public class ProxyProvider
class Proxy implements IQueryInterface, XEventListener
{
private String oid;
- Proxy(String oid, Type t) {
+ Proxy(String oid) {
this.oid = oid;
}
diff --git a/qadevOOo/testdocs/qadevlibs/source/test/Job.java b/qadevOOo/testdocs/qadevlibs/source/test/Job.java
index 86e9a42dbf97..d180d557b19b 100644
--- a/qadevOOo/testdocs/qadevlibs/source/test/Job.java
+++ b/qadevOOo/testdocs/qadevlibs/source/test/Job.java
@@ -28,34 +28,36 @@ import com.sun.star.lang.XMultiServiceFactory;
import com.sun.star.registry.XRegistryKey;
import com.sun.star.comp.loader.FactoryHelper;
-
public class Job {
static public class _Implementation implements XServiceInfo, XTypeProvider,
XJob, XNamed {
- static private final String __serviceName = "test.Job";
+ static private final String __serviceName = "test.Job";
Object oDoc = null;
String actionType = null;
String actionParm = null;
+ public _Implementation(XMultiServiceFactory xMSF) {
+ }
- public _Implementation(XMultiServiceFactory xMSF) {
- }
-
- // XServiceInfo
- public String getImplementationName() throws com.sun.star.uno.RuntimeException {
- return getClass().getName();
- }
+ // XServiceInfo
+ public String getImplementationName()
+ throws com.sun.star.uno.RuntimeException {
+ return getClass().getName();
+ }
- public boolean supportsService(String serviceName) throws com.sun.star.uno.RuntimeException {
- return __serviceName.equals(serviceName);
- }
+ public boolean supportsService(String serviceName)
+ throws com.sun.star.uno.RuntimeException {
+ return __serviceName.equals(serviceName);
+ }
- public String[] getSupportedServiceNames() throws com.sun.star.uno.RuntimeException {
- return new String[] {__serviceName};
- }
+ public String[] getSupportedServiceNames()
+ throws com.sun.star.uno.RuntimeException {
+ return new String[] { __serviceName };
+ }
private static int executed = 0;
+
public Object execute(NamedValue[] args) {
executed++;
@@ -63,41 +65,40 @@ public class Job {
}
public String getName() {
- return "" + executed;
+ return "" + executed;
}
public void setName(String n) {
}
- public byte[] getImplementationId() {
- return new byte[0];
- }
+ public byte[] getImplementationId() {
+ return new byte[0];
+ }
- public Type[] getTypes() {
- Class<?> interfaces[] = getClass().getInterfaces();
- Type types[] = new Type[interfaces.length];
- for(int i = 0; i < interfaces.length; ++ i)
- types[i] = new Type(interfaces[i]);
- return types;
- }
+ public Type[] getTypes() {
+ Class<?> interfaces[] = getClass().getInterfaces();
+ Type types[] = new Type[interfaces.length];
+ for (int i = 0; i < interfaces.length; ++i)
+ types[i] = new Type(interfaces[i]);
+ return types;
+ }
}
- public static XSingleServiceFactory __getServiceFactory(XMultiServiceFactory multiFactory,
- XRegistryKey regKey) {
- XSingleServiceFactory xSingleServiceFactory = null;
- xSingleServiceFactory = FactoryHelper.getServiceFactory(_Implementation.class,
- _Implementation.__serviceName,
- multiFactory,
- regKey);
- return xSingleServiceFactory;
+ public static XSingleServiceFactory __getServiceFactory(
+ XMultiServiceFactory multiFactory, XRegistryKey regKey) {
+ XSingleServiceFactory xSingleServiceFactory = null;
+ xSingleServiceFactory = FactoryHelper.getServiceFactory(
+ _Implementation.class, _Implementation.__serviceName,
+ multiFactory, regKey);
+ return xSingleServiceFactory;
}
-
public static boolean __writeRegistryServiceInfo(XRegistryKey regKey) {
- boolean result = true;
- result = FactoryHelper.writeRegistryServiceInfo(_Implementation.class.getName(),
- _Implementation.__serviceName, regKey);
- return result;
+ boolean result = true;
+ result = FactoryHelper.writeRegistryServiceInfo(
+ _Implementation.class.getName(), _Implementation.__serviceName,
+ regKey);
+ return result;
}
}
diff --git a/qadevOOo/tests/java/mod/_forms/OListBoxModel.java b/qadevOOo/tests/java/mod/_forms/OListBoxModel.java
index a1b7f1e200aa..8bc8f341f367 100644
--- a/qadevOOo/tests/java/mod/_forms/OListBoxModel.java
+++ b/qadevOOo/tests/java/mod/_forms/OListBoxModel.java
@@ -179,7 +179,7 @@ public class OListBoxModel extends GenericModelTest {
TestEnvironment tEnv = super.createTestEnvironment(Param, log);
tEnv.addObjRelation("XUpdateBroadcaster.Checker",
- new Checker(m_XFormLoader, m_XPS, m_XCtrl, m_ChangePropertyName, m_ChangePropertyValue));
+ new Checker(m_XFormLoader, m_XPS, m_XCtrl, m_ChangePropertyName));
return tEnv;
}
@@ -190,7 +190,7 @@ public class OListBoxModel extends GenericModelTest {
private XInterface ctrl = null;
private String ChangePropertyName = null;
- public Checker(XLoadable xl, XPropertySet ps, XInterface ctrl, String ChangePropertyName, Object ChangePropertyValue) {
+ public Checker(XLoadable xl, XPropertySet ps, XInterface ctrl, String ChangePropertyName) {
formLoaderF = xl;
this.ps = ps;
this.ctrl = ctrl;
diff --git a/qadevOOo/tests/java/mod/_forms/OTimeModel.java b/qadevOOo/tests/java/mod/_forms/OTimeModel.java
index c56a81bf1bb4..ce2603f0038a 100644
--- a/qadevOOo/tests/java/mod/_forms/OTimeModel.java
+++ b/qadevOOo/tests/java/mod/_forms/OTimeModel.java
@@ -172,7 +172,7 @@ public class OTimeModel extends GenericModelTest {
exclude.add("FormatKey");
tEnv.addObjRelation("XUpdateBroadcaster.Checker",
- new Checker(m_XFormLoader, m_XPS, m_XCtrl, m_ChangePropertyName, m_ChangePropertyValue));
+ new Checker(m_XFormLoader, m_XPS, m_XCtrl));
return tEnv;
}
@@ -181,7 +181,7 @@ public class OTimeModel extends GenericModelTest {
private XPropertySet ps = null;
private XInterface ctrl = null;
- public Checker(XLoadable xl, XPropertySet ps, XInterface ctrl, String ChangePropertyName, Object ChangePropertyValue) {
+ public Checker(XLoadable xl, XPropertySet ps, XInterface ctrl) {
formLoaderF = xl;
this.ps = ps;
this.ctrl = ctrl;
diff --git a/reportbuilder/Jar_reportbuilder.mk b/reportbuilder/Jar_reportbuilder.mk
index 3dfadcf7c5ef..bc73037bf616 100644
--- a/reportbuilder/Jar_reportbuilder.mk
+++ b/reportbuilder/Jar_reportbuilder.mk
@@ -144,7 +144,6 @@ $(eval $(call gb_Jar_add_sourcefiles,reportbuilder,\
reportbuilder/java/org/libreoffice/report/pentaho/output/text/TextRawReportProcessor \
reportbuilder/java/org/libreoffice/report/pentaho/output/text/TextRawReportTarget \
reportbuilder/java/org/libreoffice/report/pentaho/output/text/VariablesDeclarations \
- reportbuilder/java/org/libreoffice/report/pentaho/parser/AttributeSpecification \
reportbuilder/java/org/libreoffice/report/pentaho/parser/ElementReadHandler \
reportbuilder/java/org/libreoffice/report/pentaho/parser/OfficeDocumentXmlResourceFactory \
reportbuilder/java/org/libreoffice/report/pentaho/parser/OfficeStylesXmlResourceFactory \
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/VariablesCollection.java b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/VariablesCollection.java
index 308bcd03bcda..4f29d8c87907 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/VariablesCollection.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/VariablesCollection.java
@@ -42,11 +42,6 @@ public class VariablesCollection
public VariablesCollection(final String namePrefix)
{
- this(namePrefix, null);
- }
-
- private VariablesCollection(final String namePrefix, final VariablesCollection parent)
- {
if (namePrefix == null)
{
throw new NullPointerException("NamePrefix cannot be null");
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java b/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java
index 9caf5ec8bb3a..8518bc619325 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java
@@ -527,7 +527,7 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget
if (ReportTargetUtil.isElementOfType(OfficeNamespaces.OFFICE_NS, "body", attrs))
{
states.push(IntegerCache.getInteger(OfficeDocumentReportTarget.STATE_IN_BODY));
- startBody(attrs);
+ startBody();
}
else
{
@@ -559,7 +559,6 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget
if (ReportTargetUtil.isElementOfType(JFreeReportInfo.REPORT_NAMESPACE, "report-body", attrs))
{
states.push(IntegerCache.getInteger(OfficeDocumentReportTarget.STATE_IN_GROUP_BODY));
- startGroupBody(attrs);
}
else
{
@@ -675,7 +674,6 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget
if (ReportTargetUtil.isElementOfType(JFreeReportInfo.REPORT_NAMESPACE, "group-body", attrs))
{
states.push(IntegerCache.getInteger(OfficeDocumentReportTarget.STATE_IN_GROUP_BODY));
- startGroupBody(attrs);
}
else
{
@@ -773,7 +771,7 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget
}
}
- private void startBody(final AttributeMap attrs)
+ private void startBody()
throws IOException
{
getXmlWriter().writeTag(OfficeNamespaces.OFFICE_NS, "body", XmlWriterSupport.OPEN);
@@ -816,10 +814,6 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget
{
}
- private void startGroupBody(final AttributeMap attrs)
- {
- }
-
protected abstract void startOther(final AttributeMap attrs)
throws IOException, DataSourceException, ReportProcessingException;
@@ -938,7 +932,6 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget
}
case OfficeDocumentReportTarget.STATE_IN_GROUP_INSTANCE:
{
- endGroupInstance(attrs);
break;
}
case OfficeDocumentReportTarget.STATE_IN_GROUP_BODY:
@@ -953,7 +946,7 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget
}
case OfficeDocumentReportTarget.STATE_IN_BODY:
{
- endBody(attrs);
+ endBody();
break;
}
case OfficeDocumentReportTarget.STATE_IN_DOCUMENT:
@@ -987,10 +980,6 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget
{
}
- private void endGroupInstance(final AttributeMap attrs)
- {
- }
-
public int getCurrentRole()
{
return currentRole;
@@ -1017,7 +1006,7 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget
protected abstract void endContent(final AttributeMap attrs)
throws IOException, DataSourceException, ReportProcessingException;
- private void endBody(final AttributeMap attrs)
+ private void endBody()
throws IOException
{
getXmlWriter().writeCloseTag();
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/AttributeSpecification.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/AttributeSpecification.java
deleted file mode 100644
index 7e60f65998ec..000000000000
--- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/AttributeSpecification.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-package org.libreoffice.report.pentaho.parser;
-
-public final class AttributeSpecification
-{
-
- public AttributeSpecification(String namespaceUrl, String attributName, String mapperImplementation)
- {
- }
-
-}
diff --git a/reportdesign/qa/complex/reportdesign/ReportDesignerTest.java b/reportdesign/qa/complex/reportdesign/ReportDesignerTest.java
index 523145c65b02..d7ea8fa0e72f 100644
--- a/reportdesign/qa/complex/reportdesign/ReportDesignerTest.java
+++ b/reportdesign/qa/complex/reportdesign/ReportDesignerTest.java
@@ -259,7 +259,7 @@ public class ReportDesignerTest
aPropertyList.add(aActiveConnection);
loadAndStoreReports(xNameAccess, aPropertyList, _nType);
- createDBEntry(_nType);
+ createDBEntry();
}
catch(com.sun.star.uno.Exception e)
{
@@ -276,7 +276,7 @@ public class ReportDesignerTest
}
- private void createDBEntry(int _nType)
+ private void createDBEntry()
{
// try to connect the database
String sDBConnection = ""; // (String)param.get( convwatch.PropertyName.DB_CONNECTION_STRING );
diff --git a/swext/mediawiki/src/com/sun/star/wiki/Settings.java b/swext/mediawiki/src/com/sun/star/wiki/Settings.java
index 359f66e9dba4..34e11e13e811 100644
--- a/swext/mediawiki/src/com/sun/star/wiki/Settings.java
+++ b/swext/mediawiki/src/com/sun/star/wiki/Settings.java
@@ -114,10 +114,6 @@ public class Settings
return theDocs.toArray( docs );
}
- public void setLastUsedWikiServer( int l )
- {
- }
-
public String[] getWikiURLs()
{
String [] WikiList = new String [m_WikiConnections.size()];
diff --git a/swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java b/swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java
index 43fba5c24f84..0ff4cfa1b95e 100644
--- a/swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java
+++ b/swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java
@@ -254,7 +254,6 @@ public class WikiPropDialog extends WikiDialog{
short [] sel = (short[]) aWikiListProps.getPropertyValue("SelectedItems");
String [] items = (String []) aWikiListProps.getPropertyValue("StringItemList");
m_sWikiEngineURL = items[sel[0]];
- m_aSettings.setLastUsedWikiServer(sel[0]);
m_sWikiTitle = (String) aArticleTextProps.getPropertyValue("Text");
m_sWikiComment = (String) aCommentTextProps.getPropertyValue("Text");
diff --git a/toolkit/test/accessibility/AccTreeNode.java b/toolkit/test/accessibility/AccTreeNode.java
index aae3ed5758d4..1ce46768423b 100644
--- a/toolkit/test/accessibility/AccTreeNode.java
+++ b/toolkit/test/accessibility/AccTreeNode.java
@@ -56,7 +56,7 @@ class AccTreeNode
private XAccessibleText mxText;
private XAccessibleTable mxTable;
- public AccTreeNode (XAccessible xAccessible, XAccessibleContext xContext, Object aDisplay, AccessibleTreeNode aParent)
+ public AccTreeNode (XAccessibleContext xContext, Object aDisplay, AccessibleTreeNode aParent)
{
super (aDisplay, aParent);
diff --git a/toolkit/test/accessibility/AccessibleTreeNode.java b/toolkit/test/accessibility/AccessibleTreeNode.java
index 951b86e8179c..22fa035f95f4 100644
--- a/toolkit/test/accessibility/AccessibleTreeNode.java
+++ b/toolkit/test/accessibility/AccessibleTreeNode.java
@@ -23,7 +23,7 @@ import com.sun.star.lang.IndexOutOfBoundsException;
/**
Base class for all tree nodes.
*/
-class AccessibleTreeNode
+abstract class AccessibleTreeNode
{
/// The parent node. It is null for the root node.
private AccessibleTreeNode maParent;
@@ -70,10 +70,7 @@ class AccessibleTreeNode
throw new IndexOutOfBoundsException();
}
- public int indexOf (AccessibleTreeNode aNode)
- {
- return -1;
- }
+ public abstract int indexOf (AccessibleTreeNode aNode);
/** Create a path to this node by first asking the parent for its path
and then appending this object.
diff --git a/toolkit/test/accessibility/NodeFactory.java b/toolkit/test/accessibility/NodeFactory.java
index 51b126a7a4ee..7e1d9f585c3d 100644
--- a/toolkit/test/accessibility/NodeFactory.java
+++ b/toolkit/test/accessibility/NodeFactory.java
@@ -115,7 +115,7 @@ class NodeFactory
// create node, and add default handlers
- AccTreeNode aNode = new AccTreeNode (xAccessible, xContext, sDisplay, aParent);
+ AccTreeNode aNode = new AccTreeNode (xContext, sDisplay, aParent);
addDefaultHandlers (aNode, xContext);
return aNode;
diff --git a/toolkit/test/accessibility/StringNode.java b/toolkit/test/accessibility/StringNode.java
index f424c3b6c17c..f6660e44a947 100644
--- a/toolkit/test/accessibility/StringNode.java
+++ b/toolkit/test/accessibility/StringNode.java
@@ -28,4 +28,9 @@ class StringNode
{
super (aDisplayObject, aParent);
}
+
+ @Override
+ public int indexOf(AccessibleTreeNode aNode) {
+ return -1;
+ }
}
diff --git a/unotest/source/java/org/openoffice/test/tools/OfficeDocument.java b/unotest/source/java/org/openoffice/test/tools/OfficeDocument.java
index 655d17a9a7bd..9f18a6e986fe 100644
--- a/unotest/source/java/org/openoffice/test/tools/OfficeDocument.java
+++ b/unotest/source/java/org/openoffice/test/tools/OfficeDocument.java
@@ -129,9 +129,9 @@ public class OfficeDocument
XController xController = xDocModel.getCurrentController();
if ( classify() == DocumentType.CALC )
- return new SpreadsheetView( m_orb, this, xController );
+ return new SpreadsheetView( m_orb, xController );
- return new OfficeDocumentView( m_orb, this, xController );
+ return new OfficeDocumentView( m_orb, xController );
}
/* ------------------------------------------------------------------ */
diff --git a/unotest/source/java/org/openoffice/test/tools/OfficeDocumentView.java b/unotest/source/java/org/openoffice/test/tools/OfficeDocumentView.java
index 5f89df726718..f7f9a5e6b90d 100644
--- a/unotest/source/java/org/openoffice/test/tools/OfficeDocumentView.java
+++ b/unotest/source/java/org/openoffice/test/tools/OfficeDocumentView.java
@@ -43,7 +43,7 @@ public class OfficeDocumentView
}
/* ------------------------------------------------------------------ */
- public OfficeDocumentView( XMultiServiceFactory orb, OfficeDocument document, XController controller )
+ public OfficeDocumentView( XMultiServiceFactory orb, XController controller )
{
m_orb = orb;
m_controller = controller;
diff --git a/unotest/source/java/org/openoffice/test/tools/SpreadsheetView.java b/unotest/source/java/org/openoffice/test/tools/SpreadsheetView.java
index b6e32a9beb72..21d3d23e4f60 100644
--- a/unotest/source/java/org/openoffice/test/tools/SpreadsheetView.java
+++ b/unotest/source/java/org/openoffice/test/tools/SpreadsheetView.java
@@ -24,9 +24,9 @@ public class SpreadsheetView extends OfficeDocumentView
{
/** Creates a new instance of SpreadsheetView */
- public SpreadsheetView( XMultiServiceFactory orb, OfficeDocument document, XController controller )
+ public SpreadsheetView( XMultiServiceFactory orb, XController controller )
{
- super( orb, document, controller );
+ super( orb, controller );
}
}
diff --git a/wizards/com/sun/star/wizards/form/FieldLinker.java b/wizards/com/sun/star/wizards/form/FieldLinker.java
index f5374c142db4..e80bb9de0441 100644
--- a/wizards/com/sun/star/wizards/form/FieldLinker.java
+++ b/wizards/com/sun/star/wizards/form/FieldLinker.java
@@ -43,9 +43,9 @@ public class FieldLinker extends DBLimitedFieldSelection
private String[] sSlaveListHeader;
private String[] sMasterListHeader; //CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 40);
- public FieldLinker(WizardDialog _CurUnoDialog, int iStep, int iCompPosX, int iCompPosY, int _firsthelpid)
+ public FieldLinker(WizardDialog _CurUnoDialog, int iStep, int iCompPosY, int _firsthelpid)
{
- super(_CurUnoDialog, iStep, iCompPosX, iCompPosY, _firsthelpid);
+ super(_CurUnoDialog, iStep, iCompPosY, _firsthelpid);
}
protected void insertControlGroup(int i)
diff --git a/wizards/com/sun/star/wizards/form/FormWizard.java b/wizards/com/sun/star/wizards/form/FormWizard.java
index bf8ba4bbf559..5247f61aac0b 100644
--- a/wizards/com/sun/star/wizards/form/FormWizard.java
+++ b/wizards/com/sun/star/wizards/form/FormWizard.java
@@ -248,7 +248,7 @@ public class FormWizard extends DatabaseObjectWizard
curFormDocument.xProgressBar.setValue(40);
- curFieldLinker = new FieldLinker(this, SOFIELDLINKER_PAGE, 95, 30, 34441);
+ curFieldLinker = new FieldLinker(this, SOFIELDLINKER_PAGE, 30, 34441);
curFormDocument.xProgressBar.setValue(50);
curControlArranger = new UIControlArranger(this, curFormDocument);
diff --git a/wizards/com/sun/star/wizards/form/UIControlArranger.java b/wizards/com/sun/star/wizards/form/UIControlArranger.java
index 0f700299cc94..9e68a6f5cb43 100644
--- a/wizards/com/sun/star/wizards/form/UIControlArranger.java
+++ b/wizards/com/sun/star/wizards/form/UIControlArranger.java
@@ -232,7 +232,6 @@ public class UIControlArranger
m_aButtonList.setStep(Short.valueOf((short) FormWizard.SOCONTROL_PAGE));
m_aButtonList.setShowButtons(false); // shows a button line at ''wrong'' position like |<| 1..4/4 |>|
m_aButtonList.setRenderer(new LayoutRenderer());
- m_aButtonList.setSelectionGap(new Size(2, 2));
m_aButtonList.setGap(new Size(3, 3));
// m_aButtonList.scaleImages = Boolean.FALSE;
m_aButtonList.tabIndex = curtabindex++;
diff --git a/wizards/com/sun/star/wizards/report/ReportFinalizer.java b/wizards/com/sun/star/wizards/report/ReportFinalizer.java
index a068c7082709..350ad9b29324 100644
--- a/wizards/com/sun/star/wizards/report/ReportFinalizer.java
+++ b/wizards/com/sun/star/wizards/report/ReportFinalizer.java
@@ -20,7 +20,6 @@ import com.sun.star.awt.ItemEvent;
import com.sun.star.awt.TextEvent;
import com.sun.star.awt.VclWindowPeerAttribute;
import com.sun.star.awt.XTextComponent;
-import com.sun.star.lang.XMultiServiceFactory;
import com.sun.star.uno.Exception;
import com.sun.star.wizards.common.Desktop;
import com.sun.star.wizards.common.JavaTools;
@@ -42,7 +41,7 @@ public class ReportFinalizer
public static final int SOCREATEDOCUMENT = 1;
public static final int SOCREATETEMPLATE = 2;
public static final int SOUSETEMPLATE = 3;
- public ReportFinalizer(XMultiServiceFactory _xMSF, IReportDocument _CurReportDocument, WizardDialog _CurUnoDialog)
+ public ReportFinalizer(IReportDocument _CurReportDocument, WizardDialog _CurUnoDialog)
{
this.CurUnoDialog = _CurUnoDialog;
this.CurReportDocument = _CurReportDocument;
diff --git a/wizards/com/sun/star/wizards/report/ReportWizard.java b/wizards/com/sun/star/wizards/report/ReportWizard.java
index c8353932e161..2582ac322bff 100644
--- a/wizards/com/sun/star/wizards/report/ReportWizard.java
+++ b/wizards/com/sun/star/wizards/report/ReportWizard.java
@@ -324,7 +324,7 @@ public class ReportWizard extends DatabaseObjectWizard implements XTextListener
CurGroupFieldHandler = new GroupFieldHandler(m_reportDocument, this);
CurSortingComponent = new SortingComponent(this, SOSORTPAGE, 95, 30, 210, 34346);
CurReportLayouter = new ReportLayouter(xMSF, m_reportDocument, this, isReportBuilderInstalled());
- CurReportFinalizer = new ReportFinalizer(xMSF, m_reportDocument, this);
+ CurReportFinalizer = new ReportFinalizer(m_reportDocument, this);
bCloseDocument = true;
enableNavigationButtons(false, false, false);
}
diff --git a/wizards/com/sun/star/wizards/ui/ButtonList.java b/wizards/com/sun/star/wizards/ui/ButtonList.java
index 51a7c84a2481..a1cce5047218 100644
--- a/wizards/com/sun/star/wizards/ui/ButtonList.java
+++ b/wizards/com/sun/star/wizards/ui/ButtonList.java
@@ -484,10 +484,6 @@ public class ButtonList implements XItemEventBroadcaster, XActionListener
Helper.setUnoPropertyValue(getModel(lblImageText), PropertyNames.PROPERTY_LABEL, sText);
}
- public void setSelectionGap(Size size)
- {
- }
-
public void setShowButtons(boolean b)
{
showButtons = b;
diff --git a/wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java b/wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java
index 1754b1c00750..270e19f77f8a 100644
--- a/wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java
+++ b/wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java
@@ -38,7 +38,7 @@ public abstract class DBLimitedFieldSelection
protected int iCurPosY;
protected int FirstHelpIndex;
- public DBLimitedFieldSelection(WizardDialog _CurUnoDialog, int iStep, int _iCompPosX, int iCompPosY, int _FirstHelpIndex)
+ public DBLimitedFieldSelection(WizardDialog _CurUnoDialog, int iStep, int iCompPosY, int _FirstHelpIndex)
{
this.CurUnoDialog = _CurUnoDialog;
FirstHelpIndex = _FirstHelpIndex;