diff options
Diffstat (limited to 'wizards/com')
18 files changed, 37 insertions, 54 deletions
diff --git a/wizards/com/sun/star/wizards/common/Desktop.java b/wizards/com/sun/star/wizards/common/Desktop.java index 8b2c39a80a83..02d2e6814d16 100644 --- a/wizards/com/sun/star/wizards/common/Desktop.java +++ b/wizards/com/sun/star/wizards/common/Desktop.java @@ -98,7 +98,7 @@ public class Desktop return UnoRuntime.queryInterface(XSpreadsheetDocument.class, xComponent); } - public static XDispatch getDispatcher(XMultiServiceFactory xMSF, XFrame xFrame, String _stargetframe, com.sun.star.util.URL oURL) + public static XDispatch getDispatcher(XFrame xFrame, String _stargetframe, com.sun.star.util.URL oURL) { try { @@ -136,7 +136,7 @@ public class Desktop public static void dispatchURL(XMultiServiceFactory xMSF, String sURL, XFrame xFrame, String _stargetframe) { com.sun.star.util.URL oURL = getDispatchURL(xMSF, sURL); - XDispatch xDispatch = getDispatcher(xMSF, xFrame, _stargetframe, oURL); + XDispatch xDispatch = getDispatcher(xFrame, _stargetframe, oURL); dispatchURL(xDispatch, oURL); } diff --git a/wizards/com/sun/star/wizards/common/FileAccess.java b/wizards/com/sun/star/wizards/common/FileAccess.java index 57804e6e8056..28bce7bb4cd3 100644 --- a/wizards/com/sun/star/wizards/common/FileAccess.java +++ b/wizards/com/sun/star/wizards/common/FileAccess.java @@ -201,7 +201,7 @@ public class FileAccess return ResultPath; } - public static ArrayList<String> getOfficePaths(XMultiServiceFactory xMSF, String _sPath, String sType, String sSearchDir) + public static ArrayList<String> getOfficePaths(XMultiServiceFactory xMSF, String _sPath) { //This method currently only works with sPath="Template" diff --git a/wizards/com/sun/star/wizards/db/BlindtextCreator.java b/wizards/com/sun/star/wizards/db/BlindtextCreator.java index 96208c89e6a3..6f532f188d41 100644 --- a/wizards/com/sun/star/wizards/db/BlindtextCreator.java +++ b/wizards/com/sun/star/wizards/db/BlindtextCreator.java @@ -31,28 +31,28 @@ public class BlindtextCreator String BlindTextString = PropertyNames.EMPTY_STRING; if (bIsGroupTable) { - return getBlindTextString(FieldTitle, FieldWidth, FieldWidth); + return getBlindTextString(FieldTitle, FieldWidth); } int MaxFieldCount = getMaxFieldCount(bIsCurLandscape); if (_RecordFieldNames.length <= 2 * MaxFieldCount) { if (_RecordFieldNames.length <= MaxFieldCount) { - BlindTextString = getBlindTextString(FieldTitle, FieldWidth, FieldWidth); + BlindTextString = getBlindTextString(FieldTitle, FieldWidth); } else { - BlindTextString = getBlindTextString(FieldTitle, FieldWidth, (int) (0.5 * FieldWidth)); + BlindTextString = getBlindTextString(FieldTitle, (int) (0.5 * FieldWidth)); } } else { - BlindTextString = getBlindTextString(FieldTitle, FieldWidth, (int) 1.1 * FieldTitle.length()); + BlindTextString = getBlindTextString(FieldTitle, (int) 1.1 * FieldTitle.length()); } return BlindTextString; } - public static String getBlindTextString(String FieldTitle, int FieldWidth, int MaxWidth) + public static String getBlindTextString(String FieldTitle, int MaxWidth) { String[] BlindTextArray = JavaTools.ArrayoutofString(BlindText, PropertyNames.SPACE); String PartBlindText = BlindTextArray[0]; diff --git a/wizards/com/sun/star/wizards/db/FieldColumn.java b/wizards/com/sun/star/wizards/db/FieldColumn.java index 409af6e15002..b153908df7f0 100644 --- a/wizards/com/sun/star/wizards/db/FieldColumn.java +++ b/wizards/com/sun/star/wizards/db/FieldColumn.java @@ -416,11 +416,11 @@ public class FieldColumn break; case DataType.VARCHAR: // == 12; - DefaultValue = BlindtextCreator.getBlindTextString(FieldTitle, FieldWidth, FieldWidth); + DefaultValue = BlindtextCreator.getBlindTextString(FieldTitle, FieldWidth); break; case DataType.LONGVARCHAR: // == -1; - DefaultValue = BlindtextCreator.getBlindTextString(FieldTitle, FieldWidth, FieldWidth); + DefaultValue = BlindtextCreator.getBlindTextString(FieldTitle, FieldWidth); break; case DataType.NUMERIC: // == 2; diff --git a/wizards/com/sun/star/wizards/form/FormDocument.java b/wizards/com/sun/star/wizards/form/FormDocument.java index eb2a997ef6bf..bd89cbc1d3ba 100644 --- a/wizards/com/sun/star/wizards/form/FormDocument.java +++ b/wizards/com/sun/star/wizards/form/FormDocument.java @@ -68,12 +68,12 @@ public class FormDocument extends TextDocument { oFormHandler = new FormHandler(xMSF, xTextDocument); oFormHandler.setDrawObjectsCaptureMode(false); - oTextStyleHandler = new TextStyleHandler(xMSFDoc, xTextDocument); - oViewHandler = new ViewHandler(xMSFDoc, xTextDocument); + oTextStyleHandler = new TextStyleHandler(xTextDocument); + oViewHandler = new ViewHandler(xTextDocument); oMainFormDBMetaData = new CommandMetaData(xMSF);// , CharLocale); oSubFormDBMetaData = new CommandMetaData(xMSF);// , CharLocale); - ViewHandler oViewHandler = new ViewHandler(xMSF, xTextDocument); - TextStyleHandler oTextStyleSupplier = new TextStyleHandler(xMSFDoc, xTextDocument); + ViewHandler oViewHandler = new ViewHandler(xTextDocument); + TextStyleHandler oTextStyleSupplier = new TextStyleHandler(xTextDocument); Helper.setUnoPropertyValue(xTextDocument, "ApplyFormDesignMode", Boolean.FALSE); oViewHandler.setViewSetting("ShowTableBoundaries", Boolean.FALSE); oViewHandler.setViewSetting("ShowOnlineLayout", Boolean.TRUE); diff --git a/wizards/com/sun/star/wizards/form/StyleApplier.java b/wizards/com/sun/star/wizards/form/StyleApplier.java index 24e3e62f750f..40f551592561 100644 --- a/wizards/com/sun/star/wizards/form/StyleApplier.java +++ b/wizards/com/sun/star/wizards/form/StyleApplier.java @@ -69,7 +69,7 @@ public class StyleApplier this.curFormDocument = _curFormDocument; xMSF = curFormDocument.xMSF; - TextStyleHandler oTextStyleHandler = new TextStyleHandler(xMSF, curFormDocument.xTextDocument); + TextStyleHandler oTextStyleHandler = new TextStyleHandler(curFormDocument.xTextDocument); xPageStylePropertySet = oTextStyleHandler.getStyleByName("PageStyles", "Standard"); this.CurUnoDialog = _CurUnoDialog; curtabindex = (short) (FormWizard.SOSTYLE_PAGE * 100); @@ -280,10 +280,6 @@ public class StyleApplier curFormDocument.unlockallControllers(); } - public void disposing(EventObject eventObject) - { - } - private int getStyleColor(String[] _sDataList, String _sHeader, String _sPropertyDescription) { int index = JavaTools.FieldInList(_sDataList, _sHeader); diff --git a/wizards/com/sun/star/wizards/report/DBColumn.java b/wizards/com/sun/star/wizards/report/DBColumn.java index 3be19016063b..4c5884cf3f00 100644 --- a/wizards/com/sun/star/wizards/report/DBColumn.java +++ b/wizards/com/sun/star/wizards/report/DBColumn.java @@ -137,7 +137,7 @@ public class DBColumn return false; } - public DBColumn(TextTableHandler _oTextTableHandler, RecordParser _CurDBMetaData, String _FieldName, int GroupIndex, String TableName, DBColumn OldDBColumn) { + public DBColumn(TextTableHandler _oTextTableHandler, RecordParser _CurDBMetaData, String _FieldName, String TableName, DBColumn OldDBColumn) { this.oTextTableHandler = _oTextTableHandler; this.CurDBMetaData = _CurDBMetaData; CurDBField = CurDBMetaData.getFieldColumnByDisplayName(_FieldName); @@ -153,7 +153,7 @@ public class DBColumn initializeNumberFormat(); } - public DBColumn(TextTableHandler _oTextTableHandler, RecordParser _CurDBMetaData, String _FieldName, int GroupIndex, String TableName) throws Exception + public DBColumn(TextTableHandler _oTextTableHandler, RecordParser _CurDBMetaData, String _FieldName, String TableName) throws Exception { this.oTextTableHandler = _oTextTableHandler; this.CurDBMetaData = _CurDBMetaData; diff --git a/wizards/com/sun/star/wizards/report/Dataimport.java b/wizards/com/sun/star/wizards/report/Dataimport.java index acf3cc63c73f..593b63529a61 100644 --- a/wizards/com/sun/star/wizards/report/Dataimport.java +++ b/wizards/com/sun/star/wizards/report/Dataimport.java @@ -64,7 +64,7 @@ public class Dataimport extends UnoDialog2 implements com.sun.star.awt.XActionLi CurReportDocument.StopProcess(); } - public void showProgressDisplay(XMultiServiceFactory xMSF, boolean bgetConnection) + public void showProgressDisplay(boolean bgetConnection) { try { @@ -166,7 +166,7 @@ public class Dataimport extends UnoDialog2 implements com.sun.star.awt.XActionLi PropertyValue[] properties) { CurReportDocument = ReportTextImplementation.create( xMSF, i_documentUI, _textDocument, m_oResource ); - showProgressDisplay(xMSF, true); + showProgressDisplay(true); importReportData(xMSF, this, CurReportDocument, properties); } } diff --git a/wizards/com/sun/star/wizards/report/ReportTextDocument.java b/wizards/com/sun/star/wizards/report/ReportTextDocument.java index ed6a9bcfe319..c0871b942754 100644 --- a/wizards/com/sun/star/wizards/report/ReportTextDocument.java +++ b/wizards/com/sun/star/wizards/report/ReportTextDocument.java @@ -94,8 +94,8 @@ class ReportTextDocument extends com.sun.star.wizards.text.TextDocument implemen oTextTableHandler = new TextTableHandler(xMSFDoc, xTextDocument); oTextSectionHandler = new TextSectionHandler(xMSFDoc, xTextDocument); oFormHandler = new FormHandler(xMSFDoc, xTextDocument); - oTextStyleHandler = new TextStyleHandler(xMSFDoc, xTextDocument); - oViewHandler = new ViewHandler(xMSFDoc, xTextDocument); + oTextStyleHandler = new TextStyleHandler(xTextDocument); + oViewHandler = new ViewHandler(xTextDocument); oTextFieldHandler = new TextFieldHandler(xMSFDoc, xTextDocument); DBColumnsVector = new java.util.ArrayList<DBColumn>(); oNumberFormatter = oTextTableHandler.getNumberFormatter(); @@ -283,7 +283,7 @@ class ReportTextDocument extends com.sun.star.wizards.text.TextDocument implemen } for (i = 0; i < GroupCount; i++) { - CurDBColumn = new DBColumn(oTextTableHandler, CurDBMetaData, CurDBMetaData.GroupFieldNames[i], i, TBLGROUPSECTION + (i + 1)); + CurDBColumn = new DBColumn(oTextTableHandler, CurDBMetaData, CurDBMetaData.GroupFieldNames[i], TBLGROUPSECTION + (i + 1)); CurDBColumn.formatValueCell(); DBColumnsVector.set(i, CurDBColumn); replaceFieldValueInGroupTable(CurDBColumn, i); @@ -336,7 +336,7 @@ class ReportTextDocument extends com.sun.star.wizards.text.TextDocument implemen } } - public void replaceFieldValueInRecordSection(int RecordCount) + public void replaceFieldValueInRecordSection() { int GroupCount = CurDBMetaData.GroupFieldNames.length; int FieldCount = CurDBMetaData.getFieldNames().length; @@ -357,7 +357,7 @@ class ReportTextDocument extends com.sun.star.wizards.text.TextDocument implemen { TableName = TBLGROUPSECTION + Integer.toString(i + 1); OldDBColumn = DBColumnsVector.get(i); - CurDBColumn = new DBColumn(oTextTableHandler, CurDBMetaData, SelGroupNames[i], i, TableName, OldDBColumn); + CurDBColumn = new DBColumn(oTextTableHandler, CurDBMetaData, SelGroupNames[i], TableName, OldDBColumn); CurDBColumn.formatValueCell(); DBColumnsVector.set(i, CurDBColumn); CurDBColumn.insertColumnData(oTextFieldHandler, this.bIsCurLandscape); @@ -432,7 +432,7 @@ class ReportTextDocument extends com.sun.star.wizards.text.TextDocument implemen } } - public boolean addGroupNametoDocument(String[] GroupNames, String CurGroupTitle, ArrayList<String> GroupFieldVector, ArrayList<String> ReportPath, int iSelCount) + public boolean addGroupNametoDocument(String CurGroupTitle, ArrayList<String> GroupFieldVector, ArrayList<String> ReportPath, int iSelCount) { DBColumn CurDBColumn = null; int GroupCount = GroupFieldVector.size(); @@ -446,7 +446,7 @@ class ReportTextDocument extends com.sun.star.wizards.text.TextDocument implemen { String sPath = FileAccess.getPathFromList(xMSF, ReportPath, "cnt-default.ott"); oTextSectionHandler.insertTextSection(GROUPSECTION + GroupCount, sPath, GroupCount == 1); - CurDBColumn = new DBColumn(oTextTableHandler, CurDBMetaData, CurFieldColumn.getFieldName(), GroupCount - 1, TBLGROUPSECTION + (GroupCount)); + CurDBColumn = new DBColumn(oTextTableHandler, CurDBMetaData, CurFieldColumn.getFieldName(), TBLGROUPSECTION + (GroupCount)); CurDBColumn.formatValueCell(); DBColumnsVector.add(CurDBColumn); replaceFieldValueInGroupTable(CurDBColumn, GroupCount - 1); @@ -507,7 +507,7 @@ class ReportTextDocument extends com.sun.star.wizards.text.TextDocument implemen { if (i < CurDBMetaData.GroupFieldNames.length) { - CurDBColumn = new DBColumn(oTextTableHandler, CurDBMetaData, CurDBMetaData.GroupFieldNames[i], i, COPYOFTBLGROUPSECTION + (i + 1)); + CurDBColumn = new DBColumn(oTextTableHandler, CurDBMetaData, CurDBMetaData.GroupFieldNames[i], COPYOFTBLGROUPSECTION + (i + 1)); } else { diff --git a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java index b0f3eb078347..09d319210672 100644 --- a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java +++ b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java @@ -477,7 +477,7 @@ public class ReportTextImplementation extends ReportImplementationHelper impleme public boolean liveupdate_addGroupNametoDocument(String[] GroupNames, String CurGroupTitle, ArrayList<String> GroupFieldVector, ArrayList<String> ReportPath, int iSelCount) { - return getDoc().addGroupNametoDocument(GroupNames, CurGroupTitle, GroupFieldVector, ReportPath, iSelCount); + return getDoc().addGroupNametoDocument(CurGroupTitle, GroupFieldVector, ReportPath, iSelCount); } public void refreshGroupFields(String[] _sNewNames) @@ -600,7 +600,7 @@ public class ReportTextImplementation extends ReportImplementationHelper impleme // Check general availability of office paths try { - m_aReportPath = FileAccess.getOfficePaths(getMSF(), "Template", "share", "/wizard"); + m_aReportPath = FileAccess.getOfficePaths(getMSF(), "Template"); FileAccess.combinePaths(getMSF(), m_aReportPath, "/wizard/report"); } catch (Exception e) diff --git a/wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation.java b/wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation.java index 191df4436cab..f6f26d1eeff6 100644 --- a/wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation.java +++ b/wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation.java @@ -504,7 +504,7 @@ public class ReportBuilderImplementation extends ReportImplementationHelper if (m_aReportPath == null) { // Check general availability of office paths - m_aReportPath = FileAccess.getOfficePaths(getMSF(), "Template", "share", "/wizard"); + m_aReportPath = FileAccess.getOfficePaths(getMSF(), "Template"); FileAccess.combinePaths(getMSF(), m_aReportPath, "/wizard/report"); } return m_aReportPath; @@ -632,7 +632,7 @@ public class ReportBuilderImplementation extends ReportImplementationHelper try { // TODO: check different languages in header layouts - ArrayList<String> aReportPath = FileAccess.getOfficePaths(getMSF(), "Template", "share", "/wizard"); + ArrayList<String> aReportPath = FileAccess.getOfficePaths(getMSF(), "Template"); FileAccess.combinePaths(getMSF(), aReportPath, "/wizard/report"); LayoutFiles = FileAccess.getFolderTitles(getMSF(), null, aReportPath, ".otr"); diff --git a/wizards/com/sun/star/wizards/text/TextDocument.java b/wizards/com/sun/star/wizards/text/TextDocument.java index 5ef82e080b1e..b551f36ca32b 100644 --- a/wizards/com/sun/star/wizards/text/TextDocument.java +++ b/wizards/com/sun/star/wizards/text/TextDocument.java @@ -113,7 +113,7 @@ public class TextDocument } // creates an instance of TextDocument from the desktop's current frame - public TextDocument(XMultiServiceFactory xMSF, boolean bShowStatusIndicator, XTerminateListener listener) + public TextDocument(XMultiServiceFactory xMSF, boolean bShowStatusIndicator) { this.xMSF = xMSF; @@ -267,7 +267,7 @@ public class TextDocument DocSize = getPageSize(); xMSFDoc = UnoRuntime.queryInterface(XMultiServiceFactory.class, xTextDocument); - ViewHandler myViewHandler = new ViewHandler(xMSFDoc, xTextDocument); + ViewHandler myViewHandler = new ViewHandler(xTextDocument); try { myViewHandler.setViewSetting("ZoomType", new Short(com.sun.star.view.DocumentZoomType.ENTIRE_PAGE)); diff --git a/wizards/com/sun/star/wizards/text/TextStyleHandler.java b/wizards/com/sun/star/wizards/text/TextStyleHandler.java index 58e8584eb782..c36bdc670ef2 100644 --- a/wizards/com/sun/star/wizards/text/TextStyleHandler.java +++ b/wizards/com/sun/star/wizards/text/TextStyleHandler.java @@ -34,7 +34,7 @@ public class TextStyleHandler public XStyleFamiliesSupplier xStyleFamiliesSupplier; /** Creates a new instance of TextStyleHandler */ - public TextStyleHandler(com.sun.star.lang.XMultiServiceFactory xMSF, XTextDocument xTextDocument) + public TextStyleHandler(XTextDocument xTextDocument) { xStyleFamiliesSupplier = UnoRuntime.queryInterface(XStyleFamiliesSupplier.class, xTextDocument); } diff --git a/wizards/com/sun/star/wizards/text/ViewHandler.java b/wizards/com/sun/star/wizards/text/ViewHandler.java index c0a92184b63f..3a014aa22cce 100644 --- a/wizards/com/sun/star/wizards/text/ViewHandler.java +++ b/wizards/com/sun/star/wizards/text/ViewHandler.java @@ -44,7 +44,7 @@ public class ViewHandler private XViewSettingsSupplier xViewSettingsSupplier; /** Creates a new instance of View */ - public ViewHandler(XMultiServiceFactory xMSF, XTextDocument xTextDocument) + public ViewHandler(XTextDocument xTextDocument) { xTextViewCursorSupplier = UnoRuntime.queryInterface(XTextViewCursorSupplier.class, xTextDocument.getCurrentController()); xViewSettingsSupplier = UnoRuntime.queryInterface(XViewSettingsSupplier.class, xTextDocument.getCurrentController()); diff --git a/wizards/com/sun/star/wizards/ui/ButtonList.java b/wizards/com/sun/star/wizards/ui/ButtonList.java index f80d601e6384..cdec9cba165e 100644 --- a/wizards/com/sun/star/wizards/ui/ButtonList.java +++ b/wizards/com/sun/star/wizards/ui/ButtonList.java @@ -357,10 +357,6 @@ public class ButtonList implements XItemEventBroadcaster, XActionListener return pageStart + i; } - public void contentsChanged(ListDataEvent event) - { - } - public void intervalAdded(ListDataEvent event) { if (event.getIndex0() <= m_nCurrentSelection) @@ -376,10 +372,6 @@ public class ButtonList implements XItemEventBroadcaster, XActionListener } } - public void intervalRemoved(ListDataEvent event) - { - } - /** Registers ItemListener to receive events. * @param listener The listener to register. */ diff --git a/wizards/com/sun/star/wizards/ui/FieldSelection.java b/wizards/com/sun/star/wizards/ui/FieldSelection.java index db28aaa78331..f3217bc363b8 100644 --- a/wizards/com/sun/star/wizards/ui/FieldSelection.java +++ b/wizards/com/sun/star/wizards/ui/FieldSelection.java @@ -493,7 +493,7 @@ public class FieldSelection } } - public void mergeList(String[] AllFieldNames, String[] SecondList) + public void mergeList(String[] AllFieldNames) { xFieldsListBox.addItems(AllFieldNames, (short) 0); toggleListboxButtons((short) - 1, (short) - 1); diff --git a/wizards/com/sun/star/wizards/ui/UnoDialog2.java b/wizards/com/sun/star/wizards/ui/UnoDialog2.java index fbf72b7a0df7..b67c6afab3c6 100644 --- a/wizards/com/sun/star/wizards/ui/UnoDialog2.java +++ b/wizards/com/sun/star/wizards/ui/UnoDialog2.java @@ -343,11 +343,6 @@ public class UnoDialog2 extends UnoDialog return UnoRuntime.queryInterface(type, insertControlModel2(serviceName, componentName, sPropNames, oPropValues)); } - public String translateURL(String relativeURL) - { - return PropertyNames.EMPTY_STRING; - } - public static Object getControlModel(Object unoControl) { return UnoRuntime.queryInterface(XControl.class, unoControl).getModel(); diff --git a/wizards/com/sun/star/wizards/ui/event/UnoDataAware.java b/wizards/com/sun/star/wizards/ui/event/UnoDataAware.java index 5d3675bc8d09..bf0be61d806b 100644 --- a/wizards/com/sun/star/wizards/ui/event/UnoDataAware.java +++ b/wizards/com/sun/star/wizards/ui/event/UnoDataAware.java @@ -199,7 +199,7 @@ public class UnoDataAware extends DataAware }; } - public static UnoDataAware attachLabel(Object data, String prop, Object label, final Listener listener, boolean field) + public static UnoDataAware attachLabel(Object data, String prop, Object label, boolean field) { return new UnoDataAware(data, field ? DataAwareFields.getFieldValueFor(data, prop, PropertyNames.EMPTY_STRING) |