diff options
| author | Noel Grandin <noel@peralex.com> | 2014-08-12 16:27:18 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-08-13 08:49:24 +0200 |
| commit | 8583da1e934a49791ef8d86668f3d5c3c5dae1d7 (patch) | |
| tree | f092f708b7bb9a0a23ae82c1dc499a6e3fde4518 /wizards | |
| parent | 68cd011c907d00493bf2bfde531c1e244819596b (diff) | |
java: remove unused fields
found by UCDetector
Change-Id: I4a7c56a9918054c23469de5680658e7b501f0165
Diffstat (limited to 'wizards')
47 files changed, 123 insertions, 165 deletions
diff --git a/wizards/com/sun/star/wizards/common/NumericalHelper.java b/wizards/com/sun/star/wizards/common/NumericalHelper.java index 95c24a0b061e..f8dfbc163d3a 100644 --- a/wizards/com/sun/star/wizards/common/NumericalHelper.java +++ b/wizards/com/sun/star/wizards/common/NumericalHelper.java @@ -44,9 +44,9 @@ public class NumericalHelper private static final int STRING_TYPE = -1; private static final int BOOLEAN_TYPE = -2; private static final int SEQUENCE_TYPE = -3; - public static final int ASCII_VALUE_0 = 48; - public static final int ASCII_VALUE_A = 65; - public static final int COUNT_CHARS_IN_ALPHABET = 26; + + + private static final int HEX_BASE = 16; private static final int DEC_BASE = 10; private static final int ASCII_LETTER_A_OFFSET = 55; diff --git a/wizards/com/sun/star/wizards/common/PlaceholderTextElement.java b/wizards/com/sun/star/wizards/common/PlaceholderTextElement.java index e9aa2f42c858..1169179c9508 100644 --- a/wizards/com/sun/star/wizards/common/PlaceholderTextElement.java +++ b/wizards/com/sun/star/wizards/common/PlaceholderTextElement.java @@ -32,7 +32,7 @@ public class PlaceholderTextElement extends TextElement private String hint; private String placeHolderText; private XMultiServiceFactory xmsf; - TextDocument templateDocument; + public PlaceholderTextElement(XTextRange textRange, String placeHolderText_, String hint_, XMultiServiceFactory xmsf_) { diff --git a/wizards/com/sun/star/wizards/common/PropertyNames.java b/wizards/com/sun/star/wizards/common/PropertyNames.java index c851b7432b3b..af23a119d20d 100644 --- a/wizards/com/sun/star/wizards/common/PropertyNames.java +++ b/wizards/com/sun/star/wizards/common/PropertyNames.java @@ -36,7 +36,7 @@ public class PropertyNames public static String PROPERTY_TITLE = "Title"; public static String PROPERTY_BORDER = "Border"; public static String PROPERTY_MOVEABLE = "Moveable"; - public static String PROPERTY_CLOSEABLE = "Closeable"; + public static String PROPERTY_ALIGN = "Align"; public static String COMMAND = "Command"; public static String COMMAND_TYPE = "CommandType"; diff --git a/wizards/com/sun/star/wizards/common/SystemDialog.java b/wizards/com/sun/star/wizards/common/SystemDialog.java index cf744fe779c5..49674b243e5d 100644 --- a/wizards/com/sun/star/wizards/common/SystemDialog.java +++ b/wizards/com/sun/star/wizards/common/SystemDialog.java @@ -40,7 +40,7 @@ public class SystemDialog private XFilterManager xFilterManager; private XInitialization xInitialize; private XExecutableDialog xExecutable; - private XComponent xComponent; + private XFilePickerControlAccess xFilePickerControlAccess; private XMultiServiceFactory xMSF; private XStringSubstitution xStringSubstitution; @@ -61,7 +61,7 @@ public class SystemDialog xFilterManager = UnoRuntime.queryInterface(XFilterManager.class, systemDialog); xInitialize = UnoRuntime.queryInterface(XInitialization.class, systemDialog); xExecutable = UnoRuntime.queryInterface(XExecutableDialog.class, systemDialog); - xComponent = UnoRuntime.queryInterface(XComponent.class, systemDialog); + UnoRuntime.queryInterface(XComponent.class, systemDialog); xFilePickerControlAccess = UnoRuntime.queryInterface(XFilePickerControlAccess.class, systemDialog); xStringSubstitution = createStringSubstitution(xMSF); Short[] listAny = new Short[] diff --git a/wizards/com/sun/star/wizards/db/CommandName.java b/wizards/com/sun/star/wizards/db/CommandName.java index 161af0457c6c..285e3e47725f 100644 --- a/wizards/com/sun/star/wizards/db/CommandName.java +++ b/wizards/com/sun/star/wizards/db/CommandName.java @@ -34,7 +34,7 @@ public class CommandName private String AliasName = PropertyNames.EMPTY_STRING; private boolean bCatalogAtStart; private String sCatalogSep; - private String sIdentifierQuote; + private boolean baddQuotation = true; public CommandName(CommandMetaData _CommandMetaData, String _DisplayName) @@ -176,7 +176,6 @@ public class CommandName { bCatalogAtStart = oCommandMetaData.xDBMetaData.isCatalogAtStart(); sCatalogSep = oCommandMetaData.xDBMetaData.getCatalogSeparator(); - sIdentifierQuote = oCommandMetaData.xDBMetaData.getIdentifierQuoteString(); return true; } catch (SQLException e) diff --git a/wizards/com/sun/star/wizards/db/DBMetaData.java b/wizards/com/sun/star/wizards/db/DBMetaData.java index 980221dba203..d05d0aef0daf 100644 --- a/wizards/com/sun/star/wizards/db/DBMetaData.java +++ b/wizards/com/sun/star/wizards/db/DBMetaData.java @@ -85,8 +85,8 @@ public class DBMetaData private XPropertySet m_dataSourceSettings; private XOfficeDatabaseDocument xModel; private XPropertySet xDataSourcePropertySet; - private String[] DataSourceNames; - public String[] CommandNames; + + private java.util.ArrayList<CommandObject> CommandObjects = new ArrayList<CommandObject>(1); private Locale aLocale; private int[] CommandTypes; @@ -201,7 +201,6 @@ public class DBMetaData this.xMSF = xMSF; xDatabaseContext = (XInterface) xMSF.createInstance("com.sun.star.sdb.DatabaseContext"); xNameAccess = UnoRuntime.queryInterface( XNameAccess.class, xDatabaseContext ); - DataSourceNames = xNameAccess.getElementNames(); } catch (Exception e) { diff --git a/wizards/com/sun/star/wizards/db/QueryMetaData.java b/wizards/com/sun/star/wizards/db/QueryMetaData.java index 31a443dd1619..8987d254d88e 100644 --- a/wizards/com/sun/star/wizards/db/QueryMetaData.java +++ b/wizards/com/sun/star/wizards/db/QueryMetaData.java @@ -28,7 +28,7 @@ public class QueryMetaData extends CommandMetaData { private SQLQueryComposer oSQLQueryComposer = null; - FieldColumn CurFieldColumn; + public String Command; // Vector CommandNamesV; private PropertyValue[][] m_aFilterConditions; /* = new PropertyValue[][] {}; */ diff --git a/wizards/com/sun/star/wizards/db/RecordParser.java b/wizards/com/sun/star/wizards/db/RecordParser.java index 4f8cb8994e14..1eba9a59bad7 100644 --- a/wizards/com/sun/star/wizards/db/RecordParser.java +++ b/wizards/com/sun/star/wizards/db/RecordParser.java @@ -41,12 +41,12 @@ public class RecordParser extends QueryMetaData { private XNameAccess xColumns; - com.sun.star.sdbc.XRow xRow; + private com.sun.star.sdbc.XRow xResultSetRow; public XResultSet ResultSet; private XInterface xRowSet; private XCompletedExecution xExecute; - private XColumnsSupplier xRowSetColumnsSupplier; + private XComponent xRowSetComponent; private XInteractionHandler xInteraction; public FieldColumn[] GroupFieldColumns; @@ -70,7 +70,7 @@ public class RecordParser extends QueryMetaData try { xRowSet = (XInterface) xMSF.createInstance("com.sun.star.sdb.RowSet"); - xRowSetColumnsSupplier = UnoRuntime.queryInterface(XColumnsSupplier.class, xRowSet); + UnoRuntime.queryInterface(XColumnsSupplier.class, xRowSet); xRowSetComponent = UnoRuntime.queryInterface(XComponent.class, xRowSet); xExecute = UnoRuntime.queryInterface(XCompletedExecution.class, xRowSet); XInterface oInteraction = (XInterface) xMSF.createInstance("com.sun.star.task.InteractionHandler"); diff --git a/wizards/com/sun/star/wizards/db/SQLQueryComposer.java b/wizards/com/sun/star/wizards/db/SQLQueryComposer.java index 7cdc8678b8d2..2423cc11ceba 100644 --- a/wizards/com/sun/star/wizards/db/SQLQueryComposer.java +++ b/wizards/com/sun/star/wizards/db/SQLQueryComposer.java @@ -40,7 +40,7 @@ import java.util.ArrayList; public class SQLQueryComposer { - public XColumnsSupplier xColSuppl; + private QueryMetaData CurDBMetaData; public XSingleSelectQueryAnalyzer m_xQueryAnalyzer; private ArrayList<CommandName> composedCommandNames = new ArrayList<CommandName>(1); diff --git a/wizards/com/sun/star/wizards/db/TableDescriptor.java b/wizards/com/sun/star/wizards/db/TableDescriptor.java index db77203b62c6..77c46538902b 100644 --- a/wizards/com/sun/star/wizards/db/TableDescriptor.java +++ b/wizards/com/sun/star/wizards/db/TableDescriptor.java @@ -65,7 +65,7 @@ public class TableDescriptor extends CommandMetaData implements XContainerListen private String[] sTableFilters = null; private ArrayList<ColumnDescriptor> columncontainer; private ArrayList<XPropertySet> keycolumncontainer; - public XHierarchicalNameAccess xTableHierarchicalNameAccess; + private CommandName ComposedTableName; private XAppend xKeyColAppend; private XColumnsSupplier xKeyColumnSupplier; diff --git a/wizards/com/sun/star/wizards/db/TypeInspector.java b/wizards/com/sun/star/wizards/db/TypeInspector.java index b0dbda221857..75f4f82ad837 100644 --- a/wizards/com/sun/star/wizards/db/TypeInspector.java +++ b/wizards/com/sun/star/wizards/db/TypeInspector.java @@ -51,15 +51,10 @@ public class TypeInspector public class TypeInfo { - - private int nDataType; - private String sDataTypeName; public boolean bisAutoIncrementable; private TypeInfo(int _nDataType, String _sDataTypeName, boolean _bisAutoIncrementable) { - nDataType = _nDataType; - sDataTypeName = _sDataTypeName; bisAutoIncrementable = _bisAutoIncrementable; } } diff --git a/wizards/com/sun/star/wizards/document/Control.java b/wizards/com/sun/star/wizards/document/Control.java index 1da3b217548b..e3320d877896 100644 --- a/wizards/com/sun/star/wizards/document/Control.java +++ b/wizards/com/sun/star/wizards/document/Control.java @@ -43,12 +43,12 @@ public class Control extends Shape XControlModel xControlModel; private XControl xControl; public XPropertySet xPropertySet; - private XPropertySet xControlPropertySet; + XWindowPeer xWindowPeer; - Object oDefaultValue; - GridControl oGridControl; + + private String sServiceName; - XNamed xNamed; + private final int SOMAXTEXTSIZE = 50; private int icontroltype; private XNameContainer xFormName; @@ -108,7 +108,7 @@ public class Control extends Shape _xGroupShapes.add(xShape); } xControl = oFormHandler.xControlAccess.getControl(xControlModel); - xControlPropertySet = UnoRuntime.queryInterface( XPropertySet.class, xControl ); + UnoRuntime.queryInterface( XPropertySet.class, xControl ); xWindowPeer = xControl.getPeer(); } catch (Exception e) diff --git a/wizards/com/sun/star/wizards/document/FormHandler.java b/wizards/com/sun/star/wizards/document/FormHandler.java index 74d2f54a14dd..7c675a2c141b 100644 --- a/wizards/com/sun/star/wizards/document/FormHandler.java +++ b/wizards/com/sun/star/wizards/document/FormHandler.java @@ -97,9 +97,9 @@ public class FormHandler int DataType; private int ControlType; - private String ControlService; + String GridColumnName; - private boolean bIsText; + } /** Creates a new instance of FormHandler */ @@ -197,9 +197,7 @@ public class FormHandler ControlData curControlData = new ControlData(); curControlData.DataType = _datatype; curControlData.ControlType = _controltype; - curControlData.ControlService = _scontrolservicename; curControlData.GridColumnName = _gridcolumnname; - curControlData.bIsText = _bIsTextControl; return curControlData; } diff --git a/wizards/com/sun/star/wizards/document/GridControl.java b/wizards/com/sun/star/wizards/document/GridControl.java index 13436ee5eebc..f7bab37436e5 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"; + private XControlModel xControlModel; public XComponent xComponent; diff --git a/wizards/com/sun/star/wizards/document/TimeStampControl.java b/wizards/com/sun/star/wizards/document/TimeStampControl.java index b627c7ed8baf..300459197c61 100644 --- a/wizards/com/sun/star/wizards/document/TimeStampControl.java +++ b/wizards/com/sun/star/wizards/document/TimeStampControl.java @@ -41,7 +41,7 @@ public class TimeStampControl extends DatabaseControl private Resource oResource; private String sDateAppendix; // = GetResText(RID_FORM + 4) private String sTimeAppendix; // = GetResText(RID_FORM + 5) - XShapes xGroupShapes = null; + private double nreldatewidth; private double nreltimewidth; private int nTimeWidth; diff --git a/wizards/com/sun/star/wizards/form/Finalizer.java b/wizards/com/sun/star/wizards/form/Finalizer.java index 81f3d87e3b58..19a8044c4729 100644 --- a/wizards/com/sun/star/wizards/form/Finalizer.java +++ b/wizards/com/sun/star/wizards/form/Finalizer.java @@ -34,7 +34,7 @@ public class Finalizer private WizardDialog CurUnoDialog; private short curtabindex; private XRadioButton optModifyForm; - XRadioButton optWorkWithForm; + private XTextComponent txtFormName; private FormDocument oFormDocument; diff --git a/wizards/com/sun/star/wizards/form/FormConfiguration.java b/wizards/com/sun/star/wizards/form/FormConfiguration.java index 170a32bdd197..c478745fb810 100644 --- a/wizards/com/sun/star/wizards/form/FormConfiguration.java +++ b/wizards/com/sun/star/wizards/form/FormConfiguration.java @@ -41,7 +41,7 @@ public class FormConfiguration private XRadioButton optOnExistingRelation; private XCheckBox chkcreateSubForm; private XRadioButton optSelectManually; - private XFixedText lblSubFormDescription; + private XFixedText lblRelations; private XListBox lstRelations; private String[] sreferencedTables; @@ -109,7 +109,7 @@ public class FormConfiguration { Boolean.FALSE, 37, "HID:WIZARDS_HID_DLGFORM_lstRELATIONS", 201, 55, ISubFormStep, new Short(curtabindex++), 103 }); - lblSubFormDescription = CurUnoDialog.insertLabel("lblSubFormDescription", + CurUnoDialog.insertLabel("lblSubFormDescription", new String[] { 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 diff --git a/wizards/com/sun/star/wizards/query/CallQueryWizard.java b/wizards/com/sun/star/wizards/query/CallQueryWizard.java index 60fc8f61a481..1fd4dbd38487 100644 --- a/wizards/com/sun/star/wizards/query/CallQueryWizard.java +++ b/wizards/com/sun/star/wizards/query/CallQueryWizard.java @@ -56,8 +56,8 @@ public class CallQueryWizard private static class QueryWizardImplementation extends com.sun.star.lib.uno.helper.PropertySet implements com.sun.star.lang.XInitialization, com.sun.star.lang.XServiceInfo, com.sun.star.task.XJobExecutor { private PropertyValue[] m_wizardContext; - private String Command; - public final Integer CommandType = com.sun.star.sdb.CommandType.QUERY; + + /** The constructor of the inner class has a XMultiServiceFactory parameter. * @param i_serviceFactory A special service factory could be introduced while initializing. @@ -77,7 +77,7 @@ public class CallQueryWizard if (sEvent.equals(PropertyNames.START)) { QueryWizard CurQueryWizard = new QueryWizard( m_serviceFactory, m_wizardContext ); - Command = CurQueryWizard.start(); + CurQueryWizard.start(); } } catch (Exception exception) diff --git a/wizards/com/sun/star/wizards/query/QuerySummary.java b/wizards/com/sun/star/wizards/query/QuerySummary.java index 7abe24f985bc..e6999b63be85 100644 --- a/wizards/com/sun/star/wizards/query/QuerySummary.java +++ b/wizards/com/sun/star/wizards/query/QuerySummary.java @@ -30,7 +30,7 @@ public class QuerySummary extends QueryMetaData { final private int RID_QUERY = 2300; - final protected int RID_REPORT = 2400; + private String sSummary; private Resource oResource; private String sSeparator; diff --git a/wizards/com/sun/star/wizards/query/QueryWizard.java b/wizards/com/sun/star/wizards/query/QueryWizard.java index 008c0510295d..a931f0bbbb9c 100644 --- a/wizards/com/sun/star/wizards/query/QueryWizard.java +++ b/wizards/com/sun/star/wizards/query/QueryWizard.java @@ -43,7 +43,7 @@ import com.sun.star.wizards.ui.TitlesComponent; public class QueryWizard extends DatabaseObjectWizard { - public static final String SFILLUPFIELDSLISTBOX = "fillUpFieldsListbox"; + private static final int SOFIELDSELECTION_PAGE = 1; private static final int SOSORTING_PAGE = 2; private static final int SOFILTER_PAGE = 3; diff --git a/wizards/com/sun/star/wizards/report/DBColumn.java b/wizards/com/sun/star/wizards/report/DBColumn.java index 09c5f954ca17..169f66bdcd93 100644 --- a/wizards/com/sun/star/wizards/report/DBColumn.java +++ b/wizards/com/sun/star/wizards/report/DBColumn.java @@ -47,13 +47,13 @@ public class DBColumn private XCell xValCell; private XTextRange xValTextCell; private XTextCursor xValCellCursor; - public XNumberFormats xValCellNumberFormats; + public XCell xNameCell; private XTextRange xNameTextCell; private boolean bAlignLeft; - public Object DefaultValue; + private String CharFontName; - public int FormatKey; + private PropertyState PropertyState; public int ValColumn = 1; private int ValRow = 0; @@ -63,7 +63,7 @@ public class DBColumn private XCellRange xCellRange; public XNamed xTableName; private boolean bIsGroupColumn; - TextDocument oTextDocument; + private RecordParser CurDBMetaData; private RecordTable CurRecordTable; private TextTableHandler oTextTableHandler; diff --git a/wizards/com/sun/star/wizards/report/Dataimport.java b/wizards/com/sun/star/wizards/report/Dataimport.java index 10e0aa372235..fc6dd01e7023 100644 --- a/wizards/com/sun/star/wizards/report/Dataimport.java +++ b/wizards/com/sun/star/wizards/report/Dataimport.java @@ -34,11 +34,11 @@ public class Dataimport extends UnoDialog2 implements com.sun.star.awt.XActionLi // ReportTextDocument CurReportDocument; IReportDocument CurReportDocument; - static boolean bStopProcess; + private static String sProgressDBConnection; private static String sProgressDataImport; - private static String sProgressBaseCurRecord; - static String sProgressCurRecord; + + private static String sProgressTitle; private static String sStop; @@ -49,7 +49,6 @@ public class Dataimport extends UnoDialog2 implements com.sun.star.awt.XActionLi sProgressDBConnection = m_oResource.getResText(UIConsts.RID_DB_COMMON + 34); sProgressDataImport = m_oResource.getResText(UIConsts.RID_REPORT + 67); sProgressTitle = m_oResource.getResText(UIConsts.RID_REPORT + 62); - sProgressBaseCurRecord = m_oResource.getResText(UIConsts.RID_REPORT + 63); sStop = m_oResource.getResText(UIConsts.RID_DB_COMMON + 21); } diff --git a/wizards/com/sun/star/wizards/report/RecordTable.java b/wizards/com/sun/star/wizards/report/RecordTable.java index 14c9c6baa711..cd40a35e9980 100644 --- a/wizards/com/sun/star/wizards/report/RecordTable.java +++ b/wizards/com/sun/star/wizards/report/RecordTable.java @@ -33,14 +33,14 @@ import com.sun.star.wizards.text.ViewHandler; public class RecordTable { - String CurFieldName; - String LabelDescription; + + public XNamed xTableName; public XCellRange xCellRange; public XTextTable xTextTable; private TextTableHandler oTextTableHandler; public XTableColumns xTableColumns; - private XTableRows xTableRows; + public RecordTable(TextTableHandler _oTextTableHandler) { @@ -72,7 +72,7 @@ public class RecordTable xTableName = UnoRuntime.queryInterface(XNamed.class, xTextTable); xTableName.setName(ReportTextDocument.TBLRECORDSECTION); } - xTableRows = xTextTable.getRows(); + xTextTable.getRows(); xTableColumns = xTextTable.getColumns(); xCellRange = UnoRuntime.queryInterface(XCellRange.class, xTextTable); } diff --git a/wizards/com/sun/star/wizards/report/ReportFinalizer.java b/wizards/com/sun/star/wizards/report/ReportFinalizer.java index 9f750692ec1c..68356b39d271 100644 --- a/wizards/com/sun/star/wizards/report/ReportFinalizer.java +++ b/wizards/com/sun/star/wizards/report/ReportFinalizer.java @@ -32,13 +32,12 @@ public class ReportFinalizer private WizardDialog CurUnoDialog; private XTextComponent xTitleTextBox; - XTextComponent[] xSaveTextBox = new XTextComponent[2]; - Object chkTemplate; + + private String CHANGEREPORTTITLE_FUNCNAME = "changeReportTitle"; private String TOGGLESUBTEMPLATECONTROLS_FUNCNAME = "toggleSubTemplateControls"; - String TemplatePath; private String StoreName; - boolean bfinalaskbeforeOverwrite; + private String DefaultName; private String OldDefaultName; private IReportDocument CurReportDocument; diff --git a/wizards/com/sun/star/wizards/report/ReportLayouter.java b/wizards/com/sun/star/wizards/report/ReportLayouter.java index 599d376a18ed..475e2d554f19 100644 --- a/wizards/com/sun/star/wizards/report/ReportLayouter.java +++ b/wizards/com/sun/star/wizards/report/ReportLayouter.java @@ -37,7 +37,7 @@ public class ReportLayouter { private UnoDialog CurUnoDialog; - final int SOTXTTITLE = 28; + private final int SOCONTENTLST = 29; final static public int SOOPTLANDSCAPE = 30; final static public int SOOPTPORTRAIT = 31; diff --git a/wizards/com/sun/star/wizards/report/ReportTextDocument.java b/wizards/com/sun/star/wizards/report/ReportTextDocument.java index 0cd7b9a5b102..73b249da895c 100644 --- a/wizards/com/sun/star/wizards/report/ReportTextDocument.java +++ b/wizards/com/sun/star/wizards/report/ReportTextDocument.java @@ -247,7 +247,6 @@ class ReportTextDocument extends com.sun.star.wizards.text.TextDocument implemen Helper.setUnoPropertyValue(FirstPageStyle, SIZE, oNewSize); int iLeftMargin = AnyConverter.toInt(Helper.getUnoPropertyValue(ReportPageStyle, "LeftMargin")); int iRightMargin = AnyConverter.toInt(Helper.getUnoPropertyValue(ReportPageStyle, "RightMargin")); - PageWidth = oNewSize.Width - iLeftMargin - iRightMargin; if (CurRecordTable != null) { CurRecordTable.adjustOptimalTableWidths(xMSF, oViewHandler); diff --git a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java index 1bb3cc93ac0e..74dcbebe16cd 100644 --- a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java +++ b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java @@ -127,19 +127,17 @@ public class ReportTextImplementation extends ReportImplementationHelper impleme } private static String sMsgQueryCreationImpossible; private static String sReportFormNotExisting; - private static String sMsgHiddenControlMissing; + private static String sMsgEndAutopilot; - static String sMsgConnectionImpossible; - private static String sMsgNoConnection; - static String[] ReportMessages = new String[4]; + + + private void initialResources() { sReportFormNotExisting = m_resource.getResText(UIConsts.RID_REPORT + 64); sMsgQueryCreationImpossible = m_resource.getResText(UIConsts.RID_REPORT + 65); - sMsgHiddenControlMissing = m_resource.getResText(UIConsts.RID_REPORT + 66); sMsgEndAutopilot = m_resource.getResText(UIConsts.RID_DB_COMMON + 33); - sMsgNoConnection = m_resource.getResText(UIConsts.RID_DB_COMMON + 14); } private void addTextSectionCopies() diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/DesignTemplate.java b/wizards/com/sun/star/wizards/reportbuilder/layout/DesignTemplate.java index cbf4ee93d76b..82c8b53af8c2 100644 --- a/wizards/com/sun/star/wizards/reportbuilder/layout/DesignTemplate.java +++ b/wizards/com/sun/star/wizards/reportbuilder/layout/DesignTemplate.java @@ -33,8 +33,8 @@ public class DesignTemplate { private XReportDefinition m_xReportDefinition; - private XMultiServiceFactory m_xGlobalMSF; - private String m_sFilename; + + private DesignTemplate() { @@ -291,8 +291,6 @@ public class DesignTemplate private void load(XMultiServiceFactory _xMSF, String _sPath) throws com.sun.star.uno.Exception { - m_xGlobalMSF = _xMSF; - m_sFilename = _sPath; final Object aObj = _xMSF.createInstance("com.sun.star.report.ReportDefinition"); m_xReportDefinition = UnoRuntime.queryInterface(XReportDefinition.class, aObj); diff --git a/wizards/com/sun/star/wizards/table/CGCategory.java b/wizards/com/sun/star/wizards/table/CGCategory.java index bbc244a6e922..eff29ca31aa5 100644 --- a/wizards/com/sun/star/wizards/table/CGCategory.java +++ b/wizards/com/sun/star/wizards/table/CGCategory.java @@ -30,8 +30,8 @@ import com.sun.star.wizards.common.Configuration; public class CGCategory { - public String Name; - public int Index; + + private final String CGROOTPATH = "/org.openoffice.Office.TableWizard/TableWizard/"; private XMultiServiceFactory xMSF; XNameAccess xNameAccessTablesNode; diff --git a/wizards/com/sun/star/wizards/table/CGTable.java b/wizards/com/sun/star/wizards/table/CGTable.java index c86718cd5081..cf3fb17a49e3 100644 --- a/wizards/com/sun/star/wizards/table/CGTable.java +++ b/wizards/com/sun/star/wizards/table/CGTable.java @@ -29,8 +29,8 @@ public class CGTable private XMultiServiceFactory xMSF; XNameAccess xNameAccessFieldsNode; private XNameAccess xNameAccessTableNode; - public String Index; - public String Name; + + public CGTable(XMultiServiceFactory _xMSF) { diff --git a/wizards/com/sun/star/wizards/table/CallTableWizard.java b/wizards/com/sun/star/wizards/table/CallTableWizard.java index b7693a102f34..c0214cffe334 100644 --- a/wizards/com/sun/star/wizards/table/CallTableWizard.java +++ b/wizards/com/sun/star/wizards/table/CallTableWizard.java @@ -56,10 +56,8 @@ public class CallTableWizard { private PropertyValue[] m_wizardContext; - // <properties> - private String Command; - public final Integer CommandType = com.sun.star.sdb.CommandType.TABLE; - // </properties> + + /** The constructor of the inner class has a XMultiServiceFactory parameter. */ @@ -78,7 +76,7 @@ public class CallTableWizard if ( sEvent.equals(PropertyNames.START) ) { TableWizard CurTableWizard = new TableWizard( m_serviceFactory, m_wizardContext ); - Command = CurTableWizard.startTableWizard(); + CurTableWizard.startTableWizard(); } } catch (Exception exception) diff --git a/wizards/com/sun/star/wizards/table/FieldFormatter.java b/wizards/com/sun/star/wizards/table/FieldFormatter.java index 6bbc1d0a74e3..da89154bf025 100644 --- a/wizards/com/sun/star/wizards/table/FieldFormatter.java +++ b/wizards/com/sun/star/wizards/table/FieldFormatter.java @@ -47,11 +47,11 @@ public class FieldFormatter implements XItemListener private XButton btnShiftUp; private XButton btnShiftDown; private short curtabindex; - String TOGGLEBUTTONS = "toggleButtons"; - String ADDFIELDNAME = "addFieldName"; - String REMOVEFIELDNAME = "removeFieldName"; + + + private String MODIFYFIELDNAME = "modifyFieldName"; - String[] fieldnames; + private String suntitled; private Integer IFieldFormatStep; diff --git a/wizards/com/sun/star/wizards/table/Finalizer.java b/wizards/com/sun/star/wizards/table/Finalizer.java index 162edb2e3599..694418233e9e 100644 --- a/wizards/com/sun/star/wizards/table/Finalizer.java +++ b/wizards/com/sun/star/wizards/table/Finalizer.java @@ -34,7 +34,7 @@ public class Finalizer private short curtabindex; private XRadioButton optModifyTable; private XRadioButton optWorkWithTable; - private XRadioButton optStartFormWizard; + private XTextComponent txtTableName; private XListBox xCatalogListBox; private XListBox xSchemaListBox; @@ -239,7 +239,7 @@ public class Finalizer { UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGTABLE_OPT_MODIFYTABLE", sModifyTable, 101, new Integer(109 + ndiffPosY), IFINALSTEP, new Short(curtabindex++), 177 }); - optStartFormWizard = CurUnoDialog.insertRadioButton("optStartFormWizard", null, + CurUnoDialog.insertRadioButton("optStartFormWizard", null, new String[] { PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_HELPURL, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH diff --git a/wizards/com/sun/star/wizards/table/TableWizard.java b/wizards/com/sun/star/wizards/table/TableWizard.java index 9431b821872b..ea61d6757c0e 100644 --- a/wizards/com/sun/star/wizards/table/TableWizard.java +++ b/wizards/com/sun/star/wizards/table/TableWizard.java @@ -44,7 +44,7 @@ public class TableWizard extends DatabaseObjectWizard implements XTextListener private ScenarioSelector curScenarioSelector; private FieldFormatter curFieldFormatter; private PrimaryKeyHandler curPrimaryKeyHandler; - private String sMsgWizardName = PropertyNames.EMPTY_STRING; + public HashMap<String, FieldDescription> fielditems; private int wizardmode; private String tablename; @@ -52,13 +52,12 @@ public class TableWizard extends DatabaseObjectWizard implements XTextListener private String serrTableNameexists; private String scomposedtablename; private TableDescriptor curTableDescriptor; - public static final int SONULLPAGE = 0; + public static final int SOMAINPAGE = 1; public static final int SOFIELDSFORMATPAGE = 2; public static final int SOPRIMARYKEYPAGE = 3; public static final int SOFINALPAGE = 4; private String sMsgColumnAlreadyExists = PropertyNames.EMPTY_STRING; - String WizardHeaderText[] = new String[8]; private String m_tableName; @@ -389,7 +388,6 @@ public class TableWizard extends DatabaseObjectWizard implements XTextListener public boolean getTableResources() { - sMsgWizardName = super.m_oResource.getResText(UIConsts.RID_TABLE + 1); slblFields = m_oResource.getResText(UIConsts.RID_TABLE + 19); slblSelFields = m_oResource.getResText(UIConsts.RID_TABLE + 25); serrToManyFields = m_oResource.getResText(UIConsts.RID_TABLE + 47); diff --git a/wizards/com/sun/star/wizards/text/TextDocument.java b/wizards/com/sun/star/wizards/text/TextDocument.java index 33739c56b1d5..7db7ea59a0d8 100644 --- a/wizards/com/sun/star/wizards/text/TextDocument.java +++ b/wizards/com/sun/star/wizards/text/TextDocument.java @@ -73,21 +73,21 @@ public class TextDocument public XComponent xComponent; public com.sun.star.text.XTextDocument xTextDocument; - public com.sun.star.util.XNumberFormats NumberFormats; + public com.sun.star.document.XDocumentProperties m_xDocProps; public com.sun.star.task.XStatusIndicator xProgressBar; public com.sun.star.frame.XFrame xFrame; public XText xText; public XMultiServiceFactory xMSFDoc; public XMultiServiceFactory xMSF; - private com.sun.star.util.XNumberFormatsSupplier xNumberFormatsSupplier; + public com.sun.star.awt.XWindowPeer xWindowPeer; - public int PageWidth; - public int ScaleWidth; - private Size DocSize; - public com.sun.star.awt.Rectangle PosSize; - private com.sun.star.lang.Locale CharLocale; - private XStorable xStorable; + + + + + + // creates an instance of TextDocument and creates a named frame. No document is actually loaded into this frame. public TextDocument(XMultiServiceFactory xMSF, XTerminateListener listener, String FrameName) @@ -207,11 +207,10 @@ public class TextDocument } xWindowPeer = UnoRuntime.queryInterface(XWindowPeer.class, xFrame.getComponentWindow()); xMSFDoc = UnoRuntime.queryInterface(XMultiServiceFactory.class, xTextDocument); - xNumberFormatsSupplier = UnoRuntime.queryInterface(XNumberFormatsSupplier.class, xTextDocument); + UnoRuntime.queryInterface(XNumberFormatsSupplier.class, xTextDocument); XDocumentPropertiesSupplier xDocPropsSuppl = UnoRuntime.queryInterface(XDocumentPropertiesSupplier.class, xTextDocument); m_xDocProps = xDocPropsSuppl.getDocumentProperties(); - CharLocale = (Locale) Helper.getUnoStructValue(xComponent, "CharLocale"); xText = xTextDocument.getText(); } @@ -219,11 +218,10 @@ public class TextDocument { xWindowPeer = UnoRuntime.queryInterface(XWindowPeer.class, xFrame.getComponentWindow()); xMSFDoc = UnoRuntime.queryInterface(XMultiServiceFactory.class, xTextDocument); - xNumberFormatsSupplier = UnoRuntime.queryInterface(XNumberFormatsSupplier.class, xTextDocument); + UnoRuntime.queryInterface(XNumberFormatsSupplier.class, xTextDocument); XDocumentPropertiesSupplier xDocPropsSuppl = UnoRuntime.queryInterface(XDocumentPropertiesSupplier.class, xTextDocument); m_xDocProps = xDocPropsSuppl.getDocumentProperties(); - CharLocale = (Locale) Helper.getUnoStructValue(xComponent, "CharLocale"); - xStorable = UnoRuntime.queryInterface(XStorable.class, xTextDocument); + UnoRuntime.queryInterface(XStorable.class, xTextDocument); xText = xTextDocument.getText(); } @@ -264,7 +262,6 @@ public class TextDocument } Object oDoc = OfficeDocument.load(xFrame, sDefaultTemplate, "_self", loadValues); xTextDocument = (com.sun.star.text.XTextDocument) oDoc; - DocSize = getPageSize(); xMSFDoc = UnoRuntime.queryInterface(XMultiServiceFactory.class, xTextDocument); ViewHandler myViewHandler = new ViewHandler(xTextDocument); @@ -318,11 +315,10 @@ public class TextDocument xWindowPeer = UnoRuntime.queryInterface(XWindowPeer.class, xWindow); xMSFDoc = UnoRuntime.queryInterface(XMultiServiceFactory.class, xTextDocument); - xNumberFormatsSupplier = UnoRuntime.queryInterface(XNumberFormatsSupplier.class, xTextDocument); + UnoRuntime.queryInterface(XNumberFormatsSupplier.class, xTextDocument); XDocumentPropertiesSupplier xDocPropsSuppl = UnoRuntime.queryInterface(XDocumentPropertiesSupplier.class, xTextDocument); m_xDocProps = xDocPropsSuppl.getDocumentProperties(); - CharLocale = (Locale) Helper.getUnoStructValue(xComponent, "CharLocale"); } public static XTextCursor createTextCursor(Object oCursorContainer) diff --git a/wizards/com/sun/star/wizards/text/TextTableHandler.java b/wizards/com/sun/star/wizards/text/TextTableHandler.java index ad6c2684b393..c04d3b513415 100644 --- a/wizards/com/sun/star/wizards/text/TextTableHandler.java +++ b/wizards/com/sun/star/wizards/text/TextTableHandler.java @@ -46,7 +46,7 @@ public class TextTableHandler public XTextTablesSupplier xTextTablesSupplier; private XMultiServiceFactory xMSFDoc; private XTextDocument xTextDocument; - private XSimpleText xSimpleText; + private NumberFormatter oNumberFormatter; private Locale aCharLocale; @@ -58,7 +58,7 @@ public class TextTableHandler this.xMSFDoc = xMSF; this.xTextDocument = xTextDocument; xTextTablesSupplier = UnoRuntime.queryInterface(XTextTablesSupplier.class, xTextDocument); - xSimpleText = UnoRuntime.queryInterface(XSimpleText.class, xTextDocument.getText()); + UnoRuntime.queryInterface(XSimpleText.class, xTextDocument.getText()); XNumberFormatsSupplier xNumberFormatsSupplier = UnoRuntime.queryInterface(XNumberFormatsSupplier.class, xTextDocument); aCharLocale = (Locale) Helper.getUnoStructValue(xTextDocument, "CharLocale"); oNumberFormatter = new NumberFormatter(xNumberFormatsSupplier, aCharLocale); diff --git a/wizards/com/sun/star/wizards/ui/AggregateComponent.java b/wizards/com/sun/star/wizards/ui/AggregateComponent.java index f6607f47df49..34e52a373bbe 100644 --- a/wizards/com/sun/star/wizards/ui/AggregateComponent.java +++ b/wizards/com/sun/star/wizards/ui/AggregateComponent.java @@ -44,28 +44,28 @@ public class AggregateComponent extends ControlScroller "SUM", "AVG", "MIN", "MAX" }; private QueryMetaData CurDBMetaData; - private XButton optDetailQuery; - private XButton optSummaryQuery; + + private String soptDetailQuery; private String soptSummaryQuery; private String slblAggregate; private String slblFieldNames; private String sDuplicateAggregateFunction; private int Count; - int iQueryType; + private final int SOADDROW = 1; private final int SOREMOVEROW = 2; - final int CONTROLROWDIST = 18; + private ArrayList<ControlRow> ControlRowVector; - String OPTIONBUTTONDETAILQUERY_ITEM_CHANGED = "toggleComponent"; - String OPTIONBUTTONSUMMARYQUERY_ITEM_CHANGED = "toggleComponent"; - String LISTBOXFUNCTIONS_ACTION_PERFORMED; - String LISTBOXFUNCTIONS_ITEM_CHANGED; - String LISTBOXFIELDNAMES_ACTION_PERFORMED; - String LISTBOXFIELDNAMES_ITEM_CHANGED; - String COMMANDBUTTONPLUS_ACTION_PERFORMED = "addRow"; - String COMMANDBUTTONMINUS_ACTION_PERFORMED = "removeRow"; - ArrayList<String> ControlRows; + + + + + + + + + private int curHelpID; private int lastHelpIndex; @@ -78,7 +78,7 @@ public class AggregateComponent extends ControlScroller curHelpID = _firstHelpID; this.CurDBMetaData = _CurDBMetaData; Count = 1; - optDetailQuery = CurUnoDialog.insertRadioButton("optDetailQuery", 0, new ActionListenerImpl(), + CurUnoDialog.insertRadioButton("optDetailQuery", 0, new ActionListenerImpl(), new String[] { PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_HELPURL, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STATE, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH @@ -88,7 +88,7 @@ public class AggregateComponent extends ControlScroller 8, HelpIds.getHelpIdString(curHelpID), soptDetailQuery, new Integer(_iPosX), new Integer(iCompPosY - 42), new Short((short) 1), IStep, new Short(curtabindex++), new Integer(iCompWidth) }); - optSummaryQuery = CurUnoDialog.insertRadioButton("optSummaryQuery", 0, new ActionListenerImpl(), + CurUnoDialog.insertRadioButton("optSummaryQuery", 0, new ActionListenerImpl(), new String[] { PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_HELPURL, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_MULTILINE, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH diff --git a/wizards/com/sun/star/wizards/ui/ButtonList.java b/wizards/com/sun/star/wizards/ui/ButtonList.java index f15f7d26e4ba..d9e005043f8b 100644 --- a/wizards/com/sun/star/wizards/ui/ButtonList.java +++ b/wizards/com/sun/star/wizards/ui/ButtonList.java @@ -58,7 +58,7 @@ public class ButtonList implements XItemEventBroadcaster, XActionListener private int imageTextLines = 1; private boolean rowSelect = false; public int tabIndex; - public Boolean scaleImages = Boolean.TRUE; + private String m_aControlName = "il"; private int m_nCurrentSelection = -1; private int pageStart = 0; diff --git a/wizards/com/sun/star/wizards/ui/ControlScroller.java b/wizards/com/sun/star/wizards/ui/ControlScroller.java index 171b642efd6e..b738b4af2d8e 100644 --- a/wizards/com/sun/star/wizards/ui/ControlScroller.java +++ b/wizards/com/sun/star/wizards/ui/ControlScroller.java @@ -28,7 +28,7 @@ public abstract class ControlScroller { protected WizardDialog CurUnoDialog; - private XMultiServiceFactory xMSF; + protected int ncurfieldcount; private int nblockincrement; private int nlineincrement; @@ -36,13 +36,13 @@ public abstract class ControlScroller private int ntotfieldcount; private XScrollBar xScrollBar; private ArrayList<PropertyValue[]> scrollfields; - private Integer ICompPosX; + protected int iCompPosX; - private Integer ICompPosY; + protected int iCompPosY; - private Integer ICompWidth; + protected int iCompWidth; - protected Integer ICompHeight; + protected int iCompHeight; private int iStartPosY; protected short curtabindex; @@ -54,7 +54,7 @@ public abstract class ControlScroller protected int curHelpIndex; private String sIncSuffix; protected ArrayList<Object> ControlGroupVector = new ArrayList<Object>(); - protected PeerConfig oTitlePeerConfig; + private class AdjustmentListenerImpl implements com.sun.star.awt.XAdjustmentListener { @@ -82,7 +82,6 @@ public abstract class ControlScroller // TODO add parameters for tabindices and helpindex protected ControlScroller(WizardDialog _CurUnoDialog, XMultiServiceFactory _xMSF, int _iStep, int _iCompPosX, int _iCompPosY, int _iCompWidth, int _nblockincrement, int _nlinedistance, int _firsthelpindex) { - this.xMSF = _xMSF; this.nblockincrement = _nblockincrement; this.CurUnoDialog = _CurUnoDialog; this.iStep = _iStep; @@ -92,10 +91,7 @@ public abstract class ControlScroller IStep = new Integer(iStep); this.iCompPosX = _iCompPosX; this.iCompPosY = _iCompPosY; - this.ICompPosX = new Integer(iCompPosX); - this.ICompPosY = new Integer(iCompPosY); this.iCompWidth = _iCompWidth; - this.ICompWidth = new Integer(iCompWidth); this.iCompHeight = 2 * SORELFIRSTPOSY + nblockincrement * linedistance; iStartPosY = iCompPosY + SORELFIRSTPOSY; int ScrollHeight = iCompHeight - 2; diff --git a/wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java b/wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java index 2aad4c6706de..81119688b061 100644 --- a/wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java +++ b/wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java @@ -30,13 +30,13 @@ import com.sun.star.wizards.common.PropertyNames; public abstract class DBLimitedFieldSelection { - private XMultiServiceFactory xMSF; + protected WizardDialog CurUnoDialog; private String sNoField; protected Integer IStep; - private Integer ICompPosX; - private Integer ICompPosY; - private Integer ICompWidth; + + + protected final int rowcount = 4; private final int MAXSELINDEX = rowcount - 1; protected short curtabindex; @@ -47,15 +47,11 @@ public abstract class DBLimitedFieldSelection public DBLimitedFieldSelection(WizardDialog _CurUnoDialog, int iStep, int _iCompPosX, int iCompPosY, int iCompWidth, int _FirstHelpIndex) { this.CurUnoDialog = _CurUnoDialog; - xMSF = CurUnoDialog.xMSF; FirstHelpIndex = _FirstHelpIndex; curtabindex = (short) (iStep * 100); sNoField = CurUnoDialog.m_oResource.getResText(UIConsts.RID_REPORT + 8); IStep = new Integer(iStep); iCompPosX = _iCompPosX; - ICompPosX = new Integer(iCompPosX); - ICompPosY = new Integer(iCompPosY); - ICompWidth = new Integer(iCompWidth); iCurPosY = iCompPosY; for (int i = 0; i < rowcount; i++) { diff --git a/wizards/com/sun/star/wizards/ui/FieldSelection.java b/wizards/com/sun/star/wizards/ui/FieldSelection.java index cb3576413621..7a7047c44038 100644 --- a/wizards/com/sun/star/wizards/ui/FieldSelection.java +++ b/wizards/com/sun/star/wizards/ui/FieldSelection.java @@ -35,10 +35,10 @@ public class FieldSelection protected boolean AppendMode = false; protected Integer IStep; - private int CompPosX; + private int CompPosY; private int CompHeight; - private int CompWidth; + private XFieldSelectionListener xFieldSelection; private int maxfieldcount = 10000000; @@ -174,10 +174,8 @@ public class FieldSelection int ShiftButtonCount = 2; int a = 0; this.CurUnoDialog = CurUnoDialog; - this.CompPosX = CompPosX; this.CompPosY = CompPosY; this.CompHeight = CompHeight; - this.CompWidth = CompWidth; Object btnmoveall = null; Object btnremoveall = null; diff --git a/wizards/com/sun/star/wizards/ui/FilterComponent.java b/wizards/com/sun/star/wizards/ui/FilterComponent.java index 2feef4716a77..7bfcc765fc6b 100644 --- a/wizards/com/sun/star/wizards/ui/FilterComponent.java +++ b/wizards/com/sun/star/wizards/ui/FilterComponent.java @@ -72,7 +72,7 @@ public class FilterComponent private int iTimeFormat; private PropertyValue[][] filterconditions; private short curtabindex; - private XMultiServiceFactory xMSF; + private final int SO_FIRSTFIELDNAME = 1; private final int SO_SECONDFIELDNAME = 2; private final int SO_THIRDFIELDNAME = 3; @@ -101,13 +101,8 @@ public class FilterComponent private final int SO_SECONDBOOLFIELDNAME = 256 + 2; private final int SO_THIRDBOOLFIELDNAME = 256 + 3; private final int SO_FOURTHBOOLFIELDNAME = 256 + 4; - int SO_BOOLEANLIST[] = - { - SO_FIRSTBOOLFIELDNAME, SO_SECONDBOOLFIELDNAME, SO_THIRDBOOLFIELDNAME, SO_FOURTHBOOLFIELDNAME - }; - final int SO_OPTQUERYMODE = 5; private int SOI_MATCHALL = 0; private int SOI_MATCHANY = 1; private int curHelpID; @@ -373,7 +368,6 @@ public class FilterComponent public FilterComponent(WizardDialog CurUnoDialog, XMultiServiceFactory _xMSF, int iStep, int iPosX, int iPosY, int iWidth, int FilterCount, QueryMetaData _oQueryMetaData, int _firstHelpID) { this.curHelpID = _firstHelpID; - this.xMSF = _xMSF; this.IStep = Integer.valueOf(iStep); curtabindex = UnoDialog.setInitialTabindex(iStep); diff --git a/wizards/com/sun/star/wizards/ui/SortingComponent.java b/wizards/com/sun/star/wizards/ui/SortingComponent.java index ffec486adc4a..67db72753d47 100644 --- a/wizards/com/sun/star/wizards/ui/SortingComponent.java +++ b/wizards/com/sun/star/wizards/ui/SortingComponent.java @@ -26,16 +26,16 @@ import java.util.ArrayList; public class SortingComponent { - private com.sun.star.lang.XMultiServiceFactory xMSF; + private WizardDialog CurUnoDialog; private int MaxSortIndex = -1; - public String[][] FieldNames; + private static String sNoSorting; private static String sSortCriteriaisduplicate; private static String[] sSortHeader = new String[4]; private static String[] sSortAscend = new String[4]; private static String[] sSortDescend = new String[4]; - static short[] bOldSortValues = new short[4]; + private int MAXSORTCRITERIAINDEX = 3; private final int SOFIRSTSORTLST = 0; private final int SOSECSORTLST = 1; @@ -69,7 +69,6 @@ public class SortingComponent { this.CurUnoDialog = CurUnoDialog; short curtabindex = UnoDialog.setInitialTabindex(iStep); - xMSF = CurUnoDialog.xMSF; Integer IStep = new Integer(iStep); Integer ICompPosX = new Integer(iCompPosX); Integer ICompWidth = new Integer(iCompWidth); diff --git a/wizards/com/sun/star/wizards/ui/TitlesComponent.java b/wizards/com/sun/star/wizards/ui/TitlesComponent.java index 0b379f1ec637..4558077dfba7 100644 --- a/wizards/com/sun/star/wizards/ui/TitlesComponent.java +++ b/wizards/com/sun/star/wizards/ui/TitlesComponent.java @@ -34,7 +34,7 @@ public class TitlesComponent extends ControlScroller private String[] fieldnames; private Map<String, String> fieldtitleset; private String[] fieldtitles; - public XTextListener xTextListener; + private final String SOLABELPREFIX = "lblColumnName_"; private final String SOTITLEPREFIX = "lblTitleName_"; @@ -89,7 +89,7 @@ public class TitlesComponent extends ControlScroller private class ControlRow { - PropertyValue[] regproperties; + private XTextComponent xTextComponent; private ControlRow(int _index, int _iCompPosY) diff --git a/wizards/com/sun/star/wizards/ui/UnoDialog.java b/wizards/com/sun/star/wizards/ui/UnoDialog.java index 8745987e875b..6f184f1cea30 100644 --- a/wizards/com/sun/star/wizards/ui/UnoDialog.java +++ b/wizards/com/sun/star/wizards/ui/UnoDialog.java @@ -50,7 +50,7 @@ public class UnoDialog implements EventNames public XComponent xComponent; public XInterface xDialogModel; private XInterface xUnoDialog; - private XPropertySet xPSetDlg; + private XVclWindowPeer xVclWindowPeer; public HashMap<String, Integer> ControlList; public Resource m_oResource; @@ -77,7 +77,7 @@ public class UnoDialog implements EventNames xControl = UnoRuntime.queryInterface(XControl.class, xUnoDialog); XControlModel xControlModel = UnoRuntime.queryInterface(XControlModel.class, xDialogModel); xControl.setModel(xControlModel); - xPSetDlg = UnoRuntime.queryInterface(XPropertySet.class, xDialogModel); + UnoRuntime.queryInterface(XPropertySet.class, xDialogModel); xDlgContainer = UnoRuntime.queryInterface(XControlContainer.class, xUnoDialog); xDlgNames = UnoRuntime.queryInterface(XNameContainer.class, xDialogModel); xComponent = UnoRuntime.queryInterface(XComponent.class, xUnoDialog); diff --git a/wizards/com/sun/star/wizards/ui/WizardDialog.java b/wizards/com/sun/star/wizards/ui/WizardDialog.java index a927ebb39964..825eecba647d 100644 --- a/wizards/com/sun/star/wizards/ui/WizardDialog.java +++ b/wizards/com/sun/star/wizards/ui/WizardDialog.java @@ -48,13 +48,13 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL private static final String FINISH_ACTION_PERFORMED = "finishWizard_1"; private static final String CANCEL_ACTION_PERFORMED = "cancelWizard_1"; private static final String HELP_ACTION_PERFORMED = "callHelp"; - public VetoableChangeSupport vetos = new VetoableChangeSupport(this); + private String[] sRightPaneHeaders; private int iButtonWidth = 50; private int nNewStep = 1; private int nOldStep = 1; private int nMaxStep = 1; - protected XItemListener RoadmapItemListener; + private XControl xRoadmapControl; private XItemEventBroadcaster xRoadmapBroadcaster; private String[] sRMItemLabels; @@ -62,7 +62,7 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL private XSingleServiceFactory xSSFRoadmap; public XIndexContainer xIndexContRoadmap; private Resource oWizardResource; - private String sMsgEndAutopilot; + private int hid; private boolean bTerminateListenermustberemoved = true; @@ -80,7 +80,6 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL super(xMSF); hid = hid_; oWizardResource = new Resource(xMSF, "Common", "dbw"); - sMsgEndAutopilot = oWizardResource.getResText(UIConsts.RID_DB_COMMON + 33); //new Resource(xMSF,"Common","com"); } diff --git a/wizards/com/sun/star/wizards/ui/event/EventNames.java b/wizards/com/sun/star/wizards/ui/event/EventNames.java index fbb733f522de..0cf0f17ef5fb 100644 --- a/wizards/com/sun/star/wizards/ui/event/EventNames.java +++ b/wizards/com/sun/star/wizards/ui/event/EventNames.java @@ -33,7 +33,7 @@ public interface EventNames public static final String EVENT_KEY_PRESSED = "KPR"; public static final String EVENT_KEY_RELEASED = "KRE"; //mouse events public static final String EVENT_MOUSE_PRESSED = "MPR"; - public static final String EVENT_MOUSE_RELEASED = "MRE"; + public static final String EVENT_MOUSE_ENTERED = "MEN"; public static final String EVENT_MOUSE_EXITED = "MEX"; //other events } |