[Libreoffice-commits] core.git: 5 commits - bean/com chart2/qa connectivity/qa desktop/test extensions/qa forms/qa framework/qa javaunohelper/com nlpsolver/src odk/examples qadevOOo/runner qadevOOo/tests reportbuilder/java scripting/java sot/qa swext/mediawiki sw/qa toolkit/test ucb/qa vcl/qa wizards/com
Noel Grandin
noel at peralex.com
Thu Oct 16 23:27:16 PDT 2014
bean/com/sun/star/comp/beans/LocalOfficeConnection.java | 2
bean/com/sun/star/comp/beans/OOoBean.java | 32 ++++----
chart2/qa/TestCaseOldAPI.java | 2
connectivity/qa/complex/connectivity/dbase/DBaseDateFunctions.java | 2
connectivity/qa/complex/connectivity/dbase/DBaseNumericFunctions.java | 2
desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/OptionsEventHandler.java | 2
extensions/qa/integration/extensions/ObjectInspector.java | 2
forms/qa/integration/forms/FormControlTest.java | 14 +--
forms/qa/integration/forms/ListBox.java | 2
framework/qa/complex/XUserInputInterception/EventTest.java | 2
javaunohelper/com/sun/star/lib/uno/helper/ComponentBase.java | 2
javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java | 2
nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/EvolutionarySolverStatusUno.java | 2
odk/examples/DevelopersGuide/Charts/CalcHelper.java | 4 -
odk/examples/DevelopersGuide/Charts/ChartHelper.java | 2
odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java | 6 -
odk/examples/DevelopersGuide/OfficeDev/Clipboard/TextTransferable.java | 2
odk/examples/DevelopersGuide/Spreadsheet/ExampleAddIn.java | 2
odk/examples/java/NotesAccess/NotesAccess.java | 8 +-
qadevOOo/runner/convwatch/ConvWatch.java | 4 -
qadevOOo/runner/convwatch/INIOutputter.java | 6 -
qadevOOo/runner/convwatch/OfficePrint.java | 2
qadevOOo/runner/convwatch/PRNCompare.java | 4 -
qadevOOo/runner/convwatch/PerformanceContainer.java | 10 +-
qadevOOo/runner/convwatch/StatusHelper.java | 4 -
qadevOOo/runner/convwatch/TimeHelper.java | 2
qadevOOo/runner/graphical/JPEGComparator.java | 6 -
qadevOOo/runner/graphical/JPEGCreator.java | 4 -
qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java | 2
qadevOOo/runner/graphical/PerformanceContainer.java | 14 +--
qadevOOo/runner/graphical/TimeHelper.java | 2
qadevOOo/runner/util/BasicMacroTools.java | 11 --
qadevOOo/tests/java/ifc/beans/_XPropertyWithState.java | 3
qadevOOo/tests/java/ifc/document/_XActionLockable.java | 2
qadevOOo/tests/java/ifc/frame/_XModuleManager.java | 6 -
qadevOOo/tests/java/ifc/script/_XEventAttacherManager.java | 2
qadevOOo/tests/java/ifc/sheet/_XDatabaseRange.java | 6 -
qadevOOo/tests/java/ifc/sheet/_XViewSplitable.java | 2
qadevOOo/tests/java/mod/_dbaccess/OQueryDesign.java | 2
qadevOOo/tests/java/mod/_dbaccess/TableWindowAccessibility.java | 3
qadevOOo/tests/java/mod/_xmloff/Draw/XMLStylesImporter.java | 2
reportbuilder/java/org/libreoffice/report/pentaho/SOFormulaOpCodeMapper.java | 4 -
scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java | 2
scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java | 6 -
scripting/java/com/sun/star/script/framework/provider/java/StrictResolver.java | 34 +++++---
sot/qa/complex/olesimplestorage/Test01.java | 4 -
sw/qa/complex/writer/TextPortionEnumerationTest.java | 2
swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java | 2
swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java | 8 +-
toolkit/test/accessibility/OfficeConnection.java | 2
ucb/qa/complex/tdoc/CheckTransientDocumentsDocumentContent.java | 4 -
vcl/qa/complex/memCheck/CheckMemoryUsage.java | 6 -
wizards/com/sun/star/wizards/common/Resource.java | 6 -
wizards/com/sun/star/wizards/db/SQLQueryComposer.java | 2
wizards/com/sun/star/wizards/db/TypeInspector.java | 2
wizards/com/sun/star/wizards/document/Control.java | 4 -
wizards/com/sun/star/wizards/document/GridControl.java | 2
wizards/com/sun/star/wizards/form/FormDocument.java | 2
wizards/com/sun/star/wizards/form/UIControlArranger.java | 6 -
wizards/com/sun/star/wizards/query/QuerySummary.java | 4 -
wizards/com/sun/star/wizards/table/CGCategory.java | 2
wizards/com/sun/star/wizards/ui/AggregateComponent.java | 10 +-
wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java | 2
wizards/com/sun/star/wizards/ui/FilterComponent.java | 40 +++++-----
wizards/com/sun/star/wizards/ui/SortingComponent.java | 10 +-
wizards/com/sun/star/wizards/ui/TitlesComponent.java | 6 -
wizards/com/sun/star/wizards/ui/WizardDialog.java | 2
67 files changed, 181 insertions(+), 184 deletions(-)
New commits:
commit 51b7b69de4824c0a0740c131e829b1412f1e22fa
Author: Noel Grandin <noel at peralex.com>
Date: Thu Oct 16 15:21:17 2014 +0200
java: should throw this exception
Change-Id: I0da1b5cda0ecf20d3566413864a45a49bbcb2a2d
diff --git a/desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/OptionsEventHandler.java b/desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/OptionsEventHandler.java
index 28d6dc3b..86b168a 100644
--- a/desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/OptionsEventHandler.java
+++ b/desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/OptionsEventHandler.java
@@ -317,7 +317,7 @@ public class OptionsEventHandler {
throws com.sun.star.uno.Exception {
if (aWindow == null)
- new com.sun.star.lang.IllegalArgumentException(
+ throw new com.sun.star.lang.IllegalArgumentException(
"Method external_event requires that a window is passed as argument",
this, (short) -1);
commit 4650b42868c683b5c1ef510dd32f34258cff3cb7
Author: Noel Grandin <noel at peralex.com>
Date: Thu Oct 16 15:20:04 2014 +0200
java: dodgy &= operation
Change-Id: Ia909797e08948a8ad0e6f536ce2af57880dc13ef
diff --git a/qadevOOo/tests/java/ifc/frame/_XModuleManager.java b/qadevOOo/tests/java/ifc/frame/_XModuleManager.java
index b5d895d..48987e6 100644
--- a/qadevOOo/tests/java/ifc/frame/_XModuleManager.java
+++ b/qadevOOo/tests/java/ifc/frame/_XModuleManager.java
@@ -128,10 +128,8 @@ public class _XModuleManager extends MultiMethodTest {
for (int i = 0 ; i < sequenze.length; i++){
try{
log.println("testing '" + sequenze[i].Name + "'");
- if (oObj.identify(sequenze[i].Value).equals(
- sequenze[i].Name)){
- ok &= ok;
- }else{
+ if (!oObj.identify(sequenze[i].Value).equals(
+ sequenze[i].Name)) {
log.println("failure: returned value: '" +
oObj.identify(sequenze[i].Value) +
"' ,expected value: '" + sequenze[i].Name + "'");
commit 93056481e85548e1228d3b88e53ee59ed983576e
Author: Noel Grandin <noel at peralex.com>
Date: Thu Oct 16 14:44:23 2014 +0200
java: when rethrowing exceptions, store the original
Change-Id: I8a2a264597d0b1ae06b08136fea36003682380b5
diff --git a/bean/com/sun/star/comp/beans/OOoBean.java b/bean/com/sun/star/comp/beans/OOoBean.java
index 4a82c5e..384ad60 100644
--- a/bean/com/sun/star/comp/beans/OOoBean.java
+++ b/bean/com/sun/star/comp/beans/OOoBean.java
@@ -894,28 +894,30 @@ public class OOoBean
NoDocumentException,
java.io.IOException,
com.sun.star.lang.IllegalArgumentException
- {
+ {
// wrap byte arrray into UNO stream
- com.sun.star.lib.uno.adapter.XOutputStreamToByteArrayAdapter aStream =
- new com.sun.star.lib.uno.adapter.XOutputStreamToByteArrayAdapter(
- aOutBuffer );
+ com.sun.star.lib.uno.adapter.XOutputStreamToByteArrayAdapter aStream = new com.sun.star.lib.uno.adapter.XOutputStreamToByteArrayAdapter(
+ aOutBuffer);
// add stream to arguments
- com.sun.star.beans.PropertyValue[] aExtendedArguments =
- addArgument( aArguments, new com.sun.star.beans.PropertyValue(
- "OutputStream", -1, aStream, com.sun.star.beans.PropertyState.DIRECT_VALUE ) );
+ com.sun.star.beans.PropertyValue[] aExtendedArguments = addArgument(
+ aArguments, new com.sun.star.beans.PropertyValue(
+ "OutputStream", -1, aStream,
+ com.sun.star.beans.PropertyState.DIRECT_VALUE));
// call normal store method
- storeToURL( "private:stream", aExtendedArguments );
+ storeToURL("private:stream", aExtendedArguments);
// get byte array from document stream
- try { aStream.closeOutput(); }
- catch ( com.sun.star.io.NotConnectedException aExc )
- { /* TDB */ }
- catch ( com.sun.star.io.BufferSizeExceededException aExc )
- { /* TDB */ }
- catch ( com.sun.star.io.IOException aExc )
- { throw new java.io.IOException(); }
+ try {
+ aStream.closeOutput();
+ } catch (com.sun.star.io.NotConnectedException aExc) { /* TDB */
+ } catch (com.sun.star.io.BufferSizeExceededException aExc) { /* TDB */
+ } catch (com.sun.star.io.IOException ex1) {
+ java.io.IOException ex2 = new java.io.IOException();
+ ex2.initCause(ex1);
+ throw ex2;
+ }
return aStream.getBuffer();
}
diff --git a/qadevOOo/runner/util/BasicMacroTools.java b/qadevOOo/runner/util/BasicMacroTools.java
index 0a2a856..ead35dd 100644
--- a/qadevOOo/runner/util/BasicMacroTools.java
+++ b/qadevOOo/runner/util/BasicMacroTools.java
@@ -109,14 +109,9 @@ public class BasicMacroTools {
private static XURLTransformer makeParser(XMultiServiceFactory mMSF)
throws java.lang.Exception {
- try {
- return UnoRuntime.queryInterface(
- XURLTransformer.class, mMSF.createInstance(
- "com.sun.star.util.URLTransformer"));
- } catch (Exception e) {
- throw new Exception("could not create UTL-Transformer " +
- e.toString());
- }
+ return UnoRuntime.queryInterface(
+ XURLTransformer.class, mMSF.createInstance(
+ "com.sun.star.util.URLTransformer"));
}
public void loadLibrary(String LibraryName, String LibraryURL)
diff --git a/qadevOOo/tests/java/ifc/beans/_XPropertyWithState.java b/qadevOOo/tests/java/ifc/beans/_XPropertyWithState.java
index 6bc506e..9f93e00 100644
--- a/qadevOOo/tests/java/ifc/beans/_XPropertyWithState.java
+++ b/qadevOOo/tests/java/ifc/beans/_XPropertyWithState.java
@@ -56,8 +56,7 @@ public class _XPropertyWithState extends MultiMethodTest {
oObj.getDefaultAsProperty();
} catch (com.sun.star.lang.WrappedTargetException e){
- e.printStackTrace(log);
- throw new StatusException(Status.failed("'com.sun.star.lang.WrappedTargetException' was thrown"));
+ throw new StatusException(e, Status.failed("'com.sun.star.lang.WrappedTargetException' was thrown"));
}
tRes.tested("getDefaultAsProperty()", true);
diff --git a/qadevOOo/tests/java/mod/_dbaccess/TableWindowAccessibility.java b/qadevOOo/tests/java/mod/_dbaccess/TableWindowAccessibility.java
index 17839ab..aaa4303 100644
--- a/qadevOOo/tests/java/mod/_dbaccess/TableWindowAccessibility.java
+++ b/qadevOOo/tests/java/mod/_dbaccess/TableWindowAccessibility.java
@@ -164,8 +164,7 @@ public class TableWindowAccessibility extends TestCase {
store.storeAsURL(aFile,new PropertyValue[]{});
log.println("... done");
} catch (com.sun.star.uno.Exception e) {
- e.printStackTrace(log);
- throw new StatusException(Status.failed("Couldn't register object"));
+ throw new StatusException(e, Status.failed("Couldn't register object"));
}
isolConnection = UnoRuntime.queryInterface(
diff --git a/scripting/java/com/sun/star/script/framework/provider/java/StrictResolver.java b/scripting/java/com/sun/star/script/framework/provider/java/StrictResolver.java
index a7b5802..08d06dce 100644
--- a/scripting/java/com/sun/star/script/framework/provider/java/StrictResolver.java
+++ b/scripting/java/com/sun/star/script/framework/provider/java/StrictResolver.java
@@ -57,14 +57,16 @@ public class StrictResolver implements Resolver {
try {
m = resolveArguments(sd, c);
- } catch (ClassNotFoundException e) {
- throw new NoSuchMethodException(
- "StrictResolver.getProxy: Can't find method: " + sd.getMethodName()
- + ":" + e.getMessage());
- } catch (NoSuchMethodException e) {
- throw new NoSuchMethodException(
- "StrictResolver.getProxy: Can't find method: " + sd.getMethodName()
- + ":" + e.getMessage());
+ } catch (ClassNotFoundException ex1) {
+ NoSuchMethodException ex2 = new NoSuchMethodException(
+ "StrictResolver.getProxy: Can't find method: " + sd.getMethodName());
+ ex2.initCause(ex1);
+ throw ex2;
+ } catch (NoSuchMethodException ex1) {
+ NoSuchMethodException ex2 = new NoSuchMethodException(
+ "StrictResolver.getProxy: Can't find method: " + sd.getMethodName());
+ ex2.initCause(ex1);
+ throw ex2;
}
ScriptProxy sp = new ScriptProxy(m);
@@ -76,12 +78,16 @@ public class StrictResolver implements Resolver {
try {
o = c.newInstance();
- } catch (InstantiationException ie) {
- throw new NoSuchMethodException(
- "getScriptProxy: Can't instantiate: " + c.getName());
- } catch (IllegalAccessException iae) {
- throw new NoSuchMethodException(
- "getScriptProxy: Can't access: " + c.getName());
+ } catch (InstantiationException ex1) {
+ NoSuchMethodException ex2 = new NoSuchMethodException(
+ "getScriptProxy: Can't instantiate: " + c.getName());
+ ex2.initCause(ex1);
+ throw ex2;
+ } catch (IllegalAccessException ex1) {
+ NoSuchMethodException ex2 = new NoSuchMethodException(
+ "getScriptProxy: Can't access: " + c.getName());
+ ex2.initCause(ex1);
+ throw ex2;
}
sp.setTargetObject(o);
commit 03c7c26cbe7d75f103515e62dc39103f11d4637f
Author: Noel Grandin <noel at peralex.com>
Date: Thu Oct 16 13:02:45 2014 +0200
java: final fields that can be static
Change-Id: I8c06be7bc0b8a38c662209f0de72a00550e25447
diff --git a/chart2/qa/TestCaseOldAPI.java b/chart2/qa/TestCaseOldAPI.java
index 849c559..6c1366a 100644
--- a/chart2/qa/TestCaseOldAPI.java
+++ b/chart2/qa/TestCaseOldAPI.java
@@ -45,7 +45,7 @@ import com.sun.star.uno.AnyConverter;
public class TestCaseOldAPI extends ComplexTestCase {
// The name of the tested service
- private final String testedServiceName =
+ private static final String testedServiceName =
"com.sun.star.chart.ChartDocument";
// The first of the mandatory functions:
diff --git a/connectivity/qa/complex/connectivity/dbase/DBaseDateFunctions.java b/connectivity/qa/complex/connectivity/dbase/DBaseDateFunctions.java
index 471cf8a..85975b4 100644
--- a/connectivity/qa/complex/connectivity/dbase/DBaseDateFunctions.java
+++ b/connectivity/qa/complex/connectivity/dbase/DBaseDateFunctions.java
@@ -28,7 +28,7 @@ import complex.connectivity.SubTestCase;
public class DBaseDateFunctions extends SubTestCase
{
- private final String where = "FROM \"biblio\" \"biblio\" where \"Identifier\" = 'BOR00'";
+ private static final String where = "FROM \"biblio\" \"biblio\" where \"Identifier\" = 'BOR00'";
private final XMultiServiceFactory m_xORB;
public DBaseDateFunctions(final XMultiServiceFactory _xORB, final TestCase i_testCase)
diff --git a/connectivity/qa/complex/connectivity/dbase/DBaseNumericFunctions.java b/connectivity/qa/complex/connectivity/dbase/DBaseNumericFunctions.java
index 4006910..218f02b 100644
--- a/connectivity/qa/complex/connectivity/dbase/DBaseNumericFunctions.java
+++ b/connectivity/qa/complex/connectivity/dbase/DBaseNumericFunctions.java
@@ -27,7 +27,7 @@ import complex.connectivity.TestCase;
public class DBaseNumericFunctions extends SubTestCase
{
- private final String where = "FROM \"biblio\" \"biblio\" where \"Identifier\" = 'BOR00'";
+ private static final String where = "FROM \"biblio\" \"biblio\" where \"Identifier\" = 'BOR00'";
private final XMultiServiceFactory m_xORB;
public DBaseNumericFunctions(final XMultiServiceFactory _xORB, final TestCase i_testCase)
diff --git a/extensions/qa/integration/extensions/ObjectInspector.java b/extensions/qa/integration/extensions/ObjectInspector.java
index 197f746..5e34e72 100644
--- a/extensions/qa/integration/extensions/ObjectInspector.java
+++ b/extensions/qa/integration/extensions/ObjectInspector.java
@@ -34,7 +34,7 @@ public class ObjectInspector extends complexlib.ComplexTestCase
private XMultiServiceFactory m_orb;
private Frame m_desktop;
- final private String m_inspectorFrameName = "ObjectInspector";
+ static final private String m_inspectorFrameName = "ObjectInspector";
/* ------------------------------------------------------------------ */
@Override
diff --git a/forms/qa/integration/forms/FormControlTest.java b/forms/qa/integration/forms/FormControlTest.java
index b02dc56..f697bc7 100644
--- a/forms/qa/integration/forms/FormControlTest.java
+++ b/forms/qa/integration/forms/FormControlTest.java
@@ -58,7 +58,7 @@ public class FormControlTest extends complexlib.ComplexTestCase implements XSQLE
private String m_sImageURL;
private SQLErrorEvent m_mostRecentErrorEvent;
- private final String m_dataSourceName = "integration.forms.FormControlTest";
+ private static final String m_dataSourceName = "integration.forms.FormControlTest";
/* ------------------------------------------------------------------ */
@Override
diff --git a/forms/qa/integration/forms/ListBox.java b/forms/qa/integration/forms/ListBox.java
index 96a9d72..fc60b48 100644
--- a/forms/qa/integration/forms/ListBox.java
+++ b/forms/qa/integration/forms/ListBox.java
@@ -44,7 +44,7 @@ import connectivity.tools.sdb.Connection;
public class ListBox extends TestCase
{
HsqlDatabase m_database = null;
- private final String m_foreignKeyTableName = "foreign_keys";
+ private static final String m_foreignKeyTableName = "foreign_keys";
public ListBox()
{
diff --git a/framework/qa/complex/XUserInputInterception/EventTest.java b/framework/qa/complex/XUserInputInterception/EventTest.java
index 24a78cb..350a221 100644
--- a/framework/qa/complex/XUserInputInterception/EventTest.java
+++ b/framework/qa/complex/XUserInputInterception/EventTest.java
@@ -85,7 +85,7 @@ public class EventTest {
* define the miliseconds to wait until a <CODE>EventTrigger</CODE> thread should
* be finished with its work
*/
- final int m_threadWait = 3000;
+ static final int m_threadWait = 3000;
// test environment
diff --git a/javaunohelper/com/sun/star/lib/uno/helper/ComponentBase.java b/javaunohelper/com/sun/star/lib/uno/helper/ComponentBase.java
index 0f222d7..783c1d0 100644
--- a/javaunohelper/com/sun/star/lib/uno/helper/ComponentBase.java
+++ b/javaunohelper/com/sun/star/lib/uno/helper/ComponentBase.java
@@ -27,7 +27,7 @@ import com.sun.star.uno.Type;
*/
public class ComponentBase extends WeakBase implements XComponent
{
- private final boolean DEBUG= false;
+ private static final boolean DEBUG= false;
protected MultiTypeInterfaceContainer listenerContainer;
protected boolean bInDispose= false;
protected boolean bDisposed= false;
diff --git a/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java b/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java
index c867cad..c51475e 100644
--- a/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java
+++ b/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java
@@ -87,7 +87,7 @@ import com.sun.star.uno.UnoRuntime;
*/
public class InterfaceContainer implements Cloneable
{
- final boolean DEBUG= false;
+ static final boolean DEBUG= false;
/**
* The array buffer into which the elements of the ArrayList are stored.
* The capacity of the ArrayList is the length of this array buffer.
diff --git a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/EvolutionarySolverStatusUno.java b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/EvolutionarySolverStatusUno.java
index aa9f46d..024e909 100644
--- a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/EvolutionarySolverStatusUno.java
+++ b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/EvolutionarySolverStatusUno.java
@@ -67,7 +67,7 @@ public class EvolutionarySolverStatusUno extends BaseDialog
private final ResourceManager resourceManager;
- private final int COLOR_RED = 0xFF0000;
+ private static final int COLOR_RED = 0xFF0000;
public EvolutionarySolverStatusUno(XComponentContext xContext) {
super(xContext, "Solver Status", -1, -1, 170, 95); //center the dialog on the parent
diff --git a/odk/examples/DevelopersGuide/Charts/CalcHelper.java b/odk/examples/DevelopersGuide/Charts/CalcHelper.java
index ca9ea94..50364bd 100644
--- a/odk/examples/DevelopersGuide/Charts/CalcHelper.java
+++ b/odk/examples/DevelopersGuide/Charts/CalcHelper.java
@@ -339,8 +339,8 @@ public class CalcHelper
// __________ private members and methods __________
- private final String msDataSheetName = "Data";
- private final String msChartSheetName = "Chart";
+ private static final String msDataSheetName = "Data";
+ private static final String msChartSheetName = "Chart";
private XSpreadsheetDocument maSpreadSheetDoc;
diff --git a/odk/examples/DevelopersGuide/Charts/ChartHelper.java b/odk/examples/DevelopersGuide/Charts/ChartHelper.java
index 19d1ede..043635f 100644
--- a/odk/examples/DevelopersGuide/Charts/ChartHelper.java
+++ b/odk/examples/DevelopersGuide/Charts/ChartHelper.java
@@ -235,7 +235,7 @@ public class ChartHelper
// __________ private members and methods __________
- private final String msChartClassID = "12dcae26-281f-416f-a234-c3086127382e";
+ private static final String msChartClassID = "12dcae26-281f-416f-a234-c3086127382e";
private XModel maContainerDocument;
}
diff --git a/odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java b/odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java
index f814deb..e184400 100644
--- a/odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java
+++ b/odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java
@@ -165,9 +165,9 @@ public class DialogComponent {
"Event Object = " + aEventObject );
}
- private final String aHandlerMethod1 = "doit1";
- private final String aHandlerMethod2 = "doit2";
- private final String aHandlerMethod3 = "doit3";
+ private static final String aHandlerMethod1 = "doit1";
+ private static final String aHandlerMethod2 = "doit2";
+ private static final String aHandlerMethod3 = "doit3";
//XDialogEventHandler
public boolean callHandlerMethod( /*IN*/XDialog xDialog, /*IN*/Object EventObject, /*IN*/String MethodName ) {
diff --git a/odk/examples/DevelopersGuide/OfficeDev/Clipboard/TextTransferable.java b/odk/examples/DevelopersGuide/OfficeDev/Clipboard/TextTransferable.java
index 8ce14f4..f919ff3 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/Clipboard/TextTransferable.java
+++ b/odk/examples/DevelopersGuide/OfficeDev/Clipboard/TextTransferable.java
@@ -81,5 +81,5 @@ public class TextTransferable implements XTransferable
// members
private final String text;
- private final String UNICODE_CONTENT_TYPE = "text/plain;charset=utf-16";
+ private static final String UNICODE_CONTENT_TYPE = "text/plain;charset=utf-16";
}
diff --git a/qadevOOo/tests/java/ifc/document/_XActionLockable.java b/qadevOOo/tests/java/ifc/document/_XActionLockable.java
index f8952ee..8276eb6 100644
--- a/qadevOOo/tests/java/ifc/document/_XActionLockable.java
+++ b/qadevOOo/tests/java/ifc/document/_XActionLockable.java
@@ -82,7 +82,7 @@ public class _XActionLockable extends MultiMethodTest {
tRes.tested("setActionLocks()", true);
}
- final short nLock = 8;
+ static final short nLock = 8;
/**
* Calls the method and checks returned value.<p>
diff --git a/qadevOOo/tests/java/ifc/script/_XEventAttacherManager.java b/qadevOOo/tests/java/ifc/script/_XEventAttacherManager.java
index 63daab6..c6bcbd8 100644
--- a/qadevOOo/tests/java/ifc/script/_XEventAttacherManager.java
+++ b/qadevOOo/tests/java/ifc/script/_XEventAttacherManager.java
@@ -52,7 +52,7 @@ public class _XEventAttacherManager extends MultiMethodTest {
*/
public XEventAttacherManager oObj = null;
- private final int index = 0;
+ private static final int index = 0;
/**
* Test calls the method and stores index of new entry. <p>
diff --git a/qadevOOo/tests/java/ifc/sheet/_XDatabaseRange.java b/qadevOOo/tests/java/ifc/sheet/_XDatabaseRange.java
index f7ea145..d8b0bf6 100644
--- a/qadevOOo/tests/java/ifc/sheet/_XDatabaseRange.java
+++ b/qadevOOo/tests/java/ifc/sheet/_XDatabaseRange.java
@@ -206,9 +206,9 @@ public class _XDatabaseRange extends MultiMethodTest {
oldVal == valBeforeRefresh);
}
- final short COL = 0;
- final short STARTROW = 0;
- final short ENDROW = 5;
+ static final short COL = 0;
+ static final short STARTROW = 0;
+ static final short ENDROW = 5;
/**
* Test creates new cell range address and calls the method. <p>
diff --git a/qadevOOo/tests/java/ifc/sheet/_XViewSplitable.java b/qadevOOo/tests/java/ifc/sheet/_XViewSplitable.java
index 963cbf7..c70719b 100644
--- a/qadevOOo/tests/java/ifc/sheet/_XViewSplitable.java
+++ b/qadevOOo/tests/java/ifc/sheet/_XViewSplitable.java
@@ -38,7 +38,7 @@ import com.sun.star.sheet.XViewSplitable;
public class _XViewSplitable extends MultiMethodTest {
public XViewSplitable oObj = null;
- protected final int posX = 101, posY = 51;
+ protected static final int posX = 101, posY = 51;
/**
* Test just calls the method. <p>
diff --git a/qadevOOo/tests/java/mod/_dbaccess/OQueryDesign.java b/qadevOOo/tests/java/mod/_dbaccess/OQueryDesign.java
index 86eeead..d3cfde8 100644
--- a/qadevOOo/tests/java/mod/_dbaccess/OQueryDesign.java
+++ b/qadevOOo/tests/java/mod/_dbaccess/OQueryDesign.java
@@ -52,7 +52,7 @@ public class OQueryDesign extends TestCase {
private static XDesktop xDesk;
private static XFrame xFrame;
- private final String sDataSourceName = "Bibliography";
+ private static final String sDataSourceName = "Bibliography";
private static XConnection xConn;
private static XTextDocument xTextDoc;
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/SOFormulaOpCodeMapper.java b/reportbuilder/java/org/libreoffice/report/pentaho/SOFormulaOpCodeMapper.java
index ff0aca9..977c96e 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/SOFormulaOpCodeMapper.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/SOFormulaOpCodeMapper.java
@@ -34,8 +34,8 @@ public final class SOFormulaOpCodeMapper extends WeakBase
private static final String __serviceName = "org.libreoffice.report.pentaho.SOFormulaOpCodeMapper";
private final SOFormulaParser parser;
// attributes
- final private int m_OpCodeExternal = 0;
- final private int m_OpCodeUnknown = 0;
+ static final private int m_OpCodeExternal = 0;
+ static final private int m_OpCodeUnknown = 0;
public SOFormulaOpCodeMapper(SOFormulaParser parser)
{
diff --git a/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java b/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
index 514af00..d639e36 100644
--- a/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
+++ b/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
@@ -145,7 +145,7 @@ public class PlainSourceView extends JScrollPane implements
class GlyphGutter extends JComponent {
private PlainSourceView view;
- private final String DUMMY_STRING = "99";
+ private static final String DUMMY_STRING = "99";
GlyphGutter(PlainSourceView view) {
this.view = view;
diff --git a/sot/qa/complex/olesimplestorage/Test01.java b/sot/qa/complex/olesimplestorage/Test01.java
index c4359d7..c07eb22 100644
--- a/sot/qa/complex/olesimplestorage/Test01.java
+++ b/sot/qa/complex/olesimplestorage/Test01.java
@@ -30,8 +30,8 @@ public class Test01 implements OLESimpleStorageTest
{
XMultiServiceFactory m_xMSF = null;
TestHelper m_aTestHelper = null;
- final int pStreamCnt = 5;
- final int pBytesCnt = 10;
+ static final int pStreamCnt = 5;
+ static final int pBytesCnt = 10;
public Test01 ( XMultiServiceFactory xMSF )
{
diff --git a/swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java b/swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java
index aa95ea4..2e262fb 100644
--- a/swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java
+++ b/swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java
@@ -35,7 +35,7 @@ import com.sun.star.uno.XComponentContext;
public class WikiEditSettingDialog extends WikiDialog
{
- private final String sOKMethod = "OK";
+ private static final String sOKMethod = "OK";
private String[] Methods = {sOKMethod };
private Map<String,String> setting;
diff --git a/swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java b/swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java
index a9df952..22d8e3d 100644
--- a/swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java
+++ b/swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java
@@ -29,10 +29,10 @@ public class WikiPropDialog extends WikiDialog{
private WikiEditorImpl m_aWikiEditor;
- private final String sSendMethod = "Send";
- private final String sWikiListMethod = "WikiListChange";
- private final String sArticleTextMethod = "ArticleTextChange";
- private final String sAddWikiMethod = "AddWiki";
+ private static final String sSendMethod = "Send";
+ private static final String sWikiListMethod = "WikiListChange";
+ private static final String sArticleTextMethod = "ArticleTextChange";
+ private static final String sAddWikiMethod = "AddWiki";
private String[] m_pMethods = {sSendMethod, sWikiListMethod, sArticleTextMethod, sAddWikiMethod};
diff --git a/toolkit/test/accessibility/OfficeConnection.java b/toolkit/test/accessibility/OfficeConnection.java
index 51e185c..77b471e 100644
--- a/toolkit/test/accessibility/OfficeConnection.java
+++ b/toolkit/test/accessibility/OfficeConnection.java
@@ -96,7 +96,7 @@ public class OfficeConnection
}
private int mnDefaultPort = 5678;
- private final String msDefaultHost = "localhost";
+ private static final String msDefaultHost = "localhost";
private XMultiServiceFactory maServiceManager = null;
/** A value of true just indicates that it has been tried to establish a connection,
diff --git a/ucb/qa/complex/tdoc/CheckTransientDocumentsDocumentContent.java b/ucb/qa/complex/tdoc/CheckTransientDocumentsDocumentContent.java
index 613469e..4cb92c2 100644
--- a/ucb/qa/complex/tdoc/CheckTransientDocumentsDocumentContent.java
+++ b/ucb/qa/complex/tdoc/CheckTransientDocumentsDocumentContent.java
@@ -51,8 +51,8 @@ import static org.junit.Assert.*;
*/
public class CheckTransientDocumentsDocumentContent {
// TODO: document doesn't exists
- private final String testDocuments = "sForm.sxw";
- private final String folderName = "TestFolder";
+ private static final String testDocuments = "sForm.sxw";
+ private static final String folderName = "TestFolder";
private XMultiServiceFactory xMSF = null;
private XTextDocument xTextDoc = null;
diff --git a/vcl/qa/complex/memCheck/CheckMemoryUsage.java b/vcl/qa/complex/memCheck/CheckMemoryUsage.java
index ad0e249..77d4acf 100644
--- a/vcl/qa/complex/memCheck/CheckMemoryUsage.java
+++ b/vcl/qa/complex/memCheck/CheckMemoryUsage.java
@@ -93,9 +93,9 @@ public class CheckMemoryUsage /* extends ComplexTestCase */
{
- private final String sWriterDoc = "sxw,writer_pdf_Export";
- private final String sCalcDoc = "sxc,calc_pdf_Export";
- private final String sImpressDoc = "sxi,impress_pdf_Export";
+ private static final String sWriterDoc = "sxw,writer_pdf_Export";
+ private static final String sCalcDoc = "sxc,calc_pdf_Export";
+ private static final String sImpressDoc = "sxi,impress_pdf_Export";
TempDir m_aTempDir;
private String[][] sDocTypeExportFilter;
private String[][] sDocuments;
diff --git a/wizards/com/sun/star/wizards/db/TypeInspector.java b/wizards/com/sun/star/wizards/db/TypeInspector.java
index f3ab2dd..336df75 100644
--- a/wizards/com/sun/star/wizards/db/TypeInspector.java
+++ b/wizards/com/sun/star/wizards/db/TypeInspector.java
@@ -46,7 +46,7 @@ public class TypeInspector
{
DataType.INTEGER, DataType.FLOAT, DataType.REAL, DataType.DOUBLE, DataType.NUMERIC, DataType.DECIMAL
};
- final int INVALID = 999999;
+ static final int INVALID = 999999;
XResultSet xResultSet;
public class TypeInfo
diff --git a/wizards/com/sun/star/wizards/document/Control.java b/wizards/com/sun/star/wizards/document/Control.java
index 0403895..e07b784 100644
--- a/wizards/com/sun/star/wizards/document/Control.java
+++ b/wizards/com/sun/star/wizards/document/Control.java
@@ -49,10 +49,10 @@ public class Control extends Shape
GridControl oGridControl;
String sServiceName;
XNamed xNamed;
- final int SOMAXTEXTSIZE = 50;
+ static final int SOMAXTEXTSIZE = 50;
private int icontroltype;
protected XNameContainer xFormName;
- protected final int IIMGFIELDWIDTH = 3000;
+ protected static final int IIMGFIELDWIDTH = 3000;
public Control()
{
diff --git a/wizards/com/sun/star/wizards/document/GridControl.java b/wizards/com/sun/star/wizards/document/GridControl.java
index ab78017..5d25a74 100644
--- a/wizards/com/sun/star/wizards/document/GridControl.java
+++ b/wizards/com/sun/star/wizards/document/GridControl.java
@@ -40,7 +40,7 @@ public class GridControl extends Shape
public XGridColumnFactory xGridColumnFactory;
public XPropertySet xPropertySet;
XNameAccess xNameAccess;
- final String SODEFAULTNAME = "Grid1";
+ static final String SODEFAULTNAME = "Grid1";
XControlModel xControlModel;
public XComponent xComponent;
diff --git a/wizards/com/sun/star/wizards/form/FormDocument.java b/wizards/com/sun/star/wizards/form/FormDocument.java
index 7b133b5..ae59f84 100644
--- a/wizards/com/sun/star/wizards/form/FormDocument.java
+++ b/wizards/com/sun/star/wizards/form/FormDocument.java
@@ -49,7 +49,7 @@ public class FormDocument extends TextDocument
private ViewHandler oViewHandler;
private TextStyleHandler oTextStyleHandler;
private XPropertySet xPropPageStyle;
- private final int SOFORMGAP = 2000;
+ private static final int SOFORMGAP = 2000;
private boolean bhasSubForm;
private UIControlArranger curUIControlArranger;
private StyleApplier curStyleApplier;
diff --git a/wizards/com/sun/star/wizards/form/UIControlArranger.java b/wizards/com/sun/star/wizards/form/UIControlArranger.java
index ffb3cc2..b19c957 100644
--- a/wizards/com/sun/star/wizards/form/UIControlArranger.java
+++ b/wizards/com/sun/star/wizards/form/UIControlArranger.java
@@ -45,9 +45,9 @@ public class UIControlArranger
private String[] HelpTexts = new String[4];
private ArrangeButtonList[] m_aArrangeList = new ArrangeButtonList[2];
private Integer IControlStep;
- private final int SOBASEIMAGEYPOSITION = 66;
- private final int SOIMAGELISTHEIGHT = 60;
- private final String SOALIGNMETHOD = "alignLabelControls";
+ private static final int SOBASEIMAGEYPOSITION = 66;
+ private static final int SOIMAGELISTHEIGHT = 60;
+ private static final String SOALIGNMETHOD = "alignLabelControls";
public UIControlArranger(FormWizard _CurUnoDialog, FormDocument _curFormDocument)
{
diff --git a/wizards/com/sun/star/wizards/query/QuerySummary.java b/wizards/com/sun/star/wizards/query/QuerySummary.java
index 47dc89f..120bef2 100644
--- a/wizards/com/sun/star/wizards/query/QuerySummary.java
+++ b/wizards/com/sun/star/wizards/query/QuerySummary.java
@@ -29,8 +29,8 @@ import com.sun.star.wizards.ui.FilterComponent;
public class QuerySummary extends QueryMetaData
{
- final protected int RID_QUERY = 2300;
- final protected int RID_REPORT = 2400;
+ static final protected int RID_QUERY = 2300;
+ static final protected int RID_REPORT = 2400;
String sSummary;
Resource oResource;
private String sSeparator;
diff --git a/wizards/com/sun/star/wizards/table/CGCategory.java b/wizards/com/sun/star/wizards/table/CGCategory.java
index bdcad65..05d3d6c 100644
--- a/wizards/com/sun/star/wizards/table/CGCategory.java
+++ b/wizards/com/sun/star/wizards/table/CGCategory.java
@@ -32,7 +32,7 @@ public class CGCategory
public String Name;
public int Index;
- private final String CGROOTPATH = "/org.openoffice.Office.TableWizard/TableWizard/";
+ private static final String CGROOTPATH = "/org.openoffice.Office.TableWizard/TableWizard/";
XMultiServiceFactory xMSF;
XNameAccess xNameAccessTablesNode;
XNameAccess xNameAccessCurBusinessNode;
diff --git a/wizards/com/sun/star/wizards/ui/AggregateComponent.java b/wizards/com/sun/star/wizards/ui/AggregateComponent.java
index 31eb46a..308b618 100644
--- a/wizards/com/sun/star/wizards/ui/AggregateComponent.java
+++ b/wizards/com/sun/star/wizards/ui/AggregateComponent.java
@@ -53,9 +53,9 @@ public class AggregateComponent extends ControlScroller
String sDuplicateAggregateFunction;
int Count;
int iQueryType;
- final int SOADDROW = 1;
- final int SOREMOVEROW = 2;
- final int CONTROLROWDIST = 18;
+ static final int SOADDROW = 1;
+ static final int SOREMOVEROW = 2;
+ static final int CONTROLROWDIST = 18;
ArrayList<ControlRow> ControlRowVector;
String OPTIONBUTTONDETAILQUERY_ITEM_CHANGED = "toggleComponent";
String OPTIONBUTTONSUMMARYQUERY_ITEM_CHANGED = "toggleComponent";
diff --git a/wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java b/wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java
index 0131414..355b877 100644
--- a/wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java
+++ b/wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java
@@ -37,7 +37,7 @@ public abstract class DBLimitedFieldSelection
protected Integer ICompPosX;
protected Integer ICompPosY;
protected Integer ICompWidth;
- protected final int rowcount = 4;
+ protected static final int rowcount = 4;
protected final int MAXSELINDEX = rowcount - 1;
protected short curtabindex;
protected int iCurPosY;
diff --git a/wizards/com/sun/star/wizards/ui/FilterComponent.java b/wizards/com/sun/star/wizards/ui/FilterComponent.java
index 0d40397..072cafd 100644
--- a/wizards/com/sun/star/wizards/ui/FilterComponent.java
+++ b/wizards/com/sun/star/wizards/ui/FilterComponent.java
@@ -64,8 +64,8 @@ public class FilterComponent
private String sIncSuffix;
private ControlRow[] oControlRows;
private String sDuplicateCondition;
- final int SOOPTORMODE = 100;
- final int SOOPTANDMODE = 101;
+ static final int SOOPTORMODE = 100;
+ static final int SOOPTANDMODE = 101;
QueryMetaData oQueryMetaData;
int iDateTimeFormat;
int iDateFormat;
@@ -73,41 +73,41 @@ public class FilterComponent
private PropertyValue[][] filterconditions;
private short curtabindex;
XMultiServiceFactory xMSF;
- final int SO_FIRSTFIELDNAME = 1;
- final int SO_SECONDFIELDNAME = 2;
- final int SO_THIRDFIELDNAME = 3;
- final int SO_FOURTHFIELDNAME = 4;
+ static final int SO_FIRSTFIELDNAME = 1;
+ static final int SO_SECONDFIELDNAME = 2;
+ static final int SO_THIRDFIELDNAME = 3;
+ static final int SO_FOURTHFIELDNAME = 4;
int[] SO_FIELDNAMELIST = new int[]
{
SO_FIRSTFIELDNAME, SO_SECONDFIELDNAME, SO_THIRDFIELDNAME, SO_FOURTHFIELDNAME
};
- final int SO_FIRSTCONDITION = 5;
- final int SO_SECONDCONDITION = 6;
- final int SO_THIRDCONDITION = 7;
- final int SO_FOURTHCONDITION = 8;
+ static final int SO_FIRSTCONDITION = 5;
+ static final int SO_SECONDCONDITION = 6;
+ static final int SO_THIRDCONDITION = 7;
+ static final int SO_FOURTHCONDITION = 8;
int[] SO_CONDITIONLIST = new int[]
{
SO_FIRSTCONDITION, SO_SECONDCONDITION, SO_THIRDCONDITION, SO_FOURTHCONDITION
};
- final int SO_FIRSTTEXTFIELD = 1;
- final int SO_SECONDTEXTFIELD = 2;
- final int SO_THIRDTEXTFIELD = 3;
- final int SO_FOURTHTEXTFIELD = 4;
+ static final int SO_FIRSTTEXTFIELD = 1;
+ static final int SO_SECONDTEXTFIELD = 2;
+ static final int SO_THIRDTEXTFIELD = 3;
+ static final int SO_FOURTHTEXTFIELD = 4;
int[] SO_TEXTFIELDLIST = new int[]
{
SO_FIRSTTEXTFIELD, SO_SECONDTEXTFIELD, SO_THIRDTEXTFIELD, SO_FOURTHTEXTFIELD
};
- final int SO_FIRSTBOOLFIELDNAME = 256 + 1;
- final int SO_SECONDBOOLFIELDNAME = 256 + 2;
- final int SO_THIRDBOOLFIELDNAME = 256 + 3;
- final int SO_FOURTHBOOLFIELDNAME = 256 + 4;
+ static final int SO_FIRSTBOOLFIELDNAME = 256 + 1;
+ static final int SO_SECONDBOOLFIELDNAME = 256 + 2;
+ static final int SO_THIRDBOOLFIELDNAME = 256 + 3;
+ static final int SO_FOURTHBOOLFIELDNAME = 256 + 4;
int SO_BOOLEANLIST[] =
{
SO_FIRSTBOOLFIELDNAME, SO_SECONDBOOLFIELDNAME, SO_THIRDBOOLFIELDNAME, SO_FOURTHBOOLFIELDNAME
};
- final int SO_OPTQUERYMODE = 5;
+ static final int SO_OPTQUERYMODE = 5;
int SOI_MATCHALL = 0;
int SOI_MATCHANY = 1;
int curHelpID;
diff --git a/wizards/com/sun/star/wizards/ui/SortingComponent.java b/wizards/com/sun/star/wizards/ui/SortingComponent.java
index 3eea88f..1d8c3c5 100644
--- a/wizards/com/sun/star/wizards/ui/SortingComponent.java
+++ b/wizards/com/sun/star/wizards/ui/SortingComponent.java
@@ -38,11 +38,11 @@ public class SortingComponent
static String[] sSortDescend = new String[4];
static short[] bOldSortValues = new short[4];
public int MAXSORTCRITERIAINDEX = 3;
- final int SOFIRSTSORTLST = 0;
- final int SOSECSORTLST = 1;
- final int SOTHIRDSORTLST = 2;
- final int SOFOURTHSORTLST = 3;
- final int[] SOSORTLST = new int[]
+ static final int SOFIRSTSORTLST = 0;
+ static final int SOSECSORTLST = 1;
+ static final int SOTHIRDSORTLST = 2;
+ static final int SOFOURTHSORTLST = 3;
+ static final int[] SOSORTLST = new int[]
{
SOFIRSTSORTLST, SOSECSORTLST, SOTHIRDSORTLST, SOFOURTHSORTLST
};
diff --git a/wizards/com/sun/star/wizards/ui/TitlesComponent.java b/wizards/com/sun/star/wizards/ui/TitlesComponent.java
index 1cdca6f..14a7815 100644
--- a/wizards/com/sun/star/wizards/ui/TitlesComponent.java
+++ b/wizards/com/sun/star/wizards/ui/TitlesComponent.java
@@ -30,13 +30,13 @@ public class TitlesComponent extends ControlScroller
{
int iLabelPosX;
- final int iRelLabelPosXDist = 6;
+ static final int iRelLabelPosXDist = 6;
public String[] fieldnames;
public Map<String, String> fieldtitleset;
public String[] fieldtitles;
public XTextListener xTextListener;
- final String SOLABELPREFIX = "lblColumnName_";
- final String SOTITLEPREFIX = "lblTitleName_";
+ static final String SOLABELPREFIX = "lblColumnName_";
+ static final String SOTITLEPREFIX = "lblTitleName_";
public TitlesComponent(WizardDialog _CurUnoDialog, int _iStep, int _iCompPosX, int _iCompPosY, int _iCompWidth, int _uitextfieldcount, String _slblColumnNames, String _slblColumnTitles, int _firsthelpindex)
{
commit 12b01b920f42666db84c8be1c9b6fd89a86eea4e
Author: Noel Grandin <noel at peralex.com>
Date: Thu Oct 16 12:51:54 2014 +0200
java: no need to call String.valueOf to append to a String
Change-Id: I5ef45b971d24dde814ab8cbb2e9503d9da4f0d73
diff --git a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
index a2f0db9..da86510 100644
--- a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
+++ b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
@@ -445,7 +445,7 @@ public class LocalOfficeConnection
// empty string as bridge name into createBridge. Then we should always get
// a new bridge. This does not work because of (i51323). Therefore we
// create unique bridge names for the current process.
- String sBridgeName = "OOoBean_private_bridge_" + String.valueOf(m_nBridgeCounter++);
+ String sBridgeName = "OOoBean_private_bridge_" + (m_nBridgeCounter++);
try {
mBridge = xBridgeFactory.createBridge(sBridgeName, protDcp, xConnection, null);
} catch (com.sun.star.bridge.BridgeExistsException e) {
diff --git a/forms/qa/integration/forms/FormControlTest.java b/forms/qa/integration/forms/FormControlTest.java
index b7dacb7..b02dc56 100644
--- a/forms/qa/integration/forms/FormControlTest.java
+++ b/forms/qa/integration/forms/FormControlTest.java
@@ -680,8 +680,8 @@ public class FormControlTest extends complexlib.ComplexTestCase implements XSQLE
if ( currentValue != requiredValue )
{
log.println( "wrong value of the " + fieldName + " field!" );
- log.println( " expected: " + String.valueOf( requiredValue ) );
- log.println( " found : " + String.valueOf( currentValue ) );
+ log.println( " expected: " + requiredValue );
+ log.println( " found : " + currentValue );
}
else
return true;
@@ -704,8 +704,8 @@ public class FormControlTest extends complexlib.ComplexTestCase implements XSQLE
if ( currentValue != requiredValue )
{
log.println( "wrong value of the " + fieldName + " field!" );
- log.println( " expected: " + String.valueOf( requiredValue ) );
- log.println( " found : " + String.valueOf( currentValue ) );
+ log.println( " expected: " + requiredValue );
+ log.println( " found : " + currentValue );
}
else
return true;
@@ -726,8 +726,8 @@ public class FormControlTest extends complexlib.ComplexTestCase implements XSQLE
if ( currentValue != requiredValue )
{
log.println( "wrong value of the " + fieldName + " field!" );
- log.println( " expected: " + String.valueOf( requiredValue ) );
- log.println( " found : " + String.valueOf( currentValue ) );
+ log.println( " expected: " + requiredValue );
+ log.println( " found : " + currentValue );
}
else
return true;
diff --git a/odk/examples/DevelopersGuide/Spreadsheet/ExampleAddIn.java b/odk/examples/DevelopersGuide/Spreadsheet/ExampleAddIn.java
index 109335f..c301157 100644
--- a/odk/examples/DevelopersGuide/Spreadsheet/ExampleAddIn.java
+++ b/odk/examples/DevelopersGuide/Spreadsheet/ExampleAddIn.java
@@ -49,7 +49,7 @@ class ExampleAddInResult implements com.sun.star.sheet.XVolatileResult
{
com.sun.star.sheet.ResultEvent aEvent =
new com.sun.star.sheet.ResultEvent();
- aEvent.Value = aName + " " + String.valueOf( nValue );
+ aEvent.Value = aName + " " + nValue;
aEvent.Source = this;
return aEvent;
}
diff --git a/odk/examples/java/NotesAccess/NotesAccess.java b/odk/examples/java/NotesAccess/NotesAccess.java
index 2bc0a2c..4eb6c91 100644
--- a/odk/examples/java/NotesAccess/NotesAccess.java
+++ b/odk/examples/java/NotesAccess/NotesAccess.java
@@ -222,8 +222,8 @@ public class NotesAccess implements Runnable {
// Inserting the total value.
insertIntoCell(intColumn + 3, intRow, "=B"
- + String.valueOf( intRow + 1 )
- + "*C" + String.valueOf(intRow + 1),
+ + ( intRow + 1 )
+ + "*C" + (intRow + 1),
xSpreadsheet, "");
// Increasing the current row.
@@ -235,8 +235,8 @@ public class NotesAccess implements Runnable {
// Summing all specific amounts.
insertIntoCell(intColumn + 3, intRow, "=sum(D"
- + String.valueOf( intRowToStart + 1 ) + ":D"
- + String.valueOf( intRow ),
+ + ( intRowToStart + 1 ) + ":D"
+ + intRow,
xSpreadsheet, "");
xContext = null;
diff --git a/qadevOOo/runner/convwatch/ConvWatch.java b/qadevOOo/runner/convwatch/ConvWatch.java
index 4d23bae..b1591d4 100644
--- a/qadevOOo/runner/convwatch/ConvWatch.java
+++ b/qadevOOo/runner/convwatch/ConvWatch.java
@@ -217,7 +217,7 @@ public class ConvWatch
boolean bResultIsOk = true; // result over all pages
for (int i=0;i<aList.length; i++)
{
- INIoutput.writeSection("page" + String.valueOf(i + 1)); // list start at point 0, but this is page 1 and so on... current_page = (i + 1)
+ INIoutput.writeSection("page" + (i + 1)); // list start at point 0, but this is page 1 and so on... current_page = (i + 1)
aList[i].printStatus();
boolean bCurrentResult = true; // result over exact one page
@@ -276,7 +276,7 @@ public class ConvWatch
for (int i=0;i<aDiffDiffList.length; i++)
{
- INIoutput.writeSection("page" + String.valueOf(i + 1)); // list start at point 0, but this is page 1 and so on... current_page = (i + 1)
+ INIoutput.writeSection("page" + (i + 1)); // list start at point 0, but this is page 1 and so on... current_page = (i + 1)
boolean bCurrentResult = (aDiffDiffList[i].nDiffStatus == StatusHelper.DIFF_NO_DIFFERENCES); // logic: nDiff==0 = true if there is no difference
INIoutput.checkDiffDiffLine(aDiffDiffList[i], bCurrentResult);
diff --git a/qadevOOo/runner/convwatch/INIOutputter.java b/qadevOOo/runner/convwatch/INIOutputter.java
index 3c9745f..416519b 100644
--- a/qadevOOo/runner/convwatch/INIOutputter.java
+++ b/qadevOOo/runner/convwatch/INIOutputter.java
@@ -120,7 +120,7 @@ public class INIOutputter
m_aOut.write( "newgfx=" + _aStatus.m_sNewGfx + ls);
m_aOut.write( "diffgfx=" + _aStatus.m_sDiffGfx + ls);
- String sPercent = String.valueOf(_aStatus.nPercent) + "%";
+ String sPercent = _aStatus.nPercent + "%";
if (_aStatus.nPercent > 0 && _aStatus.nPercent < 5)
{
sPercent += " (less 5% is ok)";
@@ -138,7 +138,7 @@ public class INIOutputter
m_aOut.write( "new_BM_gfx=" + _aStatus.m_sNew_BM_Gfx + ls);
m_aOut.write( "diff_BM_gfx=" + _aStatus.m_sDiff_BM_Gfx + ls);
- String sPercent2 = String.valueOf(_aStatus.nPercent2) + "%";
+ String sPercent2 = _aStatus.nPercent2 + "%";
if (_aStatus.nPercent2 > 0 && _aStatus.nPercent2 < 5)
{
sPercent2 += " (less 5% is ok)";
@@ -175,7 +175,7 @@ public class INIOutputter
m_aOut.write( "newgfx=" + _aStatus.m_sNewGfx + ls);
m_aOut.write( "diffgfx=" + _aStatus.m_sDiffGfx + ls);
- String sPercent = String.valueOf(_aStatus.nPercent) + "%";
+ String sPercent = _aStatus.nPercent + "%";
m_aOut.write("percent=" + sPercent + ls);
// is the check positiv, in a defined range
diff --git a/qadevOOo/runner/convwatch/OfficePrint.java b/qadevOOo/runner/convwatch/OfficePrint.java
index 4326200..ada4cb9 100644
--- a/qadevOOo/runner/convwatch/OfficePrint.java
+++ b/qadevOOo/runner/convwatch/OfficePrint.java
@@ -545,7 +545,7 @@ public class OfficePrint {
String sPages = "";
if (_aGTA.getMaxPages() > 0)
{
- sPages = "1-" + String.valueOf(_aGTA.getMaxPages());
+ sPages = "1-" + _aGTA.getMaxPages();
}
if (_aGTA.getOnlyPages().length() != 0)
{
diff --git a/qadevOOo/runner/convwatch/PRNCompare.java b/qadevOOo/runner/convwatch/PRNCompare.java
index 049c7e2..bc54275 100644
--- a/qadevOOo/runner/convwatch/PRNCompare.java
+++ b/qadevOOo/runner/convwatch/PRNCompare.java
@@ -167,7 +167,7 @@ public class PRNCompare
"-dNOPROMPT",
"-dBATCH",
"-sDEVICE=jpeg",
- "-r" + String.valueOf(_nResolutionInDPI),
+ "-r" + _nResolutionInDPI,
"-dNOPAUSE",
"-sOutputFile=" + sJPGFilename,
sOriginalFile
@@ -497,7 +497,7 @@ public class PRNCompare
}
int nPercent = Math.abs(nNotBlackCount_DiffGraphic * 100 / nMinNotWhiteCount);
- GlobalLogWriter.get().println( "Graphics check, pixel based:" + String.valueOf(nPercent) + "% pixel differ ");
+ GlobalLogWriter.get().println( "Graphics check, pixel based:" + nPercent + "% pixel differ ");
return nPercent;
}
diff --git a/qadevOOo/runner/convwatch/PerformanceContainer.java b/qadevOOo/runner/convwatch/PerformanceContainer.java
index f9747fc..81cbb95 100644
--- a/qadevOOo/runner/convwatch/PerformanceContainer.java
+++ b/qadevOOo/runner/convwatch/PerformanceContainer.java
@@ -107,11 +107,11 @@ public class PerformanceContainer /* extends *//* implements */ {
{
String ls = System.getProperty("line.separator");
- out.write("loadtime=" + String.valueOf(m_nTime[ Load ]) + ls);
- out.write("storetime=" + String.valueOf(m_nTime[ Store ]) + ls);
- out.write("printtime=" + String.valueOf(m_nTime[ Print ]) + ls);
- out.write("officestarttime=" + String.valueOf(m_nTime[ OfficeStart ]) + ls);
- out.write("storeaspdftime=" + String.valueOf(m_nTime[ StoreAsPDF ]) + ls);
+ out.write("loadtime=" + (m_nTime[ Load ]) + ls);
+ out.write("storetime=" + (m_nTime[ Store ]) + ls);
+ out.write("printtime=" + (m_nTime[ Print ]) + ls);
+ out.write("officestarttime=" + (m_nTime[ OfficeStart ]) + ls);
+ out.write("storeaspdftime=" + (m_nTime[ StoreAsPDF ]) + ls);
}
private static double stringToDouble(String _sStr)
diff --git a/qadevOOo/runner/convwatch/StatusHelper.java b/qadevOOo/runner/convwatch/StatusHelper.java
index 939a64a..ea3241f 100644
--- a/qadevOOo/runner/convwatch/StatusHelper.java
+++ b/qadevOOo/runner/convwatch/StatusHelper.java
@@ -69,7 +69,7 @@ public class StatusHelper
}
else if (nDiffStatus == DIFF_DIFFERENCES_FOUND)
{
- GlobalLogWriter.get().println("Files differ by " + String.valueOf(nPercent) + "%");
+ GlobalLogWriter.get().println("Files differ by " + nPercent + "%");
}
else if (nDiffStatus == DIFF_AFTER_MOVE_DONE_NO_PROBLEMS)
{
@@ -77,7 +77,7 @@ public class StatusHelper
}
else if (nDiffStatus == DIFF_AFTER_MOVE_DONE_DIFFERENCES_FOUND)
{
- GlobalLogWriter.get().println("A picture move is done, the files differ by " + String.valueOf(nPercent2) + " old was " + String.valueOf(nPercent) + "%");
+ GlobalLogWriter.get().println("A picture move is done, the files differ by " + nPercent2 + " old was " + nPercent + "%");
}
else
{
diff --git a/qadevOOo/runner/convwatch/TimeHelper.java b/qadevOOo/runner/convwatch/TimeHelper.java
index 92f8033..abb68b7 100644
--- a/qadevOOo/runner/convwatch/TimeHelper.java
+++ b/qadevOOo/runner/convwatch/TimeHelper.java
@@ -27,7 +27,7 @@ public class TimeHelper
*/
static void waitInSeconds(int _nSeconds, String _sReason)
{
- GlobalLogWriter.get().println("Wait " + String.valueOf(_nSeconds) + " sec. Reason: " + _sReason);
+ GlobalLogWriter.get().println("Wait " + _nSeconds + " sec. Reason: " + _sReason);
try {
java.lang.Thread.sleep(_nSeconds * 1000);
} catch (InterruptedException e2) {}
diff --git a/qadevOOo/runner/graphical/JPEGComparator.java b/qadevOOo/runner/graphical/JPEGComparator.java
index 67267c9..f793b52 100644
--- a/qadevOOo/runner/graphical/JPEGComparator.java
+++ b/qadevOOo/runner/graphical/JPEGComparator.java
@@ -243,7 +243,7 @@ public class JPEGComparator extends EnhancedComplexTestCase
int nPages = aResultIniFile.getIntValue("global", "pages", 0);
for (int i = 0; i < nPages; i++)
{
- String sCurrentPage = "page" + String.valueOf(i + 1);
+ String sCurrentPage = "page" + (i + 1);
int nPercent = aResultIniFile.getIntValue(sCurrentPage, "percent", -1);
if (nPercent == 0)
{
@@ -484,7 +484,7 @@ public class JPEGComparator extends EnhancedComplexTestCase
aResultIni.insertValue("global", "dpi", aNameDPIPage.DPI);
// write down flags for each page
- String sSection = "page" + String.valueOf(nPage);
+ String sSection = "page" + nPage;
aResultIni.insertValue(sSection, "oldgfx", sSource);
aResultIni.insertValue(sSection, "newgfx", sDestination);
@@ -548,7 +548,7 @@ public class JPEGComparator extends EnhancedComplexTestCase
}
int nPercent = Math.abs(nNotBlackCount_DiffGraphic * 100 / nMinNotWhiteCount);
- GlobalLogWriter.println("Graphics check, pixel based:" + String.valueOf(nPercent) + "% pixel differ ");
+ GlobalLogWriter.println("Graphics check, pixel based:" + nPercent + "% pixel differ ");
return nPercent;
}
diff --git a/qadevOOo/runner/graphical/JPEGCreator.java b/qadevOOo/runner/graphical/JPEGCreator.java
index c33b096..b9570e9 100644
--- a/qadevOOo/runner/graphical/JPEGCreator.java
+++ b/qadevOOo/runner/graphical/JPEGCreator.java
@@ -237,7 +237,7 @@ private static void convertToWidth340(String _sFrom, String _To)
private String getJPEGName(String _sOutputPath, String _sBasename, int _nResolutionInDPI, String _sGS_PageOutput)
{
- String sName = _sBasename + "_" + String.valueOf(_nResolutionInDPI) + "DPI_" + _sGS_PageOutput + ".jpg";
+ String sName = _sBasename + "_" + _nResolutionInDPI + "DPI_" + _sGS_PageOutput + ".jpg";
String sJPEGName = FileHelper.appendPath(_sOutputPath, sName);
return sJPEGName;
}
@@ -281,7 +281,7 @@ private static void convertToWidth340(String _sFrom, String _To)
"-dNOPROMPT",
"-dBATCH",
"-sDEVICE=jpeg",
- "-r" + String.valueOf(_nResolutionInDPI),
+ "-r" + _nResolutionInDPI,
"-dNOPAUSE",
"-sOutputFile=" + sJPEGNameSchema,
sPostscriptOrPDFFile
diff --git a/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java b/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java
index 0e827b3..cd0dde4 100644
--- a/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java
+++ b/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java
@@ -495,7 +495,7 @@ public class OpenOfficePostscriptCreator implements IOffice
String sPages = "";
if (_aGTA.getMaxPages() > 0)
{
- sPages = "1-" + String.valueOf(_aGTA.getMaxPages());
+ sPages = "1-" + _aGTA.getMaxPages();
}
if (_aGTA.getOnlyPages().length() != 0)
{
diff --git a/qadevOOo/runner/graphical/PerformanceContainer.java b/qadevOOo/runner/graphical/PerformanceContainer.java
index e21f684..abb5eb9 100644
--- a/qadevOOo/runner/graphical/PerformanceContainer.java
+++ b/qadevOOo/runner/graphical/PerformanceContainer.java
@@ -110,13 +110,13 @@ public class PerformanceContainer /* extends *//* implements */ {
public void print(PrintStream out)
{
- out.println("loadtime=" + String.valueOf(m_nTime[ Load ]));
- out.println("storetime=" + String.valueOf(m_nTime[ Store ]));
- out.println("printtime=" + String.valueOf(m_nTime[ Print ]));
- out.println("officestarttime=" + String.valueOf(m_nTime[ OfficeStart ]));
- out.println("officestoptime=" + String.valueOf(m_nTime[ OfficeStop ]));
- out.println("storeaspdftime=" + String.valueOf(m_nTime[ StoreAsPDF ]));
- out.println("alltime=" + String.valueOf(m_nTime[ AllTime ]));
+ out.println("loadtime=" + m_nTime[ Load ]);
+ out.println("storetime=" + m_nTime[ Store ]);
+ out.println("printtime=" + m_nTime[ Print ]);
+ out.println("officestarttime=" + m_nTime[ OfficeStart ]);
+ out.println("officestoptime=" + m_nTime[ OfficeStop ]);
+ out.println("storeaspdftime=" + m_nTime[ StoreAsPDF ]);
+ out.println("alltime=" + m_nTime[ AllTime ]);
}
public void print(IniFile _aIniFile, String _sSection)
diff --git a/qadevOOo/runner/graphical/TimeHelper.java b/qadevOOo/runner/graphical/TimeHelper.java
index 4d7e826..6b885bb 100644
--- a/qadevOOo/runner/graphical/TimeHelper.java
+++ b/qadevOOo/runner/graphical/TimeHelper.java
@@ -29,7 +29,7 @@ public class TimeHelper
*/
static void waitInSeconds(int _nSeconds, String _sReason)
{
- GlobalLogWriter.println("Wait 0.25 * " + String.valueOf(_nSeconds) + " sec. Reason: " + _sReason);
+ GlobalLogWriter.println("Wait 0.25 * " + _nSeconds + " sec. Reason: " + _sReason);
try {
java.lang.Thread.sleep(_nSeconds * 250);
} catch (InterruptedException e2) {}
diff --git a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLStylesImporter.java b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLStylesImporter.java
index deab847..59c6370 100644
--- a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLStylesImporter.java
+++ b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLStylesImporter.java
@@ -174,7 +174,7 @@ public class XMLStylesImporter extends TestCase {
boolean hasStyle =
StyleFamilyName.hasByName(impStyleName);
logF.println("Does style with name '" + impStyleName
- + "' exist? " + String.valueOf(hasStyle) );
+ + "' exist? " + hasStyle );
return hasStyle;
} catch (com.sun.star.uno.Exception e) {
logF.println("Exception while checking import :") ;
diff --git a/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java b/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java
index 881ae81..a27b5e9 100644
--- a/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java
+++ b/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java
@@ -241,8 +241,7 @@ class ScriptImpl implements XScript {
Class<?> c = scriptLoader.loadClass(className);
long end = new java.util.Date().getTime();
- LogUtils.DEBUG("loadClass took: " + String.valueOf(end - start)
- + "milliseconds");
+ LogUtils.DEBUG("loadClass took: " + (end - start) + "milliseconds");
try {
LogUtils.DEBUG("class loaded ... ");
@@ -272,8 +271,7 @@ class ScriptImpl implements XScript {
long start = new java.util.Date().getTime();
result = script.invoke(invocationArgs);
long end = new java.util.Date().getTime();
- LogUtils.DEBUG("invoke took: " + String.valueOf(end - start)
- + "milliseconds");
+ LogUtils.DEBUG("invoke took: " + (end - start) + "milliseconds");
} catch (java.lang.IllegalArgumentException iae) {
ScriptFrameworkErrorException e2 = new ScriptFrameworkErrorException(
iae.getMessage(), null, metaData.getLanguageName(),
diff --git a/sw/qa/complex/writer/TextPortionEnumerationTest.java b/sw/qa/complex/writer/TextPortionEnumerationTest.java
index dc6cf15..4e62d33 100644
--- a/sw/qa/complex/writer/TextPortionEnumerationTest.java
+++ b/sw/qa/complex/writer/TextPortionEnumerationTest.java
@@ -4107,7 +4107,7 @@ public class TextPortionEnumerationTest
private String mkName(String prefix)
{
- return prefix + String.valueOf(m_Count++);
+ return prefix + (m_Count++);
}
private StringPair mkId(String prefix)
diff --git a/wizards/com/sun/star/wizards/common/Resource.java b/wizards/com/sun/star/wizards/common/Resource.java
index 9f8f6da..657e750 100644
--- a/wizards/com/sun/star/wizards/common/Resource.java
+++ b/wizards/com/sun/star/wizards/common/Resource.java
@@ -79,7 +79,7 @@ public class Resource
}
catch (Exception exception)
{
- throw new java.lang.IllegalArgumentException("Resource with ID not " + String.valueOf(nID) + "not found", exception);
+ throw new java.lang.IllegalArgumentException("Resource with ID not " + nID + "not found", exception);
}
}
@@ -91,7 +91,7 @@ public class Resource
}
catch (Exception exception)
{
- throw new java.lang.IllegalArgumentException("Resource with ID not " + String.valueOf(nID) + "not found", exception);
+ throw new java.lang.IllegalArgumentException("Resource with ID not " + nID + "not found", exception);
}
}
@@ -108,7 +108,7 @@ public class Resource
}
catch (Exception exception)
{
- throw new java.lang.IllegalArgumentException("Resource with ID not" + String.valueOf(nID) + "not found", exception);
+ throw new java.lang.IllegalArgumentException("Resource with ID not" + nID + "not found", exception);
}
}
diff --git a/wizards/com/sun/star/wizards/db/SQLQueryComposer.java b/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
index 7fe8530..de25e25 100644
--- a/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
+++ b/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
@@ -389,7 +389,7 @@ public class SQLQueryComposer
if (bAliasNameexists)
{
a++;
- locAliasName = _TableName + "_" + String.valueOf(a);
+ locAliasName = _TableName + "_" + a;
}
else
{
diff --git a/wizards/com/sun/star/wizards/ui/AggregateComponent.java b/wizards/com/sun/star/wizards/ui/AggregateComponent.java
index ed05e94..31eb46a 100644
--- a/wizards/com/sun/star/wizards/ui/AggregateComponent.java
+++ b/wizards/com/sun/star/wizards/ui/AggregateComponent.java
@@ -480,13 +480,13 @@ public class AggregateComponent extends ControlScroller
private String getFunctionControlName(int _index)
{
- String namesuffix = "_" + String.valueOf(_index + 1);
+ String namesuffix = "_" + (_index + 1);
return "lstfunctions" + namesuffix;
}
private String getFieldsControlName(int _index)
{
- String namesuffix = "_" + String.valueOf(_index + 1);
+ String namesuffix = "_" + (_index + 1);
return "lstFieldnames" + namesuffix;
}
diff --git a/wizards/com/sun/star/wizards/ui/FilterComponent.java b/wizards/com/sun/star/wizards/ui/FilterComponent.java
index 000e196..0d40397 100644
--- a/wizards/com/sun/star/wizards/ui/FilterComponent.java
+++ b/wizards/com/sun/star/wizards/ui/FilterComponent.java
@@ -536,7 +536,7 @@ public class FilterComponent
try
{
- String sCompSuffix = sIncSuffix + "_" + String.valueOf(Index + 1);
+ String sCompSuffix = sIncSuffix + "_" + (Index + 1);
m_bEnabled = _bEnabled;
// Label Field
diff --git a/wizards/com/sun/star/wizards/ui/WizardDialog.java b/wizards/com/sun/star/wizards/ui/WizardDialog.java
index 9a382a1..5d62924 100644
--- a/wizards/com/sun/star/wizards/ui/WizardDialog.java
+++ b/wizards/com/sun/star/wizards/ui/WizardDialog.java
@@ -700,7 +700,7 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL
for (int i = 0; i < sRightPaneHeaders.length; i++)
{
- insertLabel("lblQueryTitle" + String.valueOf(i),
+ insertLabel("lblQueryTitle" + i,
new String[]
{
PropertyNames.FONT_DESCRIPTOR, PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_MULTILINE, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH
More information about the Libreoffice-commits
mailing list