[Libreoffice-commits] .: 5 commits - bean/com bean/qa framework/qa javaunohelper/com javaunohelper/test jurt/com jurt/test qadevOOo/runner qadevOOo/tests sfx2/qa sw/qa toolkit/qa xmerge/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Aug 20 08:35:30 PDT 2012
bean/com/sun/star/beans/LocalOfficeConnection.java | 2
bean/com/sun/star/comp/beans/LocalOfficeConnection.java | 43 -
bean/qa/complex/bean/OOoBeanTest.java | 8
framework/qa/complex/XUserInputInterception/EventTest.java | 6
framework/qa/complex/accelerators/AcceleratorsConfigurationTest.java | 42 -
framework/qa/complex/api_internal/CheckAPI.java | 3
framework/qa/complex/framework/autosave/AutoSave.java | 4
framework/qa/complex/framework/recovery/RecoveryTest.java | 316 ----------
framework/qa/complex/imageManager/CheckImageManager.java | 10
framework/qa/complex/imageManager/_XComponent.java | 1
framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java | 9
framework/qa/complex/loadAllDocuments/StatusIndicator.java | 20
framework/qa/complex/path_settings/PathSettingsTest.java | 24
framework/qa/complex/path_substitution/PathSubstitutionTest.java | 12
javaunohelper/com/sun/star/comp/JavaUNOHelperServices.java | 3
javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToByteArrayAdapter.java | 2
javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java | 2
jurt/com/sun/star/comp/urlresolver/UrlResolver.java | 1
jurt/test/com/sun/star/lib/uno/environments/remote/JobQueue_Test.java | 2
jurt/test/com/sun/star/lib/uno/environments/remote/ThreadPool_Test.java | 3
qadevOOo/runner/complexlib/ShowTargets.java | 20
qadevOOo/runner/convwatch/GraphicalTestArguments.java | 3
qadevOOo/runner/graphical/ParameterHelper.java | 3
qadevOOo/runner/helper/APIDescGetter.java | 4
qadevOOo/runner/util/DBTools.java | 2
qadevOOo/tests/java/ifc/accessibility/_XAccessibleEditableText.java | 2
qadevOOo/tests/java/ifc/util/_XFlushable.java | 1
sfx2/qa/complex/sfx2/UndoManager.java | 3
sw/qa/complex/writer/CheckBookmarks.java | 1
toolkit/qa/complex/toolkit/accessibility/_XAccessibleComponent.java | 3
toolkit/qa/complex/toolkit/accessibility/_XAccessibleContext.java | 3
toolkit/qa/complex/toolkit/accessibility/_XAccessibleText.java | 3
xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentDeserializerImpl.java | 3
xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentMergerImpl.java | 2
xmerge/source/bridge/java/XMergeBridge.java | 18
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PocketExcelEncoder.java | 13
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Worksheet.java | 7
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaCompiler.java | 4
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaHelper.java | 6
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaParser.java | 35 -
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenDecoder.java | 3
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenEncoder.java | 14
xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentMergerImpl.java | 2
xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/Paragraph.java | 3
xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PocketWordDocument.java | 3
xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/DocumentDeserializerImpl.java | 1
xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/DocumentMergerImpl.java | 2
xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WSDecoder.java | 5
xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/textRecord.java | 2
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java | 5
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java | 7
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/StyleCatalog.java | 36 -
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnStyle.java | 20
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/DocumentMergerImpl.java | 2
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/RowStyle.java | 24
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SheetSettings.java | 2
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentSerializer.java | 35 -
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java | 2
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentMergerImpl.java | 2
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java | 1
xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CellNodeIterator.java | 2
xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CharArrayLCSAlgorithm.java | 18
xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/IteratorRowCompare.java | 3
xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/ObjectArrayIterator.java | 8
xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/RowIterator.java | 2
xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/CharacterBaseParagraphMerge.java | 7
xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/DocumentMerge.java | 10
xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfo.java | 8
68 files changed, 15 insertions(+), 863 deletions(-)
New commits:
commit f72ff01dd3af4dab11b6e8b9a2910553e802e2fe
Author: Noel Grandin <noel at peralex.com>
Date: Mon Aug 20 16:17:13 2012 +0100
Remove dead java code, fields and local variables
Change-Id: If777dcb0e0142229df737c2f1e3e6ecb61f64168
diff --git a/bean/com/sun/star/beans/LocalOfficeConnection.java b/bean/com/sun/star/beans/LocalOfficeConnection.java
index 6d81ac6..15f025a 100644
--- a/bean/com/sun/star/beans/LocalOfficeConnection.java
+++ b/bean/com/sun/star/beans/LocalOfficeConnection.java
@@ -33,7 +33,7 @@ import com.sun.star.lib.uno.helper.UnoUrl;
import com.sun.star.lib.util.NativeLibraryLoader;
/**
- * This class reprecents a connection to the local office application.
+ * This class represents a connection to the local office application.
* @deprecated
*/
public class LocalOfficeConnection
diff --git a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
index 7ab8d88..a1d51f6 100644
--- a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
+++ b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
@@ -50,8 +50,6 @@ public class LocalOfficeConnection
public static final String OFFICE_LIB_NAME = "officebean";
public static final String OFFICE_ID_SUFFIX = "_Office";
- private static String mProgramPath;
-
private Process mProcess;
private ContainerFactory mContainerFactory;
private XComponentContext mContext;
@@ -119,11 +117,6 @@ public class LocalOfficeConnection
}
//-------------------------------------------------------------------------
- // debugging method
- private void dbgPrint( String aMessage )
- {
- System.err.println( aMessage );
- }
/**
* Constructor.
@@ -182,7 +175,6 @@ public class LocalOfficeConnection
try
{
UnoUrl aURL = UnoUrl.parseUnoUrl( url );
- mProgramPath = null;
mConnType = aURL.getConnection();
mPipe = (String) aURL.getConnectionParameters().get( "pipe" );
mPort = (String) aURL.getConnectionParameters().get( "port" );
@@ -464,39 +456,6 @@ public class LocalOfficeConnection
/**
- * Retrives a path to the office program folder.
- *
- * @return The path to the office program folder.
- */
- static private String getProgramPath()
- {
- if (mProgramPath == null)
- {
- // determine name of executable soffice
- String aExec = OFFICE_APP_NAME; // default for UNIX
- String aOS = System.getProperty("os.name");
-
- // running on Windows?
- if (aOS.startsWith("Windows"))
- aExec = OFFICE_APP_NAME + ".exe";
-
- // add other non-UNIX operating systems here
- // ...
-
- // find soffice executable relative to this class's class loader:
- File path = NativeLibraryLoader.getResource(
- LocalOfficeConnection.class.getClassLoader(), aExec);
- if (path != null)
- mProgramPath = path.getParent();
-
- // default is ""
- if ( mProgramPath == null )
- mProgramPath = "";
- }
- return mProgramPath;
- }
-
- /**
* Parses a connection URL.
* This method accepts a UNO URL with following format:<br />
* <pre>
@@ -674,8 +633,6 @@ public class LocalOfficeConnection
"Invalid UNO connection URL.");
// Set up the connection parameters.
- if (path != null)
- mProgramPath = path;
if (pipe != null)
mPipe = pipe;
}
diff --git a/bean/qa/complex/bean/OOoBeanTest.java b/bean/qa/complex/bean/OOoBeanTest.java
index 5ef755c..a644993 100644
--- a/bean/qa/complex/bean/OOoBeanTest.java
+++ b/bean/qa/complex/bean/OOoBeanTest.java
@@ -688,19 +688,11 @@ public class OOoBeanTest
}
public Dimension getPreferredSize()
{
- Container c = getParent();
return new Dimension(200, 200);
}
}
-
-
- private XMultiServiceFactory getMSF()
- {
- return(UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager()));
- }
-
// setup and close connections
@BeforeClass public static void setUpConnection() throws Exception {
System.out.println("setUpConnection()");
diff --git a/framework/qa/complex/XUserInputInterception/EventTest.java b/framework/qa/complex/XUserInputInterception/EventTest.java
index d7b8b32..576a8f5 100644
--- a/framework/qa/complex/XUserInputInterception/EventTest.java
+++ b/framework/qa/complex/XUserInputInterception/EventTest.java
@@ -71,9 +71,6 @@ public class EventTest {
//-------------------------------------------
// member
- /** points to the global uno service manager. */
- private XMultiServiceFactory m_xMSF = null;
-
/** indicates if the mousePressed event was called*/
private boolean m_mousePressed = false;
/** indicates if the mouseReleased event was called*/
@@ -131,9 +128,6 @@ public class EventTest {
* different components inside.
*/
@Before public void before() {
- // get uno service manager from global test environment
- m_xMSF = getMSF();
-
// create frame instance
try {
// get a soffice factory object
diff --git a/framework/qa/complex/accelerators/AcceleratorsConfigurationTest.java b/framework/qa/complex/accelerators/AcceleratorsConfigurationTest.java
index 9c098ac..8c14b81 100644
--- a/framework/qa/complex/accelerators/AcceleratorsConfigurationTest.java
+++ b/framework/qa/complex/accelerators/AcceleratorsConfigurationTest.java
@@ -64,7 +64,6 @@ public class AcceleratorsConfigurationTest
private XAcceleratorConfiguration m_xModuleAccelCfg = null;
private XAcceleratorConfiguration m_xDocumentAccelCfg = null;
/** XCS/XCU based accelerator configuration. */
- private XNameAccess m_xConfig = null;
private XNameAccess m_xPrimaryKeys = null;
private XNameAccess m_xSecondaryKeys = null;
@@ -113,7 +112,6 @@ public class AcceleratorsConfigurationTest
public void after()
throws java.lang.Exception
{
- m_xConfig = null;
m_xGlobalAccelCfg = null;
m_xModuleAccelCfg = null;
m_xDocumentAccelCfg = null;
@@ -578,46 +576,6 @@ public class AcceleratorsConfigurationTest
//-------------------------------------------
/** @todo document me.
*/
- private void insertKeyToConfiguration(XNameAccess xAccess, String sKey, String sCommand)
- throws java.lang.Exception
- {
- XNameContainer xContainer = UnoRuntime.queryInterface(XNameContainer.class, xAccess);
- if (!xContainer.hasByName(sKey))
- {
- XSingleServiceFactory xFac = UnoRuntime.queryInterface(XSingleServiceFactory.class, xContainer);
- XInterface xInst = UnoRuntime.queryInterface(XInterface.class, xFac.createInstance());
- xContainer.insertByName(sKey, xInst);
- }
-
- XNameAccess xKey = UnoRuntime.queryInterface(XNameAccess.class, xContainer.getByName(sKey));
- XNameContainer xCommand = UnoRuntime.queryInterface(XNameContainer.class, xKey.getByName("Command"));
- String sLocale = getOfficeLocale();
- if (xCommand.hasByName(sLocale))
- {
- xCommand.insertByName(sLocale, sCommand);
- }
- else
- {
- xCommand.replaceByName(sLocale, sCommand);
- }
- }
-
- //-------------------------------------------
- /** @todo document me.
- */
- private void removeKeyFromConfiguration(XNameAccess xAccess, String sKey)
- throws java.lang.Exception
- {
- XNameContainer xContainer = UnoRuntime.queryInterface(XNameContainer.class, xAccess);
- if (xContainer.hasByName(sKey))
- {
- xContainer.removeByName(sKey);
- }
- }
-
- //-------------------------------------------
- /** @todo document me.
- */
private void LoadDocumentAcceleratorConfiguration(String sDocCfgName)
throws java.lang.Exception
{
diff --git a/framework/qa/complex/api_internal/CheckAPI.java b/framework/qa/complex/api_internal/CheckAPI.java
index 66f09fa..96d734f 100644
--- a/framework/qa/complex/api_internal/CheckAPI.java
+++ b/framework/qa/complex/api_internal/CheckAPI.java
@@ -51,9 +51,6 @@ import com.sun.star.uno.UnoRuntime;
*/
public class CheckAPI {
- // The name of the tested service
- private final String testName = "StarOfficeAPI";
-
/**
* Return all test methods.
* @return The test methods.
diff --git a/framework/qa/complex/framework/autosave/AutoSave.java b/framework/qa/complex/framework/autosave/AutoSave.java
index 000e99c..5116d7c 100644
--- a/framework/qa/complex/framework/autosave/AutoSave.java
+++ b/framework/qa/complex/framework/autosave/AutoSave.java
@@ -166,10 +166,6 @@ public class AutoSave
/** can be used to trigger/enable/disable the AutoSave feature. */
private XDispatch m_xAutoSave = null;
- /** a test document, which needs some time for saving to simulate concurrent
- * save operations. */
- private XStorable m_xTestDoc = null;
-
private XURLTransformer m_xURLParser = null;
//-------------------------------------------
diff --git a/framework/qa/complex/framework/recovery/RecoveryTest.java b/framework/qa/complex/framework/recovery/RecoveryTest.java
index fedc92e..470eabe 100644
--- a/framework/qa/complex/framework/recovery/RecoveryTest.java
+++ b/framework/qa/complex/framework/recovery/RecoveryTest.java
@@ -183,17 +183,6 @@ public class RecoveryTest extends ComplexTestCase {
}
- private void makeRecoveryData(){
- cleanRecoveryData();
- startOffice();
- generateDesktop();
- makeCrash();
- int expectedDocumentCount = windowsPosSize.size() + 1;
- handleRecoveryDialogAfterCrash(expectedDocumentCount);
- backupRecoveryData();
- cleanRecoveryData();
- }
-
private void startOffice(){
assure("Could not connect to office", connect());
log.setWatcher(param.get("Watcher"));
@@ -243,61 +232,6 @@ public class RecoveryTest extends ComplexTestCase {
}
/**
- * While creating the test environment the positions and sizes of the frames
- * was saved. After the Office has recovered the documents, this functions
- * compares the saved positions and sizes with the current frame.
- */
- private void compareWindowPositions(){
- System.out.println("all frames:########");
- System.out.println(windowsPosSize.entrySet().toString());
-
- XEnumeration allComp = DesktopTools.getAllComponents(xMSF);
-
- String msg=null;
-
- while (allComp.hasMoreElements()){
- try{
- // get all components from the desktop
- XComponent xComponent = UnoRuntime.queryInterface(
- XComponent.class, allComp.nextElement());
-
- XModel xModel = UnoRuntime.queryInterface(XModel.class, xComponent);
-
- String frameName = xModel.getCurrentController().getFrame().getName();
-
- // check if this frame was used in creation of test environment
- if (windowsPosSize.containsKey(frameName)){
-
- Rectangle oldRect = windowsPosSize.get(frameName);
-
- XWindow xWindow = xModel.getCurrentController().getFrame().getContainerWindow();
- Rectangle newRect = xWindow.getPosSize();
-
-
- boolean ok = oldRect.Height == newRect.Height;
- ok &= oldRect.Width == newRect.Width;
- ok &= oldRect.X == newRect.X;
- ok &= oldRect.Y == newRect.Y;
-
- if (!ok){
- msg = "The frame '" + frameName + "' has a different position/size:\n";
- msg += "original value -> restored value:\n";
- msg += "X : " + oldRect.X + " -> " + newRect.X + "\n";
- msg += "Y : " + oldRect.Y + " -> " + newRect.Y + "\n";
- msg += "Height: " + oldRect.Height + " -> " + newRect.Height + "\n";
- msg += "Width : " + oldRect.Width + " -> " + newRect.Width + "\n";
- }
-
- assure(msg, ok, CONTINUE);
-
- }
- } catch (com.sun.star.container.NoSuchElementException e) {
- } catch ( com.sun.star.lang.WrappedTargetException e) {}
- }
-
- }
-
- /**
* This function crashes the office
*/
private void makeCrash(){
@@ -416,12 +350,6 @@ public class RecoveryTest extends ComplexTestCase {
handleAreYouSureDialog(true);
handleSaveDocumentsDialog(true);
}
- private void handleRecoveryDialog_Recover(int expectedDocumentCount){
-
- }
- private void handleRecoveryDialog_RecoverAndCrashreporter(int expectedDocumentCount){
-
- }
/**
* This function uses accessibility to handle the dialog which appears while the
* office is started after a crash. It waits until the "next>>" button is enabled
@@ -624,30 +552,6 @@ public class RecoveryTest extends ComplexTestCase {
}
- private void makeImpressDoc(String frameName, boolean withContent){
- log.println("creating Impress document '" + frameName + "'");
- XComponent xImpressDoc = createNewImpressDoc(frameName);
- if (withContent) fillImpressDocWithContent(xImpressDoc);
- positioningDocument(UnoRuntime.queryInterface(XModel.class,
- xImpressDoc));
- }
-
- private void makeDrawDoc(String frameName, boolean withContent){
- log.println("creating Draw document '" + frameName + "'");
- XComponent xDrawDoc = createNewDrawDoc(frameName);
- if (withContent) fillDrawDocWithContent(xDrawDoc);
- positioningDocument(UnoRuntime.queryInterface(XModel.class,
- xDrawDoc));
- }
-
- private void makeCalcDoc(String frameName, boolean withContent){
- log.println("creating Calc document '" + frameName + "'");
- XSpreadsheetDocument xSpreadsheetDoc = createNewCalcDoc(frameName);
- if (withContent) fillCalcDocWithContent(xSpreadsheetDoc);
- positioningDocument(UnoRuntime.queryInterface(XModel.class,
- xSpreadsheetDoc));
- }
-
private void positioningDocument(XModel model){
XWindow xWindow = model.getCurrentController().getFrame().getContainerWindow();
@@ -686,163 +590,6 @@ public class RecoveryTest extends ComplexTestCase {
return posSize;
}
- private void makeMathDoc(String frameName, boolean withContent){
- log.println("creating Math document '" + frameName + "'");
- XComponent xMathDoc = createNewMathDoc(frameName);
- if (withContent) fillMathDocWithContent(xMathDoc);
- positioningDocument(UnoRuntime.queryInterface(XModel.class,
- xMathDoc));
- }
-
- private XComponent createNewMathDoc(String frameName){
- XComponent xMathDoc = null;
- try{
- xMathDoc = SOF.createMathDoc(frameName);
- } catch (com.sun.star.uno.Exception e) {
- log.println("Exception occurred while creating math document '"+frameName+"':");
- failed("Couldn't create test environment");
- }
- return xMathDoc;
- }
-
- private void fillMathDocWithContent(XComponent xMathDoc){
- // setting a formula in document
- final String expFormula = "sum a cdot b";
- final XPropertySet xPS = UnoRuntime.queryInterface
- (XPropertySet.class, xMathDoc);
- try {
- xPS.setPropertyValue("Formula", expFormula);
- } catch(com.sun.star.lang.WrappedTargetException e) {
- log.println("Exception occurred while filling math document with content.");
- failed("Couldn't create test environment");
- } catch(com.sun.star.lang.IllegalArgumentException e) {
- log.println("Exception occurred while filling math document with content.");
- failed("Couldn't create test environment");
- } catch(com.sun.star.beans.PropertyVetoException e) {
- log.println("Exception occurred while filling math document with content.");
- failed("Couldn't create test environment");
- } catch(com.sun.star.beans.UnknownPropertyException e) {
- log.println("Exception occurred while filling math document with content.");
- failed("Couldn't create test environment");
- }
- }
-
- private XComponent createNewImpressDoc(String frameName){
- XComponent xImpressDoc = null;
- try{
- xImpressDoc = SOF.createImpressDoc(frameName);
- } catch (com.sun.star.uno.Exception e) {
- log.println("Exception occurred while creating impress document '"+frameName+"':");
- failed("Couldn't create test environment");
- }
- return xImpressDoc;
- }
-
-
- private void fillImpressDocWithContent(XComponent xImpressDoc){
-
- log.println( "get presentation" );
- XPresentationSupplier oPS = UnoRuntime.queryInterface(XPresentationSupplier.class, xImpressDoc);
- XInterface oObj = oPS.getPresentation();
-
- log.println( "get custom presentation" );
- XCustomPresentationSupplier oCPS = UnoRuntime.queryInterface(
- XCustomPresentationSupplier.class, xImpressDoc);
- XNameContainer xCP = oCPS.getCustomPresentations();
-
- XInterface oInstance = null;
-
- XSingleServiceFactory oSingleMSF = UnoRuntime.queryInterface(XSingleServiceFactory.class, xCP);
-
- try{
- oInstance = (XInterface) oSingleMSF.createInstance();
- } catch (com.sun.star.uno.Exception e) {
- log.println("Could not create custom presentation while filling impress document with content.");
- failed("Couldn't create test environment");
- }
-
- try {
- xCP.insertByName("FirstPresentation",oInstance);
- } catch (com.sun.star.lang.WrappedTargetException e) {
- log.println("Could not instert custom presentation while filling impress document with content.");
- failed("Couldn't create test environment");
- } catch (com.sun.star.container.ElementExistException e) {
- log.println("Could not instert custom presentation while filling impress document with content.");
- failed("Couldn't create test environment");
- } catch (com.sun.star.lang.IllegalArgumentException e) {
- log.println("Could not instert custom presentation while filling impress document with content.");
- failed("Couldn't create test environment");
- }
- }
-
- private XComponent createNewDrawDoc(String frameName){
- XComponent xDrawDoc = null;
- try{
- xDrawDoc = SOF.createDrawDoc(frameName);
- } catch (com.sun.star.uno.Exception e) {
- log.println("Exception occurred while creating draw document '"+frameName+"':");
- failed("Couldn't create test environment");
- }
- return xDrawDoc;
- }
-
- private void fillDrawDocWithContent(XComponent xDrawDoc){
- XDrawPagesSupplier oDPS = UnoRuntime.queryInterface(XDrawPagesSupplier.class, xDrawDoc);
- XDrawPages oDPn = oDPS.getDrawPages();
- XIndexAccess oDPi = UnoRuntime.queryInterface(XIndexAccess.class, oDPn);
- XDrawPage oDP = null;
- try {
- oDP = (XDrawPage) AnyConverter.toObject(
- new Type(XDrawPage.class),oDPi.getByIndex(0));
- } catch (com.sun.star.lang.WrappedTargetException e) {
- log.println("Could not get draw pages while filling draw document with content.");
- failed("Couldn't create test environment");
- } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
- log.println("Could not get draw pages while filling draw document with content.");
- failed("Couldn't create test environment");
- } catch (com.sun.star.lang.IllegalArgumentException e) {
- log.println("Could not get draw pages while filling draw document with content.");
- failed("Couldn't create test environment");
- }
-
- //get a Shape
- log.println( "getting Shape" );
- XShapes oShapes = UnoRuntime.queryInterface
- (XShapes.class, oDP);
- XInterface oObj = SOF.createShape
- (xDrawDoc, 5000, 3500, 7500, 5000, "Rectangle");
- for (int i=0; i < 10; i++) {
- oShapes.add(
- SOF.createShape(xDrawDoc,
- 5000, 3500, 7510 + 10 * i, 5010 + 10 * i, "Rectangle"));
- }
- XShape oShape = SOF.createShape
- (xDrawDoc, 3000, 4500, 15000, 1000, "Ellipse");
- oShapes.add((XShape) oObj);
- oShapes.add(oShape);
-
-
- XPropertySet oShapeProps = UnoRuntime.queryInterface(XPropertySet.class, oObj);
- XStyle aStyle = null;
- try {
- aStyle = (XStyle) AnyConverter.toObject(
- new Type(XStyle.class),oShapeProps.getPropertyValue("Style"));
- oShapeProps.setPropertyValue("ZOrder", new Integer(1));
- } catch (com.sun.star.lang.WrappedTargetException e) {
- log.println("Exception occurred while setting or getting property value while filling draw document with content.");
- failed("Couldn't create test environment");
- } catch (com.sun.star.beans.UnknownPropertyException e) {
- log.println("Exception occurred while setting or getting property value while filling draw document with content.");
- failed("Couldn't create test environment");
- } catch (com.sun.star.lang.IllegalArgumentException e) {
- log.println("Exception occurred while setting or getting property value while filling draw document with content.");
- failed("Couldn't create test environment");
- } catch (com.sun.star.beans.PropertyVetoException e) {
- log.println("Exception occurred while setting or getting property value while filling draw document with content.");
- failed("Couldn't create test environment");
- }
- }
-
private void makeWriterDoc(String frameName, boolean withContent){
log.println("creating Writer document '" + frameName + "'");
XTextDocument xTextDoc = createNewWriterDoc(frameName);
@@ -888,69 +635,6 @@ public class RecoveryTest extends ComplexTestCase {
}
}
- private XSpreadsheetDocument createNewCalcDoc(String frameName){
-
- XSpreadsheetDocument xSheetDoc = null;
-
- try {
- xSheetDoc = SOF.createCalcDoc(frameName);
- } catch (com.sun.star.uno.Exception e) {
- log.println("Exception occurred while creating calc document '"+frameName+"':");
- failed("Couldn't create test environment");
- }
- return xSheetDoc;
- }
-
- private void fillCalcDocWithContent(XSpreadsheetDocument xSpreadsheetDoc){
-
- try{
- XSpreadsheets oSpreadsheets = xSpreadsheetDoc.getSheets();
-
- XSpreadsheet oSheet = (XSpreadsheet) AnyConverter.toObject(
- new Type(XSpreadsheet.class),
- oSpreadsheets.getByName(
- oSpreadsheets.getElementNames()[0]));
-
- XCellRange testRange = oSheet.getCellRangeByName("$A$1:$D$4");
-
- XSheetCellRange testSheetRange = UnoRuntime.queryInterface(
- XSheetCellRange.class,
- testRange);
- oSheet.getCellByPosition(1, 1).setValue(1);
- oSheet.getCellByPosition(4, 5).setValue(1);
- oSheet.getCellByPosition(3, 2).setFormula("xTextDoc");
- oSheet.getCellByPosition(3, 3).setFormula("xTextDoc");
- } catch (com.sun.star.lang.WrappedTargetException e) {
- log.println("Exception occurred while filling calc document with content.");
- failed("Couldn't create test environment");
- } catch (com.sun.star.container.NoSuchElementException e) {
- log.println("Exception occurred while filling calc document with content.");
- failed("Couldn't create test environment");
- } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
- log.println("Exception occurred while filling calc document with content.");
- failed("Couldn't create test environment");
- } catch (com.sun.star.lang.IllegalArgumentException e) {
- log.println("Exception occurred while filling calc document with content.");
- failed("Couldn't create test environment");
- }
- }
-
- /**
- * copies all files from the backup folder into a folder called backup.recoveryTest
- * and copies the Recovery.xcu to recovery.xcu.recoeryTest
- */
- private void backupRecoveryData()
- {
- log.println("backup recovery data...");
- try{
- rt.copyRecoveryData(true);
- }catch (com.sun.star.io.IOException e){
- failed("could not copy recovery data: " + e.toString());
- }catch (java.io.IOException e){
- failed("could not copy recovery data: " + e.toString());
- }
- }
-
/**
* copies all files from the backup.recoveryTest folder into the backup folder
* and copies the Recovery.xcu.recoveryTest to recovery.xcu
diff --git a/framework/qa/complex/imageManager/CheckImageManager.java b/framework/qa/complex/imageManager/CheckImageManager.java
index 8e43536..4d1d78e 100644
--- a/framework/qa/complex/imageManager/CheckImageManager.java
+++ b/framework/qa/complex/imageManager/CheckImageManager.java
@@ -97,7 +97,7 @@ public class CheckImageManager {
private void performChecks(XImageManager xImageManager, String testObjectName, XUIConfigurationManager xManager) {
util.dbg.printInterfaces(xImageManager);
- OXUIConfigurationListenerImpl configListener = new OXUIConfigurationListenerImpl(xManager, xMSF);
+ OXUIConfigurationListenerImpl configListener = new OXUIConfigurationListenerImpl();
param.put("XUIConfiguration.XUIConfigurationListenerImpl", configListener);
XInitialization xInit = UnoRuntime.queryInterface(XInitialization.class, xImageManager);
@@ -146,14 +146,6 @@ public class CheckImageManager {
class OXUIConfigurationListenerImpl implements _XUIConfiguration.XUIConfigurationListenerImpl {
private boolean triggered = false;
- private XUIConfigurationManager xUIManager = null;
- private XMultiServiceFactory xMSF = null;
-
- public OXUIConfigurationListenerImpl(XUIConfigurationManager xUIManager, XMultiServiceFactory xMSF) {
-
- this.xUIManager = xUIManager;
- this.xMSF = xMSF;
- }
public boolean actionWasTriggered() {
return triggered;
diff --git a/framework/qa/complex/imageManager/_XComponent.java b/framework/qa/complex/imageManager/_XComponent.java
index 4addee6..947d7cd 100644
--- a/framework/qa/complex/imageManager/_XComponent.java
+++ b/framework/qa/complex/imageManager/_XComponent.java
@@ -40,7 +40,6 @@ import lib.TestParameters;
public class _XComponent {
public static XComponent oObj = null;
- private XNameContainer xContainer = null;
private XComponent altDispose = null;
TestParameters tEnv = null;
boolean listenerDisposed[] = new boolean[2];
diff --git a/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java b/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java
index 95a8fa5..c562ea2 100644
--- a/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java
+++ b/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java
@@ -677,15 +677,6 @@ public class CheckXComponentLoader
}
}
- private void loadURL(XComponentLoader m_xLoader, int nRequiredResult,
- String[] sURL, String sTarget, int nFlags,
- PropertyValue[] lProps) {
- for (int i = 0; i < sURL.length; i++)
- {
- loadURL(m_xLoader, nRequiredResult, sURL[i], sTarget, nFlags, lProps);
- }
- }
-
/**
* it match the int result value to a string, which can be used for logging
*/
diff --git a/framework/qa/complex/loadAllDocuments/StatusIndicator.java b/framework/qa/complex/loadAllDocuments/StatusIndicator.java
index 6e2129e..ab6b226 100644
--- a/framework/qa/complex/loadAllDocuments/StatusIndicator.java
+++ b/framework/qa/complex/loadAllDocuments/StatusIndicator.java
@@ -57,16 +57,9 @@ public class StatusIndicator implements com.sun.star.task.XStatusIndicator
// ____________________
/**
- * @member m_sText text, which describe the current status
* @member m_nRange max value for any progress
- * @member m_nValue the progress value
- * @member m_nOut regulate, how the status will be shown
- * @member m_aProtocol used for logging and transport information about used interface of this object
*/
- private String m_sText ;
private int m_nRange ;
- private int m_nValue ;
- private int m_nOut ;
private boolean m_bWasUsed ;
// ____________________
@@ -77,10 +70,7 @@ public class StatusIndicator implements com.sun.star.task.XStatusIndicator
*/
public StatusIndicator( int nOut)
{
- m_sText = new String() ;
m_nRange = 100 ;
- m_nValue = 0 ;
- m_nOut = nOut ;
m_bWasUsed = false;
}
@@ -100,9 +90,7 @@ public class StatusIndicator implements com.sun.star.task.XStatusIndicator
synchronized(this)
{
m_bWasUsed = true;
- m_sText = sText ;
m_nRange = nRange;
- m_nValue = 0 ;
}
impl_show();
}
@@ -117,9 +105,7 @@ public class StatusIndicator implements com.sun.star.task.XStatusIndicator
synchronized(this)
{
m_bWasUsed = true;
- m_sText = new String();
m_nRange = 100;
- m_nValue = 0;
}
impl_show();
}
@@ -137,7 +123,6 @@ public class StatusIndicator implements com.sun.star.task.XStatusIndicator
synchronized(this)
{
m_bWasUsed = true;
- m_sText = sText;
}
impl_show();
}
@@ -156,9 +141,6 @@ public class StatusIndicator implements com.sun.star.task.XStatusIndicator
synchronized(this)
{
m_bWasUsed = true;
-
- if (nValue<=m_nRange)
- m_nValue = nValue;
}
impl_show();
}
@@ -173,8 +155,6 @@ public class StatusIndicator implements com.sun.star.task.XStatusIndicator
synchronized(this)
{
m_bWasUsed = true;
- m_sText = new String();
- m_nValue = 0;
}
impl_show();
}
diff --git a/framework/qa/complex/path_settings/PathSettingsTest.java b/framework/qa/complex/path_settings/PathSettingsTest.java
index 9a26312..aa503b4 100644
--- a/framework/qa/complex/path_settings/PathSettingsTest.java
+++ b/framework/qa/complex/path_settings/PathSettingsTest.java
@@ -247,27 +247,6 @@ public class PathSettingsTest
return false;
}
- private String getPropertyValueAsString(String _sName)
- {
- final XPropertySet xPropSet_of_PathSettings = UnoRuntime.queryInterface(XPropertySet.class, aPathSettings);
- String sValue = "";
- {
- Object o;
- try
- {
- o = xPropSet_of_PathSettings.getPropertyValue(_sName);
- sValue = convertToString(o);
- }
- catch (UnknownPropertyException ex)
- {
- }
- catch (WrappedTargetException ex)
- {
- }
- }
- return sValue;
- }
-
/**
* Shows the path settings
* @throws UnknownPropertyException
@@ -934,7 +913,6 @@ public class PathSettingsTest
private boolean propChanged = false;
private boolean propertiesChanged = false;
- private boolean disposeCalled = false;
private boolean vetoableChanged = false;
public void propertiesChange(
@@ -956,14 +934,12 @@ public class PathSettingsTest
public void disposing(com.sun.star.lang.EventObject eventObject)
{
- disposeCalled = true;
}
public void resetListener()
{
propChanged = false;
propertiesChanged = false;
- disposeCalled = false;
vetoableChanged = false;
}
diff --git a/framework/qa/complex/path_substitution/PathSubstitutionTest.java b/framework/qa/complex/path_substitution/PathSubstitutionTest.java
index 664c0bc..b2d7c86 100644
--- a/framework/qa/complex/path_substitution/PathSubstitutionTest.java
+++ b/framework/qa/complex/path_substitution/PathSubstitutionTest.java
@@ -239,13 +239,6 @@ public class PathSubstitutionTest
resubst = new ArrayList<Boolean>();
}
- public void add(String var)
- {
- varName.add(var);
- substAtBegin.add(Boolean.TRUE);
- resubst.add(Boolean.TRUE);
- }
-
public void add(String var, boolean onlySubstAtBegin,
boolean canResubst)
{
@@ -269,11 +262,6 @@ public class PathSubstitutionTest
return varName.get(i);
}
- public String getValue(int i)
- {
- return varName.get(i);
- }
-
public String getValue(String var)
{
return varValue.get(varName.indexOf(var));
diff --git a/javaunohelper/com/sun/star/comp/JavaUNOHelperServices.java b/javaunohelper/com/sun/star/comp/JavaUNOHelperServices.java
index 69cbc0e..7ed846e 100644
--- a/javaunohelper/com/sun/star/comp/JavaUNOHelperServices.java
+++ b/javaunohelper/com/sun/star/comp/JavaUNOHelperServices.java
@@ -29,9 +29,6 @@ import com.sun.star.comp.juhtest.SmoketestCommandEnvironment;
*/
public class JavaUNOHelperServices {
- static private final String __service_smoketestCommandEnv =
- "com.sun.star.deployment.test.SmoketestCommandEnvironment";
-
/**
* Gives a factory for creating the service.
* This method is called by the <code>JavaLoader</code>
diff --git a/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToByteArrayAdapter.java b/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToByteArrayAdapter.java
index b3f7b24..ca40153 100644
--- a/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToByteArrayAdapter.java
+++ b/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToByteArrayAdapter.java
@@ -40,7 +40,6 @@ public class XOutputStreamToByteArrayAdapter
private int size = 0;
private int position = 0;
private boolean externalBuffer = false;
- private boolean closed = false;
private byte[] buffer;
/** Creates a new instance of ByteArrayXOutputStream */
@@ -77,7 +76,6 @@ public class XOutputStreamToByteArrayAdapter
System.arraycopy(buffer, 0, newBuffer, 0, position);
buffer = newBuffer;
}
- closed = true;
}
public void flush()
diff --git a/javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java b/javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java
index fbf9035..1992ceb 100644
--- a/javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java
+++ b/javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java
@@ -1125,7 +1125,6 @@ class TestClass extends PropertySet
boolean boolPropC;
public Property propBoolD= new Property("PropBoolD", 301, new Type(Boolean.TYPE), (short) 0);
- private boolean boolPropD;
public Property propBoolClass= new Property("PropBoolClass", 1001, new Type(Boolean.class), (short) 0);
public Boolean boolClassProp;
@@ -1453,7 +1452,6 @@ class TestClass extends PropertySet
enumPropertyState = com.sun.star.beans.PropertyState.DEFAULT_VALUE;
boolPropB= false;
boolPropC= false;
- boolPropD= false;
boolClassProp= null;
charClassProp= null;
byteClassProp= null;
diff --git a/jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java b/jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java
index e6ee09f..1174bec 100644
--- a/jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java
+++ b/jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java
@@ -209,6 +209,7 @@ public class java_remote_bridge
}
private final Type type;
+ private final Object object;
private int count = 1;
}
diff --git a/sfx2/qa/complex/sfx2/UndoManager.java b/sfx2/qa/complex/sfx2/UndoManager.java
index 92265d2..17983a8 100644
--- a/sfx2/qa/complex/sfx2/UndoManager.java
+++ b/sfx2/qa/complex/sfx2/UndoManager.java
@@ -1240,7 +1240,6 @@ public class UndoManager
public void redo() throws UndoFailedException
{
- m_redoCalled = true;
}
public void dispose()
@@ -1259,12 +1258,10 @@ public class UndoManager
}
boolean undoCalled() { return m_undoCalled; }
- boolean redoCalled() { return m_redoCalled; }
boolean disposed() { return m_disposed; }
private final String m_title;
private boolean m_undoCalled = false;
- private boolean m_redoCalled = false;
private boolean m_disposed = false;
}
diff --git a/sw/qa/complex/writer/CheckBookmarks.java b/sw/qa/complex/writer/CheckBookmarks.java
index a92e44e..ae637b5 100644
--- a/sw/qa/complex/writer/CheckBookmarks.java
+++ b/sw/qa/complex/writer/CheckBookmarks.java
@@ -88,7 +88,6 @@ public class CheckBookmarks {
private XMultiServiceFactory m_xMsf = null;
private XTextDocument m_xDoc = null;
private XTextDocument m_xOdfReloadedDoc = null;
- private XTextDocument m_xMsWordReloadedDoc = null;
private final BookmarkHashes actualHashes = new BookmarkHashes();
private BookmarkHashes get20111110Expectations() {
commit fa4966a15c02c435534662b51f45cac51728640d
Author: Noel Grandin <noel at peralex.com>
Date: Tue Jul 3 09:53:52 2012 +0200
Remove dead java code
Change-Id: I9a86978c4b4da058ddc44a7e79635e232ff6c870
diff --git a/jurt/com/sun/star/comp/urlresolver/UrlResolver.java b/jurt/com/sun/star/comp/urlresolver/UrlResolver.java
index 0d73e70..166007a 100644
--- a/jurt/com/sun/star/comp/urlresolver/UrlResolver.java
+++ b/jurt/com/sun/star/comp/urlresolver/UrlResolver.java
@@ -72,7 +72,6 @@ public class UrlResolver {
}
else { // new style
int index = dcp.indexOf(':');
- String url = dcp.substring(0, index).trim();
dcp = dcp.substring(index + 1).trim();
index = dcp.indexOf(';');
diff --git a/jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java b/jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java
index 1174bec..e6ee09f 100644
--- a/jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java
+++ b/jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java
@@ -209,7 +209,6 @@ public class java_remote_bridge
}
private final Type type;
- private final Object object;
private int count = 1;
}
diff --git a/jurt/test/com/sun/star/lib/uno/environments/remote/JobQueue_Test.java b/jurt/test/com/sun/star/lib/uno/environments/remote/JobQueue_Test.java
index 87af592..07639a9 100644
--- a/jurt/test/com/sun/star/lib/uno/environments/remote/JobQueue_Test.java
+++ b/jurt/test/com/sun/star/lib/uno/environments/remote/JobQueue_Test.java
@@ -197,7 +197,6 @@ public final class JobQueue_Test {
public final ThreadId _threadId = JavaThreadPoolFactory.getThreadId();
public final Object _disposeId = new Object();
public JobQueue _jobQueue = null;
- public String _message;
public TestThread(int waitTime) {
this.waitTime = waitTime;
@@ -219,7 +218,6 @@ public final class JobQueue_Test {
}
_jobQueue.enter(_disposeId);
} catch (Throwable e) {
- _message = e.getMessage();
}
synchronized (lock) {
state = STATE_DONE;
diff --git a/jurt/test/com/sun/star/lib/uno/environments/remote/ThreadPool_Test.java b/jurt/test/com/sun/star/lib/uno/environments/remote/ThreadPool_Test.java
index 7a3689e..8be06b0 100644
--- a/jurt/test/com/sun/star/lib/uno/environments/remote/ThreadPool_Test.java
+++ b/jurt/test/com/sun/star/lib/uno/environments/remote/ThreadPool_Test.java
@@ -338,8 +338,6 @@ public class ThreadPool_Test {
private static final class TestThread extends Thread {
ThreadId _threadId;
- Object _disposeId = new Object();
- String _message;
IThreadPool _iThreadPool;
TestThread() {
@@ -368,7 +366,6 @@ public class ThreadPool_Test {
_iThreadPool.enter();
}
catch(Throwable throwable) {
- _message = throwable.getMessage();
}
_iThreadPool.detach();
diff --git a/toolkit/qa/complex/toolkit/accessibility/_XAccessibleComponent.java b/toolkit/qa/complex/toolkit/accessibility/_XAccessibleComponent.java
index d90e119..b981886 100644
--- a/toolkit/qa/complex/toolkit/accessibility/_XAccessibleComponent.java
+++ b/toolkit/qa/complex/toolkit/accessibility/_XAccessibleComponent.java
@@ -53,9 +53,6 @@ public class _XAccessibleComponent {
private Rectangle bounds = null ;
- private static final String className =
- "com.sun.star.accessibility.XAccessibleComponent";
-
/**
* Constructor
* @param object
diff --git a/toolkit/qa/complex/toolkit/accessibility/_XAccessibleContext.java b/toolkit/qa/complex/toolkit/accessibility/_XAccessibleContext.java
index 290ac80..71f746f 100644
--- a/toolkit/qa/complex/toolkit/accessibility/_XAccessibleContext.java
+++ b/toolkit/qa/complex/toolkit/accessibility/_XAccessibleContext.java
@@ -52,9 +52,6 @@ public class _XAccessibleContext {
// private LogWriter log;
- private static final String className =
- "com.sun.star.accessibility.XAccessibleContext" ;
-
public XAccessibleContext oObj = null;
private int childCount = 0;
diff --git a/toolkit/qa/complex/toolkit/accessibility/_XAccessibleText.java b/toolkit/qa/complex/toolkit/accessibility/_XAccessibleText.java
index 665d186..96c53c0 100644
--- a/toolkit/qa/complex/toolkit/accessibility/_XAccessibleText.java
+++ b/toolkit/qa/complex/toolkit/accessibility/_XAccessibleText.java
@@ -69,9 +69,6 @@ public class _XAccessibleText {
// private LogWriter log;
- private static final String className =
- "com.sun.star.accessibility.XAccessibleText" ;
-
public XAccessibleText oObj = null;
private XMultiServiceFactory xMSF;
commit 08181e1c3e0df6556f4ec8732180630a780738f0
Author: Noel Grandin <noel at peralex.com>
Date: Tue Jul 3 09:16:02 2012 +0200
Remove dead java code, fields and local variables
Change-Id: Iac80b047d990fddd3b78366843afdff77620cd7f
diff --git a/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentDeserializerImpl.java b/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentDeserializerImpl.java
index 959a092..11e62eb 100644
--- a/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentDeserializerImpl.java
+++ b/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentDeserializerImpl.java
@@ -83,10 +83,7 @@ public final class DocumentDeserializerImpl
*/
public Document deserialize() throws IOException, ConvertException {
- int numberOfPDBs = cd.getNumDocuments();
Document doc = null;
- int i=0;
- ConvertData cdOut;
Iterator<Object> e = cd.getDocumentEnumeration();
while (e.hasNext()) {
PalmDocument palmDoc = (PalmDocument) e.next();
diff --git a/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentMergerImpl.java b/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentMergerImpl.java
index 8ab3ddf..f3e9f04 100644
--- a/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentMergerImpl.java
+++ b/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentMergerImpl.java
@@ -79,8 +79,6 @@ public class DocumentMergerImpl implements DocumentMerger {
NodeMergeAlgorithm charMerge = new CharacterBaseParagraphMerge();
DocumentMerge docMerge = new DocumentMerge(cc_, charMerge);
- Iterator result = null;
-
docMerge.applyDifference(i1, i2, diffTable);
}
}
diff --git a/xmerge/source/bridge/java/XMergeBridge.java b/xmerge/source/bridge/java/XMergeBridge.java
index 494396c..a2c3445 100644
--- a/xmerge/source/bridge/java/XMergeBridge.java
+++ b/xmerge/source/bridge/java/XMergeBridge.java
@@ -71,12 +71,10 @@ public class XMergeBridge {
private static XMultiServiceFactory xMSF;
- private static XDocumentHandler exportDocHandler=null;
private static XInputStream xInStream =null;
private static XOutputStream xOutStream=null;
private static String udJarPath=null;
private static XOutputStream xos = null;
- private static XOutputStreamToOutputStreamAdapter adaptedStream=null;
private static String offMime=null;
private static String sdMime=null;
private static String sFileName=null;
@@ -150,11 +148,7 @@ public class XMergeBridge {
sFileName="";
sURL="";
- String sDirectory = null;
- String udConvertClass=msUserData[0];
udJarPath=msUserData[1];
- String udImport =msUserData[2];
- String udExport =msUserData[3];
offMime =msUserData[4];
sdMime = msUserData[5];
com.sun.star.io.XInputStream xis=null;
@@ -231,12 +225,7 @@ public class XMergeBridge {
sFileName=null;
sURL=null;
- String sDirectory = null;
- String title=null;
- String udConvertClass=msUserData[0];
udJarPath=msUserData[1];
- String udImport =msUserData[2];
- String udExport =msUserData[3];
offMime =msUserData[4];
sdMime = msUserData[5];
@@ -257,10 +246,6 @@ public class XMergeBridge {
if (pValue[i].Name.compareTo("URL")==0){
sURL=(String)AnyConverter.toObject(new Type(java.lang.String.class), pValue[i].Value);
}
-
- if (pValue[i].Name.compareTo("Title")==0){
- title=(String)AnyConverter.toObject(new Type(java.lang.String.class), pValue[i].Value);
- }
}
catch(com.sun.star.lang.IllegalArgumentException AnyExec){
System.out.println("\nIllegalArgumentException "+AnyExec);
@@ -434,7 +419,6 @@ public class XMergeBridge {
String jarName = pluginUrl;
String name= getFileName(FileName);
- ConverterInfo converterInfo = null;
Iterator<ConverterInfo> ciEnum= null;
XInputStreamToInputStreamAdapter xis =new XInputStreamToInputStreamAdapter(xml);
@@ -479,7 +463,6 @@ public class XMergeBridge {
if (docEnum.hasNext()){
Document docOut = (Document)docEnum.next();
- String fileName = docOut.getFileName();
docOut.write(newxos);
newxos.flush();
@@ -502,7 +485,6 @@ public class XMergeBridge {
FileOutputStream fos = new FileOutputStream(newFile);
docOut = (Document)docEnum.next();
- fileName = docOut.getFileName();
docOut.write(fos);
fos.flush();
fos.close();
diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PocketExcelEncoder.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PocketExcelEncoder.java
index ce5779c..a0942a5 100644
--- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PocketExcelEncoder.java
+++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PocketExcelEncoder.java
@@ -218,19 +218,6 @@ final class PocketExcelEncoder extends SpreadsheetEncoder {
wb.addSettings(s);
}
- /**
- * This method sets the format of a cell to <i>string</i>.
- *
- * @param format The cell format-may already contain display info,
- * such as alignment or font type.
- *
- * @return The updated format of the cell.
- */
- private long setFormatString(long format) {
-
- return 0;
- }
-
/**
* Set a cell's formatting options via a separately create
diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Worksheet.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Worksheet.java
index 23650d1..f9d2399 100644
--- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Worksheet.java
+++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Worksheet.java
@@ -38,7 +38,6 @@ import org.openoffice.xmerge.util.Debug;
*/
public class Worksheet {
- private String name;
private Workbook wb;
private ArrayList<Row> rows = new ArrayList<Row>();
private ArrayList<ColInfo> colInfo = new ArrayList<ColInfo>();
@@ -133,7 +132,7 @@ public class Worksheet {
case PocketExcelConstants.BOOLERR_CELL:
Debug.log(Debug.TRACE,"BOOLERR: Cell Value, Boolean or Error (05h)");
- BoolErrCell bec = new BoolErrCell(is);
+ new BoolErrCell(is);
break;
case PocketExcelConstants.FORMULA_CELL:
@@ -144,7 +143,7 @@ public class Worksheet {
case PocketExcelConstants.FORMULA_STRING:
Debug.log(Debug.TRACE,"String Value of a Formula (07h)");
- StringValue sv = new StringValue(is);
+ new StringValue(is);
break;
case PocketExcelConstants.ROW_DESCRIPTION:
@@ -170,7 +169,7 @@ public class Worksheet {
case PocketExcelConstants.NUMBER_FORMAT:
Debug.log(Debug.TRACE,"FORMAT: Number Format (1Eh)");
- NumberFormat nf = new NumberFormat(is);
+ new NumberFormat(is);
break;
case PocketExcelConstants.DEFAULT_ROW_HEIGHT:
diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaCompiler.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaCompiler.java
index cc9f580..506fd27 100644
--- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaCompiler.java
+++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaCompiler.java
@@ -82,10 +82,6 @@ public class FormulaCompiler {
return pt.getTokenID() == TokenConstants.TARGSEP;
}
- private boolean isBinaryOperator(Token pt) {
- return false;
- }
-
/**
* Re-order into Infix format
* @param tokens The tokens in RPN form
diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaHelper.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaHelper.java
index fa3a183..b852ce1 100644
--- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaHelper.java
+++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaHelper.java
@@ -51,17 +51,15 @@ public class FormulaHelper {
* Sets the workbook cache so that global data such as
* <code>DefinedNames</code>, <code>Boundsheets</code> can be read
*
- * @param wb Wrokbook object containing all the global data
+ * @param wb Workbook object containing all the global data
*/
public void setWorkbook(Workbook wb) {
-
encoder.setWorkbook(wb);
decoder.setWorkbook(wb);
- parser.setWorkbook(wb);
}
/**
- * Convertes a string representation of a calc formula into an array of PocketXL bytes
+ * Converts a string representation of a calc formula into an array of PocketXL bytes
* @param formula The Formula String (e.g. 1+SUM(A1,B1))
*
* @throws UnsupportedFunctionException Thrown if a function in the formula is nto supported by Pocket Excel
diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaParser.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaParser.java
index db7c8e5..813cf0a 100644
--- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaParser.java
+++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaParser.java
@@ -42,7 +42,6 @@ public class FormulaParser {
private int index = 1;
private TokenFactory tokenFactory;
private ArrayList<Token> tokenVector;
- private Workbook wb;
/**
* Default constructor
@@ -55,14 +54,6 @@ public class FormulaParser {
}
/**
- *
- */
- public void setWorkbook(Workbook wb) {
-
- this.wb = wb;
- }
-
- /**
* Parse method for parsing from a String to a byte[]
*
* @param formula A <code>String</code> representation of a formula
@@ -126,22 +117,6 @@ public class FormulaParser {
}
/**
- * Identify <, >, <=, >=, =, <>
- *
- * @param op The <code>String</code> which is to be identified
- * @return A boolean returning the result of the comparison
- */
- private boolean isLogicalOp(String op) {
- return ((op.compareTo(">") == 0) ||
- (op.compareTo("<") == 0) ||
- (op.compareTo(">=") == 0) ||
- (op.compareTo("<=") == 0) ||
- (op.compareTo("=") == 0) ||
- (op.compareTo("<>") == 0));
- }
-
-
- /**
* Identify characters that MAY be logical operator characters
*
* @param c The character which is to be identified
@@ -191,16 +166,6 @@ public class FormulaParser {
return (c == '%');
}
- /**
- * Identify letters or numbers
- *
- * @param c The character which is to be identified
- * @return A boolean returning the result of the comparison
- */
- private boolean isAlphaNum(char c) {
- return(isAlpha(c) || isDigit(c));
- }
-
/**
* Identify valid Characters for cell references
*
diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenDecoder.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenDecoder.java
index 171abb0..36a1cdd 100644
--- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenDecoder.java
+++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenDecoder.java
@@ -47,7 +47,6 @@ public class TokenDecoder {
private TokenFactory tf;
private FunctionLookup fl;
private OperatorLookup operatorLookup;
- private OperandLookup operandLookup;
private Workbook wb;
/**
@@ -59,7 +58,6 @@ public class TokenDecoder {
tf = new TokenFactory();
fl = new FunctionLookup();
operatorLookup = new OperatorLookup();
- operandLookup = new OperandLookup();
}
/**
@@ -86,7 +84,6 @@ public class TokenDecoder {
ByteArrayInputStream bis = new ByteArrayInputStream(formula);
int b = 0 ;
- Token t;
while ((b = bis.read())!=-1)
{
diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenEncoder.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenEncoder.java
index 2d26654..7c25d6f 100644
--- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenEncoder.java
+++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenEncoder.java
@@ -40,7 +40,6 @@ import org.openoffice.xmerge.util.EndianConverter;
*/
public class TokenEncoder {
- private FunctionLookup fl;
private String parseString;
private int index;
private Workbook wb;
@@ -49,9 +48,7 @@ public class TokenEncoder {
* Default Constructor
*/
public TokenEncoder() {
-
parseString = new String();
- fl = new FunctionLookup();
}
/**
@@ -212,16 +209,6 @@ public class TokenEncoder {
return(Character.isDigit(c));
}
- /**
- * Identify letters or numbers
- *
- * @param c The character which is to be identified
- * @return A boolean returning the result of the comparison
- */
- private boolean isAlphaNum(char c) {
- return(isAlpha(c) || isDigit(c));
- }
-
/**
* Parses a column reference and returns it's integer equivalent. (eg.
* A=0, D=3, BA=27)
@@ -261,7 +248,6 @@ public class TokenEncoder {
private int row() {
char ch = parseString.charAt(index);
String rowStr = new String();
- int row = 0;
boolean status = true;
do {
diff --git a/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentMergerImpl.java b/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentMergerImpl.java
index ba849a7..b268836 100644
--- a/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentMergerImpl.java
+++ b/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentMergerImpl.java
@@ -79,8 +79,6 @@ public class DocumentMergerImpl implements DocumentMerger {
NodeMergeAlgorithm charMerge = new CharacterBaseParagraphMerge();
DocumentMerge docMerge = new DocumentMerge(cc_, charMerge);
- Iterator result = null;
-
docMerge.applyDifference(i1, i2, diffTable);
}
}
diff --git a/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/Paragraph.java b/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/Paragraph.java
index feb991a..da58d60 100644
--- a/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/Paragraph.java
+++ b/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/Paragraph.java
@@ -184,8 +184,6 @@ class Paragraph implements PocketWordConstants {
boolean inSequence = false;
boolean sawText = false;
- String s = new String(); // For debugging
-
// Start from the very beginning
for (int i = 0; i < totalLength; i++) {
// Will encounter at least two codes first
@@ -399,7 +397,6 @@ class Paragraph implements PocketWordConstants {
sb.append((char)data[i]);
sawText = true;
- s = sb.toString();
}
}
diff --git a/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PocketWordDocument.java b/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PocketWordDocument.java
index 909dc25..3b267f6 100644
--- a/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PocketWordDocument.java
+++ b/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PocketWordDocument.java
@@ -49,7 +49,6 @@ public class PocketWordDocument implements Document, PocketWordConstants {
private DocumentDescriptor descriptor;
private ArrayList<Paragraph> paragraphs;
- private ParaStyle pStyle;
private Paragraph currentPara;
/*
@@ -114,7 +113,6 @@ public class PocketWordDocument implements Document, PocketWordConstants {
}
byte[] font = new byte[80];
- int numfonts = 0;
do {
docData.read(font);
@@ -308,7 +306,6 @@ public class PocketWordDocument implements Document, PocketWordConstants {
paragraphs.add(para);
- pStyle = style;
currentPara = para;
if (listElement) {
diff --git a/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/DocumentDeserializerImpl.java b/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/DocumentDeserializerImpl.java
index 9ab7406..96a5e25 100644
--- a/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/DocumentDeserializerImpl.java
+++ b/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/DocumentDeserializerImpl.java
@@ -126,7 +126,6 @@ implements DOCConstants, OfficeConstants, DocumentDeserializer {
* @param parentDoc The parent <code>Document</code>.
*/
private void readStyleCatalog(Document parentDoc) {
- Element rootNode = null;
try {
java.io.ByteArrayOutputStream bos = new java.io.ByteArrayOutputStream();
parentDoc.write(bos);
diff --git a/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/DocumentMergerImpl.java b/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/DocumentMergerImpl.java
index b67b5c6..b663ce3 100644
--- a/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/DocumentMergerImpl.java
+++ b/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/DocumentMergerImpl.java
@@ -81,8 +81,6 @@ public class DocumentMergerImpl implements DocumentMerger {
NodeMergeAlgorithm charMerge = new CharacterBaseParagraphMerge();
DocumentMerge docMerge = new DocumentMerge(cc_, charMerge);
- Iterator result = null;
-
docMerge.applyDifference(i1, i2, diffTable);
}
}
diff --git a/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WSDecoder.java b/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WSDecoder.java
index bcd363e..632ef3e 100644
--- a/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WSDecoder.java
+++ b/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WSDecoder.java
@@ -290,7 +290,7 @@ final class WSDecoder implements DOCConstants {
}
// read the number of records - unsigned 2 bytes
- header.textRecordCount = dis.readShort() & 0x0000ffff;
+ dis.readShort();
// read the record size - unsigned 2 bytes
header.textRecordSize = dis.readShort() & 0x0000ffff;
@@ -327,9 +327,6 @@ final class WSDecoder implements DOCConstants {
/** length of text section */
int textLen = 0;
- /** number of text records */
- int textRecordCount = 0;
-
/**
* size of a text record. This is normally the same as
* TEXT_RECORD_SIZE, but some applications may modify this.
diff --git a/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/textRecord.java b/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/textRecord.java
index 7632320..fa2729e 100644
--- a/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/textRecord.java
+++ b/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/textRecord.java
@@ -81,8 +81,6 @@ class textRecord {
byte[] getBytes() {
DataOutputStream os = null; // Used for storing the data
ByteArrayOutputStream bs = null; // Used for storing the data
- byte ftBytes[] = null;
- byte ctBytes[] = null;
try {
bs = new ByteArrayOutputStream();
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java
index 86024f1..d00b1e6 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java
@@ -60,10 +60,6 @@ public class DOMDocument
private String fileName = null;
private String fileExt = null;
- /** Resources object. */
- private Resources res = null;
-
-
/**
* Default constructor.
*
@@ -98,7 +94,6 @@ public class DOMDocument
*/
public DOMDocument(String name, String ext,boolean namespaceAware, boolean validating) {
- res = Resources.getInstance();
factory.setValidating(validating);
factory.setNamespaceAware(namespaceAware);
this.fileExt = ext;
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java
index baca3de..1514e65 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java
@@ -83,9 +83,6 @@ public abstract class OfficeDocument
private String documentName = null;
private String fileName = null;
- /** Resources object. */
- private Resources res = null;
-
/**
* <code>OfficeZip</code> object to store zip contents from
* read <code>InputStream</code>. Note that this member
@@ -119,8 +116,6 @@ public abstract class OfficeDocument
* @param validating Value for <code>validating</code> flag.
*/
public OfficeDocument(String name, boolean namespaceAware, boolean validating) {
-
- res = Resources.getInstance();
factory.setValidating(validating);
factory.setNamespaceAware(namespaceAware);
this.documentName = trimDocumentName(name);
@@ -747,7 +742,7 @@ public abstract class OfficeDocument
DocumentBuilderFactory builderFactory = DocumentBuilderFactory.newInstance();
DocumentBuilder builder= builderFactory.newDocumentBuilder();
DOMImplementation domImpl = builder.getDOMImplementation();
- DocumentType docType =domImpl.createDocumentType("office:document","-//OpenOffice.org//DTD OfficeDocument 1.0//EN",null);
+ domImpl.createDocumentType("office:document","-//OpenOffice.org//DTD OfficeDocument 1.0//EN",null);
org.w3c.dom.Document newDoc = domImpl.createDocument("http://openoffice.org/2000/office","office:document",null);
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/StyleCatalog.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/StyleCatalog.java
index 818a4f2..bc7696e 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/StyleCatalog.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/StyleCatalog.java
@@ -117,7 +117,6 @@ public class StyleCatalog {
for (int j = 0; j < families.length; j++) {
if (families[j].equals(familyName)) {
- Class<?> styleClass = classes[j];
callConstructor(classes[j], child);
found = true;
}
@@ -322,41 +321,6 @@ public class StyleCatalog {
/**
- * Check whether a given node represents a <code>Style</code>
- * that should be added to the catalog, and if so, return the
- * class type for it. If <code>Style</code> should not be added,
- * or if node is not a <code>Style</code>, return null.
- *
- * @param node The <code>Node</code> to be checked.
- * @param families An array of <code>Style</code> families.
- * @param classes An array of class types corresponding to the
- * families array.
- * @param defaultClass The default class.
- *
- * @return The class that is appropriate for this node.
- */
- private Class<?> getClass(Node node, String[] families, Class<?>[] classes,
- Class<?> defaultClass) {
- NamedNodeMap attributes = node.getAttributes();
- if (attributes != null) {
- int len = attributes.getLength();
- for (int i = 0; i < len; i++) {
- Node attr = attributes.item(i);
- if (attr.getNodeName().equals("style:family")) {
- String familyName = attr.getNodeValue();
- for (int j = 0; j < families.length; j++) {
- if (families[j].equals(familyName))
- return classes[j];
- }
- return defaultClass;
- }
- }
- }
- return null;
- }
-
-
- /**
* Find the family attribute of a <code>Style</code> <code>Node</code>.
*
* @param node The <code>Node</code> to check.
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnStyle.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnStyle.java
index 5e3e84a..4dec10b 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnStyle.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnStyle.java
@@ -259,24 +259,4 @@ public class ColumnStyle extends Style implements Cloneable {
}
}
- private static String[] ignored = {
- "fo:break-before", "fo:keep-with-next"
- };
-
- /*
- * This code checks whether an attribute is one that we
- * intentionally ignore.
- *
- * @param attribute The attribute to check.
- *
- * @return true if <code>attribute</code> can be ignored,
- * otherwise false.
- */
- private boolean isIgnored(String attribute) {
- for (int i = 0; i < ignored.length; i++) {
- if (ignored[i].equals(attribute))
- return true;
- }
- return false;
- }
}
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/DocumentMergerImpl.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/DocumentMergerImpl.java
index a743dc6..fcdaba4 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/DocumentMergerImpl.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/DocumentMergerImpl.java
@@ -113,8 +113,6 @@ public class DocumentMergerImpl implements DocumentMerger {
NodeMergeAlgorithm rowMerger = new PositionBaseRowMerge(cc_);
MergeAlgorithm merger = new SheetMerge(cc_, rowMerger);
- Iterator result = null;
-
merger.applyDifference(i1, i2, diffResult);
}
}
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/RowStyle.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/RowStyle.java
index 55b064f..db3674b 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/RowStyle.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/RowStyle.java
@@ -259,24 +259,4 @@ public class RowStyle extends Style implements Cloneable {
}
}
- private static String[] ignored = {
- "fo:break-before", "fo:keep-with-next"
- };
-
- /*
- * This code checks whether an attribute is one that we
- * intentionally ignore.
- *
- * @param attribute The attribute to check.
- *
- * @return true if <code>attribute</code> can be ignored,
- * otherwise false.
- */
- private boolean isIgnored(String attribute) {
- for (int i = 0; i < ignored.length; i++) {
- if (ignored[i].equals(attribute))
- return true;
- }
- return false;
- }
}
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SheetSettings.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SheetSettings.java
index 73a5740..b4f5b60 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SheetSettings.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SheetSettings.java
@@ -45,8 +45,6 @@ public class SheetSettings implements OfficeConstants {
private int splitPointX = 0;
private int splitPointY = 0;
private int posLeft = 0;
- private int posRight = 0;
- private int posBottom = 0;
private int posTop = 0;
private int paneNumber = 2;
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 82ab17f..a8c9716 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
@@ -53,15 +53,6 @@ import org.w3c.dom.NodeList;
public abstract class SxcDocumentSerializer implements OfficeConstants,
DocumentSerializer {
- /** The cell foreground <code>Color</code>. */
- private Color foreground = Color.black;
-
- /** The cell background <code>Color</code>. */
- private Color background = Color.white;
-
- /** The cell format. */
- private long format = 0;
-
/** <code>Format</code> object describing the cell. */
private Format fmt = null;
@@ -85,9 +76,6 @@ public abstract class SxcDocumentSerializer implements OfficeConstants,
*/
private ArrayList<ColumnRowInfo> ColumnRowList;
- /** Width, in characters, of the current cell display data. */
- private int displayWidth = 0;
-
/**
* A <code>SpreadsheetEncoder</code> object for encoding to
* appropriate format.
@@ -270,8 +258,6 @@ public abstract class SxcDocumentSerializer implements OfficeConstants,
Debug.log(Debug.TRACE, "<NAMED:EXPRESSIONS>");
- NamedNodeMap att = node.getAttributes();
-
if (node.hasChildNodes()) {
NodeList nodeList = node.getChildNodes();
@@ -638,9 +624,6 @@ public abstract class SxcDocumentSerializer implements OfficeConstants,
if (tableValueTypeNode != null) {
- // Make sure we initialize to 0 the width of the current cell
- displayWidth = 0;
-
String cellType =
tableValueTypeNode.getNodeValue();
@@ -759,9 +742,6 @@ public abstract class SxcDocumentSerializer implements OfficeConstants,
}
}
- // Clear out format for current cell after it is written
- format = 0;
-
// Increase the column counter by the number of times the
// last cell was repeated.
colID += colsRepeated;
@@ -952,20 +932,5 @@ public abstract class SxcDocumentSerializer implements OfficeConstants,
return decimals;
}
- /*
- * Utility method to retrieve a Node attribute.
- */
- private String getAttribute (Node node, String attribute) {
- NamedNodeMap attrNodes = node.getAttributes();
-
- if (attrNodes != null) {
- Node attr = attrNodes.getNamedItem(attribute);
- if (attr != null) {
- return attr.getNodeValue();
- }
- }
- return null;
- }
-
}
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java
index caf1353..b162827 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java
@@ -63,7 +63,6 @@ public final class DocumentDeserializerImpl
implements DocumentDeserializer,URIResolver {
/** A <code>ConvertData</code> object assigned to this object. */
- private InputStream is = null;
private ConvertData cd = null;
private PluginFactoryImpl pluginFactory = null;
@@ -101,7 +100,6 @@ public final class DocumentDeserializerImpl
Iterator<Object> enumerate = cd.getDocumentEnumeration();
org.w3c.dom.Document domDoc=null;
DOMDocument docOut=null;
- GenericOfficeDocument doc = null;
ByteArrayOutputStream baos =null;
GenericOfficeDocument sxwDoc = new GenericOfficeDocument("output");
while (enumerate.hasNext()) {
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentMergerImpl.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentMergerImpl.java
index d26c0fa..26a763e 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentMergerImpl.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentMergerImpl.java
@@ -79,8 +79,6 @@ public class DocumentMergerImpl implements DocumentMerger {
NodeMergeAlgorithm charMerge = new CharacterBaseParagraphMerge();
DocumentMerge docMerge = new DocumentMerge(cc_, charMerge);
- Iterator result = null;
-
docMerge.applyDifference(i1, i2, diffTable);
}
}
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java
index 8de9340..911e6a6 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java
@@ -180,7 +180,6 @@ public final class DocumentSerializerImpl
System.out.println("\n Error with Xslt\n");
}
- String ext = pluginFactory.getDeviceFileExtension();
DOMDocument resultDomDoc=(DOMDocument)pluginFactory.createDeviceDocument(docName,new ByteArrayInputStream(baos.toByteArray()));
cd.addDocument (resultDomDoc);
return cd;
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CellNodeIterator.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CellNodeIterator.java
index d152b52..b92b25e 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CellNodeIterator.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CellNodeIterator.java
@@ -42,8 +42,6 @@ import org.openoffice.xmerge.util.Resources;
*/
public final class CellNodeIterator extends NodeIterator {
- private Resources res = Resources.getInstance();
-
// can be expanded to an array in the future, not necessary right now
private static final String SUPPORTED_TAG1 = OfficeConstants.TAG_TABLE_CELL;
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CharArrayLCSAlgorithm.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CharArrayLCSAlgorithm.java
index 0d2a3aa..77bc473 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CharArrayLCSAlgorithm.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CharArrayLCSAlgorithm.java
@@ -73,24 +73,6 @@ public class CharArrayLCSAlgorithm {
return diffArray;
}
-
- /**
- * Debug function Used to print out the nicely formatted
- * difference table.
- *
- * @param diffTable The difference table to display.
- */
- private void printDiffTable(int[][] diffTable) {
-
- for (int i = 0; i < diffTable.length; i++) {
- for (int j = 0; j < diffTable[i].length; j++) {
- System.out.print(" " + diffTable[i][j] + " ");
- }
- System.out.println();
- }
- }
-
-
/**
* Create the difference table.
* The difference table is used internal to keep track what
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/IteratorRowCompare.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/IteratorRowCompare.java
index ec93778..7a0cdf2 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/IteratorRowCompare.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/IteratorRowCompare.java
@@ -73,9 +73,6 @@ public class IteratorRowCompare implements DiffAlgorithm {
*/
public Difference[] computeDiffs(Iterator orgSeq, Iterator modSeq) {
- int orgSeqlen = orgSeq.elementCount();
- int modSeqlen = modSeq.elementCount();
-
ArrayList<Difference> diffVector = new ArrayList<Difference>();
// i and j are counters to keep track the current position in the
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/ObjectArrayIterator.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/ObjectArrayIterator.java
index bb7b35a..1327e4b 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/ObjectArrayIterator.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/ObjectArrayIterator.java
@@ -39,14 +39,6 @@ public final class ObjectArrayIterator implements Iterator {
/**
- * Private default constructor.
- */
- private ObjectArrayIterator() {
- // do not allow user new a ObjectArrayIterator without argument
- }
-
-
- /**
* Standard constructor.
*
* @param objArray The <code>Object</code> array.
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/RowIterator.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/RowIterator.java
index ef816b6..7564f23 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/RowIterator.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/RowIterator.java
@@ -33,8 +33,6 @@ import org.openoffice.xmerge.util.Resources;
*/
public final class RowIterator extends NodeIterator {
- private Resources res = Resources.getInstance();
-
// TODO: should compare the ConverterCapabilities supported feature only!
// otherwise even though one with a chart, one without, will still be
// considered to be not equivalent.
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/CharacterBaseParagraphMerge.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/CharacterBaseParagraphMerge.java
index 37917a1..d9a691f 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/CharacterBaseParagraphMerge.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/CharacterBaseParagraphMerge.java
@@ -38,11 +38,6 @@ public final class CharacterBaseParagraphMerge
implements NodeMergeAlgorithm {
- private class cacheCharArray {
- public cacheCharArray(int cacheSize) {
- }
- }
-
/**
* Merge two paragraph <code>Node</code> by using Longest Common
@@ -79,9 +74,7 @@ public final class CharacterBaseParagraphMerge
Difference[] diffs) {
List<TextNodeEntry> orgNodeList = orgParser.getNodeList();
- List<TextNodeEntry> modNodeList = modParser.getNodeList();
int diffCount = 0;
- int modNodeListCnt = 0;
int numNode = orgNodeList.size();
for (int i = 0; i < numNode; i++) {
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/DocumentMerge.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/DocumentMerge.java
index b79a4e1..cb60e16 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/DocumentMerge.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/DocumentMerge.java
@@ -101,8 +101,6 @@ public class DocumentMerge implements MergeAlgorithm {
int operation = currentDiff.getOperation();
- Object currentElement;
-
switch (operation) {
case Difference.DELETE:
@@ -132,11 +130,9 @@ public class DocumentMerge implements MergeAlgorithm {
// empty
}
- currentElement = orgSeq.currentElement();
-
for (;
orgSeqCounter < currentDiff.getOrgPosition();
- orgSeqCounter++, currentElement = orgSeq.next()) {
+ orgSeqCounter++, orgSeq.next()) {
// empty
}
@@ -159,11 +155,9 @@ public class DocumentMerge implements MergeAlgorithm {
// empty
}
- currentElement = orgSeq.currentElement();
-
for (;
orgSeqCounter < currentDiff.getOrgPosition();
- orgSeqCounter++, currentElement = orgSeq.next()) {
+ orgSeqCounter++, orgSeq.next()) {
// empty
}
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfo.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfo.java
index 37b5041..20b5ce5 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfo.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfo.java
@@ -226,14 +226,6 @@ public class ConverterInfo {
/**
- * Create a default constructor so we can use isValidOfficeType
- * without having to actually have a valid ConverterInfo.
- */
- private ConverterInfo() {
- }
-
-
- /**
* Returns an instance of the DocumentDeserializerFactory interface.
*
* @return instance of the DocumentDeserializer for this ConverterInfo.
commit 43c1aefd2dd5b25e1ff2cf4bf689427693a0bda1
Author: Noel Grandin <noel at peralex.com>
Date: Tue Jul 3 09:03:19 2012 +0200
fix dead assignment in setRowStyle
Change-Id: I2efa34e6374bb77f1277cbea6a2293698dbbe338
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/RowStyle.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/RowStyle.java
index cd0fa45..55b064f 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/RowStyle.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/RowStyle.java
@@ -115,9 +115,9 @@ public class RowStyle extends Style implements Cloneable {
* @param RowHeight The height of this row.
*/
public void setRowHeight(int RowHeight) {
-
- this.rowHeight = rowHeight;
+ this.rowHeight = RowHeight;
}
+
/**
* Parse a rowheight in the form "1.234cm" to twips
*
commit 92090e32dc09a9ceab75e5e78ac8c6b45ac61d0a
Author: Noel Grandin <noel at peralex.com>
Date: Mon Jul 2 16:07:33 2012 +0200
Java update - remove dead code
Change-Id: Ieafe29dd9e23bb40a2a80bd231c21e30faa9a40e
diff --git a/qadevOOo/runner/complexlib/ShowTargets.java b/qadevOOo/runner/complexlib/ShowTargets.java
index 478d565..bd37d92 100644
--- a/qadevOOo/runner/complexlib/ShowTargets.java
+++ b/qadevOOo/runner/complexlib/ShowTargets.java
@@ -92,26 +92,6 @@ public class ShowTargets
}
}
- /** determines if the test denoted by a given Class is an interactive test
- */
- static private boolean isInteractiveTest( Class<?> testClass )
- {
- java.lang.reflect.Method interactiveTestMethod = null;
- try { interactiveTestMethod = testClass.getMethod( "isInteractiveTest", new Class[]{} ); }
- catch( Exception e ) { }
-
- if ( interactiveTestMethod != null )
- {
- try
- {
- Boolean result = (Boolean)interactiveTestMethod.invoke( null, new Object[]{} );
- return result.booleanValue();
- }
- catch( Exception e ) { }
- }
- return false;
- }
-
static private String getShortTestDescription( Class<?> _testClass )
{
java.lang.reflect.Method getShortDescriptionMethod = null;
diff --git a/qadevOOo/runner/convwatch/GraphicalTestArguments.java b/qadevOOo/runner/convwatch/GraphicalTestArguments.java
index be1ce94..c0d12f3 100644
--- a/qadevOOo/runner/convwatch/GraphicalTestArguments.java
+++ b/qadevOOo/runner/convwatch/GraphicalTestArguments.java
@@ -99,9 +99,6 @@ public class GraphicalTestArguments
boolean m_bCreateDefaultReference = false;
- // CONSTRUCTOR
- private GraphicalTestArguments(){}
-
public GraphicalTestArguments(TestParameters param)
{
m_aCurrentParams = param;
diff --git a/qadevOOo/runner/graphical/ParameterHelper.java b/qadevOOo/runner/graphical/ParameterHelper.java
index cc733c3..8d2c440 100644
--- a/qadevOOo/runner/graphical/ParameterHelper.java
+++ b/qadevOOo/runner/graphical/ParameterHelper.java
@@ -81,9 +81,6 @@ public class ParameterHelper
// private GlobalLogWriter m_aLog;
- // CONSTRUCTOR
- private ParameterHelper(){}
-
public ParameterHelper(TestParameters param)
{
m_aCurrentParams = param;
diff --git a/qadevOOo/runner/helper/APIDescGetter.java b/qadevOOo/runner/helper/APIDescGetter.java
index 19f5b90..f8e124c 100644
--- a/qadevOOo/runner/helper/APIDescGetter.java
+++ b/qadevOOo/runner/helper/APIDescGetter.java
@@ -463,10 +463,6 @@ public class APIDescGetter extends DescGetter
return methDesc;
}
- private static void createIfcName(String ifc_name, ArrayList<String> meth_names, DescEntry ifcDesc)
- {
- }
-
/**
* This method ensures that XComponent will be the last in the list of interfaces
*/
diff --git a/qadevOOo/runner/util/DBTools.java b/qadevOOo/runner/util/DBTools.java
index 69bfb06..42a96c0 100644
--- a/qadevOOo/runner/util/DBTools.java
+++ b/qadevOOo/runner/util/DBTools.java
@@ -239,7 +239,7 @@ public class DBTools {
*/
public Object getDataSourceService() throws Exception
{
- Object src = src = xMSF.createInstance("com.sun.star.sdb.DataSource") ;
+ Object src = xMSF.createInstance("com.sun.star.sdb.DataSource") ;
XPropertySet props = UnoRuntime.queryInterface
(XPropertySet.class, src) ;
diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleEditableText.java b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleEditableText.java
index e942a46..654cb7a 100644
--- a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleEditableText.java
+++ b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleEditableText.java
@@ -258,7 +258,7 @@ public class _XAccessibleEditableText extends MultiMethodTest {
log.print("deleteText(" + (length-1) + "," + (length) + "): ");
locRes = oObj.deleteText(length - 1, length);
log.println(locRes);
- String expStr = expStr = text.substring(0, length - 1);
+ String expStr = text.substring(0, length - 1);
curText = oObj.getText();
log.println("Current text: '" + curText + "'");
res &= curText.equals(expStr);
diff --git a/qadevOOo/tests/java/ifc/util/_XFlushable.java b/qadevOOo/tests/java/ifc/util/_XFlushable.java
index 6f1607d..2c7b297 100644
--- a/qadevOOo/tests/java/ifc/util/_XFlushable.java
+++ b/qadevOOo/tests/java/ifc/util/_XFlushable.java
@@ -49,7 +49,6 @@ public class _XFlushable extends MultiMethodTest {
called = true ;
}
public void disposing(com.sun.star.lang.EventObject e) {}
- public void reset() { called = false; }
public boolean wasFlushed() { return called; }
}
More information about the Libreoffice-commits
mailing list