mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

java: final fields that can be static

Browse Source 
Change-Id: I8c06be7bc0b8a38c662209f0de72a00550e25447
This commit is contained in:
Noel Grandin 2014-10-16 13:02:45 +02:00
parent 12b01b920f
commit 03c7c26cbe
39 changed files with 82 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
chart2/qa/TestCaseOldAPI.java
View File

@ -45,7 +45,7 @@ import com.sun.star.uno.AnyConverter;
public class TestCaseOldAPI extends ComplexTestCase { public class TestCaseOldAPI extends ComplexTestCase {
// The name of the tested service // The name of the tested service
private final String testedServiceName = private static final String testedServiceName =
"com.sun.star.chart.ChartDocument"; "com.sun.star.chart.ChartDocument";
// The first of the mandatory functions: // The first of the mandatory functions:

2
connectivity/qa/complex/connectivity/dbase/DBaseDateFunctions.java
View File

@ -28,7 +28,7 @@ import complex.connectivity.SubTestCase;
public class DBaseDateFunctions extends 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; private final XMultiServiceFactory m_xORB;
public DBaseDateFunctions(final XMultiServiceFactory _xORB, final TestCase i_testCase) public DBaseDateFunctions(final XMultiServiceFactory _xORB, final TestCase i_testCase)

2
connectivity/qa/complex/connectivity/dbase/DBaseNumericFunctions.java
View File

@ -27,7 +27,7 @@ import complex.connectivity.TestCase;
public class DBaseNumericFunctions extends SubTestCase 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; private final XMultiServiceFactory m_xORB;
public DBaseNumericFunctions(final XMultiServiceFactory _xORB, final TestCase i_testCase) public DBaseNumericFunctions(final XMultiServiceFactory _xORB, final TestCase i_testCase)

2
extensions/qa/integration/extensions/ObjectInspector.java
View File

@ -34,7 +34,7 @@ public class ObjectInspector extends complexlib.ComplexTestCase
private XMultiServiceFactory m_orb; private XMultiServiceFactory m_orb;
private Frame m_desktop; private Frame m_desktop;
final private String m_inspectorFrameName = "ObjectInspector"; static final private String m_inspectorFrameName = "ObjectInspector";
/* ------------------------------------------------------------------ */ /* ------------------------------------------------------------------ */
@Override @Override

2
forms/qa/integration/forms/FormControlTest.java
View File

@ -58,7 +58,7 @@ public class FormControlTest extends complexlib.ComplexTestCase implements XSQLE
private String m_sImageURL; private String m_sImageURL;
private SQLErrorEvent m_mostRecentErrorEvent; private SQLErrorEvent m_mostRecentErrorEvent;
private final String m_dataSourceName = "integration.forms.FormControlTest"; private static final String m_dataSourceName = "integration.forms.FormControlTest";
/* ------------------------------------------------------------------ */ /* ------------------------------------------------------------------ */
@Override @Override

2
forms/qa/integration/forms/ListBox.java
View File

@ -44,7 +44,7 @@ import connectivity.tools.sdb.Connection;
public class ListBox extends TestCase public class ListBox extends TestCase
{ {
HsqlDatabase m_database = null; HsqlDatabase m_database = null;
private final String m_foreignKeyTableName = "foreign_keys"; private static final String m_foreignKeyTableName = "foreign_keys";
public ListBox() public ListBox()
{ {

2
framework/qa/complex/XUserInputInterception/EventTest.java
View File

@ -85,7 +85,7 @@ public class EventTest {
* define the miliseconds to wait until a <CODE>EventTrigger</CODE> thread should * define the miliseconds to wait until a <CODE>EventTrigger</CODE> thread should
* be finished with its work * be finished with its work
*/ */
final int m_threadWait = 3000; static final int m_threadWait = 3000;
// test environment // test environment

2
javaunohelper/com/sun/star/lib/uno/helper/ComponentBase.java
View File

@ -27,7 +27,7 @@ import com.sun.star.uno.Type;
*/ */
public class ComponentBase extends WeakBase implements XComponent public class ComponentBase extends WeakBase implements XComponent
{ {
private final boolean DEBUG= false; private static final boolean DEBUG= false;
protected MultiTypeInterfaceContainer listenerContainer; protected MultiTypeInterfaceContainer listenerContainer;
protected boolean bInDispose= false; protected boolean bInDispose= false;
protected boolean bDisposed= false; protected boolean bDisposed= false;

2
javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java
View File

@ -87,7 +87,7 @@ import com.sun.star.uno.UnoRuntime;
*/ */
public class InterfaceContainer implements Cloneable 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 array buffer into which the elements of the ArrayList are stored.
* The capacity of the ArrayList is the length of this array buffer. * The capacity of the ArrayList is the length of this array buffer.

2
nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/EvolutionarySolverStatusUno.java
View File

@ -67,7 +67,7 @@ public class EvolutionarySolverStatusUno extends BaseDialog
private final ResourceManager resourceManager; private final ResourceManager resourceManager;
private final int COLOR_RED = 0xFF0000; private static final int COLOR_RED = 0xFF0000;
public EvolutionarySolverStatusUno(XComponentContext xContext) { public EvolutionarySolverStatusUno(XComponentContext xContext) {
super(xContext, "Solver Status", -1, -1, 170, 95); //center the dialog on the parent super(xContext, "Solver Status", -1, -1, 170, 95); //center the dialog on the parent

4
odk/examples/DevelopersGuide/Charts/CalcHelper.java
View File

@ -339,8 +339,8 @@ public class CalcHelper
// __________ private members and methods __________ // __________ private members and methods __________
private final String msDataSheetName = "Data"; private static final String msDataSheetName = "Data";
private final String msChartSheetName = "Chart"; private static final String msChartSheetName = "Chart";
private XSpreadsheetDocument maSpreadSheetDoc; private XSpreadsheetDocument maSpreadSheetDoc;

2
odk/examples/DevelopersGuide/Charts/ChartHelper.java
View File

@ -235,7 +235,7 @@ public class ChartHelper
// __________ private members and methods __________ // __________ 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; private XModel maContainerDocument;
} }

6
odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java
View File

@ -165,9 +165,9 @@ public class DialogComponent {
"Event Object = " + aEventObject ); "Event Object = " + aEventObject );
} }
private final String aHandlerMethod1 = "doit1"; private static final String aHandlerMethod1 = "doit1";
private final String aHandlerMethod2 = "doit2"; private static final String aHandlerMethod2 = "doit2";
private final String aHandlerMethod3 = "doit3"; private static final String aHandlerMethod3 = "doit3";
//XDialogEventHandler //XDialogEventHandler
public boolean callHandlerMethod( /*IN*/XDialog xDialog, /*IN*/Object EventObject, /*IN*/String MethodName ) { public boolean callHandlerMethod( /*IN*/XDialog xDialog, /*IN*/Object EventObject, /*IN*/String MethodName ) {

2
odk/examples/DevelopersGuide/OfficeDev/Clipboard/TextTransferable.java
View File

@ -81,5 +81,5 @@ public class TextTransferable implements XTransferable
// members // members
private final String text; 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";
} }

2
qadevOOo/tests/java/ifc/document/_XActionLockable.java
View File

@ -82,7 +82,7 @@ public class _XActionLockable extends MultiMethodTest {
tRes.tested("setActionLocks()", true); tRes.tested("setActionLocks()", true);
} }
final short nLock = 8; static final short nLock = 8;
/** /**
* Calls the method and checks returned value.<p> * Calls the method and checks returned value.<p>

2
qadevOOo/tests/java/ifc/script/_XEventAttacherManager.java
View File

@ -52,7 +52,7 @@ public class _XEventAttacherManager extends MultiMethodTest {
*/ */
public XEventAttacherManager oObj = null; 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> * Test calls the method and stores index of new entry. <p>

6
qadevOOo/tests/java/ifc/sheet/_XDatabaseRange.java
View File

@ -206,9 +206,9 @@ public class _XDatabaseRange extends MultiMethodTest {
oldVal == valBeforeRefresh); oldVal == valBeforeRefresh);
} }
final short COL = 0; static final short COL = 0;
final short STARTROW = 0; static final short STARTROW = 0;
final short ENDROW = 5; static final short ENDROW = 5;
/** /**
* Test creates new cell range address and calls the method. <p> * Test creates new cell range address and calls the method. <p>

2
qadevOOo/tests/java/ifc/sheet/_XViewSplitable.java
View File

@ -38,7 +38,7 @@ import com.sun.star.sheet.XViewSplitable;
public class _XViewSplitable extends MultiMethodTest { public class _XViewSplitable extends MultiMethodTest {
public XViewSplitable oObj = null; 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> * Test just calls the method. <p>

2
qadevOOo/tests/java/mod/_dbaccess/OQueryDesign.java
View File

@ -52,7 +52,7 @@ public class OQueryDesign extends TestCase {
private static XDesktop xDesk; private static XDesktop xDesk;
private static XFrame xFrame; private static XFrame xFrame;
private final String sDataSourceName = "Bibliography"; private static final String sDataSourceName = "Bibliography";
private static XConnection xConn; private static XConnection xConn;
private static XTextDocument xTextDoc; private static XTextDocument xTextDoc;

4
reportbuilder/java/org/libreoffice/report/pentaho/SOFormulaOpCodeMapper.java
View File

@ -34,8 +34,8 @@ public final class SOFormulaOpCodeMapper extends WeakBase
private static final String __serviceName = "org.libreoffice.report.pentaho.SOFormulaOpCodeMapper"; private static final String __serviceName = "org.libreoffice.report.pentaho.SOFormulaOpCodeMapper";
private final SOFormulaParser parser; private final SOFormulaParser parser;
// attributes // attributes
final private int m_OpCodeExternal = 0; static final private int m_OpCodeExternal = 0;
final private int m_OpCodeUnknown = 0; static final private int m_OpCodeUnknown = 0;
public SOFormulaOpCodeMapper(SOFormulaParser parser) public SOFormulaOpCodeMapper(SOFormulaParser parser)
{ {

2
scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
View File

@ -145,7 +145,7 @@ public class PlainSourceView extends JScrollPane implements
class GlyphGutter extends JComponent { class GlyphGutter extends JComponent {
private PlainSourceView view; private PlainSourceView view;
private final String DUMMY_STRING = "99"; private static final String DUMMY_STRING = "99";
GlyphGutter(PlainSourceView view) { GlyphGutter(PlainSourceView view) {
this.view = view; this.view = view;

4
sot/qa/complex/olesimplestorage/Test01.java
View File

@ -30,8 +30,8 @@ public class Test01 implements OLESimpleStorageTest
{ {
XMultiServiceFactory m_xMSF = null; XMultiServiceFactory m_xMSF = null;
TestHelper m_aTestHelper = null; TestHelper m_aTestHelper = null;
final int pStreamCnt = 5; static final int pStreamCnt = 5;
final int pBytesCnt = 10; static final int pBytesCnt = 10;
public Test01 ( XMultiServiceFactory xMSF ) public Test01 ( XMultiServiceFactory xMSF )
{ {

2
swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java
View File

@ -35,7 +35,7 @@ import com.sun.star.uno.XComponentContext;
public class WikiEditSettingDialog extends WikiDialog public class WikiEditSettingDialog extends WikiDialog
{ {
private final String sOKMethod = "OK"; private static final String sOKMethod = "OK";
private String[] Methods = {sOKMethod }; private String[] Methods = {sOKMethod };
private Map<String,String> setting; private Map<String,String> setting;

8
swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java
View File

@ -29,10 +29,10 @@ public class WikiPropDialog extends WikiDialog{
private WikiEditorImpl m_aWikiEditor; private WikiEditorImpl m_aWikiEditor;
private final String sSendMethod = "Send"; private static final String sSendMethod = "Send";
private final String sWikiListMethod = "WikiListChange"; private static final String sWikiListMethod = "WikiListChange";
private final String sArticleTextMethod = "ArticleTextChange"; private static final String sArticleTextMethod = "ArticleTextChange";
private final String sAddWikiMethod = "AddWiki"; private static final String sAddWikiMethod = "AddWiki";
private String[] m_pMethods = {sSendMethod, sWikiListMethod, sArticleTextMethod, sAddWikiMethod}; private String[] m_pMethods = {sSendMethod, sWikiListMethod, sArticleTextMethod, sAddWikiMethod};

2
toolkit/test/accessibility/OfficeConnection.java
View File

@ -96,7 +96,7 @@ public class OfficeConnection
} }
private int mnDefaultPort = 5678; private int mnDefaultPort = 5678;
private final String msDefaultHost = "localhost"; private static final String msDefaultHost = "localhost";
private XMultiServiceFactory maServiceManager = null; private XMultiServiceFactory maServiceManager = null;
/** A value of true just indicates that it has been tried to establish a connection, /** A value of true just indicates that it has been tried to establish a connection,

4
ucb/qa/complex/tdoc/CheckTransientDocumentsDocumentContent.java
View File

@ -51,8 +51,8 @@ import static org.junit.Assert.*;
*/ */
public class CheckTransientDocumentsDocumentContent { public class CheckTransientDocumentsDocumentContent {
// TODO: document doesn't exists // TODO: document doesn't exists
private final String testDocuments = "sForm.sxw"; private static final String testDocuments = "sForm.sxw";
private final String folderName = "TestFolder"; private static final String folderName = "TestFolder";
private XMultiServiceFactory xMSF = null; private XMultiServiceFactory xMSF = null;
private XTextDocument xTextDoc = null; private XTextDocument xTextDoc = null;

6
vcl/qa/complex/memCheck/CheckMemoryUsage.java
View File

@ -93,9 +93,9 @@ public class CheckMemoryUsage /* extends ComplexTestCase */
{ {
private final String sWriterDoc = "sxw,writer_pdf_Export"; private static final String sWriterDoc = "sxw,writer_pdf_Export";
private final String sCalcDoc = "sxc,calc_pdf_Export"; private static final String sCalcDoc = "sxc,calc_pdf_Export";
private final String sImpressDoc = "sxi,impress_pdf_Export"; private static final String sImpressDoc = "sxi,impress_pdf_Export";
TempDir m_aTempDir; TempDir m_aTempDir;
private String[][] sDocTypeExportFilter; private String[][] sDocTypeExportFilter;
private String[][] sDocuments; private String[][] sDocuments;

2
wizards/com/sun/star/wizards/db/TypeInspector.java
View File

@ -46,7 +46,7 @@ public class TypeInspector
{ {
DataType.INTEGER, DataType.FLOAT, DataType.REAL, DataType.DOUBLE, DataType.NUMERIC, DataType.DECIMAL DataType.INTEGER, DataType.FLOAT, DataType.REAL, DataType.DOUBLE, DataType.NUMERIC, DataType.DECIMAL
}; };
final int INVALID = 999999; static final int INVALID = 999999;
XResultSet xResultSet; XResultSet xResultSet;
public class TypeInfo public class TypeInfo

4
wizards/com/sun/star/wizards/document/Control.java
View File

@ -49,10 +49,10 @@ public class Control extends Shape
GridControl oGridControl; GridControl oGridControl;
String sServiceName; String sServiceName;
XNamed xNamed; XNamed xNamed;
final int SOMAXTEXTSIZE = 50; static final int SOMAXTEXTSIZE = 50;
private int icontroltype; private int icontroltype;
protected XNameContainer xFormName; protected XNameContainer xFormName;
protected final int IIMGFIELDWIDTH = 3000; protected static final int IIMGFIELDWIDTH = 3000;
public Control() public Control()
{ {

2
wizards/com/sun/star/wizards/document/GridControl.java
View File

@ -40,7 +40,7 @@ public class GridControl extends Shape
public XGridColumnFactory xGridColumnFactory; public XGridColumnFactory xGridColumnFactory;
public XPropertySet xPropertySet; public XPropertySet xPropertySet;
XNameAccess xNameAccess; XNameAccess xNameAccess;
final String SODEFAULTNAME = "Grid1"; static final String SODEFAULTNAME = "Grid1";
XControlModel xControlModel; XControlModel xControlModel;
public XComponent xComponent; public XComponent xComponent;

2
wizards/com/sun/star/wizards/form/FormDocument.java
View File

@ -49,7 +49,7 @@ public class FormDocument extends TextDocument
private ViewHandler oViewHandler; private ViewHandler oViewHandler;
private TextStyleHandler oTextStyleHandler; private TextStyleHandler oTextStyleHandler;
private XPropertySet xPropPageStyle; private XPropertySet xPropPageStyle;
private final int SOFORMGAP = 2000; private static final int SOFORMGAP = 2000;
private boolean bhasSubForm; private boolean bhasSubForm;
private UIControlArranger curUIControlArranger; private UIControlArranger curUIControlArranger;
private StyleApplier curStyleApplier; private StyleApplier curStyleApplier;

6
wizards/com/sun/star/wizards/form/UIControlArranger.java
View File

@ -45,9 +45,9 @@ public class UIControlArranger
private String[] HelpTexts = new String[4]; private String[] HelpTexts = new String[4];
private ArrangeButtonList[] m_aArrangeList = new ArrangeButtonList[2]; private ArrangeButtonList[] m_aArrangeList = new ArrangeButtonList[2];
private Integer IControlStep; private Integer IControlStep;
private final int SOBASEIMAGEYPOSITION = 66; private static final int SOBASEIMAGEYPOSITION = 66;
private final int SOIMAGELISTHEIGHT = 60; private static final int SOIMAGELISTHEIGHT = 60;
private final String SOALIGNMETHOD = "alignLabelControls"; private static final String SOALIGNMETHOD = "alignLabelControls";
public UIControlArranger(FormWizard _CurUnoDialog, FormDocument _curFormDocument) public UIControlArranger(FormWizard _CurUnoDialog, FormDocument _curFormDocument)
{ {

4
wizards/com/sun/star/wizards/query/QuerySummary.java
View File

@ -29,8 +29,8 @@ import com.sun.star.wizards.ui.FilterComponent;
public class QuerySummary extends QueryMetaData public class QuerySummary extends QueryMetaData
{ {
final protected int RID_QUERY = 2300; static final protected int RID_QUERY = 2300;
final protected int RID_REPORT = 2400; static final protected int RID_REPORT = 2400;
String sSummary; String sSummary;
Resource oResource; Resource oResource;
private String sSeparator; private String sSeparator;

2
wizards/com/sun/star/wizards/table/CGCategory.java
View File

@ -32,7 +32,7 @@ public class CGCategory
public String Name; public String Name;
public int Index; public int Index;
private final String CGROOTPATH = "/org.openoffice.Office.TableWizard/TableWizard/"; private static final String CGROOTPATH = "/org.openoffice.Office.TableWizard/TableWizard/";
XMultiServiceFactory xMSF; XMultiServiceFactory xMSF;
XNameAccess xNameAccessTablesNode; XNameAccess xNameAccessTablesNode;
XNameAccess xNameAccessCurBusinessNode; XNameAccess xNameAccessCurBusinessNode;

6
wizards/com/sun/star/wizards/ui/AggregateComponent.java
View File

@ -53,9 +53,9 @@ public class AggregateComponent extends ControlScroller
String sDuplicateAggregateFunction; String sDuplicateAggregateFunction;
int Count; int Count;
int iQueryType; int iQueryType;
final int SOADDROW = 1; static final int SOADDROW = 1;
final int SOREMOVEROW = 2; static final int SOREMOVEROW = 2;
final int CONTROLROWDIST = 18; static final int CONTROLROWDIST = 18;
ArrayList<ControlRow> ControlRowVector; ArrayList<ControlRow> ControlRowVector;
String OPTIONBUTTONDETAILQUERY_ITEM_CHANGED = "toggleComponent"; String OPTIONBUTTONDETAILQUERY_ITEM_CHANGED = "toggleComponent";
String OPTIONBUTTONSUMMARYQUERY_ITEM_CHANGED = "toggleComponent"; String OPTIONBUTTONSUMMARYQUERY_ITEM_CHANGED = "toggleComponent";

2
wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java
View File

@ -37,7 +37,7 @@ public abstract class DBLimitedFieldSelection
protected Integer ICompPosX; protected Integer ICompPosX;
protected Integer ICompPosY; protected Integer ICompPosY;
protected Integer ICompWidth; protected Integer ICompWidth;
protected final int rowcount = 4; protected static final int rowcount = 4;
protected final int MAXSELINDEX = rowcount - 1; protected final int MAXSELINDEX = rowcount - 1;
protected short curtabindex; protected short curtabindex;
protected int iCurPosY; protected int iCurPosY;

38
wizards/com/sun/star/wizards/ui/FilterComponent.java
View File

@ -64,8 +64,8 @@ public class FilterComponent
private String sIncSuffix; private String sIncSuffix;
private ControlRow[] oControlRows; private ControlRow[] oControlRows;
private String sDuplicateCondition; private String sDuplicateCondition;
final int SOOPTORMODE = 100; static final int SOOPTORMODE = 100;
final int SOOPTANDMODE = 101; static final int SOOPTANDMODE = 101;
QueryMetaData oQueryMetaData; QueryMetaData oQueryMetaData;
int iDateTimeFormat; int iDateTimeFormat;
int iDateFormat; int iDateFormat;
@ -73,41 +73,41 @@ public class FilterComponent
private PropertyValue[][] filterconditions; private PropertyValue[][] filterconditions;
private short curtabindex; private short curtabindex;
XMultiServiceFactory xMSF; XMultiServiceFactory xMSF;
final int SO_FIRSTFIELDNAME = 1; static final int SO_FIRSTFIELDNAME = 1;
final int SO_SECONDFIELDNAME = 2; static final int SO_SECONDFIELDNAME = 2;
final int SO_THIRDFIELDNAME = 3; static final int SO_THIRDFIELDNAME = 3;
final int SO_FOURTHFIELDNAME = 4; static final int SO_FOURTHFIELDNAME = 4;
int[] SO_FIELDNAMELIST = new int[] int[] SO_FIELDNAMELIST = new int[]
{ {
SO_FIRSTFIELDNAME, SO_SECONDFIELDNAME, SO_THIRDFIELDNAME, SO_FOURTHFIELDNAME SO_FIRSTFIELDNAME, SO_SECONDFIELDNAME, SO_THIRDFIELDNAME, SO_FOURTHFIELDNAME
}; };
final int SO_FIRSTCONDITION = 5; static final int SO_FIRSTCONDITION = 5;
final int SO_SECONDCONDITION = 6; static final int SO_SECONDCONDITION = 6;
final int SO_THIRDCONDITION = 7; static final int SO_THIRDCONDITION = 7;
final int SO_FOURTHCONDITION = 8; static final int SO_FOURTHCONDITION = 8;
int[] SO_CONDITIONLIST = new int[] int[] SO_CONDITIONLIST = new int[]
{ {
SO_FIRSTCONDITION, SO_SECONDCONDITION, SO_THIRDCONDITION, SO_FOURTHCONDITION SO_FIRSTCONDITION, SO_SECONDCONDITION, SO_THIRDCONDITION, SO_FOURTHCONDITION
}; };
final int SO_FIRSTTEXTFIELD = 1; static final int SO_FIRSTTEXTFIELD = 1;
final int SO_SECONDTEXTFIELD = 2; static final int SO_SECONDTEXTFIELD = 2;
final int SO_THIRDTEXTFIELD = 3; static final int SO_THIRDTEXTFIELD = 3;
final int SO_FOURTHTEXTFIELD = 4; static final int SO_FOURTHTEXTFIELD = 4;
int[] SO_TEXTFIELDLIST = new int[] int[] SO_TEXTFIELDLIST = new int[]
{ {
SO_FIRSTTEXTFIELD, SO_SECONDTEXTFIELD, SO_THIRDTEXTFIELD, SO_FOURTHTEXTFIELD SO_FIRSTTEXTFIELD, SO_SECONDTEXTFIELD, SO_THIRDTEXTFIELD, SO_FOURTHTEXTFIELD
}; };
final int SO_FIRSTBOOLFIELDNAME = 256 + 1; static final int SO_FIRSTBOOLFIELDNAME = 256 + 1;
final int SO_SECONDBOOLFIELDNAME = 256 + 2; static final int SO_SECONDBOOLFIELDNAME = 256 + 2;
final int SO_THIRDBOOLFIELDNAME = 256 + 3; static final int SO_THIRDBOOLFIELDNAME = 256 + 3;
final int SO_FOURTHBOOLFIELDNAME = 256 + 4; static final int SO_FOURTHBOOLFIELDNAME = 256 + 4;
int SO_BOOLEANLIST[] = int SO_BOOLEANLIST[] =
{ {
SO_FIRSTBOOLFIELDNAME, SO_SECONDBOOLFIELDNAME, SO_THIRDBOOLFIELDNAME, SO_FOURTHBOOLFIELDNAME 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_MATCHALL = 0;
int SOI_MATCHANY = 1; int SOI_MATCHANY = 1;
int curHelpID; int curHelpID;

10
wizards/com/sun/star/wizards/ui/SortingComponent.java
View File

@ -38,11 +38,11 @@ public class SortingComponent
static String[] sSortDescend = new String[4]; static String[] sSortDescend = new String[4];
static short[] bOldSortValues = new short[4]; static short[] bOldSortValues = new short[4];
public int MAXSORTCRITERIAINDEX = 3; public int MAXSORTCRITERIAINDEX = 3;
final int SOFIRSTSORTLST = 0; static final int SOFIRSTSORTLST = 0;
final int SOSECSORTLST = 1; static final int SOSECSORTLST = 1;
final int SOTHIRDSORTLST = 2; static final int SOTHIRDSORTLST = 2;
final int SOFOURTHSORTLST = 3; static final int SOFOURTHSORTLST = 3;
final int[] SOSORTLST = new int[] static final int[] SOSORTLST = new int[]
{ {
SOFIRSTSORTLST, SOSECSORTLST, SOTHIRDSORTLST, SOFOURTHSORTLST SOFIRSTSORTLST, SOSECSORTLST, SOTHIRDSORTLST, SOFOURTHSORTLST
}; };

6
wizards/com/sun/star/wizards/ui/TitlesComponent.java
View File

@ -30,13 +30,13 @@ public class TitlesComponent extends ControlScroller
{ {
int iLabelPosX; int iLabelPosX;
final int iRelLabelPosXDist = 6; static final int iRelLabelPosXDist = 6;
public String[] fieldnames; public String[] fieldnames;
public Map<String, String> fieldtitleset; public Map<String, String> fieldtitleset;
public String[] fieldtitles; public String[] fieldtitles;
public XTextListener xTextListener; public XTextListener xTextListener;
final String SOLABELPREFIX = "lblColumnName_"; static final String SOLABELPREFIX = "lblColumnName_";
final String SOTITLEPREFIX = "lblTitleName_"; 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) public TitlesComponent(WizardDialog _CurUnoDialog, int _iStep, int _iCompPosX, int _iCompPosY, int _iCompWidth, int _uitextfieldcount, String _slblColumnNames, String _slblColumnTitles, int _firsthelpindex)
{ {