forms/qa/integration/forms/ListBox.java
| 4 -
forms/qa/integration/forms/TableCellTextBinding.java
| 4 -
framework/qa/complex/XUserInputInterception/EventTest.java
| 1
framework/qa/complex/accelerators/AcceleratorsConfigurationTest.java
| 8 +-
framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java
| 2
framework/qa/complex/framework/recovery/RecoveryTest.java
| 4 -
framework/qa/complex/imageManager/CheckImageManager.java
| 6 -
framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java
| 2
framework/qa/complex/loadAllDocuments/StatusIndicator.java
| 2
framework/qa/complex/path_settings/PathSettingsTest.java
| 15 +---
odk/examples/DevelopersGuide/Charts/ChartHelper.java
| 2
odk/examples/DevelopersGuide/Charts/ChartInDraw.java
| 1
odk/examples/DevelopersGuide/Charts/ChartInWriter.java
| 1
odk/examples/DevelopersGuide/Charts/ListenAtCalcRangeInDraw.java
| 1
odk/examples/DevelopersGuide/Components/SimpleLicense/LicenseTest.java
| 3
odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java
| 2
odk/examples/DevelopersGuide/GUI/ImageControlSample.java
| 4 -
odk/examples/DevelopersGuide/GUI/UnoDialogSample.java
| 6 -
odk/examples/DevelopersGuide/GUI/UnoDialogSample2.java
| 2
qadevOOo/runner/convwatch/ConvWatch.java
| 4 -
qadevOOo/runner/convwatch/ConvWatchStarter.java
| 2
qadevOOo/runner/convwatch/HTMLOutputter.java
| 2
qadevOOo/runner/convwatch/INIOutputter.java
| 2
qadevOOo/runner/convwatch/PRNCompare.java
| 8 +-
qadevOOo/runner/convwatch/PixelCounter.java
| 11 ---
qadevOOo/runner/graphical/EnhancedComplexTestCase.java
| 4 -
qadevOOo/runner/graphical/PixelCounter.java
| 6 -
qadevOOo/runner/helper/APIDescGetter.java
| 19 ++----
qadevOOo/runner/helper/CwsDataExchangeImpl.java
| 4 -
qadevOOo/runner/helper/PropertyHandlerImpl.java
| 7 --
qadevOOo/runner/lib/MultiPropertyTest.java
| 6 -
qadevOOo/runner/org/openoffice/RunnerService.java
| 2
qadevOOo/runner/stats/FatDataBaseOutProducer.java
| 5 -
qadevOOo/runner/util/AccessibilityTools.java
| 13 +---
qadevOOo/runner/util/BasicMacroTools.java
| 7 --
qadevOOo/runner/util/DBTools.java
| 2
qadevOOo/runner/util/SOfficeFactory.java
| 5 -
qadevOOo/runner/util/UITools.java
| 8 +-
qadevOOo/runner/util/db/DataSource.java
| 2
qadevOOo/runner/util/db/DatabaseDocument.java
| 3
qadevOOo/testdocs/qadevlibs/source/test/Job.java
| 3
qadevOOo/tests/java/complex/unoapi/CheckModuleAPI.java
| 4 -
qadevOOo/tests/java/ifc/awt/_XUserInputInterception.java
| 1
qadevOOo/tests/java/ifc/beans/_XHierarchicalPropertySet.java
| 8 --
qadevOOo/tests/java/ifc/beans/_XMultiHierarchicalPropertySet.java
| 8 --
qadevOOo/tests/java/ifc/sheet/_XEnhancedMouseClickBroadcaster.java
| 2
qadevOOo/tests/java/ifc/sheet/_XRangeSelection.java
| 2
qadevOOo/tests/java/ifc/ucb/_XRemoteContentProviderAcceptor.java
| 1
qadevOOo/tests/java/ifc/ui/_XContextMenuInterception.java
| 2
qadevOOo/tests/java/mod/_dbaccess/ORowSet.java
| 2
qadevOOo/tests/java/mod/_forms/GenericModelTest.java
| 2
qadevOOo/tests/java/mod/_forms/ODatabaseForm.java
| 2
qadevOOo/tests/java/mod/_nestedreg/uno/NestedRegistry.java
| 8 +-
qadevOOo/tests/java/mod/_remotebridge/various.java
| 5 -
qadevOOo/tests/java/mod/_sc/AccessibleEditableTextPara_PreviewCell.java
| 2
qadevOOo/tests/java/mod/_sc/ScAccessibleCell.java
| 2
qadevOOo/tests/java/mod/_sc/ScAccessibleDocument.java
| 2
qadevOOo/tests/java/mod/_sc/ScAccessibleDocumentPagePreview.java
| 2
qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeader.java
| 2
qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeaderArea.java
| 2
qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewCell.java
| 2
qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewHeaderCell.java
| 2
qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewTable.java
| 2
qadevOOo/tests/java/mod/_sc/ScAccessibleSpreadsheet.java
| 2
qadevOOo/tests/java/mod/_sch/AccArea.java
| 4 -
qadevOOo/tests/java/mod/_sch/AccAxis.java
| 4 -
qadevOOo/tests/java/mod/_sch/AccDataPoint.java
| 4 -
qadevOOo/tests/java/mod/_sch/AccDataSeries.java
| 4 -
qadevOOo/tests/java/mod/_sch/AccDiagram.java
| 4 -
qadevOOo/tests/java/mod/_sch/AccFloor.java
| 4 -
qadevOOo/tests/java/mod/_sch/AccGrid.java
| 4 -
qadevOOo/tests/java/mod/_sch/AccLegend.java
| 4 -
qadevOOo/tests/java/mod/_sch/AccLegendEntry.java
| 4 -
qadevOOo/tests/java/mod/_sch/AccStatisticsObject.java
| 4 -
qadevOOo/tests/java/mod/_sch/AccTitle.java
| 4 -
qadevOOo/tests/java/mod/_sch/AccWall.java
| 4 -
qadevOOo/tests/java/mod/_sch/AccessibleDocumentView.java
| 4 -
qadevOOo/tests/java/mod/_sch/ChXChartAxis.java
| 2
qadevOOo/tests/java/mod/_sch/ChXChartData.java
| 2
qadevOOo/tests/java/mod/_sch/ChXChartDataArray.java
| 2
qadevOOo/tests/java/mod/_sch/ChXChartDocument.java
| 4 -
qadevOOo/tests/java/mod/_sch/ChXChartView.java
| 2
qadevOOo/tests/java/mod/_sch/ChartGrid.java
| 2
qadevOOo/tests/java/mod/_sch/ChartLine.java
| 2
qadevOOo/tests/java/mod/_sch/ChartTitle.java
| 2
qadevOOo/tests/java/mod/_sd/AccessibleDrawDocumentView.java
| 2
qadevOOo/tests/java/mod/_sd/AccessibleOutlineView.java
| 2
qadevOOo/tests/java/mod/_sd/AccessibleSlideView.java
| 2
qadevOOo/tests/java/mod/_sm/SmEditAccessible.java
| 2
qadevOOo/tests/java/mod/_sm/SmGraphicAccessible.java
| 2
qadevOOo/tests/java/mod/_svx/AccessibleControlShape.java
| 2
qadevOOo/tests/java/mod/_svx/AccessibleEditableTextPara.java
| 2
qadevOOo/tests/java/mod/_svx/AccessibleGraphicShape.java
| 2
qadevOOo/tests/java/mod/_svx/AccessibleOLEShape.java
| 2
qadevOOo/tests/java/mod/_svx/AccessiblePageShape.java
| 2
qadevOOo/tests/java/mod/_svx/AccessiblePresentationGraphicShape.java
| 2
qadevOOo/tests/java/mod/_svx/AccessiblePresentationOLEShape.java
| 2
qadevOOo/tests/java/mod/_svx/AccessiblePresentationShape.java
| 2
qadevOOo/tests/java/mod/_svx/AccessibleShape.java
| 2
qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentPageView.java
| 2
qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentView.java
| 2
qadevOOo/tests/java/mod/_sw/SwAccessibleEndnoteView.java
| 2
qadevOOo/tests/java/mod/_sw/SwAccessibleFooterView.java
| 2
qadevOOo/tests/java/mod/_sw/SwAccessibleFootnoteView.java
| 2
qadevOOo/tests/java/mod/_sw/SwAccessibleHeaderView.java
| 2
qadevOOo/tests/java/mod/_sw/SwAccessiblePageView.java
| 2
qadevOOo/tests/java/mod/_sw/SwAccessibleParagraphView.java
| 2
qadevOOo/tests/java/mod/_sw/SwAccessibleTableCellView.java
| 2
qadevOOo/tests/java/mod/_sw/SwAccessibleTableView.java
| 2
qadevOOo/tests/java/mod/_sw/SwAccessibleTextEmbeddedObject.java
| 2
qadevOOo/tests/java/mod/_sw/SwAccessibleTextFrameView.java
| 2
qadevOOo/tests/java/mod/_sw/SwAccessibleTextGraphicObject.java
| 2
qadevOOo/tests/java/mod/_sw/SwXMailMerge.java
| 4 -
qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownComboBox.java
| 1
qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownListBox.java
| 1
qadevOOo/tests/java/mod/_toolkit/AccessiblePopupMenu.java
| 1
qadevOOo/tests/java/mod/_toolkit/AccessibleScrollBar.java
| 1
qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBarItem.java
| 1
qadevOOo/tests/java/mod/_toolkit/AccessibleToolBoxItem.java
| 1
qadevOOo/tests/java/mod/_toolkit/AccessibleWindow.java
| 1
qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentExporter.java
| 2
qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentImporter.java
| 2
qadevOOo/tests/java/mod/_xmloff/Chart/XMLExporter.java
| 2
qadevOOo/tests/java/mod/_xmloff/Chart/XMLImporter.java
| 2
qadevOOo/tests/java/mod/_xmloff/Chart/XMLStylesExporter.java
| 2
qadevOOo/tests/java/mod/_xmloff/Chart/XMLStylesImporter.java
| 2
reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java
| 4 -
reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java
| 4 -
reportbuilder/java/org/libreoffice/report/pentaho/output/StylesWriter.java
| 4 -
reportdesign/qa/complex/reportdesign/ReportDesignerTest.java
| 4 -
sc/qa/complex/calcPreview/ViewForwarder.java
| 8 +-
scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java
| 6 -
scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java
| 2
scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java
| 2
scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java
| 2
scripting/java/com/sun/star/script/framework/container/ScriptEntry.java
| 14 ++--
scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
| 2
scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java
| 4 -
scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
| 8 +-
scripting/java/org/openoffice/idesupport/ExtensionFinder.java
| 2
scripting/java/org/openoffice/idesupport/ui/ScriptPanel.java
| 5 -
scripting/workben/installer/Final.java
| 2
scripting/workben/installer/IdeFinal.java
| 2
scripting/workben/installer/IdeUpdater.java
| 2
scripting/workben/installer/InstallWizard.java
| 8 +-
scripting/workben/installer/NavPanel.java
| 2
scripting/workben/installer/Version.java
| 10 +--
scripting/workben/installer/XmlUpdater.java
| 2
scripting/workben/installer/ZipData.java
| 2
smoketest/com/sun/star/comp/smoketest/TestExtension.java
| 3
smoketest/org/libreoffice/smoketest/SmoketestCommandEnvironment.java
| 3
sw/qa/complex/accessibility/AccessibleRelationSet.java
| 2
sw/qa/complex/indeterminateState/CheckIndeterminateState.java
| 2
swext/mediawiki/src/com/sun/star/wiki/Settings.java
| 2
swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java
| 6 -
swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java
| 12 +--
swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java
| 10 +--
toolkit/test/accessibility/AccTreeNode.java
| 14 ++--
toolkit/test/accessibility/AccessibilityTreeModel.java
| 5 -
toolkit/test/accessibility/CanvasShape.java
| 10 ---
toolkit/test/accessibility/NodeHandler.java
| 12 ---
wizards/com/sun/star/wizards/common/Desktop.java
| 4 -
wizards/com/sun/star/wizards/common/FileAccess.java
| 2
wizards/com/sun/star/wizards/db/BlindtextCreator.java
| 10 +--
wizards/com/sun/star/wizards/db/ColumnPropertySet.java
| 4 -
wizards/com/sun/star/wizards/db/CommandMetaData.java
| 8 --
wizards/com/sun/star/wizards/db/FieldColumn.java
| 4 -
wizards/com/sun/star/wizards/db/QueryMetaData.java
| 2
wizards/com/sun/star/wizards/document/Control.java
| 8 +-
wizards/com/sun/star/wizards/document/OfficeDocument.java
| 2
wizards/com/sun/star/wizards/form/FormControlArranger.java
| 2
wizards/com/sun/star/wizards/form/FormDocument.java
| 31 ++--------
wizards/com/sun/star/wizards/form/FormWizard.java
| 6 -
wizards/com/sun/star/wizards/form/StyleApplier.java
| 9 --
wizards/com/sun/star/wizards/query/QueryWizard.java
| 6 -
wizards/com/sun/star/wizards/report/DBColumn.java
| 4 -
wizards/com/sun/star/wizards/report/Dataimport.java
| 8 +-
wizards/com/sun/star/wizards/report/ReportTextDocument.java
| 16 ++---
wizards/com/sun/star/wizards/report/ReportTextImplementation.java
| 4 -
wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation.java
| 4 -
wizards/com/sun/star/wizards/table/FieldFormatter.java
| 7 --
wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java
| 2
wizards/com/sun/star/wizards/table/TableWizard.java
| 4 -
wizards/com/sun/star/wizards/text/TextDocument.java
| 4 -
wizards/com/sun/star/wizards/text/TextStyleHandler.java
| 2
wizards/com/sun/star/wizards/text/ViewHandler.java
| 3
wizards/com/sun/star/wizards/ui/ButtonList.java
| 8 --
wizards/com/sun/star/wizards/ui/CommandFieldSelection.java
| 6 -
wizards/com/sun/star/wizards/ui/FieldSelection.java
| 2
wizards/com/sun/star/wizards/ui/FilterComponent.java
| 7 --
wizards/com/sun/star/wizards/ui/UnoDialog2.java
| 12 ---
wizards/com/sun/star/wizards/ui/event/UnoDataAware.java
| 2
192 files changed, 316 insertions(+), 468 deletions(-)
New commits:
commit 76c1092016b9640ac6d522f3c1b88c5121437bf1
Author: Noel Grandin <n...@peralex.com>
Date: Wed Aug 6 08:44:21 2014 +0200
java: remove unused parameters
Change-Id: I9ae22afc27ac0d2051f06885f363845e9b4ce2ff
diff --git a/toolkit/test/accessibility/AccessibilityTreeModel.java
b/toolkit/test/accessibility/AccessibilityTreeModel.java
index 6cec54f..787dddf 100644
--- a/toolkit/test/accessibility/AccessibilityTreeModel.java
+++ b/toolkit/test/accessibility/AccessibilityTreeModel.java
@@ -242,7 +242,7 @@ public class AccessibilityTreeModel
// index relative to its parent. Therefore the
// more expensive fireTreeStructureChanged is
// necessary.
- fireTreeNodesInserted (createEvent (xParent, xChild));
+ fireTreeNodesInserted (createChildUpdateEvent (xParent));
updateNode (xParent, AccessibleTreeHandler.class);
}
maCanvas.repaint ();
@@ -344,7 +344,7 @@ public class AccessibilityTreeModel
/** Create a TreeModelEvent object that informs listeners that one child
has been removed from or inserted into its parent.
*/
- public TreeModelEvent createEvent (XAccessibleContext xParent, XAccessible
xChild)
+ public TreeModelEvent createChildUpdateEvent (XAccessibleContext xParent)
{
AccessibleTreeNode aParentNode = maNodeMap.GetNode (xParent);
return createEvent (aParentNode, xParent);
diff --git a/wizards/com/sun/star/wizards/ui/UnoDialog2.java
b/wizards/com/sun/star/wizards/ui/UnoDialog2.java
index b67c6af..25d4766c 100644
--- a/wizards/com/sun/star/wizards/ui/UnoDialog2.java
+++ b/wizards/com/sun/star/wizards/ui/UnoDialog2.java
@@ -75,7 +75,7 @@ public class UnoDialog2 extends UnoDialog
return insertButton(sName, actionPerformed, this, sPropNames,
oPropValues);
}
- public XButton insertImageButton(String sName,
com.sun.star.awt.XActionListener actionPerformed, Object eventTarget, String[]
sPropNames, Object[] oPropValues)
+ public XButton insertImageButton(String sName,
com.sun.star.awt.XActionListener actionPerformed, String[] sPropNames, Object[]
oPropValues)
{
XButton xButton = (XButton)
insertControlModel2("com.sun.star.awt.UnoControlButtonModel", sName,
sPropNames, oPropValues, XButton.class);
@@ -87,11 +87,6 @@ public class UnoDialog2 extends UnoDialog
return xButton;
}
- public XButton insertImageButton(String sName,
com.sun.star.awt.XActionListener actionPerformed, String[] sPropNames, Object[]
oPropValues)
- {
- return insertImageButton(sName, actionPerformed, this, sPropNames,
oPropValues);
- }
-
public XCheckBox insertCheckBox(String sName, String itemChanged, Object
eventTarget, String[] sPropNames, Object[] oPropValues)
{
commit ebe8dbe0fd45a274b4b9bfaab9fe46bb0441d6ec
Author: Noel Grandin <n...@peralex.com>
Date: Mon Aug 11 09:41:30 2014 +0200
java: remove unused methods
Change-Id: I1abc51f66bc7d7f7135bf5cdee4fae653b2837ec
diff --git a/wizards/com/sun/star/wizards/form/FormDocument.java
b/wizards/com/sun/star/wizards/form/FormDocument.java
index 55f4f9f..c634f4e 100644
--- a/wizards/com/sun/star/wizards/form/FormDocument.java
+++ b/wizards/com/sun/star/wizards/form/FormDocument.java
@@ -439,19 +439,6 @@ public class FormDocument extends TextDocument
return aFormSize;
}
- private Size getAvailableFormSize()
- {
- if (this.Name.equals(SOMAINFORM))
- {
- setFormSize(getMainFormSize(curArrangement));
- }
- else
- {
- setFormSize(getSubFormSize());
- }
- return aFormSize;
- }
-
public void setFormSize(Size _aSize)
{
aFormSize = _aSize;
commit d5a31b221510a506a9c43d2c9f44c55405ce13fd
Author: Noel Grandin <n...@peralex.com>
Date: Wed Aug 6 08:38:10 2014 +0200
java: remove unused parameters
Change-Id: Ifc44c51ddbd21fabaad686bc3d38e2dab54d97aa
diff --git a/forms/qa/integration/forms/ListBox.java
b/forms/qa/integration/forms/ListBox.java
index b46f4a3..aff9061 100644
--- a/forms/qa/integration/forms/ListBox.java
+++ b/forms/qa/integration/forms/ListBox.java
@@ -139,7 +139,7 @@ public class ListBox extends TestCase
}
/* ------------------------------------------------------------------ */
- private String[] impl_getTypedValue( final String _asType, final int
_rowNum )
+ private String[] impl_getTypedValue( final String _asType )
{
Map< String, String[] > valueMap = new HashMap< String, String[] >();
valueMap.put( "bigint", new String[] { "1111111111", "222222222" }
);
@@ -207,7 +207,7 @@ public class ListBox extends TestCase
XPreparedStatement statement = connection.prepareStatement(
sql.toString() );
XParameters statementParameters = UnoRuntime.queryInterface(
XParameters.class, statement );
- final String[] keyValues = impl_getTypedValue( keyTypes[i], 0
);
+ final String[] keyValues = impl_getTypedValue( keyTypes[i] );
for ( int row=0; row<displayValues.length; ++row )
{
diff --git
a/odk/examples/DevelopersGuide/Components/SimpleLicense/LicenseTest.java
b/odk/examples/DevelopersGuide/Components/SimpleLicense/LicenseTest.java
index 7233654..02553e8 100644
--- a/odk/examples/DevelopersGuide/Components/SimpleLicense/LicenseTest.java
+++ b/odk/examples/DevelopersGuide/Components/SimpleLicense/LicenseTest.java
@@ -35,7 +35,6 @@
import com.sun.star.lib.uno.helper.Factory;
import com.sun.star.lang.XSingleComponentFactory;
import com.sun.star.lib.uno.helper.WeakBase;
-import com.sun.star.uno.XComponentContext;
import com.sun.star.lang.XServiceInfo;
/** This class capsulates the class, that implements the minimal component, a
diff --git
a/odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java
b/odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java
index 74f53fd..eb1c577 100644
---
a/odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java
+++
b/odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java
@@ -124,7 +124,7 @@ public class DialogComponent {
return "Created dialog \"" + DialogURL + "\"";
}
- public void copyText( XDialog xDialog, Object aEventObject ) {
+ public void copyText( XDialog xDialog ) {
XControlContainer xControlContainer = UnoRuntime.queryInterface(
XControlContainer.class, xDialog );
String aTextPropertyStr = "Text";
diff --git a/odk/examples/DevelopersGuide/GUI/ImageControlSample.java
b/odk/examples/DevelopersGuide/GUI/ImageControlSample.java
index 2e61fb2..c22e670 100644
--- a/odk/examples/DevelopersGuide/GUI/ImageControlSample.java
+++ b/odk/examples/DevelopersGuide/GUI/ImageControlSample.java
@@ -77,7 +77,7 @@ public class ImageControlSample extends UnoDialogSample{
new Object[] { new Integer(16), "This code-sample
demonstrates how to create an ImageControlSample within a dialog",
Boolean.TRUE, "HeaderLabel", new Integer(6), new Integer(6), new Integer(210)});
// add the model to the NameContainer of the dialog model
oImageControlSample.m_xDlgModelNameContainer.insertByName("Headerlabel",
oFTHeaderModel);
- XPropertySet xICModelPropertySet =
oImageControlSample.insertImageControl(xMCF, 68, 30, 32, 90);
+ XPropertySet xICModelPropertySet =
oImageControlSample.insertImageControl(68, 30, 32, 90);
oImageControlSample.insertButton(oImageControlSample, 90, 75, 50,
"~Close dialog", (short) PushButtonType.OK_value);
oImageControlSample.createWindowPeer();
// note: due to issue i76718 ("Setting graphic at a controlmodel
required dialog peer") the graphic of the image control
@@ -101,7 +101,7 @@ public class ImageControlSample extends UnoDialogSample{
}
- public XPropertySet insertImageControl(XMultiComponentFactory _xMCF, int
_nPosX, int _nPosY, int _nHeight, int _nWidth){
+ public XPropertySet insertImageControl(int _nPosX, int _nPosY, int
_nHeight, int _nWidth){
XPropertySet xICModelPropertySet = null;
try{
// create a unique name by means of an own implementation...
diff --git a/odk/examples/DevelopersGuide/GUI/UnoDialogSample.java
b/odk/examples/DevelopersGuide/GUI/UnoDialogSample.java
index 07fa110..71d2314 100644
--- a/odk/examples/DevelopersGuide/GUI/UnoDialogSample.java
+++ b/odk/examples/DevelopersGuide/GUI/UnoDialogSample.java
@@ -167,7 +167,7 @@ public class UnoDialogSample implements XTextListener,
XSpinListener, XActionLis
oUnoDialogSample.insertFileControl(oUnoDialogSample, 106, 290, 200
);
oUnoDialogSample.insertButton(oUnoDialogSample, 106, 320, 50,
"~Close dialog", (short) PushButtonType.OK_value);
oUnoDialogSample.createWindowPeer();
-
oUnoDialogSample.addRoadmap(oUnoDialogSample.getRoadmapItemStateChangeListener());
+ oUnoDialogSample.addRoadmap();
oUnoDialogSample.insertRoadmapItem(0, true, "Introduction", 1);
oUnoDialogSample.insertRoadmapItem(1, true, "Documents", 2);
oUnoDialogSample.xDialog =
UnoRuntime.queryInterface(XDialog.class, oUnoDialogSample.m_xDialogControl);
@@ -274,7 +274,7 @@ public class UnoDialogSample implements XTextListener,
XSpinListener, XActionLis
if (m_xWindowPeer == null){
createWindowPeer();
}
- addRoadmap(getRoadmapItemStateChangeListener());
+ addRoadmap();
insertRoadmapItem(0, true, "Introduction", 1);
insertRoadmapItem(1, true, "Documents", 2);
xDialog = UnoRuntime.queryInterface(XDialog.class, m_xDialogControl);
@@ -1411,7 +1411,7 @@ public class UnoDialogSample implements XTextListener,
XSpinListener, XActionLis
XSingleServiceFactory m_xSSFRoadmap;
XIndexContainer m_xRMIndexCont;
- public void addRoadmap(XItemListener _xItemListener) {
+ public void addRoadmap() {
XPropertySet xDialogModelPropertySet = null;
try {
// create a unique name by means of an own implementation...
diff --git a/odk/examples/DevelopersGuide/GUI/UnoDialogSample2.java
b/odk/examples/DevelopersGuide/GUI/UnoDialogSample2.java
index a48e469..2252627 100644
--- a/odk/examples/DevelopersGuide/GUI/UnoDialogSample2.java
+++ b/odk/examples/DevelopersGuide/GUI/UnoDialogSample2.java
@@ -121,7 +121,7 @@ public class UnoDialogSample2 extends UnoDialogSample {
oUnoDialogSample2.createWindowPeer();
// add the roadmap control. Note that the roadmap may not be
created before the windowpeer of the dialog exists
// (see http://qa.openoffice.org/issues/show_bug.cgi?id=67369)
-
oUnoDialogSample2.addRoadmap(oUnoDialogSample2.getRoadmapItemStateChangeListener());
+ oUnoDialogSample2.addRoadmap();
oUnoDialogSample2.insertRoadmapItem(0, true, "Introduction", 1);
oUnoDialogSample2.insertRoadmapItem(1, true, "Supported Services",
2);
oUnoDialogSample2.insertRoadmapItem(2, true, "Interfaces", 3);
diff --git a/qadevOOo/runner/convwatch/ConvWatch.java
b/qadevOOo/runner/convwatch/ConvWatch.java
index 2e089b1..442a56f 100644
--- a/qadevOOo/runner/convwatch/ConvWatch.java
+++ b/qadevOOo/runner/convwatch/ConvWatch.java
@@ -210,7 +210,7 @@ public class ConvWatch
// Status end
String sINIFile = _sFilenamePrefix + sNameNoSuffix + ".ini";
- INIOutputter INIoutput = INIOutputter.create(_sOutputPath,
sINIFile, "", "");
+ INIOutputter INIoutput = INIOutputter.create(_sOutputPath,
sINIFile, "");
INIoutput.createHeader();
// TODO: version info was fine
@@ -272,7 +272,7 @@ public class ConvWatch
String sNameNoSuffix = FileHelper.getNameNoSuffix(sBasename);
String sINIFile = _sFilenamePrefix + sNameNoSuffix + ".ini";
- INIOutputter INIoutput = INIOutputter.create(_sOutputPath,
sINIFile, _sFilenamePrefix, "");
+ INIOutputter INIoutput = INIOutputter.create(_sOutputPath,
sINIFile, _sFilenamePrefix);
INIoutput.createHeader();
// LLA? what if the are no values in the list? true or false;
INIoutput.writeSection("global");
diff --git a/qadevOOo/runner/convwatch/ConvWatchStarter.java
b/qadevOOo/runner/convwatch/ConvWatchStarter.java
index 2a76f6c..b8a0691 100644
--- a/qadevOOo/runner/convwatch/ConvWatchStarter.java
+++ b/qadevOOo/runner/convwatch/ConvWatchStarter.java
@@ -204,7 +204,7 @@ public class ConvWatchStarter extends
EnhancedComplexTestCase
sHTMLName = m_sInputPath.substring(n + 1);
sHTMLName += ".html";
}
- HTMLOutputter HTMLoutput = HTMLOutputter.create(m_sOutputPath,
sHTMLName, "", "");
+ HTMLOutputter HTMLoutput = HTMLOutputter.create(m_sOutputPath,
sHTMLName, "");
HTMLoutput.header( m_sOutputPath );
HTMLoutput.indexSection( m_sOutputPath );
LISTOutputter LISToutput = LISTOutputter.create(m_sOutputPath,
"allfiles.txt");
diff --git a/qadevOOo/runner/convwatch/HTMLOutputter.java
b/qadevOOo/runner/convwatch/HTMLOutputter.java
index 7d99bda..b749169 100644
--- a/qadevOOo/runner/convwatch/HTMLOutputter.java
+++ b/qadevOOo/runner/convwatch/HTMLOutputter.java
@@ -34,7 +34,7 @@ public class HTMLOutputter
String ls;
HTMLOutputter() {}
- public static HTMLOutputter create( String _sOutputPath, String
_sHTMLFilename, String _sNamePrefix, String _sTitle )
+ public static HTMLOutputter create( String _sOutputPath, String
_sHTMLFilename, String _sNamePrefix )
{
FileHelper.makeDirectories("", _sOutputPath);
HTMLOutputter a = new HTMLOutputter();
diff --git a/qadevOOo/runner/convwatch/INIOutputter.java
b/qadevOOo/runner/convwatch/INIOutputter.java
index 3169e42..30d6a0d 100644
--- a/qadevOOo/runner/convwatch/INIOutputter.java
+++ b/qadevOOo/runner/convwatch/INIOutputter.java
@@ -32,7 +32,7 @@ public class INIOutputter
*/
String ls;
- public static INIOutputter create( String _sOutputPath, String
_sHTMLFilename, String _sNamePrefix, String _sTitle )
+ public static INIOutputter create( String _sOutputPath, String
_sHTMLFilename, String _sNamePrefix )
{
FileHelper.makeDirectories("", _sOutputPath);
INIOutputter a = new INIOutputter();
diff --git a/qadevOOo/runner/convwatch/PRNCompare.java
b/qadevOOo/runner/convwatch/PRNCompare.java
index 81c4269..38955f2 100644
--- a/qadevOOo/runner/convwatch/PRNCompare.java
+++ b/qadevOOo/runner/convwatch/PRNCompare.java
@@ -149,10 +149,10 @@ public class PRNCompare
String[] aRefList = createJPEGFromPostscript(m_sOutputPath,
m_sReferencePath, m_sReferenceFile, getResolutionInDPI());
// TODO: Assume, that Postscript is already in the OutputPath, this may
change.
String[] aPSList = createJPEGFromPostscript(m_sOutputPath,
m_sOutputPath, m_sPostScriptFile, getResolutionInDPI());
- StatusHelper[] aList = createDiffs(m_sOutputPath,
- aRefList,
+ StatusHelper[] aList = createDiffs(aRefList,
aPSList,
- getMaxPages(),
m_tUseBorderMove);
+ getMaxPages(),
+ m_tUseBorderMove);
return aList;
}
@@ -342,7 +342,7 @@ public class PRNCompare
}
- public StatusHelper[] createDiffs(String _sOutputPath, String[] _aRefList,
String[] _aPSList, int _nMaxDiffs, TriState _tUseBorderMove)
+ public StatusHelper[] createDiffs(String[] _aRefList, String[] _aPSList,
int _nMaxDiffs, TriState _tUseBorderMove)
{
if (_nMaxDiffs < 1)
{
diff --git a/qadevOOo/runner/convwatch/PixelCounter.java
b/qadevOOo/runner/convwatch/PixelCounter.java
index b7723fd..36109cc 100644
--- a/qadevOOo/runner/convwatch/PixelCounter.java
+++ b/qadevOOo/runner/convwatch/PixelCounter.java
@@ -91,7 +91,7 @@ class graphics_stuff
return 0;
}
- public static void countPixel(ImageHelper img, int _x, int _y, int _w, int
_h, CountPixel _aPixelCounter)
+ public static void countPixel(ImageHelper img, int _w, int _h, CountPixel
_aPixelCounter)
{
for (int y = 0; y < _h; y++) {
for (int x = 0; x < _w; x++) {
@@ -105,7 +105,7 @@ class graphics_stuff
int h = _aImage.getHeight();
CountPixel aCountNotWhite = new CountNotWhite();
- countPixel(_aImage, 0, 0, w, h, aCountNotWhite);
+ countPixel(_aImage, w, h, aCountNotWhite);
return aCountNotWhite.getCount();
}
@@ -115,7 +115,7 @@ class graphics_stuff
int h = _aImage.getHeight();
CountPixel aCountNotBlack = new CountNotBlack();
- countPixel(_aImage, 0, 0, w, h, aCountNotBlack);
+ countPixel(_aImage, w, h, aCountNotBlack);
return aCountNotBlack.getCount();
}
}
diff --git a/qadevOOo/runner/graphical/EnhancedComplexTestCase.java
b/qadevOOo/runner/graphical/EnhancedComplexTestCase.java
index 65a2ce6..0e2be21 100644
--- a/qadevOOo/runner/graphical/EnhancedComplexTestCase.java
+++ b/qadevOOo/runner/graphical/EnhancedComplexTestCase.java
@@ -292,10 +292,6 @@ private void callEntry(String _sEntry, ParameterHelper
_aParam)
return "";
}
- public void runThroughOneFileInIndex(String _sPath, String _sBasename,
ParameterHelper _aParam)
- {
-
- }
/**
* Run through a given index.ini or run through a given directory,
* find all postscript or pdf files.
diff --git a/qadevOOo/runner/graphical/PixelCounter.java
b/qadevOOo/runner/graphical/PixelCounter.java
index 10dab09..0c0fd71 100644
--- a/qadevOOo/runner/graphical/PixelCounter.java
+++ b/qadevOOo/runner/graphical/PixelCounter.java
@@ -118,7 +118,7 @@ class CountNotBlack extends CountPixel
class graphics_stuff
{
- public static void countPixel(ImageHelper img, int _x, int _y, int _w, int
_h, CountPixel _aPixelCounter)
+ public static void countPixel(ImageHelper img, int _w, int _h, CountPixel
_aPixelCounter)
{
for (int y = 0; y < _h; y++) {
for (int x = 0; x < _w; x++) {
@@ -132,7 +132,7 @@ class graphics_stuff
final int h = _aImage.getHeight();
CountPixel aCountNotWhite = new CountNotWhite();
- countPixel(_aImage, 0, 0, w, h, aCountNotWhite);
+ countPixel(_aImage, w, h, aCountNotWhite);
return aCountNotWhite.getCount();
}
@@ -142,7 +142,7 @@ class graphics_stuff
final int h = _aImage.getHeight();
CountPixel aCountNotBlack = new CountNotBlack();
- countPixel(_aImage, 0, 0, w, h, aCountNotBlack);
+ countPixel(_aImage, w, h, aCountNotBlack);
return aCountNotBlack.getCount();
}
}
diff --git a/qadevOOo/runner/helper/APIDescGetter.java
b/qadevOOo/runner/helper/APIDescGetter.java
index 2e92a57..085f8f2 100644
--- a/qadevOOo/runner/helper/APIDescGetter.java
+++ b/qadevOOo/runner/helper/APIDescGetter.java
@@ -228,7 +228,7 @@ public class APIDescGetter extends DescGetter
System.out.println("## reading from jar");
}
- entry = getFromClassPath(job, debug);
+ entry = getFromClassPath(job);
}
boolean foundInterface = false;
@@ -515,7 +515,7 @@ public class APIDescGetter extends DescGetter
return entries;
}
- protected DescEntry getFromClassPath(String aEntry, boolean debug)
+ protected DescEntry getFromClassPath(String aEntry)
{
int dotindex = aEntry.indexOf('.');
diff --git a/qadevOOo/runner/helper/CwsDataExchangeImpl.java
b/qadevOOo/runner/helper/CwsDataExchangeImpl.java
index 6d3b4eb..3af899f 100644
--- a/qadevOOo/runner/helper/CwsDataExchangeImpl.java
+++ b/qadevOOo/runner/helper/CwsDataExchangeImpl.java
@@ -28,7 +28,7 @@ import util.PropertyName;
import util.utils;
/**
- * Implementaion of the interface CwsDataExchange
+ * Implementation of the interface CwsDataExchange
* @see share.CwsDataExchange
*/
public class CwsDataExchangeImpl implements CwsDataExchange
@@ -39,7 +39,7 @@ public class CwsDataExchangeImpl implements CwsDataExchange
private final BuildEnvTools bet;
private final boolean mDebug;
- public CwsDataExchangeImpl(String cwsName, TestParameters param, LogWriter
log) throws ParameterNotFoundException
+ public CwsDataExchangeImpl(TestParameters param, LogWriter log) throws
ParameterNotFoundException
{
this.param = param;
this.log = log;
diff --git a/qadevOOo/runner/util/AccessibilityTools.java
b/qadevOOo/runner/util/AccessibilityTools.java
index a2f0015..3e45537 100644
--- a/qadevOOo/runner/util/AccessibilityTools.java
+++ b/qadevOOo/runner/util/AccessibilityTools.java
@@ -24,7 +24,6 @@ import com.sun.star.awt.XWindow;
import com.sun.star.frame.XController;
import com.sun.star.frame.XFrame;
import com.sun.star.frame.XModel;
-import com.sun.star.lang.XMultiServiceFactory;
import com.sun.star.uno.UnoRuntime;
import com.sun.star.uno.XInterface;
diff --git a/qadevOOo/runner/util/DBTools.java
b/qadevOOo/runner/util/DBTools.java
index 467a9ce..377b6ea 100644
--- a/qadevOOo/runner/util/DBTools.java
+++ b/qadevOOo/runner/util/DBTools.java
@@ -263,7 +263,7 @@ public class DBTools {
* Creates class instance.
* @param xMSF <code>XMultiServiceFactory</code>.
*/
- public DBTools(XMultiServiceFactory xMSF, PrintWriter _logger )
+ public DBTools(XMultiServiceFactory xMSF )
{
this.xMSF = xMSF ;
try {
diff --git a/qadevOOo/runner/util/db/DataSource.java
b/qadevOOo/runner/util/db/DataSource.java
index a03ff40..eae018a 100644
--- a/qadevOOo/runner/util/db/DataSource.java
+++ b/qadevOOo/runner/util/db/DataSource.java
@@ -70,7 +70,7 @@ public class DataSource
synchronized ( this )
{
if ( m_document == null )
- m_document = new DatabaseDocument( m_orb, this );
+ m_document = new DatabaseDocument( this );
}
return m_document;
}
diff --git a/qadevOOo/runner/util/db/DatabaseDocument.java
b/qadevOOo/runner/util/db/DatabaseDocument.java
index f67ad90..d620a82 100644
--- a/qadevOOo/runner/util/db/DatabaseDocument.java
+++ b/qadevOOo/runner/util/db/DatabaseDocument.java
@@ -22,7 +22,6 @@ import com.sun.star.beans.PropertyValue;
import com.sun.star.frame.XModel;
import com.sun.star.frame.XStorable;
import com.sun.star.io.IOException;
-import com.sun.star.lang.XMultiServiceFactory;
import com.sun.star.sdb.XDocumentDataSource;
import com.sun.star.sdb.XOfficeDatabaseDocument;
import com.sun.star.uno.UnoRuntime;
@@ -32,7 +31,7 @@ import com.sun.star.uno.UnoRuntime;
*/
public class DatabaseDocument
{
- protected DatabaseDocument( final XMultiServiceFactory _orb, final
DataSource _dataSource )
+ protected DatabaseDocument( final DataSource _dataSource )
{
m_dataSource = _dataSource;
diff --git a/qadevOOo/tests/java/complex/unoapi/CheckModuleAPI.java
b/qadevOOo/tests/java/complex/unoapi/CheckModuleAPI.java
index 0322f4a..091be8f 100644
--- a/qadevOOo/tests/java/complex/unoapi/CheckModuleAPI.java
+++ b/qadevOOo/tests/java/complex/unoapi/CheckModuleAPI.java
@@ -292,7 +292,7 @@ public class CheckModuleAPI extends ComplexTestCase
{
// cws version: all added modules must be tested
final String cws = version.substring(4, version.length());
- final CwsDataExchangeImpl cde = new CwsDataExchangeImpl(cws,
param, log);
+ final CwsDataExchangeImpl cde = new CwsDataExchangeImpl(param,
log);
final ArrayList<String> addedModules = cde.getModules();
final ArrayList<String> moduleNames = new ArrayList<String>();
@@ -546,7 +546,7 @@ public class CheckModuleAPI extends ComplexTestCase
// cws version: all added modules must be tested
final String cws = version.substring(4, version.length());
- final CwsDataExchangeImpl cde = new
CwsDataExchangeImpl(cws, param, log);
+ final CwsDataExchangeImpl cde = new
CwsDataExchangeImpl(param, log);
cde.setUnoApiCwsStatus(status);
}
catch (ParameterNotFoundException ex)
diff --git a/qadevOOo/tests/java/mod/_dbaccess/ORowSet.java
b/qadevOOo/tests/java/mod/_dbaccess/ORowSet.java
index 0e0d0e5..b63b249 100644
--- a/qadevOOo/tests/java/mod/_dbaccess/ORowSet.java
+++ b/qadevOOo/tests/java/mod/_dbaccess/ORowSet.java
@@ -165,7 +165,7 @@ public class ORowSet extends TestCase {
origDB = util.utils.getFullTestDocName("TestDB/testDB.dbf");
- dbTools = new DBTools( m_orb, _log );
+ dbTools = new DBTools( m_orb );
// creating DataSource and registering it in DatabaseContext
String dbURL = (String) Param.get("test.db.url");
diff --git a/qadevOOo/tests/java/mod/_forms/GenericModelTest.java
b/qadevOOo/tests/java/mod/_forms/GenericModelTest.java
index 8109ae6..5ace649 100644
--- a/qadevOOo/tests/java/mod/_forms/GenericModelTest.java
+++ b/qadevOOo/tests/java/mod/_forms/GenericModelTest.java
@@ -397,7 +397,7 @@ public class GenericModelTest extends TestCase {
log.println("copy '"+sourceTestDB + "' -> '" + destTestDB + "'");
utils.copyFile(xMSF, sourceTestDB, destTestDB);
- m_dbTools = new DBTools( xMSF, log );
+ m_dbTools = new DBTools( xMSF );
String tmpDir = utils.getOfficeTemp((xMSF));
m_srcInf = m_dbTools.newDataSourceInfo();
diff --git a/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java
b/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java
index 8f42343..26be61c 100644
--- a/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java
+++ b/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java
@@ -233,7 +233,7 @@ public class ODatabaseForm extends TestCase {
origDB = util.utils.getFullTestDocName("TestDB/testDB.dbf");
- dbTools = new DBTools( tParam.getMSF(), log );
+ dbTools = new DBTools( tParam.getMSF() );
// creating DataSource and registering it in DatabaseContext
String dbURL = (String) tParam.get("test.db.url");
diff --git a/qadevOOo/tests/java/mod/_sw/SwXMailMerge.java
b/qadevOOo/tests/java/mod/_sw/SwXMailMerge.java
index cfd3536..9855b6b 100644
--- a/qadevOOo/tests/java/mod/_sw/SwXMailMerge.java
+++ b/qadevOOo/tests/java/mod/_sw/SwXMailMerge.java
@@ -329,7 +329,7 @@ public class SwXMailMerge extends TestCase {
xSrcProp.setPropertyValue("URL", tmpDatabaseUrl) ;
- DBTools dbt = new DBTools( Param.getMSF(), log );
+ DBTools dbt = new DBTools( Param.getMSF() );
// registering source in DatabaseContext
log.println("register database '"+tmpDatabaseUrl+"' as
'"+databaseName+"'" );
dbt.reRegisterDB(databaseName, newSource) ;
@@ -388,7 +388,7 @@ public class SwXMailMerge extends TestCase {
protected void cleanup(TestParameters Param, PrintWriter log) {
log.println("closing connections...");
XMultiServiceFactory xMsf = Param.getMSF();
- DBTools dbt = new DBTools( xMsf, log );
+ DBTools dbt = new DBTools( xMsf );
if (Param.containsKey("uniqueSuffix")){
int uniqueSuffix = Param.getInt("uniqueSuffix");
diff --git
a/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java
b/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java
index 4817715..5b5704c 100644
--- a/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java
+++ b/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java
@@ -220,7 +220,7 @@ public class SDBCReportDataFactory implements
DataSourceFactory
}
}
- private String getOrderStatement(final int commandType, final String
command, final List sortExpressions)
+ private String getOrderStatement(final List sortExpressions)
{
final StringBuffer order = new StringBuffer();
final int count = sortExpressions.size();
@@ -493,7 +493,7 @@ public class SDBCReportDataFactory implements
DataSourceFactory
WrappedTargetException,
NoSuchElementException
{
- final StringBuffer order = new
StringBuffer(getOrderStatement(commandType, command, (ArrayList<?>)
parameters.get(SORT_EXPRESSIONS)));
+ final StringBuffer order = new
StringBuffer(getOrderStatement((ArrayList<?>)
parameters.get(SORT_EXPRESSIONS)));
if (order.length() > 0 && commandType != CommandType.TABLE)
{
String statement = command;
diff --git a/reportdesign/qa/complex/reportdesign/ReportDesignerTest.java
b/reportdesign/qa/complex/reportdesign/ReportDesignerTest.java
index b9d6d39..c0216b1 100644
--- a/reportdesign/qa/complex/reportdesign/ReportDesignerTest.java
+++ b/reportdesign/qa/complex/reportdesign/ReportDesignerTest.java
@@ -351,7 +351,7 @@ public class ReportDesignerTest
return sFileType;
}
- private String getOutputPath(int _nType)
+ private String getOutputPath()
{
String sOutputPath = util.utils.getOfficeTemp/*Dir*/(getMSF());//
(String)param.get( convwatch.PropertyName.DOC_COMPARATOR_OUTPUT_PATH );
@@ -374,7 +374,7 @@ public class ReportDesignerTest
*/
private void storeComponent(String _sName, Object _xComponent, int _nType)
{
- String sOutputPath = getOutputPath(_nType);
+ String sOutputPath = getOutputPath();
// add DocumentPoolName
sOutputPath += getDocumentPoolName(_nType);
diff --git
a/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
b/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
index 98c54a6..48cb3ed 100644
--- a/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
+++ b/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
@@ -293,7 +293,7 @@ public class ScriptMetaData extends ScriptEntry {
URL url = null;
int indexOfColon = path.indexOf(":");
String scheme = path.substring( 0, indexOfColon );
- UCBStreamHandler handler = new UCBStreamHandler( parent.parent.m_xCtx,
scheme, parent.m_xSFA);
+ UCBStreamHandler handler = new UCBStreamHandler( scheme,
parent.m_xSFA);
path += UCBStreamHandler.separator;
url = new URL(null, path, handler);
diff --git
a/scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java
b/scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java
index 1f799d1..613b628 100644
--- a/scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java
+++ b/scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java
@@ -23,13 +23,11 @@ import java.io.*;
import java.util.*;
import java.util.zip.*;
-import com.sun.star.uno.XComponentContext;
import com.sun.star.ucb.XSimpleFileAccess;
import com.sun.star.uno.UnoRuntime;
import com.sun.star.io.XInputStream;
import com.sun.star.io.XOutputStream;
import com.sun.star.io.XTruncate;
-
import com.sun.star.script.framework.log.LogUtils;
import com.sun.star.script.framework.provider.PathUtils;
@@ -41,7 +39,7 @@ public class UCBStreamHandler extends URLStreamHandler {
private HashMap<String,InputStream> m_jarStreamMap = new
HashMap<String,InputStream>(12);
public static String m_ucbscheme;
- public UCBStreamHandler( XComponentContext ctxt, String scheme,
XSimpleFileAccess xSFA )
+ public UCBStreamHandler( String scheme, XSimpleFileAccess xSFA )
{
LogUtils.DEBUG( "UCBStreamHandler ctor, scheme = " + scheme );
UCBStreamHandler.m_ucbscheme = scheme;
diff --git
a/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
b/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
index a752648..78459c2 100644
---
a/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
+++
b/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
@@ -109,20 +109,20 @@ public class PlainSourceView extends JScrollPane
/* Implementation of DocumentListener interface */
public void insertUpdate(DocumentEvent e) {
- doChanged(e);
+ doChanged();
}
public void removeUpdate(DocumentEvent e) {
- doChanged(e);
+ doChanged();
}
public void changedUpdate(DocumentEvent e) {
- doChanged(e);
+ doChanged();
}
/* If the number of lines in the JTextArea has changed then update the
GlyphGutter */
- public void doChanged(DocumentEvent e) {
+ public void doChanged() {
isModified = true;
if (linecount != ta.getLineCount()) {
diff --git a/smoketest/com/sun/star/comp/smoketest/TestExtension.java
b/smoketest/com/sun/star/comp/smoketest/TestExtension.java
index e2253b4..ed57f2f 100644
--- a/smoketest/com/sun/star/comp/smoketest/TestExtension.java
+++ b/smoketest/com/sun/star/comp/smoketest/TestExtension.java
@@ -21,7 +21,6 @@ package com.sun.star.comp.smoketest;
import com.sun.star.lib.uno.helper.Factory;
import com.sun.star.lang.XSingleComponentFactory;
import com.sun.star.lib.uno.helper.WeakBase;
-import com.sun.star.uno.XComponentContext;
import com.sun.star.registry.XRegistryKey;
import com.sun.star.lang.XServiceInfo;
diff --git
a/smoketest/org/libreoffice/smoketest/SmoketestCommandEnvironment.java
b/smoketest/org/libreoffice/smoketest/SmoketestCommandEnvironment.java
index 4198739..fe4f346 100644
--- a/smoketest/org/libreoffice/smoketest/SmoketestCommandEnvironment.java
+++ b/smoketest/org/libreoffice/smoketest/SmoketestCommandEnvironment.java
@@ -20,7 +20,6 @@ package org.libreoffice.smoketest;
import com.sun.star.lib.uno.helper.WeakBase;
import com.sun.star.uno.UnoRuntime;
-import com.sun.star.uno.XComponentContext;
import com.sun.star.lang.XServiceInfo;
import com.sun.star.ucb.XCommandEnvironment;
diff --git a/toolkit/test/accessibility/AccTreeNode.java
b/toolkit/test/accessibility/AccTreeNode.java
index af1c333..ab673ed 100644
--- a/toolkit/test/accessibility/AccTreeNode.java
+++ b/toolkit/test/accessibility/AccTreeNode.java
@@ -83,7 +83,7 @@ class AccTreeNode
HandlerDescriptor aDescriptor = maHandlers.get(i);
aDescriptor.maHandler = aDescriptor.maHandler.createHandler
(mxContext);
aDescriptor.mnChildCount =
- aDescriptor.maHandler.getChildCount (this);
+ aDescriptor.maHandler.getChildCount ();
}
}
@@ -161,7 +161,7 @@ class AccTreeNode
HandlerDescriptor aDescriptor = maHandlers.get(i);
if (aDescriptor.mnChildCount < 0)
aDescriptor.mnChildCount =
- aDescriptor.maHandler.getChildCount (this);
+ aDescriptor.maHandler.getChildCount ();
return aDescriptor;
}
@@ -211,7 +211,7 @@ class AccTreeNode
// search with next handler
HandlerDescriptor aDescriptor = getHandlerDescriptor (i);
if (nIndex < aDescriptor.mnChildCount)
- return aDescriptor.maHandler.getChildNoCreate (this,
nIndex);
+ return aDescriptor.maHandler.getChildNoCreate (nIndex);
else
nIndex -= aDescriptor.mnChildCount;
}
@@ -236,8 +236,8 @@ class AccTreeNode
HandlerDescriptor aDescriptor = getHandlerDescriptor (i);
if (nIndex < aDescriptor.mnChildCount)
{
- bStatus = aDescriptor.maHandler.removeChild (this, nIndex);
- aDescriptor.mnChildCount =
aDescriptor.maHandler.getChildCount (this);
+ bStatus = aDescriptor.maHandler.removeChild (nIndex);
+ aDescriptor.mnChildCount =
aDescriptor.maHandler.getChildCount ();
break;
}
else
@@ -334,7 +334,7 @@ class AccTreeNode
{
AccessibleTreeHandler aHandler =
(AccessibleTreeHandler)aDescriptor.maHandler;
AccessibleTreeNode aNode = aHandler.addAccessibleChild (this,
xChild);
- aDescriptor.mnChildCount = aHandler.getChildCount (this);
+ aDescriptor.mnChildCount = aHandler.getChildCount ();
return aNode;
}
}
@@ -363,7 +363,7 @@ class AccTreeNode
{
aDescriptor.maHandler.update(this);
// Get updated number of children.
- int nChildCount = aDescriptor.maHandler.getChildCount (this);
+ int nChildCount = aDescriptor.maHandler.getChildCount ();
aDescriptor.mnChildCount = nChildCount;
// Fill in the indices of the updated children.
for (int j=0; j<nChildCount; j++)
diff --git a/toolkit/test/accessibility/AccessibilityTreeModel.java
b/toolkit/test/accessibility/AccessibilityTreeModel.java
index a7cbbaf..6cec54f 100644
--- a/toolkit/test/accessibility/AccessibilityTreeModel.java
+++ b/toolkit/test/accessibility/AccessibilityTreeModel.java
@@ -19,7 +19,6 @@
import java.util.ArrayList;
import javax.swing.event.TreeModelEvent;
-import javax.swing.event.TreeModelListener;
import javax.swing.tree.TreePath;
import com.sun.star.accessibility.XAccessible;
diff --git a/toolkit/test/accessibility/CanvasShape.java
b/toolkit/test/accessibility/CanvasShape.java
index cf0f492..736d2f3 100644
--- a/toolkit/test/accessibility/CanvasShape.java
+++ b/toolkit/test/accessibility/CanvasShape.java
@@ -240,16 +240,6 @@ class CanvasShape
- /** Callback for disposing events.
- */
- public void disposing (com.sun.star.lang.EventObject e)
- {
- System.out.println ("Disposing");
- }
-
-
-
-
/** Compute whether the specified point lies inside the object's
bounding box.
*/
diff --git a/toolkit/test/accessibility/NodeHandler.java
b/toolkit/test/accessibility/NodeHandler.java
index e6da882..73a36aa 100644
--- a/toolkit/test/accessibility/NodeHandler.java
+++ b/toolkit/test/accessibility/NodeHandler.java
@@ -48,7 +48,7 @@ abstract class NodeHandler
}
/** return the number of children this object has */
- public int getChildCount(Object aObject)
+ public int getChildCount()
{
synchronized (maChildList)
{
@@ -77,7 +77,7 @@ abstract class NodeHandler
}
}
- public AccessibleTreeNode getChildNoCreate (AccessibleTreeNode aParent,
int nIndex)
+ public AccessibleTreeNode getChildNoCreate (int nIndex)
{
synchronized (maChildList)
{
@@ -87,7 +87,7 @@ abstract class NodeHandler
/** Remove the specified child from the list of children.
*/
- public boolean removeChild (AccessibleTreeNode aNode, int nIndex)
+ public boolean removeChild (int nIndex)
{
try
{
@@ -124,12 +124,6 @@ abstract class NodeHandler
// They have default implementations for no actions and read-only.
- /** May this child be changed? */
- public boolean isChildEditable (AccessibleTreeNode aNode, int nIndex)
- {
- return false;
- }
-
/** get names of supported actions */
public String[] getActions (AccessibleTreeNode aNode)
{
diff --git a/wizards/com/sun/star/wizards/db/ColumnPropertySet.java
b/wizards/com/sun/star/wizards/db/ColumnPropertySet.java
index e8c2f10..10458ac 100644
--- a/wizards/com/sun/star/wizards/db/ColumnPropertySet.java
+++ b/wizards/com/sun/star/wizards/db/ColumnPropertySet.java
@@ -76,7 +76,7 @@ public class ColumnPropertySet
{
xPropertySet.setPropertyValue("Precision", precision);
}
- setType(nType, sTypeName, precision);
+ setType(sTypeName, precision);
for (int i = 0; i < _aNewColPropertyValues.length; i++)
{
String sPropName = _aNewColPropertyValues[i].Name;
@@ -124,7 +124,7 @@ public class ColumnPropertySet
}
}
- private void setType(int _nType, String _sTypeName, Integer precision)
+ private void setType(String _sTypeName, Integer precision)
{
if (_sTypeName.equals(PropertyNames.EMPTY_STRING))
{
diff --git a/wizards/com/sun/star/wizards/db/CommandMetaData.java
b/wizards/com/sun/star/wizards/db/CommandMetaData.java
index a4fe388..ef1b026 100644
--- a/wizards/com/sun/star/wizards/db/CommandMetaData.java
+++ b/wizards/com/sun/star/wizards/db/CommandMetaData.java
@@ -82,7 +82,7 @@ public class CommandMetaData extends DBMetaData
super(xMSF);
}
- public void initializeFieldColumns(boolean _bgetDefaultValue, String
_CommandName, String[] _FieldNames)
+ public void initializeFieldColumns(String _CommandName, String[]
_FieldNames)
{
this.setCommandName(_CommandName);
FieldColumns = new FieldColumn[_FieldNames.length];
@@ -271,7 +271,7 @@ public class CommandMetaData extends DBMetaData
throw new com.sun.star.uno.RuntimeException();
}
- public boolean getFieldNamesOfCommand(String _commandname, int
_commandtype, boolean _bAppendMode)
+ public boolean getFieldNamesOfCommand(String _commandname, int
_commandtype)
{
try
{
@@ -660,10 +660,6 @@ public class CommandMetaData extends DBMetaData
return skeycolumnnames;
}
- public void openFormDocument(boolean _bReadOnly)
- {
- }
-
public void setCommandComposingAttributes()
{
try
diff --git a/wizards/com/sun/star/wizards/db/QueryMetaData.java
b/wizards/com/sun/star/wizards/db/QueryMetaData.java
index 4b994ac..3db9870 100644
--- a/wizards/com/sun/star/wizards/db/QueryMetaData.java
+++ b/wizards/com/sun/star/wizards/db/QueryMetaData.java
@@ -200,7 +200,7 @@ public class QueryMetaData extends CommandMetaData
return oTable.getColumns().getElementNames();
}
- public void initializeFieldTitleSet(boolean _bAppendMode)
+ public void initializeFieldTitleSet()
{
try
{
diff --git a/wizards/com/sun/star/wizards/document/Control.java
b/wizards/com/sun/star/wizards/document/Control.java
index b581898..c292665 100644
--- a/wizards/com/sun/star/wizards/document/Control.java
+++ b/wizards/com/sun/star/wizards/document/Control.java
@@ -67,23 +67,23 @@ public class Control extends Shape
{
super(_oFormHandler, _aPoint, _aSize);
xFormName = _xFormName;
- createControl(_icontroltype, _aPoint, _aSize, null, _FieldName);
+ createControl(_icontroltype, null, _FieldName);
}
public Control(FormHandler _oFormHandler, XShapes _xGroupShapes,
XNameContainer _xFormName, int _icontroltype, Point _aPoint, Size _aSize)
{
super(_oFormHandler, _aPoint, _aSize);
xFormName = _xFormName;
- createControl(_icontroltype, _aPoint, _aSize, _xGroupShapes, null);
+ createControl(_icontroltype, _xGroupShapes, null);
}
public Control(FormHandler _oFormHandler, int _icontroltype, Point
_aPoint, Size _aSize)
{
super(_oFormHandler, _aPoint, _aSize);
- createControl(_icontroltype, _aPoint, _aSize, null, null);
+ createControl(_icontroltype, null, null);
}
- public void createControl(int _icontroltype, Point _aPoint, Size _aSize,
XShapes _xGroupShapes, String _FieldName)
+ public void createControl(int _icontroltype, XShapes _xGroupShapes, String
_FieldName)
{
try
{
diff --git a/wizards/com/sun/star/wizards/document/OfficeDocument.java
b/wizards/com/sun/star/wizards/document/OfficeDocument.java
index 540c503..35f00c6 100644
--- a/wizards/com/sun/star/wizards/document/OfficeDocument.java
+++ b/wizards/com/sun/star/wizards/document/OfficeDocument.java
@@ -62,7 +62,7 @@ public class OfficeDocument
private XWindowPeer xWindowPeer;
/** Creates a new instance of OfficeDocument */
- public OfficeDocument(XMultiServiceFactory _xMSF)
+ public OfficeDocument()
{
}
diff --git a/wizards/com/sun/star/wizards/form/FormControlArranger.java
b/wizards/com/sun/star/wizards/form/FormControlArranger.java
index 4b49ebc..1527c06 100644
--- a/wizards/com/sun/star/wizards/form/FormControlArranger.java
+++ b/wizards/com/sun/star/wizards/form/FormControlArranger.java
@@ -329,7 +329,7 @@ public class FormControlArranger
}
}
- public void positionControls(int _icurArrangement, Point _aStartPoint,
Size _aFormSize, short _iAlign, Short _NBorderType)
+ public void positionControls(int _icurArrangement, Point _aStartPoint,
short _iAlign, Short _NBorderType)
{
try
{
diff --git a/wizards/com/sun/star/wizards/form/FormDocument.java
b/wizards/com/sun/star/wizards/form/FormDocument.java
index bd89cbc..55f4f9f 100644
--- a/wizards/com/sun/star/wizards/form/FormDocument.java
+++ b/wizards/com/sun/star/wizards/form/FormDocument.java
@@ -240,8 +240,8 @@ public class FormDocument extends TextDocument
{
oMainControlForm.oFormController.positionControls(oMainControlForm.curArrangement,
oMainControlForm.aStartPoint,
- oMainControlForm.getFormSize(),
- curUIControlArranger.getAlignValue(), _NBorderType);
+ curUIControlArranger.getAlignValue(),
+ _NBorderType);
}
}
@@ -262,7 +262,7 @@ public class FormDocument extends TextDocument
{
// oSubControlForm.oFormController.adjustYPositions(_idiffheight);
oSubControlForm.setStartPoint(new
Point(oSubControlForm.aStartPoint.X, oMainControlForm.getActualFormHeight() +
oMainControlForm.aStartPoint.Y + SOFORMGAP));
-
oSubControlForm.oFormController.positionControls(oSubControlForm.curArrangement,
oSubControlForm.aStartPoint, oSubControlForm.getAvailableFormSize(),
curUIControlArranger.getAlignValue(), _NBorderType);
+
oSubControlForm.oFormController.positionControls(oSubControlForm.curArrangement,
oSubControlForm.aStartPoint, curUIControlArranger.getAlignValue(),
_NBorderType);
}
}
@@ -404,11 +404,11 @@ public class FormDocument extends TextDocument
else
{
adaptControlStyles = !oFormController.areControlsexisting();
- oFormController.positionControls(_curArrangement, aStartPoint,
getAvailableFormSize(), curUIControlArranger.getAlignValue(), _NBorderType);
+ oFormController.positionControls(_curArrangement, aStartPoint,
curUIControlArranger.getAlignValue(), _NBorderType);
}
if (adaptControlStyles)
{
- curStyleApplier.applyStyle(false, true);
+ curStyleApplier.applyStyle(true);
}
if ((Name.equals(SOMAINFORM)) && (oControlForms.size() > 1))
{
diff --git a/wizards/com/sun/star/wizards/form/FormWizard.java
b/wizards/com/sun/star/wizards/form/FormWizard.java
index eda3821..5d24072 100644
--- a/wizards/com/sun/star/wizards/form/FormWizard.java
+++ b/wizards/com/sun/star/wizards/form/FormWizard.java
@@ -120,7 +120,7 @@ public class FormWizard extends DatabaseObjectWizard
{
final String sTableName =
curSubFormFieldSelection.getSelectedCommandName();
String[] aFieldNames =
curSubFormFieldSelection.getSelectedFieldNames();
-
curFormDocument.oSubFormDBMetaData.initializeFieldColumns(true, sTableName,
aFieldNames);
+
curFormDocument.oSubFormDBMetaData.initializeFieldColumns(sTableName,
aFieldNames);
}
else
{
@@ -172,7 +172,7 @@ public class FormWizard extends DatabaseObjectWizard
{
final String sTableName =
curDBCommandFieldSelection.getSelectedCommandName();
final String[] aFieldNames =
curDBCommandFieldSelection.getSelectedFieldNames();
-
curFormDocument.oMainFormDBMetaData.initializeFieldColumns(true, sTableName,
aFieldNames);
+
curFormDocument.oMainFormDBMetaData.initializeFieldColumns(sTableName,
aFieldNames);
final String[] aMainFieldNames =
curFormDocument.oMainFormDBMetaData.getFieldNames();
try
@@ -190,7 +190,7 @@ public class FormWizard extends DatabaseObjectWizard
{
final String sTableName =
curSubFormFieldSelection.getSelectedCommandName();
final String[] aFieldNames =
curSubFormFieldSelection.getSelectedFieldNames();
-
curFormDocument.oSubFormDBMetaData.initializeFieldColumns(true, sTableName,
aFieldNames);
+
curFormDocument.oSubFormDBMetaData.initializeFieldColumns(sTableName,
aFieldNames);
final String[] aSubFieldNames =
curFormDocument.oSubFormDBMetaData.getFieldNames();
try
diff --git a/wizards/com/sun/star/wizards/form/StyleApplier.java
b/wizards/com/sun/star/wizards/form/StyleApplier.java
index 40f5515..2a8b19a 100644
--- a/wizards/com/sun/star/wizards/form/StyleApplier.java
+++ b/wizards/com/sun/star/wizards/form/StyleApplier.java
@@ -21,7 +21,6 @@ import com.sun.star.awt.XListBox;
import com.sun.star.awt.XRadioButton;
import com.sun.star.beans.XPropertySet;
import com.sun.star.container.XNameAccess;
-import com.sun.star.lang.EventObject;
import com.sun.star.lang.IllegalArgumentException;
import com.sun.star.lang.XMultiServiceFactory;
import com.sun.star.uno.AnyConverter;
@@ -186,7 +185,7 @@ public class StyleApplier
return (short) -1;
}
- public void applyStyle(boolean _bmodifyBackground, boolean _bapplyalways)
+ public void applyStyle(boolean _bapplyalways)
{
short iStyle = getStyleIndex();
if ((iStyle != iOldLayoutPos) || _bapplyalways)
diff --git a/wizards/com/sun/star/wizards/query/QueryWizard.java
b/wizards/com/sun/star/wizards/query/QueryWizard.java
index f082d8f..2ab4b92 100644
--- a/wizards/com/sun/star/wizards/query/QueryWizard.java
+++ b/wizards/com/sun/star/wizards/query/QueryWizard.java
@@ -139,7 +139,7 @@ public class QueryWizard extends DatabaseObjectWizard
return m_createdQuery;
}
- public void enableRoadmapItems(String[] _FieldNames, boolean _bEnabled)
+ public void enableRoadmapItems(boolean _bEnabled)
{
try
{
@@ -324,7 +324,7 @@ public class QueryWizard extends DatabaseObjectWizard
{
case SOFIELDSELECTION_PAGE:
m_DBMetaData.reorderFieldColumns(m_DBCommandFieldSelectio.getSelectedFieldNames());
- m_DBMetaData.initializeFieldTitleSet(true);
+ m_DBMetaData.initializeFieldTitleSet();
m_DBMetaData.setNumericFields();
searchForOutdatedFields();
break;
@@ -387,7 +387,7 @@ public class QueryWizard extends DatabaseObjectWizard
boolean bEnabled = NewItems.length > 0;
setControlProperty("btnWizardNext", PropertyNames.PROPERTY_ENABLED,
bEnabled);
setControlProperty("btnWizardFinish", PropertyNames.PROPERTY_ENABLED,
bEnabled);
- enableRoadmapItems(NewItems, bEnabled); // Note: Performancewise this
could be improved
+ enableRoadmapItems(bEnabled); // Note: Performancewise this could be
improved
}
public class FieldSelectionListener implements
com.sun.star.wizards.ui.XFieldSelectionListener
diff --git a/wizards/com/sun/star/wizards/report/Dataimport.java
b/wizards/com/sun/star/wizards/report/Dataimport.java
index 593b635..77ed2f3 100644
--- a/wizards/com/sun/star/wizards/report/Dataimport.java
+++ b/wizards/com/sun/star/wizards/report/Dataimport.java
@@ -149,7 +149,7 @@ public class Dataimport extends UnoDialog2 implements
com.sun.star.awt.XActionLi
}
}
- public void importReportData(final XMultiServiceFactory _xMSF, final
Dataimport _CurDataimport, IReportDocument _CurReportDocument, PropertyValue[]
_properties)
+ public void importReportData(final XMultiServiceFactory _xMSF,
PropertyValue[] _properties)
{
if (CurReportDocument.reconnectToDatabase(_xMSF, _properties))
{
@@ -167,6 +167,6 @@ public class Dataimport extends UnoDialog2 implements
com.sun.star.awt.XActionLi
{
CurReportDocument = ReportTextImplementation.create( xMSF,
i_documentUI, _textDocument, m_oResource );
showProgressDisplay(true);
- importReportData(xMSF, this, CurReportDocument, properties);
+ importReportData(xMSF, properties);
}
}
diff --git a/wizards/com/sun/star/wizards/table/FieldFormatter.java
b/wizards/com/sun/star/wizards/table/FieldFormatter.java
index e64375b..f5ceb87 100644
--- a/wizards/com/sun/star/wizards/table/FieldFormatter.java
+++ b/wizards/com/sun/star/wizards/table/FieldFormatter.java
@@ -55,7 +55,7 @@ public class FieldFormatter implements XItemListener
String suntitled;
Integer IFieldFormatStep;
- public FieldFormatter(TableWizard _CurUnoDialog, TableDescriptor
_curTableDescriptor)
+ public FieldFormatter(TableWizard _CurUnoDialog)
{
this.CurUnoDialog = _CurUnoDialog;
curtabindex = (short) (TableWizard.SOFIELDSFORMATPAGE * 100);
@@ -390,11 +390,6 @@ public class FieldFormatter implements XItemListener
txtfieldname.setText(_ColumnName);
}
- public XPropertySet clonePropertySet(XPropertySet _xPropertySet)
- {
- return null;
- }
-
public void itemStateChanged(ItemEvent arg0)
{
String fieldname = xlstFieldNames.getSelectedItem();
diff --git a/wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java
b/wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java
index d7ac335..e58b5cc 100644
--- a/wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java
+++ b/wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java
@@ -381,7 +381,7 @@ public class PrimaryKeyHandler implements
XFieldSelectionListener
Helper.setUnoPropertyValue(UnoDialog.getModel(chkApplyAutoValueExisting),
PropertyNames.PROPERTY_ENABLED, Boolean.valueOf(bdoenableAutoValueCheckBox));
}
- public String[] getPrimaryKeyFields(TableDescriptor _curtabledescriptor)
+ public String[] getPrimaryKeyFields()
{
if (chkcreatePrimaryKey.getState() == 0)
{
diff --git a/wizards/com/sun/star/wizards/table/TableWizard.java
b/wizards/com/sun/star/wizards/table/TableWizard.java
index 70ce06b..f3e74be 100644
--- a/wizards/com/sun/star/wizards/table/TableWizard.java
+++ b/wizards/com/sun/star/wizards/table/TableWizard.java
@@ -237,7 +237,7 @@ public class TableWizard extends DatabaseObjectWizard
implements XTextListener
public void buildSteps()
{
curScenarioSelector = new ScenarioSelector(this,
this.curTableDescriptor, slblFields, slblSelFields);
- curFieldFormatter = new FieldFormatter(this, curTableDescriptor);
+ curFieldFormatter = new FieldFormatter(this);
if ( this.curTableDescriptor.supportsPrimaryKeys() )
{
curPrimaryKeyHandler = new PrimaryKeyHandler(this,
curTableDescriptor);
@@ -254,7 +254,7 @@ public class TableWizard extends DatabaseObjectWizard
implements XTextListener
String catalogname = curFinalizer.getCatalogName();
if (curTableDescriptor.supportsPrimaryKeys())
{
- String[] keyfieldnames =
curPrimaryKeyHandler.getPrimaryKeyFields(curTableDescriptor);
+ String[] keyfieldnames =
curPrimaryKeyHandler.getPrimaryKeyFields();
if (keyfieldnames != null)
{
if (keyfieldnames.length > 0)
diff --git a/wizards/com/sun/star/wizards/text/ViewHandler.java
b/wizards/com/sun/star/wizards/text/ViewHandler.java
index 3a014aa..0b3712e 100644
--- a/wizards/com/sun/star/wizards/text/ViewHandler.java
+++ b/wizards/com/sun/star/wizards/text/ViewHandler.java
@@ -23,7 +23,6 @@ import com.sun.star.container.XIndexAccess;
import com.sun.star.container.XNameAccess;
import com.sun.star.lang.IllegalArgumentException;
import com.sun.star.lang.WrappedTargetException;
-import com.sun.star.lang.XMultiServiceFactory;
import com.sun.star.style.XStyleFamiliesSupplier;
import com.sun.star.text.XPageCursor;
import com.sun.star.text.XTextContent;
diff --git a/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java
b/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java
index 80b5b9c..437f3ac 100644
--- a/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java
+++ b/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java
@@ -222,7 +222,7 @@ public class CommandFieldSelection extends FieldSelection
implements Comparator<
{
curCommandName = sSelectedTableName; // sLocList[iSelPos];
CurDBMetaData.setTableByName(curCommandName);
- binitialize =
CurDBMetaData.getFieldNamesOfCommand(curCommandName, CommandType.TABLE,
AppendMode);
+ binitialize =
CurDBMetaData.getFieldNamesOfCommand(curCommandName, CommandType.TABLE);
}
else
{
@@ -231,14 +231,14 @@ public class CommandFieldSelection extends FieldSelection
implements Comparator<
CurDBMetaData.setCommandType(CommandType.TABLE);
curCommandName =
JavaTools.replaceSubString(sSelectedTableName, PropertyNames.EMPTY_STRING,
sTablePrefix);
CurDBMetaData.setTableByName(curCommandName);
- binitialize =
CurDBMetaData.getFieldNamesOfCommand(curCommandName, CommandType.TABLE,
AppendMode);
+ binitialize =
CurDBMetaData.getFieldNamesOfCommand(curCommandName, CommandType.TABLE);
}
else
{
CurDBMetaData.setCommandType(CommandType.QUERY);
curCommandName =
JavaTools.replaceSubString(sSelectedTableName, PropertyNames.EMPTY_STRING,
sQueryPrefix);
CurDBMetaData.setQueryByName(curCommandName);
- binitialize =
CurDBMetaData.getFieldNamesOfCommand(curCommandName, CommandType.QUERY,
AppendMode);
+ binitialize =
CurDBMetaData.getFieldNamesOfCommand(curCommandName, CommandType.QUERY);
}
}
if (binitialize)
diff --git a/wizards/com/sun/star/wizards/ui/FilterComponent.java
b/wizards/com/sun/star/wizards/ui/FilterComponent.java
index 7bc43dd..dbcba18 100644
--- a/wizards/com/sun/star/wizards/ui/FilterComponent.java
+++ b/wizards/com/sun/star/wizards/ui/FilterComponent.java
@@ -179,11 +179,6 @@ public class FilterComponent
public void disposing(EventObject eventObject)
{
}
-
- public void actionPerformed(com.sun.star.awt.ActionEvent actionEvent)
- {
- getfilterstate();
- }
}
public static String getIndexNumber(String _sStr)
@@ -948,7 +943,7 @@ public class FilterComponent
return
(Helper.getUnoPropertyValue(UnoDialog.getModel(ControlElements[SOTXTVALUE]),
"Text"));
}
- protected String getDateTimeString(boolean bgetDate)
+ protected String getDateTimeString()
{
double dblValue = ((Double) getValue()).doubleValue();
NumberFormatter oNumberFormatter =
oQueryMetaData.getNumberFormatter();
commit 41709cc2688738f091a4b17839fe853caa5a0bfd
Author: Noel Grandin <n...@peralex.com>
Date: Fri Aug 8 14:53:00 2014 +0200
java: remove unused parameters
Change-Id: I47c618117e079bb2ef90d92c449c8166ea957fa5
diff --git a/forms/qa/integration/forms/TableCellTextBinding.java
b/forms/qa/integration/forms/TableCellTextBinding.java
index 8a1d1fb..2fe0736 100644
--- a/forms/qa/integration/forms/TableCellTextBinding.java
+++ b/forms/qa/integration/forms/TableCellTextBinding.java
@@ -195,8 +195,4 @@ public class TableCellTextBinding
}
}
- public void disposing(com.sun.star.lang.EventObject eventObject)
- {
- // not interested in
- }
}
diff --git a/framework/qa/complex/XUserInputInterception/EventTest.java
b/framework/qa/complex/XUserInputInterception/EventTest.java
index c71c3df..3e5694d 100644
--- a/framework/qa/complex/XUserInputInterception/EventTest.java
+++ b/framework/qa/complex/XUserInputInterception/EventTest.java
@@ -487,7 +487,6 @@ public class EventTest {
// get the position and the range of a scroll bar
XWindow xWindow = AccessibilityTools.getCurrentWindow(
- getMSF(),
xModel);
XAccessible xRoot =
AccessibilityTools.getAccessibleObject(xWindow);
diff --git
a/framework/qa/complex/accelerators/AcceleratorsConfigurationTest.java
b/framework/qa/complex/accelerators/AcceleratorsConfigurationTest.java
index 95314db..6b2ff6f 100644
--- a/framework/qa/complex/accelerators/AcceleratorsConfigurationTest.java
+++ b/framework/qa/complex/accelerators/AcceleratorsConfigurationTest.java
@@ -81,7 +81,7 @@ public class AcceleratorsConfigurationTest
String sConfigPath = "org.openoffice.Office.Accelerators";
boolean bReadOnly = false;
- XNameAccess m_xConfig2 = openConfig(m_xSmgr, sConfigPath, bReadOnly);
+ XNameAccess m_xConfig2 = openConfig(sConfigPath, bReadOnly);
if (m_xConfig2 != null)
{
m_xPrimaryKeys = UnoRuntime.queryInterface(XNameAccess.class,
m_xConfig2.getByName("PrimaryKeys"));
@@ -694,7 +694,7 @@ public class AcceleratorsConfigurationTest
String sConfigPath = "org.openoffice.Setup";
boolean bReadOnly = true;
- XNameAccess xRootConfig = openConfig(m_xSmgr, sConfigPath, bReadOnly);
+ XNameAccess xRootConfig = openConfig(sConfigPath, bReadOnly);
if (xRootConfig != null)
{
@@ -714,7 +714,7 @@ public class AcceleratorsConfigurationTest
{
String sConfigPath = "org.openoffice.Setup";
boolean bReadOnly = false;
- XNameAccess xRootConfig = openConfig(m_xSmgr, sConfigPath, bReadOnly);
+ XNameAccess xRootConfig = openConfig(sConfigPath, bReadOnly);
if (xRootConfig != null)
{
@@ -729,7 +729,7 @@ public class AcceleratorsConfigurationTest
/** @todo document me.
*/
- private XNameAccess openConfig(XMultiServiceFactory xSMGR,
+ private XNameAccess openConfig(
String sConfigPath,
boolean bReadOnly)
throws java.lang.Exception
diff --git
a/framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java
b/framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java
index f621a5a..59d8abc 100644
---
a/framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java
+++
b/framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java
@@ -293,7 +293,7 @@ public class CheckContextMenuInterceptor
System.out.println("try to open contex menu...");
new AccessibilityTools();
- xWindow = AccessibilityTools.getCurrentWindow(xMSF, aModel);
+ xWindow = AccessibilityTools.getCurrentWindow(aModel);
XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);
diff --git a/framework/qa/complex/framework/recovery/RecoveryTest.java
b/framework/qa/complex/framework/recovery/RecoveryTest.java
index c022e17..7a5d2ac 100644
--- a/framework/qa/complex/framework/recovery/RecoveryTest.java
+++ b/framework/qa/complex/framework/recovery/RecoveryTest.java
@@ -102,7 +102,7 @@ public class RecoveryTest extends ComplexTestCase {
handleRecoveryDialogAfterCrash(expectedDocumentCount);
startOffice();
handleRecoveryDialog_QuickExit(expectedDocumentCount);
- handleCrashReporterDialog(true, true);
+ handleCrashReporterDialog(true);
checkDocumentCount(expectedDocumentCount);
}
@@ -264,7 +264,7 @@ public class RecoveryTest extends ComplexTestCase {
}
}
- private void handleCrashReporterDialog(boolean cancel, boolean YesNo){
+ private void handleCrashReporterDialog(boolean cancel){
try{
log.println("try to get Crash Reporter Dialog...");
diff --git a/framework/qa/complex/imageManager/CheckImageManager.java
b/framework/qa/complex/imageManager/CheckImageManager.java
index 02111c0..d5004c4 100644
--- a/framework/qa/complex/imageManager/CheckImageManager.java
+++ b/framework/qa/complex/imageManager/CheckImageManager.java
@@ -75,7 +75,7 @@ public class CheckImageManager {
fail("Exception. " + e.getMessage());
}
XImageManager xImageManager =
UnoRuntime.queryInterface(XImageManager.class, xManager.getImageManager());
- performChecks(xImageManager, "ModuleUIConfig", xManager);
+ performChecks(xImageManager, "ModuleUIConfig");
}
public void checkImageManager() {
@@ -89,10 +89,10 @@ public class CheckImageManager {
}
XImageManager xImageManager =
UnoRuntime.queryInterface(XImageManager.class, xManager.getImageManager());
- performChecks(xImageManager, "UIConfig", xManager);
+ performChecks(xImageManager, "UIConfig");
}
- private void performChecks(XImageManager xImageManager, String
testObjectName, XUIConfigurationManager xManager) {
+ private void performChecks(XImageManager xImageManager, String
testObjectName) {
util.dbg.printInterfaces(xImageManager);
OXUIConfigurationListenerImpl configListener = new
OXUIConfigurationListenerImpl();
diff --git a/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java
b/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java
index 3e2b37b..955fa0b 100644
--- a/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java
+++ b/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java
@@ -219,7 +219,7 @@ public class CheckXComponentLoader
@Test public void checkUsingOfMediaDescriptor()
{
InteractionHandler xHandler = new InteractionHandler();
- StatusIndicator xIndicator = new
StatusIndicator(StatusIndicator.SHOWSTATUS_LOG);
+ StatusIndicator xIndicator = new StatusIndicator();
PropertyValue[] lProps = new PropertyValue[3];
diff --git a/framework/qa/complex/loadAllDocuments/StatusIndicator.java
b/framework/qa/complex/loadAllDocuments/StatusIndicator.java
index d83651e..691b4c7 100644
--- a/framework/qa/complex/loadAllDocuments/StatusIndicator.java
+++ b/framework/qa/complex/loadAllDocuments/StatusIndicator.java
@@ -53,7 +53,7 @@ public class StatusIndicator implements
com.sun.star.task.XStatusIndicator
* ctor
* It's initialize an object of this class with default values.
*/
- public StatusIndicator( int nOut)
+ public StatusIndicator()
{
m_bWasUsed = false;
}
diff --git a/framework/qa/complex/path_settings/PathSettingsTest.java
b/framework/qa/complex/path_settings/PathSettingsTest.java
index f23cf0e..0c01ef3 100644
--- a/framework/qa/complex/path_settings/PathSettingsTest.java
+++ b/framework/qa/complex/path_settings/PathSettingsTest.java
@@ -563,7 +563,10 @@ public class PathSettingsTest
System.out.println(" FAIL: Did not change value on property "
+ name + ".");
bResult = false;
}
- newVal = changeToIncorrectValue(val);
+ /*
+ * Change the given String to an incorrect path URL.
+ */
+ newVal = "fileblablabla";
System.out.println(" Try to change to incorrect value '" + newVal
+ "'");
try
{
@@ -650,16 +653,6 @@ public class PathSettingsTest
}
/**
- * Change the given String to an incorrect path URL.
- * @return The changed path URL.
- */
- private String changeToIncorrectValue(String path)
- {
- // return an illegal path
- return "fileblablabla";
- }
-
- /**
* Listener implementation which sets a flag when
* listener was called.
*/
diff --git a/odk/examples/DevelopersGuide/Charts/ChartHelper.java
b/odk/examples/DevelopersGuide/Charts/ChartHelper.java
index 2a75a94..7208c58 100644
--- a/odk/examples/DevelopersGuide/Charts/ChartHelper.java
+++ b/odk/examples/DevelopersGuide/Charts/ChartHelper.java
@@ -69,7 +69,6 @@ public class ChartHelper
}
public XChartDocument insertOLEChartInWriter(
- String sChartName,
Point aUpperLeft,
Size aExtent,
String sChartServiceName )
@@ -143,7 +142,6 @@ public class ChartHelper
}
public XChartDocument insertOLEChartInDraw(
- String sChartName,
Point aUpperLeft,
Size aExtent,
String sChartServiceName )
diff --git a/odk/examples/DevelopersGuide/Charts/ChartInDraw.java
b/odk/examples/DevelopersGuide/Charts/ChartInDraw.java
index eff0757..bf16e57 100644
--- a/odk/examples/DevelopersGuide/Charts/ChartInDraw.java
+++ b/odk/examples/DevelopersGuide/Charts/ChartInDraw.java
@@ -78,7 +78,6 @@ public class ChartInDraw
// insert a new chart into the "Chart" sheet of the
// spreadsheet document
XChartDocument aChartDoc = aChartHelper.insertOLEChartInDraw(
- "BarChart",
aPos,
aExtent,
"com.sun.star.chart.BarDiagram" );
diff --git a/odk/examples/DevelopersGuide/Charts/ChartInWriter.java
b/odk/examples/DevelopersGuide/Charts/ChartInWriter.java
index 34678a1..d9585c3 100644
--- a/odk/examples/DevelopersGuide/Charts/ChartInWriter.java
+++ b/odk/examples/DevelopersGuide/Charts/ChartInWriter.java
@@ -86,7 +86,6 @@ public class ChartInWriter
// insert a new chart into the "Chart" sheet of the
// spreadsheet document
XChartDocument aChartDoc = aChartHelper.insertOLEChartInWriter(
- "BarChart",
aPos,
aExtent,
"com.sun.star.chart.AreaDiagram" );
diff --git a/odk/examples/DevelopersGuide/Charts/ListenAtCalcRangeInDraw.java
b/odk/examples/DevelopersGuide/Charts/ListenAtCalcRangeInDraw.java
index c1227b2..95b4761 100644
--- a/odk/examples/DevelopersGuide/Charts/ListenAtCalcRangeInDraw.java
+++ b/odk/examples/DevelopersGuide/Charts/ListenAtCalcRangeInDraw.java
@@ -89,7 +89,6 @@ public class ListenAtCalcRangeInDraw implements
XChartDataChangeEventListener
// insert a new chart into the "Chart" sheet of the
// spreadsheet document
maChartDocument = aChartHelper.insertOLEChartInDraw(
- "ChartWithCalcData",
aPos,
aExtent,
"com.sun.star.chart.XYDiagram" );
diff --git
a/odk/examples/DevelopersGuide/Components/SimpleLicense/LicenseTest.java
b/odk/examples/DevelopersGuide/Components/SimpleLicense/LicenseTest.java
index 76baa81..7233654 100644
--- a/odk/examples/DevelopersGuide/Components/SimpleLicense/LicenseTest.java
+++ b/odk/examples/DevelopersGuide/Components/SimpleLicense/LicenseTest.java
@@ -58,7 +58,7 @@ public class LicenseTest {
* @param xmultiservicefactoryInitialization A special service factory
* could be introduced while initializing.
*/
- public _LicenseTest(XComponentContext xCompContext) {
+ public _LicenseTest() {
}
/** This method returns an array of all supported service names.
diff --git a/qadevOOo/runner/convwatch/PixelCounter.java
b/qadevOOo/runner/convwatch/PixelCounter.java
index ef0223a..b7723fd 100644
--- a/qadevOOo/runner/convwatch/PixelCounter.java
+++ b/qadevOOo/runner/convwatch/PixelCounter.java
@@ -91,15 +91,10 @@ class graphics_stuff
return 0;
}
- public static void handlesinglepixel(int x, int y, int pixel)
- {
- }
-
public static void countPixel(ImageHelper img, int _x, int _y, int _w, int
_h, CountPixel _aPixelCounter)
{
for (int y = 0; y < _h; y++) {
for (int x = 0; x < _w; x++) {
- // handlesinglepixel(x+i, y+j, pixels[j * w + i]);
_aPixelCounter.count(img.getPixel(x,y));
}
}
diff --git a/qadevOOo/runner/helper/APIDescGetter.java
b/qadevOOo/runner/helper/APIDescGetter.java
index ef1e751..2e92a57 100644
--- a/qadevOOo/runner/helper/APIDescGetter.java
+++ b/qadevOOo/runner/helper/APIDescGetter.java
@@ -259,7 +259,7 @@ public class APIDescGetter extends DescGetter
}
protected static DescEntry[] getSubEntries(BufferedReader cvsFile,
- DescEntry parent, boolean debug)
+ DescEntry parent)
{
String line = "";
String old_ifc_name = "";
@@ -621,7 +621,7 @@ public class APIDescGetter extends DescGetter
theEntry.entryName + "'");
}
- DescEntry[] subEntries = getSubEntries(csvFile, theEntry, debug);
+ DescEntry[] subEntries = getSubEntries(csvFile, theEntry);
theEntry.SubEntryCount = subEntries.length;
theEntry.SubEntries = subEntries;
@@ -708,7 +708,7 @@ public class APIDescGetter extends DescGetter
return setErrorDescription(aEntry, "couldn't find file '" + aUrl +
"'");
}
- DescEntry[] subEntries = getSubEntries(csvFile, aEntry, debug);
+ DescEntry[] subEntries = getSubEntries(csvFile, aEntry);
aEntry.SubEntryCount = subEntries.length;
aEntry.SubEntries = subEntries;
@@ -759,7 +759,7 @@ public class APIDescGetter extends DescGetter
System.out.println("## reading from File " + descPath);
}
- scenario = getScenarioFromDirectory(descPath, job, debug);
+ scenario = getScenarioFromDirectory(descPath, job);
}
else
{
@@ -768,14 +768,13 @@ public class APIDescGetter extends DescGetter
System.out.println("## reading from jar");
}
- scenario = getScenarioFromClassPath(job, debug);
+ scenario = getScenarioFromClassPath(job);
}
return scenario;
}
- protected String[] getScenarioFromDirectory(String descPath, String job,
- boolean debug)
+ protected String[] getScenarioFromDirectory(String descPath, String job)
{
String[] modules = null;
ArrayList<String> componentList = new ArrayList<String>();
@@ -829,7 +828,7 @@ public class APIDescGetter extends DescGetter
}
- protected String[] getScenarioFromClassPath(String job, boolean debug)
+ protected String[] getScenarioFromClassPath(String job)
{
String subdir = "/";
diff --git a/qadevOOo/runner/helper/PropertyHandlerImpl.java
b/qadevOOo/runner/helper/PropertyHandlerImpl.java
index 873edc4..7fd2fb0 100644
--- a/qadevOOo/runner/helper/PropertyHandlerImpl.java
+++ b/qadevOOo/runner/helper/PropertyHandlerImpl.java
@@ -18,7 +18,6 @@
package helper;
import com.sun.star.inspection.LineDescriptor;
-import com.sun.star.inspection.XPropertyControlFactory;
import com.sun.star.inspection.XPropertyHandler;
/**
@@ -236,10 +235,4 @@ public class PropertyHandlerImpl implements
XPropertyHandler{
return false;
}
- /**
- * This method currently does nothing
- */
- public void describePropertyLine(String string, LineDescriptor[]
lineDescriptor, XPropertyControlFactory xPropertyControlFactory) {
- }
-
}
diff --git a/qadevOOo/runner/lib/MultiPropertyTest.java
b/qadevOOo/runner/lib/MultiPropertyTest.java
index 531946d..a0c93f3 100644
--- a/qadevOOo/runner/lib/MultiPropertyTest.java
+++ b/qadevOOo/runner/lib/MultiPropertyTest.java
@@ -447,7 +447,7 @@ public class MultiPropertyTest extends MultiMethodTest
* The method produces new value of the property from the oldValue.
* It returns the result of ValueChanger.changePValue method.
* Subclasses can override the method to return their own value,
- * when the changePValue beahviour is not enough, for example,
+ * when the changePValue behavior is not enough, for example,
* when oldValue is null.
*/
protected Object getNewValue(String propName, Object oldValue)
@@ -459,7 +459,7 @@ public class MultiPropertyTest extends MultiMethodTest
/**
* The method compares obj1 and obj2. It calls
* MultiPropertyTest.compare, but subclasses can override to change
- * the behaviour, since normally compare calls Object.equals method
+ * the behavior, since normally compare calls Object.equals method
* which is not appropriate in some cases(e.g., structs with equals
* not overridden).
*/
@@ -471,7 +471,7 @@ public class MultiPropertyTest extends MultiMethodTest
/**
* The method returns a String representation of the obj. It calls
* MultipropertyTest.toString(Object), but subclasses can override
- * to change the behaviour.
+ * to change the behavior.
*/
protected String toString(Object obj)
{
diff --git a/qadevOOo/runner/org/openoffice/RunnerService.java
b/qadevOOo/runner/org/openoffice/RunnerService.java
index 521dff7..d398f20 100644
--- a/qadevOOo/runner/org/openoffice/RunnerService.java
+++ b/qadevOOo/runner/org/openoffice/RunnerService.java
@@ -59,7 +59,7 @@ public class RunnerService implements XJob, XServiceInfo,
* ct'tor
* Construct an own office provider for tests
*/
- public RunnerService(XMultiServiceFactory xMSF) {
+ public RunnerService() {
}
public Object execute(NamedValue[] args) {
diff --git a/qadevOOo/runner/stats/FatDataBaseOutProducer.java
b/qadevOOo/runner/stats/FatDataBaseOutProducer.java
index baa6bb4..48fe206 100644
--- a/qadevOOo/runner/stats/FatDataBaseOutProducer.java
+++ b/qadevOOo/runner/stats/FatDataBaseOutProducer.java
@@ -90,11 +90,6 @@ public class FatDataBaseOutProducer extends
DataBaseOutProducer {
return true;
}
- // check the database afterwards
- protected boolean checkDataBase(LogWriter log) {
- return true;
- }
-
protected boolean insertEntry(LogWriter log) {
executeSQLCommand("SELECT id AS \"entry.id\", name AS \"entry.name\"
FROM entry WHERE name = \"$EntryLongName\";", true);
diff --git a/qadevOOo/runner/util/AccessibilityTools.java
b/qadevOOo/runner/util/AccessibilityTools.java
index e13bfcf..a2f0015 100644
--- a/qadevOOo/runner/util/AccessibilityTools.java
+++ b/qadevOOo/runner/util/AccessibilityTools.java
@@ -43,17 +43,15 @@ public class AccessibilityTools {
return UnoRuntime.queryInterface(XAccessible.class, xObject);
}
- public static XWindow getCurrentContainerWindow(XMultiServiceFactory msf,
- XModel xModel) {
- return getWindow(msf, xModel, true);
+ public static XWindow getCurrentContainerWindow(XModel xModel) {
+ return getWindow(xModel, true);
}
- public static XWindow getCurrentWindow(XMultiServiceFactory msf,
- XModel xModel) {
- return getWindow(msf, xModel, false);
+ public static XWindow getCurrentWindow(XModel xModel) {
+ return getWindow(xModel, false);
}
- private static XWindow getWindow(XMultiServiceFactory msf, XModel xModel,
+ private static XWindow getWindow(XModel xModel,
boolean containerWindow) {
XWindow xWindow = null;
diff --git a/qadevOOo/runner/util/BasicMacroTools.java
b/qadevOOo/runner/util/BasicMacroTools.java
index 97fb2c5..9d48c94 100644
--- a/qadevOOo/runner/util/BasicMacroTools.java
+++ b/qadevOOo/runner/util/BasicMacroTools.java
@@ -49,7 +49,7 @@ public class BasicMacroTools {
XComponent xDoc) throws java.lang.Exception {
try {
mMSF = msf;
- mDispProv = makeDispatchProvider(mMSF, xModel);
+ mDispProv = makeDispatchProvider(xModel);
mParser = makeParser(mMSF);
Object DocLibCont = null;
@@ -82,7 +82,7 @@ public class BasicMacroTools {
throws java.lang.Exception {
try {
mMSF = msf;
- mDispProv = makeDispatchProvider(mMSF, xModel);
+ mDispProv = makeDispatchProvider(xModel);
mParser = makeParser(mMSF);
Object ASLC = null;
@@ -107,8 +107,7 @@ public class BasicMacroTools {
}
}
- private static XDispatchProvider makeDispatchProvider(XMultiServiceFactory
mMSF,
- XModel aModel)
+ private static XDispatchProvider makeDispatchProvider(XModel aModel)
throws java.lang.Exception {
XController xController = aModel.getCurrentController();
XFrame xFrame = xController.getFrame();
diff --git a/qadevOOo/runner/util/SOfficeFactory.java
b/qadevOOo/runner/util/SOfficeFactory.java
index 72ca975..dec23a2 100644
--- a/qadevOOo/runner/util/SOfficeFactory.java
+++ b/qadevOOo/runner/util/SOfficeFactory.java
@@ -215,12 +215,9 @@ public class SOfficeFactory {
*
* @see XChartDocument
*/
- public XChartDocument createChartDoc(String frameName)
+ public XChartDocument createChartDoc()
throws com.sun.star.uno.Exception {
-// XComponent oDoc = loadDocument(
-// util.utils.getFullTestURL("emptyChart.sds"));
-
XComponent oDoc = loadDocument("private:factory/schart");
if (oDoc != null) {
diff --git a/qadevOOo/runner/util/UITools.java
b/qadevOOo/runner/util/UITools.java
index db99c09..0df2803 100644
--- a/qadevOOo/runner/util/UITools.java
+++ b/qadevOOo/runner/util/UITools.java
@@ -53,14 +53,14 @@ public class UITools {
public UITools(XMultiServiceFactory msf, XModel xModel)
{
mMSF = msf;
- mXRoot = makeRoot(mMSF, xModel);
+ mXRoot = makeRoot(xModel);
}
public UITools(XMultiServiceFactory msf, XTextDocument xTextDoc)
{
mMSF = msf;
XModel xModel = UnoRuntime.queryInterface(XModel.class, xTextDoc);
- mXRoot = makeRoot(mMSF, xModel);
+ mXRoot = makeRoot(xModel);
}
public UITools(XMultiServiceFactory msf, XWindow xWindow)
@@ -69,9 +69,9 @@ public class UITools {
mXRoot = makeRoot(xWindow);
}
- private static XAccessible makeRoot(XMultiServiceFactory msf, XModel
aModel)
+ private static XAccessible makeRoot(XModel aModel)
{
- XWindow xWindow = AccessibilityTools.getCurrentWindow(msf, aModel);
+ XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel);
return AccessibilityTools.getAccessibleObject(xWindow);
}
diff --git a/qadevOOo/testdocs/qadevlibs/source/test/Job.java
b/qadevOOo/testdocs/qadevlibs/source/test/Job.java
index 01a5b71..950eee8 100644
--- a/qadevOOo/testdocs/qadevlibs/source/test/Job.java
+++ b/qadevOOo/testdocs/qadevlibs/source/test/Job.java
@@ -85,8 +85,7 @@ public class Job {
}
- public static XSingleServiceFactory __getServiceFactory(String implName,
- XMultiServiceFactory multiFactory,
+ public static XSingleServiceFactory
__getServiceFactory(XMultiServiceFactory multiFactory,
XRegistryKey regKey) {
XSingleServiceFactory xSingleServiceFactory = null;
xSingleServiceFactory =
FactoryHelper.getServiceFactory(_Implementation.class,
diff --git a/qadevOOo/tests/java/ifc/awt/_XUserInputInterception.java
b/qadevOOo/tests/java/ifc/awt/_XUserInputInterception.java
index 1209ac9..9b3a2b5 100644
--- a/qadevOOo/tests/java/ifc/awt/_XUserInputInterception.java
+++ b/qadevOOo/tests/java/ifc/awt/_XUserInputInterception.java
@@ -459,7 +459,6 @@ public class _XUserInputInterception extends
MultiMethodTest {
util.DesktopTools.bringWindowToFront(xModel);
XWindow xWindow = AccessibilityTools.getCurrentWindow(
- tParam.getMSF(),
xModel);
XAccessible xRoot =
AccessibilityTools.getAccessibleObject(xWindow);
diff --git a/qadevOOo/tests/java/ifc/beans/_XHierarchicalPropertySet.java
b/qadevOOo/tests/java/ifc/beans/_XHierarchicalPropertySet.java
index bd295d1..dd19cf8 100644
--- a/qadevOOo/tests/java/ifc/beans/_XHierarchicalPropertySet.java
+++ b/qadevOOo/tests/java/ifc/beans/_XHierarchicalPropertySet.java
@@ -34,7 +34,6 @@ public class _XHierarchicalPropertySet extends
MultiMethodTest {
boolean res = true;
if (hpsi != null) {
- res = checkHPSI(hpsi);
} else {
log.println(
"The component doesn't provide
HierarchicalPropertySetInfo");
@@ -119,13 +118,6 @@ public class _XHierarchicalPropertySet extends
MultiMethodTest {
tRes.tested("setHierarchicalPropertyValue()", res);
}
- protected boolean checkHPSI(XHierarchicalPropertySetInfo hpsi) {
- log.println("Checking the resulting HierarchicalPropertySetInfo");
- log.println("### NOT yet implemented");
-
- return true;
- }
-
protected boolean checkType(String name, String type, Object value) {
boolean result = true;
diff --git a/qadevOOo/tests/java/ifc/beans/_XMultiHierarchicalPropertySet.java
b/qadevOOo/tests/java/ifc/beans/_XMultiHierarchicalPropertySet.java
index f915f61..9bcc343 100644
--- a/qadevOOo/tests/java/ifc/beans/_XMultiHierarchicalPropertySet.java
+++ b/qadevOOo/tests/java/ifc/beans/_XMultiHierarchicalPropertySet.java
@@ -34,7 +34,6 @@ public class _XMultiHierarchicalPropertySet extends
MultiMethodTest {
boolean res = true;
if (hpsi != null) {
- res = checkHPSI(hpsi);
} else {
log.println(
"The component doesn't provide
HierarchicalPropertySetInfo");
@@ -113,13 +112,6 @@ public class _XMultiHierarchicalPropertySet extends
MultiMethodTest {
tRes.tested("setHierarchicalPropertyValues()", res);
}
- protected boolean checkHPSI(XHierarchicalPropertySetInfo hpsi) {
- log.println("Checking the resulting HierarchicalPropertySetInfo");
- log.println("### NOT yet implemented");
-
- return true;
- }
-
protected boolean checkType(String[] name, String[] type, Object[] value) {
boolean result = true;
diff --git a/qadevOOo/tests/java/ifc/sheet/_XEnhancedMouseClickBroadcaster.java
b/qadevOOo/tests/java/ifc/sheet/_XEnhancedMouseClickBroadcaster.java
index dbfd307..9c5bb63 100644
--- a/qadevOOo/tests/java/ifc/sheet/_XEnhancedMouseClickBroadcaster.java
+++ b/qadevOOo/tests/java/ifc/sheet/_XEnhancedMouseClickBroadcaster.java
@@ -76,7 +76,7 @@ public class _XEnhancedMouseClickBroadcaster extends
MultiMethodTest {
log.println("try to open contex menu...");
new AccessibilityTools();
- XWindow xWindow = AccessibilityTools.getCurrentWindow(tParam.getMSF(),
docModel);
+ XWindow xWindow = AccessibilityTools.getCurrentWindow(docModel);
XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);
diff --git a/qadevOOo/tests/java/ifc/sheet/_XRangeSelection.java
b/qadevOOo/tests/java/ifc/sheet/_XRangeSelection.java
index 3f81fd0..5fb682a 100644
--- a/qadevOOo/tests/java/ifc/sheet/_XRangeSelection.java
+++ b/qadevOOo/tests/java/ifc/sheet/_XRangeSelection.java
@@ -157,7 +157,7 @@ public class _XRangeSelection extends MultiMethodTest {
XModel xModel = UnoRuntime.queryInterface(XModel.class, xSheetDoc);
System.out.println("Name: " +
xModel.getCurrentController().getFrame().getName());
- XWindow xWindow = AccessibilityTools.getCurrentWindow(tParam.getMSF(),
xModel);
+ XWindow xWindow = AccessibilityTools.getCurrentWindow(xModel);
XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);
XAccessibleContext ctx =
AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.TABLE );
diff --git a/qadevOOo/tests/java/ifc/ucb/_XRemoteContentProviderAcceptor.java
b/qadevOOo/tests/java/ifc/ucb/_XRemoteContentProviderAcceptor.java
index a12dc1b..abf5b54 100644
--- a/qadevOOo/tests/java/ifc/ucb/_XRemoteContentProviderAcceptor.java
+++ b/qadevOOo/tests/java/ifc/ucb/_XRemoteContentProviderAcceptor.java
@@ -46,7 +46,6 @@ public class _XRemoteContentProviderAcceptor extends
MultiMethodTest {
public void doneWithRemoteContentProviders
(XRemoteContentProviderAcceptor xRCPA) {
}
- public void disposing (com.sun.star.lang.EventObject obj) {}
}
diff --git a/qadevOOo/tests/java/ifc/ui/_XContextMenuInterception.java
b/qadevOOo/tests/java/ifc/ui/_XContextMenuInterception.java
index fbce478..e9b41cb1 100644
--- a/qadevOOo/tests/java/ifc/ui/_XContextMenuInterception.java
+++ b/qadevOOo/tests/java/ifc/ui/_XContextMenuInterception.java
@@ -156,7 +156,7 @@ public class _XContextMenuInterception extends
MultiMethodTest {
log.println("try to open contex menu...");
new AccessibilityTools();
- xWindow = AccessibilityTools.getCurrentWindow(xMSF, xModel);
+ xWindow = AccessibilityTools.getCurrentWindow(xModel);
XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);
diff --git a/qadevOOo/tests/java/mod/_nestedreg/uno/NestedRegistry.java
b/qadevOOo/tests/java/mod/_nestedreg/uno/NestedRegistry.java
index 5269f33..3eed73a 100644
--- a/qadevOOo/tests/java/mod/_nestedreg/uno/NestedRegistry.java
+++ b/qadevOOo/tests/java/mod/_nestedreg/uno/NestedRegistry.java
@@ -75,10 +75,10 @@ public class NestedRegistry extends TestCase {
/**
* Creates a temporary copy of file, which is deleted when VM exits.
* @param src Source file path.
- * @param dst Destination file path.
+ * @param dst Destination file path.
* @throws java.io.IOException If any problems occur during copiing.
*/
- protected void copyFile(String src, String dst, PrintWriter log)
+ protected void copyFile(String src, String dst)
throws java.io.IOException {
File srcF = new File(src) ;
File dstF = new File(dst) ;
@@ -139,8 +139,8 @@ public class NestedRegistry extends TestCase {
log.println("creating copies of the registry for XSimpleRegistry");
try {
String source = utils.getFullTestDocName("XSimpleRegistry.rdb");
- copyFile(source, openF, log) ;
- copyFile(source, mergeF, log) ;
+ copyFile(source, openF) ;
+ copyFile(source, mergeF) ;
} catch (java.io.IOException e) {
log.println("Exception occurred while copying files");
e.printStackTrace(log);
diff --git a/qadevOOo/tests/java/mod/_remotebridge/various.java
b/qadevOOo/tests/java/mod/_remotebridge/various.java
index 27b1558..b01d323 100644
--- a/qadevOOo/tests/java/mod/_remotebridge/various.java
+++ b/qadevOOo/tests/java/mod/_remotebridge/various.java
@@ -135,8 +135,7 @@ public class various extends TestCase {
* Creates object which can call <code>accept</code> method
* of the Acceptor object specified.
*/
- public AcceptorThread(XAcceptor acc, XInstanceProvider xInstProv,
- XBridgeFactory xBrdgFctr) {
+ public AcceptorThread(XAcceptor acc) {
this.acc = acc ;
}
@@ -212,7 +211,7 @@ public class various extends TestCase {
// create own implementation of XInstanceProvider
XInstanceProvider xInstProv = new MyInstanceProvider(xMSF);
// create waiting acceptor thread
- accThread = new AcceptorThread(xAcctr, xInstProv, xBrdgFctr);
+ accThread = new AcceptorThread(xAcctr);
accThread.start();
// let the thread sleep
try {
diff --git
a/qadevOOo/tests/java/mod/_sc/AccessibleEditableTextPara_PreviewCell.java
b/qadevOOo/tests/java/mod/_sc/AccessibleEditableTextPara_PreviewCell.java
index 1b33a50..1c70b16 100644
--- a/qadevOOo/tests/java/mod/_sc/AccessibleEditableTextPara_PreviewCell.java
+++ b/qadevOOo/tests/java/mod/_sc/AccessibleEditableTextPara_PreviewCell.java
@@ -144,7 +144,7 @@ public class AccessibleEditableTextPara_PreviewCell extends
TestCase {
try {
XAccessible xRoot = AccessibilityTools.getAccessibleObject(
AccessibilityTools.getCurrentWindow(
- Param.getMSF(), xModel));
+ xModel));
if (xRoot != null) {
AccessibilityTools.getAccessibleObjectForRole(
xRoot, AccessibleRole.TABLE_CELL, true);
diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleCell.java
b/qadevOOo/tests/java/mod/_sc/ScAccessibleCell.java
index 014c151..6e60de5 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAccessibleCell.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleCell.java
@@ -103,7 +103,7 @@ public class ScAccessibleCell extends TestCase {
XModel aModel = UnoRuntime.queryInterface(XModel.class,
xSpreadsheetDoc);
- XWindow xWindow = AccessibilityTools.getCurrentWindow( Param.getMSF(),
aModel);
+ XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel);
XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);
oObj = AccessibilityTools.getAccessibleObjectForRole
diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleDocument.java
b/qadevOOo/tests/java/mod/_sc/ScAccessibleDocument.java
index 7e4592a..fa68417 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAccessibleDocument.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleDocument.java
@@ -86,7 +86,7 @@ public class ScAccessibleDocument extends TestCase {
new AccessibilityTools();
- XWindow xWindow = AccessibilityTools.getCurrentWindow(Param.getMSF(),
aModel);
+ XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel);
XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);
oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot,
AccessibleRole.DOCUMENT, "");
diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleDocumentPagePreview.java
b/qadevOOo/tests/java/mod/_sc/ScAccessibleDocumentPagePreview.java
index e35d766..ee42b5f 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAccessibleDocumentPagePreview.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleDocumentPagePreview.java
@@ -155,7 +155,7 @@ public class ScAccessibleDocumentPagePreview extends
TestCase {
new AccessibilityTools();
- XWindow xWindow =
AccessibilityTools.getCurrentContainerWindow(Param.getMSF(), aModel);
+ XWindow xWindow = AccessibilityTools.getCurrentContainerWindow(aModel);
XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);
AccessibilityTools.printAccessibleTree(log, xRoot,
Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE));
diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeader.java
b/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeader.java
index ce3f885..059ff1c 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeader.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeader.java
@@ -143,7 +143,7 @@ public class ScAccessiblePageHeader extends TestCase {
throw new RuntimeException(e);
}
try {
- XWindow xWindow = AccessibilityTools.getCurrentWindow(
Param.getMSF(), aModel);
+ XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel);
XAccessible xRoot =
AccessibilityTools.getAccessibleObject(xWindow);
if (xRoot != null) {
oObj = AccessibilityTools.getAccessibleObjectForRole
diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeaderArea.java
b/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeaderArea.java
index 767c6e6..86bee32 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeaderArea.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeaderArea.java
@@ -137,7 +137,7 @@ public class ScAccessiblePageHeaderArea extends TestCase {
new AccessibilityTools();
- XWindow xWindow = AccessibilityTools.getCurrentContainerWindow(
Param.getMSF(), aModel);
+ XWindow xWindow = AccessibilityTools.getCurrentContainerWindow(aModel);
XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);
try {
diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewCell.java
b/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewCell.java
index d2494e6..20863da 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewCell.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewCell.java
@@ -167,7 +167,7 @@ public class ScAccessiblePreviewCell extends TestCase {
try {
XAccessible xRoot = AccessibilityTools.getAccessibleObject(
AccessibilityTools.getCurrentWindow(
- Param.getMSF(), xModel));
+ xModel));
if (xRoot != null) {
oObj = AccessibilityTools.getAccessibleObjectForRole(
xRoot, AccessibleRole.TABLE_CELL, true);
diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewHeaderCell.java
b/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewHeaderCell.java
index fcc75f6..c70381d 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewHeaderCell.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewHeaderCell.java
@@ -248,7 +248,7 @@ public class ScAccessiblePreviewHeaderCell extends TestCase
{
try {
XAccessible xRoot = AccessibilityTools.getAccessibleObject(
AccessibilityTools.getCurrentWindow(
- Param.getMSF(), xModel));
+ xModel));
if (xRoot != null) {
oObj = AccessibilityTools.getAccessibleObjectForRole(
xRoot, AccessibleRole.TABLE, "A");
diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewTable.java
b/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewTable.java
index f923cd4..d7809c9 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewTable.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewTable.java
@@ -171,7 +171,7 @@ public class ScAccessiblePreviewTable extends TestCase {
try {
xRoot = AccessibilityTools.getAccessibleObject(
AccessibilityTools.getCurrentContainerWindow(
- Param.getMSF(), xModel));
+ xModel));
if (xRoot != null) {
oObj = AccessibilityTools.getAccessibleObjectForRole(
xRoot, AccessibleRole.TABLE);
diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleSpreadsheet.java
b/qadevOOo/tests/java/mod/_sc/ScAccessibleSpreadsheet.java
index ac371a9..3d6456b 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAccessibleSpreadsheet.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleSpreadsheet.java
... etc. - the rest is truncated
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
