[Libreoffice-commits] core.git: 8 commits - bean/com bean/qa bean/test bridges/test chart2/qa connectivity/qa dbaccess/qa embeddedobj/test extensions/qa filter/qa forms/qa framework/qa javaunohelper/com javaunohelper/test jurt/com jurt/test nlpsolver/ThirdParty odk/examples package/qa qadevOOo/runner qadevOOo/tests reportbuilder/java reportdesign/qa sc/qa scripting/examples scripting/java scripting/workben sfx2/qa stoc/test swext/mediawiki sw/qa testtools/source toolkit/qa toolkit/test ucb/qa unotools/qa unoxml/qa vcl/qa wizards/com xmerge/source
Noel Grandin
noel at peralex.com
Thu Aug 14 02:00:48 PDT 2014
bean/com/sun/star/beans/ContainerFactory.java | 2
bean/com/sun/star/beans/LocalOfficeConnection.java | 1
bean/com/sun/star/beans/LocalOfficeWindow.java | 1
bean/com/sun/star/beans/OfficeConnection.java | 2
bean/com/sun/star/comp/beans/ContainerFactory.java | 2
bean/com/sun/star/comp/beans/LocalOfficeWindow.java | 1
bean/qa/complex/bean/OOoBeanTest.java | 1
bean/test/applet/oooapplet/OOoViewer.java | 1
bridges/test/lib/TestBed.java | 5
chart2/qa/TestCaseOldAPI.java | 8
connectivity/qa/complex/connectivity/dbase/DBaseSqlTests.java | 3
connectivity/qa/complex/connectivity/hsqldb/DatabaseMetaData.java | 63 ----
connectivity/qa/complex/connectivity/hsqldb/TestCacheSize.java | 9
connectivity/qa/connectivity/tools/FlatFileDatabase.java | 1
connectivity/qa/connectivity/tools/sdb/Connection.java | 1
dbaccess/qa/complex/dbaccess/DataSource.java | 1
embeddedobj/test/Container1/EmbedContApp.java | 5
extensions/qa/integration/extensions/MethodHandler.java | 1
filter/qa/complex/filter/detection/typeDetection/Helper.java | 5
forms/qa/integration/forms/CellBinding.java | 2
forms/qa/integration/forms/DocumentHelper.java | 1
forms/qa/integration/forms/DocumentViewHelper.java | 3
forms/qa/integration/forms/FormControlTest.java | 1
forms/qa/integration/forms/FormLayer.java | 1
framework/qa/complex/XUserInputInterception/EventTest.java | 22 -
framework/qa/complex/api_internal/CheckAPI.java | 1
framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java | 2
framework/qa/complex/desktop/DesktopTerminate.java | 1
framework/qa/complex/dispatches/checkdispatchapi.java | 1
framework/qa/complex/disposing/GetServiceWhileDisposingOffice.java | 1
framework/qa/complex/framework/recovery/RecoveryTools.java | 1
framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java | 24 -
framework/qa/complex/path_settings/PathSettingsTest.java | 1
javaunohelper/com/sun/star/lib/uno/helper/PropertySetMixin.java | 4
javaunohelper/test/com/sun/star/comp/helper/SharedLibraryLoader_Test.java | 1
javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java | 4
jurt/com/sun/star/lib/connections/pipe/pipeAcceptor.java | 3
jurt/com/sun/star/lib/uno/environments/java/java_environment.java | 7
jurt/test/com/sun/star/lib/uno/protocols/urp/Marshaling_Test.java | 2
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalFile.java | 5
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/RandomGenerator.java | 1
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/space/DesignSpace.java | 1
odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java | 8
odk/examples/DevelopersGuide/Database/CodeSamples.java | 1
odk/examples/DevelopersGuide/Database/RowSet.java | 1
odk/examples/DevelopersGuide/Database/Sales.java | 4
odk/examples/DevelopersGuide/Forms/FLTools.java | 1
odk/examples/DevelopersGuide/Forms/HsqlDatabase.java | 3
odk/examples/DevelopersGuide/Forms/SpreadsheetView.java | 3
odk/examples/DevelopersGuide/Forms/UNO.java | 1
odk/examples/DevelopersGuide/GUI/UnoDialogSample.java | 4
odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/OfficeConnect.java | 4
odk/examples/DevelopersGuide/OfficeDev/OfficeConnect.java | 1
odk/examples/DevelopersGuide/Spreadsheet/SpreadsheetSample.java | 3
odk/examples/java/ConverterServlet/ConverterServlet.java | 6
odk/examples/java/EmbedDocument/Container1/EmbedContApp.java | 1
odk/examples/java/Inspector/Inspector.java | 1
odk/examples/java/Inspector/Introspector.java | 1
odk/examples/java/Inspector/SourceCodeGenerator.java | 1
odk/examples/java/Inspector/UnoNode.java | 2
odk/examples/java/Spreadsheet/SCalc.java | 1
odk/examples/java/ToDo/ToDo.java | 1
package/qa/ofopxmlstorages/TestHelper.java | 5
qadevOOo/runner/base/java_complex.java | 2
qadevOOo/runner/convwatch/ConvWatchStarter.java | 1
qadevOOo/runner/convwatch/DB.java | 1
qadevOOo/runner/convwatch/DBHelper.java | 2
qadevOOo/runner/convwatch/DocumentConverter.java | 3
qadevOOo/runner/convwatch/FileHelper.java | 39 --
qadevOOo/runner/convwatch/ImageHelper.java | 1
qadevOOo/runner/convwatch/IniFile.java | 4
qadevOOo/runner/convwatch/MSOfficePrint.java | 1
qadevOOo/runner/convwatch/OfficePrint.java | 1
qadevOOo/runner/graphical/BuildID.java | 3
qadevOOo/runner/graphical/FileHelper.java | 3
qadevOOo/runner/graphical/IniFile.java | 4
qadevOOo/runner/graphical/MSOfficePostscriptCreator.java | 7
qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java | 1
qadevOOo/runner/helper/CfgParser.java | 4
qadevOOo/runner/helper/OfficeProvider.java | 1
qadevOOo/runner/helper/ProcessHandler.java | 6
qadevOOo/runner/helper/StreamSimulator.java | 130 ++------
qadevOOo/runner/helper/URLHelper.java | 2
qadevOOo/runner/helper/UnoProvider.java | 4
qadevOOo/runner/lib/Parameters.java | 8
qadevOOo/runner/lib/TestParameters.java | 155 +---------
qadevOOo/runner/org/openoffice/Runner.java | 34 --
qadevOOo/runner/org/openoffice/RunnerService.java | 20 -
qadevOOo/runner/stats/OutProducerFactory.java | 7
qadevOOo/runner/util/DBTools.java | 4
qadevOOo/runner/util/PropertyName.java | 25 +
qadevOOo/runner/util/SOfficeFactory.java | 3
qadevOOo/runner/util/SysUtils.java | 5
qadevOOo/runner/util/UITools.java | 6
qadevOOo/runner/util/XMLTools.java | 6
qadevOOo/runner/util/compare/DocComparatorFactory.java | 7
qadevOOo/runner/util/compare/GraphicalComparator.java | 2
qadevOOo/runner/util/utils.java | 1
qadevOOo/tests/java/ifc/awt/_XScrollBar.java | 3
qadevOOo/tests/java/ifc/awt/_XSpinValue.java | 3
qadevOOo/tests/java/ifc/beans/_XMultiPropertySet.java | 3
qadevOOo/tests/java/ifc/bridge/_XBridgeFactory.java | 2
qadevOOo/tests/java/ifc/bridge/_XUnoUrlResolver.java | 4
qadevOOo/tests/java/ifc/container/_XContainer.java | 3
qadevOOo/tests/java/ifc/document/_XViewDataSupplier.java | 1
qadevOOo/tests/java/ifc/drawing/_LineShapeDescriptor.java | 3
qadevOOo/tests/java/ifc/drawing/_ShapeDescriptor.java | 3
qadevOOo/tests/java/ifc/drawing/_XShape.java | 1
qadevOOo/tests/java/ifc/i18n/_XCalendar.java | 8
qadevOOo/tests/java/ifc/i18n/_XExtendedIndexEntrySupplier.java | 13
qadevOOo/tests/java/ifc/sheet/_DatabaseImportDescriptor.java | 3
qadevOOo/tests/java/ifc/sheet/_FunctionDescription.java | 3
qadevOOo/tests/java/ifc/sheet/_SheetSortDescriptor.java | 4
qadevOOo/tests/java/ifc/sheet/_XDataPilotDescriptor.java | 1
qadevOOo/tests/java/ifc/sheet/_XSheetAuditing.java | 1
qadevOOo/tests/java/ifc/style/_CharacterProperties.java | 3
qadevOOo/tests/java/ifc/text/_XText.java | 3
qadevOOo/tests/java/ifc/ucb/_XContentProviderManager.java | 3
qadevOOo/tests/java/ifc/util/_XImportable.java | 2
qadevOOo/tests/java/ifc/util/_XSearchDescriptor.java | 1
qadevOOo/tests/java/ifc/view/_XPrintable.java | 1
qadevOOo/tests/java/mod/_acceptor/Acceptor.java | 4
qadevOOo/tests/java/mod/_acceptor/uno/Acceptor.java | 4
qadevOOo/tests/java/mod/_brdgfctr/BridgeFactory.java | 4
qadevOOo/tests/java/mod/_bridgefac/uno/BridgeFactory.java | 4
qadevOOo/tests/java/mod/_connector/uno/Connector.java | 4
qadevOOo/tests/java/mod/_connectr/Connector.java | 4
qadevOOo/tests/java/mod/_dbaccess/OQueryDesign.java | 4
qadevOOo/tests/java/mod/_dynamicloader/Dynamic.java | 1
qadevOOo/tests/java/mod/_forms/ODatabaseForm.java | 2
qadevOOo/tests/java/mod/_forms/OGridControlModel.java | 12
qadevOOo/tests/java/mod/_fwk/ControlMenuController.java | 23 -
qadevOOo/tests/java/mod/_rdbtdp/RegistryTypeDescriptionProvider.java | 2
qadevOOo/tests/java/mod/_regtypeprov/uno/RegistryTypeDescriptionProvider.java | 2
qadevOOo/tests/java/mod/_remotebridge/uno/various.java | 3
qadevOOo/tests/java/mod/_remotebridge/various.java | 3
qadevOOo/tests/java/mod/_sc/ScAccessibleCsvCell.java | 2
qadevOOo/tests/java/mod/_sc/ScAccessibleCsvGrid.java | 12
qadevOOo/tests/java/mod/_sc/ScAccessibleCsvRuler.java | 7
qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupItemObj.java | 1
qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupObj.java | 1
qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupsObj.java | 1
qadevOOo/tests/java/mod/_sc/ScDatabaseRangeObj.java | 2
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableChartsEnumeration.java | 3
qadevOOo/tests/java/mod/_sd/SdUnoPresView.java | 3
qadevOOo/tests/java/mod/_svx/AccessibleControlShape.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 | 6
qadevOOo/tests/java/mod/_svx/AccessiblePresentationGraphicShape.java | 4
qadevOOo/tests/java/mod/_svx/AccessiblePresentationOLEShape.java | 4
qadevOOo/tests/java/mod/_svx/AccessiblePresentationShape.java | 2
qadevOOo/tests/java/mod/_svx/AccessibleShape.java | 2
qadevOOo/tests/java/mod/_svx/SvxDrawPage.java | 4
qadevOOo/tests/java/mod/_svx/SvxShapeDimensioning.java | 1
qadevOOo/tests/java/mod/_svx/SvxShapeGroup.java | 2
qadevOOo/tests/java/mod/_svx/SvxShapePolyPolygon.java | 2
qadevOOo/tests/java/mod/_svx/SvxShapePolyPolygonBezier.java | 1
qadevOOo/tests/java/mod/_sw/PageStyle.java | 1
qadevOOo/tests/java/mod/_sw/SwXChapterNumbering.java | 2
qadevOOo/tests/java/mod/_sw/XMLContentImporter.java | 3
qadevOOo/tests/java/mod/_sw/XMLMetaImporter.java | 3
qadevOOo/tests/java/mod/_toolkit/AccessibleEdit.java | 2
qadevOOo/tests/java/mod/_toolkit/AccessibleMenuItem.java | 1
qadevOOo/tests/java/mod/_toolkit/Toolkit.java | 2
qadevOOo/tests/java/mod/_toolkit/UnoTreeControl.java | 2
qadevOOo/tests/java/mod/_xmloff/Chart/XMLStylesImporter.java | 7
qadevOOo/tests/java/mod/_xmloff/Draw/XMLContentExporter.java | 1
qadevOOo/tests/java/mod/_xmloff/Impress/XMLSettingsExporter.java | 10
reportbuilder/java/org/libreoffice/report/ImageService.java | 2
reportbuilder/java/org/libreoffice/report/ReportExpressionMetaData.java | 2
reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java | 2
reportbuilder/java/org/libreoffice/report/pentaho/SOFormulaParser.java | 1
reportbuilder/java/org/libreoffice/report/pentaho/SOReportJobFactory.java | 2
reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/TableCellLayoutController.java | 1
reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java | 1
reportbuilder/java/org/libreoffice/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget.java | 3
reportbuilder/java/org/libreoffice/report/pentaho/output/text/TextRawReportTarget.java | 21 -
reportbuilder/java/org/libreoffice/report/pentaho/parser/StyleMapper.java | 2
reportdesign/qa/complex/reportdesign/ReportDesignerTest.java | 4
sc/qa/complex/dataPilot/CheckDataPilot.java | 1
sc/qa/complex/dataPilot/_XDataPilotDescriptor.java | 5
sc/qa/complex/dataPilot/_XPropertySet.java | 10
sc/qa/complex/sc/CalcRTL.java | 7
scripting/examples/java/Newsgroup/OfficeAttachment.java | 16 -
scripting/examples/java/Newsgroup/PostNewsgroup.java | 4
scripting/examples/java/Newsgroup/StatusWindow.java | 3
scripting/examples/java/Newsgroup/SubscribedNewsgroups.java | 1
scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java | 1
scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java | 1
scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java | 1
scripting/java/org/openoffice/idesupport/LocalOffice.java | 2
scripting/java/org/openoffice/idesupport/filter/BinaryOnlyFilter.java | 7
scripting/java/org/openoffice/netbeans/modules/office/filesystem/OpenOfficeDocFileSystem.java | 5
scripting/java/org/openoffice/netbeans/modules/office/nodes/ScriptNode.java | 75 ----
scripting/java/org/openoffice/netbeans/modules/office/wizard/ParcelContentsIterator.java | 2
scripting/workben/installer/ExecCmd.java | 1
scripting/workben/installer/IdeVersion.java | 3
scripting/workben/installer/InstallWizard.java | 6
scripting/workben/mod/_scripting/ScriptInfo.java | 4
scripting/workben/mod/_scripting/ScriptStorage.java | 4
sfx2/qa/complex/sfx2/DocumentProperties.java | 8
sfx2/qa/complex/sfx2/tools/WriterHelper.java | 3
stoc/test/javavm/testcomponent/TestComponent.java | 4
sw/qa/complex/writer/TextPortionEnumerationTest.java | 12
swext/mediawiki/src/com/sun/star/wiki/Helper.java | 2
swext/mediawiki/src/com/sun/star/wiki/Settings.java | 1
swext/mediawiki/src/com/sun/star/wiki/WikiArticle.java | 4
swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java | 4
testtools/source/servicetests/TestBase.java | 57 ---
testtools/source/servicetests/TestService.java | 73 ----
toolkit/qa/complex/toolkit/Assert.java | 1
toolkit/test/accessibility/AccessibilityTree.java | 5
toolkit/test/accessibility/AccessibilityWorkBench.java | 3
toolkit/test/accessibility/AccessibleContextHandler.java | 10
toolkit/test/accessibility/AccessibleTextHandler.java | 2
toolkit/test/accessibility/InformationWriter.java | 3
toolkit/test/accessibility/TextLogger.java | 3
toolkit/test/accessibility/ov/ObjectViewContainer.java | 1
ucb/qa/complex/tdoc/CheckTransientDocumentsDocumentContent.java | 9
ucb/qa/complex/tdoc/_XCommandInfoChangeNotifier.java | 1
ucb/qa/complex/tdoc/_XCommandProcessor.java | 16 -
ucb/qa/complex/tdoc/_XPropertiesChangeNotifier.java | 1
ucb/qa/complex/tdoc/_XPropertySetInfoChangeNotifier.java | 1
unotools/qa/complex/tempfile/Test02.java | 1
unoxml/qa/complex/unoxml/DOMTest.java | 1
vcl/qa/complex/memCheck/CheckMemoryUsage.java | 2
vcl/qa/complex/persistent_window_states/DocumentHandle.java | 1
wizards/com/sun/star/wizards/common/Configuration.java | 1
wizards/com/sun/star/wizards/common/Desktop.java | 8
wizards/com/sun/star/wizards/common/FileAccess.java | 1
wizards/com/sun/star/wizards/common/Helper.java | 1
wizards/com/sun/star/wizards/common/JavaTools.java | 1
wizards/com/sun/star/wizards/common/PlaceholderTextElement.java | 1
wizards/com/sun/star/wizards/common/Resource.java | 1
wizards/com/sun/star/wizards/db/CommandMetaData.java | 3
wizards/com/sun/star/wizards/db/TableDescriptor.java | 1
wizards/com/sun/star/wizards/document/Control.java | 1
wizards/com/sun/star/wizards/document/GridControl.java | 1
wizards/com/sun/star/wizards/document/OfficeDocument.java | 9
wizards/com/sun/star/wizards/document/TimeStampControl.java | 1
wizards/com/sun/star/wizards/form/FormDocument.java | 2
wizards/com/sun/star/wizards/form/StyleApplier.java | 1
wizards/com/sun/star/wizards/form/UIControlArranger.java | 1
wizards/com/sun/star/wizards/report/DBColumn.java | 1
wizards/com/sun/star/wizards/report/GroupFieldHandler.java | 3
wizards/com/sun/star/wizards/report/RecordTable.java | 1
wizards/com/sun/star/wizards/report/ReportLayouter.java | 1
wizards/com/sun/star/wizards/report/ReportTextDocument.java | 4
wizards/com/sun/star/wizards/report/ReportTextImplementation.java | 1
wizards/com/sun/star/wizards/report/ReportWizard.java | 8
wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java | 2
wizards/com/sun/star/wizards/reportbuilder/layout/Tabular.java | 1
wizards/com/sun/star/wizards/table/FieldFormatter.java | 1
wizards/com/sun/star/wizards/table/TableWizard.java | 24 -
wizards/com/sun/star/wizards/text/TextDocument.java | 21 -
wizards/com/sun/star/wizards/text/TextSectionHandler.java | 1
wizards/com/sun/star/wizards/text/TextTableHandler.java | 2
wizards/com/sun/star/wizards/ui/AggregateComponent.java | 1
wizards/com/sun/star/wizards/ui/ButtonList.java | 1
wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java | 1
wizards/com/sun/star/wizards/ui/FilterComponent.java | 5
wizards/com/sun/star/wizards/ui/ImageList.java | 1
wizards/com/sun/star/wizards/ui/PathSelection.java | 1
wizards/com/sun/star/wizards/ui/UnoDialog.java | 1
wizards/com/sun/star/wizards/ui/WizardDialog.java | 9
wizards/com/sun/star/wizards/ui/event/DataAware.java | 2
wizards/com/sun/star/wizards/ui/event/SimpleDataAware.java | 32 --
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDB.java | 5
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbDecoder.java | 1
xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java | 3
271 files changed, 152 insertions(+), 1452 deletions(-)
New commits:
commit f7bd0edb9e8e3dfbb4e085b100042a7749a2e7a5
Author: Noel Grandin <noel at peralex.com>
Date: Tue Aug 12 12:07:02 2014 +0200
java: remove useless instanceof tests
Change-Id: Idb058179f90ddbe5157d564ed5f9c9168898fb0c
diff --git a/javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java b/javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java
index 7b02e62..7736438 100644
--- a/javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java
+++ b/javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java
@@ -1243,13 +1243,13 @@ class TestClass extends PropertySet
value= new Object(); // TypeClass.VOID
r[i++]= convertPropertyValue(propObjectA, outNewVal, outOldVal, value);
- r[i++]= outNewVal[0] instanceof Object && outNewVal[0].equals(value);
+ r[i++]= outNewVal[0].equals(value);
value= new Integer(111);
r[i++]= convertPropertyValue(propObjectA, outNewVal, outOldVal, value);
r[i++]= outNewVal[0] instanceof Integer && outNewVal[0].equals(value);
value= new ComponentBase();
r[i++]= convertPropertyValue(propObjectA, outNewVal, outOldVal, value);
- r[i++]= outNewVal[0] instanceof Object && outNewVal[0].equals(value);
+ r[i++]= outNewVal[0].equals(value);
value= new Integer(111);
r[i++]= convertPropertyValue(propAnyA, outNewVal, outOldVal, value);
r[i++]= outNewVal[0] instanceof Any && ((Any)outNewVal[0]).getType().equals(new Type(Integer.class))
commit 0d916bb240dee671a06057d2ff7fbf9a4b94e8f3
Author: Noel Grandin <noel at peralex.com>
Date: Tue Aug 12 12:06:15 2014 +0200
java: remove unused imports
Change-Id: Ic60b30141fd1dc61acfb97b811aec680a2ab9c22
diff --git a/bean/com/sun/star/beans/ContainerFactory.java b/bean/com/sun/star/beans/ContainerFactory.java
index 7b8e93f..28e8d0d 100644
--- a/bean/com/sun/star/beans/ContainerFactory.java
+++ b/bean/com/sun/star/beans/ContainerFactory.java
@@ -18,8 +18,6 @@
package com.sun.star.beans;
-import java.awt.Container;
-
/**
* This interface reprecents an AWT container factory.
*
diff --git a/bean/com/sun/star/beans/LocalOfficeConnection.java b/bean/com/sun/star/beans/LocalOfficeConnection.java
index 34c33f9..2b24990 100644
--- a/bean/com/sun/star/beans/LocalOfficeConnection.java
+++ b/bean/com/sun/star/beans/LocalOfficeConnection.java
@@ -18,7 +18,6 @@
package com.sun.star.beans;
-import java.awt.Container;
import java.io.File;
import java.util.Iterator;
import java.util.List;
diff --git a/bean/com/sun/star/beans/OfficeConnection.java b/bean/com/sun/star/beans/OfficeConnection.java
index 272d237..91f0554 100644
--- a/bean/com/sun/star/beans/OfficeConnection.java
+++ b/bean/com/sun/star/beans/OfficeConnection.java
@@ -18,8 +18,6 @@
package com.sun.star.beans;
-import java.awt.Container;
-
import com.sun.star.lang.XComponent;
import com.sun.star.uno.XComponentContext;
diff --git a/bean/com/sun/star/comp/beans/ContainerFactory.java b/bean/com/sun/star/comp/beans/ContainerFactory.java
index 8e54884..bd0e48a 100644
--- a/bean/com/sun/star/comp/beans/ContainerFactory.java
+++ b/bean/com/sun/star/comp/beans/ContainerFactory.java
@@ -18,8 +18,6 @@
package com.sun.star.comp.beans;
-import java.awt.Container;
-
/**
* This interface represents an AWT container factory.
*
diff --git a/connectivity/qa/connectivity/tools/sdb/Connection.java b/connectivity/qa/connectivity/tools/sdb/Connection.java
index e3c006a..a1617fb 100644
--- a/connectivity/qa/connectivity/tools/sdb/Connection.java
+++ b/connectivity/qa/connectivity/tools/sdb/Connection.java
@@ -24,7 +24,6 @@ import com.sun.star.sdbc.SQLException;
import com.sun.star.sdbc.XConnection;
import com.sun.star.sdbc.XDatabaseMetaData;
import com.sun.star.sdbc.XPreparedStatement;
-import com.sun.star.sdbc.XResultSet;
import com.sun.star.sdbc.XStatement;
import com.sun.star.sdbcx.XTablesSupplier;
import com.sun.star.uno.Exception;
diff --git a/extensions/qa/integration/extensions/MethodHandler.java b/extensions/qa/integration/extensions/MethodHandler.java
index c362016..771784b 100644
--- a/extensions/qa/integration/extensions/MethodHandler.java
+++ b/extensions/qa/integration/extensions/MethodHandler.java
@@ -19,7 +19,6 @@
package integration.extensions;
import com.sun.star.uno.*;
-import com.sun.star.lang.*;
import com.sun.star.beans.*;
import com.sun.star.reflection.*;
import com.sun.star.inspection.*;
diff --git a/forms/qa/integration/forms/DocumentHelper.java b/forms/qa/integration/forms/DocumentHelper.java
index 41e6205..a86bc6b 100644
--- a/forms/qa/integration/forms/DocumentHelper.java
+++ b/forms/qa/integration/forms/DocumentHelper.java
@@ -20,7 +20,6 @@ package integration.forms;
import com.sun.star.beans.PropertyState;
import com.sun.star.beans.PropertyValue;
import com.sun.star.beans.XPropertySet;
-import com.sun.star.container.XChild;
import com.sun.star.container.XIndexContainer;
import com.sun.star.container.XNameContainer;
import com.sun.star.document.MacroExecMode;
diff --git a/forms/qa/integration/forms/DocumentViewHelper.java b/forms/qa/integration/forms/DocumentViewHelper.java
index 4026ba3..bd4a344 100644
--- a/forms/qa/integration/forms/DocumentViewHelper.java
+++ b/forms/qa/integration/forms/DocumentViewHelper.java
@@ -23,9 +23,6 @@ import com.sun.star.awt.XControl;
import com.sun.star.awt.XControlModel;
import com.sun.star.awt.XWindow;
import com.sun.star.beans.PropertyValue;
-import com.sun.star.beans.XPropertySet;
-import com.sun.star.container.XIndexContainer;
-import com.sun.star.form.FormComponentType;
import com.sun.star.form.XForm;
import com.sun.star.form.runtime.XFormController;
import com.sun.star.frame.XController;
diff --git a/forms/qa/integration/forms/FormLayer.java b/forms/qa/integration/forms/FormLayer.java
index 67c2c26..ca14289 100644
--- a/forms/qa/integration/forms/FormLayer.java
+++ b/forms/qa/integration/forms/FormLayer.java
@@ -31,7 +31,6 @@ import com.sun.star.awt.Size;
import com.sun.star.awt.Point;
import com.sun.star.awt.VisualEffect;
import com.sun.star.awt.XControlModel;
-import com.sun.star.container.XNameAccess;
import com.sun.star.text.TextContentAnchorType;
import com.sun.star.drawing.XDrawPage;
diff --git a/framework/qa/complex/framework/recovery/RecoveryTools.java b/framework/qa/complex/framework/recovery/RecoveryTools.java
index 623f141..0de2d69 100644
--- a/framework/qa/complex/framework/recovery/RecoveryTools.java
+++ b/framework/qa/complex/framework/recovery/RecoveryTools.java
@@ -21,7 +21,6 @@ package complex.framework.recovery;
import com.sun.star.awt.XDialog;
import com.sun.star.awt.XExtendedToolkit;
import com.sun.star.awt.XWindow;
-import com.sun.star.frame.XDesktop;
import com.sun.star.lang.XMultiServiceFactory;
import com.sun.star.uno.UnoRuntime;
import com.sun.star.uno.XInterface;
diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/space/DesignSpace.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/space/DesignSpace.java
index 0b98752..d2e3f5a 100644
--- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/space/DesignSpace.java
+++ b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/space/DesignSpace.java
@@ -25,7 +25,6 @@
*/
package net.adaptivebox.space;
-import net.adaptivebox.global.*;
public class DesignSpace {
//The information of all the dimension
diff --git a/odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java b/odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java
index 099391a..7376fdd 100644
--- a/odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java
+++ b/odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java
@@ -38,16 +38,9 @@ import com.sun.star.uno.XComponentContext;
import com.sun.star.lang.XTypeProvider;
import com.sun.star.lang.XServiceInfo;
import com.sun.star.lang.XSingleComponentFactory;
-import com.sun.star.lang.XMultiComponentFactory;
import com.sun.star.lib.uno.helper.Factory;
import com.sun.star.awt.XDialog;
-import com.sun.star.awt.XDialogProvider2;
import com.sun.star.awt.XDialogEventHandler;
-import com.sun.star.awt.XControl;
-import com.sun.star.awt.XControlModel;
-import com.sun.star.awt.XControlContainer;
-import com.sun.star.beans.XPropertySet;
-import com.sun.star.frame.XModel;
import com.sun.star.frame.XFrame;
import com.sun.star.awt.XToolkit;
diff --git a/odk/examples/DevelopersGuide/Database/RowSet.java b/odk/examples/DevelopersGuide/Database/RowSet.java
index 4c783bf..2fd6de3 100644
--- a/odk/examples/DevelopersGuide/Database/RowSet.java
+++ b/odk/examples/DevelopersGuide/Database/RowSet.java
@@ -37,7 +37,6 @@ import com.sun.star.lang.XComponent;
import com.sun.star.uno.UnoRuntime;
import com.sun.star.uno.XComponentContext;
import com.sun.star.beans.XPropertySet;
-import com.sun.star.container.XNameAccess;
import com.sun.star.sdbc.*;
import com.sun.star.sdbcx.Privilege;
import com.sun.star.sdb.XRowSetApproveBroadcaster;
diff --git a/odk/examples/DevelopersGuide/Forms/FLTools.java b/odk/examples/DevelopersGuide/Forms/FLTools.java
index e15c454..cef9e4e 100644
--- a/odk/examples/DevelopersGuide/Forms/FLTools.java
+++ b/odk/examples/DevelopersGuide/Forms/FLTools.java
@@ -34,7 +34,6 @@
import com.sun.star.uno.*;
import com.sun.star.lang.*;
-import com.sun.star.util.*;
import com.sun.star.beans.*;
import com.sun.star.container.*;
import com.sun.star.awt.*;
diff --git a/odk/examples/DevelopersGuide/Forms/HsqlDatabase.java b/odk/examples/DevelopersGuide/Forms/HsqlDatabase.java
index df2c1b5..8350c92 100644
--- a/odk/examples/DevelopersGuide/Forms/HsqlDatabase.java
+++ b/odk/examples/DevelopersGuide/Forms/HsqlDatabase.java
@@ -20,14 +20,11 @@ import com.sun.star.beans.PropertyValue;
import com.sun.star.beans.XPropertySet;
import com.sun.star.container.XNameAccess;
import com.sun.star.frame.XStorable;
-import com.sun.star.frame.XModel;
import com.sun.star.sdb.XOfficeDatabaseDocument;
import com.sun.star.sdbc.SQLException;
import com.sun.star.sdbc.XCloseable;
import com.sun.star.sdbc.XConnection;
-import com.sun.star.sdbc.XStatement;
import com.sun.star.uno.UnoRuntime;
-import com.sun.star.io.IOException;
import com.sun.star.sdb.XDocumentDataSource;
import com.sun.star.sdbc.XDataSource;
import com.sun.star.uno.XComponentContext;
diff --git a/odk/examples/DevelopersGuide/Forms/SpreadsheetView.java b/odk/examples/DevelopersGuide/Forms/SpreadsheetView.java
index 402ffe2..6fb099b 100644
--- a/odk/examples/DevelopersGuide/Forms/SpreadsheetView.java
+++ b/odk/examples/DevelopersGuide/Forms/SpreadsheetView.java
@@ -21,11 +21,8 @@
* Created on 2. Oktober 2003, 14:02
*/
-import com.sun.star.uno.*;
import com.sun.star.lang.*;
import com.sun.star.frame.*;
-import com.sun.star.sheet.*;
-import com.sun.star.container.*;
public class SpreadsheetView extends DocumentViewHelper
{
diff --git a/odk/examples/DevelopersGuide/Forms/UNO.java b/odk/examples/DevelopersGuide/Forms/UNO.java
index cd29249..78fbab3 100644
--- a/odk/examples/DevelopersGuide/Forms/UNO.java
+++ b/odk/examples/DevelopersGuide/Forms/UNO.java
@@ -39,7 +39,6 @@ import com.sun.star.container.*;
import com.sun.star.form.*;
import com.sun.star.lang.*;
import com.sun.star.sdb.*;
-import com.sun.star.sdbcx.*;
public class UNO
{
diff --git a/odk/examples/DevelopersGuide/GUI/UnoDialogSample.java b/odk/examples/DevelopersGuide/GUI/UnoDialogSample.java
index d332979..5bf2853 100644
--- a/odk/examples/DevelopersGuide/GUI/UnoDialogSample.java
+++ b/odk/examples/DevelopersGuide/GUI/UnoDialogSample.java
@@ -40,9 +40,7 @@ import com.sun.star.awt.FocusEvent;
import com.sun.star.awt.ItemEvent;
import com.sun.star.awt.KeyEvent;
import com.sun.star.awt.MouseEvent;
-import com.sun.star.awt.PosSize;
import com.sun.star.awt.PushButtonType;
-import com.sun.star.awt.Rectangle;
import com.sun.star.awt.SpinEvent;
import com.sun.star.awt.TextEvent;
import com.sun.star.awt.XActionListener;
@@ -87,12 +85,10 @@ import com.sun.star.lang.XComponent;
import com.sun.star.lang.XMultiComponentFactory;
import com.sun.star.lang.XMultiServiceFactory;
import com.sun.star.lang.XSingleServiceFactory;
-import com.sun.star.text.XTextDocument;
import com.sun.star.ucb.XFileIdentifierConverter;
import com.sun.star.uno.AnyConverter;
import com.sun.star.uno.UnoRuntime;
import com.sun.star.uno.XComponentContext;
-import com.sun.star.util.XMacroExpander;
import com.sun.star.util.XNumberFormats;
import com.sun.star.util.XNumberFormatsSupplier;
import com.sun.star.util.Date;
diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/OfficeConnect.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/OfficeConnect.java
index 782a3d2..0ec1d70 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/OfficeConnect.java
+++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/OfficeConnect.java
@@ -32,11 +32,7 @@
*
*************************************************************************/
-// __________ Imports __________
-import com.sun.star.uno.UnoRuntime;
-import com.sun.star.uno.Any;
-import java.lang.String;
// __________ Implementation __________
diff --git a/odk/examples/DevelopersGuide/OfficeDev/OfficeConnect.java b/odk/examples/DevelopersGuide/OfficeDev/OfficeConnect.java
index f49e6a1..7990a22 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/OfficeConnect.java
+++ b/odk/examples/DevelopersGuide/OfficeDev/OfficeConnect.java
@@ -34,7 +34,6 @@
// __________ Imports __________
-import com.sun.star.uno.Any;
import com.sun.star.uno.UnoRuntime;
// others
diff --git a/odk/examples/java/Inspector/Inspector.java b/odk/examples/java/Inspector/Inspector.java
index e28ca5f..1139b30 100644
--- a/odk/examples/java/Inspector/Inspector.java
+++ b/odk/examples/java/Inspector/Inspector.java
@@ -54,7 +54,6 @@ import com.sun.star.lang.XServiceInfo;
import com.sun.star.lang.XSingleComponentFactory;
import com.sun.star.lib.uno.helper.Factory;
import com.sun.star.lib.uno.helper.WeakBase;
-import com.sun.star.registry.XRegistryKey;
import com.sun.star.ui.dialogs.XExecutableDialog;
import com.sun.star.ui.dialogs.XFolderPicker2;
import com.sun.star.uno.UnoRuntime;
diff --git a/odk/examples/java/Inspector/Introspector.java b/odk/examples/java/Inspector/Introspector.java
index db4c40b..4498e52 100644
--- a/odk/examples/java/Inspector/Introspector.java
+++ b/odk/examples/java/Inspector/Introspector.java
@@ -52,7 +52,6 @@ import com.sun.star.reflection.TypeDescriptionSearchDepth;
import com.sun.star.reflection.XConstantTypeDescription;
import com.sun.star.reflection.XConstantsTypeDescription;
import com.sun.star.reflection.XIdlClass;
-import com.sun.star.reflection.XIdlField;
import com.sun.star.reflection.XIdlMethod;
import com.sun.star.reflection.XIdlReflection;
import com.sun.star.reflection.XIndirectTypeDescription;
diff --git a/odk/examples/java/Inspector/SourceCodeGenerator.java b/odk/examples/java/Inspector/SourceCodeGenerator.java
index de41566..5444c7a 100644
--- a/odk/examples/java/Inspector/SourceCodeGenerator.java
+++ b/odk/examples/java/Inspector/SourceCodeGenerator.java
@@ -41,7 +41,6 @@ import com.sun.star.reflection.XIdlMethod;
import com.sun.star.reflection.XTypeDescription;
import com.sun.star.uno.Any;
import com.sun.star.uno.AnyConverter;
-import com.sun.star.uno.Type;
import com.sun.star.uno.TypeClass;
diff --git a/qadevOOo/runner/convwatch/DBHelper.java b/qadevOOo/runner/convwatch/DBHelper.java
index 6323582..00d08b4 100644
--- a/qadevOOo/runner/convwatch/DBHelper.java
+++ b/qadevOOo/runner/convwatch/DBHelper.java
@@ -21,7 +21,6 @@ package convwatch;
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.Statement;
-import java.sql.ResultSet;
import java.sql.SQLException;
import java.lang.Thread;
diff --git a/qadevOOo/runner/convwatch/FileHelper.java b/qadevOOo/runner/convwatch/FileHelper.java
index 1842652..9c23baf 100644
--- a/qadevOOo/runner/convwatch/FileHelper.java
+++ b/qadevOOo/runner/convwatch/FileHelper.java
@@ -23,8 +23,6 @@ import java.io.FileFilter;
import java.util.StringTokenizer;
import helper.OSHelper;
-import javax.swing.JOptionPane;
-
public class FileHelper
{
public FileHelper()
diff --git a/qadevOOo/runner/graphical/FileHelper.java b/qadevOOo/runner/graphical/FileHelper.java
index 64e5b1d..78551e6 100644
--- a/qadevOOo/runner/graphical/FileHelper.java
+++ b/qadevOOo/runner/graphical/FileHelper.java
@@ -28,7 +28,6 @@ import java.util.StringTokenizer;
import helper.OSHelper;
import java.io.PrintStream;
-import javax.swing.JOptionPane;
public class FileHelper
{
diff --git a/qadevOOo/runner/helper/URLHelper.java b/qadevOOo/runner/helper/URLHelper.java
index ebf59b0..9b5fc65 100644
--- a/qadevOOo/runner/helper/URLHelper.java
+++ b/qadevOOo/runner/helper/URLHelper.java
@@ -26,8 +26,6 @@ import java.net.MalformedURLException;
import java.util.ArrayList;
import java.util.Iterator;
-import com.sun.star.util.XURLTransformer;
-
/**
* It collects some static helper functons to handle URLs.
diff --git a/qadevOOo/runner/lib/Parameters.java b/qadevOOo/runner/lib/Parameters.java
index a233e0f..5b64378 100644
--- a/qadevOOo/runner/lib/Parameters.java
+++ b/qadevOOo/runner/lib/Parameters.java
@@ -30,7 +30,6 @@ import com.sun.star.beans.XPropertySetInfo;
import com.sun.star.beans.XPropertyChangeListener;
import com.sun.star.beans.XVetoableChangeListener;
import com.sun.star.beans.UnknownPropertyException;
-import com.sun.star.lang.WrappedTargetException;
import com.sun.star.uno.Type;
/**
diff --git a/qadevOOo/runner/util/DBTools.java b/qadevOOo/runner/util/DBTools.java
index 7b35217..4d41dbc 100644
--- a/qadevOOo/runner/util/DBTools.java
+++ b/qadevOOo/runner/util/DBTools.java
@@ -21,8 +21,6 @@ package util;
import com.sun.star.uno.Exception;
import java.io.PrintWriter ;
-// access the implementations via names
-import com.sun.star.uno.XInterface;
import com.sun.star.lang.XMultiServiceFactory;
import com.sun.star.uno.UnoRuntime;
@@ -37,8 +35,6 @@ import com.sun.star.util.Date ;
import com.sun.star.uno.XNamingService ;
import com.sun.star.task.XInteractionHandler ;
import com.sun.star.sdb.XCompletedConnection ;
-import com.sun.star.container.XEnumeration ;
-import com.sun.star.container.XEnumerationAccess ;
import com.sun.star.io.XInputStream ;
import com.sun.star.io.XTextInputStream ;
import com.sun.star.io.XDataInputStream ;
diff --git a/qadevOOo/runner/util/SOfficeFactory.java b/qadevOOo/runner/util/SOfficeFactory.java
index dd46df9..298b8a1 100644
--- a/qadevOOo/runner/util/SOfficeFactory.java
+++ b/qadevOOo/runner/util/SOfficeFactory.java
@@ -28,8 +28,6 @@ import com.sun.star.uno.UnoRuntime;
import com.sun.star.frame.XDesktop;
import com.sun.star.frame.XComponentLoader;
import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XServiceInfo;
-
// name - value pair
import com.sun.star.beans.PropertyValue;
import com.sun.star.beans.PropertyState;
@@ -40,7 +38,6 @@ import com.sun.star.text.*;
import com.sun.star.container.*;
import com.sun.star.chart.*;
import com.sun.star.drawing.*;
-import com.sun.star.awt.*;
public class SOfficeFactory {
diff --git a/qadevOOo/runner/util/SysUtils.java b/qadevOOo/runner/util/SysUtils.java
index 09896ad..fbcd0cc 100644
--- a/qadevOOo/runner/util/SysUtils.java
+++ b/qadevOOo/runner/util/SysUtils.java
@@ -18,13 +18,8 @@
package util;
-import java.io.File;
-import java.io.FileFilter;
import java.util.ArrayList;
-import com.sun.star.frame.XDesktop;
-import com.sun.star.frame.XFrame;
-import com.sun.star.lang.XComponent;
import com.sun.star.lang.XMultiServiceFactory;
import com.sun.star.uno.UnoRuntime;
import com.sun.star.datatransfer.clipboard.*;
diff --git a/qadevOOo/runner/util/UITools.java b/qadevOOo/runner/util/UITools.java
index 2004bca..e1b8ad5 100644
--- a/qadevOOo/runner/util/UITools.java
+++ b/qadevOOo/runner/util/UITools.java
@@ -18,22 +18,16 @@
package util;
-import java.awt.Robot;
-import java.awt.event.InputEvent;
import java.io.PrintWriter;
import java.util.ArrayList;
import com.sun.star.accessibility.AccessibleRole;
import com.sun.star.accessibility.XAccessible;
import com.sun.star.accessibility.XAccessibleAction;
-import com.sun.star.accessibility.XAccessibleComponent;
import com.sun.star.accessibility.XAccessibleContext;
import com.sun.star.accessibility.XAccessibleEditableText;
-import com.sun.star.accessibility.XAccessibleSelection;
import com.sun.star.accessibility.XAccessibleText;
import com.sun.star.accessibility.XAccessibleValue;
-import com.sun.star.awt.XExtendedToolkit;
-import com.sun.star.awt.XTopWindow;
import com.sun.star.awt.XWindow;
import com.sun.star.frame.XModel;
import com.sun.star.lang.XMultiServiceFactory;
diff --git a/qadevOOo/runner/util/XMLTools.java b/qadevOOo/runner/util/XMLTools.java
index ac3c89e..508fdfd 100644
--- a/qadevOOo/runner/util/XMLTools.java
+++ b/qadevOOo/runner/util/XMLTools.java
@@ -25,17 +25,11 @@ import java.util.HashSet;
import java.util.Iterator;
import com.sun.star.beans.PropertyValue;
-import com.sun.star.document.XExporter;
-import com.sun.star.document.XFilter;
-import com.sun.star.document.XImporter;
import com.sun.star.io.XActiveDataSource;
import com.sun.star.io.XInputStream;
import com.sun.star.io.XOutputStream;
-import com.sun.star.lang.XComponent;
import com.sun.star.lang.XMultiServiceFactory;
import com.sun.star.ucb.XSimpleFileAccess;
-import com.sun.star.uno.Any;
-import com.sun.star.uno.Type;
import com.sun.star.uno.UnoRuntime;
import com.sun.star.uno.XInterface;
import com.sun.star.xml.sax.InputSource;
diff --git a/qadevOOo/runner/util/compare/GraphicalComparator.java b/qadevOOo/runner/util/compare/GraphicalComparator.java
index 30a39d3..05cc842 100644
--- a/qadevOOo/runner/util/compare/GraphicalComparator.java
+++ b/qadevOOo/runner/util/compare/GraphicalComparator.java
@@ -23,8 +23,6 @@ import convwatch.DirectoryHelper;
import convwatch.FileHelper;
import lib.TestParameters;
-import java.io.File;
-import java.io.FileFilter;
import java.io.IOException;
import util.compare.DocComparator;
diff --git a/qadevOOo/runner/util/utils.java b/qadevOOo/runner/util/utils.java
index 332a85d..e06664a 100644
--- a/qadevOOo/runner/util/utils.java
+++ b/qadevOOo/runner/util/utils.java
@@ -26,7 +26,6 @@ import java.lang.System;
import java.util.StringTokenizer;
import java.io.*;
import java.util.ArrayList;
-import java.io.RandomAccessFile;
import java.net.Socket;
import java.net.ServerSocket;
import java.net.URI;
diff --git a/reportbuilder/java/org/libreoffice/report/ImageService.java b/reportbuilder/java/org/libreoffice/report/ImageService.java
index e7d484b..aa15e42 100644
--- a/reportbuilder/java/org/libreoffice/report/ImageService.java
+++ b/reportbuilder/java/org/libreoffice/report/ImageService.java
@@ -19,8 +19,6 @@ package org.libreoffice.report;
import com.sun.star.awt.Size;
-import java.io.InputStream;
-
public interface ImageService
{
diff --git a/reportbuilder/java/org/libreoffice/report/ReportExpressionMetaData.java b/reportbuilder/java/org/libreoffice/report/ReportExpressionMetaData.java
index 3b58c7a..dd5919c 100644
--- a/reportbuilder/java/org/libreoffice/report/ReportExpressionMetaData.java
+++ b/reportbuilder/java/org/libreoffice/report/ReportExpressionMetaData.java
@@ -17,8 +17,6 @@
*/
package org.libreoffice.report;
-import java.util.Locale;
-
public interface ReportExpressionMetaData
{
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/SOReportJobFactory.java b/reportbuilder/java/org/libreoffice/report/pentaho/SOReportJobFactory.java
index b21faf5..6ed6ec7 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/SOReportJobFactory.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/SOReportJobFactory.java
@@ -30,8 +30,6 @@ import com.sun.star.lang.IllegalArgumentException;
import com.sun.star.lang.WrappedTargetException;
import com.sun.star.lang.XInitialization;
import com.sun.star.lang.XServiceInfo;
-import com.sun.star.lang.XSingleComponentFactory;
-import com.sun.star.lib.uno.helper.Factory;
import com.sun.star.lib.uno.helper.PropertySetMixin;
import com.sun.star.lib.uno.helper.WeakBase;
import com.sun.star.registry.InvalidRegistryException;
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/StyleMapper.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/StyleMapper.java
index 8d8d1b0..539874d 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/StyleMapper.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/StyleMapper.java
@@ -17,8 +17,6 @@
*/
package org.libreoffice.report.pentaho.parser;
-import org.jfree.layouting.input.style.CSSDeclarationRule;
-
public interface StyleMapper
{
diff --git a/scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java b/scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java
index 4b8e751..0fd2c85 100644
--- a/scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java
+++ b/scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java
@@ -20,7 +20,6 @@ package com.sun.star.script.framework.container;
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.FileInputStream;
-import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
diff --git a/scripting/java/org/openoffice/idesupport/LocalOffice.java b/scripting/java/org/openoffice/idesupport/LocalOffice.java
index 07b502c..ad6e4ad 100644
--- a/scripting/java/org/openoffice/idesupport/LocalOffice.java
+++ b/scripting/java/org/openoffice/idesupport/LocalOffice.java
@@ -18,9 +18,7 @@
package org.openoffice.idesupport;
-import java.io.File;
import java.net.ConnectException;
-import java.util.ArrayList;
/**
* LocalOffice represents a connection to the local office.
diff --git a/sfx2/qa/complex/sfx2/tools/WriterHelper.java b/sfx2/qa/complex/sfx2/tools/WriterHelper.java
index 0581a7e..4b3456d 100644
--- a/sfx2/qa/complex/sfx2/tools/WriterHelper.java
+++ b/sfx2/qa/complex/sfx2/tools/WriterHelper.java
@@ -21,7 +21,6 @@ import com.sun.star.accessibility.AccessibleRole;
import com.sun.star.accessibility.XAccessible;
import com.sun.star.accessibility.XAccessibleAction;
import com.sun.star.accessibility.XAccessibleContext;
-import com.sun.star.accessibility.XAccessibleSelection;
import com.sun.star.awt.XExtendedToolkit;
import com.sun.star.awt.XWindow;
import com.sun.star.frame.XDesktop;
@@ -31,8 +30,6 @@ import com.sun.star.text.XTextDocument;
import com.sun.star.uno.UnoRuntime;
import com.sun.star.util.XCloseable;
-import java.io.PrintWriter;
-
import util.AccessibilityTools;
import util.WriterTools;
diff --git a/swext/mediawiki/src/com/sun/star/wiki/Helper.java b/swext/mediawiki/src/com/sun/star/wiki/Helper.java
index 2db73ce..57da1e8 100644
--- a/swext/mediawiki/src/com/sun/star/wiki/Helper.java
+++ b/swext/mediawiki/src/com/sun/star/wiki/Helper.java
@@ -39,8 +39,6 @@ import com.sun.star.frame.XModel;
import com.sun.star.frame.XModuleManager;
import com.sun.star.io.XInputStream;
import com.sun.star.io.XOutputStream;
-import com.sun.star.io.XSeekable;
-import com.sun.star.io.XStream;
import com.sun.star.lang.XMultiComponentFactory;
import com.sun.star.lang.XMultiServiceFactory;
import com.sun.star.lang.XComponent;
diff --git a/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java b/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java
index 1152ea6..344dff2 100644
--- a/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java
+++ b/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java
@@ -22,7 +22,6 @@ import java.io.File;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.Map;
import javax.net.ssl.SSLException;
@@ -35,11 +34,8 @@ import com.sun.star.frame.XDispatch;
import com.sun.star.frame.XDispatchProvider;
import com.sun.star.frame.XFrame;
import com.sun.star.frame.XModel;
-import com.sun.star.frame.XStatusListener;
import com.sun.star.frame.XStorable;
import com.sun.star.lang.XInitialization;
-import com.sun.star.lang.XSingleComponentFactory;
-import com.sun.star.lib.uno.helper.Factory;
import com.sun.star.lib.uno.helper.WeakBase;
import com.sun.star.uno.UnoRuntime;
import com.sun.star.uno.XComponentContext;
diff --git a/toolkit/qa/complex/toolkit/Assert.java b/toolkit/qa/complex/toolkit/Assert.java
index 5776f1f..664840f 100644
--- a/toolkit/qa/complex/toolkit/Assert.java
+++ b/toolkit/qa/complex/toolkit/Assert.java
@@ -20,7 +20,6 @@ package complex.toolkit;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-import com.sun.star.uno.UnoRuntime;
import static org.junit.Assert.*;
/**
diff --git a/ucb/qa/complex/tdoc/_XCommandInfoChangeNotifier.java b/ucb/qa/complex/tdoc/_XCommandInfoChangeNotifier.java
index d5b30f1..d4bedba 100644
--- a/ucb/qa/complex/tdoc/_XCommandInfoChangeNotifier.java
+++ b/ucb/qa/complex/tdoc/_XCommandInfoChangeNotifier.java
@@ -19,7 +19,6 @@ package complex.tdoc;
import com.sun.star.ucb.XCommandInfoChangeListener;
import com.sun.star.ucb.XCommandInfoChangeNotifier;
-import share.LogWriter;
/**
*
diff --git a/ucb/qa/complex/tdoc/_XPropertiesChangeNotifier.java b/ucb/qa/complex/tdoc/_XPropertiesChangeNotifier.java
index 8cee835..a3c8692 100644
--- a/ucb/qa/complex/tdoc/_XPropertiesChangeNotifier.java
+++ b/ucb/qa/complex/tdoc/_XPropertiesChangeNotifier.java
@@ -19,7 +19,6 @@ package complex.tdoc;
import com.sun.star.beans.XPropertiesChangeListener;
import com.sun.star.beans.XPropertiesChangeNotifier;
-import share.LogWriter;
/**
* Check the XPropertiesChangeNotifier
diff --git a/ucb/qa/complex/tdoc/_XPropertySetInfoChangeNotifier.java b/ucb/qa/complex/tdoc/_XPropertySetInfoChangeNotifier.java
index f514dd8..7461f1d 100644
--- a/ucb/qa/complex/tdoc/_XPropertySetInfoChangeNotifier.java
+++ b/ucb/qa/complex/tdoc/_XPropertySetInfoChangeNotifier.java
@@ -19,7 +19,6 @@ package complex.tdoc;
import com.sun.star.beans.XPropertySetInfoChangeListener;
import com.sun.star.beans.XPropertySetInfoChangeNotifier;
-import share.LogWriter;
/**
*
diff --git a/vcl/qa/complex/persistent_window_states/DocumentHandle.java b/vcl/qa/complex/persistent_window_states/DocumentHandle.java
index c6ce5f3..daeef05 100644
--- a/vcl/qa/complex/persistent_window_states/DocumentHandle.java
+++ b/vcl/qa/complex/persistent_window_states/DocumentHandle.java
@@ -21,7 +21,6 @@ package complex.persistent_window_states;
import com.sun.star.awt.Rectangle;
import com.sun.star.awt.PosSize;
import com.sun.star.frame.XComponentLoader;
-import com.sun.star.lang.XComponent;
import com.sun.star.awt.XWindow;
import com.sun.star.beans.PropertyValue;
import com.sun.star.beans.PropertyState;
diff --git a/wizards/com/sun/star/wizards/common/Configuration.java b/wizards/com/sun/star/wizards/common/Configuration.java
index 3f0b936..9470577 100644
--- a/wizards/com/sun/star/wizards/common/Configuration.java
+++ b/wizards/com/sun/star/wizards/common/Configuration.java
@@ -26,7 +26,6 @@ import com.sun.star.uno.AnyConverter;
import com.sun.star.uno.Exception;
import com.sun.star.uno.UnoRuntime;
import com.sun.star.lang.Locale;
-import com.sun.star.util.XChangesBatch;
/**
* This class gives access to the OO configuration api.
diff --git a/wizards/com/sun/star/wizards/common/Desktop.java b/wizards/com/sun/star/wizards/common/Desktop.java
index efaff7d..a09d4d8 100644
--- a/wizards/com/sun/star/wizards/common/Desktop.java
+++ b/wizards/com/sun/star/wizards/common/Desktop.java
@@ -18,25 +18,17 @@
package com.sun.star.wizards.common;
import com.sun.star.beans.PropertyValue;
-import com.sun.star.lang.WrappedTargetException;
import com.sun.star.lang.XComponent;
import com.sun.star.lang.XMultiComponentFactory;
import com.sun.star.lang.XMultiServiceFactory;
-import com.sun.star.sheet.XSpreadsheetDocument;
-import com.sun.star.text.XTextDocument;
-import com.sun.star.uno.Any;
import com.sun.star.uno.UnoRuntime;
import com.sun.star.uno.XComponentContext;
import com.sun.star.util.XURLTransformer;
import com.sun.star.lang.Locale;
-import com.sun.star.uno.XInterface;
import com.sun.star.bridge.XUnoUrlResolver;
import com.sun.star.comp.helper.Bootstrap;
-import com.sun.star.container.NoSuchElementException;
-import com.sun.star.container.XEnumeration;
import com.sun.star.container.XHierarchicalNameAccess;
import com.sun.star.container.XNameAccess;
-import com.sun.star.util.XStringSubstitution;
import com.sun.star.frame.*;
import com.sun.star.i18n.KParseType;
import com.sun.star.i18n.ParseResult;
diff --git a/wizards/com/sun/star/wizards/common/FileAccess.java b/wizards/com/sun/star/wizards/common/FileAccess.java
index 4dbad31..252f902 100644
--- a/wizards/com/sun/star/wizards/common/FileAccess.java
+++ b/wizards/com/sun/star/wizards/common/FileAccess.java
@@ -34,7 +34,6 @@ import com.sun.star.lang.XMultiServiceFactory;
import com.sun.star.ucb.*;
import com.sun.star.uno.UnoRuntime;
import com.sun.star.uno.XInterface;
-import com.sun.star.util.DateTime;
import com.sun.star.beans.PropertyValue;
import com.sun.star.document.XDocumentProperties;
diff --git a/wizards/com/sun/star/wizards/common/Helper.java b/wizards/com/sun/star/wizards/common/Helper.java
index 79b6dcb..aab3e72 100644
--- a/wizards/com/sun/star/wizards/common/Helper.java
+++ b/wizards/com/sun/star/wizards/common/Helper.java
@@ -22,7 +22,6 @@ import com.sun.star.util.XMacroExpander;
import java.util.Calendar;
import com.sun.star.beans.Property;
-import com.sun.star.beans.PropertyValue;
import com.sun.star.beans.XPropertySet;
import com.sun.star.lang.Locale;
import com.sun.star.lang.XMultiServiceFactory;
diff --git a/wizards/com/sun/star/wizards/common/JavaTools.java b/wizards/com/sun/star/wizards/common/JavaTools.java
index 018314e..ac217f3 100644
--- a/wizards/com/sun/star/wizards/common/JavaTools.java
+++ b/wizards/com/sun/star/wizards/common/JavaTools.java
@@ -17,7 +17,6 @@
*/
package com.sun.star.wizards.common;
-import com.sun.star.util.DateTime;
import com.sun.star.beans.PropertyValue;
import java.util.*;
import java.io.File;
diff --git a/wizards/com/sun/star/wizards/common/PlaceholderTextElement.java b/wizards/com/sun/star/wizards/common/PlaceholderTextElement.java
index 1169179..623b483 100644
--- a/wizards/com/sun/star/wizards/common/PlaceholderTextElement.java
+++ b/wizards/com/sun/star/wizards/common/PlaceholderTextElement.java
@@ -23,7 +23,6 @@ import com.sun.star.uno.Exception;
import com.sun.star.uno.UnoRuntime;
import com.sun.star.lang.XMultiServiceFactory;
import com.sun.star.text.*;
-import com.sun.star.wizards.text.*;
import com.sun.star.wizards.common.PlaceholderTextElement;
public class PlaceholderTextElement extends TextElement
diff --git a/wizards/com/sun/star/wizards/common/Resource.java b/wizards/com/sun/star/wizards/common/Resource.java
index 14e3a1a..7ef61fa 100644
--- a/wizards/com/sun/star/wizards/common/Resource.java
+++ b/wizards/com/sun/star/wizards/common/Resource.java
@@ -18,7 +18,6 @@
package com.sun.star.wizards.common;
-import com.sun.star.beans.PropertyValue;
import com.sun.star.container.XIndexAccess;
import com.sun.star.container.XNameAccess;
import com.sun.star.lang.XMultiServiceFactory;
diff --git a/wizards/com/sun/star/wizards/db/CommandMetaData.java b/wizards/com/sun/star/wizards/db/CommandMetaData.java
index a8b34dd..37dbf19 100644
--- a/wizards/com/sun/star/wizards/db/CommandMetaData.java
+++ b/wizards/com/sun/star/wizards/db/CommandMetaData.java
@@ -19,9 +19,6 @@ package com.sun.star.wizards.db;
import com.sun.star.lang.XMultiServiceFactory;
import com.sun.star.sdbc.SQLException;
-import com.sun.star.sdbcx.KeyType;
-import com.sun.star.sdbcx.XColumnsSupplier;
-import com.sun.star.sdbcx.XKeysSupplier;
import com.sun.star.uno.AnyConverter;
import com.sun.star.awt.VclWindowPeerAttribute;
import com.sun.star.uno.UnoRuntime;
diff --git a/wizards/com/sun/star/wizards/db/TableDescriptor.java b/wizards/com/sun/star/wizards/db/TableDescriptor.java
index a430d93..90b06df 100644
--- a/wizards/com/sun/star/wizards/db/TableDescriptor.java
+++ b/wizards/com/sun/star/wizards/db/TableDescriptor.java
@@ -28,7 +28,6 @@ import com.sun.star.beans.XPropertySet;
import com.sun.star.container.ContainerEvent;
import com.sun.star.container.XContainer;
import com.sun.star.container.XContainerListener;
-import com.sun.star.container.XHierarchicalNameAccess;
import com.sun.star.container.XIndexAccess;
import com.sun.star.container.XNameAccess;
import com.sun.star.lang.EventObject;
diff --git a/wizards/com/sun/star/wizards/document/Control.java b/wizards/com/sun/star/wizards/document/Control.java
index e3320d8..432971a 100644
--- a/wizards/com/sun/star/wizards/document/Control.java
+++ b/wizards/com/sun/star/wizards/document/Control.java
@@ -27,7 +27,6 @@ import com.sun.star.beans.XPropertySet;
import com.sun.star.beans.XPropertySetInfo;
import com.sun.star.container.XNameAccess;
import com.sun.star.container.XNameContainer;
-import com.sun.star.container.XNamed;
import com.sun.star.wizards.common.*;
import com.sun.star.uno.Exception;
import com.sun.star.uno.UnoRuntime;
diff --git a/wizards/com/sun/star/wizards/document/OfficeDocument.java b/wizards/com/sun/star/wizards/document/OfficeDocument.java
index 3e19628..890a373 100644
--- a/wizards/com/sun/star/wizards/document/OfficeDocument.java
+++ b/wizards/com/sun/star/wizards/document/OfficeDocument.java
@@ -20,12 +20,6 @@ package com.sun.star.wizards.document;
import com.sun.star.lang.IllegalArgumentException;
import com.sun.star.lang.XComponent;
import com.sun.star.lang.XMultiServiceFactory;
-import com.sun.star.container.XNameAccess;
-import com.sun.star.document.XDocumentProperties;
-import com.sun.star.document.XDocumentPropertiesSupplier;
-import com.sun.star.document.XEventsSupplier;
-import com.sun.star.document.XTypeDetection;
-import com.sun.star.drawing.XDrawPagesSupplier;
import com.sun.star.wizards.common.*;
import com.sun.star.awt.Rectangle;
import com.sun.star.awt.VclWindowPeerAttribute;
@@ -37,9 +31,7 @@ import com.sun.star.awt.XWindowPeer;
import com.sun.star.beans.PropertyValue;
import com.sun.star.beans.PropertyVetoException;
import com.sun.star.sheet.XCellRangeData;
-import com.sun.star.sheet.XSpreadsheetDocument;
import com.sun.star.table.XCellRange;
-import com.sun.star.task.XInteractionHandler;
import com.sun.star.text.XTextDocument;
import com.sun.star.uno.Exception;
import com.sun.star.uno.UnoRuntime;
@@ -51,7 +43,6 @@ import com.sun.star.frame.XFrame;
import com.sun.star.frame.XFrames;
import com.sun.star.frame.XFramesSupplier;
import com.sun.star.frame.XModel;
-import com.sun.star.frame.XStorable;
import com.sun.star.frame.XTerminateListener;
import com.sun.star.util.XCloseable;
import com.sun.star.util.XModifiable;
diff --git a/wizards/com/sun/star/wizards/document/TimeStampControl.java b/wizards/com/sun/star/wizards/document/TimeStampControl.java
index 3004591..4627313 100644
--- a/wizards/com/sun/star/wizards/document/TimeStampControl.java
+++ b/wizards/com/sun/star/wizards/document/TimeStampControl.java
@@ -30,7 +30,6 @@ import com.sun.star.uno.UnoRuntime;
import com.sun.star.container.XNameContainer;
import com.sun.star.drawing.XControlShape;
import com.sun.star.drawing.XShape;
-import com.sun.star.drawing.XShapes;
public class TimeStampControl extends DatabaseControl
{
diff --git a/wizards/com/sun/star/wizards/form/StyleApplier.java b/wizards/com/sun/star/wizards/form/StyleApplier.java
index c860d3a..ce90573 100644
--- a/wizards/com/sun/star/wizards/form/StyleApplier.java
+++ b/wizards/com/sun/star/wizards/form/StyleApplier.java
@@ -34,7 +34,6 @@ import com.sun.star.wizards.common.NoValidPathException;
import com.sun.star.wizards.common.PropertyNames;
import com.sun.star.wizards.document.Control;
import com.sun.star.wizards.document.DatabaseControl;
-import com.sun.star.wizards.document.GridControl;
import com.sun.star.wizards.document.TimeStampControl;
import com.sun.star.wizards.text.TextStyleHandler;
import com.sun.star.wizards.ui.*;
diff --git a/wizards/com/sun/star/wizards/form/UIControlArranger.java b/wizards/com/sun/star/wizards/form/UIControlArranger.java
index 727e40b0..ba9b18c 100644
--- a/wizards/com/sun/star/wizards/form/UIControlArranger.java
+++ b/wizards/com/sun/star/wizards/form/UIControlArranger.java
@@ -26,7 +26,6 @@ import com.sun.star.awt.XRadioButton;
import com.sun.star.lang.EventObject;
import com.sun.star.wizards.common.Helper;
import com.sun.star.wizards.common.PropertyNames;
-import com.sun.star.wizards.document.Control;
import com.sun.star.wizards.ui.ButtonList;
import com.sun.star.wizards.ui.UIConsts;
import com.sun.star.wizards.ui.UnoDialog;
diff --git a/wizards/com/sun/star/wizards/report/DBColumn.java b/wizards/com/sun/star/wizards/report/DBColumn.java
index 7f49db1..7a5cfc3 100644
--- a/wizards/com/sun/star/wizards/report/DBColumn.java
+++ b/wizards/com/sun/star/wizards/report/DBColumn.java
@@ -34,7 +34,6 @@ import com.sun.star.text.XTextTable;
import com.sun.star.uno.AnyConverter;
import com.sun.star.uno.Exception;
import com.sun.star.uno.UnoRuntime;
-import com.sun.star.util.XNumberFormats;
import com.sun.star.wizards.db.*;
import com.sun.star.wizards.common.*;
import com.sun.star.wizards.text.TextDocument;
diff --git a/wizards/com/sun/star/wizards/report/RecordTable.java b/wizards/com/sun/star/wizards/report/RecordTable.java
index cd40a35..3bf7b0c 100644
--- a/wizards/com/sun/star/wizards/report/RecordTable.java
+++ b/wizards/com/sun/star/wizards/report/RecordTable.java
@@ -23,7 +23,6 @@ import com.sun.star.container.XNamed;
import com.sun.star.lang.XMultiServiceFactory;
import com.sun.star.table.XCellRange;
import com.sun.star.table.XTableColumns;
-import com.sun.star.table.XTableRows;
import com.sun.star.text.XTextTable;
import com.sun.star.uno.Exception;
import com.sun.star.uno.UnoRuntime;
diff --git a/wizards/com/sun/star/wizards/table/FieldFormatter.java b/wizards/com/sun/star/wizards/table/FieldFormatter.java
index c320cd6..399855a 100644
--- a/wizards/com/sun/star/wizards/table/FieldFormatter.java
+++ b/wizards/com/sun/star/wizards/table/FieldFormatter.java
@@ -27,7 +27,6 @@ import com.sun.star.beans.XPropertySet;
import com.sun.star.lang.EventObject;
import com.sun.star.uno.Exception;
import com.sun.star.uno.UnoRuntime;
-import com.sun.star.wizards.common.Desktop;
import com.sun.star.wizards.common.Helper;
import com.sun.star.wizards.common.PropertyNames;
import com.sun.star.wizards.db.TableDescriptor;
diff --git a/wizards/com/sun/star/wizards/text/TextDocument.java b/wizards/com/sun/star/wizards/text/TextDocument.java
index b34e1e0..b8cfe40 100644
--- a/wizards/com/sun/star/wizards/text/TextDocument.java
+++ b/wizards/com/sun/star/wizards/text/TextDocument.java
@@ -17,54 +17,34 @@
*/
package com.sun.star.wizards.text;
-import java.util.Calendar;
-import java.util.GregorianCalendar;
-
-import com.sun.star.container.NoSuchElementException;
-import com.sun.star.container.XNameAccess;
-import com.sun.star.document.XDocumentProperties;
import com.sun.star.document.XDocumentPropertiesSupplier;
-import com.sun.star.frame.XController;
import com.sun.star.frame.XComponentLoader;
import com.sun.star.frame.XDesktop;
import com.sun.star.frame.XFramesSupplier;
import com.sun.star.frame.XLoadable;
-import com.sun.star.frame.XModel;
import com.sun.star.frame.XModule;
import com.sun.star.frame.XTerminateListener;
import com.sun.star.frame.XStorable;
-import com.sun.star.i18n.NumberFormatIndex;
import com.sun.star.awt.Size;
import com.sun.star.awt.XWindow;
import com.sun.star.awt.XWindowPeer;
import com.sun.star.beans.PropertyValue;
import com.sun.star.beans.PropertyVetoException;
-import com.sun.star.lang.Locale;
-import com.sun.star.lang.WrappedTargetException;
import com.sun.star.lang.XComponent;
import com.sun.star.lang.XMultiServiceFactory;
import com.sun.star.style.XStyle;
import com.sun.star.style.XStyleFamiliesSupplier;
import com.sun.star.task.XStatusIndicatorFactory;
-import com.sun.star.text.XPageCursor;
import com.sun.star.text.XSimpleText;
import com.sun.star.text.XText;
-import com.sun.star.text.XTextContent;
import com.sun.star.text.XTextCursor;
import com.sun.star.text.XTextDocument;
-import com.sun.star.text.XTextViewCursor;
-import com.sun.star.text.XTextViewCursorSupplier;
import com.sun.star.uno.UnoRuntime;
-import com.sun.star.util.DateTime;
import com.sun.star.util.XModifiable;
import com.sun.star.util.XNumberFormatsSupplier;
-import com.sun.star.util.XRefreshable;
-import com.sun.star.wizards.common.Configuration;
import com.sun.star.wizards.common.Desktop;
import com.sun.star.wizards.common.Helper;
-import com.sun.star.wizards.common.JavaTools;
-import com.sun.star.wizards.common.Helper.DateUtils;
import com.sun.star.wizards.common.PropertyNames;
import com.sun.star.wizards.document.OfficeDocument;
diff --git a/wizards/com/sun/star/wizards/text/TextTableHandler.java b/wizards/com/sun/star/wizards/text/TextTableHandler.java
index cbd573e..799ad80 100644
--- a/wizards/com/sun/star/wizards/text/TextTableHandler.java
+++ b/wizards/com/sun/star/wizards/text/TextTableHandler.java
@@ -23,7 +23,6 @@ import com.sun.star.container.XNamed;
import com.sun.star.frame.XFrame;
import com.sun.star.lang.Locale;
import com.sun.star.lang.XMultiServiceFactory;
-import com.sun.star.style.BreakType;
import com.sun.star.table.XCellRange;
import com.sun.star.text.XSimpleText;
import com.sun.star.text.XTextContent;
@@ -33,7 +32,6 @@ import com.sun.star.text.XTextTablesSupplier;
import com.sun.star.uno.AnyConverter;
import com.sun.star.uno.Exception;
import com.sun.star.uno.UnoRuntime;
-import com.sun.star.uno.XInterface;
import com.sun.star.util.XNumberFormatsSupplier;
import com.sun.star.view.XSelectionSupplier;
import com.sun.star.wizards.common.Desktop;
diff --git a/wizards/com/sun/star/wizards/ui/AggregateComponent.java b/wizards/com/sun/star/wizards/ui/AggregateComponent.java
index 34e52a3..ad0fe2b 100644
--- a/wizards/com/sun/star/wizards/ui/AggregateComponent.java
+++ b/wizards/com/sun/star/wizards/ui/AggregateComponent.java
@@ -21,7 +21,6 @@ import java.util.ArrayList;
import com.sun.star.awt.FontDescriptor;
import com.sun.star.awt.VclWindowPeerAttribute;
-import com.sun.star.awt.XButton;
import com.sun.star.awt.XListBox;
import com.sun.star.beans.PropertyValue;
import com.sun.star.lang.EventObject;
diff --git a/wizards/com/sun/star/wizards/ui/ButtonList.java b/wizards/com/sun/star/wizards/ui/ButtonList.java
index 06e4f9b..2e539a5 100644
--- a/wizards/com/sun/star/wizards/ui/ButtonList.java
+++ b/wizards/com/sun/star/wizards/ui/ButtonList.java
@@ -33,7 +33,6 @@ import com.sun.star.wizards.common.IRenderer;
import com.sun.star.wizards.common.PropertySetHelper;
import com.sun.star.wizards.common.PropertyNames;
import javax.swing.ListModel;
-import javax.swing.event.ListDataEvent;
import com.sun.star.wizards.common.HelpIds;
public class ButtonList implements XItemEventBroadcaster, XActionListener
diff --git a/wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java b/wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java
index 66b7042..779eada 100644
--- a/wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java
+++ b/wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java
@@ -18,7 +18,6 @@
package com.sun.star.wizards.ui;
import com.sun.star.awt.XListBox;
-import com.sun.star.lang.XMultiServiceFactory;
import com.sun.star.wizards.common.Helper;
import com.sun.star.wizards.common.JavaTools;
import com.sun.star.wizards.common.PropertyNames;
diff --git a/wizards/com/sun/star/wizards/ui/UnoDialog.java b/wizards/com/sun/star/wizards/ui/UnoDialog.java
index a0b4c13..9bc3bce 100644
--- a/wizards/com/sun/star/wizards/ui/UnoDialog.java
+++ b/wizards/com/sun/star/wizards/ui/UnoDialog.java
@@ -18,7 +18,6 @@
package com.sun.star.wizards.ui;
import com.sun.star.awt.*;
-import com.sun.star.beans.Property;
import com.sun.star.beans.XMultiPropertySet;
import com.sun.star.beans.XPropertySet;
diff --git a/wizards/com/sun/star/wizards/ui/event/DataAware.java b/wizards/com/sun/star/wizards/ui/event/DataAware.java
index 7e45396..ec9af54 100644
--- a/wizards/com/sun/star/wizards/ui/event/DataAware.java
+++ b/wizards/com/sun/star/wizards/ui/event/DataAware.java
@@ -20,8 +20,6 @@ package com.sun.star.wizards.ui.event;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.Arrays;
-import java.util.Collection;
-import java.util.Iterator;
import com.sun.star.wizards.common.PropertyNames;
/**
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDB.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDB.java
index 961fc44..a96400a 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDB.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDB.java
@@ -18,11 +18,6 @@
package org.openoffice.xmerge.converter.palm;
-import java.io.OutputStream;
-import java.io.InputStream;
-import java.io.DataOutputStream;
-import java.io.DataInputStream;
-import java.io.IOException;
import java.io.UnsupportedEncodingException;
/**
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbDecoder.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbDecoder.java
index a9658c9..c62837c 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbDecoder.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbDecoder.java
@@ -18,7 +18,6 @@
package org.openoffice.xmerge.converter.palm;
-import java.io.RandomAccessFile;
import java.io.IOException;
import java.io.ByteArrayInputStream;
import java.io.DataInputStream;
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java
index cf137ab..155c37e 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java
@@ -26,9 +26,6 @@ import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
import java.io.Writer;
-import java.text.DateFormat;
-import java.util.Date;
-import java.util.Calendar;
import java.util.Properties;
/**
commit 63ac956e33a76ee021b22b9b3a7dda838a4cc8c6
Author: Noel Grandin <noel at peralex.com>
Date: Mon Aug 11 16:41:55 2014 +0200
simplify timing code
Change-Id: I1ecbfc5183261e400349309924dbf059a32cb95f
diff --git a/qadevOOo/runner/org/openoffice/Runner.java b/qadevOOo/runner/org/openoffice/Runner.java
index fe3f1b0..c1c7850 100644
--- a/qadevOOo/runner/org/openoffice/Runner.java
+++ b/qadevOOo/runner/org/openoffice/Runner.java
@@ -37,26 +37,6 @@ import base.TestBase;
public class Runner
{
- private static long m_nStartTime;
-
- private static long getRunnerStartTime()
- {
- return m_nStartTime;
- }
-
- /**
- * simple helper functions to start/stop a timer, to know how long a process need in milliseconds
- */
- private static long getTime()
- {
- return System.currentTimeMillis();
- }
-
- private static void setStartTime(long _nStartTime)
- {
- m_nStartTime = _nStartTime;
- }
-
/**
* @return the time, which is done until last startTime()
*/
@@ -67,7 +47,7 @@ public class Runner
System.out.println("Forgotten to initialise a start timer?");
return 0;
}
- long nMeanTime = getTime();
+ long nMeanTime = System.currentTimeMillis();
return nMeanTime - _nCurrentTimer;
}
@@ -180,7 +160,7 @@ public class Runner
{
System.out.println("OOoRunner Main() version from 20101118 (yyyymmdd)");
- setStartTime(getTime());
+ final long nStartTime = System.currentTimeMillis();
DynamicClassLoader dcl = new DynamicClassLoader();
@@ -232,8 +212,8 @@ public class Runner
checkAllVariablesForCygwinPath(param);
boolean worked = toExecute.executeTest(param);
- long nTime = meanTime(getRunnerStartTime());
- String sBeautifyTime = beautifyTime(nTime);
+ final long nTime = System.currentTimeMillis() - nStartTime;
+ final String sBeautifyTime = beautifyTime(nTime);
System.out.println("Job run took: " + nTime + "ms " + " [" + sBeautifyTime + "]");
commit 537ff23149510312e90a0fad866c215b5df9699b
Author: Noel Grandin <noel at peralex.com>
Date: Mon Aug 11 16:38:15 2014 +0200
improve copmments
Change-Id: Ib55ec2f787177829a85a121afb1d3dff2ee7ab1f
diff --git a/qadevOOo/runner/org/openoffice/Runner.java b/qadevOOo/runner/org/openoffice/Runner.java
index 5513c0b..fe3f1b0 100644
--- a/qadevOOo/runner/org/openoffice/Runner.java
+++ b/qadevOOo/runner/org/openoffice/Runner.java
@@ -43,10 +43,10 @@ public class Runner
{
return m_nStartTime;
}
- /*
- simple helper functions to start/stop a timer, to know how long a process need in milliseconds
- */
+ /**
+ * simple helper functions to start/stop a timer, to know how long a process need in milliseconds
+ */
private static long getTime()
{
return System.currentTimeMillis();
@@ -57,8 +57,8 @@ public class Runner
m_nStartTime = _nStartTime;
}
- /*
- return the time, which is done until last startTime()
+ /**
+ * @return the time, which is done until last startTime()
*/
private static long meanTime(long _nCurrentTimer)
{
@@ -86,7 +86,7 @@ public class Runner
}
/**
- Helper to check if there are problems with Cygwin Path variables.
+ * Helper to check if there are problems with Cygwin Path variables.
*/
private static boolean checkVariableForCygwin(String _sVariable)
{
commit ac5954d7c540f34702033d7d951d1d16cb96730a
Author: Noel Grandin <noel at peralex.com>
Date: Mon Aug 11 15:58:09 2014 +0200
java: remove commented out code
Change-Id: I05c907a38b562231e968c17f14e09ef80e0a6ed1
diff --git a/bean/com/sun/star/beans/LocalOfficeWindow.java b/bean/com/sun/star/beans/LocalOfficeWindow.java
index 0d2021b..9283b01 100644
--- a/bean/com/sun/star/beans/LocalOfficeWindow.java
+++ b/bean/com/sun/star/beans/LocalOfficeWindow.java
@@ -205,7 +205,6 @@ public class LocalOfficeWindow
if ( isShowing() )
{
// create direct parent relationship
- //setVisible( true );
parentPeer = new JavaWindowPeerFake( getNativeWindow(), type);
bPeer = true;
}
diff --git a/bean/com/sun/star/comp/beans/LocalOfficeWindow.java b/bean/com/sun/star/comp/beans/LocalOfficeWindow.java
index 790ddd0..2cbde53 100644
--- a/bean/com/sun/star/comp/beans/LocalOfficeWindow.java
+++ b/bean/com/sun/star/comp/beans/LocalOfficeWindow.java
@@ -186,7 +186,6 @@ public class LocalOfficeWindow
if ( isShowing() )
{
// create direct parent relationship
- //setVisible( true );
parentPeer = new JavaWindowPeerFake(getWrappedWindowHandle(), type);
bPeer = true;
}
diff --git a/bean/qa/complex/bean/OOoBeanTest.java b/bean/qa/complex/bean/OOoBeanTest.java
index 2b180a6..141f63d 100644
--- a/bean/qa/complex/bean/OOoBeanTest.java
+++ b/bean/qa/complex/bean/OOoBeanTest.java
@@ -543,7 +543,6 @@ public class OOoBeanTest
}
else
{
- // Thread.sleep(2000);
}
} finally {
diff --git a/bean/test/applet/oooapplet/OOoViewer.java b/bean/test/applet/oooapplet/OOoViewer.java
index 4fdf1c0..c2eaaa5 100644
--- a/bean/test/applet/oooapplet/OOoViewer.java
+++ b/bean/test/applet/oooapplet/OOoViewer.java
@@ -137,7 +137,6 @@ final class CustomURLClassLoader extends URLClassLoader {
// this.findClass, after this.loadClass has already called
// super.findClass, so no need to call super.findClass again:
throw new ClassNotFoundException( name );
-// return super.findClass(name);
}
diff --git a/bridges/test/lib/TestBed.java b/bridges/test/lib/TestBed.java
index 4f6bf13..3e33235 100644
--- a/bridges/test/lib/TestBed.java
+++ b/bridges/test/lib/TestBed.java
@@ -37,7 +37,6 @@ import java.io.PrintStream;
public final class TestBed {
public boolean execute(XInstanceProvider provider, boolean waitForServer,
Class client, long wait) throws Exception {
- // assert client.isAssignableFrom(client) && wait >= 0;
synchronized (lock) {
server = new Server(provider);
server.start();
@@ -45,10 +44,6 @@ public final class TestBed {
}
Process p = Runtime.getRuntime().exec(new String[] {
"java", "-classpath", System.getProperty("java.class.path"),
-/*
- "-Xdebug",
- "-Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n",
-*/
client.getName() });
pipe(p.getInputStream(), System.out, "CO> ");
pipe(p.getErrorStream(), System.err, "CE> ");
diff --git a/chart2/qa/TestCaseOldAPI.java b/chart2/qa/TestCaseOldAPI.java
index a640b87..2966200 100644
--- a/chart2/qa/TestCaseOldAPI.java
+++ b/chart2/qa/TestCaseOldAPI.java
@@ -347,7 +347,6 @@ public class TestCaseOldAPI extends ComplexTestCase {
fMax1 = AnyConverter.toDouble( oMax );
log.println( "Maximum retrieved: " + fMax1 );
//todo: the view has to be built before there is an explicit value
-// assure( "Max is 0.0", fMax1 > 0.0 );
xProp.setPropertyValue( "AutoMax", new Boolean( false ));
oMax = xProp.getPropertyValue( "Max" );
assure( "No Maximum set", AnyConverter.isDouble( oMax ));
@@ -546,13 +545,6 @@ public class TestCaseOldAPI extends ComplexTestCase {
xDiaProp.getPropertyValue( "Vertical" )));
}
- // reset to bar-chart
-// aMyServiceName = new String( "com.sun.star.chart.BarDiagram" );
-// XDiagram xDia = (XDiagram) UnoRuntime.queryInterface(
-// XDiagram.class, xFact.createInstance( aMyServiceName ));
-// assure( aMyServiceName + " could not be created", xDia != null );
-
-// mxOldDoc.setDiagram( xDia );
}
catch( Exception ex )
{
diff --git a/connectivity/qa/complex/connectivity/dbase/DBaseSqlTests.java b/connectivity/qa/complex/connectivity/dbase/DBaseSqlTests.java
index 8ff5cc4..09f7cac 100644
--- a/connectivity/qa/complex/connectivity/dbase/DBaseSqlTests.java
+++ b/connectivity/qa/complex/connectivity/dbase/DBaseSqlTests.java
@@ -55,9 +55,6 @@ public class DBaseSqlTests extends SubTestCase
execute(xRowRes,"1 FROM \"biblio\" \"biblio\" where 0 < 1");
execute(xRowRes,"1 FROM \"biblio\" \"biblio\" where 2 > 1");
execute(xRowRes,"1,1+1,'a' + 'b' FROM \"biblio\" \"biblio\" where 2 > 1");
- // execute(xRowRes,"1 FROM \"biblio\" \"biblio\" where (0 = 0) is true");
- // execute(xRowRes,"1 FROM \"biblio\" \"biblio\" where not (0 = 0) is not true");
- // execute(xRowRes,"1 FROM \"biblio\" \"biblio\" where 1 between 0 and 2");
execute(xRowRes,"1 FROM \"biblio\" \"biblio\" where not \"Identifier\" is NULL");
execute(xRowRes,"1 FROM \"biblio\" \"biblio\" where \"Identifier\" is not NULL");
execute(xRowRes,"1 FROM \"biblio\" \"biblio\" where \"Identifier\" = \"Identifier\"");
diff --git a/connectivity/qa/complex/connectivity/hsqldb/DatabaseMetaData.java b/connectivity/qa/complex/connectivity/hsqldb/DatabaseMetaData.java
index 65bf5cf..6982395 100644
--- a/connectivity/qa/complex/connectivity/hsqldb/DatabaseMetaData.java
+++ b/connectivity/qa/complex/connectivity/hsqldb/DatabaseMetaData.java
@@ -71,8 +71,6 @@ public class DatabaseMetaData {
public void test(){
- // try {
-
try{
ResultSet rs = m_xMD.getTables(null,null,"TESTCASE",null);
while ( rs.next() )
@@ -99,66 +97,5 @@ public class DatabaseMetaData {
} catch(Exception e){
}
- //testMethod("getTypeInfo", zclass,empty,17);
-/*
- Class[] zclass = new Class[]{};
- Object[] empty = new Object[]{};
- testMethod("getCatalogs", zclass,empty,1);
-
- testMethod("getSchemas", zclass,empty,2);
- testMethod("getTableTypes", zclass,empty,1);
- Class[] a4 = new Class[4];
- Object[] o4 = new Object[4];
- a4[0] = Class.forName("java.lang.Object");
- a4[1] = Class.forName("java.lang.String");
- a4[2] = Class.forName("java.lang.String");
- a4[3] = Class.forName("java.lang.String");
-
- o4[0] = null;
- o4[1] = null;
- o4[2] = null;
- o4[3] = "%";
- testMethod("getColumnPrivileges", a4,o4,7);
- testMethod("getColumns", a4,o4,18);
- testMethod("getProcedureColumns", a4,o4,13);
- testMethod("getColumns", a4,o4,18);
-
- Class[] a3 = new Class[3];
- Object[] o3 = new Object[3];
- a3[0] = Class.forName("java.lang.Object");
- a3[1] = Class.forName("java.lang.String");
- a3[2] = Class.forName("java.lang.String");
-
- o3[0] = null;
- o3[1] = null;
- o3[2] = "%";
-
- testMethod("getExportedKeys", a3,o3,14);
- testMethod("getImportedKeys", a3,o3,14);
- testMethod("getPrimaryKeys", a3,o3,14);
- testMethod("getProcedures", a3,o3,5);
- testMethod("getTablePrivileges", a3,o3,6);
- testMethod("getVersionColumns", a3,o3,7);
- // testMethod("getCrossReference", a3,o3,14);
-
- } catch( java.lang.ClassNotFoundException ex) {
- assure("ClassNotFoundException: " + ex.getMessage() ,false);
- }
- */
- }
-/*
- public com.sun.star.sdbc.XResultSet getCrossReference(Object obj, String str, String str2, Object obj3, String str4, String str5) {
- }
- public com.sun.star.sdbc.XResultSet getIndexInfo(Object obj, String str, String str2, boolean param, boolean param4) {
}
-
- public com.sun.star.sdbc.XResultSet getTables(Object obj, String str, String str2, String[] str3) {
- }
-
- public com.sun.star.sdbc.XResultSet getUDTs(Object obj, String str, String str2, int[] values) {
- }
-
- public com.sun.star.sdbc.XResultSet getBestRowIdentifier(Object obj, String str, String str2, int param, boolean param4) throws com.sun.star.sdbc.SQLException {
- }
- */
}
diff --git a/connectivity/qa/complex/connectivity/hsqldb/TestCacheSize.java b/connectivity/qa/complex/connectivity/hsqldb/TestCacheSize.java
index c8c2816..57ce3f9 100644
--- a/connectivity/qa/complex/connectivity/hsqldb/TestCacheSize.java
+++ b/connectivity/qa/complex/connectivity/hsqldb/TestCacheSize.java
@@ -136,8 +136,6 @@ public class TestCacheSize {
sStatement = null;
cConnection = null;
- //Class.forName("org.hsqldb.jdbcDriver");
-
if (filedb) {
cConnection = drv.connect(url,info);
@@ -147,9 +145,6 @@ public class TestCacheSize {
sStatement.execute("SET LOGSIZE " + 0);
sStatement.execute("SHUTDOWN");
cConnection.close();
-// props.setProperty("hsqldb.cache_scale", "" + cacheScale);
-// props.setProperty("hsqldb.cache_size_scale",
- //"" + cacheSizeScale);
}
} catch (Exception e) {
e.printStackTrace();
@@ -255,7 +250,6 @@ public class TestCacheSize {
System.out.println("multi key table");
}
-// sStatement.execute("CREATE INDEX idx3 ON tempTEST (zip);");
System.out.println("Setup time: " + sw.elapsedTime());
fillUpBigTable(filler, randomgen);
@@ -339,9 +333,6 @@ public class TestCacheSize {
}
}
-// sStatement.execute("INSERT INTO test SELECT * FROM temptest;");
-// sStatement.execute("DROP TABLE temptest;");
-// sStatement.execute(ddl7);
System.out.println("Total insert: " + i);
System.out.println("Insert time: " + sw.elapsedTime() + " rps: "
+ (i * 1000 / (sw.elapsedTime() + 1)));
diff --git a/connectivity/qa/connectivity/tools/FlatFileDatabase.java b/connectivity/qa/connectivity/tools/FlatFileDatabase.java
index 31f263a..4a292c0 100644
--- a/connectivity/qa/connectivity/tools/FlatFileDatabase.java
+++ b/connectivity/qa/connectivity/tools/FlatFileDatabase.java
@@ -73,7 +73,6 @@ class FlatFileDatabase extends AbstractDatabase
documentFile.delete();
m_tableFileLocation = new File(documentFile.getParent() + File.separator + documentFile.getName().replace(".odb", "") + File.separator );
m_tableFileLocation.mkdir();
- //subPath.deleteOnExit();
m_databaseDocumentFile = URLHelper.getFileURLFromSystemPath(documentFile);
final String path = URLHelper.getFileURLFromSystemPath( m_tableFileLocation.getPath() );
diff --git a/dbaccess/qa/complex/dbaccess/DataSource.java b/dbaccess/qa/complex/dbaccess/DataSource.java
index 8adff3a..3b18cd2 100644
--- a/dbaccess/qa/complex/dbaccess/DataSource.java
+++ b/dbaccess/qa/complex/dbaccess/DataSource.java
@@ -81,7 +81,6 @@ public class DataSource extends TestCase
}
catch (Exception ex)
{
- // Logger.getLogger(DataSource.class.getName()).log(Level.SEVERE, null, ex);
fail();
}
}
diff --git a/embeddedobj/test/Container1/EmbedContApp.java b/embeddedobj/test/Container1/EmbedContApp.java
index f9bbd95..6eb9267 100644
--- a/embeddedobj/test/Container1/EmbedContApp.java
+++ b/embeddedobj/test/Container1/EmbedContApp.java
@@ -260,9 +260,6 @@ public class EmbedContApp extends Applet
m_aNativeView.resize( 800, 600 );
this.add( m_aNativeView );
- // Handle mouse clicks in our window.
-// addMouseListener( this );
- }
public void actionPerformed( ActionEvent evt )
{
@@ -845,8 +842,6 @@ public class EmbedContApp extends Applet
{
super.paint( g );
- // m_aNativeView.paint( g );
-
createVclWindow();
}
diff --git a/forms/qa/integration/forms/CellBinding.java b/forms/qa/integration/forms/CellBinding.java
index fc9f14d..784355b 100644
--- a/forms/qa/integration/forms/CellBinding.java
+++ b/forms/qa/integration/forms/CellBinding.java
@@ -290,7 +290,6 @@ public class CellBinding extends complexlib.ComplexTestCase
setCellText( sourceCol, (short)( row + 0 ), "Oranges" );
setCellText( sourceCol, (short)( row + 1 ), "Peaches" );
- //setListSource( listBox, sourceCol, row, (short)( row + 2 ) );
// TODO: this is currently prone to deadlocks
@@ -332,7 +331,6 @@ public class CellBinding extends complexlib.ComplexTestCase
setCellText( sourceCol, (short)( row + 0 ), "Bananas" );
setCellText( sourceCol, (short)( row + 1 ), "Strawberries" );
- //setListSource( listBox, sourceCol, row, (short)( row + 2 ) );
// TODO: this is currently prone to deadlocks
diff --git a/forms/qa/integration/forms/FormControlTest.java b/forms/qa/integration/forms/FormControlTest.java
index 5c87068..b6932e3 100644
--- a/forms/qa/integration/forms/FormControlTest.java
+++ b/forms/qa/integration/forms/FormControlTest.java
@@ -923,7 +923,6 @@ public class FormControlTest extends complexlib.ComplexTestCase implements XSQLE
{
xProducer.addConsumer( compareImages );
xProducer.startProduction();
-// wait();
}
xProducer.removeConsumer( compareImages );
diff --git a/framework/qa/complex/XUserInputInterception/EventTest.java b/framework/qa/complex/XUserInputInterception/EventTest.java
index b7e5fe3..f7e0f54 100644
--- a/framework/qa/complex/XUserInputInterception/EventTest.java
+++ b/framework/qa/complex/XUserInputInterception/EventTest.java
@@ -166,28 +166,6 @@ public class EventTest {
}
/**
- * creates a chart document and check the <CODE>XMouseClickHandler</CODE> and
- * <CODE>XKeyHandler</CODE>
- * @see com.sun.star.awt.XKeyHandler
- * @see com.sun.star.awt.XMouseClickHandler
- */
-// TODO!
-// @Test public void checkChartDocument(){
-//
-// XChartDocument xDoc = null;
-//
-// try{
-// xDoc = m_SOF.createChartDoc("ChartTest");
-// } catch (com.sun.star.uno.Exception e){
-// fail("Could not create a chart document: " +e.toString());
-// }
-//
-// checkListener(xDoc);
-//
-// closeDoc(xDoc);
-// }
-
- /**
* creates a math document and check the <CODE>XMouseClickHandler</CODE> and
* <CODE>XKeyHandler</CODE>
* @see com.sun.star.awt.XKeyHandler
diff --git a/framework/qa/complex/api_internal/CheckAPI.java b/framework/qa/complex/api_internal/CheckAPI.java
index ce73df1..c2a5f5f 100644
--- a/framework/qa/complex/api_internal/CheckAPI.java
+++ b/framework/qa/complex/api_internal/CheckAPI.java
@@ -67,7 +67,6 @@ public class CheckAPI {
@Test public void checkAPI() {
System.out.println("Start with test");
// if test is idle for 5 minutes, assume that it hangs and kill it.
- // param.put("TimeOut", new Integer("300000"));
XMultiServiceFactory xMSF = getMSF();
Object oObj = null;
try {
diff --git a/framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java b/framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java
index 59d8abc..2f96fe7 100644
--- a/framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java
+++ b/framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java
@@ -199,12 +199,10 @@ public class CheckContextMenuInterceptor
}
catch (com.sun.star.uno.RuntimeException ex)
{
- // ex.printStackTrace();
fail("Runtime exception caught!" + ex.getMessage());
}
catch (java.lang.Exception ex)
{
- // ex.printStackTrace();
fail("Java lang exception caught!" + ex.getMessage());
}
}
diff --git a/framework/qa/complex/desktop/DesktopTerminate.java b/framework/qa/complex/desktop/DesktopTerminate.java
index dc75566..f119233 100644
--- a/framework/qa/complex/desktop/DesktopTerminate.java
+++ b/framework/qa/complex/desktop/DesktopTerminate.java
@@ -150,7 +150,6 @@ public class DesktopTerminate
{
System.out.println("tearDownConnection()");
// don't do a tearDown here, desktop is already terminated.
- // connection.tearDown();
}
private static final OfficeConnection connection = new OfficeConnection();
diff --git a/framework/qa/complex/dispatches/checkdispatchapi.java b/framework/qa/complex/dispatches/checkdispatchapi.java
index 32f9138..62d43e2 100644
--- a/framework/qa/complex/dispatches/checkdispatchapi.java
+++ b/framework/qa/complex/dispatches/checkdispatchapi.java
@@ -398,7 +398,6 @@ public class checkdispatchapi
catch (java.lang.Throwable ex)
{
fail("Exception caught during using XDispatchInformationProvider.");
- // ex.printStackTrace();
}
}
diff --git a/framework/qa/complex/disposing/GetServiceWhileDisposingOffice.java b/framework/qa/complex/disposing/GetServiceWhileDisposingOffice.java
index 031dfd5..8600c02 100644
--- a/framework/qa/complex/disposing/GetServiceWhileDisposingOffice.java
+++ b/framework/qa/complex/disposing/GetServiceWhileDisposingOffice.java
@@ -90,7 +90,6 @@ public class GetServiceWhileDisposingOffice
{
System.out.println("tearDownConnection()");
// Office is already terminated.
- // connection.tearDown();
}
private static final OfficeConnection connection = new OfficeConnection();
diff --git a/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java b/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java
index 955fa0b..622f335 100644
--- a/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java
+++ b/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java
@@ -241,22 +241,16 @@ public class CheckXComponentLoader
File aSysFile = new File(m_sTestDocPath, aSnapshot.next());
String sURL = URLHelper.getFileURLFromSystemPath(aSysFile);
- if (/*! (sURL.endsWith(".jpg") ||
- sURL.endsWith(".gif"))*/
- true
- )
+ loadURL(m_xLoader, RESULT_VALID_DOC, sURL, "_blank", 0, lProps);
+ // Its not needed to reset this using states!
+ // Its done internally ...
+ if (!xIndicator.wasUsed())
{
- loadURL(m_xLoader, RESULT_VALID_DOC, sURL, "_blank", 0, lProps);
- // Its not needed to reset this using states!
- // Its done internally ...
- if (!xIndicator.wasUsed())
- {
- System.out.println("External progress was not used for loading.");
- }
- if (xHandler.wasUsed())
- {
- System.out.println("External interaction handler was not used for loading.");
- }
+ System.out.println("External progress was not used for loading.");
+ }
+ if (xHandler.wasUsed())
+ {
+ System.out.println("External interaction handler was not used for loading.");
}
}
}
diff --git a/framework/qa/complex/path_settings/PathSettingsTest.java b/framework/qa/complex/path_settings/PathSettingsTest.java
index 1e1bc5f..995d430 100644
--- a/framework/qa/complex/path_settings/PathSettingsTest.java
+++ b/framework/qa/complex/path_settings/PathSettingsTest.java
@@ -126,7 +126,6 @@ public class PathSettingsTest
{
System.out.println(e.getClass().getName());
System.out.println("Message: " + e.getMessage());
- // fail("Could not create an instance of the test object.");
}
catch (Exception e)
{
diff --git a/javaunohelper/com/sun/star/lib/uno/helper/PropertySetMixin.java b/javaunohelper/com/sun/star/lib/uno/helper/PropertySetMixin.java
index 14f887f..ca03a7c 100644
--- a/javaunohelper/com/sun/star/lib/uno/helper/PropertySetMixin.java
+++ b/javaunohelper/com/sun/star/lib/uno/helper/PropertySetMixin.java
@@ -119,8 +119,6 @@ public final class PropertySetMixin {
XComponentContext context, XInterface object, Type type,
String[] absentOptional)
{
- // assert context != null && object != null && type != null
- // && type.getTypeClass() == TypeClass.INTERFACE;
this.context = context;
this.object = object;
this.type = type;
@@ -881,8 +879,6 @@ public final class PropertySetMixin {
boolean isAmbiguous, boolean wrapDefaulted, boolean isDefaulted,
boolean wrapOptional)
{
- // assert (wrapAmbiguous || !isAmbiguous)
- // && (wrapDefaulted || !isDefaulted);
if (wrapAmbiguous
&& type.getName().startsWith("com.sun.star.beans.Ambiguous<"))
{
diff --git a/javaunohelper/test/com/sun/star/comp/helper/SharedLibraryLoader_Test.java b/javaunohelper/test/com/sun/star/comp/helper/SharedLibraryLoader_Test.java
index 3b1f589..a0f69d8 100644
--- a/javaunohelper/test/com/sun/star/comp/helper/SharedLibraryLoader_Test.java
+++ b/javaunohelper/test/com/sun/star/comp/helper/SharedLibraryLoader_Test.java
@@ -156,7 +156,6 @@ public class SharedLibraryLoader_Test {
passed = test_instantiateSharedLibraryLoader() && passed;
passed = test_loadNativeServiceManager() && passed;
passed = test_loadNativeSimpleRegistry() && passed;
- //passed = test_registerSharedLibraryLoader() && passed;
System.err.println("SharedLibraryLoader test passed? " + passed);
diff --git a/jurt/com/sun/star/lib/connections/pipe/pipeAcceptor.java b/jurt/com/sun/star/lib/connections/pipe/pipeAcceptor.java
index cde06ab..a8dd0ad 100644
--- a/jurt/com/sun/star/lib/connections/pipe/pipeAcceptor.java
+++ b/jurt/com/sun/star/lib/connections/pipe/pipeAcceptor.java
@@ -109,9 +109,6 @@ public final class pipeAcceptor implements XAcceptor {
com.sun.star.lang.IllegalArgumentException
{
throw new java.lang.NoSuchMethodError( "pipeAcceptor not fully implemented yet" );
-
- //try { return new PipeConnection( connectionDescription ); }
- //catch ( java.io.IOException e ) { return null; }
}
/**
diff --git a/jurt/com/sun/star/lib/uno/environments/java/java_environment.java b/jurt/com/sun/star/lib/uno/environments/java/java_environment.java
index 01285c2..654b9ad 100644
--- a/jurt/com/sun/star/lib/uno/environments/java/java_environment.java
+++ b/jurt/com/sun/star/lib/uno/environments/java/java_environment.java
@@ -118,13 +118,6 @@ public final class java_environment implements IEnvironment {
*/
public void list() {
// TODO???
-// synchronized (proxies) {
-// System.err.println("##### " + getClass().getName() + ".list: "
-// + getName() + ", " + getContext());
-// for (Iterator it = proxies.values().iterator(); it.hasNext();) {
-// System.err.println("#### entry: " + it.next());
-// }
-// }
}
/**
diff --git a/jurt/test/com/sun/star/lib/uno/protocols/urp/Marshaling_Test.java b/jurt/test/com/sun/star/lib/uno/protocols/urp/Marshaling_Test.java
index d9127e3..a8290af 100644
--- a/jurt/test/com/sun/star/lib/uno/protocols/urp/Marshaling_Test.java
+++ b/jurt/test/com/sun/star/lib/uno/protocols/urp/Marshaling_Test.java
@@ -67,7 +67,7 @@ public final class Marshaling_Test {
new Any(new Type(Integer.class), new Integer(10)), // Any as Any
null,
new TestPrimitiveStruct(),
- x, //new TestPrimitiveSeqStruct(),
+ x,
new byte[]{1,2,3,4,5,6,7}, // primitive sequence
new int[]{7,6,5,4,3,2,1}, // primitive sequence
new Object[]{new Integer(123), new String("hallo")}, // any sequence
diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalFile.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalFile.java
index d1ede92..36e4ebb 100644
--- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalFile.java
+++ b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalFile.java
@@ -116,7 +116,6 @@ public class GlobalFile {
public static ArrayList<ArrayList<Double>> getCurveDataFromFile(String fileName) {
File file = new File(fileName);
if(!file.exists()){
- //showMessage();
return null;
}
//open data file
@@ -126,7 +125,6 @@ public class GlobalFile {
inStream = new FileInputStream(file);
inReader = new BufferedReader(new InputStreamReader(inStream));
}catch(Exception e){
- //showMessage();
return null;//Data file open error.
}
ArrayList<Double> xaxes = new ArrayList<Double>(1);
@@ -158,7 +156,6 @@ public class GlobalFile {
xaxis = Double.valueOf(s);
xaxes.add(xaxis);
}catch(NumberFormatException e){
- //showMessage();
inReader.close();
inStream.close();
return null;//Data file data format error.
@@ -168,7 +165,6 @@ public class GlobalFile {
yaxis = Double.valueOf(s);
yaxes.add(yaxis);
}catch(NumberFormatException e){
- //showMessage();
inReader.close();
inStream.close();
return null;//Data file data format error.
@@ -177,7 +173,6 @@ public class GlobalFile {
}
inReader.close();
}catch(Exception e){
- //showMessage();
return null;//Uncertain data file error.
}
ArrayList<ArrayList<Double>> curveData = new ArrayList<ArrayList<Double>>(2);
diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/RandomGenerator.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/RandomGenerator.java
index 48d3b6d..549d9e1 100644
--- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/RandomGenerator.java
+++ b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/RandomGenerator.java
@@ -68,7 +68,6 @@ public static double doubleRangeRandom(double lowLimit,double upLimit){
if(times<=0) return new int[0];
int realTimes = Math.min(maxNum, times);
boolean[] flags = new boolean[maxNum];
-// Arrays.fill(flags, false);
boolean isBelowHalf = times<maxNum*0.5;
int virtualTimes = realTimes;
if(!isBelowHalf) {
diff --git a/odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java b/odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java
index 6fc9d90..099391a 100644
--- a/odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java
+++ b/odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java
@@ -169,7 +169,6 @@ public class DialogComponent {
//XServiceInfo
public String getImplementationName() {
- // return DialogComponent.class.getName();
return _DialogComponent.class.getName();
}
diff --git a/odk/examples/DevelopersGuide/Database/CodeSamples.java b/odk/examples/DevelopersGuide/Database/CodeSamples.java
index d714aad..f41f2ff 100644
--- a/odk/examples/DevelopersGuide/Database/CodeSamples.java
+++ b/odk/examples/DevelopersGuide/Database/CodeSamples.java
@@ -102,7 +102,6 @@ public class CodeSamples
}
displayTableStructure( con );
}
- // printDataSources();
}
catch(Exception e)
{
diff --git a/odk/examples/DevelopersGuide/Database/Sales.java b/odk/examples/DevelopersGuide/Database/Sales.java
index ef1be66..ff1ec65 100644
--- a/odk/examples/DevelopersGuide/Database/Sales.java
+++ b/odk/examples/DevelopersGuide/Database/Sales.java
@@ -113,10 +113,6 @@ public class Sales
{
// example for a programmatic way to do updates.
XStatement stmt = con.createStatement();
-// stmt.executeUpdate("INSERT INTO SALES " +
-// "VALUES (4, 102, 5, 'FTOP Darjeeling tea', '2002-01-02',150)");
-//
-// stmt = con.createStatement();
XPropertySet xProp = UnoRuntime.queryInterface(XPropertySet.class,stmt);
xProp.setPropertyValue("ResultSetType", new java.lang.Integer(ResultSetType.SCROLL_INSENSITIVE));
xProp.setPropertyValue("ResultSetConcurrency", new java.lang.Integer(ResultSetConcurrency.UPDATABLE));
diff --git a/odk/examples/DevelopersGuide/Spreadsheet/SpreadsheetSample.java b/odk/examples/DevelopersGuide/Spreadsheet/SpreadsheetSample.java
index 1d394a4..7f4652a 100644
--- a/odk/examples/DevelopersGuide/Spreadsheet/SpreadsheetSample.java
+++ b/odk/examples/DevelopersGuide/Spreadsheet/SpreadsheetSample.java
@@ -710,9 +710,6 @@ public class SpreadsheetSample extends SpreadsheetDocHelper
aAutoFormatObj = xAutoFormatsNA.getByName( aAutoFormatName );
else
{
- // create a new auto format (with document service manager!)
-// xDocServiceManager = (com.sun.star.lang.XMultiServiceFactory)
-// UnoRuntime.queryInterface( com.sun.star.lang.XMultiServiceFactory.class, getDocument() );
aAutoFormatObj = xDocServiceManager.createInstance(
"com.sun.star.sheet.TableAutoFormat" );
xAutoFormatsNA.insertByName( aAutoFormatName, aAutoFormatObj );
diff --git a/odk/examples/java/ConverterServlet/ConverterServlet.java b/odk/examples/java/ConverterServlet/ConverterServlet.java
index 607fc14..be1b5cb 100644
--- a/odk/examples/java/ConverterServlet/ConverterServlet.java
+++ b/odk/examples/java/ConverterServlet/ConverterServlet.java
@@ -312,12 +312,6 @@ public class ConverterServlet extends HttpServlet {
xComponent.dispose();
}
-// }
-// catch( Exception exception ) {
-// exception.printStackTrace();
-// return( "" );
-// }
-
if ( stringConvertedFile.startsWith( "file:///" ) ) {
// Truncating the beginning of the file name
stringConvertedFile = stringConvertedFile.substring( 8 );
diff --git a/odk/examples/java/EmbedDocument/Container1/EmbedContApp.java b/odk/examples/java/EmbedDocument/Container1/EmbedContApp.java
index 5c01baf..fad4b84 100644
--- a/odk/examples/java/EmbedDocument/Container1/EmbedContApp.java
+++ b/odk/examples/java/EmbedDocument/Container1/EmbedContApp.java
@@ -124,7 +124,6 @@ public class EmbedContApp extends Applet implements MouseListener, XEmbeddedClie
m_aObjectMenu.add( aItem );
// Handle mouse clicks in our window.
-// addMouseListener( new MouseWatcher() );
addMouseListener( this );
}
diff --git a/odk/examples/java/Inspector/UnoNode.java b/odk/examples/java/Inspector/UnoNode.java
index 51e9932..965f8aa 100644
--- a/odk/examples/java/Inspector/UnoNode.java
+++ b/odk/examples/java/Inspector/UnoNode.java
@@ -316,10 +316,8 @@ public class UnoNode{
private static Type sequenceComponentType(Type sequenceType) {
-// assert sequenceType.getTypeClass() == TypeClass.SEQUENCE;
String n = sequenceType.getTypeName();
final String PREFIX = "[]";
-// assert n.startsWith(PREFIX);
return new Type(n.substring(PREFIX.length()));
}
diff --git a/odk/examples/java/Spreadsheet/SCalc.java b/odk/examples/java/Spreadsheet/SCalc.java
index 51c869e..8f4e1d9 100644
--- a/odk/examples/java/Spreadsheet/SCalc.java
+++ b/odk/examples/java/Spreadsheet/SCalc.java
@@ -315,7 +315,6 @@ public class SCalc {
XPropertySet oTPS = UnoRuntime.queryInterface(
XPropertySet.class, xChart.getTitle() );
oTPS.setPropertyValue("String","The new title");
- //oDiag.Dim3D();
} catch (Exception e){
System.err.println("Changin Properties failed "+e);
e.printStackTrace(System.err);
diff --git a/odk/examples/java/ToDo/ToDo.java b/odk/examples/java/ToDo/ToDo.java
index 71a6283..e40dfc8 100644
--- a/odk/examples/java/ToDo/ToDo.java
+++ b/odk/examples/java/ToDo/ToDo.java
@@ -581,7 +581,6 @@ public class ToDo {
private String getStringFromGregorianCalendar( GregorianCalendar gregCal ) {
String sDate = ( gregCal.get( Calendar.MONTH ) + 1 )
+ STRING_SEPARATOR + gregCal.get( Calendar.DATE )
-// + STRING_SEPARATOR + ( gregCal.get( Calendar.MONTH ) + 1 )
+ STRING_SEPARATOR + gregCal.get( Calendar.YEAR );
return sDate;
diff --git a/package/qa/ofopxmlstorages/TestHelper.java b/package/qa/ofopxmlstorages/TestHelper.java
index 8836fc6..7fbf012 100644
--- a/package/qa/ofopxmlstorages/TestHelper.java
+++ b/package/qa/ofopxmlstorages/TestHelper.java
@@ -234,11 +234,6 @@ public class TestHelper {
public boolean checkRelations( StringPair[][] aStorRels, StringPair[][] aTestRels )
{
- // Message( "StorageRels:" );
- // PrintRelations( aStorRels );
- // Message( "TestRels:" );
- // PrintRelations( aTestRels );
-
if ( aStorRels.length != aTestRels.length )
{
Error( "The provided relations sequence has different size than the storage's one!" );
diff --git a/qadevOOo/runner/base/java_complex.java b/qadevOOo/runner/base/java_complex.java
index ba0ab703..4dbf070 100644
--- a/qadevOOo/runner/base/java_complex.java
+++ b/qadevOOo/runner/base/java_complex.java
@@ -89,8 +89,6 @@ public class java_complex implements TestBase
// and the office was killed.
// In complex tests just use "ThreadTimeOut" as timout.
- // param.put("TimeOut", new Integer(0));
-
for (int i = 0; i < entries.length; i++)
{
diff --git a/qadevOOo/runner/convwatch/ConvWatchStarter.java b/qadevOOo/runner/convwatch/ConvWatchStarter.java
index 1cd1799..2adce75 100644
--- a/qadevOOo/runner/convwatch/ConvWatchStarter.java
+++ b/qadevOOo/runner/convwatch/ConvWatchStarter.java
@@ -301,7 +301,6 @@ public class ConvWatchStarter extends EnhancedComplexTestCase
GlobalLogWriter.get().println("Set office watcher");
OfficeWatcher aWatcher = (OfficeWatcher)param.get("Watcher");
GlobalLogWriter.get().setWatcher(aWatcher);
- // initializeWatcher(param);
String sStatusRunThrough = "";
String sStatusMessage = "";
diff --git a/qadevOOo/runner/convwatch/DB.java b/qadevOOo/runner/convwatch/DB.java
index 23f258e..a743f8a 100644
--- a/qadevOOo/runner/convwatch/DB.java
+++ b/qadevOOo/runner/convwatch/DB.java
@@ -263,7 +263,6 @@ public class DB extends DBHelper
{
String sError = e.getMessage();
GlobalLogWriter.get().println("DB: Original SQL error: " + sError);
- // throw new ValueNotFoundException("Can't execute SQL: " + _sSQL);
}
return aResultList;
}
diff --git a/qadevOOo/runner/convwatch/DBHelper.java b/qadevOOo/runner/convwatch/DBHelper.java
index e6381f0..6323582 100644
--- a/qadevOOo/runner/convwatch/DBHelper.java
+++ b/qadevOOo/runner/convwatch/DBHelper.java
@@ -141,7 +141,6 @@ public class DBHelper
if (sPart.startsWith("db:"))
{
m_sDBName = sPart.substring(3);
- // GlobalLogWriter.get().println("DB: source version: " + m_sSourceVersion);
}
else if (sPart.startsWith("user:"))
{
diff --git a/qadevOOo/runner/convwatch/DocumentConverter.java b/qadevOOo/runner/convwatch/DocumentConverter.java
index b088d91..f449b57 100644
--- a/qadevOOo/runner/convwatch/DocumentConverter.java
+++ b/qadevOOo/runner/convwatch/DocumentConverter.java
@@ -141,9 +141,6 @@ public class DocumentConverter extends EnhancedComplexTestCase
// check if all need software is installed and accessible
checkEnvironment(mustInstalledSoftware());
- // test_removeFirstDirectorysAndBasenameFrom();
- // Get the MultiServiceFactory.
- // XMultiServiceFactory xMSF = (XMultiServiceFactory)param.getMSF();
GraphicalTestArguments aGTA = getGraphicalTestArguments();
if (aGTA == null)
{
diff --git a/qadevOOo/runner/convwatch/FileHelper.java b/qadevOOo/runner/convwatch/FileHelper.java
index 3cf88eb..1842652 100644
--- a/qadevOOo/runner/convwatch/FileHelper.java
+++ b/qadevOOo/runner/convwatch/FileHelper.java
@@ -120,42 +120,6 @@ public class FileHelper
return "";
}
-/*
- static ArrayList files = new ArrayList();
- public static Object[] traverse( String afileDirectory )
- {
-
- File fileDirectory = new File(afileDirectory);
- // Testing, if the file is a directory, and if so, it throws an exception
- if ( !fileDirectory.isDirectory() )
- {
- throw new IllegalArgumentException( "not a directory: " + fileDirectory.getName() );
- }
-
- // Getting all files and directories in the current directory
- File[] entries = fileDirectory.listFiles();
-
- // Iterating for each file and directory
- for ( int i = 0; i < entries.length; ++i )
- {
- // adding file to List
- try
- {
- // Composing the URL by replacing all backslashs
- String stringUrl = "file:///"
- + entries[ i ].getAbsolutePath().replace( '\\', '/' );
- files.add(stringUrl);
- }
- catch( Exception exception )
- {
- exception.printStackTrace();
- }
- }
- return files.toArray();
- }
-*/
-
- // makeDirectories("", "/tmp/a/b");
// creates all directories /tmp/a/b
public static void makeDirectories(String first, String path)
@@ -285,7 +249,6 @@ public class FileHelper
{
boolean bDebug = false;
String sTmpPath = util.utils.getUsersTempDir();
- //util.utils.getUsersTempDir();
String fs = System.getProperty("file.separator");
String sName = sTmpPath + fs + "DOC_COMPARATOR_DEBUG";
File aFile = new File(sName);
diff --git a/qadevOOo/runner/convwatch/ImageHelper.java b/qadevOOo/runner/convwatch/ImageHelper.java
index 1a29770..914c70e 100644
--- a/qadevOOo/runner/convwatch/ImageHelper.java
+++ b/qadevOOo/runner/convwatch/ImageHelper.java
@@ -94,7 +94,6 @@ class ImageHelper
"Cannot construct object with current Java version " +
javaVersion + ": " + ex.getMessage());
}
-// aImage = ImageIO.read(aFile);
return new ImageHelper(aImage);
}
}
diff --git a/qadevOOo/runner/convwatch/IniFile.java b/qadevOOo/runner/convwatch/IniFile.java
index dc3b55a..1e7795d 100644
--- a/qadevOOo/runner/convwatch/IniFile.java
+++ b/qadevOOo/runner/convwatch/IniFile.java
@@ -179,7 +179,7 @@ class IniFile
continue;
}
- if (sLine.startsWith("[") /* && sLine.endsWith("]") */)
+ if (sLine.startsWith("["))
{
// found end.
break;
@@ -212,7 +212,7 @@ class IniFile
continue;
}
- if (sLine.startsWith("[") /* && sLine.endsWith("]") */)
+ if (sLine.startsWith("["))
{
// found end.
return j;
diff --git a/qadevOOo/runner/convwatch/MSOfficePrint.java b/qadevOOo/runner/convwatch/MSOfficePrint.java
index 90c0b93..7ccf7d0 100644
--- a/qadevOOo/runner/convwatch/MSOfficePrint.java
+++ b/qadevOOo/runner/convwatch/MSOfficePrint.java
@@ -177,7 +177,6 @@ public class MSOfficePrint
String sOfficeType = getOfficeType(_sInputFile);
// special case, if xml we prefer word, but with DEFAULT_XML_FORMAT_APP=excel it's changeable.
- // if (_aGTA.getDefaultXMLFormatApp().toLowerCase().equals("excel"))
if (sOfficeType.equals("excel"))
{
aStartCommand = createExcelPrintHelper();
diff --git a/qadevOOo/runner/convwatch/OfficePrint.java b/qadevOOo/runner/convwatch/OfficePrint.java
index 83da79d..9279f64 100644
--- a/qadevOOo/runner/convwatch/OfficePrint.java
+++ b/qadevOOo/runner/convwatch/OfficePrint.java
@@ -309,7 +309,6 @@ public class OfficePrint {
String _sOutputURL,
String _sPrintFileURL)
{
- // waitInSeconds(1);
boolean bBack = false;
XComponent aDoc = loadFromURL(_aGTA, _sInputURL);
diff --git a/qadevOOo/runner/graphical/BuildID.java b/qadevOOo/runner/graphical/BuildID.java
index 1e08fb8..3b73b33 100644
--- a/qadevOOo/runner/graphical/BuildID.java
+++ b/qadevOOo/runner/graphical/BuildID.java
@@ -57,7 +57,6 @@ public class BuildID
sOfficePath = _sApp;
}
}
- // GlobalLogWriter.get().println("Office path: " + sOfficePath);
return sOfficePath;
}
@@ -75,7 +74,6 @@ public class BuildID
if (aSOfficeFile.exists())
{
String sOfficePath = FileHelper.getPath(_sOfficePath);
- // ok. System.out.println("directory: " + sOfficePath);
sBuildID = getBuildIDFromBootstrap(sOfficePath, _sIniSection);
if (sBuildID.length() == 0)
{
@@ -87,7 +85,6 @@ public class BuildID
GlobalLogWriter.println("soffice executable not found.");
}
-// int dummy = 0;
return sBuildID;
}
diff --git a/qadevOOo/runner/graphical/FileHelper.java b/qadevOOo/runner/graphical/FileHelper.java
index 440e627..64e5b1d 100644
--- a/qadevOOo/runner/graphical/FileHelper.java
+++ b/qadevOOo/runner/graphical/FileHelper.java
@@ -130,7 +130,6 @@ public class FileHelper
}
- // makeDirectories("", "/tmp/a/b");
// creates all directories /tmp/a/b
public static void makeDirectories(String first, String path)
@@ -260,7 +259,6 @@ public class FileHelper
{
boolean bDebug = false;
String sTmpPath = util.utils.getUsersTempDir();
- //util.utils.getUsersTempDir();
String fs = System.getProperty("file.separator");
String sName = sTmpPath + fs + "DOC_COMPARATOR_DEBUG";
File aFile = new File(sName);
diff --git a/qadevOOo/runner/graphical/IniFile.java b/qadevOOo/runner/graphical/IniFile.java
index 326365a..2b6ecc3 100644
--- a/qadevOOo/runner/graphical/IniFile.java
+++ b/qadevOOo/runner/graphical/IniFile.java
@@ -231,7 +231,7 @@ public class IniFile implements Enumeration<String>
{
continue;
}
- if (sLine.startsWith("[") /* && sLine.endsWith("]") */)
+ if (sLine.startsWith("[") )
{
// TODO: due to the fact we would like to insert an empty line before new sections
// TODO: we should check if we are in an empty line and if, go back one line.
@@ -267,7 +267,7 @@ public class IniFile implements Enumeration<String>
continue;
}
- if (sLine.startsWith("[") /* && sLine.endsWith("]") */)
+ if (sLine.startsWith("["))
{
// found end.
return j;
diff --git a/qadevOOo/runner/graphical/MSOfficePostscriptCreator.java b/qadevOOo/runner/graphical/MSOfficePostscriptCreator.java
index 13db622..8d9e8c9 100644
--- a/qadevOOo/runner/graphical/MSOfficePostscriptCreator.java
+++ b/qadevOOo/runner/graphical/MSOfficePostscriptCreator.java
@@ -422,7 +422,6 @@ public class MSOfficePostscriptCreator implements IOffice
String sTmpPath = util.utils.getUsersTempDir();
String ls = System.getProperty("line.separator");
- // ArrayList aList = new ArrayList();
String sSaveViaWord = "saveViaWord.pl";
ArrayList<String> aList = searchLocalFile(sSaveViaWord);
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list