[Libreoffice-commits] .: 12 commits - accessibility/bridge connectivity/qa jurt/test odk/examples odk/source qadevOOo/qa qadevOOo/runner qadevOOo/testdocs qadevOOo/tests scripting/java toolkit/qa toolkit/test wizards/com xmerge/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Tue Aug 28 07:16:56 PDT 2012
accessibility/bridge/org/openoffice/accessibility/AccessBridge.java | 11
accessibility/bridge/org/openoffice/accessibility/KeyHandler.java | 6
accessibility/bridge/org/openoffice/accessibility/PopupWindow.java | 6
accessibility/bridge/org/openoffice/java/accessibility/AbstractButton.java | 2
accessibility/bridge/org/openoffice/java/accessibility/AccessibleEditableTextImpl.java | 3
accessibility/bridge/org/openoffice/java/accessibility/AccessibleKeyBinding.java | 1
accessibility/bridge/org/openoffice/java/accessibility/AccessibleObjectFactory.java | 6
accessibility/bridge/org/openoffice/java/accessibility/AccessibleTextImpl.java | 3
accessibility/bridge/org/openoffice/java/accessibility/Alert.java | 2
accessibility/bridge/org/openoffice/java/accessibility/CheckBox.java | 1
accessibility/bridge/org/openoffice/java/accessibility/ComboBox.java | 6
accessibility/bridge/org/openoffice/java/accessibility/Component.java | 16
accessibility/bridge/org/openoffice/java/accessibility/Container.java | 5
accessibility/bridge/org/openoffice/java/accessibility/DescendantManager.java | 3
accessibility/bridge/org/openoffice/java/accessibility/Dialog.java | 2
accessibility/bridge/org/openoffice/java/accessibility/Icon.java | 3
accessibility/bridge/org/openoffice/java/accessibility/Label.java | 3
accessibility/bridge/org/openoffice/java/accessibility/List.java | 8
accessibility/bridge/org/openoffice/java/accessibility/MenuContainer.java | 2
accessibility/bridge/org/openoffice/java/accessibility/MenuItem.java | 2
accessibility/bridge/org/openoffice/java/accessibility/Paragraph.java | 4
accessibility/bridge/org/openoffice/java/accessibility/RadioButton.java | 1
accessibility/bridge/org/openoffice/java/accessibility/ScrollBar.java | 2
accessibility/bridge/org/openoffice/java/accessibility/Separator.java | 5
accessibility/bridge/org/openoffice/java/accessibility/Table.java | 10
accessibility/bridge/org/openoffice/java/accessibility/ToolTip.java | 3
accessibility/bridge/org/openoffice/java/accessibility/Tree.java | 8
accessibility/bridge/org/openoffice/java/accessibility/logging/XAccessibleHypertextLog.java | 1
connectivity/qa/connectivity/tools/AbstractDatabase.java | 2
connectivity/qa/connectivity/tools/CRMDatabase.java | 6
connectivity/qa/connectivity/tools/DataSource.java | 8
connectivity/qa/connectivity/tools/FlatFileDatabase.java | 15
connectivity/qa/connectivity/tools/HsqlColumnDescriptor.java | 2
connectivity/qa/connectivity/tools/HsqlDatabase.java | 13
connectivity/qa/connectivity/tools/QueryDefinition.java | 2
connectivity/qa/connectivity/tools/RowSet.java | 2
jurt/test/com/sun/star/comp/bridgefactory/BridgeFactory_Test.java | 1
jurt/test/com/sun/star/lib/uno/environments/remote/JobQueue_Test.java | 1
jurt/test/com/sun/star/lib/uno/environments/remote/ThreadPool_Test.java | 2
jurt/test/com/sun/star/lib/uno/protocols/urp/Marshaling_Test.java | 1
jurt/test/com/sun/star/uno/AnyConverter_Test.java | 4
odk/examples/DevelopersGuide/Forms/HsqlDatabase.java | 15
odk/source/com/sun/star/lib/loader/InstallationFinder.java | 10
qadevOOo/qa/complex/junitskeleton/Skeleton.java | 2
qadevOOo/runner/base/java_fat.java | 2
qadevOOo/runner/base/java_fat_service.java | 2
qadevOOo/runner/convwatch/BuildID.java | 1
qadevOOo/runner/convwatch/DocumentConverter.java | 1
qadevOOo/runner/convwatch/ReferenceBuilder.java | 2
qadevOOo/runner/graphical/JPEGComparator.java | 2
qadevOOo/runner/graphical/OpenOfficeDatabaseReportExtractor.java | 2
qadevOOo/runner/helper/ObjectInspectorModelImpl.java | 4
qadevOOo/runner/helper/ProcessHandler.java | 5
qadevOOo/runner/helper/PropertyHandlerImpl.java | 1
qadevOOo/runner/lib/MultiMethodTest.java | 1
qadevOOo/runner/lib/MultiPropertyTest.java | 4
qadevOOo/runner/lib/Status.java | 2
qadevOOo/runner/lib/TestCase.java | 6
qadevOOo/runner/lib/TestResult.java | 2
qadevOOo/runner/share/DescGetter.java | 2
qadevOOo/runner/stats/SQLExecution.java | 2
qadevOOo/runner/util/DesktopTools.java | 1
qadevOOo/runner/util/SOfficeFactory.java | 1
qadevOOo/runner/util/UITools.java | 1
qadevOOo/runner/util/WaitUnreachable.java | 2
qadevOOo/runner/util/WriterTools.java | 3
qadevOOo/runner/util/db/DataSource.java | 7
qadevOOo/testdocs/backend/org/openoffice/JavaSystemBackend.java | 1
qadevOOo/testdocs/qadevlibs/source/test/Job.java | 13
qadevOOo/tests/java/ifc/accessibility/_XAccessibleComponent.java | 12
qadevOOo/tests/java/ifc/accessibility/_XAccessibleContext.java | 1
qadevOOo/tests/java/ifc/awt/_XTabController.java | 1
qadevOOo/tests/java/ifc/awt/_XUserInputInterception.java | 4
qadevOOo/tests/java/ifc/awt/tree/_XTreeDataModel.java | 2
qadevOOo/tests/java/ifc/beans/_XMultiPropertySet.java | 3
qadevOOo/tests/java/ifc/beans/_XPropertySet.java | 4
qadevOOo/tests/java/ifc/beans/_XPropertyWithState.java | 1
qadevOOo/tests/java/ifc/container/_XContainer.java | 4
qadevOOo/tests/java/ifc/drawing/_LineProperties.java | 1
qadevOOo/tests/java/ifc/drawing/_Text.java | 2
qadevOOo/tests/java/ifc/form/_FormControlModel.java | 2
qadevOOo/tests/java/ifc/frame/_XDispatchRecorderSupplier.java | 1
qadevOOo/tests/java/ifc/lang/_XComponent.java | 5
qadevOOo/tests/java/ifc/linguistic2/_XDictionaryList.java | 2
qadevOOo/tests/java/ifc/linguistic2/_XLinguServiceEventBroadcaster.java | 2
qadevOOo/tests/java/ifc/linguistic2/_XLinguServiceManager.java | 2
qadevOOo/tests/java/ifc/sdb/_RowSet.java | 2
qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryAnalyzer.java | 2
qadevOOo/tests/java/ifc/sdbc/_XRow.java | 1
qadevOOo/tests/java/ifc/sheet/_XEnhancedMouseClickBroadcaster.java | 7
qadevOOo/tests/java/ifc/sheet/_XRangeSelection.java | 4
qadevOOo/tests/java/ifc/style/_CharacterProperties.java | 1
qadevOOo/tests/java/ifc/text/_TextGraphicObject.java | 1
qadevOOo/tests/java/ifc/text/_TextSection.java | 2
qadevOOo/tests/java/ifc/text/_XTextFieldsSupplier.java | 1
qadevOOo/tests/java/ifc/ucb/_XRemoteContentProviderAcceptor.java | 2
qadevOOo/tests/java/ifc/ucb/_XSimpleFileAccess.java | 2
qadevOOo/tests/java/ifc/util/_XChangesNotifier.java | 1
qadevOOo/tests/java/mod/_dbaccess/ODatasourceBrowser.java | 1
qadevOOo/tests/java/mod/_dbaccess/ORowSet.java | 2
qadevOOo/tests/java/mod/_dbaccess/SbaXGridControl.java | 1
qadevOOo/tests/java/mod/_forms/GenericModelTest.java | 3
qadevOOo/tests/java/mod/_forms/OButtonControl.java | 1
qadevOOo/tests/java/mod/_forms/OButtonModel.java | 2
qadevOOo/tests/java/mod/_forms/OCheckBoxControl.java | 1
qadevOOo/tests/java/mod/_forms/OCheckBoxModel.java | 2
qadevOOo/tests/java/mod/_forms/OComboBoxControl.java | 1
qadevOOo/tests/java/mod/_forms/OComboBoxModel.java | 2
qadevOOo/tests/java/mod/_forms/OCurrencyControl.java | 1
qadevOOo/tests/java/mod/_forms/OCurrencyModel.java | 2
qadevOOo/tests/java/mod/_forms/ODatabaseForm.java | 4
qadevOOo/tests/java/mod/_forms/ODateControl.java | 1
qadevOOo/tests/java/mod/_forms/ODateModel.java | 2
qadevOOo/tests/java/mod/_forms/OEditControl.java | 1
qadevOOo/tests/java/mod/_forms/OEditModel.java | 2
qadevOOo/tests/java/mod/_forms/OFileControlModel.java | 3
qadevOOo/tests/java/mod/_forms/OFixedTextModel.java | 2
qadevOOo/tests/java/mod/_forms/OFormattedControl.java | 1
qadevOOo/tests/java/mod/_forms/OFormattedFieldWrapper.java | 2
qadevOOo/tests/java/mod/_forms/OGridControlModel.java | 2
qadevOOo/tests/java/mod/_forms/OGroupBoxControl.java | 1
qadevOOo/tests/java/mod/_forms/OGroupBoxModel.java | 2
qadevOOo/tests/java/mod/_forms/OHiddenModel.java | 2
qadevOOo/tests/java/mod/_forms/OImageButtonControl.java | 1
qadevOOo/tests/java/mod/_forms/OImageButtonModel.java | 2
qadevOOo/tests/java/mod/_forms/OImageControlControl.java | 1
qadevOOo/tests/java/mod/_forms/OImageControlModel.java | 2
qadevOOo/tests/java/mod/_forms/OListBoxControl.java | 1
qadevOOo/tests/java/mod/_forms/OListBoxModel.java | 2
qadevOOo/tests/java/mod/_forms/ONavigationBarControl.java | 1
qadevOOo/tests/java/mod/_forms/ONumericControl.java | 1
qadevOOo/tests/java/mod/_forms/ONumericModel.java | 2
qadevOOo/tests/java/mod/_forms/OPatternControl.java | 1
qadevOOo/tests/java/mod/_forms/OPatternModel.java | 2
qadevOOo/tests/java/mod/_forms/ORadioButtonControl.java | 1
qadevOOo/tests/java/mod/_forms/ORadioButtonModel.java | 2
qadevOOo/tests/java/mod/_forms/OScrollBarModel.java | 1
qadevOOo/tests/java/mod/_forms/OSpinButtonModel.java | 1
qadevOOo/tests/java/mod/_forms/OTimeControl.java | 1
qadevOOo/tests/java/mod/_forms/OTimeModel.java | 2
qadevOOo/tests/java/mod/_fwk/JobExecutor.java | 2
qadevOOo/tests/java/mod/_fwk/UIConfigurationManager.java | 1
qadevOOo/tests/java/mod/_fwl/FilterFactory.java | 2
qadevOOo/tests/java/mod/_fwl/TypeDetection.java | 2
qadevOOo/tests/java/mod/_sc/ScAccessibleCell.java | 2
qadevOOo/tests/java/mod/_sc/ScAccessibleCsvCell.java | 4
qadevOOo/tests/java/mod/_sc/ScAccessibleCsvGrid.java | 4
qadevOOo/tests/java/mod/_sc/ScAccessibleCsvRuler.java | 4
qadevOOo/tests/java/mod/_sc/ScAccessibleDocument.java | 4
qadevOOo/tests/java/mod/_sc/ScAccessibleDocumentPagePreview.java | 4
qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeader.java | 4
qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeaderArea.java | 4
qadevOOo/tests/java/mod/_sc/ScCellFormatsEnumeration.java | 2
qadevOOo/tests/java/mod/_sc/ScCellFormatsObj.java | 2
qadevOOo/tests/java/mod/_sc/ScCellRangesObj.java | 2
qadevOOo/tests/java/mod/_sc/ScCellSearchObj.java | 2
qadevOOo/tests/java/mod/_sc/ScCellsObj.java | 2
qadevOOo/tests/java/mod/_sc/ScChartObj.java | 2
qadevOOo/tests/java/mod/_sc/ScChartsObj.java | 2
qadevOOo/tests/java/mod/_sc/ScConsolidationDescriptor.java | 2
qadevOOo/tests/java/mod/_sc/ScFilterDescriptorBase.java | 2
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_CellAnnotationsEnumeration.java | 2
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_LabelRangesEnumeration.java | 2
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SheetCellRangesEnumeration.java | 2
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableChartsEnumeration.java | 2
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableColumnsEnumeration.java | 2
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableConditionalEntryEnumeration.java | 2
qadevOOo/tests/java/mod/_sc/ScLabelRangeObj.java | 2
qadevOOo/tests/java/mod/_sc/ScLabelRangesObj.java | 2
qadevOOo/tests/java/mod/_sc/ScTableColumnObj.java | 2
qadevOOo/tests/java/mod/_sc/ScTableColumnsObj.java | 2
qadevOOo/tests/java/mod/_sc/ScTableConditionalEntry.java | 2
qadevOOo/tests/java/mod/_sc/ScTableConditionalFormat.java | 2
qadevOOo/tests/java/mod/_sc/ScTableRowObj.java | 2
qadevOOo/tests/java/mod/_sc/ScTableValidationObj.java | 2
qadevOOo/tests/java/mod/_sch/AccessibleDocumentView.java | 2
qadevOOo/tests/java/mod/_sch/ChXChartAxis.java | 3
qadevOOo/tests/java/mod/_sch/ChXChartData.java | 2
qadevOOo/tests/java/mod/_sch/ChXChartDataArray.java | 2
qadevOOo/tests/java/mod/_sch/ChXChartView.java | 2
qadevOOo/tests/java/mod/_sch/ChXDiagram.java | 2
qadevOOo/tests/java/mod/_sch/ChartGrid.java | 3
qadevOOo/tests/java/mod/_sch/ChartLine.java | 2
qadevOOo/tests/java/mod/_sch/ChartTitle.java | 2
qadevOOo/tests/java/mod/_sd/AccessibleDrawDocumentView.java | 8
qadevOOo/tests/java/mod/_sd/AccessibleOutlineView.java | 6
qadevOOo/tests/java/mod/_sd/AccessibleSlideView.java | 6
qadevOOo/tests/java/mod/_sd/DrawController_DrawView.java | 1
qadevOOo/tests/java/mod/_sd/SdDocLinkTargets.java | 2
qadevOOo/tests/java/mod/_sd/SdDrawPage.java | 3
qadevOOo/tests/java/mod/_sd/SdDrawPagesAccess.java | 2
qadevOOo/tests/java/mod/_sd/SdGenericDrawPage.java | 2
qadevOOo/tests/java/mod/_sd/SdLayer.java | 2
qadevOOo/tests/java/mod/_sd/SdLayerManager.java | 2
qadevOOo/tests/java/mod/_sd/SdMasterPage.java | 4
qadevOOo/tests/java/mod/_sd/SdMasterPagesAccess.java | 2
qadevOOo/tests/java/mod/_sd/SdPageLinkTargets.java | 2
qadevOOo/tests/java/mod/_sd/SdUnoDrawView.java | 1
qadevOOo/tests/java/mod/_sd/SdUnoOutlineView.java | 4
qadevOOo/tests/java/mod/_sd/SdUnoPresView.java | 4
qadevOOo/tests/java/mod/_sd/SdUnoSlideView.java | 4
qadevOOo/tests/java/mod/_sd/SdXCustomPresentation.java | 4
qadevOOo/tests/java/mod/_sd/SdXCustomPresentationAccess.java | 4
qadevOOo/tests/java/mod/_sd/SdXImpressDocument.java | 4
qadevOOo/tests/java/mod/_sd/SdXPresentation.java | 4
qadevOOo/tests/java/mod/_sd/SdXShape.java | 2
qadevOOo/tests/java/mod/_stm/DataInputStream.java | 2
qadevOOo/tests/java/mod/_stm/MarkableInputStream.java | 2
qadevOOo/tests/java/mod/_streams.uno/DataInputStream.java | 2
qadevOOo/tests/java/mod/_streams.uno/MarkableInputStream.java | 2
qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBox.java | 3
qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderBar.java | 2
qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderCell.java | 2
qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTableCell.java | 2
qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrlEntry.java | 2
qadevOOo/tests/java/mod/_svx/AccessibleEditableTextPara.java | 4
qadevOOo/tests/java/mod/_svx/SvxDrawPage.java | 1
qadevOOo/tests/java/mod/_svx/SvxGraphCtrlAccessibleContext.java | 4
qadevOOo/tests/java/mod/_svx/SvxShapeGroup.java | 2
qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentPageView.java | 4
qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentView.java | 4
qadevOOo/tests/java/mod/_sw/SwAccessibleEndnoteView.java | 4
qadevOOo/tests/java/mod/_sw/SwAccessibleFooterView.java | 4
qadevOOo/tests/java/mod/_sw/SwAccessibleFootnoteView.java | 4
qadevOOo/tests/java/mod/_sw/SwAccessibleHeaderView.java | 4
qadevOOo/tests/java/mod/_sw/SwAccessiblePageView.java | 4
qadevOOo/tests/java/mod/_sw/SwAccessibleParagraphView.java | 4
qadevOOo/tests/java/mod/_sw/SwAccessibleTableCellView.java | 4
qadevOOo/tests/java/mod/_sw/SwAccessibleTableView.java | 4
qadevOOo/tests/java/mod/_sw/SwAccessibleTextEmbeddedObject.java | 4
qadevOOo/tests/java/mod/_sw/SwAccessibleTextFrameView.java | 4
qadevOOo/tests/java/mod/_sw/SwAccessibleTextGraphicObject.java | 4
qadevOOo/tests/java/mod/_sw/SwXBodyText.java | 2
qadevOOo/tests/java/mod/_sw/SwXTableCellText.java | 1
qadevOOo/tests/java/mod/_sw/SwXTextGraphicObject.java | 2
qadevOOo/tests/java/mod/_sw/SwXTextGraphicObjects.java | 2
qadevOOo/tests/java/mod/_toolkit/AccessibleButton.java | 1
qadevOOo/tests/java/mod/_toolkit/AccessibleCheckBox.java | 1
qadevOOo/tests/java/mod/_toolkit/AccessibleComboBox.java | 1
qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownComboBox.java | 1
qadevOOo/tests/java/mod/_toolkit/AccessibleEdit.java | 1
qadevOOo/tests/java/mod/_toolkit/AccessibleFixedText.java | 2
qadevOOo/tests/java/mod/_toolkit/AccessibleList.java | 1
qadevOOo/tests/java/mod/_toolkit/AccessibleListBox.java | 1
qadevOOo/tests/java/mod/_toolkit/AccessibleListItem.java | 1
qadevOOo/tests/java/mod/_toolkit/AccessibleMenu.java | 1
qadevOOo/tests/java/mod/_toolkit/AccessibleMenuBar.java | 2
qadevOOo/tests/java/mod/_toolkit/AccessibleMenuItem.java | 1
qadevOOo/tests/java/mod/_toolkit/AccessibleMenuSeparator.java | 2
qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBar.java | 4
qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBarItem.java | 3
qadevOOo/tests/java/mod/_toolkit/AccessibleTabControl.java | 2
qadevOOo/tests/java/mod/_toolkit/AccessibleTabPage.java | 1
qadevOOo/tests/java/mod/_toolkit/AccessibleToolBox.java | 1
qadevOOo/tests/java/mod/_toolkit/AccessibleWindow.java | 3
qadevOOo/tests/java/mod/_toolkit/MutableTreeNode.java | 1
qadevOOo/tests/java/mod/_toolkit/TabController.java | 2
qadevOOo/tests/java/mod/_toolkit/TabControllerModel.java | 1
qadevOOo/tests/java/mod/_toolkit/Toolkit.java | 2
qadevOOo/tests/java/mod/_toolkit/UnoControlButton.java | 1
qadevOOo/tests/java/mod/_toolkit/UnoControlCheckBox.java | 1
qadevOOo/tests/java/mod/_toolkit/UnoControlComboBox.java | 2
qadevOOo/tests/java/mod/_toolkit/UnoControlContainer.java | 1
qadevOOo/tests/java/mod/_toolkit/UnoControlCurrencyField.java | 1
qadevOOo/tests/java/mod/_toolkit/UnoControlDateField.java | 1
qadevOOo/tests/java/mod/_toolkit/UnoControlEdit.java | 1
qadevOOo/tests/java/mod/_toolkit/UnoControlFileControl.java | 1
qadevOOo/tests/java/mod/_toolkit/UnoControlFixedText.java | 1
qadevOOo/tests/java/mod/_toolkit/UnoControlFormattedField.java | 1
qadevOOo/tests/java/mod/_toolkit/UnoControlGroupBox.java | 1
qadevOOo/tests/java/mod/_toolkit/UnoControlImageControl.java | 1
qadevOOo/tests/java/mod/_toolkit/UnoControlListBox.java | 1
qadevOOo/tests/java/mod/_toolkit/UnoControlNumericField.java | 1
qadevOOo/tests/java/mod/_toolkit/UnoControlPatternField.java | 1
qadevOOo/tests/java/mod/_toolkit/UnoControlRadioButton.java | 1
qadevOOo/tests/java/mod/_toolkit/UnoControlTimeField.java | 1
qadevOOo/tests/java/mod/_toolkit/UnoScrollBarControl.java | 1
qadevOOo/tests/java/mod/_toolkit/UnoSpinButtonControl.java | 1
qadevOOo/tests/java/mod/_toolkit/UnoTreeControl.java | 5
qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentExporter.java | 2
qadevOOo/tests/java/mod/_xmloff/Chart/XMLExporter.java | 3
qadevOOo/tests/java/mod/_xmloff/Chart/XMLStylesExporter.java | 2
qadevOOo/tests/java/mod/_xmloff/Impress/XMLContentExporter.java | 2
qadevOOo/tests/java/mod/_xmloff/Impress/XMLContentImporter.java | 2
qadevOOo/tests/java/mod/_xmloff/Impress/XMLExporter.java | 2
qadevOOo/tests/java/mod/_xmloff/Impress/XMLImporter.java | 2
qadevOOo/tests/java/mod/_xmloff/Impress/XMLMetaExporter.java | 2
qadevOOo/tests/java/mod/_xmloff/Impress/XMLMetaImporter.java | 2
qadevOOo/tests/java/mod/_xmloff/Impress/XMLSettingsExporter.java | 2
qadevOOo/tests/java/mod/_xmloff/Impress/XMLSettingsImporter.java | 2
qadevOOo/tests/java/mod/_xmloff/Impress/XMLStylesExporter.java | 2
qadevOOo/tests/java/mod/_xmloff/Impress/XMLStylesImporter.java | 2
scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java | 1
scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java | 1
scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java | 2
toolkit/qa/complex/toolkit/awtgrid/TMutableGridDataModel.java | 1
toolkit/test/accessibility/AccTreeNode.java | 32 -
toolkit/test/accessibility/AccessibilityTree.java | 6
toolkit/test/accessibility/AccessibilityTreeModel.java | 32 -
toolkit/test/accessibility/AccessibilityTreeModelBase.java | 5
toolkit/test/accessibility/AccessibilityWorkBench.java | 28 -
toolkit/test/accessibility/AccessibleActionHandler.java | 6
toolkit/test/accessibility/AccessibleActionNode.java | 1
toolkit/test/accessibility/AccessibleCellHandler.java | 6
toolkit/test/accessibility/AccessibleComponentHandler.java | 4
toolkit/test/accessibility/AccessibleContextHandler.java | 4
toolkit/test/accessibility/AccessibleEditableTextHandler.java | 6
toolkit/test/accessibility/AccessibleExtendedComponentHandler.java | 6
toolkit/test/accessibility/AccessibleHyperlinkHandler.java | 8
toolkit/test/accessibility/AccessibleHypertextHandler.java | 8
toolkit/test/accessibility/AccessibleImageHandler.java | 6
toolkit/test/accessibility/AccessibleRelationHandler.java | 5
toolkit/test/accessibility/AccessibleSelectionHandler.java | 10
toolkit/test/accessibility/AccessibleTableHandler.java | 6
toolkit/test/accessibility/AccessibleTextHandler.java | 3
toolkit/test/accessibility/AccessibleTreeCellRenderer.java | 10
toolkit/test/accessibility/AccessibleTreeHandler.java | 1
toolkit/test/accessibility/AccessibleTreeNode.java | 4
toolkit/test/accessibility/AccessibleUNOHandler.java | 8
toolkit/test/accessibility/Canvas.java | 58 +--
toolkit/test/accessibility/CanvasShape.java | 6
toolkit/test/accessibility/ChildEventHandler.java | 4
toolkit/test/accessibility/ContextEventHandler.java | 2
toolkit/test/accessibility/EventHandler.java | 4
toolkit/test/accessibility/EventListener.java | 17
toolkit/test/accessibility/EventQueue.java | 15
toolkit/test/accessibility/FrameActionListener.java | 3
toolkit/test/accessibility/GeometryEventHandler.java | 5
toolkit/test/accessibility/HelpWindow.java | 7
toolkit/test/accessibility/InformationWriter.java | 60 +--
toolkit/test/accessibility/MessageArea.java | 1
toolkit/test/accessibility/NodeFactory.java | 2
toolkit/test/accessibility/NodeHandler.java | 10
toolkit/test/accessibility/NodeMap.java | 8
toolkit/test/accessibility/OfficeConnection.java | 13
toolkit/test/accessibility/Options.java | 1
toolkit/test/accessibility/QueuedListener.java | 7
toolkit/test/accessibility/SelectionDialog.java | 5
toolkit/test/accessibility/SimpleOffice.java | 51 --
toolkit/test/accessibility/StringNode.java | 2
toolkit/test/accessibility/TableEventHandler.java | 2
toolkit/test/accessibility/TextLogger.java | 1
toolkit/test/accessibility/TextUpdateListener.java | 4
toolkit/test/accessibility/TopWindowListener.java | 6
toolkit/test/accessibility/VectorNode.java | 6
toolkit/test/accessibility/ov/ContextView.java | 3
toolkit/test/accessibility/ov/FocusView.java | 5
toolkit/test/accessibility/ov/ListeningObjectView.java | 8
toolkit/test/accessibility/ov/ObjectViewContainer.java | 10
toolkit/test/accessibility/ov/SelectionView.java | 12
toolkit/test/accessibility/ov/TextView.java | 11
toolkit/test/accessibility/tools/NameProvider.java | 16
wizards/com/sun/star/wizards/common/Desktop.java | 1
wizards/com/sun/star/wizards/common/JavaTools.java | 2
wizards/com/sun/star/wizards/common/NamedValueCollection.java | 1
wizards/com/sun/star/wizards/common/Resource.java | 3
wizards/com/sun/star/wizards/db/TableDescriptor.java | 2
wizards/com/sun/star/wizards/document/Control.java | 1
wizards/com/sun/star/wizards/document/FormHandler.java | 1
wizards/com/sun/star/wizards/report/IReportDocument.java | 1
wizards/com/sun/star/wizards/report/ReportTextDocument.java | 2
wizards/com/sun/star/wizards/report/ReportTextImplementation.java | 1
wizards/com/sun/star/wizards/report/ReportWizard.java | 1
wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation.java | 1
wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarSingleColumn.java | 1
wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarTwoColumns.java | 1
wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsAbove.java | 1
wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsLeft.java | 1
wizards/com/sun/star/wizards/table/ScenarioSelector.java | 2
wizards/com/sun/star/wizards/ui/ButtonList.java | 1
wizards/com/sun/star/wizards/web/WWD_Events.java | 1
wizards/com/sun/star/wizards/web/WWD_Startup.java | 2
xmerge/source/bridge/java/XMergeBridge.java | 1
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PocketExcelDecoder.java | 12
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PocketExcelEncoder.java | 6
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/SxcDocumentDeserializerImpl.java | 3
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/SxcDocumentSerializerImpl.java | 4
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Workbook.java | 1
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Worksheet.java | 1
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaHelper.java | 1
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaParser.java | 1
xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentDeserializerImpl.java | 1
xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/DocumentDeserializerImpl.java | 9
xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/DocumentMergerImpl.java | 3
xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/DocumentSerializerImpl.java | 5
xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WSDecoder.java | 8
xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WSEncoder.java | 1
xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/Wse.java | 43 --
xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WseColorTable.java | 12
xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WseFontTable.java | 11
xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WseHeader.java | 13
xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WsePara.java | 17
xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/textRecord.java | 1
xmerge/source/xmerge/java/org/openoffice/xmerge/ConverterFactory.java | 4
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java | 1
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java | 188 +++++-----
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java | 10
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SpreadsheetDecoder.java | 6
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SpreadsheetEncoder.java | 11
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentDeserializer.java | 1
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentSerializer.java | 1
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java | 1
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java | 184 +++++----
xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CellNodeIterator.java | 1
xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/RowIterator.java | 1
xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/CharacterBaseParagraphMerge.java | 4
xmerge/source/xmerge/java/org/openoffice/xmerge/test/Driver.java | 1
407 files changed, 668 insertions(+), 1279 deletions(-)
New commits:
commit 96fb2453e40f97a0bffcfe7e046b4599beace152
Author: Noel Grandin <noel at peralex.com>
Date: Tue Aug 21 09:27:24 2012 +0200
Javadoc warnings - fix some tags and references
Change-Id: I13be16beac258c551e58654b4fc37877d7bb9695
diff --git a/qadevOOo/runner/graphical/JPEGComparator.java b/qadevOOo/runner/graphical/JPEGComparator.java
index 1ac08f7..d468bd8 100644
--- a/qadevOOo/runner/graphical/JPEGComparator.java
+++ b/qadevOOo/runner/graphical/JPEGComparator.java
@@ -393,7 +393,6 @@ public class JPEGComparator extends EnhancedComplexTestCase
* @param _sDocumentName
* @param _sResult
* @param _aParams
- * @return 0=no difference !=0 both files differ
*/
private void compareJPEG(String _sDocumentName, String _sResult, ParameterHelper _aParams)
{
diff --git a/qadevOOo/runner/helper/PropertyHandlerImpl.java b/qadevOOo/runner/helper/PropertyHandlerImpl.java
index d933e80..e08922c 100644
--- a/qadevOOo/runner/helper/PropertyHandlerImpl.java
+++ b/qadevOOo/runner/helper/PropertyHandlerImpl.java
@@ -101,7 +101,6 @@ public class PropertyHandlerImpl implements XPropertyHandler{
/**
* This method currently does nothing
* @param PropertyName the name of the property whose user interface is to be described
- * @param out_Descriptor the descriptor of the property line, to be filled by the XPropertyHandler implementation
* @param ControlFactory a factory for creating XPropertyControl instances. Must not be NULL .
* @throws com.sun.star.beans.UnknownPropertyException ::com::sun::star::beans::UnknownPropertyException if the given property is not supported by this handler
* @throws com.sun.star.lang.NullPointerException ::com::sun::star::lang::NullPointerException if ControlFactory is NULL .
diff --git a/qadevOOo/runner/lib/MultiPropertyTest.java b/qadevOOo/runner/lib/MultiPropertyTest.java
index 5d61323..c52a9d8 100644
--- a/qadevOOo/runner/lib/MultiPropertyTest.java
+++ b/qadevOOo/runner/lib/MultiPropertyTest.java
@@ -100,7 +100,7 @@ public class MultiPropertyTest extends MultiMethodTest
* calls testProperty method for the method. Otherwise calls
* super.invokeTestMethod().
*
- * @see #MultiMethodTest.invokeTestMethod()
+ * @see MultiMethodTest#invokeTestMethod
*/
protected void invokeTestMethod(Method meth, String methName)
{
@@ -554,7 +554,7 @@ public class MultiPropertyTest extends MultiMethodTest
* Tests the property using <code>PropertyValueSwitcher</code>
* tester and two values for this property.
*
- * @see #PropertyValueSwitcher
+ * @see PropertyValueSwitcher
*/
protected void testProperty(String propName, Object val1, Object val2)
{
diff --git a/qadevOOo/runner/lib/TestCase.java b/qadevOOo/runner/lib/TestCase.java
index eae36ba..0477ebe 100644
--- a/qadevOOo/runner/lib/TestCase.java
+++ b/qadevOOo/runner/lib/TestCase.java
@@ -78,7 +78,7 @@ public abstract class TestCase {
* @param tParam test parameters
* @param log writer to log information while testing
*
- * @see #initializeTestCase()
+ * @see #initializeTestCase
*/
protected void initialize( TestParameters tParam, PrintWriter log ) {
}
@@ -114,7 +114,7 @@ public abstract class TestCase {
*
* @return the created <code>TestEnvironment</code>
*
- * @see #createTestEnvironment()
+ * @see #createTestEnvironment
* @see lib.TestEnvironment
*/
public synchronized TestEnvironment getTestEnvironment( TestParameters tParam ) {
@@ -157,7 +157,7 @@ public abstract class TestCase {
* @param log writer to log information while testing
*
* @see TestEnvironment
- * @see #getTestEnvironment()
+ * @see #getTestEnvironment
*/
protected abstract TestEnvironment createTestEnvironment(
TestParameters tParam, PrintWriter log );
diff --git a/qadevOOo/runner/lib/TestResult.java b/qadevOOo/runner/lib/TestResult.java
index 1df57a9..4d89fc7 100644
--- a/qadevOOo/runner/lib/TestResult.java
+++ b/qadevOOo/runner/lib/TestResult.java
@@ -54,7 +54,7 @@ public class TestResult {
* The method makes the method tested with the status, i.e. it adds the
* status to its state and makes it completed.
*
- * @param method reffers to the method whoch was tested
+ * @param method refers to the method which was tested
* @param status describes the result of testing the method
* @return <tt>true</tt> if status is OK, <tt>false</tt> otherwise.
*
diff --git a/qadevOOo/tests/java/ifc/form/_FormControlModel.java b/qadevOOo/tests/java/ifc/form/_FormControlModel.java
index 31a5c9b..36c48dd 100644
--- a/qadevOOo/tests/java/ifc/form/_FormControlModel.java
+++ b/qadevOOo/tests/java/ifc/form/_FormControlModel.java
@@ -28,7 +28,7 @@ import lib.MultiPropertyTest;
* <li><code> TabIndex</code></li>
* <li><code> Tag</code></li>
* </ul>
-* @see com.sun.star.form.FormControlModel
+* @see com.sun.star.form
*/
public class _FormControlModel extends MultiPropertyTest {
diff --git a/qadevOOo/tests/java/ifc/sdb/_RowSet.java b/qadevOOo/tests/java/ifc/sdb/_RowSet.java
index bc31a57..1f3097d 100644
--- a/qadevOOo/tests/java/ifc/sdb/_RowSet.java
+++ b/qadevOOo/tests/java/ifc/sdb/_RowSet.java
@@ -100,7 +100,7 @@ public class _RowSet extends MultiPropertyTest {
* Overriden method which tests all the properties
* with <code>SafeTester</code>.
*
- * @see #SafeTester
+ * @see SafeTester
*/
protected void testProperty(String propName) {
testProperty(propName, new SafeTester()) ;
diff --git a/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryAnalyzer.java b/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryAnalyzer.java
index fe5dd27..18f03be 100644
--- a/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryAnalyzer.java
+++ b/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryAnalyzer.java
@@ -59,7 +59,7 @@ public class _XSingleSelectQueryAnalyzer extends MultiMethodTest {
* <ul>
* <li><code>XSingleSelectQueryComposer xCompoer</code></li>
* </ul> <p>
- * @see om.sun.star.sdb.XSingleSelectQueryComposer
+ * @see com.sun.star.sdb.XSingleSelectQueryComposer
*/
protected void before() {
diff --git a/qadevOOo/tests/java/mod/_forms/GenericModelTest.java b/qadevOOo/tests/java/mod/_forms/GenericModelTest.java
index 09d3e76..2bf33f6 100644
--- a/qadevOOo/tests/java/mod/_forms/GenericModelTest.java
+++ b/qadevOOo/tests/java/mod/_forms/GenericModelTest.java
@@ -95,7 +95,7 @@ import util.utils;
* @see com.sun.star.form.XUpdateBroadcaster
* @see com.sun.star.form.DataAwareControlModel
* @see com.sun.star.beans.XPropertyState
-* @see com.sun.star.form.FormControlModel
+* @see com.sun.star.form
* @see com.sun.star.container.XNamed
* @see com.sun.star.lang.XComponent
* @see com.sun.star.lang.XEventListener
diff --git a/qadevOOo/tests/java/mod/_forms/OButtonModel.java b/qadevOOo/tests/java/mod/_forms/OButtonModel.java
index db93288..600a98b 100644
--- a/qadevOOo/tests/java/mod/_forms/OButtonModel.java
+++ b/qadevOOo/tests/java/mod/_forms/OButtonModel.java
@@ -49,7 +49,7 @@ import lib.TestParameters;
*
* @see com.sun.star.io.XPersistObject
* @see com.sun.star.container.XChild
- * @see com.sun.star.form.FormControlModel
+ * @see com.sun.star.form
* @see com.sun.star.form.XImageProducerSupplier
* @see com.sun.star.form.FormComponent
* @see com.sun.star.beans.XPropertyAccess
diff --git a/qadevOOo/tests/java/mod/_forms/OCheckBoxModel.java b/qadevOOo/tests/java/mod/_forms/OCheckBoxModel.java
index b6fd9c7..e8910bd 100644
--- a/qadevOOo/tests/java/mod/_forms/OCheckBoxModel.java
+++ b/qadevOOo/tests/java/mod/_forms/OCheckBoxModel.java
@@ -62,7 +62,7 @@ import lib.TestParameters;
* @see com.sun.star.form.DataAwareControlModel
* @see com.sun.star.form.XUpdateBroadcaster
* @see com.sun.star.beans.XPropertyState
-* @see com.sun.star.form.FormControlModel
+* @see com.sun.star.form
* @see com.sun.star.awt.UnoControlCheckBoxModel
* @see com.sun.star.container.XNamed
* @see com.sun.star.form.XBoundComponent
diff --git a/qadevOOo/tests/java/mod/_forms/OComboBoxModel.java b/qadevOOo/tests/java/mod/_forms/OComboBoxModel.java
index eed9527..44bae5f 100644
--- a/qadevOOo/tests/java/mod/_forms/OComboBoxModel.java
+++ b/qadevOOo/tests/java/mod/_forms/OComboBoxModel.java
@@ -64,7 +64,7 @@ import util.DBTools;
* @see com.sun.star.form.DataAwareControlModel
* @see com.sun.star.form.component.DatabaseComboBox
* @see com.sun.star.beans.XPropertyState
-* @see com.sun.star.form.FormControlModel
+* @see com.sun.star.form
* @see com.sun.star.container.XNamed
* @see com.sun.star.form.XBoundComponent
* @see com.sun.star.form.component.ComboBox
diff --git a/qadevOOo/tests/java/mod/_forms/OCurrencyModel.java b/qadevOOo/tests/java/mod/_forms/OCurrencyModel.java
index a54da3c..f66cd00 100644
--- a/qadevOOo/tests/java/mod/_forms/OCurrencyModel.java
+++ b/qadevOOo/tests/java/mod/_forms/OCurrencyModel.java
@@ -61,7 +61,7 @@ import lib.TestParameters;
* @see com.sun.star.form.DataAwareControlModel
* @see com.sun.star.awt.UnoControlCurrencyFieldModel
* @see com.sun.star.beans.XPropertyState
-* @see com.sun.star.form.FormControlModel
+* @see com.sun.star.form
* @see com.sun.star.container.XNamed
* @see com.sun.star.lang.XComponent
* @see com.sun.star.lang.XEventListener
diff --git a/qadevOOo/tests/java/mod/_forms/ODateModel.java b/qadevOOo/tests/java/mod/_forms/ODateModel.java
index c33bb88..f5c7445 100644
--- a/qadevOOo/tests/java/mod/_forms/ODateModel.java
+++ b/qadevOOo/tests/java/mod/_forms/ODateModel.java
@@ -71,7 +71,7 @@ import util.DBTools;
* @see com.sun.star.form.XUpdateBroadcaster
* @see com.sun.star.form.DataAwareControlModel
* @see com.sun.star.beans.XPropertyState
-* @see com.sun.star.form.FormControlModel
+* @see com.sun.star.form
* @see com.sun.star.container.XNamed
* @see com.sun.star.lang.XComponent
* @see com.sun.star.lang.XEventListener
diff --git a/qadevOOo/tests/java/mod/_forms/OEditModel.java b/qadevOOo/tests/java/mod/_forms/OEditModel.java
index 91c30a4..58c464f 100644
--- a/qadevOOo/tests/java/mod/_forms/OEditModel.java
+++ b/qadevOOo/tests/java/mod/_forms/OEditModel.java
@@ -71,7 +71,7 @@ import util.DBTools;
* @see com.sun.star.form.component.TextField
* @see com.sun.star.form.DataAwareControlModel
* @see com.sun.star.beans.XPropertyState
-* @see com.sun.star.form.FormControlModel
+* @see com.sun.star.form
* @see com.sun.star.container.XNamed
* @see com.sun.star.awt.UnoControlEditModel
* @see com.sun.star.form.component.DatabaseTextField
diff --git a/qadevOOo/tests/java/mod/_forms/OFileControlModel.java b/qadevOOo/tests/java/mod/_forms/OFileControlModel.java
index ece2abd..a7667c4 100644
--- a/qadevOOo/tests/java/mod/_forms/OFileControlModel.java
+++ b/qadevOOo/tests/java/mod/_forms/OFileControlModel.java
@@ -63,7 +63,7 @@ import com.sun.star.util.XCloseable;
* threads concurently.
* @see com.sun.star.io.XPersistObject
* @see com.sun.star.container.XChild
- * @see com.sun.star.form.FormControlModel
+ * @see com.sun.star.form
* @see com.sun.star.awt.UnoControlFileControlModel
* @see com.sun.star.form.FormComponent
* @see com.sun.star.beans.XPropertyAccess
diff --git a/qadevOOo/tests/java/mod/_forms/OFixedTextModel.java b/qadevOOo/tests/java/mod/_forms/OFixedTextModel.java
index 61dfc27..d3c815d 100644
--- a/qadevOOo/tests/java/mod/_forms/OFixedTextModel.java
+++ b/qadevOOo/tests/java/mod/_forms/OFixedTextModel.java
@@ -46,7 +46,7 @@ import lib.TestParameters;
* threads concurently.
* @see com.sun.star.io.XPersistObject
* @see com.sun.star.container.XChild
-* @see com.sun.star.form.FormControlModel
+* @see com.sun.star.form
* @see com.sun.star.form.FormComponent
* @see com.sun.star.beans.XPropertyAccess
* @see com.sun.star.beans.XPropertyContainer
diff --git a/qadevOOo/tests/java/mod/_forms/OFormattedFieldWrapper.java b/qadevOOo/tests/java/mod/_forms/OFormattedFieldWrapper.java
index e124710..f5fb46b 100644
--- a/qadevOOo/tests/java/mod/_forms/OFormattedFieldWrapper.java
+++ b/qadevOOo/tests/java/mod/_forms/OFormattedFieldWrapper.java
@@ -65,7 +65,7 @@ import util.DBTools;
* @see com.sun.star.form.DataAwareControlModel
* @see com.sun.star.form.XUpdateBroadcaster
* @see com.sun.star.form.component.DatabaseFormattedField
- * @see com.sun.star.form.FormControlModel
+ * @see com.sun.star.form
* @see com.sun.star.beans.XPropertyState
* @see com.sun.star.container.XNamed
* @see com.sun.star.lang.XComponent
diff --git a/qadevOOo/tests/java/mod/_forms/OGridControlModel.java b/qadevOOo/tests/java/mod/_forms/OGridControlModel.java
index 1678ae0..7ee316b 100644
--- a/qadevOOo/tests/java/mod/_forms/OGridControlModel.java
+++ b/qadevOOo/tests/java/mod/_forms/OGridControlModel.java
@@ -86,7 +86,7 @@ import com.sun.star.util.XCloseable;
* @see com.sun.star.view.XSelectionSupplier
* @see com.sun.star.container.XEnumerationAccess
* @see com.sun.star.beans.XPropertyState
-* @see com.sun.star.form.FormControlModel
+* @see com.sun.star.form
* @see com.sun.star.container.XIndexReplace
* @see com.sun.star.container.XNamed
* @see com.sun.star.container.XIndexAccess
diff --git a/qadevOOo/tests/java/mod/_forms/OGroupBoxModel.java b/qadevOOo/tests/java/mod/_forms/OGroupBoxModel.java
index 4f4a6d1..d6a2e83 100644
--- a/qadevOOo/tests/java/mod/_forms/OGroupBoxModel.java
+++ b/qadevOOo/tests/java/mod/_forms/OGroupBoxModel.java
@@ -47,7 +47,7 @@ import lib.TestParameters;
* @see com.sun.star.awt.UnoControlGroupBoxModel
* @see com.sun.star.io.XPersistObject
* @see com.sun.star.container.XChild
- * @see com.sun.star.form.FormControlModel
+ * @see com.sun.star.form
* @see com.sun.star.form.FormComponent
* @see com.sun.star.beans.XPropertyAccess
* @see com.sun.star.beans.XPropertyContainer
diff --git a/qadevOOo/tests/java/mod/_forms/OHiddenModel.java b/qadevOOo/tests/java/mod/_forms/OHiddenModel.java
index e59d6ac..ac4553a 100644
--- a/qadevOOo/tests/java/mod/_forms/OHiddenModel.java
+++ b/qadevOOo/tests/java/mod/_forms/OHiddenModel.java
@@ -62,7 +62,7 @@ import com.sun.star.util.XCloseable;
* threads concurently.
* @see com.sun.star.io.XPersistObject
* @see com.sun.star.container.XChild
- * @see com.sun.star.form.FormControlModel
+ * @see com.sun.star.form
* @see com.sun.star.form.component.HiddenControl
* @see com.sun.star.form.FormComponent
* @see com.sun.star.beans.XPropertyAccess
diff --git a/qadevOOo/tests/java/mod/_forms/OImageButtonModel.java b/qadevOOo/tests/java/mod/_forms/OImageButtonModel.java
index e0bcc14..2512cd9 100644
--- a/qadevOOo/tests/java/mod/_forms/OImageButtonModel.java
+++ b/qadevOOo/tests/java/mod/_forms/OImageButtonModel.java
@@ -47,7 +47,7 @@ import lib.TestParameters;
* @see com.sun.star.io.XPersistObject
* @see com.sun.star.container.XChild
* @see com.sun.star.awt.UnoControlImageControlModel
-* @see com.sun.star.form.FormControlModel
+* @see com.sun.star.form
* @see com.sun.star.form.FormComponent
* @see com.sun.star.form.XImageProducerSupplier
* @see com.sun.star.beans.XPropertyAccess
diff --git a/qadevOOo/tests/java/mod/_forms/OImageControlModel.java b/qadevOOo/tests/java/mod/_forms/OImageControlModel.java
index 4602d4c..572686a 100644
--- a/qadevOOo/tests/java/mod/_forms/OImageControlModel.java
+++ b/qadevOOo/tests/java/mod/_forms/OImageControlModel.java
@@ -67,7 +67,7 @@ import util.DBTools;
* @see com.sun.star.form.XUpdateBroadcaster
* @see com.sun.star.form.DataAwareControlModel
* @see com.sun.star.beans.XPropertyState
-* @see com.sun.star.form.FormControlModel
+* @see com.sun.star.form
* @see com.sun.star.form.component.DatabaseImageControl
* @see com.sun.star.container.XNamed
* @see com.sun.star.lang.XComponent
diff --git a/qadevOOo/tests/java/mod/_forms/OListBoxModel.java b/qadevOOo/tests/java/mod/_forms/OListBoxModel.java
index c97868f..38f92a2 100644
--- a/qadevOOo/tests/java/mod/_forms/OListBoxModel.java
+++ b/qadevOOo/tests/java/mod/_forms/OListBoxModel.java
@@ -75,7 +75,7 @@ import util.DBTools;
* @see com.sun.star.form.XUpdateBroadcaster
* @see com.sun.star.form.DataAwareControlModel
* @see com.sun.star.beans.XPropertyState
-* @see com.sun.star.form.FormControlModel
+* @see com.sun.star.form
* @see com.sun.star.container.XNamed
* @see com.sun.star.lang.XComponent
* @see com.sun.star.lang.XEventListener
diff --git a/qadevOOo/tests/java/mod/_forms/ONumericModel.java b/qadevOOo/tests/java/mod/_forms/ONumericModel.java
index 52a2d83..6234b89 100644
--- a/qadevOOo/tests/java/mod/_forms/ONumericModel.java
+++ b/qadevOOo/tests/java/mod/_forms/ONumericModel.java
@@ -64,7 +64,7 @@ import util.DBTools;
* @see com.sun.star.form.DataAwareControlModel
* @see com.sun.star.beans.XPropertyState
* @see com.sun.star.form.component.NumericField
-* @see com.sun.star.form.FormControlModel
+* @see com.sun.star.form
* @see com.sun.star.container.XNamed
* @see com.sun.star.lang.XComponent
* @see com.sun.star.lang.XEventListener
diff --git a/qadevOOo/tests/java/mod/_forms/OPatternModel.java b/qadevOOo/tests/java/mod/_forms/OPatternModel.java
index 69b1d39..d96c280 100644
--- a/qadevOOo/tests/java/mod/_forms/OPatternModel.java
+++ b/qadevOOo/tests/java/mod/_forms/OPatternModel.java
@@ -68,7 +68,7 @@ import util.DBTools;
* @see com.sun.star.form.XUpdateBroadcaster
* @see com.sun.star.awt.UnoControlPatternFieldModel
* @see com.sun.star.form.component.DatabasePatternField
- * @see com.sun.star.form.FormControlModel
+ * @see com.sun.star.form
* @see com.sun.star.beans.XPropertyState
* @see com.sun.star.container.XNamed
* @see com.sun.star.lang.XComponent
diff --git a/qadevOOo/tests/java/mod/_forms/ORadioButtonModel.java b/qadevOOo/tests/java/mod/_forms/ORadioButtonModel.java
index a2f6543..6abbdfe 100644
--- a/qadevOOo/tests/java/mod/_forms/ORadioButtonModel.java
+++ b/qadevOOo/tests/java/mod/_forms/ORadioButtonModel.java
@@ -67,7 +67,7 @@ import util.DBTools;
* @see com.sun.star.form.DataAwareControlModel
* @see com.sun.star.awt.UnoControlRadioButtonModel
* @see com.sun.star.beans.XPropertyState
-* @see com.sun.star.form.FormControlModel
+* @see com.sun.star.form
* @see com.sun.star.container.XNamed
* @see com.sun.star.lang.XComponent
* @see com.sun.star.lang.XEventListener
diff --git a/qadevOOo/tests/java/mod/_forms/OTimeModel.java b/qadevOOo/tests/java/mod/_forms/OTimeModel.java
index 8c97bac..dff1c72 100644
--- a/qadevOOo/tests/java/mod/_forms/OTimeModel.java
+++ b/qadevOOo/tests/java/mod/_forms/OTimeModel.java
@@ -79,7 +79,7 @@ import util.DBTools;
* @see com.sun.star.form.XUpdateBroadcaster
* @see com.sun.star.form.DataAwareControlModel
* @see com.sun.star.beans.XPropertyState
-* @see com.sun.star.form.FormControlModel
+* @see com.sun.star.form
* @see com.sun.star.container.XNamed
* @see com.sun.star.lang.XComponent
* @see com.sun.star.lang.XEventListener
diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleCell.java b/qadevOOo/tests/java/mod/_sc/ScAccessibleCell.java
index 14f880c..aabc77c 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAccessibleCell.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleCell.java
@@ -84,7 +84,7 @@ public class ScAccessibleCell extends TestCase {
* @param log writer to log information while testing
*
* @see TestEnvironment
- * @see #getTestEnvironment()
+ * @see #getTestEnvironment
*/
protected TestEnvironment createTestEnvironment(
TestParameters Param, PrintWriter log) {
diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvCell.java b/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvCell.java
index c4442d6..72199ee 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvCell.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvCell.java
@@ -55,7 +55,7 @@ public class ScAccessibleCsvCell extends TestCase {
* @param log writer to log information while testing
*
* @see TestEnvironment
- * @see #getTestEnvironment()
+ * @see #getTestEnvironment
*/
protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) {
XInterface oObj = null;
@@ -134,7 +134,7 @@ public class ScAccessibleCsvCell extends TestCase {
* @param Param test parameters
* @param log writer to log information while testing
*
- * @see #initializeTestCase()
+ * @see #initializeTestCase
*/
protected void initialize(TestParameters Param, PrintWriter log) {
// get a soffice factory object
diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvGrid.java b/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvGrid.java
index 37bbc9c..d8f12e4 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvGrid.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvGrid.java
@@ -54,7 +54,7 @@ public class ScAccessibleCsvGrid extends TestCase {
* @param log writer to log information while testing
*
* @see TestEnvironment
- * @see #getTestEnvironment()
+ * @see #getTestEnvironment
*/
protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) {
@@ -129,7 +129,7 @@ public class ScAccessibleCsvGrid extends TestCase {
* @param Param test parameters
* @param log writer to log information while testing
*
- * @see #initializeTestCase()
+ * @see #initializeTestCase
*/
protected void initialize(TestParameters Param, PrintWriter log) {
// get a soffice factory object
diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvRuler.java b/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvRuler.java
index 3939e43..c43c876 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvRuler.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvRuler.java
@@ -56,7 +56,7 @@ public class ScAccessibleCsvRuler extends TestCase {
* @param log writer to log information while testing
*
* @see TestEnvironment
- * @see #getTestEnvironment()
+ * @see #getTestEnvironment
*/
protected TestEnvironment createTestEnvironment(TestParameters Param,
PrintWriter log) {
@@ -158,7 +158,7 @@ public class ScAccessibleCsvRuler extends TestCase {
* @param Param test parameters
* @param log writer to log information while testing
*
- * @see #initializeTestCase()
+ * @see #initializeTestCase
*/
protected void initialize(TestParameters Param, PrintWriter log) {
// get a soffice factory object
diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleDocument.java b/qadevOOo/tests/java/mod/_sc/ScAccessibleDocument.java
index 02cdb50..e8039b3 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAccessibleDocument.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleDocument.java
@@ -73,7 +73,7 @@ public class ScAccessibleDocument extends TestCase {
* @param log writer to log information while testing
*
* @see TestEnvironment
- * @see #getTestEnvironment()
+ * @see #getTestEnvironment
*/
protected TestEnvironment createTestEnvironment(
TestParameters Param, PrintWriter log) {
@@ -128,7 +128,7 @@ public class ScAccessibleDocument extends TestCase {
* @param Param test parameters
* @param log writer to log information while testing
*
- * @see #initializeTestCase()
+ * @see #initializeTestCase
*/
protected void initialize(TestParameters Param, PrintWriter log) {
// get a soffice factory object
diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleDocumentPagePreview.java b/qadevOOo/tests/java/mod/_sc/ScAccessibleDocumentPagePreview.java
index 9ff5271..03806dd 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAccessibleDocumentPagePreview.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleDocumentPagePreview.java
@@ -81,7 +81,7 @@ public class ScAccessibleDocumentPagePreview extends TestCase {
* @param log writer to log information while testing
*
* @see TestEnvironment
- * @see #getTestEnvironment()
+ * @see #getTestEnvironment
*/
protected TestEnvironment createTestEnvironment(
TestParameters Param, PrintWriter log) {
@@ -204,7 +204,7 @@ public class ScAccessibleDocumentPagePreview extends TestCase {
* @param Param test parameters
* @param log writer to log information while testing
*
- * @see #initializeTestCase()
+ * @see #initializeTestCase
*/
protected void initialize(TestParameters Param, PrintWriter log) {
// get a soffice factory object
diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeader.java b/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeader.java
index 11aeeec..d4e90be 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeader.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeader.java
@@ -85,7 +85,7 @@ public class ScAccessiblePageHeader extends TestCase {
* @param log writer to log information while testing
*
* @see TestEnvironment
- * @see #getTestEnvironment()
+ * @see #getTestEnvironment
*/
protected TestEnvironment createTestEnvironment(
TestParameters Param, PrintWriter log) {
@@ -248,7 +248,7 @@ public class ScAccessiblePageHeader extends TestCase {
* @param Param test parameters
* @param log writer to log information while testing
*
- * @see #initializeTestCase()
+ * @see #initializeTestCase
*/
protected void initialize(TestParameters Param, PrintWriter log) {
// get a soffice factory object
diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeaderArea.java b/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeaderArea.java
index f1a9517..e1b5019 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeaderArea.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeaderArea.java
@@ -82,7 +82,7 @@ public class ScAccessiblePageHeaderArea extends TestCase {
* @param log writer to log information while testing
*
* @see TestEnvironment
- * @see #getTestEnvironment()
+ * @see #getTestEnvironment
*/
protected TestEnvironment createTestEnvironment(
TestParameters Param, PrintWriter log) {
@@ -199,7 +199,7 @@ public class ScAccessiblePageHeaderArea extends TestCase {
* @param Param test parameters
* @param log writer to log information while testing
*
- * @see #initializeTestCase()
+ * @see #initializeTestCase
*/
protected void initialize(TestParameters Param, PrintWriter log) {
// get a soffice factory object
diff --git a/qadevOOo/tests/java/mod/_sch/AccessibleDocumentView.java b/qadevOOo/tests/java/mod/_sch/AccessibleDocumentView.java
index e223b8c..4e5e83c 100644
--- a/qadevOOo/tests/java/mod/_sch/AccessibleDocumentView.java
+++ b/qadevOOo/tests/java/mod/_sch/AccessibleDocumentView.java
@@ -105,7 +105,7 @@ public class AccessibleDocumentView extends TestCase {
* @param Param test parameters
* @param log writer to log information while testing
*
- * @see #initializeTestCase()
+ * @see #initializeTestCase
*/
protected void initialize(TestParameters Param, PrintWriter log) {
log.println( "creating a text document" );
diff --git a/qadevOOo/tests/java/mod/_sd/AccessibleDrawDocumentView.java b/qadevOOo/tests/java/mod/_sd/AccessibleDrawDocumentView.java
index 28742ec..17a7800 100644
--- a/qadevOOo/tests/java/mod/_sd/AccessibleDrawDocumentView.java
+++ b/qadevOOo/tests/java/mod/_sd/AccessibleDrawDocumentView.java
@@ -60,7 +60,7 @@ public class AccessibleDrawDocumentView extends TestCase {
* @param log writer to log information while testing
*
* @see TestEnvironment
- * @see #getTestEnvironment()
+ * @see #getTestEnvironment
*/
protected TestEnvironment createTestEnvironment
(TestParameters Param, PrintWriter log) {
@@ -150,7 +150,7 @@ public class AccessibleDrawDocumentView extends TestCase {
* @param Param test parameters
* @param log writer to log information while testing
*
- * @see #initializeTestCase()
+ * @see #initializeTestCase
*/
protected void initialize(TestParameters Param, PrintWriter log) {
// get a soffice factory object
diff --git a/qadevOOo/tests/java/mod/_sd/AccessibleOutlineView.java b/qadevOOo/tests/java/mod/_sd/AccessibleOutlineView.java
index fc00799..5225a05 100644
--- a/qadevOOo/tests/java/mod/_sd/AccessibleOutlineView.java
+++ b/qadevOOo/tests/java/mod/_sd/AccessibleOutlineView.java
@@ -58,7 +58,7 @@ public class AccessibleOutlineView extends TestCase {
* @param log writer to log information while testing
*
* @see TestEnvironment
- * @see #getTestEnvironment()
+ * @see #getTestEnvironment
*/
protected TestEnvironment createTestEnvironment
(TestParameters Param, PrintWriter log) {
@@ -115,7 +115,7 @@ public class AccessibleOutlineView extends TestCase {
* @param Param test parameters
* @param log writer to log information while testing
*
- * @see #initializeTestCase()
+ * @see #initializeTestCase
*/
protected void initialize(TestParameters Param, PrintWriter log) {
// get a soffice factory object
diff --git a/qadevOOo/tests/java/mod/_sd/AccessibleSlideView.java b/qadevOOo/tests/java/mod/_sd/AccessibleSlideView.java
index fd8f253..214da23 100644
--- a/qadevOOo/tests/java/mod/_sd/AccessibleSlideView.java
+++ b/qadevOOo/tests/java/mod/_sd/AccessibleSlideView.java
@@ -58,7 +58,7 @@ public class AccessibleSlideView extends TestCase {
* @param log writer to log information while testing
*
* @see TestEnvironment
- * @see #getTestEnvironment()
+ * @see #getTestEnvironment
*/
protected TestEnvironment createTestEnvironment
(TestParameters Param, PrintWriter log) {
@@ -122,7 +122,7 @@ public class AccessibleSlideView extends TestCase {
* @param Param test parameters
* @param log writer to log information while testing
*
- * @see #initializeTestCase()
+ * @see #initializeTestCase
*/
protected void initialize(TestParameters Param, PrintWriter log) {
// get a soffice factory object
diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBox.java b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBox.java
index 4dd0968..e43a0ec 100644
--- a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBox.java
+++ b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBox.java
@@ -80,7 +80,7 @@ public class AccessibleBrowseBox extends TestCase {
* @param log writer to log information while testing
*
* @see TestEnvironment
- * @see #getTestEnvironment()
+ * @see #getTestEnvironment
*/
protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) {
diff --git a/qadevOOo/tests/java/mod/_svx/AccessibleEditableTextPara.java b/qadevOOo/tests/java/mod/_svx/AccessibleEditableTextPara.java
index 881b2d6..4c3e28f 100644
--- a/qadevOOo/tests/java/mod/_svx/AccessibleEditableTextPara.java
+++ b/qadevOOo/tests/java/mod/_svx/AccessibleEditableTextPara.java
@@ -53,7 +53,7 @@ public class AccessibleEditableTextPara extends TestCase {
* @param log writer to log information while testing
*
* @see TestEnvironment
- * @see #getTestEnvironment()
+ * @see #getTestEnvironment
*/
protected TestEnvironment createTestEnvironment(
TestParameters Param, PrintWriter log) {
@@ -119,7 +119,7 @@ public class AccessibleEditableTextPara extends TestCase {
* @param Param test parameters
* @param log writer to log information while testing
*
- * @see #initializeTestCase()
+ * @see #initializeTestCase
*/
protected void initialize(TestParameters Param, PrintWriter log) {
// get a soffice factory object
diff --git a/qadevOOo/tests/java/mod/_svx/SvxGraphCtrlAccessibleContext.java b/qadevOOo/tests/java/mod/_svx/SvxGraphCtrlAccessibleContext.java
index 794df28..4f75756 100644
--- a/qadevOOo/tests/java/mod/_svx/SvxGraphCtrlAccessibleContext.java
+++ b/qadevOOo/tests/java/mod/_svx/SvxGraphCtrlAccessibleContext.java
@@ -67,7 +67,7 @@ public class SvxGraphCtrlAccessibleContext extends TestCase{
* @param log writer to log information while testing
*
* @see TestEnvironment
- * @see #getTestEnvironment()
+ * @see #getTestEnvironment
*/
protected TestEnvironment createTestEnvironment(
TestParameters Param, PrintWriter log) {
@@ -212,7 +212,7 @@ public class SvxGraphCtrlAccessibleContext extends TestCase{
* @param Param test parameters
* @param log writer to log information while testing
*
- * @see #initializeTestCase()
+ * @see #initializeTestCase
*/
protected void initialize(TestParameters Param, PrintWriter log) {
// get a soffice factory object
diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentPageView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentPageView.java
index aa7e2ea..2bf763e 100644
--- a/qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentPageView.java
+++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentPageView.java
@@ -59,7 +59,7 @@ public class SwAccessibleDocumentPageView extends TestCase {
* @param log writer to log information while testing
*
* @see TestEnvironment
- * @see #getTestEnvironment()
+ * @see #getTestEnvironment
*/
protected TestEnvironment createTestEnvironment(
TestParameters Param, PrintWriter log) {
@@ -178,7 +178,7 @@ public class SwAccessibleDocumentPageView extends TestCase {
* @param Param test parameters
* @param log writer to log information while testing
*
- * @see #initializeTestCase()
+ * @see #initializeTestCase
*/
protected void initialize(TestParameters Param, PrintWriter log) {
log.println( "creating a text document" );
diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentView.java
index 45b349b..b48a85f 100644
--- a/qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentView.java
+++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentView.java
@@ -63,7 +63,7 @@ public class SwAccessibleDocumentView extends TestCase {
* @param log writer to log information while testing
*
* @see TestEnvironment
- * @see #getTestEnvironment()
+ * @see #getTestEnvironment
*/
protected TestEnvironment createTestEnvironment(
TestParameters Param, PrintWriter log) {
@@ -167,7 +167,7 @@ public class SwAccessibleDocumentView extends TestCase {
* @param Param test parameters
* @param log writer to log information while testing
*
- * @see #initializeTestCase()
+ * @see #initializeTestCase
*/
protected void initialize(TestParameters Param, PrintWriter log) {
log.println( "creating a text document" );
diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleEndnoteView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleEndnoteView.java
index 9926494..fee79ae 100644
--- a/qadevOOo/tests/java/mod/_sw/SwAccessibleEndnoteView.java
+++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleEndnoteView.java
@@ -57,7 +57,7 @@ public class SwAccessibleEndnoteView extends TestCase {
* @param log writer to log information while testing
*
* @see TestEnvironment
- * @see #getTestEnvironment()
+ * @see #getTestEnvironment
*/
protected TestEnvironment createTestEnvironment(
TestParameters Param, PrintWriter log) {
@@ -172,7 +172,7 @@ public class SwAccessibleEndnoteView extends TestCase {
* @param Param test parameters
* @param log writer to log information while testing
*
- * @see #initializeTestCase()
+ * @see #initializeTestCase
*/
protected void initialize(TestParameters Param, PrintWriter log) {
log.println( "creating a text document" );
diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleFooterView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleFooterView.java
index 9ea4214..439a9df 100644
--- a/qadevOOo/tests/java/mod/_sw/SwAccessibleFooterView.java
+++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleFooterView.java
@@ -68,7 +68,7 @@ public class SwAccessibleFooterView extends TestCase {
* @param log writer to log information while testing
*
* @see TestEnvironment
- * @see #getTestEnvironment()
+ * @see #getTestEnvironment
*/
protected TestEnvironment createTestEnvironment(
TestParameters Param, PrintWriter log) {
@@ -176,7 +176,7 @@ public class SwAccessibleFooterView extends TestCase {
* @param Param test parameters
* @param log writer to log information while testing
*
- * @see #initializeTestCase()
+ * @see #initializeTestCase
*/
protected void initialize(TestParameters Param, PrintWriter log) {
log.println( "creating a text document" );
diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleFootnoteView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleFootnoteView.java
index 2eac755..4a1c921 100644
--- a/qadevOOo/tests/java/mod/_sw/SwAccessibleFootnoteView.java
+++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleFootnoteView.java
@@ -57,7 +57,7 @@ public class SwAccessibleFootnoteView extends TestCase {
* @param log writer to log information while testing
*
* @see TestEnvironment
- * @see #getTestEnvironment()
+ * @see #getTestEnvironment
*/
protected TestEnvironment createTestEnvironment(
TestParameters Param, PrintWriter log) {
@@ -173,7 +173,7 @@ public class SwAccessibleFootnoteView extends TestCase {
* @param Param test parameters
* @param log writer to log information while testing
*
- * @see #initializeTestCase()
+ * @see #initializeTestCase
*/
protected void initialize(TestParameters Param, PrintWriter log) {
log.println( "creating a text document" );
diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleHeaderView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleHeaderView.java
index 3e527aa..5443b19 100644
--- a/qadevOOo/tests/java/mod/_sw/SwAccessibleHeaderView.java
+++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleHeaderView.java
@@ -66,7 +66,7 @@ public class SwAccessibleHeaderView extends TestCase {
* @param log writer to log information while testing
*
* @see TestEnvironment
- * @see #getTestEnvironment()
+ * @see #getTestEnvironment
*/
protected TestEnvironment createTestEnvironment(
TestParameters Param, PrintWriter log) {
@@ -166,7 +166,7 @@ public class SwAccessibleHeaderView extends TestCase {
* @param Param test parameters
* @param log writer to log information while testing
*
- * @see #initializeTestCase()
+ * @see #initializeTestCase
*/
protected void initialize(TestParameters Param, PrintWriter log) {
log.println( "creating a text document" );
diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessiblePageView.java b/qadevOOo/tests/java/mod/_sw/SwAccessiblePageView.java
index 6a7f1b8..9ddfac3 100644
--- a/qadevOOo/tests/java/mod/_sw/SwAccessiblePageView.java
+++ b/qadevOOo/tests/java/mod/_sw/SwAccessiblePageView.java
@@ -66,7 +66,7 @@ public class SwAccessiblePageView extends TestCase {
* @param log writer to log information while testing
*
* @see TestEnvironment
- * @see #getTestEnvironment()
+ * @see #getTestEnvironment
*/
protected TestEnvironment createTestEnvironment(
TestParameters Param, PrintWriter log) {
@@ -246,7 +246,7 @@ public class SwAccessiblePageView extends TestCase {
* @param Param test parameters
* @param log writer to log information while testing
*
- * @see #initializeTestCase()
+ * @see #initializeTestCase
*/
protected void initialize(TestParameters Param, PrintWriter log) {
log.println( "creating a text document" );
diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleParagraphView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleParagraphView.java
index 8e48769..a6b7d15 100644
--- a/qadevOOo/tests/java/mod/_sw/SwAccessibleParagraphView.java
+++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleParagraphView.java
@@ -57,7 +57,7 @@ public class SwAccessibleParagraphView extends TestCase {
* @param log writer to log information while testing
*
* @see TestEnvironment
- * @see #getTestEnvironment()
+ * @see #getTestEnvironment
*/
protected TestEnvironment createTestEnvironment(
TestParameters Param, PrintWriter log) {
@@ -119,7 +119,7 @@ public class SwAccessibleParagraphView extends TestCase {
* @param Param test parameters
* @param log writer to log information while testing
*
- * @see #initializeTestCase()
+ * @see #initializeTestCase
*/
protected void initialize(TestParameters Param, PrintWriter log) {
log.println( "creating a text document" );
diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleTableCellView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleTableCellView.java
index 07c6c2c..2404af5 100644
--- a/qadevOOo/tests/java/mod/_sw/SwAccessibleTableCellView.java
+++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleTableCellView.java
@@ -61,7 +61,7 @@ public class SwAccessibleTableCellView extends TestCase {
* @param log writer to log information while testing
*
* @see TestEnvironment
- * @see #getTestEnvironment()
+ * @see #getTestEnvironment
*/
protected TestEnvironment createTestEnvironment(TestParameters Param,
PrintWriter log) {
@@ -135,7 +135,7 @@ public class SwAccessibleTableCellView extends TestCase {
* @param Param test parameters
* @param log writer to log information while testing
*
- * @see #initializeTestCase()
+ * @see #initializeTestCase
*/
protected void initialize(TestParameters Param, PrintWriter log) {
log.println("creating a text document");
diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleTableView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleTableView.java
index 3b19117..184814c 100644
--- a/qadevOOo/tests/java/mod/_sw/SwAccessibleTableView.java
+++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleTableView.java
@@ -63,7 +63,7 @@ public class SwAccessibleTableView extends TestCase {
* @param log writer to log information while testing
*
* @see TestEnvironment
- * @see #getTestEnvironment()
+ * @see #getTestEnvironment
*/
protected TestEnvironment createTestEnvironment(
TestParameters Param, PrintWriter log) {
@@ -152,7 +152,7 @@ public class SwAccessibleTableView extends TestCase {
* @param Param test parameters
* @param log writer to log information while testing
*
- * @see #initializeTestCase()
+ * @see #initializeTestCase
*/
protected void initialize(TestParameters Param, PrintWriter log) {
log.println( "creating a text document" );
diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleTextEmbeddedObject.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleTextEmbeddedObject.java
index 9184f0b..e5c1776 100644
--- a/qadevOOo/tests/java/mod/_sw/SwAccessibleTextEmbeddedObject.java
+++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleTextEmbeddedObject.java
@@ -59,7 +59,7 @@ public class SwAccessibleTextEmbeddedObject extends TestCase {
* @param log writer to log information while testing
*
* @see TestEnvironment
- * @see #getTestEnvironment()
+ * @see #getTestEnvironment
*/
protected TestEnvironment createTestEnvironment(
TestParameters Param, PrintWriter log) {
@@ -132,7 +132,7 @@ public class SwAccessibleTextEmbeddedObject extends TestCase {
* @param Param test parameters
* @param log writer to log information while testing
*
- * @see #initializeTestCase()
+ * @see #initializeTestCase
*/
protected void initialize(TestParameters Param, PrintWriter log) {
log.println( "open a text document" );
diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleTextFrameView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleTextFrameView.java
index d383419..8c78416 100644
--- a/qadevOOo/tests/java/mod/_sw/SwAccessibleTextFrameView.java
+++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleTextFrameView.java
@@ -67,7 +67,7 @@ public class SwAccessibleTextFrameView extends TestCase {
* @param log writer to log information while testing
*
* @see TestEnvironment
- * @see #getTestEnvironment()
+ * @see #getTestEnvironment
*/
protected TestEnvironment createTestEnvironment(
TestParameters Param, PrintWriter log) {
@@ -164,7 +164,7 @@ public class SwAccessibleTextFrameView extends TestCase {
* @param Param test parameters
* @param log writer to log information while testing
*
- * @see #initializeTestCase()
+ * @see #initializeTestCase
*/
protected void initialize(TestParameters Param, PrintWriter log) {
log.println( "creating a text document" );
diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleTextGraphicObject.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleTextGraphicObject.java
index cbb73f1..a1f1ae2 100644
--- a/qadevOOo/tests/java/mod/_sw/SwAccessibleTextGraphicObject.java
+++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleTextGraphicObject.java
@@ -65,7 +65,7 @@ public class SwAccessibleTextGraphicObject extends TestCase {
* @param log writer to log information while testing
*
* @see TestEnvironment
- * @see #getTestEnvironment()
+ * @see #getTestEnvironment
*/
protected TestEnvironment createTestEnvironment(
TestParameters Param, PrintWriter log) {
@@ -154,7 +154,7 @@ public class SwAccessibleTextGraphicObject extends TestCase {
* @param Param test parameters
* @param log writer to log information while testing
*
- * @see #initializeTestCase()
+ * @see #initializeTestCase
*/
protected void initialize(TestParameters Param, PrintWriter log) {
log.println( "creating a text document" );
commit 9dc3b1bf6120e958e1a943a9c3c8432302bd25e3
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Aug 28 16:05:41 2012 +0200
Simplify/remove some methods named "dropTable"
Change-Id: Icbebe81fec6ce0b39946dec00f57471b2cafd5e1
diff --git a/connectivity/qa/connectivity/tools/FlatFileDatabase.java b/connectivity/qa/connectivity/tools/FlatFileDatabase.java
index 5af55c6..e45f471 100644
--- a/connectivity/qa/connectivity/tools/FlatFileDatabase.java
+++ b/connectivity/qa/connectivity/tools/FlatFileDatabase.java
@@ -89,17 +89,6 @@ class FlatFileDatabase extends AbstractDatabase
storable.storeAsURL( m_databaseDocumentFile, new PropertyValue[] { } );
}
- /** drops the table with a given name
-
- @param _name
- the name of the table to drop
- */
- public void dropTable(final String _name) throws SQLException
- {
- String dropStatement = "DROP TABLE \"" + _name;
- executeSQL(dropStatement);
- }
-
final String m_urlSubScheme;
File m_tableFileLocation = null;
}
diff --git a/connectivity/qa/connectivity/tools/HsqlDatabase.java b/connectivity/qa/connectivity/tools/HsqlDatabase.java
index 4a733ef..851d0e3 100644
--- a/connectivity/qa/connectivity/tools/HsqlDatabase.java
+++ b/connectivity/qa/connectivity/tools/HsqlDatabase.java
@@ -81,17 +81,12 @@ public class HsqlDatabase extends AbstractDatabase
@param _name
the name of the table to drop
- @param _ifExists
- TRUE if it should be dropped only when it exists.
*/
- public void dropTable(final String _name, final boolean _ifExists) throws SQLException
+ private void dropTable(final String _name) throws SQLException
{
final StringBuffer dropStatement = new StringBuffer("DROP TABLE \"");
dropStatement.append(_name);
- if (_ifExists)
- {
- dropStatement.append("\" IF EXISTS");
- }
+ dropStatement.append("\" IF EXISTS");
executeSQL(dropStatement.toString());
}
@@ -99,7 +94,7 @@ public class HsqlDatabase extends AbstractDatabase
{
if (_dropIfExists)
{
- dropTable(_tableDesc.getName(), true);
+ dropTable(_tableDesc.getName());
}
createTable(_tableDesc);
}
diff --git a/odk/examples/DevelopersGuide/Forms/HsqlDatabase.java b/odk/examples/DevelopersGuide/Forms/HsqlDatabase.java
index 1b8a9e1..b0c2687 100644
--- a/odk/examples/DevelopersGuide/Forms/HsqlDatabase.java
+++ b/odk/examples/DevelopersGuide/Forms/HsqlDatabase.java
@@ -210,21 +210,6 @@ public class HsqlDatabase
return (XModel)UnoRuntime.queryInterface( XModel.class, m_databaseDocument );
}
- /** drops the table with a given name
-
- @param _name
- the name of the table to drop
- @param _ifExists
- TRUE if it should be dropped only when it exists.
- */
- public void dropTable( String _name, boolean _ifExists ) throws SQLException
- {
- String dropStatement = "DROP TABLE \"" + _name;
- if ( _ifExists )
- dropStatement += "\" IF EXISTS";
- executeSQL( dropStatement );
- }
-
/** returns the URL of the ODB document represented by this instance
*/
public String getDocumentURL()
commit 05f7bb2e3eba3cdf0098b63e9431c76001738794
Author: Noel Grandin <noel at peralex.com>
Date: Tue Aug 21 09:11:31 2012 +0200
Java cleanup - remove unused parameters and fields
Change-Id: I4e9a27ce0b5f6d782034306afadb1b9d0ed9a2ba
diff --git a/accessibility/bridge/org/openoffice/accessibility/AccessBridge.java b/accessibility/bridge/org/openoffice/accessibility/AccessBridge.java
index 6b6911d..f9b56fe 100644
--- a/accessibility/bridge/org/openoffice/accessibility/AccessBridge.java
+++ b/accessibility/bridge/org/openoffice/accessibility/AccessBridge.java
@@ -120,7 +120,7 @@ public class AccessBridge {
if (implName.equals(AccessBridge.class.getName())) {
// Initialize toolkit to register at Java <-> Windows access bridge
- java.awt.Toolkit tk = java.awt.Toolkit.getDefaultToolkit();
+ java.awt.Toolkit.getDefaultToolkit();
xSingleServiceFactory = FactoryHelper.getServiceFactory(_AccessBridge.class,
_AccessBridge._serviceName, multiFactory, regKey);
diff --git a/connectivity/qa/connectivity/tools/AbstractDatabase.java b/connectivity/qa/connectivity/tools/AbstractDatabase.java
index 5890829..c389508 100644
--- a/connectivity/qa/connectivity/tools/AbstractDatabase.java
+++ b/connectivity/qa/connectivity/tools/AbstractDatabase.java
@@ -167,7 +167,7 @@ public abstract class AbstractDatabase implements DatabaseAccess
final XDocumentDataSource dataSource = UnoRuntime.queryInterface( XDocumentDataSource.class, dbContext.getByName( _docURL ) );
m_databaseDocument = dataSource.getDatabaseDocument();
- m_dataSource = new DataSource(m_orb, m_databaseDocument.getDataSource());
+ m_dataSource = new DataSource(m_databaseDocument.getDataSource());
}
/** returns the URL of the ODB document represented by this instance
diff --git a/connectivity/qa/connectivity/tools/CRMDatabase.java b/connectivity/qa/connectivity/tools/CRMDatabase.java
index 68acdfb..5769a00 100644
--- a/connectivity/qa/connectivity/tools/CRMDatabase.java
+++ b/connectivity/qa/connectivity/tools/CRMDatabase.java
@@ -44,7 +44,6 @@ public class CRMDatabase
private static final String VARCHAR50 = "VARCHAR(50)";
private final XMultiServiceFactory m_orb;
private final HsqlDatabase m_database;
- private final DataSource m_dataSource;
private final Connection m_connection;
/** constructs the CRM database
@@ -54,7 +53,6 @@ public class CRMDatabase
m_orb = _orb;
m_database = new HsqlDatabase( m_orb );
- m_dataSource = m_database.getDataSource();
if ( _withUI )
{
@@ -87,7 +85,6 @@ public class CRMDatabase
m_orb = _orb;
m_database = new HsqlDatabase( m_orb, _existingDocumentURL );
- m_dataSource = m_database.getDataSource();
m_connection = m_database.defaultConnection();
}
diff --git a/connectivity/qa/connectivity/tools/DataSource.java b/connectivity/qa/connectivity/tools/DataSource.java
index 36b62cd..6b6048c 100644
--- a/connectivity/qa/connectivity/tools/DataSource.java
+++ b/connectivity/qa/connectivity/tools/DataSource.java
@@ -36,22 +36,18 @@ public class DataSource
{
// the service factory
- private final XMultiServiceFactory m_orb;
private XDataSource m_dataSource;
public DataSource(final XMultiServiceFactory _orb, final String _registeredName) throws Exception
{
- m_orb = _orb;
-
final XNameAccess dbContext = UnoRuntime.queryInterface(
XNameAccess.class, _orb.createInstance( "com.sun.star.sdb.DatabaseContext" ) );
m_dataSource = UnoRuntime.queryInterface( XDataSource.class, dbContext.getByName( _registeredName ) );
}
- public DataSource(final XMultiServiceFactory _orb,final XDataSource _dataSource)
+ public DataSource(final XDataSource _dataSource)
{
- m_orb = _orb;
m_dataSource = _dataSource;
}
diff --git a/connectivity/qa/connectivity/tools/FlatFileDatabase.java b/connectivity/qa/connectivity/tools/FlatFileDatabase.java
index eeb326b..5af55c6 100644
--- a/connectivity/qa/connectivity/tools/FlatFileDatabase.java
+++ b/connectivity/qa/connectivity/tools/FlatFileDatabase.java
@@ -80,7 +80,7 @@ class FlatFileDatabase extends AbstractDatabase
m_databaseDocument = UnoRuntime.queryInterface( XOfficeDatabaseDocument.class,
m_orb.createInstance("com.sun.star.sdb.OfficeDatabaseDocument"));
- m_dataSource = new DataSource(m_orb, m_databaseDocument.getDataSource());
+ m_dataSource = new DataSource(m_databaseDocument.getDataSource());
final XPropertySet dsProperties = UnoRuntime.queryInterface(XPropertySet.class, m_databaseDocument.getDataSource());
dsProperties.setPropertyValue("URL", "sdbc:" + m_urlSubScheme + ":" + path);
@@ -93,10 +93,8 @@ class FlatFileDatabase extends AbstractDatabase
@param _name
the name of the table to drop
- @param _ifExists
- TRUE if it should be dropped only when it exists.
*/
- public void dropTable(final String _name,final boolean _ifExists) throws SQLException
+ public void dropTable(final String _name) throws SQLException
{
String dropStatement = "DROP TABLE \"" + _name;
executeSQL(dropStatement);
diff --git a/connectivity/qa/connectivity/tools/HsqlDatabase.java b/connectivity/qa/connectivity/tools/HsqlDatabase.java
index f2ad47b..4a733ef 100644
--- a/connectivity/qa/connectivity/tools/HsqlDatabase.java
+++ b/connectivity/qa/connectivity/tools/HsqlDatabase.java
@@ -66,7 +66,7 @@ public class HsqlDatabase extends AbstractDatabase
m_databaseDocument = UnoRuntime.queryInterface(
XOfficeDatabaseDocument.class, m_orb.createInstance("com.sun.star.sdb.OfficeDatabaseDocument"));
- m_dataSource = new DataSource(m_orb, m_databaseDocument.getDataSource());
+ m_dataSource = new DataSource(m_databaseDocument.getDataSource());
final XPropertySet dsProperties = UnoRuntime.queryInterface(XPropertySet.class, m_databaseDocument.getDataSource());
dsProperties.setPropertyValue("URL", "sdbc:embedded:hsqldb");
commit 938506285925f27ac6b94c076e81ca7c7303be58
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Aug 28 15:43:56 2012 +0200
Make it clearer that previous change was sound
Change-Id: I0f2440b39e7b99b207755779a82bbeec164de278
diff --git a/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WseHeader.java b/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WseHeader.java
index cd4a125..bf4b752 100644
--- a/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WseHeader.java
+++ b/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WseHeader.java
@@ -109,12 +109,10 @@ class WseHeader extends Wse {
* @return A <code>byte</code> array representing this element.
*/
byte[] getBytes() {
- DataOutputStream os; // Used for storing the data
- ByteArrayOutputStream bs = null; // Used for storing the data
+ ByteArrayOutputStream bs = new ByteArrayOutputStream();
+ DataOutputStream os = new DataOutputStream(bs);
try {
- bs = new ByteArrayOutputStream();
- os = new DataOutputStream(bs);
os.write(2); // binary doc indicator
os.write(4); // binary header indicator
commit 4e2c95c786ecd5931e6fb7f2ceda5c203350f305
Author: Noel Grandin <noel at peralex.com>
Date: Tue Aug 21 09:07:44 2012 +0200
Java cleanup - remove unnecessary null checks
Change-Id: I72a847b1180e9aeb8dec18bcaedee7286eee7754
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/List.java b/accessibility/bridge/org/openoffice/java/accessibility/List.java
index ae6dd02..cfa9e19 100644
--- a/accessibility/bridge/org/openoffice/java/accessibility/List.java
+++ b/accessibility/bridge/org/openoffice/java/accessibility/List.java
@@ -253,10 +253,8 @@ public class List extends DescendantManager implements javax.accessibility.Acces
XAccessibleContext xAccessibleContext = unoAccessible.getAccessibleContext();
if (xAccessibleContext != null) {
javax.accessibility.AccessibleContext ac = new AccessibleListItem(xAccessibleContext);
- if (ac != null) {
- ac.setAccessibleParent(List.this);
- accessibleContext = ac;
- }
+ ac.setAccessibleParent(List.this);
+ accessibleContext = ac;
AccessibleStateAdapter.setComponentState(this, xAccessibleContext.getAccessibleStateSet());
}
} catch (com.sun.star.uno.RuntimeException e) {
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/Table.java b/accessibility/bridge/org/openoffice/java/accessibility/Table.java
index 2e587f2..5896082 100644
--- a/accessibility/bridge/org/openoffice/java/accessibility/Table.java
+++ b/accessibility/bridge/org/openoffice/java/accessibility/Table.java
@@ -478,11 +478,9 @@ public class Table extends DescendantManager implements javax.accessibility.Acce
try {
XAccessibleContext xAccessibleContext = unoAccessible.getAccessibleContext();
if (xAccessibleContext != null) {
- javax.accessibility.AccessibleContext ac = new AccessibleTableCell(xAccessibleContext);
- if (ac != null) {
- ac.setAccessibleParent(Table.this);
- accessibleContext = ac;
- }
+ javax.accessibility.AccessibleContext ac = new AccessibleTableCell(xAccessibleContext);
+ ac.setAccessibleParent(Table.this);
+ accessibleContext = ac;
}
} catch (com.sun.star.uno.RuntimeException e) {
}
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/Tree.java b/accessibility/bridge/org/openoffice/java/accessibility/Tree.java
index 1291f55..a0a59c9 100644
--- a/accessibility/bridge/org/openoffice/java/accessibility/Tree.java
+++ b/accessibility/bridge/org/openoffice/java/accessibility/Tree.java
@@ -490,11 +490,9 @@ public class Tree extends DescendantManager implements javax.accessibility.Acces
try {
XAccessibleContext xAccessibleContext = unoAccessible.getAccessibleContext();
if (xAccessibleContext != null) {
- javax.accessibility.AccessibleContext ac = new AccessibleTreeItem(xAccessibleContext);
- if (ac != null) {
- ac.setAccessibleParent(Tree.this);
- accessibleContext = ac;
- }
+ javax.accessibility.AccessibleContext ac = new AccessibleTreeItem(xAccessibleContext);
+ ac.setAccessibleParent(Tree.this);
+ accessibleContext = ac;
}
} catch (com.sun.star.uno.RuntimeException e) {
}
diff --git a/odk/source/com/sun/star/lib/loader/InstallationFinder.java b/odk/source/com/sun/star/lib/loader/InstallationFinder.java
index 6b2860f..e220ede 100644
--- a/odk/source/com/sun/star/lib/loader/InstallationFinder.java
+++ b/odk/source/com/sun/star/lib/loader/InstallationFinder.java
@@ -350,12 +350,10 @@ final class InstallationFinder {
"reading which command output failed: " + e );
return null;
} finally {
- if ( br != null ) {
- try {
- br.close();
- } catch ( IOException e ) {
- // closing standard input stream failed, ignore
- }
+ try {
+ br.close();
+ } catch ( IOException e ) {
+ // closing standard input stream failed, ignore
}
}
diff --git a/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WseHeader.java b/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WseHeader.java
index c620f21..cd4a125 100644
--- a/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WseHeader.java
+++ b/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WseHeader.java
@@ -127,9 +127,7 @@ class WseHeader extends Wse {
e.printStackTrace();
}
- if (bs != null) {
- return bs.toByteArray();
- } else return null;
+ return bs.toByteArray();
}
}
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java
index c1ab7f9..d51dcfe 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java
@@ -510,106 +510,107 @@ public abstract class OfficeDocument
throw new OfficeDocumentException(ex);
}
- if (isZip)
- {
+ if (isZip) {
read(is);
- }
- else{
- try{
- Reader r = secondHack(is);
- InputSource ins = new InputSource(r);
- org.w3c.dom.Document newDoc = builder.parse(ins);
- Element rootElement=newDoc.getDocumentElement();
-
- NodeList nodeList;
- Node tmpNode;
- Node rootNode = rootElement;
- if (newDoc !=null){
- /*content*/
- contentDoc = createDOM(TAG_OFFICE_DOCUMENT_CONTENT);
- rootElement=contentDoc.getDocumentElement();
- rootNode = rootElement;
-
- // FIX (HJ): Include office:font-decls in content DOM
- nodeList= newDoc.getElementsByTagName(TAG_OFFICE_FONT_DECLS);
- if (nodeList.getLength()>0){
- tmpNode = contentDoc.importNode(nodeList.item(0),true);
- rootNode.appendChild(tmpNode);
- }
-
- nodeList= newDoc.getElementsByTagName(TAG_OFFICE_AUTOMATIC_STYLES);
- if (nodeList.getLength()>0){
- tmpNode = contentDoc.importNode(nodeList.item(0),true);
- rootNode.appendChild(tmpNode);
- }
-
- nodeList= newDoc.getElementsByTagName(TAG_OFFICE_BODY);
- if (nodeList.getLength()>0){
- tmpNode = contentDoc.importNode(nodeList.item(0),true);
- rootNode.appendChild(tmpNode);
- }
-
- /*Styles*/
- styleDoc = createDOM(TAG_OFFICE_DOCUMENT_STYLES);
- rootElement=styleDoc.getDocumentElement();
- rootNode = rootElement;
-
- // FIX (HJ): Include office:font-decls in styles DOM
- nodeList= newDoc.getElementsByTagName(TAG_OFFICE_FONT_DECLS);
- if (nodeList.getLength()>0){
- tmpNode = styleDoc.importNode(nodeList.item(0),true);
- rootNode.appendChild(tmpNode);
- }
-
- nodeList= newDoc.getElementsByTagName(TAG_OFFICE_STYLES);
- if (nodeList.getLength()>0){
- tmpNode = styleDoc.importNode(nodeList.item(0),true);
- rootNode.appendChild(tmpNode);
- }
-
- // FIX (HJ): Include office:automatic-styles in styles DOM
- nodeList= newDoc.getElementsByTagName(TAG_OFFICE_AUTOMATIC_STYLES);
- if (nodeList.getLength()>0){
- tmpNode = styleDoc.importNode(nodeList.item(0),true);
- rootNode.appendChild(tmpNode);
- }
-
- // FIX (HJ): Include office:master-styles in styles DOM
- nodeList= newDoc.getElementsByTagName(TAG_OFFICE_MASTER_STYLES);
- if (nodeList.getLength()>0){
- tmpNode = styleDoc.importNode(nodeList.item(0),true);
- rootNode.appendChild(tmpNode);
- }
-
- /*Settings*/
- settingsDoc = createDOM(TAG_OFFICE_DOCUMENT_SETTINGS);
- rootElement=settingsDoc.getDocumentElement();
- rootNode = rootElement;
- nodeList= newDoc.getElementsByTagName(TAG_OFFICE_SETTINGS);
- if (nodeList.getLength()>0){
- tmpNode = settingsDoc.importNode(nodeList.item(0),true);
- rootNode.appendChild(tmpNode);
- }
- /*Meta*/
- metaDoc = createDOM(TAG_OFFICE_DOCUMENT_META);
- rootElement=metaDoc.getDocumentElement();
- rootNode = rootElement;
- nodeList= newDoc.getElementsByTagName(TAG_OFFICE_META);
- if (nodeList.getLength()>0){
- tmpNode = metaDoc.importNode(nodeList.item(0),true);
- rootNode.appendChild(tmpNode);
- }
+ } else {
+ try {
+ Reader r = secondHack(is);
+ InputSource ins = new InputSource(r);
+ org.w3c.dom.Document newDoc = builder.parse(ins);
+ Element rootElement = newDoc.getDocumentElement();
+
+ NodeList nodeList;
+ Node tmpNode;
+ Node rootNode = rootElement;
+
+ /* content */
+ contentDoc = createDOM(TAG_OFFICE_DOCUMENT_CONTENT);
+ rootElement = contentDoc.getDocumentElement();
+ rootNode = rootElement;
+
+ // FIX (HJ): Include office:font-decls in content DOM
+ nodeList = newDoc
+ .getElementsByTagName(TAG_OFFICE_FONT_DECLS);
+ if (nodeList.getLength() > 0) {
+ tmpNode = contentDoc.importNode(nodeList.item(0), true);
+ rootNode.appendChild(tmpNode);
}
+
+ nodeList = newDoc
+ .getElementsByTagName(TAG_OFFICE_AUTOMATIC_STYLES);
+ if (nodeList.getLength() > 0) {
+ tmpNode = contentDoc.importNode(nodeList.item(0), true);
+ rootNode.appendChild(tmpNode);
+ }
+
+ nodeList = newDoc.getElementsByTagName(TAG_OFFICE_BODY);
+ if (nodeList.getLength() > 0) {
+ tmpNode = contentDoc.importNode(nodeList.item(0), true);
+ rootNode.appendChild(tmpNode);
+ }
+
+ /* Styles */
+ styleDoc = createDOM(TAG_OFFICE_DOCUMENT_STYLES);
+ rootElement = styleDoc.getDocumentElement();
+ rootNode = rootElement;
+
+ // FIX (HJ): Include office:font-decls in styles DOM
+ nodeList = newDoc
+ .getElementsByTagName(TAG_OFFICE_FONT_DECLS);
+ if (nodeList.getLength() > 0) {
+ tmpNode = styleDoc.importNode(nodeList.item(0), true);
+ rootNode.appendChild(tmpNode);
+ }
+
+ nodeList = newDoc.getElementsByTagName(TAG_OFFICE_STYLES);
+ if (nodeList.getLength() > 0) {
+ tmpNode = styleDoc.importNode(nodeList.item(0), true);
+ rootNode.appendChild(tmpNode);
+ }
+
+ // FIX (HJ): Include office:automatic-styles in styles DOM
+ nodeList = newDoc
+ .getElementsByTagName(TAG_OFFICE_AUTOMATIC_STYLES);
+ if (nodeList.getLength() > 0) {
+ tmpNode = styleDoc.importNode(nodeList.item(0), true);
+ rootNode.appendChild(tmpNode);
+ }
+
+ // FIX (HJ): Include office:master-styles in styles DOM
+ nodeList = newDoc
+ .getElementsByTagName(TAG_OFFICE_MASTER_STYLES);
+ if (nodeList.getLength() > 0) {
+ tmpNode = styleDoc.importNode(nodeList.item(0), true);
+ rootNode.appendChild(tmpNode);
+ }
+
+ /* Settings */
+ settingsDoc = createDOM(TAG_OFFICE_DOCUMENT_SETTINGS);
+ rootElement = settingsDoc.getDocumentElement();
+ rootNode = rootElement;
+ nodeList = newDoc.getElementsByTagName(TAG_OFFICE_SETTINGS);
+ if (nodeList.getLength() > 0) {
+ tmpNode = settingsDoc
+ .importNode(nodeList.item(0), true);
+ rootNode.appendChild(tmpNode);
+ }
+ /* Meta */
+ metaDoc = createDOM(TAG_OFFICE_DOCUMENT_META);
+ rootElement = metaDoc.getDocumentElement();
+ rootNode = rootElement;
+ nodeList = newDoc.getElementsByTagName(TAG_OFFICE_META);
+ if (nodeList.getLength() > 0) {
+ tmpNode = metaDoc.importNode(nodeList.item(0), true);
+ rootNode.appendChild(tmpNode);
+ }
+ } catch (SAXException ex) {
+ throw new OfficeDocumentException(ex);
+ }
}
- catch (SAXException ex) {
- throw new OfficeDocumentException(ex);
- }
- }
}
-
/**
* Parse given <code>byte</code> array into a DOM
* <code>Document</code> object using the
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java
index 911e6a6..a347280 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java
@@ -100,89 +100,113 @@ public final class DocumentSerializerImpl
* @throws IOException If any I/O error occurs.
*/
public ConvertData serialize() throws ConvertException, IOException {
- String docName = sxwDoc.getName();
- org.w3c.dom.Document domDoc = sxwDoc.getContentDOM();
- org.w3c.dom.Document metaDoc = sxwDoc.getMetaDOM();
- org.w3c.dom.Document styleDoc = sxwDoc.getStyleDOM();
- ByteArrayOutputStream baos= new ByteArrayOutputStream();
- ConvertData cd = new ConvertData();
- Node offnode = domDoc.getDocumentElement();
- if (!(offnode.getNodeName()).equals("office:document")){
- try{
- DocumentBuilderFactory builderFactory = DocumentBuilderFactory.newInstance();
- DocumentBuilder builder= builderFactory.newDocumentBuilder();
- DOMImplementation domImpl = builder.getDOMImplementation();
- DocumentType docType =domImpl.createDocumentType("office:document","-//OpenOffice.org//DTD OfficeDocument 1.0//EN",null);
- org.w3c.dom.Document newDoc = domImpl.createDocument("http://openoffice.org/2000/office","office:document",docType);
-
-
- Element rootElement=newDoc.getDocumentElement();
- rootElement.setAttribute("xmlns:office","http://openoffice.org/2000/office");
- rootElement.setAttribute("xmlns:style","http://openoffice.org/2000/style" );
- rootElement.setAttribute("xmlns:text","http://openoffice.org/2000/text");
- rootElement.setAttribute("xmlns:table","http://openoffice.org/2000/table");
-
- rootElement.setAttribute("xmlns:draw","http://openoffice.org/2000/drawing");
- rootElement.setAttribute("xmlns:fo","http://www.w3.org/1999/XSL/Format" );
- rootElement.setAttribute("xmlns:xlink","http://www.w3.org/1999/xlink" );
- rootElement.setAttribute("xmlns:dc","http://purl.org/dc/elements/1.1/" );
- rootElement.setAttribute("xmlns:meta","http://openoffice.org/2000/meta" );
- rootElement.setAttribute("xmlns:number","http://openoffice.org/2000/datastyle" );
- rootElement.setAttribute("xmlns:svg","http://www.w3.org/2000/svg" );
- rootElement.setAttribute("xmlns:chart","http://openoffice.org/2000/chart" );
- rootElement.setAttribute("xmlns:dr3d","http://openoffice.org/2000/dr3d" );
- rootElement.setAttribute("xmlns:math","http://www.w3.org/1998/Math/MathML" );
- rootElement.setAttribute("xmlns:form","http://openoffice.org/2000/form" );
- rootElement.setAttribute("xmlns:script","http://openoffice.org/2000/script" );
- rootElement.setAttribute("xmlns:config","http://openoffice.org/2001/config" );
- rootElement.setAttribute("office:class","text" );
- rootElement.setAttribute("office:version","1.0");
-
-
- NodeList nodeList;
- Node tmpNode;
- Node rootNode = rootElement;
- if (metaDoc !=null){
- nodeList= metaDoc.getElementsByTagName(TAG_OFFICE_META);
- if (nodeList.getLength()>0){
- tmpNode = newDoc.importNode(nodeList.item(0),true);
- rootNode.appendChild(tmpNode);
- }
- } if (styleDoc !=null){
- nodeList= styleDoc.getElementsByTagName(TAG_OFFICE_STYLES);
- if (nodeList.getLength()>0){
- tmpNode = newDoc.importNode(nodeList.item(0),true);
- rootNode.appendChild(tmpNode);
- }
- }if (domDoc !=null){
- nodeList= domDoc.getElementsByTagName(TAG_OFFICE_AUTOMATIC_STYLES);
- if (nodeList.getLength()>0){
- tmpNode = newDoc.importNode(nodeList.item(0),true);
- rootNode.appendChild(tmpNode);
- }
- nodeList= domDoc.getElementsByTagName(TAG_OFFICE_BODY);
- if (nodeList.getLength()>0){
- tmpNode = newDoc.importNode(nodeList.item(0),true);
- rootNode.appendChild(tmpNode);
- }
- }
- domDoc=newDoc;
- }catch(Exception e){
- System.out.println("\nAn Exception occurred with Xslt Serializer"+e);
- }
+ String docName = sxwDoc.getName();
+ org.w3c.dom.Document domDoc = sxwDoc.getContentDOM();
+ org.w3c.dom.Document metaDoc = sxwDoc.getMetaDOM();
+ org.w3c.dom.Document styleDoc = sxwDoc.getStyleDOM();
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ ConvertData cd = new ConvertData();
+ Node offnode = domDoc.getDocumentElement();
+ if (!(offnode.getNodeName()).equals("office:document")) {
+ try {
+ DocumentBuilderFactory builderFactory = DocumentBuilderFactory
+ .newInstance();
+ DocumentBuilder builder = builderFactory.newDocumentBuilder();
+ DOMImplementation domImpl = builder.getDOMImplementation();
+ DocumentType docType = domImpl.createDocumentType(
+ "office:document",
+ "-//OpenOffice.org//DTD OfficeDocument 1.0//EN", null);
+ org.w3c.dom.Document newDoc = domImpl.createDocument(
+ "http://openoffice.org/2000/office", "office:document",
+ docType);
+
+ Element rootElement = newDoc.getDocumentElement();
+ rootElement.setAttribute("xmlns:office",
+ "http://openoffice.org/2000/office");
+ rootElement.setAttribute("xmlns:style",
+ "http://openoffice.org/2000/style");
+ rootElement.setAttribute("xmlns:text",
+ "http://openoffice.org/2000/text");
+ rootElement.setAttribute("xmlns:table",
+ "http://openoffice.org/2000/table");
+
+ rootElement.setAttribute("xmlns:draw",
+ "http://openoffice.org/2000/drawing");
+ rootElement.setAttribute("xmlns:fo",
+ "http://www.w3.org/1999/XSL/Format");
+ rootElement.setAttribute("xmlns:xlink",
+ "http://www.w3.org/1999/xlink");
+ rootElement.setAttribute("xmlns:dc",
+ "http://purl.org/dc/elements/1.1/");
+ rootElement.setAttribute("xmlns:meta",
+ "http://openoffice.org/2000/meta");
+ rootElement.setAttribute("xmlns:number",
+ "http://openoffice.org/2000/datastyle");
+ rootElement.setAttribute("xmlns:svg",
+ "http://www.w3.org/2000/svg");
+ rootElement.setAttribute("xmlns:chart",
+ "http://openoffice.org/2000/chart");
+ rootElement.setAttribute("xmlns:dr3d",
+ "http://openoffice.org/2000/dr3d");
+ rootElement.setAttribute("xmlns:math",
+ "http://www.w3.org/1998/Math/MathML");
+ rootElement.setAttribute("xmlns:form",
+ "http://openoffice.org/2000/form");
+ rootElement.setAttribute("xmlns:script",
+ "http://openoffice.org/2000/script");
+ rootElement.setAttribute("xmlns:config",
+ "http://openoffice.org/2001/config");
+ rootElement.setAttribute("office:class", "text");
+ rootElement.setAttribute("office:version", "1.0");
+
+ NodeList nodeList;
+ Node tmpNode;
+ Node rootNode = rootElement;
+ if (metaDoc != null) {
+ nodeList = metaDoc.getElementsByTagName(TAG_OFFICE_META);
+ if (nodeList.getLength() > 0) {
+ tmpNode = newDoc.importNode(nodeList.item(0), true);
+ rootNode.appendChild(tmpNode);
+ }
+ }
+ if (styleDoc != null) {
+ nodeList = styleDoc.getElementsByTagName(TAG_OFFICE_STYLES);
+ if (nodeList.getLength() > 0) {
+ tmpNode = newDoc.importNode(nodeList.item(0), true);
+ rootNode.appendChild(tmpNode);
+ }
+ }
+ nodeList = domDoc
+ .getElementsByTagName(TAG_OFFICE_AUTOMATIC_STYLES);
+ if (nodeList.getLength() > 0) {
+ tmpNode = newDoc.importNode(nodeList.item(0), true);
+ rootNode.appendChild(tmpNode);
+ }
+ nodeList = domDoc.getElementsByTagName(TAG_OFFICE_BODY);
+ if (nodeList.getLength() > 0) {
+ tmpNode = newDoc.importNode(nodeList.item(0), true);
+ rootNode.appendChild(tmpNode);
+ }
+ domDoc = newDoc;
+ } catch (Exception e) {
+ System.out
+ .println("\nAn Exception occurred with Xslt Serializer"
+ + e);
+ }
- }
+ }
- try{
- baos=transform(domDoc);
- }
- catch (Exception e){
- System.out.println("\n Error with Xslt\n");
- }
+ try {
+ baos = transform(domDoc);
+ } catch (Exception e) {
+ System.out.println("\n Error with Xslt\n");
+ }
- DOMDocument resultDomDoc=(DOMDocument)pluginFactory.createDeviceDocument(docName,new ByteArrayInputStream(baos.toByteArray()));
- cd.addDocument (resultDomDoc);
- return cd;
+ DOMDocument resultDomDoc = (DOMDocument) pluginFactory
+ .createDeviceDocument(docName,
+ new ByteArrayInputStream(baos.toByteArray()));
+ cd.addDocument(resultDomDoc);
+ return cd;
}
public Source resolve(String href,String base)
commit 0439c5189a81aa74e2e998b773cf7a4b1271c83f
Author: Noel Grandin <noel at peralex.com>
Date: Tue Aug 21 08:58:57 2012 +0200
Java cleanup - remove unused local fields and variables and parameters
Change-Id: I5114bf2e390f3f5052819710329a789fc78c60f2
diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PocketExcelDecoder.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PocketExcelDecoder.java
index a873604..6115c14 100644
--- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PocketExcelDecoder.java
+++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PocketExcelDecoder.java
@@ -62,17 +62,8 @@ final class PocketExcelDecoder extends SpreadsheetDecoder {
/**
* Constructor creates a Pocket Excel WorkBook.
- *
- * @param name The name of the WorkBook.
- * @param worksheetNames set of Strings equivalent to the worksheets
- * contained in the workbook
- * @param password The password for the workBook.
- *
- * @throws IOException If any I/O error occurs.
*/
- PocketExcelDecoder(String name, String[] worksheetNames, String password) throws IOException {
- super(name, password);
-
+ PocketExcelDecoder() {
fmt = new Format();
}
diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PocketExcelEncoder.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PocketExcelEncoder.java
index a0942a5..e642bff 100644
--- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PocketExcelEncoder.java
+++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PocketExcelEncoder.java
@@ -43,15 +43,11 @@ final class PocketExcelEncoder extends SpreadsheetEncoder {
* Constructor creates a Pocket Excel WorkBook.
*
* @param name The name of the WorkBook.
- * @param password The password for the WorkBook.
*
* @throws IOException If any I/O error occurs.
*/
- PocketExcelEncoder(String name, String password) throws IOException {
-
- super(name, password);
+ PocketExcelEncoder(String name) throws IOException {
wb = new Workbook(name);
-
}
diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/SxcDocumentDeserializerImpl.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/SxcDocumentDeserializerImpl.java
index 3a7fc7c..1bff41d 100644
--- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/SxcDocumentDeserializerImpl.java
+++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/SxcDocumentDeserializerImpl.java
@@ -63,8 +63,7 @@ public final class SxcDocumentDeserializerImpl extends SxcDocumentDeserializer {
*/
public SpreadsheetDecoder createDecoder(String workbook,
String[] worksheetNames, String password) throws IOException {
-
- return new PocketExcelDecoder(workbook, worksheetNames, password);
+ return new PocketExcelDecoder();
}
diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/SxcDocumentSerializerImpl.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/SxcDocumentSerializerImpl.java
index 2689e24..bf3c3a8 100644
--- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/SxcDocumentSerializerImpl.java
+++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/SxcDocumentSerializerImpl.java
@@ -60,11 +60,11 @@ public final class SxcDocumentSerializerImpl extends SxcDocumentSerializer {
// contain a path or the file extension.
String docName = sxcDoc.getName();
- // TODO - get real values for password when implemnted in XML
+ // TODO - get real values for password when implemented in XML
// Passwords are not currently stored in StarCalc XML format.
String password = null;
- encoder = new PocketExcelEncoder(docName, password);
+ encoder = new PocketExcelEncoder(docName);
// get dom document
org.w3c.dom.Document domDoc = sxcDoc.getContentDOM();
diff --git a/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WSDecoder.java b/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WSDecoder.java
index 9441c81..c5b12ce 100644
--- a/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WSDecoder.java
+++ b/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WSDecoder.java
@@ -140,7 +140,7 @@ final class WSDecoder implements DOCConstants {
while (curIndex < rawData.length) {
if (WsePara.isValid(rawData, curIndex)) {
v.add(new WsePara(rawData, curIndex));
- curIndex = WsePara.computeNewIndex(rawData, curIndex);
+ curIndex = WsePara.computeNewIndex(curIndex);
} else if (WseTextRun.isValid(rawData, curIndex)) {
v.add(new WseTextRun(rawData, curIndex, fontTable, colorTable));
curIndex = WseTextRun.computeNewIndex(rawData, curIndex);
diff --git a/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WSEncoder.java b/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WSEncoder.java
index 3d7cec7..e813632 100644
--- a/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WSEncoder.java
+++ b/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WSEncoder.java
@@ -51,7 +51,6 @@ final class WSEncoder {
private short version;
private int textLen;
private short maxRecSize;
- private int textRecCount = 0;
/* WordSmith document elements. */
diff --git a/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/Wse.java b/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/Wse.java
index b50d3e5..dc86058 100644
--- a/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/Wse.java
+++ b/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/Wse.java
@@ -29,37 +29,6 @@ package org.openoffice.xmerge.converter.xml.sxw.wordsmith;
abstract class Wse {
/**
- * Return true if <code>dataArray[startIndex]</code> is the start
- * of a valid element of this type.
- *
- * @param dataArray <code>byte</code> array.
- * @param startIndex The start index.
- *
- * @return true if <code>dataArray[startIndex]</code> is the
- * start of a valid element of this type, false otherwise.
- */
- static boolean isValid(byte dataArray[], int startIndex) {
- return false;
- }
-
-
- /**
- * Compute and return the index of the first <code>byte</code>
- * following this element. It is assumed that the element
- * starting at <code>dataArray[startIndex]</code> is valid.
- *
- * @param dataArray <code>byte</code> array.
- * @param startIndex The start index.
- *
- * @return The index of the first <code>byte</code> following
- * this element.
- */
- static int computeNewIndex(byte dataArray[], int startIndex) {
- return 0;
- }
-
-
- /**
* Return the total number of bytes needed to represent this
* object.
*
diff --git a/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WseHeader.java b/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WseHeader.java
index 3e18805..c620f21 100644
--- a/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WseHeader.java
+++ b/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WseHeader.java
@@ -84,12 +84,11 @@ class WseHeader extends Wse {
* following this element. It is assumed that the element
* starting at <code>dataArray[startIndex]</code> is valid.
*
- * @param dataArray <code>byte</code> array.
* @param startIndex The start index.
*
* @return The first <code>byte</code> following this element.
*/
- static int computeNewIndex(byte dataArray[], int startIndex) {
+ static int computeNewIndex(int startIndex) {
return startIndex + 18;
}
diff --git a/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WsePara.java b/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WsePara.java
index 166f550..e9b33d6 100644
--- a/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WsePara.java
+++ b/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WsePara.java
@@ -155,13 +155,12 @@ class WsePara extends Wse {
* <code>dataArray[startIndex]</code> is the beginning of a valid
* paragraph descriptor.
*
- * @param dataArray <code>byte</code> array.
* @param startIndex The start index.
*
* @return The index of the first <code>byte</code> following the
* paragraph description.
*/
- static int computeNewIndex(byte dataArray[], int startIndex) {
+ static int computeNewIndex(int startIndex) {
return startIndex + 13;
}
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java
index 8d7761f..82650fd 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java
@@ -27,14 +27,12 @@ import org.openoffice.xmerge.util.Debug;
abstract class conversionAlgorithm {
- int I(String val) {
- return 0;
- }
+ abstract int I(String val);
}
- /*
- * This algorithm expects only values in millimeters, e.g. "20.3mm".
- */
+/**
+ * This algorithm expects only values in millimeters, e.g. "20.3mm".
+ */
class horizSize extends conversionAlgorithm {
int I(String value) {
if (value.endsWith("mm")) {
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SpreadsheetDecoder.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SpreadsheetDecoder.java
index c54ccea..380497d 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SpreadsheetDecoder.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SpreadsheetDecoder.java
@@ -32,12 +32,6 @@ import org.openoffice.xmerge.ConvertData;
public abstract class SpreadsheetDecoder {
/**
- * Constructor for creating new <code>SpreadsheetDecoder</code>.
- */
- public SpreadsheetDecoder(String name, String password) throws IOException {
- }
-
- /**
* Returns the total number of sheets in the WorkBook.
*
* @return The number of sheets in the WorkBook.
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SpreadsheetEncoder.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SpreadsheetEncoder.java
index bb2c0af..aae852c 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SpreadsheetEncoder.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SpreadsheetEncoder.java
@@ -33,17 +33,6 @@ public abstract class SpreadsheetEncoder {
/**
- * Creates new SpreadsheetEncoder.
- *
- * @param name The name of the WorkBook to be created.
- * @param password An optional password for the WorkBook.
- *
- * @throws IOException If any I/O error occurs.
- */
- public SpreadsheetEncoder(String name, String password) throws IOException { }
-
-
- /**
* Create a new WorkSheet within the WorkBook.
*
* @param sheetName The name of the WorkSheet.
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/CharacterBaseParagraphMerge.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/CharacterBaseParagraphMerge.java
index d9a691f..36c1b72 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/CharacterBaseParagraphMerge.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/CharacterBaseParagraphMerge.java
@@ -130,14 +130,14 @@ public final class CharacterBaseParagraphMerge
orgTextNode.endChar() + ">");
Debug.log(Debug.INFO, " extraChar value <" + extraChar + ">");
- coreMerge(orgDiffCount, diffCount, diffs, orgParser,
+ coreMerge(orgDiffCount, diffCount, diffs,
modParser, orgTextNode, extraChar);
}
}
}
private void coreMerge(int startDiffNum, int endDiffNum, Difference[] diffs,
- CharacterParser orgParser, CharacterParser modParser,
+ CharacterParser modParser,
TextNodeEntry orgTextNode, int extraChar) {
Node orgNode = orgTextNode.node();
commit 59c05d030e6e95924ef442b23b86b674518e593b
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Aug 28 14:20:47 2012 +0200
Make use of autoboxing
Change-Id: I5eb463abbacc8804712a10bdccfe5535ba82c07b
diff --git a/toolkit/test/accessibility/AccTreeNode.java b/toolkit/test/accessibility/AccTreeNode.java
index c972257..47cd392 100644
--- a/toolkit/test/accessibility/AccTreeNode.java
+++ b/toolkit/test/accessibility/AccTreeNode.java
@@ -359,7 +359,7 @@ class AccTreeNode
aDescriptor.mnChildCount = nChildCount;
// Fill in the indices of the updated children.
for (int j=0; j<nChildCount; j++)
- aChildIndices.add(new Integer(j+nOffset));
+ aChildIndices.add(j+nOffset);
}
nOffset += aDescriptor.mnChildCount;
}
diff --git a/toolkit/test/accessibility/AccessibilityTreeModel.java b/toolkit/test/accessibility/AccessibilityTreeModel.java
index 12ff8a6..bd442ed 100644
--- a/toolkit/test/accessibility/AccessibilityTreeModel.java
+++ b/toolkit/test/accessibility/AccessibilityTreeModel.java
@@ -401,7 +401,7 @@ public class AccessibilityTreeModel
int nChildIndices[] = new int[nCount];
for (int i=0; i<nCount; i++)
{
- int nIndex = aChildIndices.elementAt(i).intValue();
+ int nIndex = aChildIndices.elementAt(i);
aChildObjects[i] = aNode.getChild (nIndex);
nChildIndices[i] = nIndex;
}
diff --git a/toolkit/test/accessibility/AccessibleTreeCellRenderer.java b/toolkit/test/accessibility/AccessibleTreeCellRenderer.java
index 03b7d93..169fe96 100644
--- a/toolkit/test/accessibility/AccessibleTreeCellRenderer.java
+++ b/toolkit/test/accessibility/AccessibleTreeCellRenderer.java
@@ -79,7 +79,7 @@ public class AccessibleTreeCellRenderer
if (maChangedLines.size() <= nRow)
maChangedLines.setSize (nRow+1);
nRow -= 1; // row index is one to large for some reason.
- maChangedLines.set (nRow, new Boolean (true));
+ maChangedLines.set (nRow, true);
}
/** Inform the cell renderer of a set of changed line which to paint
commit 67a5b7a8c1a1b1d9a8e458c26be3dc706ab3fabc
Author: Noel Grandin <noel at peralex.com>
Date: Tue Aug 21 08:47:59 2012 +0200
Java5 update - convert to using generics for collections
Change-Id: I384cb006beee280922564c9277025843a1bda74a
diff --git a/toolkit/test/accessibility/AccTreeNode.java b/toolkit/test/accessibility/AccTreeNode.java
index 6224ce2..c972257 100644
--- a/toolkit/test/accessibility/AccTreeNode.java
+++ b/toolkit/test/accessibility/AccTreeNode.java
@@ -40,7 +40,7 @@ class AccTreeNode
public int mnChildCount;
}
/// NodeHandlers for this node
- private Vector maHandlers;
+ private Vector<HandlerDescriptor> maHandlers;
// The accessible context of this node.
private XAccessible mxAccessible;
@@ -58,7 +58,7 @@ class AccTreeNode
{
super (aDisplay, aParent);
- maHandlers = new Vector(5);
+ maHandlers = new Vector<HandlerDescriptor>(5);
mxContext = xContext;
mxAccessible = xAccessible;
}
@@ -72,7 +72,7 @@ class AccTreeNode
for (int i=0; i<maHandlers.size(); i++)
{
System.out.println ("replacing handler " + i);
- HandlerDescriptor aDescriptor = (HandlerDescriptor)maHandlers.get(i);
+ HandlerDescriptor aDescriptor = maHandlers.get(i);
aDescriptor.maHandler = aDescriptor.maHandler.createHandler (mxContext);
aDescriptor.mnChildCount =
aDescriptor.maHandler.getChildCount (this);
@@ -87,7 +87,7 @@ class AccTreeNode
public XAccessibleComponent getComponent ()
{
if (mxComponent == null && mxContext != null)
- mxComponent = (XAccessibleComponent)UnoRuntime.queryInterface(
+ mxComponent = UnoRuntime.queryInterface(
XAccessibleComponent.class, mxContext);
return mxComponent;
}
@@ -97,7 +97,7 @@ class AccTreeNode
if (mxComponent == null)
getComponent();
if (mxComponent != null)
- return (XAccessibleExtendedComponent)UnoRuntime.queryInterface(
+ return UnoRuntime.queryInterface(
XAccessibleExtendedComponent.class, mxComponent);
else
return null;
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list