[Libreoffice-commits] core.git: extensions/qa framework/qa qadevOOo/Jar_OOoRunner.mk qadevOOo/runner qadevOOo/tests sc/qa scripting/java swext/mediawiki vcl/qa wizards/com xmerge/source
Noel Grandin
noel at peralex.com
Mon Mar 14 11:59:34 UTC 2016
extensions/qa/integration/extensions/MethodHandler.java | 4
framework/qa/complex/dispatches/Interceptor.java | 2
qadevOOo/Jar_OOoRunner.mk | 3
qadevOOo/runner/helper/BuildEnvTools.java | 182 ----------
qadevOOo/runner/helper/ComplexDescGetter.java | 2
qadevOOo/runner/helper/ParameterNotFoundException.java | 30 -
qadevOOo/runner/helper/ProcessHandler.java | 79 ----
qadevOOo/runner/helper/WindowListener.java | 55 ---
qadevOOo/runner/lib/MultiPropertyTest.java | 4
qadevOOo/runner/util/PropertyName.java | 18
qadevOOo/tests/java/ifc/connection/_XAcceptor.java | 2
qadevOOo/tests/java/ifc/container/_XEnumeration.java | 1
qadevOOo/tests/java/ifc/document/_XMimeTypeInfo.java | 1
qadevOOo/tests/java/ifc/drawing/_GraphicObjectShape.java | 1
qadevOOo/tests/java/ifc/sheet/_XUsedAreaCursor.java | 1
qadevOOo/tests/java/ifc/text/_XFootnote.java | 2
qadevOOo/tests/java/ifc/text/_XParagraphCursor.java | 2
qadevOOo/tests/java/ifc/text/_XTextRangeCompare.java | 1
qadevOOo/tests/java/ifc/text/_XTextTableCursor.java | 1
qadevOOo/tests/java/mod/_dbaccess/OSingleSelectQueryComposer.java | 2
qadevOOo/tests/java/mod/_fwk/ControlMenuController.java | 1
sc/qa/complex/dataPilot/_XDataPilotTable.java | 2
scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java | 4
scripting/java/com/sun/star/script/framework/io/XStorageHelper.java | 4
swext/mediawiki/src/com/sun/star/wiki/WikiProtocolSocketFactory.java | 2
vcl/qa/complex/persistent_window_states/DocumentHandle.java | 2
wizards/com/sun/star/wizards/common/FileAccess.java | 2
wizards/com/sun/star/wizards/common/ParaStyled.java | 2
wizards/com/sun/star/wizards/document/OfficeDocument.java | 1
wizards/com/sun/star/wizards/table/TableWizard.java | 4
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentSerializer.java | 1
31 files changed, 8 insertions(+), 410 deletions(-)
New commits:
commit b9d63d49be66ed1bfc4a76924f1c52ec3630adc8
Author: Noel Grandin <noel at peralex.com>
Date: Tue Jan 12 15:27:41 2016 +0200
remove some unused Java code
found by UCDetector
Change-Id: Ic0295a24b26e206eb53eda2da540755477df86df
diff --git a/extensions/qa/integration/extensions/MethodHandler.java b/extensions/qa/integration/extensions/MethodHandler.java
index c362fae..05fe1a7 100644
--- a/extensions/qa/integration/extensions/MethodHandler.java
+++ b/extensions/qa/integration/extensions/MethodHandler.java
@@ -55,12 +55,12 @@ public class MethodHandler implements XPropertyHandler
public void addEventListener(com.sun.star.lang.XEventListener _eventListener)
{
- // ingnoring this
+ // ignoring this
}
public void addPropertyChangeListener(com.sun.star.beans.XPropertyChangeListener _propertyChangeListener) throws com.sun.star.lang.NullPointerException
{
- // ingnoring this
+ // ignoring this
}
public Object convertToControlValue(String _propertyName, Object _propertyValue, com.sun.star.uno.Type type) throws com.sun.star.beans.UnknownPropertyException
diff --git a/framework/qa/complex/dispatches/Interceptor.java b/framework/qa/complex/dispatches/Interceptor.java
index 5ce13a5..ecbac44 100644
--- a/framework/qa/complex/dispatches/Interceptor.java
+++ b/framework/qa/complex/dispatches/Interceptor.java
@@ -158,7 +158,7 @@ public class Interceptor implements XDispatch,
* solar mutex. If this hangs - you can see a beautiful deadlock
* when you attach your debugger to the main process.
*/
- public void checkNoSolarMutexHeld()
+ private void checkNoSolarMutexHeld()
{
try
{
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index 0e513f6..2c21d7d 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -58,7 +58,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
qadevOOo/runner/graphical/FileHelper \
qadevOOo/runner/helper/APIDescGetter \
qadevOOo/runner/helper/AppProvider \
- qadevOOo/runner/helper/BuildEnvTools \
qadevOOo/runner/helper/CfgParser \
qadevOOo/runner/helper/ClParser \
qadevOOo/runner/helper/ComplexDescGetter \
@@ -70,7 +69,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
qadevOOo/runner/helper/OfficeProvider \
qadevOOo/runner/helper/OfficeWatcher \
qadevOOo/runner/helper/OSHelper \
- qadevOOo/runner/helper/ParameterNotFoundException \
qadevOOo/runner/helper/ProcessHandler \
qadevOOo/runner/helper/PropertyHandlerFactroy \
qadevOOo/runner/helper/PropertyHandlerImpl \
@@ -78,7 +76,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
qadevOOo/runner/helper/StringHelper \
qadevOOo/runner/helper/UnoProvider \
qadevOOo/runner/helper/URLHelper \
- qadevOOo/runner/helper/WindowListener \
qadevOOo/runner/lib/DynamicClassLoader \
qadevOOo/runner/lib/ExceptionStatus \
qadevOOo/runner/lib/MultiMethodTest \
diff --git a/qadevOOo/runner/helper/BuildEnvTools.java b/qadevOOo/runner/helper/BuildEnvTools.java
deleted file mode 100644
index 60d3284..0000000
--- a/qadevOOo/runner/helper/BuildEnvTools.java
+++ /dev/null
@@ -1,182 +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 helper;
-
-import java.io.File;
-import java.io.PrintWriter;
-import lib.TestParameters;
-import share.LogWriter;
-import util.*;
-
-/**
- * This class support you to execute some shell commands in a build environment. At every call of commands
- * a build environment was created and the commands will be executed.
- *
- */
-public class BuildEnvTools {
-
- private final TestParameters param;
- private final LogWriter log;
- private final boolean mDebug;
- private final String mPlatform;
- private final String mShell;
- private final boolean mCygwin;
-
- /**
- * This constructor creates an instance of BuildEncTools. It is verifying for all neccesarry
- * parameters in <CODE>TestParameters</CODE> This must be:
- * <ul>
- * <li>OperatingSystem: Fill this parameter with an operating system like unxsols, unxsoli, unxlngi or wntmsci.
- * </li>
- * <li> Shell: Fill this parameter with a shell f.e '/bin/tcsh'
- * or 'c:\\myShell\\myShell.exe'
- * </li>
- */
- public BuildEnvTools(TestParameters param, LogWriter log) throws ParameterNotFoundException {
- this.param = param;
- this.log = log;
- mDebug = param.getBool(PropertyName.DEBUG_IS_ACTIVE);
-
- boolean error = false;
-
- String msg = "\nERROR: the following parameter must be set before executing the test:\n\n";
-
- mPlatform = (String) param.get(PropertyName.OPERATING_SYSTEM);
- if (mDebug) {
- log.println("### " + mPlatform);
- }
- if (mPlatform == null){
- msg += PropertyName.OPERATING_SYSTEM + "\nFill this parameter with an operating system like unxsols," +
- " unxsoli, unxlngi, unxmacxi or wntmsci. \n\n";
- }
- if (mPlatform != null &&
- (!mPlatform.equalsIgnoreCase(PropertyName.UNXSOLS)) &&
- (!mPlatform.equalsIgnoreCase(PropertyName.UNXSOLI)) &&
- (!mPlatform.equalsIgnoreCase(PropertyName.UNXLNGI)) &&
- (!mPlatform.equalsIgnoreCase(PropertyName.UNXMACXI))&&
- (!mPlatform.equalsIgnoreCase(PropertyName.WNTMSCI)) ){
-
- msg += PropertyName.OPERATING_SYSTEM + ":" + mPlatform + "\nFill this parameter with an operating system like unxsols," +
- " unxsoli, unxlngi, unxmacxi or wntmsci. \n\n";
- error = true;
- }
-
- mShell = (String) param.get(PropertyName.SHELL);
- if (mShell == null) {
- msg += PropertyName.SHELL + "\nFill this parameter with a shell" +
- "\n\t/bin/tcsh c:\\myShell\\myShell.exe\n\n";
- error = true;
- }
-
- mCygwin = param.getBool(PropertyName.CYGWIN);
-
- if (error) {
- throw new ParameterNotFoundException(msg);
- }
- }
-
- /**
- * Executes the given commands in OOo-Environment shell.
- * @return the processHandler of the commands
- * @see helper.ProcessHandler
- */
- public ProcessHandler runCommandsInEnvironmentShell(String[] commands, File workDir, int shortWait) {
-
- final String[] cmdLines = getCmdLinesWithCommand(commands);
- final ProcessHandler pHdl = new ProcessHandler(cmdLines, (PrintWriter) log, workDir, shortWait, param);
- pHdl.runCommand();
- return pHdl;
- }
-
- public String getSrcRoot() {
-
- String sSrcRoot = (String) param.get(PropertyName.SRC_ROOT);
-
- if (sSrcRoot == null) {
- String[] cmdLines = null;
- if (mPlatform.equals(PropertyName.WNTMSCI) && ! mCygwin) {
- cmdLines = new String[]{mShell, "/C", "echo SRC_ROOT=%SRC_ROOT"};
- } else {
- cmdLines = new String[]{mShell, "--login ", "-c ", "echo \"SRC_ROOT=$SRC_ROOT\""};
- }
-
- final ProcessHandler procHdl = new ProcessHandler(cmdLines, (PrintWriter) log, null, 5000, param);
- procHdl.runCommand();
-
- if (mDebug) {
- log.println("---> Output of command:");
- log.println(procHdl.getOutputText());
- log.println("<--- Output of command:");
- log.println("---> Error output of command");
- log.println(procHdl.getErrorText());
- log.println("<--- Error output of command");
- }
- final String output = procHdl.getOutputText();
- final String[] outs = output.split("\n");
-
- for (int i = 0; i < outs.length; i++) {
- final String line = outs[i];
- if (line.startsWith("SRC_ROOT")) {
- sSrcRoot = getEnvValue(line);
- }
- }
- }
- return sSrcRoot;
- }
-
- private String[] getCmdLinesWithCommand(String[] commands) {
- String[] cmdLines = null;
- log.println("prepare command for platform " + mPlatform);
-
- String separator = "";
- if (mPlatform.equals(PropertyName.WNTMSCI)) {
- separator = mCygwin ? ";" : "^";
- } else {
- separator = ";";
- }
-
- StringBuilder sb = new StringBuilder();
- for (int i = 0; i < commands.length; i++) {
- if (i != 0) {
- sb.append(separator);
- }
- sb.append(commands[i]);
- }
-
- String command = sb.toString();
-
- if (mPlatform.equals(PropertyName.WNTMSCI)){
- if (mCygwin){
- String srcRoot = (String) param.get(PropertyName.SRC_ROOT);
- String envSet = "export cyg_src_root=`cygpath '" + srcRoot.replaceAll("\\\\", "\\\\\\\\")+ "'`; source $cyg_src_root/winenv.set.sh;";
- command = envSet + command;
- cmdLines = new String[]{mShell, "--login", "-c", "\"" + command + "\""};
- } else {
- cmdLines = new String[]{mShell, "/C", "\"" + command + "\""};
- }
- } else {
- cmdLines = new String[]{mShell, "-c", command};
- }
- return cmdLines;
- }
-
- private String getEnvValue(String line) {
- final String[] split = line.split("=");
- return split[1];
- }
-}
diff --git a/qadevOOo/runner/helper/ComplexDescGetter.java b/qadevOOo/runner/helper/ComplexDescGetter.java
index 7a207a6..444ff18 100644
--- a/qadevOOo/runner/helper/ComplexDescGetter.java
+++ b/qadevOOo/runner/helper/ComplexDescGetter.java
@@ -147,7 +147,7 @@ public class ComplexDescGetter extends DescGetter
* @param testMethodNames list of all methods to test
* @return filled description entry
*/
- public DescEntry createTestDesc(String testObjectName, String className, String[] testMethodNames, LogWriter log)
+ private DescEntry createTestDesc(String testObjectName, String className, String[] testMethodNames, LogWriter log)
{
DescEntry dEntry = new DescEntry();
diff --git a/qadevOOo/runner/helper/ParameterNotFoundException.java b/qadevOOo/runner/helper/ParameterNotFoundException.java
deleted file mode 100644
index bb856a7..0000000
--- a/qadevOOo/runner/helper/ParameterNotFoundException.java
+++ /dev/null
@@ -1,30 +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 helper;
-
-/**
- * This exception is thrown when a parameter could not be found.
- *
- */
-public class ParameterNotFoundException extends Exception {
- public ParameterNotFoundException(String message){
- super (message);
- }
-
-}
diff --git a/qadevOOo/runner/helper/ProcessHandler.java b/qadevOOo/runner/helper/ProcessHandler.java
index 60b31b0..cd49021 100644
--- a/qadevOOo/runner/helper/ProcessHandler.java
+++ b/qadevOOo/runner/helper/ProcessHandler.java
@@ -120,10 +120,8 @@ public class ProcessHandler
private boolean isStarted = false;
private long mTimeOut = 0;
private Pump stdout = null;
- private Pump stderr = null;
private PrintStream stdIn = null;
private Process m_aProcess = null;
- private TestParameters param = null;
private boolean debug = false;
private boolean bUseOutput = true;
@@ -212,7 +210,6 @@ public class ProcessHandler
{
this(null, log, workDir, null, 0);
this.cmdLineArray = commands;
- this.param = param;
if (shortWait != 0)
{
this.mTimeOut = shortWait;
@@ -226,62 +223,6 @@ public class ProcessHandler
}
/**
- * This method do an asynchronous execution of the commands. To avoid a interruption on long running processes
- * caused by <CODE>OfficeWatcher</CODE>, the OfficeWatcher get frequently a ping.
- * @see helper.OfficeWatcher
- */
- public void runCommand()
- {
-
- boolean changedText = true;
- String memText = "";
-
- this.executeAsynchronously();
-
- OfficeWatcher ow = null;
- if (param != null)
- {
- ow = (OfficeWatcher) param.get(PropertyName.OFFICE_WATCHER);
- }
- if (ow != null)
- {
- ow.ping();
- }
-
- int hangcheck = 10;
- while (!this.isFinished() && changedText)
- {
- waitFor(2000, false); // wait but don't kill
-
- if (ow != null)
- {
- ow.ping();
- }
- // check for changes in the output stream. If there are no changes, the process maybe hangs
- if (!this.isFinished())
- {
- hangcheck--;
- if (hangcheck < 0)
- {
- String sOutputText = getOutputText();
- if (sOutputText.length() == memText.length())
- {
- changedText = false;
- }
- hangcheck = 10;
- memText = this.getOutputText();
- }
- }
- }
-
- if (!this.isFinished())
- {
- dbg("runCommand Process is not finished but there are no changes in output stream.");
- this.kill();
- }
- }
-
- /**
* Executes the command and returns only when the process
* exits.
*
@@ -417,7 +358,7 @@ public class ProcessHandler
}
dbg("execute: pump io-streams");
stdout = new Pump(m_aProcess.getInputStream(), log, "out > ", bUseOutput);
- stderr = new Pump(m_aProcess.getErrorStream(), log, "err > ", bUseOutput);
+ new Pump(m_aProcess.getErrorStream(), log, "err > ", bUseOutput);
stdIn = new PrintStream(m_aProcess.getOutputStream());
dbg("execute: flush io-streams");
@@ -549,24 +490,6 @@ public class ProcessHandler
}
/**
- * Returns the text output by external command to stderr.
- * @return the text output by external command to stderr
- */
- public String getErrorText()
- {
- if (stderr == null)
- {
- return "";
- }
- else
- {
- return stderr.getStringBuffer();
- }
- }
-
-
-
- /**
* Returns information about was the command started or
* not.
*
diff --git a/qadevOOo/runner/helper/WindowListener.java b/qadevOOo/runner/helper/WindowListener.java
deleted file mode 100644
index 710bda7..0000000
--- a/qadevOOo/runner/helper/WindowListener.java
+++ /dev/null
@@ -1,55 +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 helper;
-
-/**
- * An own implementation of a XWindowListener
- *
- */
-public class WindowListener implements com.sun.star.awt.XWindowListener {
-
- /**
- * The window hidden event
- */
- public void windowHidden(com.sun.star.lang.EventObject eventObject) {
- }
-
- /**
- * The window move event
- */
- public void windowMoved(com.sun.star.awt.WindowEvent windowEvent) {
- }
-
- /**
- * The window resize event
- */
- public void windowResized(com.sun.star.awt.WindowEvent windowEvent) {
- }
-
- /**
- * The window show event
- */
- public void windowShown(com.sun.star.lang.EventObject eventObject) {
- }
-
- /**
- * The dispose event
- */
- public void disposing(com.sun.star.lang.EventObject eventObject) {
- }
-}
diff --git a/qadevOOo/runner/lib/MultiPropertyTest.java b/qadevOOo/runner/lib/MultiPropertyTest.java
index 673fdb3..2d5e067 100644
--- a/qadevOOo/runner/lib/MultiPropertyTest.java
+++ b/qadevOOo/runner/lib/MultiPropertyTest.java
@@ -37,10 +37,6 @@ import util.ValueChanger;
import util.ValueComparer;
import util.utils;
-import com.sun.star.uno.Any;
-import com.sun.star.uno.AnyConverter;
-import com.sun.star.uno.Type;
-
/**
* MultiPropertyTest extends the functionality of MultiMethodTest to support
* services testing. Since, in most cases, service tests has one method testing
diff --git a/qadevOOo/runner/util/PropertyName.java b/qadevOOo/runner/util/PropertyName.java
index 51d52a8..83a0b7f 100644
--- a/qadevOOo/runner/util/PropertyName.java
+++ b/qadevOOo/runner/util/PropertyName.java
@@ -120,26 +120,8 @@ public interface PropertyName {
* path to the source root of OpenOffice.org
*/
String SRC_ROOT = "SRC_ROOT";
- /**
- * parameter name: "Version"<p>
- * the name of the version to test
- */
- String VERSION = "Version";
/**
- * parameter name "Shell"<p>
- * Path to a shell.
- * This shell is used to run some commands outside of Java
- * example: /bin/tcsh c:\\myShell\\myShell.exe
- */
- String SHELL = "Shell";
- /**
- * parameter name "Cygwin"<p>
- * If Cygwin is set to TRUE it indicates if the runner runs in a Cygwin
- * environment
- */
- String CYGWIN = "Cygwin";
- /**
* internal only, no parameter
*/
String WNTMSCI = "wntmsci";
diff --git a/qadevOOo/tests/java/ifc/connection/_XAcceptor.java b/qadevOOo/tests/java/ifc/connection/_XAcceptor.java
index 924d9c0..2e69eab 100644
--- a/qadevOOo/tests/java/ifc/connection/_XAcceptor.java
+++ b/qadevOOo/tests/java/ifc/connection/_XAcceptor.java
@@ -18,8 +18,6 @@
package ifc.connection;
-import java.io.PrintWriter;
-
import lib.MultiMethodTest;
import lib.StatusException;
diff --git a/qadevOOo/tests/java/ifc/container/_XEnumeration.java b/qadevOOo/tests/java/ifc/container/_XEnumeration.java
index e6df237..4cddb30 100644
--- a/qadevOOo/tests/java/ifc/container/_XEnumeration.java
+++ b/qadevOOo/tests/java/ifc/container/_XEnumeration.java
@@ -22,7 +22,6 @@ import lib.MultiMethodTest;
import com.sun.star.container.NoSuchElementException;
import com.sun.star.container.XEnumeration;
-import com.sun.star.container.XEnumerationAccess;
import com.sun.star.lang.WrappedTargetException;
/**
diff --git a/qadevOOo/tests/java/ifc/document/_XMimeTypeInfo.java b/qadevOOo/tests/java/ifc/document/_XMimeTypeInfo.java
index 6744186..81b3994 100644
--- a/qadevOOo/tests/java/ifc/document/_XMimeTypeInfo.java
+++ b/qadevOOo/tests/java/ifc/document/_XMimeTypeInfo.java
@@ -22,7 +22,6 @@ package ifc.document;
import lib.MultiMethodTest;
import com.sun.star.document.XMimeTypeInfo;
-import com.sun.star.lang.XComponent;
/**
* Testing <code>com.sun.star.document.XMimeTypeInfo</code>
diff --git a/qadevOOo/tests/java/ifc/drawing/_GraphicObjectShape.java b/qadevOOo/tests/java/ifc/drawing/_GraphicObjectShape.java
index f31a07d..dfbde7d 100644
--- a/qadevOOo/tests/java/ifc/drawing/_GraphicObjectShape.java
+++ b/qadevOOo/tests/java/ifc/drawing/_GraphicObjectShape.java
@@ -22,7 +22,6 @@ import lib.MultiPropertyTest;
import com.sun.star.awt.XBitmap;
import com.sun.star.container.XIndexContainer;
-import com.sun.star.uno.Any;
import com.sun.star.uno.UnoRuntime;
/**
diff --git a/qadevOOo/tests/java/ifc/sheet/_XUsedAreaCursor.java b/qadevOOo/tests/java/ifc/sheet/_XUsedAreaCursor.java
index d7e6223..19079b7 100644
--- a/qadevOOo/tests/java/ifc/sheet/_XUsedAreaCursor.java
+++ b/qadevOOo/tests/java/ifc/sheet/_XUsedAreaCursor.java
@@ -21,7 +21,6 @@ package ifc.sheet;
import lib.MultiMethodTest;
import com.sun.star.sheet.XCellRangeAddressable;
-import com.sun.star.sheet.XSheetCellCursor;
import com.sun.star.sheet.XUsedAreaCursor;
import com.sun.star.table.CellRangeAddress;
import com.sun.star.uno.UnoRuntime;
diff --git a/qadevOOo/tests/java/ifc/text/_XFootnote.java b/qadevOOo/tests/java/ifc/text/_XFootnote.java
index acd7fa5..6aedd2c 100644
--- a/qadevOOo/tests/java/ifc/text/_XFootnote.java
+++ b/qadevOOo/tests/java/ifc/text/_XFootnote.java
@@ -19,8 +19,6 @@
package ifc.text;
import lib.MultiMethodTest;
-import util.XInstCreator;
-
import com.sun.star.text.XFootnote;
diff --git a/qadevOOo/tests/java/ifc/text/_XParagraphCursor.java b/qadevOOo/tests/java/ifc/text/_XParagraphCursor.java
index bfa772d..1aa58a3 100644
--- a/qadevOOo/tests/java/ifc/text/_XParagraphCursor.java
+++ b/qadevOOo/tests/java/ifc/text/_XParagraphCursor.java
@@ -19,8 +19,6 @@
package ifc.text;
import lib.MultiMethodTest;
-import util.XInstCreator;
-
import com.sun.star.text.XParagraphCursor;
/**
diff --git a/qadevOOo/tests/java/ifc/text/_XTextRangeCompare.java b/qadevOOo/tests/java/ifc/text/_XTextRangeCompare.java
index 4cdea2b..b39bba9 100644
--- a/qadevOOo/tests/java/ifc/text/_XTextRangeCompare.java
+++ b/qadevOOo/tests/java/ifc/text/_XTextRangeCompare.java
@@ -25,7 +25,6 @@ import lib.StatusException;
import com.sun.star.text.XText;
import com.sun.star.text.XTextCursor;
import com.sun.star.text.XTextDocument;
-import com.sun.star.text.XTextRange;
import com.sun.star.text.XTextRangeCompare;
import com.sun.star.uno.UnoRuntime;
import com.sun.star.uno.XInterface;
diff --git a/qadevOOo/tests/java/ifc/text/_XTextTableCursor.java b/qadevOOo/tests/java/ifc/text/_XTextTableCursor.java
index 0c6a4cb..7772301 100644
--- a/qadevOOo/tests/java/ifc/text/_XTextTableCursor.java
+++ b/qadevOOo/tests/java/ifc/text/_XTextTableCursor.java
@@ -20,7 +20,6 @@ package ifc.text;
import lib.MultiMethodTest;
-import com.sun.star.table.XCell;
import com.sun.star.text.XTextTableCursor;
diff --git a/qadevOOo/tests/java/mod/_dbaccess/OSingleSelectQueryComposer.java b/qadevOOo/tests/java/mod/_dbaccess/OSingleSelectQueryComposer.java
index 00835dd..272688f 100644
--- a/qadevOOo/tests/java/mod/_dbaccess/OSingleSelectQueryComposer.java
+++ b/qadevOOo/tests/java/mod/_dbaccess/OSingleSelectQueryComposer.java
@@ -23,7 +23,6 @@ import java.io.PrintWriter;
import lib.TestCase;
import lib.TestEnvironment;
import lib.TestParameters;
-import util.DBTools;
import util.utils;
import com.sun.star.beans.XPropertySet;
@@ -32,7 +31,6 @@ import com.sun.star.lang.XMultiServiceFactory;
import com.sun.star.sdb.CommandType;
import com.sun.star.sdb.XSingleSelectQueryAnalyzer;
import com.sun.star.sdb.XSingleSelectQueryComposer;
-import com.sun.star.sdbc.XConnection;
import com.sun.star.sdbc.XDataSource;
import com.sun.star.sdbc.XResultSet;
import com.sun.star.sdbcx.XColumnsSupplier;
diff --git a/qadevOOo/tests/java/mod/_fwk/ControlMenuController.java b/qadevOOo/tests/java/mod/_fwk/ControlMenuController.java
index 27bf1f9..9863c4c 100644
--- a/qadevOOo/tests/java/mod/_fwk/ControlMenuController.java
+++ b/qadevOOo/tests/java/mod/_fwk/ControlMenuController.java
@@ -19,7 +19,6 @@
package mod._fwk;
import com.sun.star.lang.XMultiServiceFactory;
-import com.sun.star.text.XTextDocument;
import com.sun.star.uno.XInterface;
import java.io.PrintWriter;
import lib.TestCase;
diff --git a/sc/qa/complex/dataPilot/_XDataPilotTable.java b/sc/qa/complex/dataPilot/_XDataPilotTable.java
index 1856413..1c29a0f 100644
--- a/sc/qa/complex/dataPilot/_XDataPilotTable.java
+++ b/sc/qa/complex/dataPilot/_XDataPilotTable.java
@@ -49,7 +49,6 @@ public class _XDataPilotTable {
private XCell xCellForChange = null;
private XCell xCellForCheck = null;
private CellAddress OutputRange = null;
- private int changeValue = 0;
/**
* The test parameters
@@ -72,7 +71,6 @@ public class _XDataPilotTable {
xCellForChange = (XCell)param.get("CELLFORCHANGE");
xCellForCheck = (XCell)param.get("CELLFORCHECK");
OutputRange = (CellAddress)param.get("OUTPUTRANGE");
- changeValue = ((Integer)param.get("CHANGEVALUE")).intValue();
if (xCellForChange == null || OutputRange == null ||
xCellForCheck == null) {
diff --git a/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java b/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java
index 6384f5b..cdb8715 100644
--- a/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java
+++ b/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java
@@ -20,11 +20,7 @@ package com.sun.star.script.framework.browse;
import com.sun.star.beans.XIntrospectionAccess;
-import com.sun.star.container.NoSuchElementException;
-
import com.sun.star.lang.XMultiComponentFactory;
-import com.sun.star.lang.WrappedTargetException;
-
import com.sun.star.lib.uno.helper.PropertySet;
import com.sun.star.script.XInvocation;
diff --git a/scripting/java/com/sun/star/script/framework/io/XStorageHelper.java b/scripting/java/com/sun/star/script/framework/io/XStorageHelper.java
index 7d5b900..79c5f10 100644
--- a/scripting/java/com/sun/star/script/framework/io/XStorageHelper.java
+++ b/scripting/java/com/sun/star/script/framework/io/XStorageHelper.java
@@ -29,10 +29,6 @@ import com.sun.star.embed.XTransactedObject;
import com.sun.star.frame.XModel;
-import com.sun.star.io.XInputStream;
-import com.sun.star.io.XOutputStream;
-import com.sun.star.io.XStream;
-
import com.sun.star.lang.EventObject;
import com.sun.star.lang.XComponent;
import com.sun.star.lang.XEventListener;
diff --git a/swext/mediawiki/src/com/sun/star/wiki/WikiProtocolSocketFactory.java b/swext/mediawiki/src/com/sun/star/wiki/WikiProtocolSocketFactory.java
index 81e09f9..17527ca 100644
--- a/swext/mediawiki/src/com/sun/star/wiki/WikiProtocolSocketFactory.java
+++ b/swext/mediawiki/src/com/sun/star/wiki/WikiProtocolSocketFactory.java
@@ -171,8 +171,6 @@ class WikiProtocolSocketFactory extends SSLSocketFactory
// to stderr - useful for debugging encrypted TLS connections
class LoggingProtocolSocketFactory extends SSLSocketFactory
{
- private SSLContext m_aSSLContext;
-
private static class LogSocket extends SSLSocket
{
private final SSLSocket m_Socket;
diff --git a/vcl/qa/complex/persistent_window_states/DocumentHandle.java b/vcl/qa/complex/persistent_window_states/DocumentHandle.java
index e3760ba..470b144 100644
--- a/vcl/qa/complex/persistent_window_states/DocumentHandle.java
+++ b/vcl/qa/complex/persistent_window_states/DocumentHandle.java
@@ -18,8 +18,6 @@
package complex.persistent_window_states;
-import helper.WindowListener;
-
import com.sun.star.awt.PosSize;
import com.sun.star.awt.Rectangle;
import com.sun.star.awt.WindowEvent;
diff --git a/wizards/com/sun/star/wizards/common/FileAccess.java b/wizards/com/sun/star/wizards/common/FileAccess.java
index 02357fe..8f74c60 100644
--- a/wizards/com/sun/star/wizards/common/FileAccess.java
+++ b/wizards/com/sun/star/wizards/common/FileAccess.java
@@ -28,13 +28,11 @@ import java.util.Vector;
import com.sun.star.io.XActiveDataSink;
import com.sun.star.io.XInputStream;
import com.sun.star.io.XTextInputStream;
-import com.sun.star.lang.Locale;
import com.sun.star.lang.XMultiServiceFactory;
import com.sun.star.ucb.CommandAbortedException;
import com.sun.star.ucb.XFileIdentifierConverter;
import com.sun.star.ucb.XSimpleFileAccess;
import com.sun.star.ucb.XSimpleFileAccess2;
-import com.sun.star.uno.Exception;
import com.sun.star.uno.UnoRuntime;
import com.sun.star.uno.XInterface;
import com.sun.star.beans.PropertyValue;
diff --git a/wizards/com/sun/star/wizards/common/ParaStyled.java b/wizards/com/sun/star/wizards/common/ParaStyled.java
index 492a75b..6046571 100644
--- a/wizards/com/sun/star/wizards/common/ParaStyled.java
+++ b/wizards/com/sun/star/wizards/common/ParaStyled.java
@@ -31,7 +31,7 @@ class ParaStyled
paraStyle = paraStyle_;
}
- void format(Object textRange)
+ private void format(Object textRange)
{
XText o;
o = UnoRuntime.queryInterface(XText.class, textRange);
diff --git a/wizards/com/sun/star/wizards/document/OfficeDocument.java b/wizards/com/sun/star/wizards/document/OfficeDocument.java
index 965e640..0f02623 100644
--- a/wizards/com/sun/star/wizards/document/OfficeDocument.java
+++ b/wizards/com/sun/star/wizards/document/OfficeDocument.java
@@ -17,7 +17,6 @@
*/
package com.sun.star.wizards.document;
-import com.sun.star.lang.IllegalArgumentException;
import com.sun.star.lang.XComponent;
import com.sun.star.lang.XMultiServiceFactory;
import com.sun.star.wizards.common.*;
diff --git a/wizards/com/sun/star/wizards/table/TableWizard.java b/wizards/com/sun/star/wizards/table/TableWizard.java
index f23647d..fc8a705 100644
--- a/wizards/com/sun/star/wizards/table/TableWizard.java
+++ b/wizards/com/sun/star/wizards/table/TableWizard.java
@@ -45,7 +45,7 @@ public class TableWizard extends DatabaseObjectWizard implements XTextListener
private FieldFormatter curFieldFormatter;
private PrimaryKeyHandler curPrimaryKeyHandler;
HashMap<String, FieldDescription> fielditems;
- int wizardmode;
+ private int wizardmode;
private String tablename;
private String serrToManyFields;
private String serrTableNameexists;
@@ -127,7 +127,7 @@ public class TableWizard extends DatabaseObjectWizard implements XTextListener
}
- public boolean iscompleted(int _ndialogpage)
+ private boolean iscompleted(int _ndialogpage)
{
switch (_ndialogpage)
{
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentSerializer.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentSerializer.java
index 9cf2942..5313956 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentSerializer.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentSerializer.java
@@ -24,7 +24,6 @@ import java.util.Iterator;
import org.openoffice.xmerge.ConvertData;
import org.openoffice.xmerge.ConvertException;
-import org.openoffice.xmerge.Document;
import org.openoffice.xmerge.DocumentSerializer;
import org.openoffice.xmerge.converter.xml.OfficeConstants;
import org.openoffice.xmerge.converter.xml.StyleCatalog;
More information about the Libreoffice-commits
mailing list