diff options
57 files changed, 28 insertions, 127 deletions
diff --git a/bean/com/sun/star/beans/LocalOfficeWindow.java b/bean/com/sun/star/beans/LocalOfficeWindow.java index bb58b656dcdd..22bb02f3d183 100644 --- a/bean/com/sun/star/beans/LocalOfficeWindow.java +++ b/bean/com/sun/star/beans/LocalOfficeWindow.java @@ -270,7 +270,6 @@ public class LocalOfficeWindow void cancel() throws java.lang.InterruptedException { - Thread aThread = aWatchedThread; aWatchedThread = null; stop(); diff --git a/bean/com/sun/star/comp/beans/OOoBean.java b/bean/com/sun/star/comp/beans/OOoBean.java index 1da6646d6daa..4f60fb8375af 100644 --- a/bean/com/sun/star/comp/beans/OOoBean.java +++ b/bean/com/sun/star/comp/beans/OOoBean.java @@ -1453,11 +1453,10 @@ xLayoutManager.showElement("private:resource/menubar/menubar"); dbgPrint( "EventListener(" + aTag + ").running() #" + ++n ); // still alive? - com.sun.star.lang.XMultiComponentFactory xServiceManager = null; try { // an arbitrary (but cheap) call into OOo - xServiceManager = iConnection.getComponentContext().getServiceManager(); + iConnection.getComponentContext().getServiceManager(); // call successfully performed, restart watch for next loop try diff --git a/bean/qa/complex/bean/OOoBeanTest.java b/bean/qa/complex/bean/OOoBeanTest.java index 734923cff76f..82a604bdfc1d 100644 --- a/bean/qa/complex/bean/OOoBeanTest.java +++ b/bean/qa/complex/bean/OOoBeanTest.java @@ -481,7 +481,6 @@ public class OOoBeanTest for (; i < 1; i++) { - EventQueue q = Toolkit.getDefaultToolkit().getSystemEventQueue(); EventQueue.invokeAndWait( new Runnable() { public void run() { try { diff --git a/bean/test/applet/oooapplet/OOoViewer.java b/bean/test/applet/oooapplet/OOoViewer.java index 6ea9270b199f..2a14c79afb06 100644 --- a/bean/test/applet/oooapplet/OOoViewer.java +++ b/bean/test/applet/oooapplet/OOoViewer.java @@ -73,7 +73,6 @@ public class OOoViewer extends Applet { // Class arPropValClass = m_loader.loadClass("[Lcom.sun.star.beans.PropertyValue;"); Object arProp = Array.newInstance( m_loader.loadClass("com.sun.star.beans.PropertyValue"), 1); - Class<? extends Object> clazz = arProp.getClass(); Method methLoad = beanClass.getMethod( "loadFromURL", new Class[] { @@ -175,7 +174,6 @@ final class CustomURLClassLoader extends URLClassLoader { return result; } - URI uri = null; for (URL u : resourcePaths) { if (u.getProtocol().startsWith("file")){ try { diff --git a/bridges/test/testclient.java b/bridges/test/testclient.java index 3aa562e744be..873e8de36e74 100644 --- a/bridges/test/testclient.java +++ b/bridges/test/testclient.java @@ -115,7 +115,6 @@ public class testclient if( null != xConnection ) { System.out.println( "after connect" ); - String rootOid = "OfficeDaemon.Factory"; com.sun.star.uno.IBridge bridge = UnoRuntime.getBridgeByName( "java", null, diff --git a/filter/qa/complex/filter/detection/typeDetection/TypeDetection.java b/filter/qa/complex/filter/detection/typeDetection/TypeDetection.java index 7b750b91c44a..02f50aedc300 100644 --- a/filter/qa/complex/filter/detection/typeDetection/TypeDetection.java +++ b/filter/qa/complex/filter/detection/typeDetection/TypeDetection.java @@ -523,7 +523,6 @@ public class TypeDetection extends ComplexTestCase { PropertyValue[] out = inOut[0]; - boolean bStream = false; log.println("out-Parameter"); boolean bReadOnly = false; for (int i=0; i < out.length; i++){ diff --git a/framework/qa/complex/imageManager/_XUIConfiguration.java b/framework/qa/complex/imageManager/_XUIConfiguration.java index 31fa934f4c06..bee3a42fffbf 100644 --- a/framework/qa/complex/imageManager/_XUIConfiguration.java +++ b/framework/qa/complex/imageManager/_XUIConfiguration.java @@ -48,7 +48,6 @@ public class _XUIConfiguration { public void before() { xListener = (XUIConfigurationListenerImpl)tEnv.get( "XUIConfiguration.XUIConfigurationListenerImpl"); - XUIConfigurationListener l; } public boolean _addConfigurationListener() { diff --git a/javaunohelper/com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter.java b/javaunohelper/com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter.java index f4cda932f3ef..318a716fc86f 100644 --- a/javaunohelper/com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter.java +++ b/javaunohelper/com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter.java @@ -73,7 +73,6 @@ public class InputStreamToXInputStreamAdapter implements XInputStream { public int readBytes(byte[][] b, int len) throws com.sun.star.io.IOException { - int count = 0; try { long bytesRead; if (len >iIn.available()) { @@ -100,7 +99,6 @@ public class InputStreamToXInputStreamAdapter implements XInputStream { public int readSomeBytes(byte[][] b, int len) throws com.sun.star.io.IOException { - int count = 0; try { long bytesRead; if (len >iIn.available()) { diff --git a/javaunohelper/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java b/javaunohelper/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java index 7f4a62387514..80af78871797 100644 --- a/javaunohelper/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java +++ b/javaunohelper/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java @@ -108,7 +108,6 @@ public class XInputStreamToInputStreamAdapter extends InputStream { } public int read(byte[] b, int off, int len) throws IOException { - int count = 0; byte [][] tmp = new byte [1][b.length]; try { long bytesRead; diff --git a/javaunohelper/test/com/sun/star/comp/helper/SharedLibraryLoader_Test.java b/javaunohelper/test/com/sun/star/comp/helper/SharedLibraryLoader_Test.java index 3fd5f8cfc0fd..4a50617dff88 100644 --- a/javaunohelper/test/com/sun/star/comp/helper/SharedLibraryLoader_Test.java +++ b/javaunohelper/test/com/sun/star/comp/helper/SharedLibraryLoader_Test.java @@ -106,7 +106,6 @@ public class SharedLibraryLoader_Test { static public boolean test_loadNativeSimpleRegistry() throws java.lang.Exception { - boolean result = false; System.out.println("*******************************************************************"); System.out.println("Test: <<< load native SimpleRegistry >>>"); if ( sharedLibraryLoader == null ) diff --git a/javaunohelper/test/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer_Test.java b/javaunohelper/test/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer_Test.java index 2d3e764aee72..3aaa764a037d 100644 --- a/javaunohelper/test/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer_Test.java +++ b/javaunohelper/test/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer_Test.java @@ -271,7 +271,6 @@ public class MultiTypeInterfaceContainer_Test boolean r[]= new boolean[50]; int i= 0; - int count= 0; cont.clear(); Type[] types= cont.getContainedTypes(); r[i++]= types.length == 0; diff --git a/javaunohelper/test/com/sun/star/lib/uno/helper/UnoUrlTest.java b/javaunohelper/test/com/sun/star/lib/uno/helper/UnoUrlTest.java index e71c6518b756..d12c5aee4e21 100644 --- a/javaunohelper/test/com/sun/star/lib/uno/helper/UnoUrlTest.java +++ b/javaunohelper/test/com/sun/star/lib/uno/helper/UnoUrlTest.java @@ -61,7 +61,7 @@ public class UnoUrlTest { public void testStart2() { try { - UnoUrl url = UnoUrl.parseUnoUrl("uno1:x;y;z"); + UnoUrl.parseUnoUrl("uno1:x;y;z"); fail("Should throw an exception"); } catch (com.sun.star.lang.IllegalArgumentException e) { } @@ -69,7 +69,7 @@ public class UnoUrlTest { public void testStart3() { try { - UnoUrl url = UnoUrl.parseUnoUrl("un:x;y;z"); + UnoUrl.parseUnoUrl("un:x;y;z"); fail("Should throw an exception"); } catch (com.sun.star.lang.IllegalArgumentException e) { } @@ -87,7 +87,7 @@ public class UnoUrlTest { public void testParam1() { try { - UnoUrl url = UnoUrl.parseUnoUrl("uno:"); + UnoUrl.parseUnoUrl("uno:"); fail("Should throw an exception"); } catch (com.sun.star.lang.IllegalArgumentException e) { } @@ -95,7 +95,7 @@ public class UnoUrlTest { public void testParam2() { try { - UnoUrl url = UnoUrl.parseUnoUrl("uno:a;"); + UnoUrl.parseUnoUrl("uno:a;"); fail("Should throw an exception"); } catch (com.sun.star.lang.IllegalArgumentException e) { } @@ -103,7 +103,7 @@ public class UnoUrlTest { public void testPartName1() { try { - UnoUrl url = UnoUrl.parseUnoUrl("uno:abc!abc;b;c"); + UnoUrl.parseUnoUrl("uno:abc!abc;b;c"); fail("Should throw an exception"); } catch (com.sun.star.lang.IllegalArgumentException e) { } @@ -111,7 +111,7 @@ public class UnoUrlTest { public void testOID1() { try { - UnoUrl url = UnoUrl.parseUnoUrl("uno:x;y;ABC<ABC"); + UnoUrl.parseUnoUrl("uno:x;y;ABC<ABC"); fail("Should throw an exception"); } catch (com.sun.star.lang.IllegalArgumentException e) { } @@ -143,7 +143,7 @@ public class UnoUrlTest { public void testParams1() { try { - UnoUrl url = UnoUrl.parseUnoUrl("uno:x,abc!abc=val;y;ABC"); + UnoUrl.parseUnoUrl("uno:x,abc!abc=val;y;ABC"); fail("Should throw an exception"); } catch (com.sun.star.lang.IllegalArgumentException e) { } @@ -151,7 +151,7 @@ public class UnoUrlTest { public void testParams2() { try { - UnoUrl url = UnoUrl.parseUnoUrl("uno:x,abc=val<val;y;ABC"); + UnoUrl.parseUnoUrl("uno:x,abc=val<val;y;ABC"); fail("Should throw an exception"); } catch (com.sun.star.lang.IllegalArgumentException e) { } @@ -199,7 +199,7 @@ public class UnoUrlTest { public void testUTF1() { try { - UnoUrl url = UnoUrl.parseUnoUrl("uno:x,abc=val%4t;y;ABC"); + UnoUrl.parseUnoUrl("uno:x,abc=val%4t;y;ABC"); fail("Should throw an exception"); } catch (com.sun.star.lang.IllegalArgumentException e) { } diff --git a/jurt/test/com/sun/star/lib/uno/protocols/urp/Marshaling_Test.java b/jurt/test/com/sun/star/lib/uno/protocols/urp/Marshaling_Test.java index 0c411ca36e6d..d9127e3804cc 100644 --- a/jurt/test/com/sun/star/lib/uno/protocols/urp/Marshaling_Test.java +++ b/jurt/test/com/sun/star/lib/uno/protocols/urp/Marshaling_Test.java @@ -231,8 +231,6 @@ public final class Marshaling_Test { if((op1.getClass().getComponentType() == op2.getClass().getComponentType()) && (Array.getLength(op1) == Array.getLength(op2))) { - Class zClass = op1.getClass().getComponentType(); - for(int i = 0; i < Array.getLength(op1); ++ i) result = result & compareObjects(Array.get(op1, i), Array.get(op2, i)); } diff --git a/odk/examples/DevelopersGuide/GUI/MessageBox.java b/odk/examples/DevelopersGuide/GUI/MessageBox.java index 63b2d03d7511..c43b4743b290 100644 --- a/odk/examples/DevelopersGuide/GUI/MessageBox.java +++ b/odk/examples/DevelopersGuide/GUI/MessageBox.java @@ -176,7 +176,7 @@ public class MessageBox { XMessageBox xMessageBox = xMessageBoxFactory.createMessageBox(_xParentWindowPeer, MessageBoxType.ERRORBOX, com.sun.star.awt.MessageBoxButtons.BUTTONS_OK, _sTitle, _sMessage); xComponent = UnoRuntime.queryInterface(XComponent.class, xMessageBox); if (xMessageBox != null){ - short nResult = xMessageBox.execute(); + xMessageBox.execute(); } } catch (com.sun.star.uno.Exception ex) { ex.printStackTrace(System.err); @@ -216,23 +216,17 @@ public class MessageBox { public static int getRedColorShare(int _nColor) { int nRed = _nColor/65536; int nRedModulo = _nColor % 65536; - int nGreen = nRedModulo / 256; - int nGreenModulo = (nRedModulo % 256); - int nBlue = nGreenModulo; return nRed; } public static int getGreenColorShare(int _nColor) { - int nRed = _nColor/65536; int nRedModulo = _nColor % 65536; int nGreen = nRedModulo / 256; return nGreen; } public static int getBlueColorShare(int _nColor) { - int nRed = _nColor/65536; int nRedModulo = _nColor % 65536; - int nGreen = nRedModulo / 256; int nGreenModulo = (nRedModulo % 256); int nBlue = nGreenModulo; return nBlue; diff --git a/odk/examples/DevelopersGuide/GUI/UnoDialogSample.java b/odk/examples/DevelopersGuide/GUI/UnoDialogSample.java index aef248ba5c89..a5097b1d0621 100644 --- a/odk/examples/DevelopersGuide/GUI/UnoDialogSample.java +++ b/odk/examples/DevelopersGuide/GUI/UnoDialogSample.java @@ -859,7 +859,6 @@ public class UnoDialogSample implements XTextListener, XSpinListener, XActionLis public static String createUniqueName(XNameAccess _xElementContainer, String _sElementName) { boolean bElementexists = true; int i = 1; - String sIncSuffix = ""; String BaseName = _sElementName; while (bElementexists) { bElementexists = _xElementContainer.hasByName(_sElementName); @@ -1473,9 +1472,6 @@ public class UnoDialogSample implements XTextListener, XSpinListener, XActionLis public void keyReleased(KeyEvent keyEvent) { - int i = keyEvent.KeyChar; - int n = keyEvent.KeyCode; - int m = keyEvent.KeyFunc; } public void keyPressed(KeyEvent keyEvent) { diff --git a/odk/examples/DevelopersGuide/GUI/UnoMenu.java b/odk/examples/DevelopersGuide/GUI/UnoMenu.java index 3c424d60eaed..8f915bdb2761 100644 --- a/odk/examples/DevelopersGuide/GUI/UnoMenu.java +++ b/odk/examples/DevelopersGuide/GUI/UnoMenu.java @@ -175,14 +175,12 @@ public UnoMenu(XComponentContext _xContext, XMultiComponentFactory _xMCF) { } public void itemHighlighted(MenuEvent menuEvent) { - int i = 0; } public void itemDeactivated(MenuEvent menuEvent) { - int i = 0; } + } public void itemActivated(MenuEvent menuEvent) { - int i = 0; } } diff --git a/odk/examples/java/Storage/TestHelper.java b/odk/examples/java/Storage/TestHelper.java index ac0c3b9c2d03..02a1bad0893a 100644 --- a/odk/examples/java/Storage/TestHelper.java +++ b/odk/examples/java/Storage/TestHelper.java @@ -516,7 +516,7 @@ public class TestHelper { pWrongPass[0] += pPass[0]; try { - Object oSubStream = xParentStorage.openEncryptedStreamElement( sName, ElementModes.READ, new String(pWrongPass) ); + xParentStorage.openEncryptedStreamElement( sName, ElementModes.READ, new String(pWrongPass) ); Error( "Encrypted stream '" + sName + "' was opened with wrong password!" ); return false; } diff --git a/sc/qa/complex/calcPreview/ViewForwarder.java b/sc/qa/complex/calcPreview/ViewForwarder.java index 3d2a1d268a80..8ea5a9899cd9 100644 --- a/sc/qa/complex/calcPreview/ViewForwarder.java +++ b/sc/qa/complex/calcPreview/ViewForwarder.java @@ -1055,7 +1055,6 @@ public class ViewForwarder { XWindow xWindow = AccessibilityTools.getCurrentWindow(mXMSF, aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - XAccessible parent = null; try { XAccessibleContext con = AccessibilityTools.getAccessibleObjectForRole diff --git a/sc/qa/complex/dataPilot/_XNamed.java b/sc/qa/complex/dataPilot/_XNamed.java index 11c1df4d5409..b7d9e8c3a33d 100644 --- a/sc/qa/complex/dataPilot/_XNamed.java +++ b/sc/qa/complex/dataPilot/_XNamed.java @@ -83,7 +83,6 @@ public class _XNamed { boolean result = true; boolean loc_result = true; String name = null; - String NewName = null; loc_result = ((name = oObj.getName()) != null); System.out.println("getting the name \"" + name + "\""); diff --git a/sc/qa/complex/sc/CalcRTL.java b/sc/qa/complex/sc/CalcRTL.java index 68d06de65ee1..ee5f3039b5cb 100644 --- a/sc/qa/complex/sc/CalcRTL.java +++ b/sc/qa/complex/sc/CalcRTL.java @@ -365,7 +365,6 @@ public class CalcRTL /* extends ComplexTestCase */ newValue = getRealValue(newValue); resValue = getRealValue(resValue); - short attr = prop.Attributes; boolean readOnly = (prop.Attributes & PropertyAttribute.READONLY) != 0; boolean maybeVoid = (prop.Attributes & PropertyAttribute.MAYBEVOID) != 0; diff --git a/scripting/java/com/sun/star/script/framework/container/DeployedUnoPackagesDB.java b/scripting/java/com/sun/star/script/framework/container/DeployedUnoPackagesDB.java index 9a9cb5eb4ef2..fa95d065d67a 100644 --- a/scripting/java/com/sun/star/script/framework/container/DeployedUnoPackagesDB.java +++ b/scripting/java/com/sun/star/script/framework/container/DeployedUnoPackagesDB.java @@ -73,7 +73,6 @@ public class DeployedUnoPackagesDB { ArrayList<String> packageUrls = new ArrayList<String>(4); Element main = document.getDocumentElement(); Element root = null; - Element item; int len = 0; NodeList langNodes = null; diff --git a/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java b/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java index 2270d544fc91..48a7289abdd3 100644 --- a/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java +++ b/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java @@ -341,10 +341,8 @@ public class ScriptMetaData extends ScriptEntry implements Cloneable { } protected boolean writeSourceFile() { - String parcelLocation = parent.getPathToParcel(); String sourceFilePath = parent.getPathToParcel() + "/" + getLanguageName(); boolean result = false; - OutputStream os = null; try { XSimpleFileAccess2 xSFA2 = UnoRuntime.queryInterface( XSimpleFileAccess2.class, diff --git a/scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java b/scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java index 027c3fa9af51..e592b028a921 100644 --- a/scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java +++ b/scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java @@ -183,7 +183,6 @@ public class UnoPkgContainer extends ParcelContainer { ScriptMetaData scriptData = null; - String language = psu.language; String functionName = psu.function; String parcelName = psu.parcel; String location = psu.location; diff --git a/scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java b/scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java index 27254a42d0b5..8b06fb84ed51 100644 --- a/scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java +++ b/scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java @@ -192,7 +192,6 @@ public class UCBStreamHandler extends URLStreamHandler { { ZipInputStream zis = null; ZipEntry entry = null; - boolean found = false; zis = new ZipInputStream(is); 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 ba507afc6a6a..c936aacfae07 100644 --- a/scripting/java/com/sun/star/script/framework/io/XStorageHelper.java +++ b/scripting/java/com/sun/star/script/framework/io/XStorageHelper.java @@ -184,8 +184,7 @@ public class XStorageHelper implements XEventListener if ( model != null ) { LogUtils.DEBUG(" Disposing doc " + model.getURL() ); - Object result = modelMap.remove( model ); - result = null; + modelMap.remove( model ); } } public XStorage getStorage() diff --git a/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java b/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java index a348dffd85d8..3d886215d807 100644 --- a/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java +++ b/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java @@ -549,7 +549,6 @@ public abstract class ScriptProvider public String[] getElementNames() { // TODO needs implementing? - String[] result = new String[0]; throw new com.sun.star.uno.RuntimeException( "getElementNames not implemented" ); diff --git a/scripting/workben/installer/FileUpdater.java b/scripting/workben/installer/FileUpdater.java index 21c3d34dd367..17d1ad9ba88d 100644 --- a/scripting/workben/installer/FileUpdater.java +++ b/scripting/workben/installer/FileUpdater.java @@ -25,7 +25,6 @@ public class FileUpdater { public static boolean updateProtocolHandler( String installPath, JLabel statusLabel ) { File in_file = null; - FileInputStream in = null; File out_file = null; FileWriter out = null; int count = 0; @@ -95,7 +94,6 @@ public class FileUpdater { public static boolean updateScriptXLC( String installPath, JLabel statusLabel ) { File in_file = null; - FileInputStream in = null; File out_file = null; FileWriter out = null; int count = 0; @@ -167,7 +165,6 @@ public class FileUpdater { public static boolean updateDialogXLC( String installPath, JLabel statusLabel ) { File in_file = null; - FileInputStream in = null; File out_file = null; FileWriter out = null; int count = 0; @@ -175,7 +172,6 @@ public class FileUpdater { //System.out.println( "updateDialogXLC" ); try { in_file = new File( installPath+File.separator+"user"+File.separator+"basic"+File.separator+"dialog.xlc" ); - String xmlLine = ""; String[] xmlArray = new String[50]; try { diff --git a/scripting/workben/installer/IdeFinal.java b/scripting/workben/installer/IdeFinal.java index 2d91929358ab..eac052191731 100644 --- a/scripting/workben/installer/IdeFinal.java +++ b/scripting/workben/installer/IdeFinal.java @@ -76,9 +76,7 @@ public class IdeFinal extends javax.swing.JPanel implements ActionListener, Inst ArrayList<?> locations = InstallWizard.getLocations(); //System.out.println("here "+locations.size()); // Returned 1 - String progpath=null; String path=null; - String classespath=null; for (int i =0;i<locations.size();i++){ path= (String)locations.get(i); diff --git a/scripting/workben/installer/InstUtil.java b/scripting/workben/installer/InstUtil.java index 26ec2027b4d6..0fb687c80f00 100644 --- a/scripting/workben/installer/InstUtil.java +++ b/scripting/workben/installer/InstUtil.java @@ -181,7 +181,6 @@ public class InstUtil { return null; }*/ - File theFile = null; Properties results = new Properties(); StringBuffer str = new StringBuffer(); @@ -197,7 +196,6 @@ public class InstUtil { if( jeditLogFile.exists() ) { String[] jeditDetails = getJeditInstallation( jeditLogFile ); System.out.println( "getJeditLocation ) " + jeditDetails[0] ); - File f = new File(jeditDetails[0]); results.put("jEdit "+jeditDetails[1], jeditDetails[0]); System.out.println( "jeditDetails[0] is " + jeditDetails[0]); } @@ -439,7 +437,7 @@ public class InstUtil { System.err.println("Problem with sversion.ini"); } try { - Properties vers = InstUtil.getOfficeVersions(f); + InstUtil.getOfficeVersions(f); } catch (IOException e) { e.printStackTrace(); System.err.println(e); diff --git a/scripting/workben/installer/Register.java b/scripting/workben/installer/Register.java index 7e4c4c87d8b5..e2d7ceabc9af 100644 --- a/scripting/workben/installer/Register.java +++ b/scripting/workben/installer/Register.java @@ -73,7 +73,6 @@ public class Register{ String[] packages = {"ooscriptframe.zip", "bshruntime.zip", "jsruntime.zip"}; try { - String s=null; boolean goodResult = false; String env[] = new String[1]; ExecCmd command = new ExecCmd(); diff --git a/scripting/workben/installer/Version.java b/scripting/workben/installer/Version.java index d1c7c819f6f4..ec3420b2bb18 100644 --- a/scripting/workben/installer/Version.java +++ b/scripting/workben/installer/Version.java @@ -251,7 +251,6 @@ class MyTableModel extends AbstractTableModel { data = new ArrayList<ArrayList<Object>>(); boolean isWindows = (System.getProperty("os.name").indexOf("Windows") != -1); - int len = validVersions.length; for (Enumeration e = properties.propertyNames(); e.hasMoreElements() ;) { String key = (String)e.nextElement(); String path = null; diff --git a/scripting/workben/installer/XmlUpdater.java b/scripting/workben/installer/XmlUpdater.java index d9f9832bc4b8..7dfe5eca37e1 100644 --- a/scripting/workben/installer/XmlUpdater.java +++ b/scripting/workben/installer/XmlUpdater.java @@ -20,13 +20,11 @@ package installer; import java.io.*; import java.util.*; -import java.net.URL; import javax.swing.*; public class XmlUpdater extends Thread { private String classesPath = null; - private String jarfilename; private String installPath; private boolean netInstall; private boolean bindingsInstall; @@ -154,19 +152,14 @@ public class XmlUpdater extends Thread { public void run() { - InputStream istream; //InputSource isource; //DocumentBuilderFactory builderFactory; //DocumentBuilder builder = null; - URL url; - String fileName = null; internalThread = Thread.currentThread(); //System.out.println("\n\n\n\nFileName: "+installPath); classesPath= installPath.concat(File.separator+"program"+File.separator+"classes"+File.separator); - String opSys =System.getProperty("os.name"); - //System.out.println("\n System "+opSys); String progpath=installPath; progpath= progpath.concat(File.separator+"program"+File.separator); diff --git a/stoc/test/javavm/testapplet/TestApplet.java b/stoc/test/javavm/testapplet/TestApplet.java index ab01541fa8a2..d5484e372c7f 100644 --- a/stoc/test/javavm/testapplet/TestApplet.java +++ b/stoc/test/javavm/testapplet/TestApplet.java @@ -40,7 +40,6 @@ public class TestApplet extends java.applet.Applet { // Security tests. File f= new File("d:\\temp\\javasecurity.txt"); - SecurityManager mgr= System.getSecurityManager(); try { f.createNewFile(); diff --git a/stoc/test/javavm/testcomponent/TestComponent.java b/stoc/test/javavm/testcomponent/TestComponent.java index 33cb4e25fb37..7406c1751019 100644 --- a/stoc/test/javavm/testcomponent/TestComponent.java +++ b/stoc/test/javavm/testcomponent/TestComponent.java @@ -64,7 +64,6 @@ public class TestComponent implements XServiceInfo, XTypeProvider public String getImplementationName( ) { String a= "the functions are for debugging"; - int abc= 34; String prop= System.getProperty("ftp.proxyHost"); prop= System.getProperty("ftp.proxyPort"); prop= System.getProperty("http.proxyHost"); diff --git a/toolkit/qa/complex/toolkit/accessibility/_XAccessibleText.java b/toolkit/qa/complex/toolkit/accessibility/_XAccessibleText.java index 96c53c0db117..6de3a08485ec 100644 --- a/toolkit/qa/complex/toolkit/accessibility/_XAccessibleText.java +++ b/toolkit/qa/complex/toolkit/accessibility/_XAccessibleText.java @@ -653,7 +653,7 @@ public class _XAccessibleText { try { System.out.println("getTextRange(-1, chCount - 1): "); - String txtRange = oObj.getTextRange(-1, chCount - 1); + oObj.getTextRange(-1, chCount - 1); System.out.println("Exception was expected"); res &= false; } catch(com.sun.star.lang.IndexOutOfBoundsException e) { @@ -663,7 +663,7 @@ public class _XAccessibleText { try { System.out.println("getTextRange(0, chCount + 1): "); - String txtRange = oObj.getTextRange(0, chCount + 1); + oObj.getTextRange(0, chCount + 1); System.out.println("Exception was expected"); res &= false; } catch(com.sun.star.lang.IndexOutOfBoundsException e) { @@ -673,7 +673,7 @@ public class _XAccessibleText { try { System.out.println("getTextRange(chCount+1, -1): "); - String txtRange = oObj.getTextRange(chCount+1, -1); + oObj.getTextRange(chCount+1, -1); System.out.println("Exception was expected"); res &= false; } catch(com.sun.star.lang.IndexOutOfBoundsException e) { @@ -701,8 +701,7 @@ public class _XAccessibleText { try { System.out.println("getTextAtIndex(-1, AccessibleTextType.PARAGRAPH):"); - TextSegment txt = - oObj.getTextAtIndex(-1, AccessibleTextType.PARAGRAPH); + oObj.getTextAtIndex(-1, AccessibleTextType.PARAGRAPH); System.out.println("Exception was expected"); res &= false; } catch(com.sun.star.lang.IndexOutOfBoundsException e) { @@ -716,8 +715,7 @@ public class _XAccessibleText { try { System.out.println("getTextAtIndex(chCount+1," + " AccessibleTextType.PARAGRAPH):"); - TextSegment txt = oObj.getTextAtIndex(chCount + 1, - AccessibleTextType.PARAGRAPH); + oObj.getTextAtIndex(chCount + 1, AccessibleTextType.PARAGRAPH); System.out.println("Exception was expected"); res &= false; } catch(com.sun.star.lang.IndexOutOfBoundsException e) { @@ -775,8 +773,7 @@ public class _XAccessibleText { try { System.out.println("getTextBeforeIndex(-1, AccessibleTextType.PARAGRAPH):"); - TextSegment txt = oObj.getTextBeforeIndex(-1, - AccessibleTextType.PARAGRAPH); + oObj.getTextBeforeIndex(-1, AccessibleTextType.PARAGRAPH); System.out.println("Exception was expected"); res &= false; } catch(com.sun.star.lang.IndexOutOfBoundsException e) { @@ -791,8 +788,7 @@ public class _XAccessibleText { try { System.out.println("getTextBeforeIndex(chCount+1, " + "AccessibleTextType.PARAGRAPH):"); - TextSegment txt = oObj.getTextBeforeIndex(chCount + 1, - AccessibleTextType.PARAGRAPH); + oObj.getTextBeforeIndex(chCount + 1, AccessibleTextType.PARAGRAPH); System.out.println("Exception was expected"); res &= false; } catch(com.sun.star.lang.IndexOutOfBoundsException e) { @@ -865,8 +861,7 @@ public class _XAccessibleText { try { System.out.println("getTextBehindIndex(-1, AccessibleTextType.PARAGRAPH):"); - TextSegment txt = oObj.getTextBehindIndex(-1, - AccessibleTextType.PARAGRAPH); + oObj.getTextBehindIndex(-1, AccessibleTextType.PARAGRAPH); System.out.println("Exception was expected"); res &= false; } catch(com.sun.star.lang.IndexOutOfBoundsException e) { @@ -881,8 +876,7 @@ public class _XAccessibleText { try { System.out.println("getTextBehindIndex(chCount+1, " + "AccessibleTextType.PARAGRAPH):"); - TextSegment txt = oObj.getTextBehindIndex(chCount + 1, - AccessibleTextType.PARAGRAPH); + oObj.getTextBehindIndex(chCount + 1, AccessibleTextType.PARAGRAPH); System.out.println("Exception was expected"); res &= false; } catch(com.sun.star.lang.IndexOutOfBoundsException e) { diff --git a/toolkit/test/accessibility/AccessibilityTreeModel.java b/toolkit/test/accessibility/AccessibilityTreeModel.java index c9d30819949c..a7cbbaf13e70 100644 --- a/toolkit/test/accessibility/AccessibilityTreeModel.java +++ b/toolkit/test/accessibility/AccessibilityTreeModel.java @@ -208,8 +208,6 @@ public class AccessibilityTreeModel AccessibleTreeNode aChildNode = null; try { - boolean bRet = false; - // First make sure that the accessible object does not already have // a representation. aChildNode = maNodeMap.GetNode(xNewChild); diff --git a/toolkit/test/accessibility/AccessibilityWorkBench.java b/toolkit/test/accessibility/AccessibilityWorkBench.java index 43365d5a9fe3..31ff92287fd4 100644 --- a/toolkit/test/accessibility/AccessibilityWorkBench.java +++ b/toolkit/test/accessibility/AccessibilityWorkBench.java @@ -120,9 +120,6 @@ public class AccessibilityWorkBench { setSize (new Dimension (8000,600)); - JScrollPane aScrollPane; - GridBagConstraints constraints; - // Create new layout. GridBagLayout aLayout = new GridBagLayout (); getContentPane().setLayout (aLayout); @@ -186,7 +183,6 @@ public class AccessibilityWorkBench // Button bar. maButtonBar = new JPanel(); - GridBagLayout aButtonLayout = new GridBagLayout (); maButtonBar.setLayout (new FlowLayout()); addGridElement (maButtonBar, 0,3, 2,1, 1,0, GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL); diff --git a/toolkit/test/accessibility/Canvas.java b/toolkit/test/accessibility/Canvas.java index 116da3e12dbc..d584770d964b 100644 --- a/toolkit/test/accessibility/Canvas.java +++ b/toolkit/test/accessibility/Canvas.java @@ -392,7 +392,6 @@ class Canvas protected CanvasShape FindCanvasShapeUnderMouse (MouseEvent e) { - int nObjects = maObjects.size(); CanvasShape aObjectUnderMouse = null; int nCount = maObjectList.size(); for (int i=nCount-1; i>=0; --i) diff --git a/toolkit/test/accessibility/CanvasShape.java b/toolkit/test/accessibility/CanvasShape.java index f9a036bc543a..648ab7a38423 100644 --- a/toolkit/test/accessibility/CanvasShape.java +++ b/toolkit/test/accessibility/CanvasShape.java @@ -118,7 +118,6 @@ class CanvasShape try{ // Transform the object's position and size according to the // specified offset and scale. - Point aLocation = new Point(); maShape = new Rectangle2D.Double ( maPosition.x * nScaleFactor + nXOffset, maPosition.y * nScaleFactor + nYOffset, diff --git a/toolkit/test/accessibility/InformationWriter.java b/toolkit/test/accessibility/InformationWriter.java index 994d84ca42be..4fb968c8e0ec 100644 --- a/toolkit/test/accessibility/InformationWriter.java +++ b/toolkit/test/accessibility/InformationWriter.java @@ -258,7 +258,6 @@ public class InformationWriter + xContext.getAccessibleDescription()); MessageArea.println (sIndent + "Role : " + xContext.getAccessibleRole()); - String sHasParent; if (xContext.getAccessibleParent() != null) { MessageArea.println (sIndent + "Has parent : yes"); diff --git a/unotools/qa/complex/tempfile/Test02.java b/unotools/qa/complex/tempfile/Test02.java index e1d4e5fda21f..24868c0b6560 100644 --- a/unotools/qa/complex/tempfile/Test02.java +++ b/unotools/qa/complex/tempfile/Test02.java @@ -42,7 +42,6 @@ public class Test02 implements TempFileTest { XTempFile xTempFile = null; XTruncate xTruncate = null; String sFileURL = null; - String sFileName = null; //create a temporary file. try { oTempFile = m_xMSF.createInstance( "com.sun.star.io.TempFile" ); diff --git a/unoxml/qa/complex/unoxml/DOMTest.java b/unoxml/qa/complex/unoxml/DOMTest.java index 3a44eaf4a41b..0211da376eed 100644 --- a/unoxml/qa/complex/unoxml/DOMTest.java +++ b/unoxml/qa/complex/unoxml/DOMTest.java @@ -2560,7 +2560,7 @@ public class DOMTest } try { - XNode xResult = xXPathAPI.selectSingleNode(xDoc, "//pre:foo"); + xXPathAPI.selectSingleNode(xDoc, "//pre:foo"); fail("XXPathAPI.selectSingleNode"); } catch (XPathException e) { /* expected */ } xXPathAPI.registerNS("pre", ns); @@ -2572,7 +2572,7 @@ public class DOMTest xXPathAPI.unregisterNS("pre", ns); try { - XNode xResult = xXPathAPI.selectSingleNode(xDoc, "//pre:foo"); + xXPathAPI.selectSingleNode(xDoc, "//pre:foo"); fail("XXPathAPI.unregisterNS"); } catch (XPathException e) { /* expected */ } diff --git a/wizards/com/sun/star/wizards/common/Configuration.java b/wizards/com/sun/star/wizards/common/Configuration.java index 817552ba759f..74e73e7ed33b 100644 --- a/wizards/com/sun/star/wizards/common/Configuration.java +++ b/wizards/com/sun/star/wizards/common/Configuration.java @@ -391,7 +391,6 @@ public abstract class Configuration public static XNameAccess getChildNodebyDisplayName(XNameAccess _xNameAccessNode, String _displayname) { - String[] snames = null; return getChildNodebyDisplayName(_xNameAccessNode, _displayname, PropertyNames.PROPERTY_NAME); } @@ -401,7 +400,6 @@ public abstract class Configuration try { snames = _xNameAccessNode.getElementNames(); - String[] sdisplaynames = new String[snames.length]; for (int i = 0; i < snames.length; i++) { String curdisplayname = (String) Helper.getUnoPropertyValue(_xNameAccessNode.getByName(snames[i]), _nodename); @@ -424,7 +422,6 @@ public abstract class Configuration try { snames = _xNameAccessNode.getElementNames(); - String[] sdisplaynames = new String[snames.length]; for (int i = 0; i < snames.length; i++) { String curdisplayname = (String) Helper.getUnoPropertyValue(_xNameAccessNode.getByName(snames[i]), _nodename); diff --git a/wizards/com/sun/star/wizards/common/JavaTools.java b/wizards/com/sun/star/wizards/common/JavaTools.java index 11656babb1fb..0b83b07ff4c1 100644 --- a/wizards/com/sun/star/wizards/common/JavaTools.java +++ b/wizards/com/sun/star/wizards/common/JavaTools.java @@ -335,7 +335,6 @@ public class JavaTools if (!MainString.equals(PropertyNames.EMPTY_STRING)) { ArrayList<String> StringVector = new ArrayList<String>(); - String LocString = null; int iIndex; do { diff --git a/wizards/com/sun/star/wizards/common/NumericalHelper.java b/wizards/com/sun/star/wizards/common/NumericalHelper.java index 4653099a7721..091aef9e637a 100644 --- a/wizards/com/sun/star/wizards/common/NumericalHelper.java +++ b/wizards/com/sun/star/wizards/common/NumericalHelper.java @@ -147,7 +147,6 @@ public class NumericalHelper { char retValue = 0; - boolean hasConversionWarning = false; TypeObject aTypeObject = getTypeObject(aValue); switch (aTypeObject.iType) { diff --git a/wizards/com/sun/star/wizards/db/QueryMetaData.java b/wizards/com/sun/star/wizards/db/QueryMetaData.java index a5435e4dae66..ac94dea871fc 100644 --- a/wizards/com/sun/star/wizards/db/QueryMetaData.java +++ b/wizards/com/sun/star/wizards/db/QueryMetaData.java @@ -131,7 +131,6 @@ public class QueryMetaData extends CommandMetaData public void removeSeveralFieldColumnsByDisplayFieldName(String[] _DisplayFieldNames) { ArrayList<FieldColumn> oRemainingFieldColumns = new ArrayList<FieldColumn>(); - int a = 0; for (int n = 0; n < FieldColumns.length; n++) { String sDisplayFieldName = FieldColumns[n].getDisplayFieldName(); diff --git a/wizards/com/sun/star/wizards/db/RecordParser.java b/wizards/com/sun/star/wizards/db/RecordParser.java index 9f130836aef1..caeb1461597a 100644 --- a/wizards/com/sun/star/wizards/db/RecordParser.java +++ b/wizards/com/sun/star/wizards/db/RecordParser.java @@ -127,7 +127,6 @@ public class RecordParser extends QueryMetaData public Object getColumnValue(int ColIndex, int iType) { - boolean bResult; Object oAny = Any.VOID; switch (iType) { diff --git a/wizards/com/sun/star/wizards/document/OfficeDocument.java b/wizards/com/sun/star/wizards/document/OfficeDocument.java index 06425e5df782..6fbf0da777fd 100644 --- a/wizards/com/sun/star/wizards/document/OfficeDocument.java +++ b/wizards/com/sun/star/wizards/document/OfficeDocument.java @@ -129,7 +129,6 @@ public class OfficeDocument Object oDocument = null; com.sun.star.frame.XComponentLoader xComponentLoader = null; - XInterface xInterface = null; String sURL = "private:factory/" + sDocumentType; try diff --git a/wizards/com/sun/star/wizards/form/FieldLinker.java b/wizards/com/sun/star/wizards/form/FieldLinker.java index 82899b92b532..fa2a89e3200a 100644 --- a/wizards/com/sun/star/wizards/form/FieldLinker.java +++ b/wizards/com/sun/star/wizards/form/FieldLinker.java @@ -62,7 +62,6 @@ public class FieldLinker extends DBLimitedFieldSelection int SOSECLINKLST = 1; int SOTHIRDLINKLST = 2; int SOFOURTHLINKLST = 3; - Integer IListBoxPosX = new Integer(iCompPosX + 6); sSlaveListHeader = CurUnoDialog.m_oResource.getResArray(UIConsts.RID_FORM + 20, 4); //new String[rowcount];PropertyNames.EMPTY_STRING; //CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 40); sMasterListHeader = CurUnoDialog.m_oResource.getResArray(UIConsts.RID_FORM + 24, 4);// new String[rowcount];PropertyNames.EMPTY_STRING; //CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 40); SOLINKLST = new int[] diff --git a/wizards/com/sun/star/wizards/form/FormWizard.java b/wizards/com/sun/star/wizards/form/FormWizard.java index f1a2ad047f92..24d1bd4d5c5f 100644 --- a/wizards/com/sun/star/wizards/form/FormWizard.java +++ b/wizards/com/sun/star/wizards/form/FormWizard.java @@ -403,7 +403,6 @@ public class FormWizard extends DatabaseObjectWizard { String sID = JavaTools.ArrayoutofString(sIncSuffix, "_")[1]; ID = Integer.parseInt(sID); - int a = 0; } } } diff --git a/wizards/com/sun/star/wizards/table/ScenarioSelector.java b/wizards/com/sun/star/wizards/table/ScenarioSelector.java index 5933a68e5fee..53a1346c18b9 100644 --- a/wizards/com/sun/star/wizards/table/ScenarioSelector.java +++ b/wizards/com/sun/star/wizards/table/ScenarioSelector.java @@ -222,7 +222,6 @@ public class ScenarioSelector extends FieldSelection implements XItemListener, X public void addColumnsToDescriptor() { - XNameAccess xNameAccessFieldNode; String[] fieldnames = getSelectedFieldNames(); for (int i = 0; i < fieldnames.length; i++) { @@ -331,7 +330,6 @@ public class ScenarioSelector extends FieldSelection implements XItemListener, X iduplicate = JavaTools.getDuplicateFieldIndex(NewItems, NewItems[i]); if (iduplicate != -1) { - XNameAccess xNameAccessFieldNode; String sdisplayname = Desktop.getUniqueName(NewItems, NewItems[iduplicate], PropertyNames.EMPTY_STRING); FieldDescription curfielddescription = new FieldDescription(xMSF, aLocale, this, sdisplayname, NewItems[iduplicate], imaxcolumnchars); CurTableWizardUnoDialog.fielditems.put(sdisplayname, curfielddescription); diff --git a/wizards/com/sun/star/wizards/text/TextDocument.java b/wizards/com/sun/star/wizards/text/TextDocument.java index 06a885c50072..5ef82e080b1e 100644 --- a/wizards/com/sun/star/wizards/text/TextDocument.java +++ b/wizards/com/sun/star/wizards/text/TextDocument.java @@ -316,7 +316,7 @@ public class TextDocument xComponent = UnoRuntime.queryInterface(XComponent.class, xTextDocument); XWindow xWindow = xFrame.getComponentWindow(); - xWindowPeer = UnoRuntime.queryInterface(XWindowPeer.class, xFrame.getComponentWindow()); + xWindowPeer = UnoRuntime.queryInterface(XWindowPeer.class, xWindow); xMSFDoc = UnoRuntime.queryInterface(XMultiServiceFactory.class, xTextDocument); xNumberFormatsSupplier = UnoRuntime.queryInterface(XNumberFormatsSupplier.class, xTextDocument); diff --git a/wizards/com/sun/star/wizards/ui/AggregateComponent.java b/wizards/com/sun/star/wizards/ui/AggregateComponent.java index 604aecd63358..0f1010bc4012 100644 --- a/wizards/com/sun/star/wizards/ui/AggregateComponent.java +++ b/wizards/com/sun/star/wizards/ui/AggregateComponent.java @@ -370,7 +370,6 @@ public class AggregateComponent extends ControlScroller ArrayList<String[]> aggregatevector = new ArrayList<String[]>(); PropertyValue[][] aggregatelist = this.getScrollFieldValues(); PropertyValue[] currowproperties; - PropertyValue curaggregateproperty; if (CurDBMetaData.AggregateFieldNames != null) { for (int i = 0; i < aggregatelist.length; i++) diff --git a/wizards/com/sun/star/wizards/ui/ControlScroller.java b/wizards/com/sun/star/wizards/ui/ControlScroller.java index dfb920ebc09d..8210cce41c1f 100644 --- a/wizards/com/sun/star/wizards/ui/ControlScroller.java +++ b/wizards/com/sun/star/wizards/ui/ControlScroller.java @@ -132,7 +132,6 @@ public abstract class ControlScroller { try { - boolean bisVisible; ntotfieldcount = _ntotfieldcount; setCurFieldCount(); nscrollvalue = 0; @@ -167,9 +166,7 @@ public abstract class ControlScroller protected void fillupControls(boolean binitialize) { - int newindex; PropertyValue[] oldproperties; - PropertyValue[] newproperties; for (int a = 0; a < this.nblockincrement; a++) { if (a < ncurfieldcount) diff --git a/wizards/com/sun/star/wizards/ui/SortingComponent.java b/wizards/com/sun/star/wizards/ui/SortingComponent.java index e884baa62860..a5c0790c4e94 100644 --- a/wizards/com/sun/star/wizards/ui/SortingComponent.java +++ b/wizards/com/sun/star/wizards/ui/SortingComponent.java @@ -72,7 +72,6 @@ public class SortingComponent xMSF = CurUnoDialog.xMSF; Integer IStep = new Integer(iStep); Integer ICompPosX = new Integer(iCompPosX); - Integer ICompPosY = new Integer(iCompPosY); Integer ICompWidth = new Integer(iCompWidth); Integer IListBoxPosX = new Integer(iCompPosX + 6); @@ -81,7 +80,6 @@ public class SortingComponent Integer IListBoxWidth = new Integer(iCompWidth - iOptButtonWidth - 12); Integer IOptButtonPosX = new Integer(IListBoxPosX.intValue() + IListBoxWidth.intValue() + 6); getResources(); - com.sun.star.awt.XWindow[] xListBoxWindow = new com.sun.star.awt.XWindow[4]; boolean bDoEnable; String HIDString; int iCurPosY = iCompPosY; diff --git a/wizards/com/sun/star/wizards/ui/UnoDialog.java b/wizards/com/sun/star/wizards/ui/UnoDialog.java index ec3b6b2bc0de..56974cfb6723 100644 --- a/wizards/com/sun/star/wizards/ui/UnoDialog.java +++ b/wizards/com/sun/star/wizards/ui/UnoDialog.java @@ -553,7 +553,6 @@ public class UnoDialog implements EventNames { int iCurControlStep = AnyConverter.toInt(getControlProperty(controlname, PropertyNames.PROPERTY_STEP)); int iCurDialogStep = AnyConverter.toInt(Helper.getUnoPropertyValue(this.xDialogModel, PropertyNames.PROPERTY_STEP)); - int iNewStep; if (bIsVisible) { setControlProperty(controlname, PropertyNames.PROPERTY_STEP, new Integer(iCurDialogStep)); @@ -757,7 +756,7 @@ public class UnoDialog implements EventNames Object oControl = xDlgContainer.getControl(ControlName); xControl = UnoRuntime.queryInterface(XControl.class, oControl); XWindowPeer xWindowPeer = xControl.getPeer(); - XVclWindowPeer xVclWindowPeer = UnoRuntime.queryInterface(XVclWindowPeer.class, xControl.getPeer()); + XVclWindowPeer xVclWindowPeer = UnoRuntime.queryInterface(XVclWindowPeer.class, xWindowPeer); xVclWindowPeer.setProperty("AutoMnemonics", Boolean.valueOf(bValue)); } @@ -1041,16 +1040,11 @@ public class UnoDialog implements EventNames public static int getRedColorShare(int _nColor) { int nRed = _nColor / 65536; - int nRedModulo = _nColor % 65536; - int nGreen = nRedModulo / 256; - int nGreenModulo = (nRedModulo % 256); - int nBlue = nGreenModulo; return nRed; } public static int getGreenColorShare(int _nColor) { - int nRed = _nColor / 65536; int nRedModulo = _nColor % 65536; int nGreen = nRedModulo / 256; return nGreen; @@ -1058,9 +1052,7 @@ public class UnoDialog implements EventNames public static int getBlueColorShare(int _nColor) { - int nRed = _nColor / 65536; int nRedModulo = _nColor % 65536; - int nGreen = nRedModulo / 256; int nGreenModulo = (nRedModulo % 256); int nBlue = nGreenModulo; return nBlue; diff --git a/xmlsecurity/test_docs/tools/httpserv/src/httpserv/Main.java b/xmlsecurity/test_docs/tools/httpserv/src/httpserv/Main.java index a9bd3cee9977..b191b5c1ee02 100644 --- a/xmlsecurity/test_docs/tools/httpserv/src/httpserv/Main.java +++ b/xmlsecurity/test_docs/tools/httpserv/src/httpserv/Main.java @@ -126,7 +126,6 @@ class MyHandler implements HttpHandler { public void handle(HttpExchange xchange) throws IOException { try { //First get the path to the file - File fileCurrent = new File("."); String sRequestPath = xchange.getRequestURI().getPath(); System.out.println("requested: " + sRequestPath); File fileRequest = new File(new File(".").getCanonicalPath(), sRequestPath); |