java: remove more dead code
found by looking for unused parameters (in Eclipse) Change-Id: I03cf9bc8312e59747b2d0ac153ee2fc8d76be893
This commit is contained in:
@@ -48,7 +48,7 @@ public final class Bug107753_Test extends ComplexTestCase {
|
|||||||
|
|
||||||
public void test() throws Exception {
|
public void test() throws Exception {
|
||||||
TestBed t = new TestBed();
|
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 {
|
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 {
|
private static final class Provider implements XInstanceProvider {
|
||||||
public Provider(TestBed testBed) {
|
|
||||||
}
|
|
||||||
|
|
||||||
public Object getInstance(String instanceName) {
|
public Object getInstance(String instanceName) {
|
||||||
return new XTransport() {
|
return new XTransport() {
|
||||||
|
@@ -57,9 +57,6 @@ class MyCallMe implements XCallMe
|
|||||||
{
|
{
|
||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
public void setsAttribute( String _sattribute ) throws com.sun.star.uno.RuntimeException
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
// Methods
|
// Methods
|
||||||
public void call( /*IN*/String s, /*IN*/int nToDo ) throws com.sun.star.uno.RuntimeException
|
public void call( /*IN*/String s, /*IN*/int nToDo ) throws com.sun.star.uno.RuntimeException
|
||||||
|
@@ -51,7 +51,7 @@ public class StorageFileAccess implements org.hsqldb.lib.FileAccess{
|
|||||||
if ( isStreamElement(key,filename) )
|
if ( isStreamElement(key,filename) )
|
||||||
removeElement(key,filename);
|
removeElement(key,filename);
|
||||||
} catch (java.io.IOException e) {
|
} 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);
|
renameElement(key,oldName, newName);
|
||||||
}
|
}
|
||||||
} catch (java.io.IOException e) {
|
} catch (java.io.IOException e) {
|
||||||
throw new FileSystemRuntimeException( e, FileSystemRuntimeException.fileAccessRenameElementFailed );
|
throw new FileSystemRuntimeException( e );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -31,10 +31,7 @@ package org.hsqldb.lib;
|
|||||||
*/
|
*/
|
||||||
public class FileSystemRuntimeException extends java.lang.RuntimeException {
|
public class FileSystemRuntimeException extends java.lang.RuntimeException {
|
||||||
|
|
||||||
public static final int fileAccessRemoveElementFailed = 1;
|
public FileSystemRuntimeException(java.lang.Throwable _cause) {
|
||||||
public static final int fileAccessRenameElementFailed = 2;
|
|
||||||
|
|
||||||
public FileSystemRuntimeException(java.lang.Throwable _cause, int _errorCode) {
|
|
||||||
super(_cause);
|
super(_cause);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -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"));
|
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();
|
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)
|
,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"));
|
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");
|
test.setURL("jdbc:hsqldb:g:\\hsql\\db");
|
||||||
|
|
||||||
|
|
||||||
|
@@ -39,7 +39,6 @@ package complex.connectivity.hsqldb;
|
|||||||
import org.hsqldb.lib.StopWatch;
|
import org.hsqldb.lib.StopWatch;
|
||||||
|
|
||||||
import java.util.Random;
|
import java.util.Random;
|
||||||
import com.sun.star.lang.*;
|
|
||||||
import com.sun.star.uno.UnoRuntime;
|
import com.sun.star.uno.UnoRuntime;
|
||||||
import com.sun.star.sdbc.*;
|
import com.sun.star.sdbc.*;
|
||||||
|
|
||||||
@@ -111,7 +110,7 @@ public class TestCacheSize {
|
|||||||
private XDriver drv;
|
private XDriver drv;
|
||||||
private com.sun.star.beans.PropertyValue[] info;
|
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;
|
drv = _drv;
|
||||||
info = _info;
|
info = _info;
|
||||||
}
|
}
|
||||||
|
@@ -103,7 +103,7 @@ public class CheckImageManager {
|
|||||||
assertTrue(testObjectName + "::XInitialization.initialize", _xInit._initialize());
|
assertTrue(testObjectName + "::XInitialization.initialize", _xInit._initialize());
|
||||||
|
|
||||||
// xImageManager is already there, just write a test ;-)
|
// 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.getAllImageNames", _xImage._getAllImageNames());
|
||||||
assertTrue(testObjectName + "::XImageManager.getImages", _xImage._getImages());
|
assertTrue(testObjectName + "::XImageManager.getImages", _xImage._getImages());
|
||||||
assertTrue(testObjectName + "::XImageManager.hasImage", _xImage._hasImage());
|
assertTrue(testObjectName + "::XImageManager.hasImage", _xImage._hasImage());
|
||||||
@@ -113,7 +113,7 @@ public class CheckImageManager {
|
|||||||
assertTrue(testObjectName + "::XImageManager.reset", _xImage._reset());
|
assertTrue(testObjectName + "::XImageManager.reset", _xImage._reset());
|
||||||
|
|
||||||
XTypeProvider xType = UnoRuntime.queryInterface(XTypeProvider.class, xImageManager);
|
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.getImplementationId", _xType._getImplementationId());
|
||||||
assertTrue(testObjectName + "::XTypeProvider.getTypes", _xType._getTypes());
|
assertTrue(testObjectName + "::XTypeProvider.getTypes", _xType._getTypes());
|
||||||
|
|
||||||
|
@@ -20,7 +20,6 @@ package complex.imageManager;
|
|||||||
import com.sun.star.graphic.XGraphic;
|
import com.sun.star.graphic.XGraphic;
|
||||||
import com.sun.star.ui.ImageType;
|
import com.sun.star.ui.ImageType;
|
||||||
import com.sun.star.ui.XImageManager;
|
import com.sun.star.ui.XImageManager;
|
||||||
import lib.TestParameters;
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -33,7 +32,7 @@ public class _XImageManager {
|
|||||||
private XGraphic[] xGraphicArray = null;
|
private XGraphic[] xGraphicArray = null;
|
||||||
private final XImageManager oObj;
|
private final XImageManager oObj;
|
||||||
|
|
||||||
public _XImageManager( TestParameters tEnv, XImageManager oObj) {
|
public _XImageManager( XImageManager oObj) {
|
||||||
this.oObj = oObj;
|
this.oObj = oObj;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -22,7 +22,6 @@ package complex.imageManager;
|
|||||||
|
|
||||||
import com.sun.star.lang.XTypeProvider;
|
import com.sun.star.lang.XTypeProvider;
|
||||||
import com.sun.star.uno.Type;
|
import com.sun.star.uno.Type;
|
||||||
import lib.TestParameters;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Testing <code>com.sun.star.lang.XTypeProvider</code>
|
* Testing <code>com.sun.star.lang.XTypeProvider</code>
|
||||||
@@ -40,7 +39,7 @@ public class _XTypeProvider {
|
|||||||
|
|
||||||
private XTypeProvider oObj = null;
|
private XTypeProvider oObj = null;
|
||||||
|
|
||||||
public _XTypeProvider(TestParameters tEnv, XTypeProvider oObj) {
|
public _XTypeProvider(XTypeProvider oObj) {
|
||||||
this.oObj = oObj;
|
this.oObj = oObj;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -50,7 +50,7 @@ public class ProxyProvider
|
|||||||
// if retVal == null then probably not registered
|
// if retVal == null then probably not registered
|
||||||
if (retVal == null)
|
if (retVal == null)
|
||||||
{
|
{
|
||||||
Object aProxy = new Proxy(sOid, type);
|
Object aProxy = new Proxy(sOid);
|
||||||
String[] arOid = new String[]
|
String[] arOid = new String[]
|
||||||
{sOid};
|
{sOid};
|
||||||
retVal= env.registerInterface(aProxy, arOid, type);
|
retVal= env.registerInterface(aProxy, arOid, type);
|
||||||
@@ -62,7 +62,7 @@ public class ProxyProvider
|
|||||||
class Proxy implements IQueryInterface, XEventListener
|
class Proxy implements IQueryInterface, XEventListener
|
||||||
{
|
{
|
||||||
private String oid;
|
private String oid;
|
||||||
Proxy(String oid, Type t) {
|
Proxy(String oid) {
|
||||||
this.oid = oid;
|
this.oid = oid;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -28,7 +28,6 @@ import com.sun.star.lang.XMultiServiceFactory;
|
|||||||
import com.sun.star.registry.XRegistryKey;
|
import com.sun.star.registry.XRegistryKey;
|
||||||
import com.sun.star.comp.loader.FactoryHelper;
|
import com.sun.star.comp.loader.FactoryHelper;
|
||||||
|
|
||||||
|
|
||||||
public class Job {
|
public class Job {
|
||||||
|
|
||||||
static public class _Implementation implements XServiceInfo, XTypeProvider,
|
static public class _Implementation implements XServiceInfo, XTypeProvider,
|
||||||
@@ -38,24 +37,27 @@ public class Job {
|
|||||||
String actionType = null;
|
String actionType = null;
|
||||||
String actionParm = null;
|
String actionParm = null;
|
||||||
|
|
||||||
|
|
||||||
public _Implementation(XMultiServiceFactory xMSF) {
|
public _Implementation(XMultiServiceFactory xMSF) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// XServiceInfo
|
// XServiceInfo
|
||||||
public String getImplementationName() throws com.sun.star.uno.RuntimeException {
|
public String getImplementationName()
|
||||||
|
throws com.sun.star.uno.RuntimeException {
|
||||||
return getClass().getName();
|
return getClass().getName();
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean supportsService(String serviceName) throws com.sun.star.uno.RuntimeException {
|
public boolean supportsService(String serviceName)
|
||||||
|
throws com.sun.star.uno.RuntimeException {
|
||||||
return __serviceName.equals(serviceName);
|
return __serviceName.equals(serviceName);
|
||||||
}
|
}
|
||||||
|
|
||||||
public String[] getSupportedServiceNames() throws com.sun.star.uno.RuntimeException {
|
public String[] getSupportedServiceNames()
|
||||||
|
throws com.sun.star.uno.RuntimeException {
|
||||||
return new String[] { __serviceName };
|
return new String[] { __serviceName };
|
||||||
}
|
}
|
||||||
|
|
||||||
private static int executed = 0;
|
private static int executed = 0;
|
||||||
|
|
||||||
public Object execute(NamedValue[] args) {
|
public Object execute(NamedValue[] args) {
|
||||||
executed++;
|
executed++;
|
||||||
|
|
||||||
@@ -83,21 +85,20 @@ public class Job {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static XSingleServiceFactory __getServiceFactory(XMultiServiceFactory multiFactory,
|
public static XSingleServiceFactory __getServiceFactory(
|
||||||
XRegistryKey regKey) {
|
XMultiServiceFactory multiFactory, XRegistryKey regKey) {
|
||||||
XSingleServiceFactory xSingleServiceFactory = null;
|
XSingleServiceFactory xSingleServiceFactory = null;
|
||||||
xSingleServiceFactory = FactoryHelper.getServiceFactory(_Implementation.class,
|
xSingleServiceFactory = FactoryHelper.getServiceFactory(
|
||||||
_Implementation.__serviceName,
|
_Implementation.class, _Implementation.__serviceName,
|
||||||
multiFactory,
|
multiFactory, regKey);
|
||||||
regKey);
|
|
||||||
return xSingleServiceFactory;
|
return xSingleServiceFactory;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public static boolean __writeRegistryServiceInfo(XRegistryKey regKey) {
|
public static boolean __writeRegistryServiceInfo(XRegistryKey regKey) {
|
||||||
boolean result = true;
|
boolean result = true;
|
||||||
result = FactoryHelper.writeRegistryServiceInfo(_Implementation.class.getName(),
|
result = FactoryHelper.writeRegistryServiceInfo(
|
||||||
_Implementation.__serviceName, regKey);
|
_Implementation.class.getName(), _Implementation.__serviceName,
|
||||||
|
regKey);
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -179,7 +179,7 @@ public class OListBoxModel extends GenericModelTest {
|
|||||||
TestEnvironment tEnv = super.createTestEnvironment(Param, log);
|
TestEnvironment tEnv = super.createTestEnvironment(Param, log);
|
||||||
|
|
||||||
tEnv.addObjRelation("XUpdateBroadcaster.Checker",
|
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;
|
return tEnv;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -190,7 +190,7 @@ public class OListBoxModel extends GenericModelTest {
|
|||||||
private XInterface ctrl = null;
|
private XInterface ctrl = null;
|
||||||
private String ChangePropertyName = 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;
|
formLoaderF = xl;
|
||||||
this.ps = ps;
|
this.ps = ps;
|
||||||
this.ctrl = ctrl;
|
this.ctrl = ctrl;
|
||||||
|
@@ -172,7 +172,7 @@ public class OTimeModel extends GenericModelTest {
|
|||||||
exclude.add("FormatKey");
|
exclude.add("FormatKey");
|
||||||
|
|
||||||
tEnv.addObjRelation("XUpdateBroadcaster.Checker",
|
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;
|
return tEnv;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -181,7 +181,7 @@ public class OTimeModel extends GenericModelTest {
|
|||||||
private XPropertySet ps = null;
|
private XPropertySet ps = null;
|
||||||
private XInterface ctrl = 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;
|
formLoaderF = xl;
|
||||||
this.ps = ps;
|
this.ps = ps;
|
||||||
this.ctrl = ctrl;
|
this.ctrl = ctrl;
|
||||||
|
@@ -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/TextRawReportProcessor \
|
||||||
reportbuilder/java/org/libreoffice/report/pentaho/output/text/TextRawReportTarget \
|
reportbuilder/java/org/libreoffice/report/pentaho/output/text/TextRawReportTarget \
|
||||||
reportbuilder/java/org/libreoffice/report/pentaho/output/text/VariablesDeclarations \
|
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/ElementReadHandler \
|
||||||
reportbuilder/java/org/libreoffice/report/pentaho/parser/OfficeDocumentXmlResourceFactory \
|
reportbuilder/java/org/libreoffice/report/pentaho/parser/OfficeDocumentXmlResourceFactory \
|
||||||
reportbuilder/java/org/libreoffice/report/pentaho/parser/OfficeStylesXmlResourceFactory \
|
reportbuilder/java/org/libreoffice/report/pentaho/parser/OfficeStylesXmlResourceFactory \
|
||||||
|
@@ -41,11 +41,6 @@ public class VariablesCollection
|
|||||||
private List<FormattedTextElement> variables;
|
private List<FormattedTextElement> variables;
|
||||||
|
|
||||||
public VariablesCollection(final String namePrefix)
|
public VariablesCollection(final String namePrefix)
|
||||||
{
|
|
||||||
this(namePrefix, null);
|
|
||||||
}
|
|
||||||
|
|
||||||
private VariablesCollection(final String namePrefix, final VariablesCollection parent)
|
|
||||||
{
|
{
|
||||||
if (namePrefix == null)
|
if (namePrefix == null)
|
||||||
{
|
{
|
||||||
|
@@ -527,7 +527,7 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget
|
|||||||
if (ReportTargetUtil.isElementOfType(OfficeNamespaces.OFFICE_NS, "body", attrs))
|
if (ReportTargetUtil.isElementOfType(OfficeNamespaces.OFFICE_NS, "body", attrs))
|
||||||
{
|
{
|
||||||
states.push(IntegerCache.getInteger(OfficeDocumentReportTarget.STATE_IN_BODY));
|
states.push(IntegerCache.getInteger(OfficeDocumentReportTarget.STATE_IN_BODY));
|
||||||
startBody(attrs);
|
startBody();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -559,7 +559,6 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget
|
|||||||
if (ReportTargetUtil.isElementOfType(JFreeReportInfo.REPORT_NAMESPACE, "report-body", attrs))
|
if (ReportTargetUtil.isElementOfType(JFreeReportInfo.REPORT_NAMESPACE, "report-body", attrs))
|
||||||
{
|
{
|
||||||
states.push(IntegerCache.getInteger(OfficeDocumentReportTarget.STATE_IN_GROUP_BODY));
|
states.push(IntegerCache.getInteger(OfficeDocumentReportTarget.STATE_IN_GROUP_BODY));
|
||||||
startGroupBody(attrs);
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -675,7 +674,6 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget
|
|||||||
if (ReportTargetUtil.isElementOfType(JFreeReportInfo.REPORT_NAMESPACE, "group-body", attrs))
|
if (ReportTargetUtil.isElementOfType(JFreeReportInfo.REPORT_NAMESPACE, "group-body", attrs))
|
||||||
{
|
{
|
||||||
states.push(IntegerCache.getInteger(OfficeDocumentReportTarget.STATE_IN_GROUP_BODY));
|
states.push(IntegerCache.getInteger(OfficeDocumentReportTarget.STATE_IN_GROUP_BODY));
|
||||||
startGroupBody(attrs);
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -773,7 +771,7 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void startBody(final AttributeMap attrs)
|
private void startBody()
|
||||||
throws IOException
|
throws IOException
|
||||||
{
|
{
|
||||||
getXmlWriter().writeTag(OfficeNamespaces.OFFICE_NS, "body", XmlWriterSupport.OPEN);
|
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)
|
protected abstract void startOther(final AttributeMap attrs)
|
||||||
throws IOException, DataSourceException, ReportProcessingException;
|
throws IOException, DataSourceException, ReportProcessingException;
|
||||||
|
|
||||||
@@ -938,7 +932,6 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget
|
|||||||
}
|
}
|
||||||
case OfficeDocumentReportTarget.STATE_IN_GROUP_INSTANCE:
|
case OfficeDocumentReportTarget.STATE_IN_GROUP_INSTANCE:
|
||||||
{
|
{
|
||||||
endGroupInstance(attrs);
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case OfficeDocumentReportTarget.STATE_IN_GROUP_BODY:
|
case OfficeDocumentReportTarget.STATE_IN_GROUP_BODY:
|
||||||
@@ -953,7 +946,7 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget
|
|||||||
}
|
}
|
||||||
case OfficeDocumentReportTarget.STATE_IN_BODY:
|
case OfficeDocumentReportTarget.STATE_IN_BODY:
|
||||||
{
|
{
|
||||||
endBody(attrs);
|
endBody();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case OfficeDocumentReportTarget.STATE_IN_DOCUMENT:
|
case OfficeDocumentReportTarget.STATE_IN_DOCUMENT:
|
||||||
@@ -987,10 +980,6 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
private void endGroupInstance(final AttributeMap attrs)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
public int getCurrentRole()
|
public int getCurrentRole()
|
||||||
{
|
{
|
||||||
return currentRole;
|
return currentRole;
|
||||||
@@ -1017,7 +1006,7 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget
|
|||||||
protected abstract void endContent(final AttributeMap attrs)
|
protected abstract void endContent(final AttributeMap attrs)
|
||||||
throws IOException, DataSourceException, ReportProcessingException;
|
throws IOException, DataSourceException, ReportProcessingException;
|
||||||
|
|
||||||
private void endBody(final AttributeMap attrs)
|
private void endBody()
|
||||||
throws IOException
|
throws IOException
|
||||||
{
|
{
|
||||||
getXmlWriter().writeCloseTag();
|
getXmlWriter().writeCloseTag();
|
||||||
|
@@ -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)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@@ -259,7 +259,7 @@ public class ReportDesignerTest
|
|||||||
aPropertyList.add(aActiveConnection);
|
aPropertyList.add(aActiveConnection);
|
||||||
|
|
||||||
loadAndStoreReports(xNameAccess, aPropertyList, _nType);
|
loadAndStoreReports(xNameAccess, aPropertyList, _nType);
|
||||||
createDBEntry(_nType);
|
createDBEntry();
|
||||||
}
|
}
|
||||||
catch(com.sun.star.uno.Exception e)
|
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
|
// try to connect the database
|
||||||
String sDBConnection = ""; // (String)param.get( convwatch.PropertyName.DB_CONNECTION_STRING );
|
String sDBConnection = ""; // (String)param.get( convwatch.PropertyName.DB_CONNECTION_STRING );
|
||||||
|
@@ -114,10 +114,6 @@ public class Settings
|
|||||||
return theDocs.toArray( docs );
|
return theDocs.toArray( docs );
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setLastUsedWikiServer( int l )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
public String[] getWikiURLs()
|
public String[] getWikiURLs()
|
||||||
{
|
{
|
||||||
String [] WikiList = new String [m_WikiConnections.size()];
|
String [] WikiList = new String [m_WikiConnections.size()];
|
||||||
|
@@ -254,7 +254,6 @@ public class WikiPropDialog extends WikiDialog{
|
|||||||
short [] sel = (short[]) aWikiListProps.getPropertyValue("SelectedItems");
|
short [] sel = (short[]) aWikiListProps.getPropertyValue("SelectedItems");
|
||||||
String [] items = (String []) aWikiListProps.getPropertyValue("StringItemList");
|
String [] items = (String []) aWikiListProps.getPropertyValue("StringItemList");
|
||||||
m_sWikiEngineURL = items[sel[0]];
|
m_sWikiEngineURL = items[sel[0]];
|
||||||
m_aSettings.setLastUsedWikiServer(sel[0]);
|
|
||||||
m_sWikiTitle = (String) aArticleTextProps.getPropertyValue("Text");
|
m_sWikiTitle = (String) aArticleTextProps.getPropertyValue("Text");
|
||||||
m_sWikiComment = (String) aCommentTextProps.getPropertyValue("Text");
|
m_sWikiComment = (String) aCommentTextProps.getPropertyValue("Text");
|
||||||
|
|
||||||
|
@@ -56,7 +56,7 @@ class AccTreeNode
|
|||||||
private XAccessibleText mxText;
|
private XAccessibleText mxText;
|
||||||
private XAccessibleTable mxTable;
|
private XAccessibleTable mxTable;
|
||||||
|
|
||||||
public AccTreeNode (XAccessible xAccessible, XAccessibleContext xContext, Object aDisplay, AccessibleTreeNode aParent)
|
public AccTreeNode (XAccessibleContext xContext, Object aDisplay, AccessibleTreeNode aParent)
|
||||||
{
|
{
|
||||||
super (aDisplay, aParent);
|
super (aDisplay, aParent);
|
||||||
|
|
||||||
|
@@ -23,7 +23,7 @@ import com.sun.star.lang.IndexOutOfBoundsException;
|
|||||||
/**
|
/**
|
||||||
Base class for all tree nodes.
|
Base class for all tree nodes.
|
||||||
*/
|
*/
|
||||||
class AccessibleTreeNode
|
abstract class AccessibleTreeNode
|
||||||
{
|
{
|
||||||
/// The parent node. It is null for the root node.
|
/// The parent node. It is null for the root node.
|
||||||
private AccessibleTreeNode maParent;
|
private AccessibleTreeNode maParent;
|
||||||
@@ -70,10 +70,7 @@ class AccessibleTreeNode
|
|||||||
throw new IndexOutOfBoundsException();
|
throw new IndexOutOfBoundsException();
|
||||||
}
|
}
|
||||||
|
|
||||||
public int indexOf (AccessibleTreeNode aNode)
|
public abstract int indexOf (AccessibleTreeNode aNode);
|
||||||
{
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Create a path to this node by first asking the parent for its path
|
/** Create a path to this node by first asking the parent for its path
|
||||||
and then appending this object.
|
and then appending this object.
|
||||||
|
@@ -115,7 +115,7 @@ class NodeFactory
|
|||||||
|
|
||||||
|
|
||||||
// create node, and add default handlers
|
// create node, and add default handlers
|
||||||
AccTreeNode aNode = new AccTreeNode (xAccessible, xContext, sDisplay, aParent);
|
AccTreeNode aNode = new AccTreeNode (xContext, sDisplay, aParent);
|
||||||
addDefaultHandlers (aNode, xContext);
|
addDefaultHandlers (aNode, xContext);
|
||||||
|
|
||||||
return aNode;
|
return aNode;
|
||||||
|
@@ -28,4 +28,9 @@ class StringNode
|
|||||||
{
|
{
|
||||||
super (aDisplayObject, aParent);
|
super (aDisplayObject, aParent);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int indexOf(AccessibleTreeNode aNode) {
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@@ -129,9 +129,9 @@ public class OfficeDocument
|
|||||||
XController xController = xDocModel.getCurrentController();
|
XController xController = xDocModel.getCurrentController();
|
||||||
|
|
||||||
if ( classify() == DocumentType.CALC )
|
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 );
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ------------------------------------------------------------------ */
|
/* ------------------------------------------------------------------ */
|
||||||
|
@@ -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_orb = orb;
|
||||||
m_controller = controller;
|
m_controller = controller;
|
||||||
|
@@ -24,9 +24,9 @@ public class SpreadsheetView extends OfficeDocumentView
|
|||||||
{
|
{
|
||||||
|
|
||||||
/** Creates a new instance of SpreadsheetView */
|
/** 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 );
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -43,9 +43,9 @@ public class FieldLinker extends DBLimitedFieldSelection
|
|||||||
private String[] sSlaveListHeader;
|
private String[] sSlaveListHeader;
|
||||||
private String[] sMasterListHeader; //CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 40);
|
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)
|
protected void insertControlGroup(int i)
|
||||||
|
@@ -248,7 +248,7 @@ public class FormWizard extends DatabaseObjectWizard
|
|||||||
|
|
||||||
curFormDocument.xProgressBar.setValue(40);
|
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);
|
curFormDocument.xProgressBar.setValue(50);
|
||||||
|
|
||||||
curControlArranger = new UIControlArranger(this, curFormDocument);
|
curControlArranger = new UIControlArranger(this, curFormDocument);
|
||||||
|
@@ -232,7 +232,6 @@ public class UIControlArranger
|
|||||||
m_aButtonList.setStep(Short.valueOf((short) FormWizard.SOCONTROL_PAGE));
|
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.setShowButtons(false); // shows a button line at ''wrong'' position like |<| 1..4/4 |>|
|
||||||
m_aButtonList.setRenderer(new LayoutRenderer());
|
m_aButtonList.setRenderer(new LayoutRenderer());
|
||||||
m_aButtonList.setSelectionGap(new Size(2, 2));
|
|
||||||
m_aButtonList.setGap(new Size(3, 3));
|
m_aButtonList.setGap(new Size(3, 3));
|
||||||
// m_aButtonList.scaleImages = Boolean.FALSE;
|
// m_aButtonList.scaleImages = Boolean.FALSE;
|
||||||
m_aButtonList.tabIndex = curtabindex++;
|
m_aButtonList.tabIndex = curtabindex++;
|
||||||
|
@@ -20,7 +20,6 @@ import com.sun.star.awt.ItemEvent;
|
|||||||
import com.sun.star.awt.TextEvent;
|
import com.sun.star.awt.TextEvent;
|
||||||
import com.sun.star.awt.VclWindowPeerAttribute;
|
import com.sun.star.awt.VclWindowPeerAttribute;
|
||||||
import com.sun.star.awt.XTextComponent;
|
import com.sun.star.awt.XTextComponent;
|
||||||
import com.sun.star.lang.XMultiServiceFactory;
|
|
||||||
import com.sun.star.uno.Exception;
|
import com.sun.star.uno.Exception;
|
||||||
import com.sun.star.wizards.common.Desktop;
|
import com.sun.star.wizards.common.Desktop;
|
||||||
import com.sun.star.wizards.common.JavaTools;
|
import com.sun.star.wizards.common.JavaTools;
|
||||||
@@ -42,7 +41,7 @@ public class ReportFinalizer
|
|||||||
public static final int SOCREATEDOCUMENT = 1;
|
public static final int SOCREATEDOCUMENT = 1;
|
||||||
public static final int SOCREATETEMPLATE = 2;
|
public static final int SOCREATETEMPLATE = 2;
|
||||||
public static final int SOUSETEMPLATE = 3;
|
public static final int SOUSETEMPLATE = 3;
|
||||||
public ReportFinalizer(XMultiServiceFactory _xMSF, IReportDocument _CurReportDocument, WizardDialog _CurUnoDialog)
|
public ReportFinalizer(IReportDocument _CurReportDocument, WizardDialog _CurUnoDialog)
|
||||||
{
|
{
|
||||||
this.CurUnoDialog = _CurUnoDialog;
|
this.CurUnoDialog = _CurUnoDialog;
|
||||||
this.CurReportDocument = _CurReportDocument;
|
this.CurReportDocument = _CurReportDocument;
|
||||||
|
@@ -324,7 +324,7 @@ public class ReportWizard extends DatabaseObjectWizard implements XTextListener
|
|||||||
CurGroupFieldHandler = new GroupFieldHandler(m_reportDocument, this);
|
CurGroupFieldHandler = new GroupFieldHandler(m_reportDocument, this);
|
||||||
CurSortingComponent = new SortingComponent(this, SOSORTPAGE, 95, 30, 210, 34346);
|
CurSortingComponent = new SortingComponent(this, SOSORTPAGE, 95, 30, 210, 34346);
|
||||||
CurReportLayouter = new ReportLayouter(xMSF, m_reportDocument, this, isReportBuilderInstalled());
|
CurReportLayouter = new ReportLayouter(xMSF, m_reportDocument, this, isReportBuilderInstalled());
|
||||||
CurReportFinalizer = new ReportFinalizer(xMSF, m_reportDocument, this);
|
CurReportFinalizer = new ReportFinalizer(m_reportDocument, this);
|
||||||
bCloseDocument = true;
|
bCloseDocument = true;
|
||||||
enableNavigationButtons(false, false, false);
|
enableNavigationButtons(false, false, false);
|
||||||
}
|
}
|
||||||
|
@@ -484,10 +484,6 @@ public class ButtonList implements XItemEventBroadcaster, XActionListener
|
|||||||
Helper.setUnoPropertyValue(getModel(lblImageText), PropertyNames.PROPERTY_LABEL, sText);
|
Helper.setUnoPropertyValue(getModel(lblImageText), PropertyNames.PROPERTY_LABEL, sText);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setSelectionGap(Size size)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setShowButtons(boolean b)
|
public void setShowButtons(boolean b)
|
||||||
{
|
{
|
||||||
showButtons = b;
|
showButtons = b;
|
||||||
|
@@ -38,7 +38,7 @@ public abstract class DBLimitedFieldSelection
|
|||||||
protected int iCurPosY;
|
protected int iCurPosY;
|
||||||
protected int FirstHelpIndex;
|
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;
|
this.CurUnoDialog = _CurUnoDialog;
|
||||||
FirstHelpIndex = _FirstHelpIndex;
|
FirstHelpIndex = _FirstHelpIndex;
|
||||||
|
Reference in New Issue
Block a user