summaryrefslogtreecommitdiff
path: root/wizards
diff options
context:
space:
mode:
Diffstat (limited to 'wizards')
-rw-r--r--wizards/com/sun/star/wizards/document/GridControl.java1
-rw-r--r--wizards/com/sun/star/wizards/form/FormDocument.java2
-rw-r--r--wizards/com/sun/star/wizards/report/GroupFieldHandler.java3
-rw-r--r--wizards/com/sun/star/wizards/report/ReportLayouter.java1
-rw-r--r--wizards/com/sun/star/wizards/report/ReportTextDocument.java4
-rw-r--r--wizards/com/sun/star/wizards/report/ReportTextImplementation.java1
-rw-r--r--wizards/com/sun/star/wizards/report/ReportWizard.java8
-rw-r--r--wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java2
-rw-r--r--wizards/com/sun/star/wizards/reportbuilder/layout/Tabular.java1
-rw-r--r--wizards/com/sun/star/wizards/table/TableWizard.java24
-rw-r--r--wizards/com/sun/star/wizards/text/TextDocument.java1
-rw-r--r--wizards/com/sun/star/wizards/text/TextSectionHandler.java1
-rw-r--r--wizards/com/sun/star/wizards/ui/FilterComponent.java5
-rw-r--r--wizards/com/sun/star/wizards/ui/ImageList.java1
-rw-r--r--wizards/com/sun/star/wizards/ui/PathSelection.java1
-rw-r--r--wizards/com/sun/star/wizards/ui/WizardDialog.java9
-rw-r--r--wizards/com/sun/star/wizards/ui/event/SimpleDataAware.java32
17 files changed, 2 insertions, 95 deletions
diff --git a/wizards/com/sun/star/wizards/document/GridControl.java b/wizards/com/sun/star/wizards/document/GridControl.java
index f7bab37436e5..ce7ef674abf7 100644
--- a/wizards/com/sun/star/wizards/document/GridControl.java
+++ b/wizards/com/sun/star/wizards/document/GridControl.java
@@ -61,7 +61,6 @@ public class GridControl extends Shape
xGridColumnFactory = UnoRuntime.queryInterface( XGridColumnFactory.class, oGridModel );
xComponent = UnoRuntime.queryInterface( XComponent.class, oGridModel );
-// Helper.setUnoPropertyValue(oGridModel, PropertyNames.PROPERTY_NAME, _sname);
for (int i = 0; i < fieldcolumns.length; i++)
{
FieldColumn curfieldcolumn = fieldcolumns[i];
diff --git a/wizards/com/sun/star/wizards/form/FormDocument.java b/wizards/com/sun/star/wizards/form/FormDocument.java
index 295a5c6879f8..62ef353c8001 100644
--- a/wizards/com/sun/star/wizards/form/FormDocument.java
+++ b/wizards/com/sun/star/wizards/form/FormDocument.java
@@ -160,7 +160,6 @@ public class FormDocument extends TextDocument
adjustMainFormSize(_NBorderType);
final ControlForm aSubControlForm = new ControlForm(this, SOSUBFORM, getSubFormPoint(), getSubFormSize());
oControlForms.add(aSubControlForm);
- /* ((ControlForm) oControlForms.get(1))*/
aSubControlForm.initialize(curUIControlArranger.getSelectedArrangement(1), _NBorderType);
}
else if (_bModifySubForm)
@@ -260,7 +259,6 @@ public class FormDocument extends TextDocument
}
else
{
-// oSubControlForm.oFormController.adjustYPositions(_idiffheight);
oSubControlForm.setStartPoint(new Point(oSubControlForm.aStartPoint.X, oMainControlForm.getActualFormHeight() + oMainControlForm.aStartPoint.Y + SOFORMGAP));
oSubControlForm.oFormController.positionControls(oSubControlForm.curArrangement, oSubControlForm.aStartPoint, curUIControlArranger.getAlignValue(), _NBorderType);
}
diff --git a/wizards/com/sun/star/wizards/report/GroupFieldHandler.java b/wizards/com/sun/star/wizards/report/GroupFieldHandler.java
index d62fe3f2165d..e992e99150a0 100644
--- a/wizards/com/sun/star/wizards/report/GroupFieldHandler.java
+++ b/wizards/com/sun/star/wizards/report/GroupFieldHandler.java
@@ -137,7 +137,7 @@ public class GroupFieldHandler extends FieldSelection
}
- /* protected */ private class FieldSelectionListener implements com.sun.star.wizards.ui.XFieldSelectionListener
+ private class FieldSelectionListener implements com.sun.star.wizards.ui.XFieldSelectionListener
{
public void moveItemDown(String Selitem)
@@ -174,7 +174,6 @@ public class GroupFieldHandler extends FieldSelection
String[] NewSelGroupNames = xSelectedFieldsListBox.getItems();
CurUnoDialog.setControlProperty("lblBlindTextNote_1", PropertyNames.PROPERTY_ENABLED, Boolean.valueOf(NewSelGroupNames.length == 0));
- // CurReportDocument.refreshGroupFields(xSelectedFieldsListBox.getItems());
}
}
diff --git a/wizards/com/sun/star/wizards/report/ReportLayouter.java b/wizards/com/sun/star/wizards/report/ReportLayouter.java
index 475e2d554f19..84328628d24c 100644
--- a/wizards/com/sun/star/wizards/report/ReportLayouter.java
+++ b/wizards/com/sun/star/wizards/report/ReportLayouter.java
@@ -260,7 +260,6 @@ public class ReportLayouter
break;
case SOOPTLANDSCAPE:
- // CurReportDocument.getDoc().changePageOrientation(true);
try
{
CurReportDocument.setPageOrientation(SOOPTLANDSCAPE);
diff --git a/wizards/com/sun/star/wizards/report/ReportTextDocument.java b/wizards/com/sun/star/wizards/report/ReportTextDocument.java
index f052ce219dce..fcd6bae0b244 100644
--- a/wizards/com/sun/star/wizards/report/ReportTextDocument.java
+++ b/wizards/com/sun/star/wizards/report/ReportTextDocument.java
@@ -99,12 +99,10 @@ class ReportTextDocument extends com.sun.star.wizards.text.TextDocument implemen
oTextFieldHandler = new TextFieldHandler(xMSFDoc, xTextDocument);
DBColumnsVector = new java.util.ArrayList<DBColumn>();
oNumberFormatter = oTextTableHandler.getNumberFormatter();
- // CurDBMetaData = new RecordParser(xMSF); //, CharLocale, oNumberFormatter);
CurDBMetaData = _aRecordParser;
long lDateCorrection = oNumberFormatter.getNullDateCorrection();
oNumberFormatter.setBooleanReportDisplayNumberFormat();
oNumberFormatter.setNullDateCorrection(lDateCorrection);
- // sMsgInvalidTextField = oResource.getResText(UIConsts.RID_REPORT + 73);
sMsgTableNotExisting = oResource.getResText(UIConsts.RID_REPORT + 61);
sMsgCommonReportError = oResource.getResText(UIConsts.RID_REPORT + 72);
sMsgCommonReportError = JavaTools.replaceSubString(sMsgCommonReportError, String.valueOf((char) 13), "<BR>");
@@ -157,8 +155,6 @@ class ReportTextDocument extends com.sun.star.wizards.text.TextDocument implemen
if (CurDBMetaData.getCommandType() == CommandType.QUERY)
{
oFormHandler.insertHiddenControl(xNameAccess, xNamedForm, PropertyNames.COMMAND, "");
- //DBMetaData.CommandObject oCommand = CurDBMetaData.getQueryByName(CurDBMetaData.getCommandName());
- //oFormHandler.insertHiddenControl(xNameAccess, xNamedForm, COMMAND, CurDBMetaData.Command);
}
else
{
diff --git a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
index 74dcbebe16cd..ee477c473205 100644
--- a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
+++ b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
@@ -491,7 +491,6 @@ public class ReportTextImplementation extends ReportImplementationHelper impleme
public void setPageOrientation(int nOrientation) throws com.sun.star.lang.IllegalArgumentException
{
// LLA: should we lock controllers here?
- // CurReportDocument.getDoc().xTextDocument.lockControllers();
if (nOrientation == ReportLayouter.SOOPTLANDSCAPE)
{
getDoc().changePageOrientation(true);
diff --git a/wizards/com/sun/star/wizards/report/ReportWizard.java b/wizards/com/sun/star/wizards/report/ReportWizard.java
index 1dc886b437da..945fdeb14fa9 100644
--- a/wizards/com/sun/star/wizards/report/ReportWizard.java
+++ b/wizards/com/sun/star/wizards/report/ReportWizard.java
@@ -188,7 +188,6 @@ public class ReportWizard extends DatabaseObjectWizard implements XTextListener
case SOTITLEPAGE:
String[] sFieldTitles = CurTitlesComponent.getFieldTitles();
// set new field name titles
- // CurReportDocument.getRecordParser().setFieldTitles(sFieldTitles);
m_reportDocument.setFieldTitles(sFieldTitles);
break;
@@ -196,13 +195,11 @@ public class ReportWizard extends DatabaseObjectWizard implements XTextListener
// TODO: DESIGN!!! a getter should return a value!!!
CurGroupFieldHandler.getGroupFieldNames(m_reportDocument.getRecordParser());
String[] aGroupFieldNames = m_reportDocument.getRecordParser().GroupFieldNames;
- // CurReportDocument.getRecordParser().prependSortFieldNames(aGroupFieldNames);
m_reportDocument.setGrouping(aGroupFieldNames);
break;
case SOSORTPAGE:
String[][] aSortFieldNames = CurSortingComponent.getSortFieldNames();
- // CurReportDocument.getRecordParser().SortFieldNames = aSortFieldNames;
m_reportDocument.setSorting(aSortFieldNames);
// TODO: why do we make a switch here
super.enablefromStep(SOTEMPLATEPAGE, true);
@@ -308,7 +305,6 @@ public class ReportWizard extends DatabaseObjectWizard implements XTextListener
private void buildSteps()
{
- // CurReportDocument.getDoc().xProgressBar.setValue(30);
CurDBCommandFieldSelection = new CommandFieldSelection(this, m_reportDocument.getRecordParser(), 100, slblFields, slblSelFields, slblTables, true, 34330);
CurDBCommandFieldSelection.addFieldSelectionListener(new FieldSelectionListener());
if (!isReportBuilderInstalled())
@@ -509,7 +505,6 @@ public class ReportWizard extends DatabaseObjectWizard implements XTextListener
}
if (bexecute)
{
- // CurDataimport.insertDatabaseDatatoReportDocument(xMSF);
m_reportDocument.insertDatabaseDatatoReportDocument(xMSF);
}
@@ -596,7 +591,7 @@ public class ReportWizard extends DatabaseObjectWizard implements XTextListener
boolean bEnabled = NewItems.length > 0;
setControlProperty("btnWizardNext", PropertyNames.PROPERTY_ENABLED, Boolean.valueOf(bEnabled));
setControlProperty("btnWizardFinish", PropertyNames.PROPERTY_ENABLED, Boolean.valueOf(bEnabled));
- enableRoadmapItems(bEnabled); // Note: Performancewise this could be improved
+ enableRoadmapItems(bEnabled); // Note: Performance-wise this could be improved
}
public void textChanged(TextEvent xTextEvent)
@@ -606,7 +601,6 @@ public class ReportWizard extends DatabaseObjectWizard implements XTextListener
Object oModel = UnoDialog.getModel(xTextEvent.Source);
String sContent = (String) Helper.getUnoPropertyValue(oModel, "Text");
String fieldname = this.CurTitlesComponent.getFieldNameByTitleControl(oModel);
- // CurReportDocument.getDoc().oTextFieldHandler.changeUserFieldContent(fieldname, sfieldtitle);
m_reportDocument.liveupdate_changeUserFieldContent(fieldname, sContent);
}
catch (Exception exception)
diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java b/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java
index bef28fae4032..bfdf6e523b0e 100644
--- a/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java
+++ b/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java
@@ -1186,8 +1186,6 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter
// but there seems some problems, we have to control.
copyProperties(aComponent, aClone);
- // aShape.setPosition(aComponent.getPosition());
- // aShape.setSize(aComponent.getSize());
_xToSection.add(aShape);
}
}
diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/Tabular.java b/wizards/com/sun/star/wizards/reportbuilder/layout/Tabular.java
index ed676f1aa3c6..593ae72609a0 100644
--- a/wizards/com/sun/star/wizards/reportbuilder/layout/Tabular.java
+++ b/wizards/com/sun/star/wizards/reportbuilder/layout/Tabular.java
@@ -107,7 +107,6 @@ public class Tabular extends ReportBuilderLayouter
xGroup = UnoRuntime.queryInterface(XGroup.class, xGroups.getByIndex(lastGroupPostion));
// We don't need to copy the GroupProperties, because this is done in the insertGroup() member function
- // copyGroupProperties(0);
aSO = getDesignTemplate().getGroupLabel(lastGroupPostion);
}
diff --git a/wizards/com/sun/star/wizards/table/TableWizard.java b/wizards/com/sun/star/wizards/table/TableWizard.java
index ea61d6757c0e..7644935a8163 100644
--- a/wizards/com/sun/star/wizards/table/TableWizard.java
+++ b/wizards/com/sun/star/wizards/table/TableWizard.java
@@ -213,30 +213,6 @@ public class TableWizard extends DatabaseObjectWizard implements XTextListener
}
}
-/*
- public static void main(String args[])
- {
- String ConnectStr = "uno:socket,host=localhost,port=8100;urp,negotiate=0,forcesynchronous=1;StarOffice.NamingService";
- PropertyValue[] curproperties = null;
- try
- {
- XMultiServiceFactory xLocMSF = com.sun.star.wizards.common.Desktop.connect(ConnectStr);
- TableWizard CurTableWizard = new TableWizard(xLocMSF);
- if (xLocMSF != null)
- {
- System.out.println("Connected to " + ConnectStr);
- curproperties = new PropertyValue[1];
- curproperties[0] = Properties.createProperty("DataSourceName", "Bibliography");
- //curproperties[0] = Properties.createProperty("DatabaseLocation", "file:///path/to/database.odb");
- CurTableWizard.startTableWizard(xLocMSF, curproperties);
- }
- }
- catch (Exception exception)
- {
- exception.printStackTrace(System.err);
- }
- }
-*/
private void buildSteps()
{
curScenarioSelector = new ScenarioSelector(this, this.curTableDescriptor, slblFields, slblSelFields);
diff --git a/wizards/com/sun/star/wizards/text/TextDocument.java b/wizards/com/sun/star/wizards/text/TextDocument.java
index 181314aade12..b34e1e06cc6f 100644
--- a/wizards/com/sun/star/wizards/text/TextDocument.java
+++ b/wizards/com/sun/star/wizards/text/TextDocument.java
@@ -197,7 +197,6 @@ public class TextDocument
xFrame = _textDocument.getCurrentController().getFrame();
xComponent = UnoRuntime.queryInterface(XComponent.class, _textDocument);
xTextDocument = UnoRuntime.queryInterface(XTextDocument.class, xComponent);
- //PosSize = xFrame.getComponentWindow().getPosSize();
if (bshowStatusIndicator)
{
XStatusIndicatorFactory xStatusIndicatorFactory = UnoRuntime.queryInterface(XStatusIndicatorFactory.class, xFrame);
diff --git a/wizards/com/sun/star/wizards/text/TextSectionHandler.java b/wizards/com/sun/star/wizards/text/TextSectionHandler.java
index 4c4a9ff10b48..ddbe78a3f6c4 100644
--- a/wizards/com/sun/star/wizards/text/TextSectionHandler.java
+++ b/wizards/com/sun/star/wizards/text/TextSectionHandler.java
@@ -208,7 +208,6 @@ public class TextSectionHandler
{
XTextCursor xTextCursor = xText.createTextCursor();
xText.insertControlCharacter(xTextCursor, ControlCharacter.PARAGRAPH_BREAK, false);
- // Helper.setUnoPropertyValue(xTextCursor, "PageDescName", "First Page");
xTextCursor.collapseToEnd();
}
XTextCursor xSecondTextCursor = xText.createTextCursor();
diff --git a/wizards/com/sun/star/wizards/ui/FilterComponent.java b/wizards/com/sun/star/wizards/ui/FilterComponent.java
index 9c416f02df8f..4c7a399b172d 100644
--- a/wizards/com/sun/star/wizards/ui/FilterComponent.java
+++ b/wizards/com/sun/star/wizards/ui/FilterComponent.java
@@ -454,11 +454,9 @@ public class FilterComponent
for (i = 0; i < RowCount; i++)
{
oControlRows[i].setFieldNames(_fieldnames);
- // oControlRows[i].setFieldNames(aFieldNamesWithAdditionalEmpty);
}
this.filterconditions = _filterconditions;
PropertyValue[] curfilterconditions;
- // int a;
if (_filterconditions.length == 1)
{
curfilterconditions = filterconditions[0];
@@ -759,7 +757,6 @@ public class FilterComponent
sValue = JavaTools.replaceSubString(sValue, PropertyNames.EMPTY_STRING, "' }");
try
{
- //Helper.setUnoPropertyValue(UnoDialog.getModel(ControlElements[SOTXTVALUE]), "EffectiveValue", );
oQueryMetaData.getNumberFormatter().convertStringToNumber(iDateFormat, sValue);
}
catch (java.lang.Exception ex)
@@ -774,7 +771,6 @@ public class FilterComponent
sValue = JavaTools.replaceSubString(sValue, PropertyNames.EMPTY_STRING, "' }");
try
{
- //Helper.setUnoPropertyValue(UnoDialog.getModel(ControlElements[SOTXTVALUE]), "EffectiveValue", );
oQueryMetaData.getNumberFormatter().convertStringToNumber(iTimeFormat, sValue);
}
catch (java.lang.Exception ex)
@@ -786,7 +782,6 @@ public class FilterComponent
//TODO: other datetime formats?
else
{
- //Helper.setUnoPropertyValue(UnoDialog.getModel(ControlElements[SOTXTVALUE]), "EffectiveValue", sValue);
}
}
else if (AnyConverter.isBoolean(_filtercondition.Value))
diff --git a/wizards/com/sun/star/wizards/ui/ImageList.java b/wizards/com/sun/star/wizards/ui/ImageList.java
index 011c9ecce72a..0b45dc4cc626 100644
--- a/wizards/com/sun/star/wizards/ui/ImageList.java
+++ b/wizards/com/sun/star/wizards/ui/ImageList.java
@@ -523,7 +523,6 @@ public class ImageList implements XItemEventBroadcaster, ListDataListener
public void intervalRemoved(ListDataEvent event)
{
- //contentsChanged(event);
}
/** Registers ItemListener to receive events.
diff --git a/wizards/com/sun/star/wizards/ui/PathSelection.java b/wizards/com/sun/star/wizards/ui/PathSelection.java
index e3b14186d3f4..2c108687bd0c 100644
--- a/wizards/com/sun/star/wizards/ui/PathSelection.java
+++ b/wizards/com/sun/star/wizards/ui/PathSelection.java
@@ -79,7 +79,6 @@ public class PathSelection
{
Boolean.valueOf(Enabled), 12, TxtHelpURL, new Integer(XPos), new Integer(YPos + 10), new Integer(DialogStep), new Short((short) (CurTabIndex + 1)), new Integer(Width - 26)
});
- //CurUnoDialog.setControlProperty("txtSavePath", PropertyNames.READ_ONLY, Boolean.TRUE);
CurUnoDialog.setControlProperty("txtSavePath", PropertyNames.PROPERTY_ENABLED, Boolean.FALSE);
CurUnoDialog.insertButton("cmdSelectPath", "triggerPathPicker", this, new String[]
{
diff --git a/wizards/com/sun/star/wizards/ui/WizardDialog.java b/wizards/com/sun/star/wizards/ui/WizardDialog.java
index aac598d1c532..115e94fc1e9c 100644
--- a/wizards/com/sun/star/wizards/ui/WizardDialog.java
+++ b/wizards/com/sun/star/wizards/ui/WizardDialog.java
@@ -80,8 +80,6 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL
super(xMSF);
hid = hid_;
oWizardResource = new Resource(xMSF, "Common", "dbw");
-
- //new Resource(xMSF,"Common","com");
}
@Override
@@ -258,13 +256,6 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL
return sRMItemLabels;
}
- /* public void insertRoadmapItems(int StartIndex, int RMCount)
- {
- Object oRoadmapItem;
- boolean bEnabled;
- for (int i = StartIndex; i < (StartIndex + RMCount); i++)
- insertSingleRoadmapItem(i, true, sRMItemLabels[i], i);
- }*/
public int insertRoadmapItem(int _Index, boolean _bEnabled, int _LabelID, int _CurItemID)
{
return insertRoadmapItem(_Index, _bEnabled, sRMItemLabels[_LabelID], _CurItemID);
diff --git a/wizards/com/sun/star/wizards/ui/event/SimpleDataAware.java b/wizards/com/sun/star/wizards/ui/event/SimpleDataAware.java
index 6767682a176d..0595820f4006 100644
--- a/wizards/com/sun/star/wizards/ui/event/SimpleDataAware.java
+++ b/wizards/com/sun/star/wizards/ui/event/SimpleDataAware.java
@@ -31,44 +31,12 @@ public class SimpleDataAware extends DataAware
controlValue = controlValue_;
}
- /*
- protected void enableControls(Object value) {
- Boolean b = getBoolean(value);
- for (int i = 0; i<disableObjects.length; i++)
- UIHelper.setEnabled(disableObjects[i],b);
- }
- */
@Override
protected void setToUI(Object value)
{
controlValue.set(value, control);
}
- /**
- * Try to get from an arbitrary object a boolean value.
- * Null returns Boolean.FALSE;
- * A Boolean object returns itself.
- * An Array returns true if it not empty.
- * An Empty String returns Boolean.FALSE.
- * everything else returns a Boolean.TRUE.
- * @param value
- * @return
- */
- /*protected Boolean getBoolean(Object value) {
- if (value==null)
- return Boolean.FALSE;
- if (value instanceof Boolean)
- return (Boolean)value;
- else if (value.getClass().isArray())
- return ((short[])value).length != 0 ? Boolean.TRUE : Boolean.FALSE;
- else if (value.equals(PropertyNames.EMPTY_STRING)) return Boolean.FALSE;
- else return Boolean.TRUE;
- }
-
- public void disableControls(Object[] controls) {
- disableObjects = controls;
- }
- */
@Override
protected Object getFromUI()
{
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-25 19:10:40 +0000