strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

java: remove some unused local variables

Browse source 
Change-Id: Ia01528460e2f4b610d123e29cad66520abc6a965
This commit is contained in:
Noel Grandin 2014-12-05 11:03:50 +02:00
parent db203e59d6
commit c199b76d88
21 changed files with 19 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
bean/com/sun/star/comp/beans/LocalOfficeConnection.java
View file

@ -303,7 +303,7 @@ public class LocalOfficeConnection
com.sun.star.comp.helper.Bootstrap.createInitialComponentContext(null);
// initial serviceManager
XMultiComponentFactory xLocalServiceManager = xLocalContext.getServiceManager();
xLocalContext.getServiceManager();
// try to connect to soffice
Object aInitialObject = null;
@ -403,7 +403,6 @@ public class LocalOfficeConnection
}
else { // new style
int index = dcp.indexOf(':');
String url = dcp.substring(0, index).trim();
dcp = dcp.substring(index + 1).trim();
index = dcp.indexOf(';');

1
filter/qa/complex/filter/misc/FinalizedMandatoryTest.java
View file

@ -159,7 +159,6 @@ public class FinalizedMandatoryTest
System.out.println("------------------------------------------------");
try
{
PropertyValue instanceProp = new PropertyValue();
filterName = filterNames[i];
System.out.println(filterName);

1
jurt/com/sun/star/lib/uno/environments/remote/Job.java
View file

@ -77,7 +77,6 @@ public class Job {
* @return the result of the message.
*/
public Object execute() throws Throwable {
Object msgResult = _iMessage.getResult();
if (_iMessage.isRequest()) {
Object result = null;
Throwable exception = null;

2
jurt/workbench/com/sun/star/comp/urlresolver/UrlResolver_Test.java
View file

@ -36,7 +36,7 @@ public class UrlResolver_Test
XComponentContext xcomponentcontext = Bootstrap.createInitialComponentContext( null );
// initial serviceManager
XMultiComponentFactory xLocalServiceManager = xcomponentcontext.getServiceManager();
xcomponentcontext.getServiceManager();
// create a connector, so that it can contact the office
XUnoUrlResolver urlResolver

2
jvmfwk/plugins/sunmajor/pluginlib/JREProperties.java
View file

@ -53,7 +53,7 @@ public class JREProperties
{
try{
//This line is needed to get the accessibility properties
Toolkit tk = java.awt.Toolkit.getDefaultToolkit();
java.awt.Toolkit.getDefaultToolkit();
}
catch(Throwable e)
{

1
nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/BaseDialog.java
View file

@ -90,7 +90,6 @@ public abstract class BaseDialog extends BaseControl {
public BaseDialog(XComponentContext context, String title, int x, int y, int width, int height) {
super(context);
ModalState modalState = ModalState.Exit;
try {
xMCF = context.getServiceManager();
setUnoModel(xMCF.createInstanceWithContext("com.sun.star.awt.UnoControlDialogModel", context));

1
reportbuilder/java/org/libreoffice/report/pentaho/PentahoReportJob.java
View file

@ -135,7 +135,6 @@ public class PentahoReportJob implements ReportJob
this.masterValues = (ArrayList<?>) jobProperties.getProperty(ReportEngineParameterNames.INPUT_MASTER_VALUES);
this.detailColumns = (ArrayList<?>) jobProperties.getProperty(ReportEngineParameterNames.INPUT_DETAIL_COLUMNS);
Integer maxRows=(Integer) jobProperties.getProperty(ReportEngineParameterNames.MAXROWS);
this.resourceManager = new ResourceManager();
this.resourceManager.registerDefaults();

2
reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java
View file

@ -1037,7 +1037,7 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget
DocumentBuilder dBuilder = dbFactory.newDocumentBuilder();
Document document = dBuilder.parse(new InputSource(inputStream));
NodeList nl = document.getElementsByTagName("document-meta/meta/generator");
document.getElementsByTagName("document-meta/meta/generator");
Node node = document.getFirstChild().getFirstChild().getFirstChild().getFirstChild();
String creator = node.getNodeValue();
node.setNodeValue(creator + "/report_builder");

12
scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java
View file

@ -76,18 +76,14 @@ public class ParcelBrowseNode extends PropertySet implements
registerProperty("Creatable", new Type(boolean.class), (short)0, "creatable");
registerProperty("Renamable", new Type(boolean.class), (short)0, "renamable");
String parcelDirUrl = parcel.getPathToParcel();
XComponentContext xCtx = provider.getScriptingContext().getComponentContext();
XMultiComponentFactory xFac = xCtx.getServiceManager();
try {
XSimpleFileAccess xSFA =
UnoRuntime.queryInterface(XSimpleFileAccess.class,
xFac.createInstanceWithContext(
"com.sun.star.ucb.SimpleFileAccess",
xCtx));
UnoRuntime.queryInterface(XSimpleFileAccess.class,
xFac.createInstanceWithContext(
"com.sun.star.ucb.SimpleFileAccess",
xCtx));
} catch (com.sun.star.uno.Exception e) {
// TODO propagate potential errors
LogUtils.DEBUG("Caught exception creating ParcelBrowseNode " + e);

10
scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java
View file

@ -65,15 +65,13 @@ public class ProviderBrowseNode extends PropertySet implements
registerProperty("Deletable", new Type(boolean.class), (short)0, "deletable");
registerProperty("Creatable", new Type(boolean.class), (short)0, "creatable");
registerProperty("Editable", new Type(boolean.class), (short)0, "editable");
XSimpleFileAccess xSFA = null;
XMultiComponentFactory xFac = m_xCtx.getServiceManager();
try {
xSFA = UnoRuntime.queryInterface(XSimpleFileAccess.class,
xFac.createInstanceWithContext(
"com.sun.star.ucb.SimpleFileAccess",
xCtx));
UnoRuntime.queryInterface(XSimpleFileAccess.class,
xFac.createInstanceWithContext(
"com.sun.star.ucb.SimpleFileAccess",
xCtx));
}
// TODO propage errors
catch (com.sun.star.uno.Exception e) {

2
scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java
View file

@ -71,8 +71,6 @@ public class ScriptBrowseNode extends PropertySet implements
XMultiComponentFactory xFac = xCtx.getServiceManager();
try {
ScriptMetaData data = (ScriptMetaData)parent.getByName(name);
XSimpleFileAccess xSFA = UnoRuntime.queryInterface(
XSimpleFileAccess.class,
xFac.createInstanceWithContext(

8
scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java
View file

@ -148,7 +148,7 @@ public class ParcelDescriptor {
return new ScriptEntry[0];
for (int i = 0; i < len; i++) {
String language, languagename, logicalname, description = "";
String language, languagename, description = "";
Map<String, String> langProps = new HashMap<String, String>();
NodeList nl;
Element tmp;
@ -158,11 +158,9 @@ public class ParcelDescriptor {
nl = scriptElement.getElementsByTagName("logicalname");
if (nl == null)
logicalname = "";
else {
if (nl != null)
{
tmp = (Element)nl.item(0);
logicalname = tmp.getAttribute("value");
}
// get the text of the description element

1
scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java
View file

@ -165,7 +165,6 @@ public class UnoPkgContainer extends ParcelContainer {
com.sun.star.container.NoSuchElementException,
com.sun.star.lang.WrappedTargetException {
ScriptMetaData scriptData = null;
String functionName = psu.function;
String parcelName = psu.parcel;
String location = psu.location;

2
scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java
View file

@ -180,8 +180,6 @@ class ScriptImpl implements XScript {
aOutParamIndex[0] = new short[0];
aOutParam[0] = new Object[0];
Map<String, String> languageProps = metaData.getLanguageProperties();
ScriptDescriptor scriptDesc =
new ScriptDescriptor(metaData.getLanguageName());

5
scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java
View file

@ -182,11 +182,10 @@ class ScriptImpl implements XScript {
aOutParam[0] = new Object[0];
ClassLoader cl = null;
URL sourceUrl = null;
try {
cl = ClassLoaderFactory.getURLClassLoader(metaData);
sourceUrl = metaData.getSourceURL();
metaData.getSourceURL();
} catch (java.net.MalformedURLException mfu) {
throw new ScriptFrameworkErrorException(
mfu.getMessage(), null,
@ -197,14 +196,12 @@ class ScriptImpl implements XScript {
Context ctxt = null;
try {
String editorURL = sourceUrl.toString();
Object result = null;
ScriptEditorForJavaScript editor =
ScriptEditorForJavaScript.getEditor(metaData.getSourceURL());
if (editor != null) {
editorURL = editor.getURL();
result = editor.execute();
if (result != null &&

4
sw/qa/complex/writer/CheckBookmarks.java
View file

@ -146,9 +146,7 @@ public class CheckBookmarks {
throws com.sun.star.uno.Exception
{
XText xText = m_xDoc.getText();
XSimpleText xSimpleText = UnoRuntime.queryInterface(
XSimpleText.class,
xText);
UnoRuntime.queryInterface(XSimpleText.class, xText);
for(int nPara=0; nPara<10; ++nPara) {
for(int nBookmark=0; nBookmark<100; ++nBookmark){
insertBookmark(

2
sw/qa/complex/writer/TextPortionEnumerationTest.java
View file

@ -589,7 +589,7 @@ class FuzzyTester
TreeNode node = m_BufferExpected.get(i);
int j = m_BufferActual.indexOf(node);
if (j >= 0) {
TreeNode other = m_BufferActual.get(j);
m_BufferActual.get(j);
if (j != i)
{
//FIXME how bad is this?

1
swext/mediawiki/src/com/sun/star/wiki/Helper.java
View file

@ -608,7 +608,6 @@ public class Helper
aProxyPortProp = "ooInetHTTPSProxyPort";
}
String aNoProxyList = AnyConverter.toString( xNameAccess.getByName( "ooInetNoProxy" ) );
String aProxyName = AnyConverter.toString( xNameAccess.getByName( aProxyNameProp ) );
int nProxyPort = 80;

9
swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java
View file

@ -107,18 +107,11 @@ public final class WikiEditorImpl extends WeakBase
}
private boolean m_bInitialized;
public synchronized void initialize( Object[] args ) throws com.sun.star.uno.Exception
{
if ( m_bInitialized )
{
}
if ( args.length > 0 )
{
m_bInitialized = true;
m_xFrame = UnoRuntime.queryInterface( XFrame.class, args[0] );
// become close listener
XCloseBroadcaster cb = UnoRuntime.queryInterface( XCloseBroadcaster.class, m_xFrame );
}
}
@ -197,7 +190,7 @@ public final class WikiEditorImpl extends WeakBase
{
try
{
URI uri = new URI( uristring );
new URI( uristring );
// check whether any blogs are live...
setListenerState( "command");

1
toolkit/test/accessibility/TopWindowListener.java
View file

@ -108,7 +108,6 @@ class TopWindowListener
if (aObject instanceof VectorNode && xTopLevelObject != null)
{
System.out.println ("removing node " + xTopLevelObject);
VectorNode aRoot = (VectorNode) aObject;
maModel.removeNode (xTopLevelObject.getAccessibleContext());
}
}

1
toolkit/test/accessibility/ov/StateSetView.java
View file

@ -179,7 +179,6 @@ public static class StateSetAllView
XAccessibleStateSet xStateSet = mxContext.getAccessibleStateSet();
if (xStateSet != null)
{
short aStates[] = xStateSet.getStates ();
final int nMaxStateIndex = AccessibleStateType.MANAGES_DESCENDANTS;
int nStateWidth = (aWidgetArea.width-12) / (nMaxStateIndex+1);
AffineTransform aTransform = g.getTransform ();