You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ji...@apache.org on 2026/10/13 15:25:06 UTC
(openoffice) branch AOO50X updated (eb76c9b3bf -> 7ba51dc71e)
This is an automated email from the ASF dual-hosted git repository.
jimjag pushed a change to branch AOO50X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
from eb76c9b3bf svx, avmedia: put the media question when the URL is set, not while painting
new 213edfc39e vcl: GTK2 ownership and lifecycle audit.
new 4a3f001258 vcl: GTK2 native widget rendering cleanup
new 2f8cc657ee vcl: GTK upgrade - replace direct widget struct access with public APIs
new b316652052 Lokalized Dutch
new 8797f2b219 Lokalized Dutch
new ee4b196a5e Lokalized Dutch
new 9216e35a2c Lokalized Dutch
new 0d44ccdba0 Lokalized Dutch
new 514fb97c38 Don't specify the MediaWiki extension Java sourcelevel, isn't not used anywhere else, and we now need at least Java 8 (see 00a90ea2c35aa0d62b41963f97bc10041530f5d1).
new b926b1a864 Use a simpler way to format a date, which doesn't require explicitly creating a java.lang.StringBuffer in the process.
new cb508685ab Remove unnecessary casts on the return values from UnoRuntime.queryInterface().
new 4140469023 Replace java.lang.StringBuffer with java.lang.StringBuilder.
new 9d6590b616 Remove unused imports of: java.util.Enumeration java.util.Hashtable java.util.Vector
new 63acec1d10 Begin converting java.util.Vector to java.util.ArrayList.
new 84d507fed8 Fix the build-breaking regression in 8a6d05c5839d3bb0755d29b6ff1d93273263d245 caused by removing the sourcelevel property but not removing a reference to it.
new db94a49c9a Remove unnecessary casts from calls to AnyConverter.toObject().
new a85c3b5cd8 General spelling clean up (#484)
new 6e2027afb8 Update README.md
new 7ba51dc71e Update README.md
The 19 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/linters/codespell.txt | 8 -
README.md | 2 +-
.../org/openoffice/accessibility/AccessBridge.java | 8 +-
.../accessibility/WindowsAccessBridgeAdapter.java | 4 +-
.../java/accessibility/AbstractButton.java | 4 +-
.../accessibility/AccessibleComponentImpl.java | 2 +-
.../accessibility/AccessibleHypertextImpl.java | 4 +-
.../accessibility/AccessibleObjectFactory.java | 2 +-
.../java/accessibility/AccessibleTextImpl.java | 14 +-
.../openoffice/java/accessibility/ComboBox.java | 2 +-
.../openoffice/java/accessibility/Component.java | 12 +-
.../openoffice/java/accessibility/Container.java | 8 +-
.../java/accessibility/DescendantManager.java | 4 +-
.../org/openoffice/java/accessibility/Dialog.java | 2 +-
.../org/openoffice/java/accessibility/Frame.java | 2 +-
.../org/openoffice/java/accessibility/Icon.java | 2 +-
.../org/openoffice/java/accessibility/Label.java | 2 +-
.../org/openoffice/java/accessibility/List.java | 12 +-
.../org/openoffice/java/accessibility/Menu.java | 2 +-
.../java/accessibility/MenuContainer.java | 2 +-
.../openoffice/java/accessibility/Paragraph.java | 4 +-
.../openoffice/java/accessibility/ScrollBar.java | 4 +-
.../org/openoffice/java/accessibility/Table.java | 14 +-
.../java/accessibility/TextComponent.java | 6 +-
.../java/accessibility/ToggleButton.java | 2 +-
.../org/openoffice/java/accessibility/ToolTip.java | 2 +-
.../org/openoffice/java/accessibility/Tree.java | 16 +-
.../org/openoffice/java/accessibility/Window.java | 2 +-
.../accessibility/logging/XAccessibleEventLog.java | 4 +-
.../accessibility/logging/XAccessibleTextLog.java | 2 +-
.../accessibility/awb/AccessibilityWorkBench.java | 2 +-
.../accessibility/awb/canvas/CanvasShape.java | 4 +-
.../accessibility/awb/tree/ToolkitNode.java | 6 +-
.../accessibility/awb/view/ComponentView.java | 4 +-
.../accessibility/awb/view/EditableTextView.java | 4 +-
.../accessibility/awb/view/FocusView.java | 4 +-
.../accessibility/awb/view/SelectionView.java | 6 +-
.../awb/view/ServiceInterfaceView.java | 6 +-
.../accessibility/awb/view/TableView.java | 8 +-
.../accessibility/awb/view/TextView.java | 12 +-
.../awb/view/text/TextActionDialog.java | 6 +-
.../accessibility/misc/InformationWriter.java | 28 +-
.../accessibility/misc/OfficeConnection.java | 4 +-
.../accessibility/misc/SimpleOffice.java | 28 +-
main/avmedia/source/java/FrameGrabber.java | 2 +-
.../com/sun/star/beans/LocalOfficeConnection.java | 12 +-
.../java/com/sun/star/beans/LocalOfficeWindow.java | 14 +-
.../java/com/sun/star/comp/beans/Controller.java | 2 +-
.../main/java/com/sun/star/comp/beans/Frame.java | 4 +-
.../sun/star/comp/beans/LocalOfficeConnection.java | 16 +-
.../com/sun/star/comp/beans/LocalOfficeWindow.java | 14 +-
.../main/java/com/sun/star/comp/beans/OOoBean.java | 28 +-
.../com/sun/star/comp/beans/OfficeDocument.java | 6 +-
.../main/java/com/sun/star/comp/beans/Wrapper.java | 2 +-
main/bean/qa/complex/bean/OOoBeanTest.java | 4 +-
main/chart2/qa/complex/chart2/TestCaseOldAPI.java | 99 ++-
.../qa/complex/connectivity/HsqlDriverTest.java | 16 +-
.../complex/connectivity/JdbcLongVarCharTest.java | 10 +-
.../connectivity/dbase/DBaseDateFunctions.java | 10 +-
.../connectivity/dbase/DBaseNumericFunctions.java | 10 +-
.../complex/connectivity/dbase/DBaseSqlTests.java | 6 +-
.../connectivity/dbase/DBaseStringFunctions.java | 10 +-
.../complex/connectivity/hsqldb/TestCacheSize.java | 22 +-
.../qa/connectivity/tools/HsqlDatabase.java | 12 +-
.../connectivity/qa/connectivity/tools/RowSet.java | 4 +-
main/dbaccess/qa/complex/dbaccess/RowSet.java | 2 +-
.../source/ext/macromigration/migrationengine.cxx | 6 +-
main/default_images/res/helpimg/nl/feldalle.png | Bin 346 -> 1543 bytes
main/default_images/res/helpimg/nl/feldcolo.png | Bin 698 -> 853 bytes
.../res/helpimg/nl/names_as_addressing.png | Bin 2959 -> 7072 bytes
main/default_images/res/helpimg/nl/rechenlt.png | Bin 585 -> 2649 bytes
main/default_images/res/helpimg/nl/sheettabs.png | Bin 1414 -> 2348 bytes
main/default_images/res/helpimg/nl/swh00117.png | Bin 891 -> 1379 bytes
main/default_images/res/helpimg/nl/zellvor.png | Bin 657 -> 832 bytes
.../comp/extensionoptions/OptionsEventHandler.java | 22 +-
main/embeddedobj/qa/complex/embedding/Test01.java | 16 +-
.../embeddedobj/test/Container1/BitmapPainter.java | 2 +-
main/embeddedobj/test/Container1/EmbedContApp.java | 72 +-
.../test/Container1/EmbedContFrame.java | 6 +-
main/embeddedobj/test/Container1/PaintThread.java | 2 +-
main/embeddedobj/test/Container1/WindowHelper.java | 12 +-
.../qa/integration/extensions/ConsoleWait.java | 2 +-
.../qa/integration/extensions/Frame.java | 12 +-
.../qa/integration/extensions/MethodHandler.java | 4 +-
.../qa/integration/extensions/ObjectInspector.java | 8 +-
.../qa/integration/extensions/ServicesHandler.java | 6 +-
main/extensions/test/pgp/TestPGP.java | 6 +-
.../detection/typeDetection/TypeDetection.java | 4 +-
.../source/config/tools/split/FCFGSplit.java | 6 +-
.../filter/source/config/tools/split/Splitter.java | 2 +-
.../comp/xsltfilter/XSLTFilterOLEExtracter.java | 26 +-
.../sun/star/comp/xsltfilter/XSLTransformer.java | 32 +-
main/filter/source/xsltvalidate/XSLTValidate.java | 4 +-
.../integration/complex/forms/tools/ResultSet.java | 4 +-
main/forms/qa/integration/forms/CellBinding.java | 38 +-
.../qa/integration/forms/ControlValidation.java | 2 +-
main/forms/qa/integration/forms/DateValidator.java | 2 +-
.../forms/qa/integration/forms/DocumentHelper.java | 36 +-
.../qa/integration/forms/DocumentViewHelper.java | 12 +-
main/forms/qa/integration/forms/FormComponent.java | 18 +-
.../qa/integration/forms/FormControlTest.java | 26 +-
main/forms/qa/integration/forms/FormLayer.java | 10 +-
main/forms/qa/integration/forms/ListBox.java | 6 +-
main/forms/qa/integration/forms/ListSelection.java | 16 +-
main/forms/qa/integration/forms/RadioButtons.java | 6 +-
.../integration/forms/SingleControlValidation.java | 6 +-
.../qa/integration/forms/SpreadsheetDocument.java | 10 +-
.../qa/integration/forms/SpreadsheetView.java | 8 +-
.../qa/integration/forms/TableCellTextBinding.java | 2 +-
main/forms/qa/integration/forms/TimeValidator.java | 2 +-
main/forms/qa/integration/forms/ValueBinding.java | 6 +-
.../qa/integration/forms/XMLFormSettings.java | 10 +-
main/forms/qa/integration/xforms/Model.java | 6 +-
main/forms/qa/integration/xforms/XMLDocument.java | 6 +-
.../AcceleratorsConfigurationTest.java | 2 +-
.../qa/complex/api_internal/CheckAPI.java | 8 +-
.../CheckContextMenuInterceptor.java | 2 +-
.../qa/complex/framework/autosave/AutoSave.java | 4 +-
.../qa/complex/framework/autosave/Protocol.java | 28 +-
.../qa/complex/framework/recovery/CrashThread.java | 6 +-
.../complex/framework/recovery/RecoveryTest.java | 50 +-
.../complex/framework/recovery/RecoveryTools.java | 8 +-
.../qa/complex/imageManager/CheckImageManager.java | 2 +-
.../complex/loadAllDocuments/StreamSimulator.java | 6 +-
main/framework/source/services/backingcomp.cxx | 8 +-
.../setup/Controller/ChooseDirectoryCtrl.java | 1 -
.../setup/Controller/InstallationImminentCtrl.java | 1 -
.../Controller/UninstallationCompletedCtrl.java | 1 -
.../setup/SetupData/SetupDataProvider.java | 1 -
.../org/openoffice/setup/Util/AbortInstaller.java | 1 -
.../org/openoffice/setup/Util/InfoCtrl.java | 1 -
.../com/sun/star/lib/uno/helper/UnoUrl.java | 10 +-
.../com/sun/star/lib/uno/helper/WeakBase.java | 7 +-
.../com/sun/star/lib/uno/helper/Factory_Test.java | 12 +-
.../com/sun/star/lib/uno/helper/WeakBase_Test.java | 2 +-
.../java/com/sun/star/comp/loader/JavaLoader.java | 12 +-
.../star/lib/uno/environments/remote/ThreadId.java | 2 +-
.../java/com/sun/star/lib/util/StringHelper.java | 2 +-
.../com/sun/star/lib/util/UrlToFileMapper.java | 2 +-
main/l10ntools/java/jpropex/build.xml | 2 +-
main/l10ntools/java/jpropex/java/JPropEx.java | 8 +-
main/l10ntools/java/jpropex/java/SdfEntity.java | 4 +-
main/l10ntools/java/l10nconv/build.xml | 2 +-
.../star/tooling/DirtyTags/DirtyTagWrapper.java | 6 +-
.../com/sun/star/tooling/DirtyTags/TagPair.java | 4 +-
.../com/sun/star/tooling/converter/GSIWriter.java | 18 +-
.../com/sun/star/tooling/converter/SDFReader.java | 2 +-
.../com/sun/star/tooling/converter/SDFWriter.java | 2 +-
.../sun/star/tooling/converter/XLIFFWriter.java | 4 +-
main/l10ntools/java/receditor/build.xml | 2 +-
main/l10ntools/source/filter/merge/FCFGMerge.java | 4 +-
main/l10ntools/source/filter/merge/Merger.java | 4 +-
.../source/filter/utils/AnalyzeStartupLog.java | 2 +-
main/l10ntools/source/filter/utils/Cache.java | 24 +-
main/l10ntools/source/filter/utils/FileHelper.java | 14 +-
main/l10ntools/source/filter/utils/XMLHelper.java | 18 +-
.../Accessibility/ConnectionTask.java | 6 +-
.../Accessibility/EventHandler.java | 8 +-
.../Accessibility/EventListenerProxy.java | 4 +-
.../Accessibility/GraphicalDisplay.java | 2 +-
.../Accessibility/RegistrationThread.java | 2 +-
.../Accessibility/TextualDisplay.java | 2 +-
.../CreatingDialogs/SampleDialog.java | 30 +-
.../DevelopersGuide/Charts/CalcHelper.java | 40 +-
.../DevelopersGuide/Charts/ChartHelper.java | 36 +-
.../DevelopersGuide/Charts/ChartInCalc.java | 34 +-
.../DevelopersGuide/Charts/ChartInDraw.java | 16 +-
.../DevelopersGuide/Charts/ChartInWriter.java | 8 +-
.../examples/DevelopersGuide/Charts/Helper.java | 6 +-
.../Charts/JavaSampleChartAddIn.java | 50 +-
.../Charts/ListenAtCalcRangeInDraw.java | 16 +-
.../Charts/SelectionChangeListener.java | 22 +-
.../Components/Addons/JobsAddon/AsyncJob.java | 12 +-
.../ProtocolHandlerAddon.java | 8 +-
.../JavaComponent/TestJavaComponent.java | 4 +-
.../dialogcomponent/DialogComponent.java | 14 +-
.../DevelopersGuide/Config/ConfigExamples.java | 88 +--
.../DevelopersGuide/Database/CodeSamples.java | 34 +-
.../DevelopersGuide/Database/OpenQuery.java | 14 +-
.../examples/DevelopersGuide/Database/RowSet.java | 32 +-
.../examples/DevelopersGuide/Database/Sales.java | 30 +-
.../DevelopersGuide/Database/SalesMan.java | 4 +-
.../examples/DevelopersGuide/Database/sdbcx.java | 62 +-
.../DevelopersGuide/Drawing/ChangeOrderDemo.java | 6 +-
.../Drawing/ControlAndSelectDemo.java | 20 +-
.../DevelopersGuide/Drawing/CustomShowDemo.java | 20 +-
.../DevelopersGuide/Drawing/DrawViewDemo.java | 8 +-
.../DevelopersGuide/Drawing/DrawingDemo.java | 18 +-
.../Drawing/FillAndLineStyleDemo.java | 4 +-
.../DevelopersGuide/Drawing/GluePointDemo.java | 14 +-
.../DevelopersGuide/Drawing/GraphicExportDemo.java | 10 +-
.../examples/DevelopersGuide/Drawing/Helper.java | 4 +-
.../DevelopersGuide/Drawing/LayerDemo.java | 10 +-
.../Drawing/ObjectTransformationDemo.java | 6 +-
.../DevelopersGuide/Drawing/Organigram.java | 18 +-
.../DevelopersGuide/Drawing/PageHelper.java | 32 +-
.../DevelopersGuide/Drawing/PresentationDemo.java | 20 +-
.../DevelopersGuide/Drawing/ShapeHelper.java | 18 +-
.../DevelopersGuide/Drawing/StyleDemo.java | 22 +-
.../examples/DevelopersGuide/Drawing/TextDemo.java | 6 +-
.../FirstSteps/FirstLoadComponent.java | 36 +-
.../FirstSteps/HelloTextTableShape.java | 84 +--
.../DevelopersGuide/Forms/ButtonOperator.java | 2 +-
.../DevelopersGuide/Forms/ControlLock.java | 4 +-
.../DevelopersGuide/Forms/DataAwareness.java | 12 +-
.../DevelopersGuide/Forms/DateValidator.java | 2 +-
.../Forms/DocumentBasedExample.java | 6 +-
.../DevelopersGuide/Forms/DocumentHelper.java | 38 +-
.../DevelopersGuide/Forms/DocumentViewHelper.java | 14 +-
.../examples/DevelopersGuide/Forms/FLTools.java | 14 +-
.../examples/DevelopersGuide/Forms/FormLayer.java | 12 +-
.../DevelopersGuide/Forms/GridFieldValidator.java | 4 +-
.../DevelopersGuide/Forms/HsqlDatabase.java | 18 +-
.../DevelopersGuide/Forms/KeyGenerator.java | 20 +-
.../odk/examples/DevelopersGuide/Forms/RowSet.java | 10 +-
.../DevelopersGuide/Forms/SalesFilter.java | 2 +-
.../Forms/SingleControlValidation.java | 6 +-
.../DevelopersGuide/Forms/SpreadsheetDocument.java | 10 +-
.../Forms/SpreadsheetValueBinding.java | 6 +-
.../DevelopersGuide/Forms/SpreadsheetView.java | 8 +-
.../Forms/TableCellTextBinding.java | 2 +-
.../DevelopersGuide/Forms/TimeValidator.java | 2 +-
main/odk/examples/DevelopersGuide/Forms/UNO.java | 18 +-
.../examples/DevelopersGuide/Forms/URLHelper.java | 2 +-
.../DevelopersGuide/Forms/ValueBinding.java | 6 +-
.../DevelopersGuide/GUI/DialogDocument.java | 12 +-
.../DevelopersGuide/GUI/ImageControlSample.java | 12 +-
.../examples/DevelopersGuide/GUI/MessageBox.java | 16 +-
.../GUI/RoadmapItemStateChangeListener.java | 2 +-
.../examples/DevelopersGuide/GUI/SystemDialog.java | 22 +-
.../DevelopersGuide/GUI/UnoDialogSample.java | 188 ++---
.../DevelopersGuide/GUI/UnoDialogSample2.java | 14 +-
main/odk/examples/DevelopersGuide/GUI/UnoMenu.java | 18 +-
.../odk/examples/DevelopersGuide/GUI/UnoMenu2.java | 8 +-
.../OfficeDev/Clipboard/Clipboard.java | 14 +-
.../OfficeDev/ContextMenuInterceptor.java | 28 +-
.../OfficeDev/DesktopEnvironment/DocumentView.java | 2 +-
.../DesktopEnvironment/FunctionHelper.java | 58 +-
.../OfficeDev/DesktopEnvironment/Interceptor.java | 4 +-
.../DesktopEnvironment/StatusListener.java | 2 +-
.../DisableCommands/DisableCommandsTest.java | 32 +-
.../AsciiFilter/AsciiReplaceFilter.java | 24 +-
.../AsciiFilter/FilterOptions.java | 6 +-
.../FlatXmlFilter_java/FlatXml.java | 16 +-
.../OfficeDev/Linguistic/LinguisticExamples.java | 4 +-
.../OfficeDev/Linguistic/OneInstanceFactory.java | 6 +-
.../OfficeDev/Linguistic/SampleHyphenator.java | 2 +-
.../OfficeDev/Linguistic/SampleSpellChecker.java | 2 +-
.../OfficeDev/Linguistic/SampleThesaurus.java | 2 +-
.../DevelopersGuide/OfficeDev/MenuElement.java | 4 +-
.../DevelopersGuide/OfficeDev/Number_Formats.java | 22 +-
.../OfficeDev/PathSettings/PathSettingsTest.java | 2 +-
.../PathSubstitution/PathSubstitutionTest.java | 2 +-
.../OfficeDev/TerminationTest/TerminationTest.java | 2 +-
.../InterprocessConn/ConnectionAwareClient.java | 14 +-
.../ProfUNO/InterprocessConn/UrlResolver.java | 2 +-
.../SimpleBootstrap_java/SimpleBootstrap_java.java | 2 +-
.../SayHello/SayHello/SayHello.java | 4 +-
.../ScriptSelector/ScriptSelector.java | 10 +-
.../Spreadsheet/GeneralTableSample.java | 28 +-
.../Spreadsheet/SpreadsheetDocHelper.java | 34 +-
.../Spreadsheet/SpreadsheetSample.java | 182 ++---
.../DevelopersGuide/Spreadsheet/ViewSample.java | 18 +-
.../DevelopersGuide/Text/TextDocuments.java | 234 +++---
.../DevelopersGuide/UCB/ChildrenRetriever.java | 6 +-
main/odk/examples/DevelopersGuide/UCB/Helper.java | 18 +-
.../DevelopersGuide/UCB/PropertiesComposer.java | 4 +-
.../DevelopersGuide/UCB/PropertiesRetriever.java | 2 +-
.../DevelopersGuide/UCB/ResourceCreator.java | 2 +-
.../java/ConverterServlet/ConverterServlet.java | 16 +-
.../java/DocumentHandling/DocumentConverter.java | 8 +-
.../java/DocumentHandling/DocumentLoader.java | 4 +-
.../java/DocumentHandling/DocumentPrinter.java | 6 +-
.../java/DocumentHandling/DocumentSaver.java | 12 +-
main/odk/examples/java/Drawing/SDraw.java | 26 +-
.../EmbedDocument/Container1/EmbedContApp.java | 52 +-
.../EmbedDocument/Container1/EmbedContFrame.java | 6 +-
.../EmbeddedObject/OwnEmbeddedObject.java | 34 +-
main/odk/examples/java/Inspector/Inspector.java | 30 +-
.../examples/java/Inspector/InspectorAddon.java | 8 +-
.../odk/examples/java/Inspector/InspectorPane.java | 4 +-
main/odk/examples/java/Inspector/Introspector.java | 28 +-
.../java/Inspector/ProtocolHandlerAddon.java | 8 +-
.../java/Inspector/SourceCodeGenerator.java | 2 +-
main/odk/examples/java/Inspector/TDocSupplier.java | 14 +-
.../odk/examples/java/Inspector/TestInspector.java | 4 +-
main/odk/examples/java/Inspector/UnoNode.java | 12 +-
.../examples/java/Inspector/UnoPropertyNode.java | 2 +-
.../Inspector/XLanguageSourceCodeGenerator.java | 1 -
.../odk/examples/java/NotesAccess/NotesAccess.java | 8 +-
.../examples/java/Spreadsheet/ChartTypeChange.java | 42 +-
.../examples/java/Spreadsheet/EuroAdaption.java | 28 +-
main/odk/examples/java/Spreadsheet/SCalc.java | 38 +-
.../java/Storage/StorageFunctionality.java | 8 +-
main/odk/examples/java/Storage/Test01.java | 6 +-
main/odk/examples/java/Storage/Test02.java | 4 +-
main/odk/examples/java/Storage/Test03.java | 8 +-
main/odk/examples/java/Storage/Test04.java | 8 +-
main/odk/examples/java/Storage/Test05.java | 4 +-
main/odk/examples/java/Storage/Test06.java | 4 +-
main/odk/examples/java/Storage/Test07.java | 8 +-
main/odk/examples/java/Storage/Test08.java | 10 +-
main/odk/examples/java/Storage/Test09.java | 6 +-
main/odk/examples/java/Storage/TestHelper.java | 44 +-
main/odk/examples/java/Text/BookmarkInsertion.java | 18 +-
main/odk/examples/java/Text/GraphicsInserter.java | 14 +-
main/odk/examples/java/Text/HardFormatting.java | 18 +-
main/odk/examples/java/Text/SWriter.java | 24 +-
main/odk/examples/java/Text/StyleCreation.java | 16 +-
.../examples/java/Text/StyleInitialization.java | 30 +-
.../examples/java/Text/TextDocumentStructure.java | 22 +-
main/odk/examples/java/Text/TextReplace.java | 12 +-
main/odk/examples/java/Text/WriterSelector.java | 20 +-
main/odk/examples/java/ToDo/ToDo.java | 34 +-
.../sun/star/lib/loader/InstallationFinder.java | 2 +-
.../star/configuration/backend/XSchemaHandler.idl | 2 +-
.../offapi/com/sun/star/document/FilterFactory.idl | 2 +-
.../sun/star/form/PropertyBrowserController.idl | 4 +-
main/offapi/com/sun/star/frame/XDispatch.idl | 2 +-
.../com/sun/star/text/XDependentTextField.idl | 2 +-
.../com/sun/star/xml/crypto/XXMLEncryption.idl | 2 +-
.../sun/star/xml/crypto/XXMLEncryptionTemplate.idl | 4 +-
.../com/sun/star/xml/crypto/XXMLSignature.idl | 6 +-
.../sun/star/xml/crypto/XXMLSignatureTemplate.idl | 2 +-
.../data/org/openoffice/Office/TableWizard.xcu | 12 +-
.../org/apache/openoffice/ooxml/parser/Parser.java | 1 -
.../apache/openoffice/ooxml/viewer/StreamView.java | 2 +-
.../openoffice/ooxml/viewer/xml/XMLScanner.java | 2 +-
.../schema/generator/ParserTablesGenerator.java | 10 +-
.../ooxml/schema/generator/html/HtmlGenerator.java | 2 +-
.../openoffice/ooxml/schema/model/complex/Any.java | 2 +-
.../ooxml/schema/model/simple/Restriction.java | 2 +-
.../openoffice/ooxml/schema/simple/NumberNode.java | 2 +-
.../openoffice/ooxml/schema/simple/StringNode.java | 2 +-
.../qa/ofopxmlstorages/StorageUnitTest.java | 2 +-
main/package/qa/ofopxmlstorages/Test03.java | 6 +-
main/package/qa/ofopxmlstorages/Test04.java | 2 +-
main/package/qa/ofopxmlstorages/Test07.java | 4 +-
main/package/qa/ofopxmlstorages/TestHelper.java | 44 +-
main/package/qa/storages/BorderedStream.java | 4 +-
.../package/qa/storages/RegressionTest_114358.java | 6 +-
.../package/qa/storages/RegressionTest_125919.java | 6 +-
.../package/qa/storages/RegressionTest_i26398.java | 2 +-
.../package/qa/storages/RegressionTest_i27773.java | 6 +-
.../package/qa/storages/RegressionTest_i29169.java | 6 +-
.../package/qa/storages/RegressionTest_i29321.java | 2 +-
.../package/qa/storages/RegressionTest_i30400.java | 8 +-
.../package/qa/storages/RegressionTest_i30677.java | 6 +-
.../package/qa/storages/RegressionTest_i35095.java | 4 +-
.../package/qa/storages/RegressionTest_i46848.java | 6 +-
.../package/qa/storages/RegressionTest_i49755.java | 6 +-
.../package/qa/storages/RegressionTest_i55821.java | 4 +-
.../package/qa/storages/RegressionTest_i59886.java | 10 +-
.../package/qa/storages/RegressionTest_i61909.java | 4 +-
.../package/qa/storages/RegressionTest_i84234.java | 4 +-
main/package/qa/storages/StorageUnitTest.java | 2 +-
main/package/qa/storages/Test01.java | 6 +-
main/package/qa/storages/Test02.java | 4 +-
main/package/qa/storages/Test03.java | 8 +-
main/package/qa/storages/Test04.java | 8 +-
main/package/qa/storages/Test05.java | 4 +-
main/package/qa/storages/Test06.java | 4 +-
main/package/qa/storages/Test07.java | 8 +-
main/package/qa/storages/Test08.java | 10 +-
main/package/qa/storages/Test09.java | 6 +-
main/package/qa/storages/Test10.java | 6 +-
main/package/qa/storages/Test11.java | 4 +-
main/package/qa/storages/Test12.java | 6 +-
main/package/qa/storages/Test13.java | 6 +-
main/package/qa/storages/Test14.java | 6 +-
main/package/qa/storages/Test15.java | 12 +-
main/package/qa/storages/Test16.java | 6 +-
main/package/qa/storages/Test17.java | 4 +-
main/package/qa/storages/Test18.java | 6 +-
main/package/qa/storages/TestHelper.java | 98 +--
.../src/main/java/basicrunner/BasicHandler.java | 12 +-
.../java/basicrunner/BasicHandlerProvider.java | 4 +-
.../java/basicrunner/basichelper/Connector.java | 2 +-
.../main/java/basicrunner/basichelper/Filter.java | 4 +-
.../java/basicrunner/basichelper/ThreadRunner.java | 8 +-
.../java/OOoRunner/src/main/java/convwatch/DB.java | 12 +-
.../src/main/java/convwatch/DBHelper.java | 4 +-
.../src/main/java/convwatch/DateHelper.java | 7 +-
.../java/convwatch/EnhancedComplexTestCase.java | 2 +-
.../java/convwatch/GraphicalDifferenceCheck.java | 10 +-
.../java/convwatch/GraphicalTestArguments.java | 2 +-
.../src/main/java/convwatch/HTMLOutputter.java | 10 +-
.../main/java/convwatch/ReportDesignerTest.java | 24 +-
.../src/main/java/convwatch/StringHelper.java | 2 +-
.../src/main/java/graphical/DateHelper.java | 7 +-
.../src/main/java/graphical/HTMLResult.java | 8 +-
.../OpenOfficeDatabaseReportExtractor.java | 6 +-
.../src/main/java/helper/ConfigHelper.java | 26 +-
.../src/main/java/helper/ConfigurationRead.java | 6 +-
.../main/java/helper/ContextMenuInterceptor.java | 14 +-
.../OOoRunner/src/main/java/helper/InetTools.java | 6 +-
.../src/main/java/helper/ProcessHandler.java | 8 +-
.../src/main/java/helper/StreamSimulator.java | 6 +-
.../src/main/java/helper/StringHelper.java | 2 +-
.../OOoRunner/src/main/java/helper/URLHelper.java | 2 +-
.../src/main/java/helper/UnoProvider.java | 2 +-
.../ifc/accessibility/_XAccessibleComponent.java | 16 +-
.../_XAccessibleEventBroadcaster.java | 2 +-
.../_XAccessibleExtendedComponent.java | 2 +-
.../ifc/accessibility/_XAccessibleSelection.java | 6 +-
.../java/ifc/accessibility/_XAccessibleTable.java | 4 +-
.../java/ifc/accessibility/_XAccessibleText.java | 6 +-
.../src/main/java/ifc/awt/_XScrollBar.java | 6 +-
.../src/main/java/ifc/awt/_XSpinValue.java | 6 +-
.../src/main/java/ifc/awt/_XTopWindow.java | 2 +-
.../main/java/ifc/awt/_XUserInputInterception.java | 2 +-
.../src/main/java/ifc/beans/_XFastPropertySet.java | 4 +-
.../main/java/ifc/beans/_XMultiPropertyStates.java | 4 +-
.../src/main/java/ifc/beans/_XPropertyState.java | 2 +-
.../java/ifc/beans/_XTolerantMultiPropertySet.java | 4 +-
.../src/main/java/ifc/bridge/_XBridge.java | 2 +-
.../src/main/java/ifc/bridge/_XBridgeFactory.java | 4 +-
.../src/main/java/ifc/bridge/_XUnoUrlResolver.java | 6 +-
.../src/main/java/ifc/chart/_BarDiagram.java | 2 +-
.../main/java/ifc/chart/_Chart3DBarProperties.java | 4 +-
.../main/java/ifc/chart/_ChartAxisYSupplier.java | 2 +-
.../main/java/ifc/chart/_ChartAxisZSupplier.java | 2 +-
.../src/main/java/ifc/chart/_ChartStatistics.java | 2 +-
.../java/ifc/chart/_ChartTwoAxisXSupplier.java | 2 +-
.../java/ifc/chart/_ChartTwoAxisYSupplier.java | 2 +-
.../src/main/java/ifc/chart/_Diagram.java | 2 +-
.../src/main/java/ifc/chart/_Dim3DDiagram.java | 2 +-
.../src/main/java/ifc/chart/_LineDiagram.java | 2 +-
.../src/main/java/ifc/chart/_StackableDiagram.java | 2 +-
.../src/main/java/ifc/chart/_StockDiagram.java | 2 +-
.../src/main/java/ifc/chart/_XChartData.java | 4 +-
.../src/main/java/ifc/chart/_XChartDataArray.java | 2 +-
.../java/ifc/configuration/backend/_XBackend.java | 2 +-
.../ifc/configuration/backend/_XLayerHandler.java | 6 +-
.../java/ifc/configuration/backend/_XSchema.java | 4 +-
.../src/main/java/ifc/connection/_XAcceptor.java | 4 +-
.../src/main/java/ifc/connection/_XConnector.java | 2 +-
.../src/main/java/ifc/container/_XChild.java | 2 +-
.../src/main/java/ifc/container/_XContainer.java | 4 +-
.../main/java/ifc/container/_XIndexReplace.java | 4 +-
.../src/main/java/ifc/container/_XNameReplace.java | 6 +-
.../clipboard/_XClipboardNotifier.java | 4 +-
.../src/main/java/ifc/document/_LinkTarget.java | 2 +-
.../src/main/java/ifc/document/_Settings.java | 2 +-
.../java/ifc/document/_XDocumentInfoSupplier.java | 2 +-
.../java/ifc/document/_XDocumentInsertable.java | 2 +-
.../main/java/ifc/document/_XEventBroadcaster.java | 4 +-
.../src/main/java/ifc/document/_XFilter.java | 2 +-
.../ifc/document/_XStandaloneDocumentInfo.java | 4 +-
.../main/java/ifc/document/_XViewDataSupplier.java | 2 +-
.../java/ifc/drawing/_DrawingDocumentDrawView.java | 8 +-
.../src/main/java/ifc/drawing/_FillProperties.java | 8 +-
.../main/java/ifc/drawing/_GraphicObjectShape.java | 4 +-
.../java/ifc/drawing/_LineShapeDescriptor.java | 2 +-
.../main/java/ifc/drawing/_ShapeDescriptor.java | 2 +-
.../main/java/ifc/drawing/_XConnectorShape.java | 4 +-
.../src/main/java/ifc/drawing/_XControlShape.java | 2 +-
.../java/ifc/drawing/_XDrawPageDuplicator.java | 6 +-
.../src/main/java/ifc/drawing/_XDrawView.java | 4 +-
.../src/main/java/ifc/drawing/_XLayerSupplier.java | 2 +-
.../src/main/java/ifc/drawing/_XShapeBinder.java | 2 +-
.../src/main/java/ifc/drawing/_XShapeCombiner.java | 2 +-
.../main/java/ifc/drawing/_XShapeDescriptor.java | 2 +-
.../src/main/java/ifc/drawing/_XShapeGrouper.java | 2 +-
.../main/java/ifc/form/_XChangeBroadcaster.java | 4 +-
.../ifc/form/_XDatabaseParameterBroadcaster.java | 2 +-
.../src/main/java/ifc/form/_XFormController.java | 4 +-
.../OOoRunner/src/main/java/ifc/form/_XSubmit.java | 2 +-
.../validation/_XValidatableFormComponent.java | 2 +-
.../validation/_XValidityConstraintListener.java | 2 +-
.../src/main/java/ifc/frame/_XDesktop.java | 4 +-
.../src/main/java/ifc/frame/_XDispatch.java | 2 +-
.../main/java/ifc/frame/_XDispatchProvider.java | 4 +-
.../main/java/ifc/frame/_XDispatchRecorder.java | 2 +-
.../java/ifc/frame/_XDispatchRecorderSupplier.java | 8 +-
.../main/java/ifc/frame/_XDocumentTemplates.java | 12 +-
.../src/main/java/ifc/frame/_XFrameLoader.java | 2 +-
.../src/main/java/ifc/frame/_XFramesSupplier.java | 12 +-
.../java/ifc/frame/_XSynchronousFrameLoader.java | 4 +-
.../src/main/java/ifc/io/_XActiveDataSink.java | 2 +-
.../src/main/java/ifc/io/_XActiveDataSource.java | 2 +-
.../src/main/java/ifc/io/_XConnectable.java | 2 +-
.../src/main/java/ifc/io/_XDataInputStream.java | 2 +-
.../src/main/java/ifc/io/_XInputStream.java | 2 +-
.../src/main/java/ifc/io/_XObjectInputStream.java | 4 +-
.../src/main/java/ifc/io/_XObjectOutputStream.java | 4 +-
.../src/main/java/ifc/io/_XPersistObject.java | 28 +-
.../src/main/java/ifc/lang/_ServiceManager.java | 2 +-
.../java/ifc/loader/_XImplementationLoader.java | 2 +-
.../main/java/ifc/reflection/_XProxyFactory.java | 2 +-
.../ifc/script/_XInvocationAdapterFactory.java | 4 +-
.../ifc/script/_XInvocationAdapterFactory2.java | 4 +-
.../main/java/ifc/sdb/_DataAccessDescriptor.java | 12 +-
.../OOoRunner/src/main/java/ifc/sdb/_RowSet.java | 4 +-
.../java/ifc/sdb/_XSingleSelectQueryAnalyzer.java | 2 +-
.../java/ifc/sdb/_XSingleSelectQueryComposer.java | 4 +-
.../src/main/java/ifc/sdbc/_XCloseable.java | 2 +-
.../src/main/java/ifc/sdbc/_XParameters.java | 4 +-
.../src/main/java/ifc/sdbc/_XResultSet.java | 4 +-
.../src/main/java/ifc/sdbc/_XResultSetUpdate.java | 2 +-
.../src/main/java/ifc/sdbc/_XRowUpdate.java | 4 +-
.../src/main/java/ifc/sdbcx/_XColumnsSupplier.java | 2 +-
.../java/ifc/sdbcx/_XDataDefinitionSupplier.java | 2 +-
.../src/main/java/ifc/sdbcx/_XDeleteRows.java | 4 +-
.../src/main/java/ifc/sdbcx/_XTablesSupplier.java | 2 +-
.../main/java/ifc/sheet/_FunctionDescription.java | 4 +-
.../src/main/java/ifc/sheet/_Scenario.java | 2 +-
.../OOoRunner/src/main/java/ifc/sheet/_Shape.java | 4 +-
.../ifc/sheet/_SpreadsheetDocumentSettings.java | 4 +-
.../java/ifc/sheet/_XActivationBroadcaster.java | 2 +-
.../main/java/ifc/sheet/_XArrayFormulaRange.java | 2 +-
.../main/java/ifc/sheet/_XCellRangeMovement.java | 18 +-
.../main/java/ifc/sheet/_XCellRangeReferrer.java | 2 +-
.../src/main/java/ifc/sheet/_XCellRangesQuery.java | 6 +-
.../src/main/java/ifc/sheet/_XCellSeries.java | 2 +-
.../main/java/ifc/sheet/_XDataPilotDescriptor.java | 6 +-
.../java/ifc/sheet/_XDataPilotFieldGrouping.java | 4 +-
.../src/main/java/ifc/sheet/_XDataPilotTable2.java | 20 +-
.../main/java/ifc/sheet/_XDocumentAuditing.java | 26 +-
.../ifc/sheet/_XEnhancedMouseClickBroadcaster.java | 4 +-
.../src/main/java/ifc/sheet/_XFormulaQuery.java | 2 +-
.../src/main/java/ifc/sheet/_XGoalSeek.java | 6 +-
.../main/java/ifc/sheet/_XMultipleOperation.java | 6 +-
.../src/main/java/ifc/sheet/_XNamedRanges.java | 6 +-
.../src/main/java/ifc/sheet/_XRangeSelection.java | 18 +-
.../main/java/ifc/sheet/_XScenarioEnhanced.java | 2 +-
.../src/main/java/ifc/sheet/_XSheetAnnotation.java | 4 +-
.../java/ifc/sheet/_XSheetAnnotationAnchor.java | 4 +-
.../src/main/java/ifc/sheet/_XSheetAuditing.java | 12 +-
.../src/main/java/ifc/sheet/_XSheetCellCursor.java | 38 +-
.../src/main/java/ifc/sheet/_XSheetFilterable.java | 8 +-
.../main/java/ifc/sheet/_XSheetFilterableEx.java | 2 +-
.../src/main/java/ifc/sheet/_XSheetOutline.java | 2 +-
.../src/main/java/ifc/sheet/_XSpreadsheet.java | 2 +-
.../java/ifc/sheet/_XSubTotalCalculatable.java | 2 +-
.../src/main/java/ifc/sheet/_XUsedAreaCursor.java | 4 +-
.../main/java/ifc/style/_CharacterProperties.java | 8 +-
.../src/main/java/ifc/style/_PageProperties.java | 8 +-
.../main/java/ifc/style/_ParagraphProperties.java | 12 +-
.../main/java/ifc/system/_XSystemShellExecute.java | 2 +-
.../src/main/java/ifc/table/_CellProperties.java | 8 +-
.../src/main/java/ifc/table/_TableColumn.java | 2 +-
.../src/main/java/ifc/table/_XAutoFormattable.java | 6 +-
.../src/main/java/ifc/table/_XCellCursor.java | 14 +-
.../src/main/java/ifc/table/_XTableColumns.java | 4 +-
.../main/java/ifc/task/_XInteractionHandler.java | 4 +-
.../src/main/java/ifc/text/_BaseIndex.java | 8 +-
.../src/main/java/ifc/text/_CellProperties.java | 3 +-
.../src/main/java/ifc/text/_MailMerge.java | 12 +-
.../src/main/java/ifc/text/_TextColumns.java | 2 +-
.../src/main/java/ifc/text/_TextGraphicObject.java | 4 +-
.../src/main/java/ifc/text/_TextSection.java | 12 +-
.../src/main/java/ifc/text/_XDocumentIndex.java | 4 +-
.../java/ifc/text/_XRelativeTextContentInsert.java | 2 +-
.../main/java/ifc/text/_XTextFieldsSupplier.java | 16 +-
.../src/main/java/ifc/text/_XTextRangeCompare.java | 2 +-
.../ucb/_XCachedDynamicResultSetStubFactory.java | 2 +-
.../src/main/java/ifc/ucb/_XCommandProcessor.java | 2 +-
.../java/ifc/ucb/_XContentProviderManager.java | 4 +-
.../src/main/java/ifc/ucb/_XSimpleFileAccess.java | 2 +-
.../ifc/ucb/_XSortedDynamicResultSetFactory.java | 10 +-
.../java/ifc/ui/_XContextMenuInterception.java | 10 +-
.../ui/_XModuleUIConfigurationManagerSupplier.java | 2 +-
.../main/java/ifc/ui/_XUIConfigurationManager.java | 18 +-
.../main/java/ifc/ui/dialogs/_XControlAccess.java | 2 +-
.../java/ifc/ui/dialogs/_XExecutableDialog.java | 4 +-
.../java/ifc/ui/dialogs/_XFilePickerNotifier.java | 8 +-
.../src/main/java/ifc/uno/_XComponentContext.java | 2 +-
.../src/main/java/ifc/util/_XCloneable.java | 4 +-
.../src/main/java/ifc/util/_XImportable.java | 2 +-
.../src/main/java/ifc/view/_XControlAccess.java | 8 +-
.../main/java/ifc/view/_XPrintJobBroadcaster.java | 2 +-
.../src/main/java/ifc/view/_XPrintable.java | 2 +-
.../ifc/xml/_UserDefinedAttributeSupplier.java | 8 +-
.../src/main/java/lib/MultiPropertyTest.java | 2 +-
.../src/main/java/lib/TestParameters.java | 2 +-
.../src/main/java/mod/_basctl/AccessibleShape.java | 8 +-
.../mod/_cached/CachedContentResultSetFactory.java | 12 +-
.../_cached/CachedContentResultSetStubFactory.java | 10 +-
.../mod/_cached/CachedDynamicResultSetFactory.java | 12 +-
.../_cached/CachedDynamicResultSetStubFactory.java | 10 +-
.../main/java/mod/_cnt/ChaosContentProvider.java | 2 +-
.../main/java/mod/_cnt/CntUnoDataContainer.java | 2 +-
.../mod/_dbaccess/ConnectionLineAccessibility.java | 16 +-
.../java/mod/_dbaccess/JoinViewAccessibility.java | 16 +-
.../main/java/mod/_dbaccess/ODatabaseContext.java | 8 +-
.../main/java/mod/_dbaccess/ODatabaseSource.java | 8 +-
.../java/mod/_dbaccess/ODatasourceBrowser.java | 16 +-
.../src/main/java/mod/_dbaccess/OQueryDesign.java | 28 +-
.../main/java/mod/_dbaccess/OSQLMessageDialog.java | 4 +-
.../mod/_dbaccess/OSingleSelectQueryComposer.java | 20 +-
.../main/java/mod/_dbaccess/SbaXGridControl.java | 32 +-
.../mod/_dbaccess/TableWindowAccessibility.java | 18 +-
.../src/main/java/mod/_forms/GenericModelTest.java | 18 +-
.../src/main/java/mod/_forms/OButtonControl.java | 6 +-
.../src/main/java/mod/_forms/OCheckBoxControl.java | 8 +-
.../src/main/java/mod/_forms/OComboBoxControl.java | 8 +-
.../src/main/java/mod/_forms/OCurrencyControl.java | 8 +-
.../src/main/java/mod/_forms/ODatabaseForm.java | 46 +-
.../src/main/java/mod/_forms/ODateControl.java | 8 +-
.../src/main/java/mod/_forms/OEditControl.java | 10 +-
.../main/java/mod/_forms/OFileControlModel.java | 8 +-
.../main/java/mod/_forms/OFormattedControl.java | 8 +-
.../src/main/java/mod/_forms/OFormsCollection.java | 4 +-
.../main/java/mod/_forms/OGridControlModel.java | 14 +-
.../src/main/java/mod/_forms/OGroupBoxControl.java | 4 +-
.../src/main/java/mod/_forms/OHiddenModel.java | 8 +-
.../main/java/mod/_forms/OImageButtonControl.java | 6 +-
.../main/java/mod/_forms/OImageControlControl.java | 6 +-
.../src/main/java/mod/_forms/OListBoxControl.java | 10 +-
.../src/main/java/mod/_forms/OListBoxModel.java | 4 +-
.../java/mod/_forms/ONavigationBarControl.java | 4 +-
.../src/main/java/mod/_forms/ONumericControl.java | 8 +-
.../src/main/java/mod/_forms/OPatternControl.java | 8 +-
.../main/java/mod/_forms/ORadioButtonControl.java | 6 +-
.../src/main/java/mod/_forms/OScrollBarModel.java | 2 +-
.../src/main/java/mod/_forms/OSpinButtonModel.java | 2 +-
.../src/main/java/mod/_forms/OTimeControl.java | 8 +-
.../src/main/java/mod/_forms/OTimeModel.java | 4 +-
.../main/java/mod/_fwk/ControlMenuController.java | 6 +-
.../OOoRunner/src/main/java/mod/_fwk/Desktop.java | 2 +-
.../src/main/java/mod/_fwk/DispatchRecorder.java | 12 +-
.../src/main/java/mod/_fwk/DocumentProperties.java | 4 +-
.../OOoRunner/src/main/java/mod/_fwk/Frame.java | 4 +-
.../src/main/java/mod/_fwk/JobExecutor.java | 32 +-
.../src/main/java/mod/_fwk/LayoutManager.java | 6 +-
.../src/main/java/mod/_fwk/ModuleManager.java | 14 +-
.../mod/_fwk/ModuleUIConfigurationManager.java | 18 +-
.../main/java/mod/_fwk/ObjectMenuController.java | 2 +-
.../java/mod/_fwk/PopupMenuControllerFactory.java | 8 +-
.../java/mod/_fwk/StatusBarControllerFactory.java | 4 +-
.../main/java/mod/_fwk/UIConfigurationManager.java | 12 +-
.../java/mod/_fwk/UIElementFactoryManager.java | 2 +-
.../main/java/mod/_fwl/ContentHandlerFactory.java | 2 +-
.../src/main/java/mod/_fwl/FilterFactory.java | 2 +-
.../src/main/java/mod/_fwl/FrameLoaderFactory.java | 2 +-
.../src/main/java/mod/_fwl/PathSettings.java | 2 +-
.../src/main/java/mod/_fwl/TypeDetection.java | 4 +-
.../OOoRunner/src/main/java/mod/_lng/DicList.java | 2 +-
.../src/main/java/mod/_lnn/Hyphenator.java | 2 +-
.../src/main/java/mod/_lnn/SpellChecker.java | 2 +-
.../src/main/java/mod/_pcr/ObjectInspector.java | 18 +-
.../main/java/mod/_pcr/ObjectInspectorModel.java | 8 +-
.../_rdbtdp/RegistryTypeDescriptionProvider.java | 10 +-
.../RegistryTypeDescriptionProvider.java | 10 +-
.../main/java/mod/_remotebridge.uno/various.java | 16 +-
.../src/main/java/mod/_remotebridge/various.java | 16 +-
.../AccessibleEditableTextPara_HeaderFooter.java | 18 +-
.../AccessibleEditableTextPara_PreviewCell.java | 14 +-
.../src/main/java/mod/_sc/ScAccessibleCell.java | 16 +-
.../src/main/java/mod/_sc/ScAccessibleCsvCell.java | 8 +-
.../src/main/java/mod/_sc/ScAccessibleCsvGrid.java | 6 +-
.../main/java/mod/_sc/ScAccessibleCsvRuler.java | 10 +-
.../main/java/mod/_sc/ScAccessibleDocument.java | 2 +-
.../mod/_sc/ScAccessibleDocumentPagePreview.java | 26 +-
.../main/java/mod/_sc/ScAccessiblePageHeader.java | 30 +-
.../java/mod/_sc/ScAccessiblePageHeaderArea.java | 18 +-
.../main/java/mod/_sc/ScAccessiblePreviewCell.java | 14 +-
.../mod/_sc/ScAccessiblePreviewHeaderCell.java | 22 +-
.../java/mod/_sc/ScAccessiblePreviewTable.java | 16 +-
.../main/java/mod/_sc/ScAccessibleSpreadsheet.java | 10 +-
.../src/main/java/mod/_sc/ScAnnotationObj.java | 14 +-
.../main/java/mod/_sc/ScAnnotationShapeObj.java | 20 +-
.../main/java/mod/_sc/ScAnnotationTextCursor.java | 12 +-
.../src/main/java/mod/_sc/ScAnnotationsObj.java | 18 +-
.../src/main/java/mod/_sc/ScAreaLinkObj.java | 12 +-
.../src/main/java/mod/_sc/ScAreaLinksObj.java | 10 +-
.../main/java/mod/_sc/ScAutoFormatFieldObj.java | 12 +-
.../src/main/java/mod/_sc/ScAutoFormatObj.java | 8 +-
.../src/main/java/mod/_sc/ScAutoFormatsObj.java | 8 +-
.../src/main/java/mod/_sc/ScCellCursorObj.java | 12 +-
.../src/main/java/mod/_sc/ScCellFieldObj.java | 18 +-
.../src/main/java/mod/_sc/ScCellFieldsObj.java | 16 +-
.../java/mod/_sc/ScCellFormatsEnumeration.java | 12 +-
.../src/main/java/mod/_sc/ScCellFormatsObj.java | 10 +-
.../OOoRunner/src/main/java/mod/_sc/ScCellObj.java | 12 +-
.../src/main/java/mod/_sc/ScCellRangeObj.java | 14 +-
.../src/main/java/mod/_sc/ScCellRangesObj.java | 14 +-
.../src/main/java/mod/_sc/ScCellSearchObj.java | 10 +-
.../src/main/java/mod/_sc/ScCellTextCursor.java | 10 +-
.../src/main/java/mod/_sc/ScCellsEnumeration.java | 14 +-
.../src/main/java/mod/_sc/ScCellsObj.java | 14 +-
.../src/main/java/mod/_sc/ScChartObj.java | 22 +-
.../src/main/java/mod/_sc/ScChartsObj.java | 14 +-
.../java/mod/_sc/ScConsolidationDescriptor.java | 4 +-
.../src/main/java/mod/_sc/ScDDELinkObj.java | 18 +-
.../src/main/java/mod/_sc/ScDDELinksObj.java | 12 +-
.../java/mod/_sc/ScDataPilotFieldGroupItemObj.java | 50 +-
.../java/mod/_sc/ScDataPilotFieldGroupObj.java | 48 +-
.../java/mod/_sc/ScDataPilotFieldGroupsObj.java | 44 +-
.../src/main/java/mod/_sc/ScDataPilotFieldObj.java | 24 +-
.../main/java/mod/_sc/ScDataPilotFieldsObj.java | 10 +-
.../src/main/java/mod/_sc/ScDataPilotItemObj.java | 28 +-
.../src/main/java/mod/_sc/ScDataPilotItemsObj.java | 26 +-
.../src/main/java/mod/_sc/ScDataPilotTableObj.java | 20 +-
.../main/java/mod/_sc/ScDataPilotTablesObj.java | 10 +-
.../src/main/java/mod/_sc/ScDatabaseRangeObj.java | 24 +-
.../src/main/java/mod/_sc/ScDatabaseRangesObj.java | 8 +-
.../main/java/mod/_sc/ScDocumentConfiguration.java | 2 +-
.../src/main/java/mod/_sc/ScDrawPageObj.java | 10 +-
.../src/main/java/mod/_sc/ScDrawPagesObj.java | 4 +-
.../main/java/mod/_sc/ScFilterDescriptorBase.java | 10 +-
.../java/mod/_sc/ScFunctionDescriptionObj.java | 2 +-
.../src/main/java/mod/_sc/ScFunctionListObj.java | 2 +-
.../src/main/java/mod/_sc/ScHeaderFieldObj.java | 24 +-
.../src/main/java/mod/_sc/ScHeaderFieldsObj.java | 24 +-
.../java/mod/_sc/ScHeaderFooterContentObj.java | 18 +-
.../java/mod/_sc/ScHeaderFooterTextCursor.java | 18 +-
.../main/java/mod/_sc/ScHeaderFooterTextObj.java | 18 +-
.../main/java/mod/_sc/ScImportDescriptorBase.java | 8 +-
...ndexEnumeration_CellAnnotationsEnumeration.java | 12 +-
...cIndexEnumeration_CellAreaLinksEnumeration.java | 12 +-
.../ScIndexEnumeration_DDELinksEnumeration.java | 14 +-
...ndexEnumeration_DataPilotFieldsEnumeration.java | 12 +-
...IndexEnumeration_DataPilotItemsEnumeration.java | 28 +-
...ndexEnumeration_DataPilotTablesEnumeration.java | 12 +-
...IndexEnumeration_DatabaseRangesEnumeration.java | 10 +-
...Enumeration_FunctionDescriptionEnumeration.java | 4 +-
.../ScIndexEnumeration_LabelRangesEnumeration.java | 8 +-
.../ScIndexEnumeration_NamedRangesEnumeration.java | 8 +-
.../ScIndexEnumeration_ScenariosEnumeration.java | 16 +-
...ndexEnumeration_SheetCellRangesEnumeration.java | 14 +-
.../ScIndexEnumeration_SheetLinksEnumeration.java | 16 +-
...numeration_SpreadsheetViewPanesEnumeration.java | 12 +-
...ScIndexEnumeration_SpreadsheetsEnumeration.java | 6 +-
...IndexEnumeration_SubTotalFieldsEnumeration.java | 14 +-
...ndexEnumeration_TableAutoFormatEnumeration.java | 4 +-
.../ScIndexEnumeration_TableChartsEnumeration.java | 16 +-
...ScIndexEnumeration_TableColumnsEnumeration.java | 12 +-
...umeration_TableConditionalEntryEnumeration.java | 14 +-
.../ScIndexEnumeration_TableRowsEnumeration.java | 12 +-
.../ScIndexEnumeration_TextFieldEnumeration.java | 16 +-
.../src/main/java/mod/_sc/ScLabelRangeObj.java | 10 +-
.../src/main/java/mod/_sc/ScLabelRangesObj.java | 6 +-
.../src/main/java/mod/_sc/ScModelObj.java | 20 +-
.../src/main/java/mod/_sc/ScNamedRangeObj.java | 10 +-
.../src/main/java/mod/_sc/ScNamedRangesObj.java | 12 +-
.../main/java/mod/_sc/ScRecentFunctionsObj.java | 4 +-
.../src/main/java/mod/_sc/ScScenariosObj.java | 14 +-
.../src/main/java/mod/_sc/ScShapeObj.java | 2 +-
.../src/main/java/mod/_sc/ScSheetLinkObj.java | 18 +-
.../src/main/java/mod/_sc/ScSheetLinksObj.java | 14 +-
.../main/java/mod/_sc/ScSortDescriptorBase.java | 8 +-
.../java/mod/_sc/ScSpreadsheetSettingsObj.java | 2 +-
.../src/main/java/mod/_sc/ScStyleFamiliesObj.java | 4 +-
.../src/main/java/mod/_sc/ScStyleFamilyObj.java | 14 +-
.../src/main/java/mod/_sc/ScStyleObj.java | 36 +-
.../java/mod/_sc/ScSubTotalDescriptorBase.java | 10 +-
.../src/main/java/mod/_sc/ScSubTotalFieldObj.java | 16 +-
.../src/main/java/mod/_sc/ScTabViewObj.java | 28 +-
.../src/main/java/mod/_sc/ScTableColumnObj.java | 16 +-
.../src/main/java/mod/_sc/ScTableColumnsObj.java | 10 +-
.../main/java/mod/_sc/ScTableConditionalEntry.java | 16 +-
.../java/mod/_sc/ScTableConditionalFormat.java | 16 +-
.../src/main/java/mod/_sc/ScTableRowObj.java | 16 +-
.../src/main/java/mod/_sc/ScTableRowsObj.java | 10 +-
.../src/main/java/mod/_sc/ScTableSheetObj.java | 16 +-
.../src/main/java/mod/_sc/ScTableSheetsObj.java | 4 +-
.../main/java/mod/_sc/ScTableValidationObj.java | 14 +-
.../mod/_sc/ScUniqueCellFormatsEnumeration.java | 10 +-
.../main/java/mod/_sc/ScUniqueCellFormatsObj.java | 8 +-
.../src/main/java/mod/_sc/ScViewPaneObj.java | 22 +-
.../src/main/java/mod/_sc/XMLContentExporter.java | 10 +-
.../src/main/java/mod/_sc/XMLContentImporter.java | 4 +-
.../src/main/java/mod/_sc/XMLExporter.java | 12 +-
.../src/main/java/mod/_sc/XMLImporter.java | 6 +-
.../src/main/java/mod/_sc/XMLMetaExporter.java | 6 +-
.../src/main/java/mod/_sc/XMLMetaImporter.java | 8 +-
.../src/main/java/mod/_sc/XMLSettingsExporter.java | 6 +-
.../src/main/java/mod/_sc/XMLSettingsImporter.java | 8 +-
.../src/main/java/mod/_sc/XMLStylesExporter.java | 10 +-
.../src/main/java/mod/_sc/XMLStylesImporter.java | 8 +-
.../OOoRunner/src/main/java/mod/_sch/AccArea.java | 4 +-
.../OOoRunner/src/main/java/mod/_sch/AccAxis.java | 4 +-
.../src/main/java/mod/_sch/AccDataPoint.java | 4 +-
.../src/main/java/mod/_sch/AccDataSeries.java | 4 +-
.../src/main/java/mod/_sch/AccDiagram.java | 4 +-
.../OOoRunner/src/main/java/mod/_sch/AccFloor.java | 6 +-
.../OOoRunner/src/main/java/mod/_sch/AccGrid.java | 4 +-
.../src/main/java/mod/_sch/AccLegend.java | 4 +-
.../src/main/java/mod/_sch/AccLegendEntry.java | 4 +-
.../main/java/mod/_sch/AccStatisticsObject.java | 6 +-
.../OOoRunner/src/main/java/mod/_sch/AccTitle.java | 4 +-
.../OOoRunner/src/main/java/mod/_sch/AccWall.java | 6 +-
.../main/java/mod/_sch/AccessibleDocumentView.java | 2 +-
.../src/main/java/mod/_sch/ChXChartAxis.java | 2 +-
.../src/main/java/mod/_sch/ChXChartDocument.java | 2 +-
.../src/main/java/mod/_sch/ChXChartView.java | 6 +-
.../src/main/java/mod/_sch/ChXDataPoint.java | 2 +-
.../src/main/java/mod/_sch/ChXDataRow.java | 2 +-
.../src/main/java/mod/_sch/ChXDiagram.java | 24 +-
.../src/main/java/mod/_sch/ChartArea.java | 2 +-
.../src/main/java/mod/_sch/ChartGrid.java | 2 +-
.../src/main/java/mod/_sch/ChartLegend.java | 2 +-
.../src/main/java/mod/_sch/ChartLine.java | 4 +-
.../java/mod/_sd/AccessibleDrawDocumentView.java | 12 +-
.../main/java/mod/_sd/AccessibleOutlineView.java | 8 +-
.../src/main/java/mod/_sd/AccessibleSlideView.java | 8 +-
.../main/java/mod/_sd/DrawController_DrawView.java | 26 +-
.../java/mod/_sd/DrawController_HandoutView.java | 30 +-
.../java/mod/_sd/DrawController_NotesView.java | 30 +-
.../java/mod/_sd/DrawController_OutlineView.java | 30 +-
.../mod/_sd/DrawController_PresentationView.java | 30 +-
.../src/main/java/mod/_sd/SdDocLinkTargets.java | 2 +-
.../src/main/java/mod/_sd/SdDrawPage.java | 12 +-
.../src/main/java/mod/_sd/SdDrawPagesAccess.java | 2 +-
.../src/main/java/mod/_sd/SdGenericDrawPage.java | 10 +-
.../OOoRunner/src/main/java/mod/_sd/SdLayer.java | 10 +-
.../src/main/java/mod/_sd/SdLayerManager.java | 12 +-
.../src/main/java/mod/_sd/SdMasterPage.java | 10 +-
.../src/main/java/mod/_sd/SdMasterPagesAccess.java | 2 +-
.../src/main/java/mod/_sd/SdPageLinkTargets.java | 6 +-
.../src/main/java/mod/_sd/SdUnoDrawView.java | 26 +-
.../src/main/java/mod/_sd/SdUnoOutlineView.java | 18 +-
.../src/main/java/mod/_sd/SdUnoPresView.java | 32 +-
.../src/main/java/mod/_sd/SdUnoSlideView.java | 12 +-
.../main/java/mod/_sd/SdXCustomPresentation.java | 20 +-
.../java/mod/_sd/SdXCustomPresentationAccess.java | 6 +-
.../src/main/java/mod/_sd/SdXImpressDocument.java | 8 +-
.../src/main/java/mod/_sd/SdXPresentation.java | 6 +-
.../OOoRunner/src/main/java/mod/_sd/SdXShape.java | 22 +-
.../java/mod/_servicemgr.uno/OServiceManager.java | 10 +-
.../src/main/java/mod/_sfx/DocumentTemplates.java | 2 +-
.../main/java/mod/_sfx/StandaloneDocumentInfo.java | 2 +-
.../src/main/java/mod/_sm/SmEditAccessible.java | 6 +-
.../src/main/java/mod/_sm/SmGraphicAccessible.java | 6 +-
.../src/main/java/mod/_sm/XMLExporter.java | 4 +-
.../src/main/java/mod/_sm/XMLImporter.java | 2 +-
.../src/main/java/mod/_sm/XMLMetaExporter.java | 4 +-
.../src/main/java/mod/_sm/XMLMetaImporter.java | 4 +-
.../src/main/java/mod/_sm/XMLSettingsExporter.java | 4 +-
.../src/main/java/mod/_sm/XMLSettingsImporter.java | 2 +-
.../src/main/java/mod/_smgr/OServiceManager.java | 10 +-
.../src/main/java/mod/_stm/DataInputStream.java | 10 +-
.../src/main/java/mod/_stm/DataOutputStream.java | 10 +-
.../main/java/mod/_stm/MarkableInputStream.java | 8 +-
.../main/java/mod/_stm/MarkableOutputStream.java | 12 +-
.../src/main/java/mod/_stm/ObjectInputStream.java | 24 +-
.../src/main/java/mod/_stm/ObjectOutputStream.java | 28 +-
.../OOoRunner/src/main/java/mod/_stm/Pipe.java | 2 +-
.../OOoRunner/src/main/java/mod/_stm/Pump.java | 4 +-
.../java/mod/_streams.uno/DataInputStream.java | 10 +-
.../java/mod/_streams.uno/DataOutputStream.java | 10 +-
.../java/mod/_streams.uno/MarkableInputStream.java | 8 +-
.../mod/_streams.uno/MarkableOutputStream.java | 12 +-
.../java/mod/_streams.uno/ObjectInputStream.java | 24 +-
.../java/mod/_streams.uno/ObjectOutputStream.java | 28 +-
.../src/main/java/mod/_streams.uno/Pipe.java | 2 +-
.../src/main/java/mod/_streams.uno/Pump.java | 4 +-
.../java/mod/_svtools/AccessibleBrowseBox.java | 8 +-
.../mod/_svtools/AccessibleBrowseBoxHeaderBar.java | 10 +-
.../_svtools/AccessibleBrowseBoxHeaderCell.java | 8 +-
.../mod/_svtools/AccessibleBrowseBoxTable.java | 8 +-
.../mod/_svtools/AccessibleBrowseBoxTableCell.java | 8 +-
.../mod/_svtools/AccessibleIconChoiceCtrl.java | 16 +-
.../_svtools/AccessibleIconChoiceCtrlEntry.java | 12 +-
.../main/java/mod/_svtools/AccessibleTabBar.java | 4 +-
.../java/mod/_svtools/AccessibleTabBarPage.java | 8 +-
.../mod/_svtools/AccessibleTabBarPageList.java | 10 +-
.../java/mod/_svtools/AccessibleTreeListBox.java | 6 +-
.../mod/_svtools/AccessibleTreeListBoxEntry.java | 12 +-
.../main/java/mod/_svx/AccessibleControlShape.java | 2 +-
.../java/mod/_svx/AccessibleEditableTextPara.java | 8 +-
.../main/java/mod/_svx/AccessibleGraphicShape.java | 2 +-
.../src/main/java/mod/_svx/AccessibleOLEShape.java | 4 +-
.../main/java/mod/_svx/AccessiblePageShape.java | 4 +-
.../_svx/AccessiblePresentationGraphicShape.java | 8 +-
.../mod/_svx/AccessiblePresentationOLEShape.java | 8 +-
.../java/mod/_svx/AccessiblePresentationShape.java | 8 +-
.../src/main/java/mod/_svx/AccessibleShape.java | 2 +-
.../src/main/java/mod/_svx/GraphicExporter.java | 8 +-
.../src/main/java/mod/_svx/SvxDrawPage.java | 10 +-
.../mod/_svx/SvxGraphCtrlAccessibleContext.java | 20 +-
.../src/main/java/mod/_svx/SvxGraphicObject.java | 24 +-
.../OOoRunner/src/main/java/mod/_svx/SvxShape.java | 12 +-
.../src/main/java/mod/_svx/SvxShapeCircle.java | 14 +-
.../src/main/java/mod/_svx/SvxShapeCollection.java | 2 +-
.../src/main/java/mod/_svx/SvxShapeConnector.java | 16 +-
.../src/main/java/mod/_svx/SvxShapeControl.java | 12 +-
.../main/java/mod/_svx/SvxShapeDimensioning.java | 12 +-
.../src/main/java/mod/_svx/SvxShapeGroup.java | 24 +-
.../main/java/mod/_svx/SvxShapePolyPolygon.java | 18 +-
.../java/mod/_svx/SvxShapePolyPolygonBezier.java | 18 +-
.../main/java/mod/_svx/SvxUnoNumberingRules.java | 4 +-
.../src/main/java/mod/_svx/SvxUnoText.java | 4 +-
.../src/main/java/mod/_svx/SvxUnoTextContent.java | 8 +-
.../main/java/mod/_svx/SvxUnoTextContentEnum.java | 4 +-
.../src/main/java/mod/_svx/SvxUnoTextCursor.java | 2 +-
.../src/main/java/mod/_svx/SvxUnoTextField.java | 6 +-
.../src/main/java/mod/_svx/SvxUnoTextRange.java | 14 +-
.../java/mod/_svx/SvxUnoTextRangeEnumeration.java | 10 +-
.../src/main/java/mod/_sw/CharacterStyle.java | 20 +-
.../java/mod/_sw/ConditionalParagraphStyle.java | 18 +-
.../OOoRunner/src/main/java/mod/_sw/PageStyle.java | 18 +-
.../src/main/java/mod/_sw/ParagraphStyle.java | 18 +-
.../java/mod/_sw/SwAccessibleDocumentPageView.java | 6 +-
.../java/mod/_sw/SwAccessibleDocumentView.java | 4 +-
.../main/java/mod/_sw/SwAccessibleEndnoteView.java | 10 +-
.../main/java/mod/_sw/SwAccessibleFooterView.java | 16 +-
.../java/mod/_sw/SwAccessibleFootnoteView.java | 8 +-
.../main/java/mod/_sw/SwAccessibleHeaderView.java | 14 +-
.../main/java/mod/_sw/SwAccessiblePageView.java | 24 +-
.../java/mod/_sw/SwAccessibleParagraphView.java | 2 +-
.../java/mod/_sw/SwAccessibleTableCellView.java | 4 +-
.../main/java/mod/_sw/SwAccessibleTableView.java | 4 +-
.../mod/_sw/SwAccessibleTextEmbeddedObject.java | 4 +-
.../java/mod/_sw/SwAccessibleTextFrameView.java | 8 +-
.../mod/_sw/SwAccessibleTextGraphicObject.java | 6 +-
.../main/java/mod/_sw/SwXAutoTextContainer.java | 2 +-
.../src/main/java/mod/_sw/SwXAutoTextEntry.java | 12 +-
.../src/main/java/mod/_sw/SwXAutoTextGroup.java | 8 +-
.../src/main/java/mod/_sw/SwXBookmark.java | 2 +-
.../src/main/java/mod/_sw/SwXBookmarks.java | 2 +-
.../OOoRunner/src/main/java/mod/_sw/SwXCell.java | 2 +-
.../src/main/java/mod/_sw/SwXCellRange.java | 4 +-
.../src/main/java/mod/_sw/SwXChapterNumbering.java | 2 +-
.../src/main/java/mod/_sw/SwXDocumentIndex.java | 4 +-
.../main/java/mod/_sw/SwXDocumentIndexMark.java | 6 +-
.../src/main/java/mod/_sw/SwXDocumentIndexes.java | 2 +-
.../src/main/java/mod/_sw/SwXDrawPage.java | 4 +-
.../main/java/mod/_sw/SwXEndnoteProperties.java | 8 +-
.../src/main/java/mod/_sw/SwXFieldEnumeration.java | 10 +-
.../src/main/java/mod/_sw/SwXFieldMaster.java | 2 +-
.../src/main/java/mod/_sw/SwXFootnote.java | 6 +-
.../main/java/mod/_sw/SwXFootnoteProperties.java | 6 +-
.../src/main/java/mod/_sw/SwXFootnoteText.java | 6 +-
.../src/main/java/mod/_sw/SwXFootnotes.java | 6 +-
.../OOoRunner/src/main/java/mod/_sw/SwXFrames.java | 6 +-
.../src/main/java/mod/_sw/SwXHeadFootText.java | 14 +-
.../java/mod/_sw/SwXLineNumberingProperties.java | 2 +-
.../src/main/java/mod/_sw/SwXMailMerge.java | 26 +-
.../src/main/java/mod/_sw/SwXNumberingRules.java | 20 +-
.../src/main/java/mod/_sw/SwXParagraph.java | 24 +-
.../main/java/mod/_sw/SwXParagraphEnumeration.java | 2 +-
.../src/main/java/mod/_sw/SwXPrintSettings.java | 2 +-
.../src/main/java/mod/_sw/SwXPropertySetInfo.java | 2 +-
.../src/main/java/mod/_sw/SwXReferenceMark.java | 8 +-
.../src/main/java/mod/_sw/SwXReferenceMarks.java | 12 +-
.../OOoRunner/src/main/java/mod/_sw/SwXShape.java | 4 +-
.../OOoRunner/src/main/java/mod/_sw/SwXStyle.java | 24 +-
.../src/main/java/mod/_sw/SwXStyleFamilies.java | 4 +-
.../src/main/java/mod/_sw/SwXStyleFamily.java | 12 +-
.../src/main/java/mod/_sw/SwXTableCellText.java | 2 +-
.../src/main/java/mod/_sw/SwXTextColumns.java | 18 +-
.../src/main/java/mod/_sw/SwXTextCursor.java | 4 +-
.../src/main/java/mod/_sw/SwXTextDefaults.java | 2 +-
.../src/main/java/mod/_sw/SwXTextDocument.java | 32 +-
.../main/java/mod/_sw/SwXTextEmbeddedObject.java | 18 +-
.../main/java/mod/_sw/SwXTextEmbeddedObjects.java | 8 +-
.../src/main/java/mod/_sw/SwXTextField.java | 10 +-
.../src/main/java/mod/_sw/SwXTextFieldMasters.java | 2 +-
.../src/main/java/mod/_sw/SwXTextFieldTypes.java | 2 +-
.../src/main/java/mod/_sw/SwXTextFrame.java | 8 +-
.../src/main/java/mod/_sw/SwXTextFrameText.java | 4 +-
.../main/java/mod/_sw/SwXTextGraphicObject.java | 10 +-
.../main/java/mod/_sw/SwXTextGraphicObjects.java | 6 +-
.../src/main/java/mod/_sw/SwXTextPortion.java | 16 +-
.../java/mod/_sw/SwXTextPortionEnumeration.java | 8 +-
.../src/main/java/mod/_sw/SwXTextRanges.java | 2 +-
.../src/main/java/mod/_sw/SwXTextSearch.java | 2 +-
.../src/main/java/mod/_sw/SwXTextSection.java | 28 +-
.../src/main/java/mod/_sw/SwXTextSections.java | 8 +-
.../src/main/java/mod/_sw/SwXTextTable.java | 12 +-
.../src/main/java/mod/_sw/SwXTextTableRow.java | 6 +-
.../src/main/java/mod/_sw/SwXTextTables.java | 4 +-
.../src/main/java/mod/_sw/SwXTextView.java | 22 +-
.../src/main/java/mod/_sw/SwXTextViewCursor.java | 2 +-
.../src/main/java/mod/_sw/SwXViewSettings.java | 2 +-
.../src/main/java/mod/_sw/XMLContentExporter.java | 2 +-
.../src/main/java/mod/_sw/XMLContentImporter.java | 4 +-
.../src/main/java/mod/_sw/XMLExporter.java | 2 +-
.../src/main/java/mod/_sw/XMLImporter.java | 4 +-
.../src/main/java/mod/_sw/XMLMetaExporter.java | 6 +-
.../src/main/java/mod/_sw/XMLMetaImporter.java | 6 +-
.../src/main/java/mod/_sw/XMLSettingsExporter.java | 4 +-
.../src/main/java/mod/_sw/XMLSettingsImporter.java | 2 +-
.../src/main/java/mod/_sw/XMLStylesExporter.java | 4 +-
.../src/main/java/mod/_sw/XMLStylesImporter.java | 2 +-
.../java/mod/_tdmgr/TypeDescriptionManager.java | 4 +-
.../main/java/mod/_toolkit/AccessibleButton.java | 16 +-
.../main/java/mod/_toolkit/AccessibleCheckBox.java | 16 +-
.../main/java/mod/_toolkit/AccessibleComboBox.java | 18 +-
.../mod/_toolkit/AccessibleDropDownComboBox.java | 2 +-
.../mod/_toolkit/AccessibleDropDownListBox.java | 2 +-
.../src/main/java/mod/_toolkit/AccessibleEdit.java | 16 +-
.../java/mod/_toolkit/AccessibleFixedText.java | 18 +-
.../src/main/java/mod/_toolkit/AccessibleList.java | 18 +-
.../main/java/mod/_toolkit/AccessibleListBox.java | 18 +-
.../main/java/mod/_toolkit/AccessibleListItem.java | 16 +-
.../src/main/java/mod/_toolkit/AccessibleMenu.java | 6 +-
.../main/java/mod/_toolkit/AccessibleMenuBar.java | 2 +-
.../main/java/mod/_toolkit/AccessibleMenuItem.java | 10 +-
.../java/mod/_toolkit/AccessibleMenuSeparator.java | 2 +-
.../java/mod/_toolkit/AccessiblePopupMenu.java | 12 +-
.../java/mod/_toolkit/AccessibleRadioButton.java | 20 +-
.../java/mod/_toolkit/AccessibleScrollBar.java | 6 +-
.../java/mod/_toolkit/AccessibleStatusBar.java | 2 +-
.../java/mod/_toolkit/AccessibleStatusBarItem.java | 4 +-
.../java/mod/_toolkit/AccessibleTabControl.java | 16 +-
.../main/java/mod/_toolkit/AccessibleTabPage.java | 18 +-
.../main/java/mod/_toolkit/AccessibleToolBox.java | 4 +-
.../java/mod/_toolkit/AccessibleToolBoxItem.java | 6 +-
.../main/java/mod/_toolkit/AccessibleWindow.java | 8 +-
.../java/mod/_toolkit/MutableTreeDataModel.java | 2 +-
.../main/java/mod/_toolkit/MutableTreeNode.java | 6 +-
.../src/main/java/mod/_toolkit/TabController.java | 8 +-
.../src/main/java/mod/_toolkit/Toolkit.java | 8 +-
.../main/java/mod/_toolkit/UnoControlButton.java | 2 +-
.../main/java/mod/_toolkit/UnoControlCheckBox.java | 4 +-
.../main/java/mod/_toolkit/UnoControlComboBox.java | 6 +-
.../java/mod/_toolkit/UnoControlContainer.java | 14 +-
.../java/mod/_toolkit/UnoControlCurrencyField.java | 6 +-
.../java/mod/_toolkit/UnoControlDateField.java | 4 +-
.../main/java/mod/_toolkit/UnoControlDialog.java | 24 +-
.../java/mod/_toolkit/UnoControlDialogModel.java | 18 +-
.../src/main/java/mod/_toolkit/UnoControlEdit.java | 6 +-
.../java/mod/_toolkit/UnoControlFileControl.java | 6 +-
.../java/mod/_toolkit/UnoControlFixedText.java | 4 +-
.../mod/_toolkit/UnoControlFormattedField.java | 8 +-
.../main/java/mod/_toolkit/UnoControlGroupBox.java | 4 +-
.../java/mod/_toolkit/UnoControlImageControl.java | 6 +-
.../main/java/mod/_toolkit/UnoControlListBox.java | 6 +-
.../java/mod/_toolkit/UnoControlNumericField.java | 8 +-
.../java/mod/_toolkit/UnoControlPatternField.java | 6 +-
.../java/mod/_toolkit/UnoControlRadioButton.java | 4 +-
.../java/mod/_toolkit/UnoControlTimeField.java | 6 +-
.../java/mod/_toolkit/UnoScrollBarControl.java | 6 +-
.../java/mod/_toolkit/UnoSpinButtonControl.java | 4 +-
.../src/main/java/mod/_toolkit/UnoTreeControl.java | 34 +-
.../mod/_typemgr.uno/TypeDescriptionManager.java | 4 +-
.../main/java/mod/_ucb/UniversalContentBroker.java | 2 +-
.../java/mod/_ucpchelp/CHelpContentProvider.java | 2 +-
.../java/mod/_ucpdav/WebDAVContentProvider.java | 2 +-
.../src/main/java/mod/_ucpfile/FileProvider.java | 2 +-
.../main/java/mod/_ucpftp/FTPContentProvider.java | 2 +-
.../mod/_ucphier/HierarchyContentProvider.java | 2 +-
.../java/mod/_ucppkg/PackageContentProvider.java | 2 +-
.../src/main/java/mod/_ucprmt/ContentProvider.java | 2 +-
.../main/java/mod/_ucprmt/ProviderAcceptor.java | 2 +-
.../src/main/java/mod/_ucprmt/ProxyProvider.java | 2 +-
.../java/mod/_xmloff/Chart/XMLContentExporter.java | 4 +-
.../java/mod/_xmloff/Chart/XMLContentImporter.java | 2 +-
.../main/java/mod/_xmloff/Chart/XMLExporter.java | 4 +-
.../main/java/mod/_xmloff/Chart/XMLImporter.java | 2 +-
.../java/mod/_xmloff/Chart/XMLStylesExporter.java | 2 +-
.../java/mod/_xmloff/Draw/XMLContentExporter.java | 12 +-
.../java/mod/_xmloff/Draw/XMLContentImporter.java | 4 +-
.../main/java/mod/_xmloff/Draw/XMLExporter.java | 12 +-
.../main/java/mod/_xmloff/Draw/XMLImporter.java | 4 +-
.../java/mod/_xmloff/Draw/XMLMetaExporter.java | 6 +-
.../java/mod/_xmloff/Draw/XMLMetaImporter.java | 4 +-
.../java/mod/_xmloff/Draw/XMLSettingsExporter.java | 6 +-
.../java/mod/_xmloff/Draw/XMLSettingsImporter.java | 4 +-
.../java/mod/_xmloff/Draw/XMLStylesExporter.java | 8 +-
.../java/mod/_xmloff/Draw/XMLStylesImporter.java | 4 +-
.../mod/_xmloff/Impress/XMLContentExporter.java | 6 +-
.../mod/_xmloff/Impress/XMLContentImporter.java | 4 +-
.../main/java/mod/_xmloff/Impress/XMLExporter.java | 6 +-
.../main/java/mod/_xmloff/Impress/XMLImporter.java | 4 +-
.../java/mod/_xmloff/Impress/XMLMetaExporter.java | 6 +-
.../java/mod/_xmloff/Impress/XMLMetaImporter.java | 4 +-
.../mod/_xmloff/Impress/XMLSettingsExporter.java | 10 +-
.../mod/_xmloff/Impress/XMLSettingsImporter.java | 4 +-
.../mod/_xmloff/Impress/XMLStylesExporter.java | 8 +-
.../mod/_xmloff/Impress/XMLStylesImporter.java | 4 +-
.../src/main/java/org/openoffice/Runner.java | 2 +-
.../main/java/org/openoffice/RunnerService.java | 4 +-
.../src/main/java/stats/InternalLogWriter.java | 14 +-
.../src/main/java/util/AccessibilityTools.java | 6 +-
.../src/main/java/util/BasicMacroTools.java | 22 +-
.../OOoRunner/src/main/java/util/CalcTools.java | 10 +-
.../java/OOoRunner/src/main/java/util/DBTools.java | 38 +-
.../OOoRunner/src/main/java/util/DesktopTools.java | 36 +-
.../OOoRunner/src/main/java/util/DrawTools.java | 8 +-
.../OOoRunner/src/main/java/util/FormTools.java | 58 +-
.../OOoRunner/src/main/java/util/FrameDsc.java | 4 +-
.../OOoRunner/src/main/java/util/InstCreator.java | 14 +-
.../src/main/java/util/RegistryTools.java | 2 +-
.../src/main/java/util/SOfficeFactory.java | 48 +-
.../OOoRunner/src/main/java/util/SysUtils.java | 6 +-
.../java/OOoRunner/src/main/java/util/UITools.java | 46 +-
.../OOoRunner/src/main/java/util/WriterTools.java | 12 +-
.../OOoRunner/src/main/java/util/XMLTools.java | 22 +-
.../src/main/java/util/db/DataSource.java | 6 +-
.../src/main/java/util/db/DatabaseDocument.java | 8 +-
.../java/OOoRunner/src/main/java/util/dbg.java | 6 +-
.../java/OOoRunner/src/main/java/util/utils.java | 40 +-
.../backend/org/openoffice/JavaSystemBackend.java | 2 +-
.../java/com/sun/star/report/SDBCReportData.java | 24 +-
.../com/sun/star/report/SDBCReportDataFactory.java | 30 +-
.../java/com/sun/star/report/SOImageService.java | 6 +-
.../com/sun/star/report/StorageRepository.java | 12 +-
.../star/report/pentaho/DefaultNameGenerator.java | 2 +-
.../sun/star/report/pentaho/SOFormulaParser.java | 4 +-
.../star/report/pentaho/SOReportJobFactory.java | 16 +-
.../report/pentaho/StarFunctionDescription.java | 4 +-
.../pentaho/output/OfficeDocumentReportTarget.java | 8 +-
.../report/pentaho/output/text/PageContext.java | 4 +-
.../complex/reportdesign/ReportDesignerTest.java | 2 +-
.../ridl/src/main/java/com/sun/star/uno/Type.java | 2 +-
main/sc/qa/complex/calcPreview/ViewForwarder.java | 46 +-
.../complex/cellRanges/CheckXCellRangesQuery.java | 4 +-
main/sc/qa/complex/dataPilot/CheckDataPilot.java | 16 +-
main/sc/source/ui/vba/vbachart.cxx | 8 +-
main/sc/source/ui/vba/vbafont.cxx | 2 +-
.../examples/beanshell/Capitalise/capitalise.bsh | 12 +-
.../examples/beanshell/HelloWorld/helloworld.bsh | 2 +-
.../beanshell/Highlight/ButtonPressHandler.bsh | 14 +-
.../examples/beanshell/Highlight/ShowDialog.bsh | 4 +-
.../examples/beanshell/Highlight/highlighter.bsh | 6 +-
.../examples/beanshell/MemoryUsage/memusage.bsh | 26 +-
.../examples/beanshell/WordCount/wordcount.bsh | 8 +-
.../examples/java/HelloWorld/HelloWorld.java | 2 +-
.../examples/java/Highlight/HighlightText.java | 22 +-
.../examples/java/MemoryUsage/MemoryUsage.java | 30 +-
.../examples/java/Newsgroup/MimeConfiguration.java | 2 +-
.../examples/java/Newsgroup/OfficeAttachment.java | 2 +-
.../examples/java/Newsgroup/PostNewsgroup.java | 10 +-
.../examples/java/selector/ScriptSelector.java | 20 +-
.../script/framework/security/SecurityDialog.java | 48 +-
.../script/framework/browse/DialogFactory.java | 62 +-
.../script/framework/browse/ParcelBrowseNode.java | 2 +-
.../framework/browse/ProviderBrowseNode.java | 2 +-
.../script/framework/browse/ScriptBrowseNode.java | 2 +-
.../star/script/framework/container/Parcel.java | 2 +-
.../framework/container/ParcelContainer.java | 8 +-
.../script/framework/container/ScriptMetaData.java | 4 +-
.../framework/container/UnoPkgContainer.java | 2 +-
.../star/script/framework/io/UCBStreamHandler.java | 2 +-
.../star/script/framework/io/XStorageHelper.java | 14 +-
.../framework/provider/EditorScriptContext.java | 4 +-
.../star/script/framework/provider/PathUtils.java | 2 +-
.../script/framework/provider/ScriptContext.java | 2 +-
.../script/framework/provider/ScriptProvider.java | 28 +-
.../beanshell/ScriptEditorForBeanShell.java | 2 +-
.../provider/beanshell/ScriptSourceModel.java | 2 +-
.../framework/provider/beanshell/template.bsh | 2 +-
.../framework/provider/java/ScriptDescriptor.java | 2 +-
.../javascript/ScriptEditorForJavaScript.java | 6 +-
.../org/openoffice/idesupport/SVersionRCFile.java | 2 +-
.../idesupport/filter/BinaryOnlyFilter.java | 2 +-
.../idesupport/filter/ExceptParcelFilter.java | 2 +-
.../idesupport/localoffice/LocalOfficeImpl.java | 10 +-
.../org/openoffice/idesupport/xml/Manifest.java | 1 -
.../modules/office/actions/BuildParcelAction.java | 1 -
.../modules/office/actions/DeployParcelAction.java | 2 -
.../office/actions/ParcelFolderSupport.java | 2 +-
.../modules/office/actions/ParcelSupport.java | 1 -
.../modules/office/options/OfficeSettings.java | 1 -
.../office/resources/templates/HelloWorld.java_ | 2 +-
.../office/wizard/SelectPathVisualPanel.java | 1 -
.../workben/ifc/scripting/ScriptingUtils.java | 8 +-
.../workben/ifc/scripting/SecurityDialogUtil.java | 8 +-
.../workben/ifc/scripting/_XScriptInfoAccess.java | 2 +-
.../workben/ifc/scripting/_XScriptInvocation.java | 10 +-
.../ifc/scripting/_XScriptNameResolver.java | 8 +-
.../workben/ifc/scripting/_XScriptSecurity.java | 20 +-
.../ifc/scripting/_XScriptStorageManager.java | 2 +-
main/scripting/workben/installer/InstUtil.java | 13 +-
.../scripting/workben/mod/_scripting/Dispatch.java | 4 +-
.../scripting/workben/mod/_scripting/Function.java | 4 +-
.../workben/mod/_scripting/FunctionProvider.java | 2 +-
.../workben/mod/_scripting/ScriptInfo.java | 4 +-
.../workben/mod/_scripting/ScriptStorage.java | 2 +-
.../mod/_scripting/ScriptStorageManager.java | 4 +-
.../workben/mod/_scripting/TestDataLoader.java | 2 +-
main/sfx2/qa/complex/sfx2/DocumentInfo.java | 2 +-
.../qa/complex/sfx2/DocumentMetadataAccess.java | 21 +-
main/sfx2/qa/complex/sfx2/DocumentProperties.java | 4 +-
main/shell/source/unix/misc/open-url.c | 2 +-
main/shell/source/unix/misc/senddoc.c | 2 +-
.../accessibility/AccessibleRelationSet.java | 20 +-
.../sw/qa/complex/checkColor/CheckChangeColor.java | 6 +-
.../CheckIndeterminateState.java | 4 +-
main/sw/qa/complex/writer/CheckBookmarks.java | 20 +-
.../sw/qa/complex/writer/CheckCrossReferences.java | 36 +-
main/sw/qa/complex/writer/CheckFlies.java | 12 +-
main/sw/qa/complex/writer/LoadSaveTest.java | 8 +-
.../complex/writer/TextPortionEnumerationTest.java | 218 +++---
main/sw/source/core/docnode/ndcopy.cxx | 2 +-
main/sw/source/filter/ww8/ww8atr.cxx | 2 +-
main/swext/mediawiki/build.xml | 3 +-
.../mediawiki/src/com/sun/star/wiki/Helper.java | 60 +-
.../sun/star/wiki/MainThreadDialogExecutor.java | 2 +-
.../mediawiki/src/com/sun/star/wiki/Settings.java | 20 +-
.../src/com/sun/star/wiki/WikiDialog.java | 32 +-
.../src/com/sun/star/wiki/WikiEditorImpl.java | 20 +-
.../sun/star/wiki/WikiOptionsEventHandlerImpl.java | 6 +-
main/toolkit/test/accessibility/AccTreeNode.java | 14 +-
.../test/accessibility/AccessibilityTreeModel.java | 3 +-
.../test/accessibility/AccessibilityWorkBench.java | 3 +-
.../accessibility/AccessibleActionHandler.java | 4 +-
.../test/accessibility/AccessibleCellHandler.java | 4 +-
.../accessibility/AccessibleComponentHandler.java | 2 +-
.../AccessibleEditableTextHandler.java | 4 +-
.../AccessibleExtendedComponentHandler.java | 4 +-
.../accessibility/AccessibleHyperlinkHandler.java | 4 +-
.../accessibility/AccessibleHypertextHandler.java | 4 +-
.../test/accessibility/AccessibleImageHandler.java | 4 +-
.../accessibility/AccessibleRelationHandler.java | 4 +-
.../accessibility/AccessibleSelectionHandler.java | 3 +-
.../test/accessibility/AccessibleTableHandler.java | 4 +-
.../test/accessibility/AccessibleTextHandler.java | 7 +-
.../test/accessibility/AccessibleUNOHandler.java | 4 +-
.../test/accessibility/ChildEventHandler.java | 4 +-
main/toolkit/test/accessibility/EventHandler.java | 4 +-
main/toolkit/test/accessibility/EventListener.java | 2 -
.../test/accessibility/InformationWriter.java | 28 +-
main/toolkit/test/accessibility/NodeFactory.java | 1 -
.../test/accessibility/OfficeConnection.java | 4 +-
.../toolkit/test/accessibility/QueuedListener.java | 4 +-
main/toolkit/test/accessibility/SimpleOffice.java | 28 +-
.../test/accessibility/TextUpdateListener.java | 2 +-
.../test/accessibility/TopWindowListener.java | 4 +-
main/toolkit/test/accessibility/ov/FocusView.java | 4 +-
.../test/accessibility/ov/ListeningObjectView.java | 4 +-
.../test/accessibility/ov/SelectionView.java | 6 +-
main/toolkit/test/accessibility/ov/TextView.java | 4 +-
main/tools/source/fsys/dirent.cxx | 2 +-
main/ucb/qa/complex/tdoc/_XChild.java | 2 +-
main/ucb/qa/complex/tdoc/_XCommandProcessor.java | 4 +-
.../com/sun/star/comp/ucb/GlobalTransfer_Test.java | 10 +-
.../source/skeletonmaker/javacompskeleton.cxx | 14 +-
.../qa/complex/unoxml/RDFRepositoryTest.java | 21 +-
main/vcl/inc/unx/gtk/gtkdata.hxx | 11 +
main/vcl/inc/unx/gtk/gtkframe.hxx | 13 +-
main/vcl/inc/unx/gtk/gtkgdi.hxx | 3 +-
main/vcl/qa/complex/memCheck/CheckMemoryUsage.java | 2 +-
main/vcl/unx/gtk/app/gtkdata.cxx | 90 ++-
main/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 87 +--
main/vcl/unx/gtk/window/gtkframe.cxx | 165 +++-
main/vcl/unx/gtk/window/gtkobject.cxx | 8 +-
.../com/sun/star/wizards/common/FileAccess.java | 10 +-
.../sun/star/wizards/common/NumericalHelper.java | 8 +-
.../com/sun/star/wizards/db/DBMetaData.java | 2 +-
.../com/sun/star/wizards/db/RecordParser.java | 6 +-
.../com/sun/star/wizards/db/SQLQueryComposer.java | 2 +-
.../com/sun/star/wizards/db/TableDescriptor.java | 2 +-
.../com/sun/star/wizards/document/FormHandler.java | 4 +-
.../sun/star/wizards/report/CallReportWizard.java | 2 +-
.../sun/star/wizards/report/ReportFinalizer.java | 2 +-
.../sun/star/wizards/report/ReportLayouter.java | 2 +-
.../layout/ReportBuilderLayouter.java | 17 +-
.../sun/star/wizards/table/ScenarioSelector.java | 1 -
.../sun/star/wizards/text/TextFieldHandler.java | 8 +-
.../sun/star/wizards/text/TextStyleHandler.java | 4 +-
.../com/sun/star/wizards/ui/ButtonList.java | 2 +-
.../sun/star/wizards/ui/CommandFieldSelection.java | 2 +-
.../com/sun/star/wizards/ui/DocumentPreview.java | 6 +-
.../com/sun/star/wizards/ui/FieldSelection.java | 6 +-
.../wizards/com/sun/star/wizards/ui/ImageList.java | 4 +-
.../wizards/com/sun/star/wizards/ui/UnoDialog.java | 6 +-
.../com/sun/star/wizards/ui/WizardDialog.java | 2 +-
.../sun/star/wizards/ui/event/UnoDataAware.java | 2 +-
.../com/sun/star/wizards/web/WWD_Events.java | 2 +-
.../star/wizards/web/export/AbstractExporter.java | 2 +-
.../XMergeBridge/src/main/java/XMergeBridge.java | 26 +-
.../converter/xml/sxw/aportisdoc/DocDecoder.java | 2 +-
.../converter/xml/sxw/aportisdoc/DocEncoder.java | 4 +-
.../xml/sxw/aportisdoc/DocumentSerializerImpl.java | 2 +-
.../xml/sxc/pexcel/PocketExcelEncoder.java | 4 +-
.../xml/sxc/pexcel/records/ExtendedFormat.java | 4 +-
.../sxc/pexcel/records/formula/FormulaHelper.java | 2 +-
.../sxc/pexcel/records/formula/FormulaParser.java | 4 +-
.../xml/sxc/pexcel/records/formula/Token.java | 8 +-
.../sxc/pexcel/records/formula/TokenDecoder.java | 2 +-
.../xml/sxw/pocketword/DocumentSerializerImpl.java | 2 +-
.../converter/xml/sxw/pocketword/Paragraph.java | 6 +-
.../xmerge/converter/xml/OfficeDocument.java | 4 +-
.../converter/xml/OfficeDocumentException.java | 4 +-
.../converter/xml/sxc/SxcDocumentSerializer.java | 2 +-
.../xmerge/merger/diff/CharacterParser.java | 2 +-
.../openoffice/xmerge/util/ColourConverter.java | 2 +-
.../java/org/openoffice/xmerge/util/Debug.java | 2 +-
.../org/openoffice/xmerge/util/OfficeUtil.java | 12 +-
.../java/org/openoffice/xmerge/util/XmlUtil.java | 2 +-
.../xml/sxc/minicalc/MinicalcDecoder.java | 1 -
.../xml/sxc/minicalc/MinicalcEncoder.java | 4 +-
.../sxc/minicalc/SxcDocumentDeserializerImpl.java | 1 -
.../palmtests/qa/comparator/XmlZipExtract.java | 1 -
.../sxw/wordsmith/DocumentDeserializerImpl.java | 1 -
.../xml/sxw/wordsmith/DocumentSerializerImpl.java | 2 +-
main/xmloff/inc/xmloff/xmlexppr.hxx | 4 +-
main/xmlsecurity/tools/uno/EncryptionEntity.java | 24 +-
main/xmlsecurity/tools/uno/SecurityEntity.java | 6 +-
main/xmlsecurity/tools/uno/SignatureEntity.java | 26 +-
main/xmlsecurity/tools/uno/TestTool.java | 16 +-
.../tools/uno/XMLSecurityFrameworkController.java | 22 +-
.../org/openoffice/test/common/FileUtil.java | 2 +-
.../org/openoffice/test/common/Installer.java | 2 +-
.../org/openoffice/test/common/ReportUploader.java | 2 +-
.../org/openoffice/test/common/StreamPump.java | 6 +-
.../org/openoffice/test/common/SystemUtil.java | 22 +-
.../test/vcl/client/VclHookException.java | 2 +-
.../source/api/i18n/XBreakIteratorTest.java | 2 +-
test/testuno/source/fvt/mix/MixedTest.java | 4 +-
.../fvt/mix/sc/sheet/InsertCalcSheetTest.java | 18 +-
.../fvt/mix/sc/sheet/InsertExcelSheetTest.java | 18 +-
test/testuno/source/fvt/uno/db/DBAccess.java | 16 +-
test/testuno/source/fvt/uno/ffc/FFCTest.java | 6 +-
.../source/fvt/uno/sc/cell/DeleteContents.java | 10 +-
.../source/fvt/uno/sc/cell/InsertDeleteCells.java | 24 +-
.../source/fvt/uno/sc/data/AdvanceFilter.java | 18 +-
test/testuno/source/fvt/uno/sc/data/DataSort.java | 16 +-
.../fvt/uno/sc/data/StandardFilterOption.java | 114 +--
.../source/fvt/uno/sc/data/StardarFilterTest.java | 16 +-
.../source/fvt/uno/sc/data/SubTotalsFunction.java | 4 +-
.../source/fvt/uno/sc/data/SubtotalsForGroup.java | 8 +-
.../source/fvt/uno/sc/data/ValidityTypeTest.java | 6 +-
.../source/fvt/uno/sc/formula/TestFormulaDocs.java | 10 +-
.../fvt/uno/sc/formula/TestFormulaRoundTrip.java | 6 +-
.../source/fvt/uno/sc/object/DrawingObject.java | 14 +-
.../source/fvt/uno/sc/rowcolumn/CellMerge.java | 6 +-
.../CreateShowHideEditDeleteComments.java | 28 +-
.../uno/sc/rowcolumn/InsertDeleteRowAndColumn.java | 12 +-
.../uno/sc/rowcolumn/ResizeHideShowRowColumn.java | 48 +-
.../source/fvt/uno/sc/sheet/SheetBasicTest.java | 6 +-
.../fvt/uno/sd/animation/CustomAnimation.java | 26 +-
.../source/fvt/uno/sd/animation/TextAnimation.java | 22 +-
.../fvt/uno/sd/bullet/CheckBuildInBullet.java | 12 +-
.../source/fvt/uno/sd/bullet/CheckBulletStyle.java | 12 +-
.../fvt/uno/sd/bullet/GraphicBulletFromFile.java | 12 +-
.../fvt/uno/sd/bullet/NumberingBulletTypes.java | 12 +-
.../fvt/uno/sd/bullet/NumberingProperty.java | 56 +-
.../fvt/uno/sd/character/CheckCharacterStyle.java | 28 +-
.../testuno/source/fvt/uno/sd/chart/ChartData.java | 24 +-
.../source/fvt/uno/sd/chart/ChartProperties.java | 80 +-
.../source/fvt/uno/sd/chart/ChartTypes.java | 26 +-
.../fvt/uno/sd/file/CheckFileProperties.java | 14 +-
.../fvt/uno/sd/graphic/GraphicPro_Border.java | 24 +-
.../fvt/uno/sd/graphic/GraphicPro_Position.java | 12 +-
.../source/fvt/uno/sd/graphic/GraphicPro_Size.java | 12 +-
.../fvt/uno/sd/paragraph/ParagraphStyle.java | 22 +-
.../uno/sd/paragraph/ParagraphTextProperty.java | 20 +-
.../source/fvt/uno/sd/shape/ShapeProperties.java | 56 +-
.../source/fvt/uno/sd/shape/ShapeTypes.java | 22 +-
.../source/fvt/uno/sd/slideshow/CustomShow.java | 26 +-
.../source/fvt/uno/sd/slideshow/SlideShow.java | 22 +-
.../source/fvt/uno/sd/textbox/FillProperties.java | 30 +-
.../source/fvt/uno/sd/textbox/LineProperties.java | 22 +-
test/testuno/source/fvt/uno/sw/DocumentTest.java | 32 +-
.../source/fvt/uno/sw/bookmark/CheckBookmarks.java | 12 +-
.../source/fvt/uno/sw/breaks/CheckBreaks.java | 20 +-
.../sw/crossreference/CheckCrossReferences.java | 38 +-
.../fvt/uno/sw/field/CheckDateTimeField.java | 30 +-
.../source/fvt/uno/sw/field/PageCountField.java | 10 +-
.../source/fvt/uno/sw/field/PageNumberField.java | 10 +-
.../source/fvt/uno/sw/field/SubjectField.java | 8 +-
.../source/fvt/uno/sw/field/TitleField.java | 8 +-
.../source/fvt/uno/sw/frame/CheckFrames.java | 8 +-
.../source/fvt/uno/sw/frame/FrameAnchorType.java | 16 +-
.../source/fvt/uno/sw/frame/FrameBackColor.java | 24 +-
.../source/fvt/uno/sw/frame/FrameBackGraphic.java | 16 +-
.../source/fvt/uno/sw/frame/FrameBorder.java | 22 +-
.../uno/sw/frame/FrameBorderSpacingtoContent.java | 24 +-
.../source/fvt/uno/sw/frame/FrameDescription.java | 14 +-
.../source/fvt/uno/sw/frame/FrameHyperlink.java | 16 +-
.../source/fvt/uno/sw/frame/FramePosition.java | 16 +-
.../source/fvt/uno/sw/frame/FrameShadow.java | 18 +-
.../testuno/source/fvt/uno/sw/frame/FrameSize.java | 24 +-
.../source/fvt/uno/sw/frame/FrameWrapType.java | 18 +-
.../source/fvt/uno/sw/frame/InsertFrame.java | 14 +-
.../fvt/uno/sw/paragraph/ParagraphAlignment.java | 64 +-
.../fvt/uno/sw/paragraph/ParagraphBackColor.java | 16 +-
.../fvt/uno/sw/paragraph/ParagraphBackGraphic.java | 192 ++---
.../fvt/uno/sw/paragraph/ParagraphBorder.java | 32 +-
.../fvt/uno/sw/paragraph/ParagraphDropcap.java | 40 +-
.../sw/paragraph/ParagraphIndentAndSpacing.java | 32 +-
.../fvt/uno/sw/paragraph/ParagraphInsertBreak.java | 224 +++---
.../fvt/uno/sw/paragraph/ParagraphLineSpacing.java | 140 ++--
.../ParagraphNumberingAndBulletAlignment.java | 96 +--
.../ParagraphNumberingAndBulletCharacterStyle.java | 832 ++++++++++-----------
...agraphNumberingAndBulletIndentAtAndAlignAt.java | 32 +-
.../ParagraphNumberingAndBulletTabStop.java | 32 +-
...aragraphNumberingAndBullet_CharacterBullet.java | 64 +-
.../ParagraphNumberingAndBullet_Graphic.java | 32 +-
...agraphNumberingAndBullet_Graphic_Alignment.java | 288 +++----
...hNumberingAndBullet_Graphic_WidthAndHeight.java | 32 +-
...ngAndBullet_Number_BeforeAndAfterCharacter.java | 32 +-
...ragraphNumberingAndBullet_Number_StartWith.java | 32 +-
.../ParagraphNumberingAndBullet_Numbering.java | 256 +++----
.../sw/paragraph/ParagraphOutlineAndNumbering.java | 32 +-
.../fvt/uno/sw/paragraph/ParagraphShadow.java | 100 +--
.../uno/sw/paragraph/ParagraphSpacingtoBorder.java | 16 +-
.../source/fvt/uno/sw/paragraph/ParagraphTabs.java | 100 +--
.../sw/paragraph/ParagraphTexttoTextAlignment.java | 80 +-
.../fvt/uno/sw/puretext/CharacterBackColor.java | 16 +-
.../source/fvt/uno/sw/puretext/CharacterBlink.java | 16 +-
.../fvt/uno/sw/puretext/CharacterChangeCase.java | 80 +-
.../source/fvt/uno/sw/puretext/CharacterColor.java | 16 +-
.../fvt/uno/sw/puretext/CharacterEmphasis.java | 16 +-
.../fvt/uno/sw/puretext/CharacterFontname.java | 16 +-
.../fvt/uno/sw/puretext/CharacterHidden.java | 16 +-
.../fvt/uno/sw/puretext/CharacterHyperlink.java | 16 +-
.../fvt/uno/sw/puretext/CharacterLocale.java | 18 +-
.../fvt/uno/sw/puretext/CharacterOutline.java | 16 +-
.../fvt/uno/sw/puretext/CharacterPosition.java | 48 +-
.../fvt/uno/sw/puretext/CharacterRelief.java | 16 +-
.../puretext/CharacterRotationAndScaleWidth.java | 48 +-
.../fvt/uno/sw/puretext/CharacterShadow.java | 16 +-
.../source/fvt/uno/sw/puretext/CharacterSize.java | 16 +-
.../fvt/uno/sw/puretext/CharacterSpacing.java | 48 +-
.../uno/sw/puretext/CharacterStrikeThrough.java | 16 +-
.../source/fvt/uno/sw/puretext/CharacterStyle.java | 16 +-
.../fvt/uno/sw/puretext/CharacterUnderline.java | 16 +-
.../uno/sw/puretext/InsertCharacterToTable.java | 30 +-
.../source/fvt/uno/sw/table/TableBasic.java | 326 ++++----
.../uno/sw/table/TableBorderSpacingtoContent.java | 32 +-
.../source/fvt/uno/sw/table/TableCellProtect.java | 32 +-
.../source/fvt/uno/sw/table/TableInsertBreak.java | 416 +++++------
.../testuno/source/fvt/uno/sw/table/TableName.java | 32 +-
.../fvt/uno/sw/table/TableVerticalAlignment.java | 96 +--
.../source/org/openoffice/test/uno/UnoApp.java | 26 +-
test/testuno/source/pvt/uno/Conversion.java | 2 +-
test/testuno/source/testlib/uno/ChartUtil.java | 16 +-
test/testuno/source/testlib/uno/DBUtil.java | 14 +-
test/testuno/source/testlib/uno/GraphicUtil.java | 18 +-
test/testuno/source/testlib/uno/PageUtil.java | 6 +-
test/testuno/source/testlib/uno/SCUtil.java | 90 +--
test/testuno/source/testlib/uno/SDUtil.java | 14 +-
test/testuno/source/testlib/uno/SWUtil.java | 58 +-
test/testuno/source/testlib/uno/ShapeUtil.java | 34 +-
test/testuno/source/testlib/uno/TestUtil.java | 4 +-
1423 files changed, 9570 insertions(+), 9522 deletions(-)
(openoffice) 08/19: Lokalized Dutch
Posted by ji...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jimjag pushed a commit to branch AOO50X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 0d44ccdba0033b359900607ffb0f3772b420a2dc
Author: DiGro <di...@yahoo.co.uk>
AuthorDate: Wed Sep 30 16:13:37 2026 +0200
Lokalized Dutch
(cherry picked from commit 34b5379a43fb31ceaf5a777fb73dc05ae05092c8)
---
main/default_images/res/helpimg/nl/rechenlt.png | Bin 585 -> 2649 bytes
main/default_images/res/helpimg/nl/swh00117.png | Bin 891 -> 1379 bytes
main/default_images/res/helpimg/nl/zellvor.png | Bin 657 -> 832 bytes
3 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/main/default_images/res/helpimg/nl/rechenlt.png b/main/default_images/res/helpimg/nl/rechenlt.png
index 70a43b05ee..4f84c2f521 100644
Binary files a/main/default_images/res/helpimg/nl/rechenlt.png and b/main/default_images/res/helpimg/nl/rechenlt.png differ
diff --git a/main/default_images/res/helpimg/nl/swh00117.png b/main/default_images/res/helpimg/nl/swh00117.png
index 4ef983f5fa..b57933a029 100644
Binary files a/main/default_images/res/helpimg/nl/swh00117.png and b/main/default_images/res/helpimg/nl/swh00117.png differ
diff --git a/main/default_images/res/helpimg/nl/zellvor.png b/main/default_images/res/helpimg/nl/zellvor.png
index b5241b2b67..0fe3912942 100644
Binary files a/main/default_images/res/helpimg/nl/zellvor.png and b/main/default_images/res/helpimg/nl/zellvor.png differ
(openoffice) 05/19: Lokalized Dutch
Posted by ji...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jimjag pushed a commit to branch AOO50X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 8797f2b219dcdd9d321c3309ae0044b9f13cb589
Author: DiGro <di...@yahoo.co.uk>
AuthorDate: Wed Sep 30 14:52:33 2026 +0200
Lokalized Dutch
(cherry picked from commit c14e6752ec1ecb36541a12b305d74e7625e67a3c)
---
main/default_images/res/helpimg/nl/sheettabs.png | Bin 1414 -> 2348 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/main/default_images/res/helpimg/nl/sheettabs.png b/main/default_images/res/helpimg/nl/sheettabs.png
index fe1d96fb38..13fbe4ac4e 100644
Binary files a/main/default_images/res/helpimg/nl/sheettabs.png and b/main/default_images/res/helpimg/nl/sheettabs.png differ
(openoffice) 13/19: Remove unused imports of: java.util.Enumeration java.util.Hashtable java.util.Vector
Posted by ji...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jimjag pushed a commit to branch AOO50X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 9d6590b616cd6ab55ce226661909e42c76dde885
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Sat Oct 3 16:47:24 2026 +0200
Remove unused imports of:
java.util.Enumeration
java.util.Hashtable
java.util.Vector
Patch by: me
(cherry picked from commit 5226f0b8dea4ef117ddd2bc4948a8601d0ac403b)
---
.../workben/org/openoffice/accessibility/awb/view/SelectionView.java | 2 --
main/chart2/qa/complex/chart2/TestCaseOldAPI.java | 1 -
.../filter/qa/complex/filter/detection/typeDetection/TypeDetection.java | 2 --
.../JavaSetup/org/openoffice/setup/Controller/ChooseDirectoryCtrl.java | 1 -
.../org/openoffice/setup/Controller/InstallationImminentCtrl.java | 1 -
.../org/openoffice/setup/Controller/UninstallationCompletedCtrl.java | 1 -
.../src/JavaSetup/org/openoffice/setup/SetupData/SetupDataProvider.java | 1 -
.../src/JavaSetup/org/openoffice/setup/Util/AbortInstaller.java | 1 -
.../src/JavaSetup/org/openoffice/setup/Util/InfoCtrl.java | 1 -
main/odk/examples/DevelopersGuide/UCB/Helper.java | 2 --
main/odk/examples/java/Inspector/XLanguageSourceCodeGenerator.java | 1 -
.../JavaOOXMLParser/src/org/apache/openoffice/ooxml/parser/Parser.java | 1 -
main/scripting/java/org/openoffice/idesupport/xml/Manifest.java | 1 -
.../openoffice/netbeans/modules/office/actions/BuildParcelAction.java | 1 -
.../openoffice/netbeans/modules/office/actions/DeployParcelAction.java | 2 --
.../org/openoffice/netbeans/modules/office/actions/ParcelSupport.java | 1 -
.../org/openoffice/netbeans/modules/office/options/OfficeSettings.java | 1 -
.../netbeans/modules/office/wizard/SelectPathVisualPanel.java | 1 -
main/scripting/workben/installer/InstUtil.java | 1 -
main/toolkit/test/accessibility/AccessibilityTreeModel.java | 1 -
main/toolkit/test/accessibility/AccessibilityWorkBench.java | 1 -
main/toolkit/test/accessibility/AccessibleSelectionHandler.java | 1 -
main/toolkit/test/accessibility/AccessibleTextHandler.java | 1 -
main/toolkit/test/accessibility/EventListener.java | 2 --
main/toolkit/test/accessibility/NodeFactory.java | 1 -
main/toolkit/test/accessibility/ov/SelectionView.java | 2 --
main/wizards/com/sun/star/wizards/table/ScenarioSelector.java | 1 -
.../openoffice/xmerge/converter/xml/sxc/minicalc/MinicalcDecoder.java | 1 -
.../xmerge/converter/xml/sxc/minicalc/SxcDocumentDeserializerImpl.java | 1 -
main/xmerge/source/palmtests/qa/comparator/XmlZipExtract.java | 1 -
.../xmerge/converter/xml/sxw/wordsmith/DocumentDeserializerImpl.java | 1 -
31 files changed, 37 deletions(-)
diff --git a/main/accessibility/workben/org/openoffice/accessibility/awb/view/SelectionView.java b/main/accessibility/workben/org/openoffice/accessibility/awb/view/SelectionView.java
index 9e2070e5aa..27a1a64cc5 100644
--- a/main/accessibility/workben/org/openoffice/accessibility/awb/view/SelectionView.java
+++ b/main/accessibility/workben/org/openoffice/accessibility/awb/view/SelectionView.java
@@ -23,8 +23,6 @@
package org.openoffice.accessibility.awb.view;
-import java.util.Vector;
-
import java.awt.event.ActionListener;
import java.awt.event.ActionEvent;
diff --git a/main/chart2/qa/complex/chart2/TestCaseOldAPI.java b/main/chart2/qa/complex/chart2/TestCaseOldAPI.java
index 9e4c352824..2175963431 100644
--- a/main/chart2/qa/complex/chart2/TestCaseOldAPI.java
+++ b/main/chart2/qa/complex/chart2/TestCaseOldAPI.java
@@ -30,7 +30,6 @@ import com.sun.star.uno.Type;
import com.sun.star.uno.XComponentContext;
import java.io.PrintWriter;
-import java.util.Hashtable;
import com.sun.star.lang.*;
import com.sun.star.beans.*;
diff --git a/main/filter/qa/complex/filter/detection/typeDetection/TypeDetection.java b/main/filter/qa/complex/filter/detection/typeDetection/TypeDetection.java
index 1a16cc1e3e..1387f220b0 100644
--- a/main/filter/qa/complex/filter/detection/typeDetection/TypeDetection.java
+++ b/main/filter/qa/complex/filter/detection/typeDetection/TypeDetection.java
@@ -32,8 +32,6 @@ import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.Hashtable;
import util.utils;
import org.junit.After;
diff --git a/main/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/ChooseDirectoryCtrl.java b/main/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/ChooseDirectoryCtrl.java
index 04a6a2c93e..c9e066e21b 100644
--- a/main/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/ChooseDirectoryCtrl.java
+++ b/main/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/ChooseDirectoryCtrl.java
@@ -35,7 +35,6 @@ import org.openoffice.setup.Util.InstallChangeCtrl;
import org.openoffice.setup.Util.LogManager;
import org.openoffice.setup.Util.SystemManager;
import java.io.File;
-import java.util.Vector;
import javax.swing.JDialog;
import javax.swing.JOptionPane;
import org.openoffice.setup.Dialogs.DatabaseDialog;
diff --git a/main/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/InstallationImminentCtrl.java b/main/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/InstallationImminentCtrl.java
index 6f48b3a752..8435aed3b8 100644
--- a/main/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/InstallationImminentCtrl.java
+++ b/main/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/InstallationImminentCtrl.java
@@ -35,7 +35,6 @@ import org.openoffice.setup.Util.InfoCtrl;
import org.openoffice.setup.Util.Informer;
import org.openoffice.setup.Util.LogManager;
import org.openoffice.setup.Util.ModuleCtrl;
-import java.util.Vector;
public class InstallationImminentCtrl extends PanelController {
diff --git a/main/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/UninstallationCompletedCtrl.java b/main/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/UninstallationCompletedCtrl.java
index 1e0ef9e527..cc04a94ab5 100644
--- a/main/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/UninstallationCompletedCtrl.java
+++ b/main/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/UninstallationCompletedCtrl.java
@@ -31,7 +31,6 @@ import org.openoffice.setup.SetupData.ProductDescription;
import org.openoffice.setup.SetupData.SetupDataProvider;
import org.openoffice.setup.Util.InfoCtrl;
import org.openoffice.setup.Util.LogManager;
-import java.util.Vector;
public class UninstallationCompletedCtrl extends PanelController {
diff --git a/main/javainstaller2/src/JavaSetup/org/openoffice/setup/SetupData/SetupDataProvider.java b/main/javainstaller2/src/JavaSetup/org/openoffice/setup/SetupData/SetupDataProvider.java
index 10671d898e..b889928c05 100644
--- a/main/javainstaller2/src/JavaSetup/org/openoffice/setup/SetupData/SetupDataProvider.java
+++ b/main/javainstaller2/src/JavaSetup/org/openoffice/setup/SetupData/SetupDataProvider.java
@@ -27,7 +27,6 @@ import org.openoffice.setup.InstallData;
import org.openoffice.setup.Installer.Installer;
import org.openoffice.setup.Installer.InstallerFactory;
import java.util.Enumeration;
-import java.util.Vector;
import javax.swing.tree.DefaultMutableTreeNode;
/**
diff --git a/main/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/AbortInstaller.java b/main/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/AbortInstaller.java
index b999a6072b..b8e50d6fe3 100644
--- a/main/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/AbortInstaller.java
+++ b/main/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/AbortInstaller.java
@@ -24,7 +24,6 @@
package org.openoffice.setup.Util;
import org.openoffice.setup.InstallData;
-import java.util.Vector;
public class AbortInstaller {
diff --git a/main/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/InfoCtrl.java b/main/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/InfoCtrl.java
index 7c35177ae1..58a6a1f361 100644
--- a/main/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/InfoCtrl.java
+++ b/main/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/InfoCtrl.java
@@ -27,7 +27,6 @@ import org.openoffice.setup.InstallData;
import org.openoffice.setup.SetupData.PackageDescription;
import org.openoffice.setup.SetupData.ProductDescription;
import java.util.Enumeration;
-import java.util.Vector;
public class InfoCtrl {
diff --git a/main/odk/examples/DevelopersGuide/UCB/Helper.java b/main/odk/examples/DevelopersGuide/UCB/Helper.java
index b0c8c1f631..0b39600c80 100644
--- a/main/odk/examples/DevelopersGuide/UCB/Helper.java
+++ b/main/odk/examples/DevelopersGuide/UCB/Helper.java
@@ -21,8 +21,6 @@
-import java.util.Vector;
-
import java.io.File;
import java.io.FileOutputStream;
diff --git a/main/odk/examples/java/Inspector/XLanguageSourceCodeGenerator.java b/main/odk/examples/java/Inspector/XLanguageSourceCodeGenerator.java
index ce795f29d0..1805bc4c67 100644
--- a/main/odk/examples/java/Inspector/XLanguageSourceCodeGenerator.java
+++ b/main/odk/examples/java/Inspector/XLanguageSourceCodeGenerator.java
@@ -21,7 +21,6 @@
import com.sun.star.uno.TypeClass;
-import java.util.Vector;
public interface XLanguageSourceCodeGenerator {
diff --git a/main/ooxml/source/framework/JavaOOXMLParser/src/org/apache/openoffice/ooxml/parser/Parser.java b/main/ooxml/source/framework/JavaOOXMLParser/src/org/apache/openoffice/ooxml/parser/Parser.java
index cd51087f3c..253e2d79c9 100644
--- a/main/ooxml/source/framework/JavaOOXMLParser/src/org/apache/openoffice/ooxml/parser/Parser.java
+++ b/main/ooxml/source/framework/JavaOOXMLParser/src/org/apache/openoffice/ooxml/parser/Parser.java
@@ -22,7 +22,6 @@
package org.apache.openoffice.ooxml.parser;
import java.io.InputStream;
-import java.util.Vector;
import javax.xml.stream.Location;
import javax.xml.stream.XMLInputFactory;
diff --git a/main/scripting/java/org/openoffice/idesupport/xml/Manifest.java b/main/scripting/java/org/openoffice/idesupport/xml/Manifest.java
index cf6d43041f..a797d59505 100644
--- a/main/scripting/java/org/openoffice/idesupport/xml/Manifest.java
+++ b/main/scripting/java/org/openoffice/idesupport/xml/Manifest.java
@@ -31,7 +31,6 @@ import java.io.BufferedReader;
import java.io.InputStreamReader;
import java.io.IOException;
-import java.util.Enumeration;
import java.util.ArrayList;
import java.util.Iterator;
diff --git a/main/scripting/java/org/openoffice/netbeans/modules/office/actions/BuildParcelAction.java b/main/scripting/java/org/openoffice/netbeans/modules/office/actions/BuildParcelAction.java
index 1db4c3f149..60042c7007 100644
--- a/main/scripting/java/org/openoffice/netbeans/modules/office/actions/BuildParcelAction.java
+++ b/main/scripting/java/org/openoffice/netbeans/modules/office/actions/BuildParcelAction.java
@@ -24,7 +24,6 @@
package org.openoffice.netbeans.modules.office.actions;
import java.util.Vector;
-import java.util.Enumeration;
import org.openide.nodes.Node;
import org.openide.util.HelpCtx;
diff --git a/main/scripting/java/org/openoffice/netbeans/modules/office/actions/DeployParcelAction.java b/main/scripting/java/org/openoffice/netbeans/modules/office/actions/DeployParcelAction.java
index 980d0bba26..839be4858e 100644
--- a/main/scripting/java/org/openoffice/netbeans/modules/office/actions/DeployParcelAction.java
+++ b/main/scripting/java/org/openoffice/netbeans/modules/office/actions/DeployParcelAction.java
@@ -25,10 +25,8 @@ package org.openoffice.netbeans.modules.office.actions;
import java.io.File;
import java.io.IOException;
-import java.util.Hashtable;
import java.util.List;
import java.util.ArrayList;
-import java.util.Enumeration;
import javax.swing.JMenuItem;
import javax.swing.JFileChooser;
diff --git a/main/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelSupport.java b/main/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelSupport.java
index c8608f1bdd..ba0eea253f 100644
--- a/main/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelSupport.java
+++ b/main/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelSupport.java
@@ -26,7 +26,6 @@ package org.openoffice.netbeans.modules.office.actions;
import java.io.File;
import java.io.IOException;
import java.beans.PropertyVetoException;
-import java.util.Enumeration;
import java.util.Calendar;
import org.openide.TopManager;
diff --git a/main/scripting/java/org/openoffice/netbeans/modules/office/options/OfficeSettings.java b/main/scripting/java/org/openoffice/netbeans/modules/office/options/OfficeSettings.java
index e6f3e054f9..db901a3196 100644
--- a/main/scripting/java/org/openoffice/netbeans/modules/office/options/OfficeSettings.java
+++ b/main/scripting/java/org/openoffice/netbeans/modules/office/options/OfficeSettings.java
@@ -23,7 +23,6 @@
package org.openoffice.netbeans.modules.office.options;
-import java.util.Hashtable;
import java.util.Enumeration;
import java.io.File;
import java.io.IOException;
diff --git a/main/scripting/java/org/openoffice/netbeans/modules/office/wizard/SelectPathVisualPanel.java b/main/scripting/java/org/openoffice/netbeans/modules/office/wizard/SelectPathVisualPanel.java
index 2431817e8c..da92a0654f 100644
--- a/main/scripting/java/org/openoffice/netbeans/modules/office/wizard/SelectPathVisualPanel.java
+++ b/main/scripting/java/org/openoffice/netbeans/modules/office/wizard/SelectPathVisualPanel.java
@@ -27,7 +27,6 @@
package org.openoffice.netbeans.modules.office.wizard;
-import java.util.Hashtable;
import java.util.Enumeration;
import java.io.File;
import java.io.IOException;
diff --git a/main/scripting/workben/installer/InstUtil.java b/main/scripting/workben/installer/InstUtil.java
index 3fc47e0c6b..c02743d24f 100644
--- a/main/scripting/workben/installer/InstUtil.java
+++ b/main/scripting/workben/installer/InstUtil.java
@@ -338,7 +338,6 @@ public class InstUtil {
public static Properties getOfficeVersions(File sversionFile) throws IOException {
BufferedReader reader = new BufferedReader(new FileReader(sversionFile));
- Vector values;
String sectionName = null;
Properties results = new Properties();
diff --git a/main/toolkit/test/accessibility/AccessibilityTreeModel.java b/main/toolkit/test/accessibility/AccessibilityTreeModel.java
index 6e52c1366e..efdb693371 100644
--- a/main/toolkit/test/accessibility/AccessibilityTreeModel.java
+++ b/main/toolkit/test/accessibility/AccessibilityTreeModel.java
@@ -26,7 +26,6 @@ import javax.swing.tree.TreePath;
import java.util.Vector;
import java.util.HashMap;
-import java.util.Enumeration;
import com.sun.star.accessibility.*;
diff --git a/main/toolkit/test/accessibility/AccessibilityWorkBench.java b/main/toolkit/test/accessibility/AccessibilityWorkBench.java
index 63e00d6071..f67224cc64 100644
--- a/main/toolkit/test/accessibility/AccessibilityWorkBench.java
+++ b/main/toolkit/test/accessibility/AccessibilityWorkBench.java
@@ -50,7 +50,6 @@ import com.sun.star.accessibility.XAccessibleStateSet;
import com.sun.star.awt.XExtendedToolkit;
-import java.util.Vector;
import java.awt.*;
import java.awt.event.*;
import javax.swing.*;
diff --git a/main/toolkit/test/accessibility/AccessibleSelectionHandler.java b/main/toolkit/test/accessibility/AccessibleSelectionHandler.java
index 1e922e1e65..480a9b63fd 100644
--- a/main/toolkit/test/accessibility/AccessibleSelectionHandler.java
+++ b/main/toolkit/test/accessibility/AccessibleSelectionHandler.java
@@ -28,7 +28,6 @@ import com.sun.star.lang.IndexOutOfBoundsException;
import javax.swing.*;
import java.awt.*;
-import java.util.Vector;
import java.awt.event.ActionListener;
import java.awt.event.ActionEvent;
diff --git a/main/toolkit/test/accessibility/AccessibleTextHandler.java b/main/toolkit/test/accessibility/AccessibleTextHandler.java
index 7752be458c..81638e8ab0 100644
--- a/main/toolkit/test/accessibility/AccessibleTextHandler.java
+++ b/main/toolkit/test/accessibility/AccessibleTextHandler.java
@@ -32,7 +32,6 @@ import com.sun.star.uno.UnoRuntime;
import com.sun.star.lang.IndexOutOfBoundsException;
import com.sun.star.beans.PropertyValue;
-import java.util.Vector;
import java.awt.Container;
import java.awt.FlowLayout;
import java.awt.BorderLayout;
diff --git a/main/toolkit/test/accessibility/EventListener.java b/main/toolkit/test/accessibility/EventListener.java
index 02388e6c83..861b6da30b 100644
--- a/main/toolkit/test/accessibility/EventListener.java
+++ b/main/toolkit/test/accessibility/EventListener.java
@@ -25,9 +25,7 @@ import javax.swing.tree.TreePath;
import javax.swing.event.TreeModelListener;
import javax.swing.event.TreeModelEvent;
-import java.util.Vector;
import java.util.HashMap;
-import java.util.Enumeration;
import com.sun.star.accessibility.*;
import com.sun.star.uno.*;
diff --git a/main/toolkit/test/accessibility/NodeFactory.java b/main/toolkit/test/accessibility/NodeFactory.java
index a256ce5956..0b4a26737e 100644
--- a/main/toolkit/test/accessibility/NodeFactory.java
+++ b/main/toolkit/test/accessibility/NodeFactory.java
@@ -20,7 +20,6 @@
*************************************************************/
import com.sun.star.accessibility.*;
-import java.util.Vector;
import tools.NameProvider;
diff --git a/main/toolkit/test/accessibility/ov/SelectionView.java b/main/toolkit/test/accessibility/ov/SelectionView.java
index f4b3c2148e..a1c3b8bbfd 100644
--- a/main/toolkit/test/accessibility/ov/SelectionView.java
+++ b/main/toolkit/test/accessibility/ov/SelectionView.java
@@ -21,8 +21,6 @@
package ov;
-import java.util.Vector;
-
import java.awt.event.ActionListener;
import java.awt.event.ActionEvent;
diff --git a/main/wizards/com/sun/star/wizards/table/ScenarioSelector.java b/main/wizards/com/sun/star/wizards/table/ScenarioSelector.java
index 75e5c3ab40..7ae5b2861e 100644
--- a/main/wizards/com/sun/star/wizards/table/ScenarioSelector.java
+++ b/main/wizards/com/sun/star/wizards/table/ScenarioSelector.java
@@ -23,7 +23,6 @@
package com.sun.star.wizards.table;
import java.util.ArrayList;
-import java.util.Vector;
import com.sun.star.awt.ItemEvent;
import com.sun.star.awt.XFixedText;
diff --git a/main/xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/MinicalcDecoder.java b/main/xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/MinicalcDecoder.java
index 512a69f33d..e9137b5951 100644
--- a/main/xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/MinicalcDecoder.java
+++ b/main/xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/MinicalcDecoder.java
@@ -35,7 +35,6 @@ import java.io.ByteArrayInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.util.Enumeration;
import org.openoffice.xmerge.ConvertData;
import org.openoffice.xmerge.converter.xml.OfficeConstants;
diff --git a/main/xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/SxcDocumentDeserializerImpl.java b/main/xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/SxcDocumentDeserializerImpl.java
index 4ac22b22f9..bf19a49df1 100644
--- a/main/xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/SxcDocumentDeserializerImpl.java
+++ b/main/xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/SxcDocumentDeserializerImpl.java
@@ -30,7 +30,6 @@ import org.openoffice.xmerge.ConvertData;
import org.openoffice.xmerge.converter.palm.PalmDocument;
import java.io.IOException;
-import java.util.Enumeration;
/**
* <p>MiniCalc implementation of <code>DocumentDeserializer</code>
diff --git a/main/xmerge/source/palmtests/qa/comparator/XmlZipExtract.java b/main/xmerge/source/palmtests/qa/comparator/XmlZipExtract.java
index 9d97c708ad..affc7436bc 100644
--- a/main/xmerge/source/palmtests/qa/comparator/XmlZipExtract.java
+++ b/main/xmerge/source/palmtests/qa/comparator/XmlZipExtract.java
@@ -27,7 +27,6 @@ import java.io.FileInputStream;
import java.io.RandomAccessFile;
import java.io.BufferedInputStream;
import java.io.ByteArrayOutputStream;
-import java.util.Enumeration;
import java.util.zip.ZipFile;
import java.util.zip.ZipEntry;
diff --git a/main/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/DocumentDeserializerImpl.java b/main/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/DocumentDeserializerImpl.java
index 5db5d678e5..3ee84ef084 100644
--- a/main/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/DocumentDeserializerImpl.java
+++ b/main/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/DocumentDeserializerImpl.java
@@ -26,7 +26,6 @@ package org.openoffice.xmerge.converter.xml.sxw.wordsmith;
import org.w3c.dom.*;
import java.io.IOException;
-import java.util.Enumeration;
import org.openoffice.xmerge.Document;
import org.openoffice.xmerge.ConvertData;
(openoffice) 02/19: vcl: GTK2 native widget rendering cleanup
Posted by ji...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jimjag pushed a commit to branch AOO50X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 4a3f001258b453021f8c85ca2b08fcb05159ff68
Author: Pedro Giffuni <pf...@apache.org>
AuthorDate: Sun Sep 20 11:33:43 2026 -0500
vcl: GTK2 native widget rendering cleanup
Reduce GTK2 implementation-detail dependencies in native widget rendering.
- Replace direct GTK_WIDGET_SET_FLAGS / UNSET_FLAGS flag twiddling with
public GTK2 APIs (gtk_widget_set_can_focus, gtk_widget_set_can_default,
gtk_widget_set_sensitive) in GtkSalFrame::Init, NWSetWidgetState, and
toolbar/toggle button rendering. GTK 2.18+ is the minimum required version.
- Remove redundant sensitivity flag manipulation in toolbar, grip,
menubar, and popup menu rendering.
- Consolidate repetitive widget style realization and default flag capture
into NWInitWidget().
- Use sal_IntPtr for gWidgetDefaultFlags hash_map key for 64-bit portability.
- Clean up gWidgetDefaultFlags and gWidgetData in GtkData::deInitNWF().
No functional change intended.
(cherry picked from commit 72dd4668a72a87a341b93e67bdad785ccd040e26)
---
main/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 75 +++++++++------------------
main/vcl/unx/gtk/window/gtkframe.cxx | 5 +-
2 files changed, 27 insertions(+), 53 deletions(-)
diff --git a/main/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/main/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index bf73af90dd..bbd90a254b 100644
--- a/main/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/main/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -144,7 +144,7 @@ struct NWFWidgetData
// Keep a hash table of Widgets->default flags so that we can
// easily and quickly reset each to a default state before using
// them
-static std::hash_map<long, guint> gWidgetDefaultFlags;
+static std::hash_map<sal_IntPtr, guint> gWidgetDefaultFlags;
static std::vector<NWFWidgetData> gWidgetData;
static const GtkBorder aDefDefBorder = { 1, 1, 1, 1 };
@@ -463,6 +463,8 @@ void GtkData::deInitNWF( void )
delete gWidgetData[i].gNWPixmapCacheList;
gWidgetData[i].gNWPixmapCacheList = NULL;
}
+ gWidgetDefaultFlags.clear();
+ gWidgetData.clear();
}
@@ -2495,10 +2497,6 @@ sal_Bool GtkSalGraphics::NWPaintGTKToolbar(
{
NWSetWidgetState( gWidgetData[m_nScreen].gToolbarWidget, nState, stateType );
- GTK_WIDGET_UNSET_FLAGS( gWidgetData[m_nScreen].gToolbarWidget, GTK_SENSITIVE );
- if ( nState & CTRL_STATE_ENABLED )
- GTK_WIDGET_SET_FLAGS( gWidgetData[m_nScreen].gToolbarWidget, GTK_SENSITIVE );
-
if( nPart == PART_DRAW_BACKGROUND_HORZ )
gtk_toolbar_set_orientation( GTK_TOOLBAR(gWidgetData[m_nScreen].gToolbarWidget), GTK_ORIENTATION_HORIZONTAL );
else
@@ -2509,10 +2507,6 @@ sal_Bool GtkSalGraphics::NWPaintGTKToolbar(
{
NWSetWidgetState( gWidgetData[m_nScreen].gHandleBoxWidget, nState, stateType );
- GTK_WIDGET_UNSET_FLAGS( gWidgetData[m_nScreen].gHandleBoxWidget, GTK_SENSITIVE );
- if ( nState & CTRL_STATE_ENABLED )
- GTK_WIDGET_SET_FLAGS( gWidgetData[m_nScreen].gHandleBoxWidget, GTK_SENSITIVE );
-
gtk_handle_box_set_shadow_type( GTK_HANDLE_BOX(gWidgetData[m_nScreen].gHandleBoxWidget), shadowType );
// evaluate grip rect
@@ -2659,10 +2653,6 @@ sal_Bool GtkSalGraphics::NWPaintGTKMenubar(
{
NWSetWidgetState( gWidgetData[m_nScreen].gMenubarWidget, nState, stateType );
- GTK_WIDGET_UNSET_FLAGS( gWidgetData[m_nScreen].gMenubarWidget, GTK_SENSITIVE );
- if ( nState & CTRL_STATE_ENABLED )
- GTK_WIDGET_SET_FLAGS( gWidgetData[m_nScreen].gMenubarWidget, GTK_SENSITIVE );
-
// #118704# for translucent menubar styles paint background first
gtk_paint_flat_box( gWidgetData[m_nScreen].gMenubarWidget->style,
gdkDrawable,
@@ -2737,10 +2727,6 @@ sal_Bool GtkSalGraphics::NWPaintGTKPopupMenu(
NWSetWidgetState( gWidgetData[m_nScreen].gMenuWidget, nState, stateType );
- GTK_WIDGET_UNSET_FLAGS( gWidgetData[m_nScreen].gMenuWidget, GTK_SENSITIVE );
- if ( nState & CTRL_STATE_ENABLED )
- GTK_WIDGET_SET_FLAGS( gWidgetData[m_nScreen].gMenuWidget, GTK_SENSITIVE );
-
for( clipList::const_iterator it = rClipList.begin(); it != rClipList.end(); ++it )
{
clipRect.x = it->Left();
@@ -3739,7 +3725,7 @@ static void NWSetWidgetState( GtkWidget* widget, ControlState nState, GtkStateTy
GTK_WIDGET_UNSET_FLAGS( widget, GTK_HAS_DEFAULT );
GTK_WIDGET_UNSET_FLAGS( widget, GTK_HAS_FOCUS );
GTK_WIDGET_UNSET_FLAGS( widget, GTK_SENSITIVE );
- GTK_WIDGET_SET_FLAGS( widget, gWidgetDefaultFlags[(long)widget] );
+ GTK_WIDGET_SET_FLAGS( widget, gWidgetDefaultFlags[(sal_IntPtr)widget] );
if ( nState & CTRL_STATE_DEFAULT )
GTK_WIDGET_SET_FLAGS( widget, GTK_HAS_DEFAULT );
@@ -3756,6 +3742,15 @@ static void NWSetWidgetState( GtkWidget* widget, ControlState nState, GtkStateTy
//-------------------------------------
+static void NWInitWidget( GtkWidget* widget )
+{
+ gtk_widget_realize( widget );
+ gtk_widget_ensure_style( widget );
+
+ // Store widget's default flags
+ gWidgetDefaultFlags[ (sal_IntPtr)widget ] = GTK_WIDGET_FLAGS( widget );
+}
+
static void NWAddWidgetToCacheWindow( GtkWidget* widget, int nScreen )
{
NWFWidgetData& rData = gWidgetData[nScreen];
@@ -3776,11 +3771,7 @@ static void NWAddWidgetToCacheWindow( GtkWidget* widget, int nScreen )
}
gtk_container_add( GTK_CONTAINER(rData.gDumbContainer), widget );
- gtk_widget_realize( widget );
- gtk_widget_ensure_style( widget );
-
- // Store widget's default flags
- gWidgetDefaultFlags[ (long)widget ] = GTK_WIDGET_FLAGS( widget );
+ NWInitWidget( widget );
}
//-------------------------------------
@@ -3952,13 +3943,13 @@ static void NWEnsureGTKToolbar( int nScreen )
(char *)NULL);
gtk_button_set_relief( GTK_BUTTON(gWidgetData[nScreen].gToolbarButtonWidget), aRelief );
- GTK_WIDGET_UNSET_FLAGS( gWidgetData[nScreen].gToolbarButtonWidget, GTK_CAN_FOCUS );
- GTK_WIDGET_UNSET_FLAGS( gWidgetData[nScreen].gToolbarButtonWidget, GTK_CAN_DEFAULT );
+ gtk_widget_set_can_focus( gWidgetData[nScreen].gToolbarButtonWidget, FALSE );
+ gtk_widget_set_can_default( gWidgetData[nScreen].gToolbarButtonWidget, FALSE );
NWAddWidgetToCacheWindow( gWidgetData[nScreen].gToolbarButtonWidget, nScreen );
gtk_button_set_relief( GTK_BUTTON(gWidgetData[nScreen].gToolbarToggleWidget), aRelief );
- GTK_WIDGET_UNSET_FLAGS( gWidgetData[nScreen].gToolbarToggleWidget, GTK_CAN_FOCUS );
- GTK_WIDGET_UNSET_FLAGS( gWidgetData[nScreen].gToolbarToggleWidget, GTK_CAN_DEFAULT );
+ gtk_widget_set_can_focus( gWidgetData[nScreen].gToolbarToggleWidget, FALSE );
+ gtk_widget_set_can_default( gWidgetData[nScreen].gToolbarToggleWidget, FALSE );
NWAddWidgetToCacheWindow( gWidgetData[nScreen].gToolbarToggleWidget, nScreen );
}
if( ! gWidgetData[nScreen].gHandleBoxWidget )
@@ -3982,10 +3973,7 @@ static void NWEnsureGTKMenubar( int nScreen )
gtk_widget_show( gWidgetData[nScreen].gMenubarWidget );
// do what NWAddWidgetToCacheWindow does except adding to def container
- gtk_widget_realize( gWidgetData[nScreen].gMenuItemMenubarWidget );
- gtk_widget_ensure_style( gWidgetData[nScreen].gMenuItemMenubarWidget );
-
- gWidgetDefaultFlags[ (long)gWidgetData[nScreen].gMenuItemMenubarWidget ] = GTK_WIDGET_FLAGS( gWidgetData[nScreen].gMenuItemMenubarWidget );
+ NWInitWidget( gWidgetData[nScreen].gMenuItemMenubarWidget );
}
}
@@ -4005,26 +3993,11 @@ static void NWEnsureGTKMenu( int nScreen )
gtk_menu_shell_append( GTK_MENU_SHELL( gWidgetData[nScreen].gMenuWidget ), gWidgetData[nScreen].gImageMenuItem );
// do what NWAddWidgetToCacheWindow does except adding to def container
- gtk_widget_realize( gWidgetData[nScreen].gMenuWidget );
- gtk_widget_ensure_style( gWidgetData[nScreen].gMenuWidget );
-
- gtk_widget_realize( gWidgetData[nScreen].gMenuItemMenuWidget );
- gtk_widget_ensure_style( gWidgetData[nScreen].gMenuItemMenuWidget );
-
- gtk_widget_realize( gWidgetData[nScreen].gMenuItemCheckMenuWidget );
- gtk_widget_ensure_style( gWidgetData[nScreen].gMenuItemCheckMenuWidget );
-
- gtk_widget_realize( gWidgetData[nScreen].gMenuItemRadioMenuWidget );
- gtk_widget_ensure_style( gWidgetData[nScreen].gMenuItemRadioMenuWidget );
-
- gtk_widget_realize( gWidgetData[nScreen].gImageMenuItem );
- gtk_widget_ensure_style( gWidgetData[nScreen].gImageMenuItem );
-
- gWidgetDefaultFlags[ (long)gWidgetData[nScreen].gMenuWidget ] = GTK_WIDGET_FLAGS( gWidgetData[nScreen].gMenuWidget );
- gWidgetDefaultFlags[ (long)gWidgetData[nScreen].gMenuItemMenuWidget ] = GTK_WIDGET_FLAGS( gWidgetData[nScreen].gMenuItemMenuWidget );
- gWidgetDefaultFlags[ (long)gWidgetData[nScreen].gMenuItemCheckMenuWidget ] = GTK_WIDGET_FLAGS( gWidgetData[nScreen].gMenuItemCheckMenuWidget );
- gWidgetDefaultFlags[ (long)gWidgetData[nScreen].gMenuItemRadioMenuWidget ] = GTK_WIDGET_FLAGS( gWidgetData[nScreen].gMenuItemRadioMenuWidget );
- gWidgetDefaultFlags[ (long)gWidgetData[nScreen].gImageMenuItem ] = GTK_WIDGET_FLAGS( gWidgetData[nScreen].gImageMenuItem );
+ NWInitWidget( gWidgetData[nScreen].gMenuWidget );
+ NWInitWidget( gWidgetData[nScreen].gMenuItemMenuWidget );
+ NWInitWidget( gWidgetData[nScreen].gMenuItemCheckMenuWidget );
+ NWInitWidget( gWidgetData[nScreen].gMenuItemRadioMenuWidget );
+ NWInitWidget( gWidgetData[nScreen].gImageMenuItem );
}
}
diff --git a/main/vcl/unx/gtk/window/gtkframe.cxx b/main/vcl/unx/gtk/window/gtkframe.cxx
index e622639eab..67cb16d5f3 100644
--- a/main/vcl/unx/gtk/window/gtkframe.cxx
+++ b/main/vcl/unx/gtk/window/gtkframe.cxx
@@ -934,8 +934,9 @@ void GtkSalFrame::Init( SystemParentData* pSysData )
{
m_pWindow = gtk_plug_new( pSysData->aWindow );
m_bWindowIsGtkPlug = true;
- GTK_WIDGET_SET_FLAGS( m_pWindow, GTK_CAN_FOCUS | GTK_SENSITIVE | GTK_CAN_DEFAULT );
- gtk_widget_set_sensitive( m_pWindow, true );
+ gtk_widget_set_can_focus( m_pWindow, TRUE );
+ gtk_widget_set_can_default( m_pWindow, TRUE );
+ gtk_widget_set_sensitive( m_pWindow, TRUE );
}
else
{
(openoffice) 17/19: General spelling clean up (#484)
Posted by ji...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jimjag pushed a commit to branch AOO50X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit a85c3b5cd88381601b591a9a4174ea5b63b65371
Author: John Bampton <jb...@users.noreply.github.com>
AuthorDate: Tue Oct 13 19:57:33 2026 +1000
General spelling clean up (#484)
* Fix spelling
* Clean up codespell ignored words list
(cherry picked from commit 3d88fa310793915bc3fc4ff1937e87bfa1038073)
---
.github/linters/codespell.txt | 8 --------
main/dbaccess/source/ext/macromigration/migrationengine.cxx | 6 +++---
main/l10ntools/java/jpropex/build.xml | 2 +-
main/l10ntools/java/l10nconv/build.xml | 2 +-
main/l10ntools/java/receditor/build.xml | 2 +-
.../com/sun/star/configuration/backend/XSchemaHandler.idl | 2 +-
main/offapi/com/sun/star/xml/crypto/XXMLEncryption.idl | 2 +-
.../com/sun/star/xml/crypto/XXMLEncryptionTemplate.idl | 4 ++--
main/offapi/com/sun/star/xml/crypto/XXMLSignature.idl | 6 +++---
.../offapi/com/sun/star/xml/crypto/XXMLSignatureTemplate.idl | 2 +-
.../registry/data/org/openoffice/Office/TableWizard.xcu | 12 ++++++------
main/sc/source/ui/vba/vbafont.cxx | 2 +-
main/shell/source/unix/misc/open-url.c | 2 +-
main/shell/source/unix/misc/senddoc.c | 2 +-
main/sw/source/core/docnode/ndcopy.cxx | 2 +-
main/sw/source/filter/ww8/ww8atr.cxx | 2 +-
main/tools/source/fsys/dirent.cxx | 2 +-
.../converter/xml/sxc/pexcel/records/ExtendedFormat.java | 4 ++--
.../converter/xml/sxc/pexcel/records/formula/Token.java | 8 ++++----
.../java/org/openoffice/xmerge/util/ColourConverter.java | 2 +-
main/xmloff/inc/xmloff/xmlexppr.hxx | 4 ++--
21 files changed, 35 insertions(+), 43 deletions(-)
diff --git a/.github/linters/codespell.txt b/.github/linters/codespell.txt
index 51f3aceaf9..f58fa4b006 100644
--- a/.github/linters/codespell.txt
+++ b/.github/linters/codespell.txt
@@ -451,10 +451,7 @@ collpase
colmuned
colse
colums
-comand
comando
-comaparison
-comaprison
comared
comares
combained
@@ -660,7 +657,6 @@ definied
definifiton
definitivly
defint
-defualt
defult
degenrate
degress
@@ -691,20 +687,17 @@ dependeny
dependicies
depenent
depent
-deprication
dequed
dereferencable
deregisteres
deregistrated
dergeistered
deriver
-dertermine
dervied
dervived
desaster
descritor
descritpro
-descrption
desctop
desctructed
desctructor
@@ -716,7 +709,6 @@ desribing
desroyer
destanation
destinaion
-destionation
destop
destory
destorying
diff --git a/main/dbaccess/source/ext/macromigration/migrationengine.cxx b/main/dbaccess/source/ext/macromigration/migrationengine.cxx
index 81c7a3eba4..605884b698 100644
--- a/main/dbaccess/source/ext/macromigration/migrationengine.cxx
+++ b/main/dbaccess/source/ext/macromigration/migrationengine.cxx
@@ -1066,7 +1066,7 @@ namespace dbmm
const Reference< XNameAccess >& _rxContainer, const ::rtl::OUString& _rContainerLoc,
SubDocuments& _out_rDocs, const SubDocumentType _eType, size_t& _io_counter )
{
- const ::rtl::OUString sHierarhicalBase(
+ const ::rtl::OUString sHierarchicalBase(
_rContainerLoc.getLength() ? ::rtl::OUStringBuffer( _rContainerLoc ).appendAscii( "/" ).makeStringAndClear()
: ::rtl::OUString() );
@@ -1077,7 +1077,7 @@ namespace dbmm
)
{
Any aElement( _rxContainer->getByName( *elementName ) );
- ::rtl::OUString sElementName( ::rtl::OUStringBuffer( sHierarhicalBase ).append( *elementName ) );
+ ::rtl::OUString sElementName( ::rtl::OUStringBuffer( sHierarchicalBase ).append( *elementName ) );
Reference< XNameAccess > xSubContainer( aElement, UNO_QUERY );
if ( xSubContainer.is() )
@@ -1087,7 +1087,7 @@ namespace dbmm
else
{
Reference< XCommandProcessor > xCommandProcessor( aElement, UNO_QUERY );
- OSL_ENSURE( xCommandProcessor.is(), "lcl_collectHierarchicalElementNames_throw: no container, and no comand processor? What *is* it, then?!" );
+ OSL_ENSURE( xCommandProcessor.is(), "lcl_collectHierarchicalElementNames_throw: no container, and no command processor? What *is* it, then?!" );
if ( xCommandProcessor.is() )
{
_out_rDocs.push_back( SubDocument( xCommandProcessor, sElementName, _eType, ++_io_counter ) );
diff --git a/main/l10ntools/java/jpropex/build.xml b/main/l10ntools/java/jpropex/build.xml
index d4e73ae78b..91e1b44f6a 100644
--- a/main/l10ntools/java/jpropex/build.xml
+++ b/main/l10ntools/java/jpropex/build.xml
@@ -117,7 +117,7 @@
<target name="compile" depends="prepare,res">
<javac destdir="${build.class}"
debug="${debug}"
- deprecation="${deprication}"
+ deprecation="${deprecation}"
optimize="${optimize}"
classpathref="classpath">
<src path="${java.dir}"/>
diff --git a/main/l10ntools/java/l10nconv/build.xml b/main/l10ntools/java/l10nconv/build.xml
index 2a839fb354..df53e2aff7 100644
--- a/main/l10ntools/java/l10nconv/build.xml
+++ b/main/l10ntools/java/l10nconv/build.xml
@@ -119,7 +119,7 @@
<target name="compile" depends="prepare,res">
<javac destdir="${build.class}"
debug="${debug}"
- deprecation="${deprication}"
+ deprecation="${deprecation}"
optimize="${optimize}"
classpathref="classpath">
<src path="${java.dir}"/>
diff --git a/main/l10ntools/java/receditor/build.xml b/main/l10ntools/java/receditor/build.xml
index b4129053ef..1ff17b92b2 100644
--- a/main/l10ntools/java/receditor/build.xml
+++ b/main/l10ntools/java/receditor/build.xml
@@ -117,7 +117,7 @@
<target name="compile" depends="prepare,res">
<javac destdir="${build.class}"
debug="${debug}"
- deprecation="${deprication}"
+ deprecation="${deprecation}"
optimize="${optimize}"
classpathref="classpath">
<src path="${java.dir}"/>
diff --git a/main/offapi/com/sun/star/configuration/backend/XSchemaHandler.idl b/main/offapi/com/sun/star/configuration/backend/XSchemaHandler.idl
index 83eaf5d1b0..a1fff28078 100644
--- a/main/offapi/com/sun/star/configuration/backend/XSchemaHandler.idl
+++ b/main/offapi/com/sun/star/configuration/backend/XSchemaHandler.idl
@@ -55,7 +55,7 @@ published interface XSchemaHandler: ::com::sun::star::uno::XInterface
/** receives notification that a schema description is started.
- <p> The schema descrption may comprise components templates or both.
+ <p> The schema description may comprise components templates or both.
</p>
@throws com::sun::star::configuration::backend::MalformedDataException
diff --git a/main/offapi/com/sun/star/xml/crypto/XXMLEncryption.idl b/main/offapi/com/sun/star/xml/crypto/XXMLEncryption.idl
index 85b5830002..d7f66a14b4 100644
--- a/main/offapi/com/sun/star/xml/crypto/XXMLEncryption.idl
+++ b/main/offapi/com/sun/star/xml/crypto/XXMLEncryption.idl
@@ -48,7 +48,7 @@ module com { module sun { module star { module xml { module crypto {
* <p>The encrypter or decrypter concrete a key by retrieve security context
* and encryption template.</p>
*
- * <p>In some cases, the encrypter or decrypter can dertermine and locate the
+ * <p>In some cases, the encrypter or decrypter can determine and locate the
* EncrytedKey from the encryption template by dereference the RetrievalMethod
* inside EncryptedData.</p>
*
diff --git a/main/offapi/com/sun/star/xml/crypto/XXMLEncryptionTemplate.idl b/main/offapi/com/sun/star/xml/crypto/XXMLEncryptionTemplate.idl
index 5146ccce6a..e0f64a3586 100644
--- a/main/offapi/com/sun/star/xml/crypto/XXMLEncryptionTemplate.idl
+++ b/main/offapi/com/sun/star/xml/crypto/XXMLEncryptionTemplate.idl
@@ -45,8 +45,8 @@ module com { module sun { module star { module xml { module crypto {
* EncryptedData or EncryptedKey. Empty entities are not allowed in a encryption
* template when performing decryption.</p>
*
- * <p>In some cases, the encrypter or decrypter can dertermine and locate the
- * EncrytedKey from the encryption template by dereference the RetrievalMethod
+ * <p>In some cases, the encrypter or decrypter can determine and locate the
+ * EncryptedKey from the encryption template by dereference the RetrievalMethod
* inside EncryptedData.</p>
*
* <p>In some cases, the EncryptedKey need to be clearly pointed out by the
diff --git a/main/offapi/com/sun/star/xml/crypto/XXMLSignature.idl b/main/offapi/com/sun/star/xml/crypto/XXMLSignature.idl
index e11666f96d..a890489b18 100644
--- a/main/offapi/com/sun/star/xml/crypto/XXMLSignature.idl
+++ b/main/offapi/com/sun/star/xml/crypto/XXMLSignature.idl
@@ -40,12 +40,12 @@ module com { module sun { module star { module xml { module crypto {
/**
* Interface of XML signature
*
- * <p>This interface represents a xml signer or vertifier.</p>
+ * <p>This interface represents a xml signer or verifier.</p>
*
- * <p>The signer or vertifier concrete a key by retrieve signature context and
+ * <p>The signer or verifier concrete a key by retrieve signature context and
* signature template.</p>
*
- * <p>In some cases, the signer or vertifier can dertermine and locate the
+ * <p>In some cases, the signer or verifier can determine and locate the
* contents to be signed from the signature template by dereference the URI.</p>
*
* <p>In some cases, the contents to be signed need to be clearly pointed out by
diff --git a/main/offapi/com/sun/star/xml/crypto/XXMLSignatureTemplate.idl b/main/offapi/com/sun/star/xml/crypto/XXMLSignatureTemplate.idl
index 7bbdaea5c6..3b1a1a1fd5 100644
--- a/main/offapi/com/sun/star/xml/crypto/XXMLSignatureTemplate.idl
+++ b/main/offapi/com/sun/star/xml/crypto/XXMLSignatureTemplate.idl
@@ -45,7 +45,7 @@ module com { module sun { module star { module xml { module crypto {
* entities include digest value and signature value. Empty entities are not
* allowed in a signature template when performing validation.</p>
*
- * <p>In some cases, the signer or vertifier can dertermine and locate the
+ * <p>In some cases, the signer or verifier can determine and locate the
* contents to be signed from the template by dereference the URI.</p>
*
* <p>With the help of signature context, the signer or verifier specifies the
diff --git a/main/officecfg/registry/data/org/openoffice/Office/TableWizard.xcu b/main/officecfg/registry/data/org/openoffice/Office/TableWizard.xcu
index 1805ecea60..ee55211ded 100644
--- a/main/officecfg/registry/data/org/openoffice/Office/TableWizard.xcu
+++ b/main/officecfg/registry/data/org/openoffice/Office/TableWizard.xcu
@@ -5259,7 +5259,7 @@
</prop>
<prop oor:name="ShortName">
- <value xml:lang="en-US">Descrption</value>
+ <value xml:lang="en-US">Description</value>
</prop>
<prop oor:name="Type">
@@ -5699,7 +5699,7 @@
</prop>
<prop oor:name="ShortName">
- <value xml:lang="en-US">Descrption</value>
+ <value xml:lang="en-US">Description</value>
</prop>
<prop oor:name="Type">
@@ -5982,7 +5982,7 @@
</prop>
<prop oor:name="ShortName">
- <value xml:lang="en-US">Descrption</value>
+ <value xml:lang="en-US">Description</value>
</prop>
<prop oor:name="Type">
@@ -6729,7 +6729,7 @@
</prop>
<prop oor:name="ShortName">
- <value xml:lang="en-US">Descrption</value>
+ <value xml:lang="en-US">Description</value>
</prop>
<prop oor:name="Type">
@@ -6987,7 +6987,7 @@
</prop>
<prop oor:name="ShortName">
- <value xml:lang="en-US">Descrption</value>
+ <value xml:lang="en-US">Description</value>
</prop>
<prop oor:name="Type">
@@ -9133,7 +9133,7 @@
</prop>
<prop oor:name="ShortName">
- <value xml:lang="en-US">Descrption</value>
+ <value xml:lang="en-US">Description</value>
</prop>
<prop oor:name="Type">
diff --git a/main/sc/source/ui/vba/vbafont.cxx b/main/sc/source/ui/vba/vbafont.cxx
index b47b46b5b2..3fa30f0a27 100644
--- a/main/sc/source/ui/vba/vbafont.cxx
+++ b/main/sc/source/ui/vba/vbafont.cxx
@@ -240,7 +240,7 @@ ScVbaFont::setColorIndex( const uno::Any& _colorindex )
if ( !nIndex || ( nIndex == excel::XlColorIndex::xlColorIndexAutomatic ) )
{
- nIndex = 1; // check defualt ( assume black )
+ nIndex = 1; // check default ( assume black )
ScVbaFont_BASE::setColorIndex( uno::makeAny( nIndex ) );
}
else
diff --git a/main/shell/source/unix/misc/open-url.c b/main/shell/source/unix/misc/open-url.c
index d530741081..d6042cdeac 100644
--- a/main/shell/source/unix/misc/open-url.c
+++ b/main/shell/source/unix/misc/open-url.c
@@ -64,7 +64,7 @@ void logMessage( char* msg)
fclose( log);
}
-// dump comand line arguments
+// dump command line arguments
void dumpArgs( int argc, char *argv[] )
{
int i;
diff --git a/main/shell/source/unix/misc/senddoc.c b/main/shell/source/unix/misc/senddoc.c
index 5740d5df08..6cce361772 100644
--- a/main/shell/source/unix/misc/senddoc.c
+++ b/main/shell/source/unix/misc/senddoc.c
@@ -64,7 +64,7 @@ void logMessage( char* msg)
fclose( log);
}
-// dump comand line arguments
+// dump command line arguments
void dumpArgs( int argc, char *argv[] )
{
int i;
diff --git a/main/sw/source/core/docnode/ndcopy.cxx b/main/sw/source/core/docnode/ndcopy.cxx
index 25c6db4210..53f03e055d 100644
--- a/main/sw/source/core/docnode/ndcopy.cxx
+++ b/main/sw/source/core/docnode/ndcopy.cxx
@@ -231,7 +231,7 @@ SwCntntNode* SwTxtNode::MakeCopy( SwDoc* pDoc, const SwNodeIndex& rIdx ) const
// the Copy-Textnode is the Node with the Text, the Copy-Attrnode is the
// node with the collection and hard attributes. Normally ist the same
// node, but if insert a glossary without formatting, then the Attrnode
- // is the prev node of the destionation position in dest. document.
+ // is the prev node of the destination position in dest. document.
SwTxtNode* pCpyTxtNd = (SwTxtNode*)this;
SwTxtNode* pCpyAttrNd = pCpyTxtNd;
diff --git a/main/sw/source/filter/ww8/ww8atr.cxx b/main/sw/source/filter/ww8/ww8atr.cxx
index 80e4740afe..23f8f53fae 100644
--- a/main/sw/source/filter/ww8/ww8atr.cxx
+++ b/main/sw/source/filter/ww8/ww8atr.cxx
@@ -1876,7 +1876,7 @@ void WW8Export::OutputField( const SwField* pFld, ww::eField eFldType,
if ( bHandleBookmark )
{
- // retrieve reference destionation - the name of the bookmark
+ // retrieve reference destination - the name of the bookmark
String aLinkStr;
const sal_uInt16 nSubType = pFld->GetSubType();
const SwGetRefField& rRFld = *(static_cast<const SwGetRefField*>(pFld));
diff --git a/main/tools/source/fsys/dirent.cxx b/main/tools/source/fsys/dirent.cxx
index c941a0c763..ac2fa493f8 100644
--- a/main/tools/source/fsys/dirent.cxx
+++ b/main/tools/source/fsys/dirent.cxx
@@ -2105,7 +2105,7 @@ DirEntry DirEntry::TempName( DirEntryKind eKind ) const
char *ret_val;
size_t i;
- // dertermine Directory, Prefix and Extension
+ // determine Directory, Prefix and Extension
char pfx[6];
char ext[5];
const char *dir;
diff --git a/main/xmerge/java/pexcel/src/main/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ExtendedFormat.java b/main/xmerge/java/pexcel/src/main/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ExtendedFormat.java
index f07dcd49ba..40616ff8b6 100644
--- a/main/xmerge/java/pexcel/src/main/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ExtendedFormat.java
+++ b/main/xmerge/java/pexcel/src/main/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ExtendedFormat.java
@@ -84,7 +84,7 @@ org.openoffice.xmerge.converter.xml.OfficeConstants {
}
/**
- * Constructs a pocket Excel Document using defualt values and sets the
+ * Constructs a pocket Excel Document using default values and sets the
* font index using the specified attribute
*
* @param ixfnt index of the font this format should use
@@ -276,7 +276,7 @@ org.openoffice.xmerge.converter.xml.OfficeConstants {
/**
* Compare two ExtendedFormat to see if the font index is the same
*
- * @param rhs the ExtendedFormat to be used in the comaprison
+ * @param rhs the ExtendedFormat to be used in the comparison
* @return boolean if the two are the same otherwise false
*/
public boolean compareTo(ExtendedFormat rhs) {
diff --git a/main/xmerge/java/pexcel/src/main/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/Token.java b/main/xmerge/java/pexcel/src/main/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/Token.java
index 024beea4af..36cece427f 100644
--- a/main/xmerge/java/pexcel/src/main/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/Token.java
+++ b/main/xmerge/java/pexcel/src/main/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/Token.java
@@ -28,7 +28,7 @@ package org.openoffice.xmerge.converter.xml.sxc.pexcel.records.formula;
* A Token is the basic building block of any formula.
* A Token can be of four types (Operator, Operand, Function with fixed
* arguments and function with a variable number of arguments. Each type can
- * have numerous id's. Thetypes are define in <code>ParseToken</code> and the
+ * have numerous id's. The types are define in <code>ParseToken</code> and the
* id's are defined in <code>TokenConstants</code>. The other member variables
* are priority which is returned from the <code>PrecedenceTable</code>, the
* value which is the String equivalent of the token (eg. "+", "$A$12", "SUM")
@@ -61,7 +61,7 @@ public class Token implements ParseToken {
/**
* Checks if the current token is an operator
*
- * @return A <code>boolean</code> result of the comaparison
+ * @return A <code>boolean</code> result of the comparison
*/
public boolean isOperator() {
return type == ParseToken.TOKEN_OPERATOR;
@@ -70,7 +70,7 @@ public class Token implements ParseToken {
/**
* Checks if the current token is an operand
*
- * @return A <code>boolean</code> result of the comaparison
+ * @return A <code>boolean</code> result of the comparison
*/
public boolean isOperand() {
return type == ParseToken.TOKEN_OPERAND;
@@ -79,7 +79,7 @@ public class Token implements ParseToken {
/**
* Checks if the current token is a function
*
- * @return A <code>boolean</code> result of the comaparison
+ * @return A <code>boolean</code> result of the comparison
*/
public boolean isFunction() {
return (type==ParseToken.TOKEN_FUNCTION_FIXED) || (type==ParseToken.TOKEN_FUNCTION_VARIABLE);
diff --git a/main/xmerge/java/xmerge/src/main/java/org/openoffice/xmerge/util/ColourConverter.java b/main/xmerge/java/xmerge/src/main/java/org/openoffice/xmerge/util/ColourConverter.java
index 40760ee220..5fb0aaee82 100644
--- a/main/xmerge/java/xmerge/src/main/java/org/openoffice/xmerge/util/ColourConverter.java
+++ b/main/xmerge/java/xmerge/src/main/java/org/openoffice/xmerge/util/ColourConverter.java
@@ -30,7 +30,7 @@ import java.awt.Color;
* Utility class mapping RGB colour specifications to the colour indices used
* in the Pocket PC. The original converter was written for use with Pocket
* Word it was later put into the utils so Pocket excel could use this code
- * also. For this reason the defualt values are those used by Pocket Word but
+ * also. For this reason the default values are those used by Pocket Word but
* a colour table can be passed in through the constructor to map the 16
* values to a colour table.
*
diff --git a/main/xmloff/inc/xmloff/xmlexppr.hxx b/main/xmloff/inc/xmloff/xmlexppr.hxx
index d039500dff..254aafe073 100644
--- a/main/xmloff/inc/xmloff/xmlexppr.hxx
+++ b/main/xmloff/inc/xmloff/xmlexppr.hxx
@@ -120,10 +120,10 @@ public:
::com::sun::star::beans::XPropertySet > rPropSet ) const
{ return _Filter(rPropSet, sal_False); }
- /** Like Filter(), excepti that:
+ /** Like Filter(), except that:
* - only properties that have the map flag MID_FLAG_DEFAULT_ITEM_EXPORT
* set are exported,
- * - instead of the property's value, its defualt value is exported.
+ * - instead of the property's value, its default value is exported.
*/
::std::vector< XMLPropertyState > FilterDefaults(
const ::com::sun::star::uno::Reference<
(openoffice) 19/19: Update README.md
Posted by ji...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jimjag pushed a commit to branch AOO50X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 7ba51dc71ed9f7a132e064228f5b56bfb7ae8bd7
Author: Matthias Seidel <ms...@apache.org>
AuthorDate: Tue Oct 13 15:33:05 2026 +0200
Update README.md
(cherry picked from commit beb914a2646bb91a39dbd6a38c8847d211b26a2b)
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index ce95e8aa2e..e33008d869 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@ Currently supported platforms include:
- FreeBSD
- OS/2
-OpenOffice is used by millions of users worldwide and with more than 408 million downloads it is one of the most successful open source projects.
+OpenOffice is used by millions of users worldwide and with more than 400 million downloads it is one of the most successful open source projects.
# Getting the latest sources via Git
(openoffice) 12/19: Replace java.lang.StringBuffer with java.lang.StringBuilder.
Posted by ji...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jimjag pushed a commit to branch AOO50X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 414046902314a00f3f3c88f81131462dcb947949
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Thu Oct 1 04:26:17 2026 +0200
Replace java.lang.StringBuffer with java.lang.StringBuilder.
StringBuilder is faster as its methods are not "synchronized",
avoiding unnecessary locking.
Patch by: me
(cherry picked from commit b6fd66b75b193ec5c149e1b2c838579d044a0b3d)
---
.../accessibility/awb/view/TableView.java | 6 ++---
.../accessibility/awb/view/TextView.java | 6 ++---
.../com/sun/star/beans/LocalOfficeConnection.java | 6 ++---
.../sun/star/comp/beans/LocalOfficeConnection.java | 6 ++---
main/bean/qa/complex/bean/OOoBeanTest.java | 4 ++--
.../qa/connectivity/tools/HsqlDatabase.java | 6 ++---
.../source/config/tools/split/FCFGSplit.java | 6 ++---
.../filter/source/config/tools/split/Splitter.java | 2 +-
main/forms/qa/integration/forms/ListBox.java | 6 ++---
main/forms/qa/integration/forms/RadioButtons.java | 2 +-
.../qa/complex/framework/autosave/Protocol.java | 28 +++++++++++-----------
.../com/sun/star/lib/uno/helper/UnoUrl.java | 2 +-
.../com/sun/star/lib/uno/helper/WeakBase_Test.java | 2 +-
.../star/lib/uno/environments/remote/ThreadId.java | 2 +-
.../java/com/sun/star/lib/util/StringHelper.java | 2 +-
.../com/sun/star/lib/util/UrlToFileMapper.java | 2 +-
main/l10ntools/java/jpropex/java/JPropEx.java | 8 +++----
main/l10ntools/java/jpropex/java/SdfEntity.java | 4 ++--
.../star/tooling/DirtyTags/DirtyTagWrapper.java | 6 ++---
.../com/sun/star/tooling/DirtyTags/TagPair.java | 4 ++--
.../com/sun/star/tooling/converter/GSIWriter.java | 18 +++++++-------
.../com/sun/star/tooling/converter/SDFReader.java | 2 +-
.../com/sun/star/tooling/converter/SDFWriter.java | 2 +-
.../sun/star/tooling/converter/XLIFFWriter.java | 4 ++--
main/l10ntools/source/filter/merge/FCFGMerge.java | 4 ++--
main/l10ntools/source/filter/merge/Merger.java | 4 ++--
.../source/filter/utils/AnalyzeStartupLog.java | 2 +-
main/l10ntools/source/filter/utils/Cache.java | 24 +++++++++----------
main/l10ntools/source/filter/utils/FileHelper.java | 14 +++++------
main/l10ntools/source/filter/utils/XMLHelper.java | 18 +++++++-------
.../DevelopersGuide/Charts/ChartInCalc.java | 4 ++--
.../Components/Addons/JobsAddon/AsyncJob.java | 2 +-
.../DevelopersGuide/Config/ConfigExamples.java | 2 +-
.../DevelopersGuide/Drawing/DrawViewDemo.java | 2 +-
.../DevelopersGuide/Drawing/GraphicExportDemo.java | 2 +-
.../examples/DevelopersGuide/Forms/URLHelper.java | 2 +-
.../DesktopEnvironment/FunctionHelper.java | 2 +-
.../AsciiFilter/AsciiReplaceFilter.java | 8 +++----
.../DevelopersGuide/Text/TextDocuments.java | 6 ++---
main/odk/examples/DevelopersGuide/UCB/Helper.java | 8 +++----
.../java/DocumentHandling/DocumentLoader.java | 2 +-
.../java/DocumentHandling/DocumentPrinter.java | 2 +-
.../java/DocumentHandling/DocumentSaver.java | 4 ++--
main/odk/examples/java/Text/GraphicsInserter.java | 2 +-
.../sun/star/lib/loader/InstallationFinder.java | 2 +-
.../apache/openoffice/ooxml/viewer/StreamView.java | 2 +-
.../openoffice/ooxml/viewer/xml/XMLScanner.java | 2 +-
.../schema/generator/ParserTablesGenerator.java | 10 ++++----
.../ooxml/schema/generator/html/HtmlGenerator.java | 2 +-
.../openoffice/ooxml/schema/model/complex/Any.java | 2 +-
.../ooxml/schema/model/simple/Restriction.java | 2 +-
.../openoffice/ooxml/schema/simple/NumberNode.java | 2 +-
.../openoffice/ooxml/schema/simple/StringNode.java | 2 +-
.../java/OOoRunner/src/main/java/convwatch/DB.java | 12 +++++-----
.../src/main/java/convwatch/DBHelper.java | 4 ++--
.../java/convwatch/EnhancedComplexTestCase.java | 2 +-
.../java/convwatch/GraphicalDifferenceCheck.java | 6 ++---
.../src/main/java/convwatch/HTMLOutputter.java | 10 ++++----
.../src/main/java/convwatch/StringHelper.java | 2 +-
.../src/main/java/graphical/HTMLResult.java | 8 +++----
.../src/main/java/helper/ProcessHandler.java | 8 +++----
.../src/main/java/helper/StringHelper.java | 2 +-
.../OOoRunner/src/main/java/helper/URLHelper.java | 2 +-
.../src/main/java/org/openoffice/Runner.java | 2 +-
.../src/main/java/stats/InternalLogWriter.java | 14 +++++------
.../java/OOoRunner/src/main/java/util/utils.java | 6 ++---
.../java/com/sun/star/report/SDBCReportData.java | 12 +++++-----
.../com/sun/star/report/SDBCReportDataFactory.java | 6 ++---
.../star/report/pentaho/DefaultNameGenerator.java | 2 +-
.../sun/star/report/pentaho/SOFormulaParser.java | 2 +-
.../report/pentaho/StarFunctionDescription.java | 4 ++--
.../pentaho/output/OfficeDocumentReportTarget.java | 8 +++----
.../report/pentaho/output/text/PageContext.java | 4 ++--
.../ridl/src/main/java/com/sun/star/uno/Type.java | 2 +-
.../script/framework/container/ScriptMetaData.java | 2 +-
.../star/script/framework/provider/PathUtils.java | 2 +-
.../beanshell/ScriptEditorForBeanShell.java | 2 +-
.../provider/beanshell/ScriptSourceModel.java | 2 +-
.../framework/provider/java/ScriptDescriptor.java | 2 +-
.../javascript/ScriptEditorForJavaScript.java | 2 +-
.../org/openoffice/idesupport/SVersionRCFile.java | 2 +-
.../idesupport/filter/BinaryOnlyFilter.java | 2 +-
.../idesupport/filter/ExceptParcelFilter.java | 2 +-
.../office/actions/ParcelFolderSupport.java | 2 +-
main/scripting/workben/installer/InstUtil.java | 12 +++++-----
.../workben/mod/_scripting/TestDataLoader.java | 2 +-
main/sw/qa/complex/writer/CheckBookmarks.java | 2 +-
.../mediawiki/src/com/sun/star/wiki/Helper.java | 2 +-
.../accessibility/AccessibleRelationHandler.java | 2 +-
.../test/accessibility/AccessibleTextHandler.java | 4 ++--
.../source/skeletonmaker/javacompskeleton.cxx | 12 +++++-----
main/vcl/qa/complex/memCheck/CheckMemoryUsage.java | 2 +-
.../com/sun/star/wizards/common/FileAccess.java | 6 ++---
.../sun/star/wizards/common/NumericalHelper.java | 8 +++----
.../com/sun/star/wizards/db/SQLQueryComposer.java | 2 +-
.../layout/ReportBuilderLayouter.java | 4 ++--
.../sun/star/wizards/ui/event/UnoDataAware.java | 2 +-
.../converter/xml/sxw/aportisdoc/DocDecoder.java | 2 +-
.../converter/xml/sxw/aportisdoc/DocEncoder.java | 4 ++--
.../xml/sxw/aportisdoc/DocumentSerializerImpl.java | 2 +-
.../xml/sxc/pexcel/PocketExcelEncoder.java | 4 ++--
.../sxc/pexcel/records/formula/FormulaHelper.java | 2 +-
.../sxc/pexcel/records/formula/FormulaParser.java | 4 ++--
.../sxc/pexcel/records/formula/TokenDecoder.java | 2 +-
.../xml/sxw/pocketword/DocumentSerializerImpl.java | 2 +-
.../converter/xml/sxw/pocketword/Paragraph.java | 6 ++---
.../xmerge/converter/xml/OfficeDocument.java | 4 ++--
.../converter/xml/OfficeDocumentException.java | 4 ++--
.../converter/xml/sxc/SxcDocumentSerializer.java | 2 +-
.../xmerge/merger/diff/CharacterParser.java | 2 +-
.../java/org/openoffice/xmerge/util/Debug.java | 2 +-
.../java/org/openoffice/xmerge/util/XmlUtil.java | 2 +-
.../xml/sxc/minicalc/MinicalcEncoder.java | 4 ++--
.../xml/sxw/wordsmith/DocumentSerializerImpl.java | 2 +-
main/xmlsecurity/tools/uno/TestTool.java | 4 ++--
.../org/openoffice/test/common/FileUtil.java | 2 +-
.../org/openoffice/test/common/Installer.java | 2 +-
.../org/openoffice/test/common/ReportUploader.java | 2 +-
.../org/openoffice/test/common/StreamPump.java | 6 ++---
.../org/openoffice/test/common/SystemUtil.java | 22 ++++++++---------
.../test/vcl/client/VclHookException.java | 2 +-
test/testuno/source/testlib/uno/DBUtil.java | 6 ++---
test/testuno/source/testlib/uno/TestUtil.java | 2 +-
123 files changed, 286 insertions(+), 286 deletions(-)
diff --git a/main/accessibility/workben/org/openoffice/accessibility/awb/view/TableView.java b/main/accessibility/workben/org/openoffice/accessibility/awb/view/TableView.java
index 9b78f9109e..9e66e643be 100644
--- a/main/accessibility/workben/org/openoffice/accessibility/awb/view/TableView.java
+++ b/main/accessibility/workben/org/openoffice/accessibility/awb/view/TableView.java
@@ -24,7 +24,7 @@
package org.openoffice.accessibility.awb.view;
import java.lang.Integer;
-import java.lang.StringBuffer;
+import java.lang.StringBuilder;
import javax.swing.JLabel;
@@ -95,7 +95,7 @@ public class TableView
maColumnCountLabel.setText (Integer.toString (nColumnCount));
maCellCountLabel.setText (Integer.toString (nRowCount*nColumnCount));
- StringBuffer sList = new StringBuffer();
+ StringBuilder sList = new StringBuilder();
int[] aSelected = mxTable.getSelectedAccessibleRows();
boolean bFirst = true;
for (int i=0; i<aSelected.length; i++)
@@ -108,7 +108,7 @@ public class TableView
sList.append (Integer.toString(aSelected[i]));
}
maSelectedRowsLabel.setText (sList.toString());
- sList = new StringBuffer();
+ sList = new StringBuilder();
aSelected = mxTable.getSelectedAccessibleColumns();
bFirst = true;
for (int i=0; i<aSelected.length; i++)
diff --git a/main/accessibility/workben/org/openoffice/accessibility/awb/view/TextView.java b/main/accessibility/workben/org/openoffice/accessibility/awb/view/TextView.java
index 209fda0285..d009632347 100644
--- a/main/accessibility/workben/org/openoffice/accessibility/awb/view/TextView.java
+++ b/main/accessibility/workben/org/openoffice/accessibility/awb/view/TextView.java
@@ -252,7 +252,7 @@ public class TextView
int nMaxDisplayCount = 30;
// build up string
- StringBuffer aCharacterArray = new StringBuffer();
+ StringBuilder aCharacterArray = new StringBuilder();
int nIndex = 0;
try
{
@@ -281,7 +281,7 @@ public class TextView
*/
private String GetTextBoundsString ()
{
- StringBuffer aBuffer = new StringBuffer ();
+ StringBuilder aBuffer = new StringBuilder ();
try
{
// Iterate over all characters in the text.
@@ -340,7 +340,7 @@ public class TextView
{
aSegment = GetTextSegment (nIndex, nTextType, nWhere);
DefaultMutableTreeNode aSegmentNode = new DefaultMutableTreeNode (
- new StringBuffer (
+ new StringBuilder (
Integer.toString (nIndex) + " -> "
+ Integer.toString (aSegment.SegmentStart) + " - "
+ Integer.toString (aSegment.SegmentEnd) + " : "
diff --git a/main/bean/java/officebean/src/main/java/com/sun/star/beans/LocalOfficeConnection.java b/main/bean/java/officebean/src/main/java/com/sun/star/beans/LocalOfficeConnection.java
index 067059591a..fd32b240a5 100644
--- a/main/bean/java/officebean/src/main/java/com/sun/star/beans/LocalOfficeConnection.java
+++ b/main/bean/java/officebean/src/main/java/com/sun/star/beans/LocalOfficeConnection.java
@@ -381,7 +381,7 @@ public class LocalOfficeConnection
String pipe = null;
char ch;
int state = 0;
- StringBuffer buffer = new StringBuffer();
+ StringBuilder buffer = new StringBuilder();
for(idx = 0; idx < params.length(); idx += 1) {
ch = params.charAt(idx);
switch (state) {
@@ -529,11 +529,11 @@ public class LocalOfficeConnection
/* replaces each substring aSearch in aString by aReplace.
- StringBuffer.replaceAll() is not available in Java 1.3.x.
+ StringBuilder.replaceAll() is not available in Java 1.3.x.
*/
private static String replaceAll(String aString, String aSearch, String aReplace )
{
- StringBuffer aBuffer = new StringBuffer(aString);
+ StringBuilder aBuffer = new StringBuilder(aString);
int nPos = aString.length();
int nOfs = aSearch.length();
diff --git a/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/LocalOfficeConnection.java b/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/LocalOfficeConnection.java
index 16eba0f28a..213c1f6fce 100644
--- a/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/LocalOfficeConnection.java
+++ b/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/LocalOfficeConnection.java
@@ -539,7 +539,7 @@ public class LocalOfficeConnection
String pipe = null;
char ch;
int state = 0;
- StringBuffer buffer = new StringBuffer();
+ StringBuilder buffer = new StringBuilder();
for(idx = 0; idx < params.length(); idx += 1) {
ch = params.charAt(idx);
switch (state) {
@@ -687,11 +687,11 @@ public class LocalOfficeConnection
/* replaces each substring aSearch in aString by aReplace.
- StringBuffer.replaceAll() is not available in Java 1.3.x.
+ StringBuilder.replaceAll() is not available in Java 1.3.x.
*/
private static String replaceAll(String aString, String aSearch, String aReplace )
{
- StringBuffer aBuffer = new StringBuffer(aString);
+ StringBuilder aBuffer = new StringBuilder(aString);
int nPos = aString.length();
int nOfs = aSearch.length();
diff --git a/main/bean/qa/complex/bean/OOoBeanTest.java b/main/bean/qa/complex/bean/OOoBeanTest.java
index 1f99ba383d..c133aa5a84 100644
--- a/main/bean/qa/complex/bean/OOoBeanTest.java
+++ b/main/bean/qa/complex/bean/OOoBeanTest.java
@@ -403,7 +403,7 @@ public class OOoBeanTest
// #1
Thread.sleep(1000);
- StringBuffer buf = new StringBuffer(1000);
+ StringBuilder buf = new StringBuilder(1000);
for (int i = 0; i < 1; i++)
{
// Thread.sleep(1000);
@@ -471,7 +471,7 @@ public class OOoBeanTest
frame.validate();
// #1
Thread.sleep(1000);
- StringBuffer buf = new StringBuffer(1000);
+ StringBuilder buf = new StringBuilder(1000);
int i = 0;
for (; i < 1; i++)
diff --git a/main/connectivity/qa/connectivity/tools/HsqlDatabase.java b/main/connectivity/qa/connectivity/tools/HsqlDatabase.java
index 7b9b062a78..7d4a6f5977 100644
--- a/main/connectivity/qa/connectivity/tools/HsqlDatabase.java
+++ b/main/connectivity/qa/connectivity/tools/HsqlDatabase.java
@@ -91,7 +91,7 @@ public class HsqlDatabase extends AbstractDatabase
*/
public void dropTable(final String _name, final boolean _ifExists) throws SQLException
{
- final StringBuffer dropStatement = new StringBuffer("DROP TABLE \"");
+ final StringBuilder dropStatement = new StringBuilder("DROP TABLE \"");
dropStatement.append(_name);
if (_ifExists)
{
@@ -113,7 +113,7 @@ public class HsqlDatabase extends AbstractDatabase
*/
public void createTable(final HsqlTableDescriptor _tableDesc) throws SQLException
{
- StringBuffer createStatement = new StringBuffer("CREATE CACHED TABLE \"");
+ StringBuilder createStatement = new StringBuilder("CREATE CACHED TABLE \"");
createStatement.append(_tableDesc.getName());
createStatement.append("\" ( ");
@@ -159,7 +159,7 @@ public class HsqlDatabase extends AbstractDatabase
foreignKeysForTable += "\"" + columns[i].getName() + "\"";
foreignKeys.put(foreignTable, foreignKeysForTable);
- final StringBuffer foreignKeyRefsForTable = new StringBuffer(foreignKeyRefs.containsKey(foreignTable) ? (String) foreignKeyRefs.get(foreignTable) : "");
+ final StringBuilder foreignKeyRefsForTable = new StringBuilder(foreignKeyRefs.containsKey(foreignTable) ? (String) foreignKeyRefs.get(foreignTable) : "");
if (foreignKeyRefsForTable.length() > 0)
{
foreignKeyRefsForTable.append(", ");
diff --git a/main/filter/source/config/tools/split/FCFGSplit.java b/main/filter/source/config/tools/split/FCFGSplit.java
index 24ff179e75..3b926bf156 100644
--- a/main/filter/source/config/tools/split/FCFGSplit.java
+++ b/main/filter/source/config/tools/split/FCFGSplit.java
@@ -447,7 +447,7 @@ public class FCFGSplit
// analyze some time stamps
long t_end = System.currentTimeMillis();
- java.lang.StringBuffer sTimes = new java.lang.StringBuffer(100);
+ java.lang.StringBuilder sTimes = new java.lang.StringBuilder(100);
sTimes.append("Needed times:\n" );
sTimes.append("t [all]\t\t=\t" );
sTimes.append(t_end-t_start );
@@ -527,7 +527,7 @@ public class FCFGSplit
*/
private static void printCopyright()
{
- java.lang.StringBuffer sOut = new java.lang.StringBuffer(256);
+ java.lang.StringBuilder sOut = new java.lang.StringBuilder(256);
sOut.append("FCFGSplit\n");
sOut.append("Copyright: 2000 by Sun Microsystems, Inc.\n");
sOut.append("All Rights Reserved.\n");
@@ -540,7 +540,7 @@ public class FCFGSplit
*/
private static void printHelp()
{
- java.lang.StringBuffer sOut = new java.lang.StringBuffer(1000);
+ java.lang.StringBuilder sOut = new java.lang.StringBuilder(1000);
sOut.append("_______________________________________________________________________________\n\n" );
sOut.append("usage: FCFGSplit "+CMD_CONFIG+"=<file name> "+CMD_DEBUG+"=<level>\n" );
sOut.append("parameters:\n" );
diff --git a/main/filter/source/config/tools/split/Splitter.java b/main/filter/source/config/tools/split/Splitter.java
index 94c94b37ef..09fd9afc54 100644
--- a/main/filter/source/config/tools/split/Splitter.java
+++ b/main/filter/source/config/tools/split/Splitter.java
@@ -211,7 +211,7 @@ public class Splitter
(nContentHandlers != 0)
)
{
- java.lang.StringBuffer sStatistic = new java.lang.StringBuffer(256);
+ java.lang.StringBuilder sStatistic = new java.lang.StringBuilder(256);
sStatistic.append("some cache items seems to be not transformed:\n");
sStatistic.append(nTypes +" unhandled types\n" );
sStatistic.append(nFilters +" unhandled filters\n" );
diff --git a/main/forms/qa/integration/forms/ListBox.java b/main/forms/qa/integration/forms/ListBox.java
index 6c330136d6..e61b015fd4 100644
--- a/main/forms/qa/integration/forms/ListBox.java
+++ b/main/forms/qa/integration/forms/ListBox.java
@@ -105,7 +105,7 @@ public class ListBox extends TestCase
formOperations.execute( FormFeature.MoveToFirst );
for ( int row=0; row<2; ++row )
{
- StringBuffer failedFieldTypes = new StringBuffer();
+ StringBuilder failedFieldTypes = new StringBuilder();
for ( int i=0; i<fieldTypes.length; ++i )
{
final String columnFKName = fieldTypes[i] + "_fk";
@@ -203,7 +203,7 @@ public class ListBox extends TestCase
Vector< String[] > foreignKeyValues = new Vector< String[] >();
- StringBuffer foreignKeyInsertSQL = new StringBuffer();
+ StringBuilder foreignKeyInsertSQL = new StringBuilder();
foreignKeyInsertSQL.append( "INSERT INTO \"" + m_foreignKeyTableName + "\" VALUES (?" );
final String[] displayValues = impl_getDisplayValues();
@@ -222,7 +222,7 @@ public class ListBox extends TestCase
) );
// insert a few rows
- StringBuffer sql = new StringBuffer();
+ StringBuilder sql = new StringBuilder();
sql.append( "INSERT INTO \"" );
sql.append( tableName );
sql.append( "\" VALUES (?, ?)");
diff --git a/main/forms/qa/integration/forms/RadioButtons.java b/main/forms/qa/integration/forms/RadioButtons.java
index c71a42f716..86127cf18f 100644
--- a/main/forms/qa/integration/forms/RadioButtons.java
+++ b/main/forms/qa/integration/forms/RadioButtons.java
@@ -340,7 +340,7 @@ public class RadioButtons
/* ------------------------------------------------------------------ */
private String stateString( short[] states )
{
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
for ( int i=0; i<states.length; ++i )
buf.append( states[i] );
return buf.toString();
diff --git a/main/framework/qa/complex/framework/autosave/Protocol.java b/main/framework/qa/complex/framework/autosave/Protocol.java
index 6f7ffdbbd2..bc17c4420f 100644
--- a/main/framework/qa/complex/framework/autosave/Protocol.java
+++ b/main/framework/qa/complex/framework/autosave/Protocol.java
@@ -214,7 +214,7 @@ public class Protocol extends JComponent
/** format this line as an ascii string for writing log files */
public synchronized String toString()
{
- StringBuffer sLine = new StringBuffer(1000);
+ StringBuilder sLine = new StringBuilder(1000);
// insert line number
// Use right bound notation and format 6 digits!
@@ -302,7 +302,7 @@ public class Protocol extends JComponent
*/
public synchronized String toHTML()
{
- StringBuffer sLine = new StringBuffer(1000);
+ StringBuilder sLine = new StringBuilder(1000);
sLine.append("<tr>");
// insert line number
@@ -455,7 +455,7 @@ public class Protocol extends JComponent
* @param bBold
* enable/disable bold state for the text content.
*/
- private void impl_generateColoredHTMLCell(StringBuffer sCell ,
+ private void impl_generateColoredHTMLCell(StringBuilder sCell ,
String sContent,
String sBGColor,
String sFGColor,
@@ -569,7 +569,7 @@ public class Protocol extends JComponent
*/
public synchronized void log( /*IN*/ com.sun.star.beans.NamedValue[] lProps )
{
- StringBuffer sValues = new StringBuffer(1000);
+ StringBuilder sValues = new StringBuilder(1000);
impl_logPropertyArray(sValues, lProps);
log(TYPE_SCOPE_OPEN | TYPE_INFO, "property array ["+lProps.length+"]:");
@@ -578,7 +578,7 @@ public class Protocol extends JComponent
public synchronized void log( /*IN*/ com.sun.star.beans.PropertyValue[] lProps )
{
- StringBuffer sValues = new StringBuffer(1000);
+ StringBuilder sValues = new StringBuilder(1000);
impl_logPropertyArray(sValues, lProps);
log(TYPE_SCOPE_OPEN | TYPE_INFO, "property array ["+lProps.length+"]:");
@@ -587,7 +587,7 @@ public class Protocol extends JComponent
public synchronized void log( /*IN*/ com.sun.star.beans.NamedValue aProp )
{
- StringBuffer sValue = new StringBuffer(1000);
+ StringBuilder sValue = new StringBuilder(1000);
impl_logProperty(sValue, aProp);
log(TYPE_SCOPE_OPEN | TYPE_INFO, "property:" );
@@ -596,7 +596,7 @@ public class Protocol extends JComponent
public synchronized void log( /*IN*/ com.sun.star.beans.PropertyValue aProp )
{
- StringBuffer sValue = new StringBuffer(1000);
+ StringBuilder sValue = new StringBuilder(1000);
impl_logProperty(sValue, aProp);
log(TYPE_SCOPE_OPEN | TYPE_INFO, "property:" );
@@ -605,7 +605,7 @@ public class Protocol extends JComponent
public synchronized void log( /*IN*/ Object aAny )
{
- StringBuffer sValue = new StringBuffer(1000);
+ StringBuilder sValue = new StringBuilder(1000);
impl_logAny(sValue, aAny);
log(TYPE_SCOPE_OPEN | TYPE_INFO, "any:" );
@@ -706,7 +706,7 @@ public class Protocol extends JComponent
if ((m_nMode & MODE_HTML) != MODE_HTML)
return;
- StringBuffer sLog = new StringBuffer(1000);
+ StringBuilder sLog = new StringBuilder(1000);
sLog.append("<a href=\"");
sLog.append(sTarget );
sLog.append("\">" );
@@ -794,7 +794,7 @@ public class Protocol extends JComponent
* @param lProps
* represent the property(array) to be logged.
*/
- private void impl_logPropertyArray( /*OUT*/ StringBuffer sOut ,
+ private void impl_logPropertyArray( /*OUT*/ StringBuilder sOut ,
/*IN */ com.sun.star.beans.PropertyValue[] lProps )
{
int i = 0;
@@ -804,7 +804,7 @@ public class Protocol extends JComponent
impl_logProperty(sOut, lProps[i]);
}
- private void impl_logPropertyArray( /*OUT*/ StringBuffer sOut ,
+ private void impl_logPropertyArray( /*OUT*/ StringBuilder sOut ,
/*IN */ com.sun.star.beans.NamedValue[] lProps )
{
int i = 0;
@@ -814,14 +814,14 @@ public class Protocol extends JComponent
impl_logProperty(sOut, lProps[i]);
}
- private void impl_logProperty( /*OUT*/ StringBuffer sOut ,
+ private void impl_logProperty( /*OUT*/ StringBuilder sOut ,
/*IN*/ com.sun.star.beans.NamedValue aProp )
{
sOut.append("\""+aProp.Name+"\" = ");
impl_logAny(sOut, aProp.Value);
}
- private void impl_logProperty( /*OUT*/ StringBuffer sOut ,
+ private void impl_logProperty( /*OUT*/ StringBuilder sOut ,
/*IN*/ com.sun.star.beans.PropertyValue aProp )
{
sOut.append("\""+aProp.Name+"\" = ");
@@ -832,7 +832,7 @@ public class Protocol extends JComponent
/**
* it tries to convert the given any into a suitable string notation .-)
*/
- private synchronized void impl_logAny( /*OUT*/ StringBuffer sOut ,
+ private synchronized void impl_logAny( /*OUT*/ StringBuilder sOut ,
/*IN */ Object aAny )
{
try
diff --git a/main/javaunohelper/com/sun/star/lib/uno/helper/UnoUrl.java b/main/javaunohelper/com/sun/star/lib/uno/helper/UnoUrl.java
index 774e8d75c7..a88dae2835 100644
--- a/main/javaunohelper/com/sun/star/lib/uno/helper/UnoUrl.java
+++ b/main/javaunohelper/com/sun/star/lib/uno/helper/UnoUrl.java
@@ -96,7 +96,7 @@ public class UnoUrl {
}
public String getUninterpretedString() {
- StringBuffer buf = new StringBuffer(partTypeName);
+ StringBuilder buf = new StringBuilder(partTypeName);
if (uninterpretedParameterString.length() > 0) {
buf.append(',');
buf.append(uninterpretedParameterString);
diff --git a/main/javaunohelper/test/com/sun/star/lib/uno/helper/WeakBase_Test.java b/main/javaunohelper/test/com/sun/star/lib/uno/helper/WeakBase_Test.java
index 89685a285d..9099412619 100644
--- a/main/javaunohelper/test/com/sun/star/lib/uno/helper/WeakBase_Test.java
+++ b/main/javaunohelper/test/com/sun/star/lib/uno/helper/WeakBase_Test.java
@@ -87,7 +87,7 @@ public class WeakBase_Test
// byte 0 - 3 contain hashcode and the remaining bytes represent the classname
byte [] ar= comp.getImplementationId();
- StringBuffer buff= new StringBuffer();
+ StringBuilder buff= new StringBuilder();
for (int c= 0; c < ar.length - 4; c++){
buff.append((char) ar[4 + c]);
// buff.append(" ");
diff --git a/main/jurt/java/jurt/src/main/java/com/sun/star/lib/uno/environments/remote/ThreadId.java b/main/jurt/java/jurt/src/main/java/com/sun/star/lib/uno/environments/remote/ThreadId.java
index 5e1913b453..ab97d2b670 100644
--- a/main/jurt/java/jurt/src/main/java/com/sun/star/lib/uno/environments/remote/ThreadId.java
+++ b/main/jurt/java/jurt/src/main/java/com/sun/star/lib/uno/environments/remote/ThreadId.java
@@ -66,7 +66,7 @@ public final class ThreadId {
}
public String toString() {
- StringBuffer b = new StringBuffer("[ThreadId:");
+ StringBuilder b = new StringBuilder("[ThreadId:");
for (int i = 0; i < id.length; ++i) {
String n = Integer.toHexString(id[i] & 0xFF);
if (n.length() == 1) {
diff --git a/main/jurt/java/jurt/src/main/java/com/sun/star/lib/util/StringHelper.java b/main/jurt/java/jurt/src/main/java/com/sun/star/lib/util/StringHelper.java
index baaeb03e7f..f4ce94372b 100644
--- a/main/jurt/java/jurt/src/main/java/com/sun/star/lib/util/StringHelper.java
+++ b/main/jurt/java/jurt/src/main/java/com/sun/star/lib/util/StringHelper.java
@@ -30,7 +30,7 @@ public final class StringHelper
private StringHelper() {} // do not instantiate
public static String replace(String str, char from, String to) {
- StringBuffer b = new StringBuffer();
+ StringBuilder b = new StringBuilder();
for (int i = 0;;) {
int j = str.indexOf(from, i);
if (j == -1) {
diff --git a/main/jurt/java/jurt/src/main/java/com/sun/star/lib/util/UrlToFileMapper.java b/main/jurt/java/jurt/src/main/java/com/sun/star/lib/util/UrlToFileMapper.java
index 35b65694de..052846d791 100644
--- a/main/jurt/java/jurt/src/main/java/com/sun/star/lib/util/UrlToFileMapper.java
+++ b/main/jurt/java/jurt/src/main/java/com/sun/star/lib/util/UrlToFileMapper.java
@@ -124,7 +124,7 @@ public final class UrlToFileMapper {
private static String encode(String url) {
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
for (int i = 0; i < url.length(); ++i) {
char c = url.charAt(i);
// The RFC 2732 <uric> characters: !$&'()*+,-./:;=?@[]_~ plus digits
diff --git a/main/l10ntools/java/jpropex/java/JPropEx.java b/main/l10ntools/java/jpropex/java/JPropEx.java
index 0e7beeac72..38b4f291a3 100644
--- a/main/l10ntools/java/jpropex/java/JPropEx.java
+++ b/main/l10ntools/java/jpropex/java/JPropEx.java
@@ -249,7 +249,7 @@ public class JPropEx
// -> <path>/<lang>/<more_path>
if( pathPrefixArg != null && pathPrefixArg.length()>0 && pathPostfixArg != null && pathPostfixArg.length()>0 )
{
- path = new StringBuffer().append( pathPrefixArg ).append( "/" ).append( lcLang ).append( "/" ).append( pathPostfixArg ).append( "/" ).toString();
+ path = new StringBuilder().append( pathPrefixArg ).append( "/" ).append( lcLang ).append( "/" ).append( pathPostfixArg ).append( "/" ).toString();
name += formatFilename( filename , filenameIdx , lang , type );
}
//use of -i <one_filename>
@@ -350,21 +350,21 @@ public class JPropEx
lang += "_" + langpart2.toUpperCase();
else // -> de_DE
lang += "_" + langpart1.toUpperCase();
- return new StringBuffer().append( filename.substring( filenameIdx , filename.lastIndexOf( "_en_US.properties" ) ) )
+ return new StringBuilder().append( filename.substring( filenameIdx , filename.lastIndexOf( "_en_US.properties" ) ) )
.append( "_" ).append( lang.replaceAll("-","_") ).append( ".properties" ).toString();
// -> de
case JAVA_ENUS_TYPE:
lang = langpart1.toLowerCase();
if( langpart2.length() > 0 )
lang += "_" + langpart2.toLowerCase();
- return new StringBuffer().append( filename.substring( filenameIdx , filename.lastIndexOf( "_en_us.properties" ) ) )
+ return new StringBuilder().append( filename.substring( filenameIdx , filename.lastIndexOf( "_en_us.properties" ) ) )
.append( "_" ).append( lang.replaceAll("-","_") ).append( ".properties" ).toString();
// -> de
case JAVA_TYPE:
lang = langpart1.toLowerCase();
if( langpart2.length() > 0 )
lang += "_" + langpart2.toLowerCase();
- return new StringBuffer().append( filename.substring( filenameIdx , filename.lastIndexOf( ".properties" ) ) )
+ return new StringBuilder().append( filename.substring( filenameIdx , filename.lastIndexOf( ".properties" ) ) )
.append( "_" ).append( lang.replaceAll("-","_") ).append( ".properties" ).toString();
default:
System.err.println("ERROR: Something is really broken here, l10ntools/java/jprop/java/JPropEx.java :: formatFilename()");
diff --git a/main/l10ntools/java/jpropex/java/SdfEntity.java b/main/l10ntools/java/jpropex/java/SdfEntity.java
index 8fce80978b..3de13d004b 100644
--- a/main/l10ntools/java/jpropex/java/SdfEntity.java
+++ b/main/l10ntools/java/jpropex/java/SdfEntity.java
@@ -121,12 +121,12 @@ public class SdfEntity implements Cloneable{
return source_file.substring(0 , source_file.lastIndexOf( "\\" )-1 );
}
public String toString(){
- return new StringBuffer( project ).append( "\t" ).append( source_file ).append( "\t" ).append( dummy1 ).append( "\t" ).append( resource_type ).append( "\t" ).append( gid ).append( "\t" )
+ return new StringBuilder( project ).append( "\t" ).append( source_file ).append( "\t" ).append( dummy1 ).append( "\t" ).append( resource_type ).append( "\t" ).append( gid ).append( "\t" )
.append( lid ).append( "\t" ).append( helpid ).append( "\t" ).append( platform ).append( "\t" ).append( dummy2 ).append( "\t" ).append( langid ).append( "\t" )
.append( text ).append( "\t" ).append( helptext ).append( "\t" ).append( quickhelptext ).append( "\t" ).append( title ).append( "\t" ).append( date ).toString();
}
public String getId(){
- return new StringBuffer( project ).append( gid ).append( lid ).append( source_file ).append( resource_type ).append( platform ).append( helpid ).append( langid ).toString();
+ return new StringBuilder( project ).append( gid ).append( lid ).append( source_file ).append( resource_type ).append( platform ).append( helpid ).append( langid ).toString();
}
public String getDummy1() {
diff --git a/main/l10ntools/java/l10nconv/java/com/sun/star/tooling/DirtyTags/DirtyTagWrapper.java b/main/l10ntools/java/l10nconv/java/com/sun/star/tooling/DirtyTags/DirtyTagWrapper.java
index 19898a1f2f..374729dbcd 100644
--- a/main/l10ntools/java/l10nconv/java/com/sun/star/tooling/DirtyTags/DirtyTagWrapper.java
+++ b/main/l10ntools/java/l10nconv/java/com/sun/star/tooling/DirtyTags/DirtyTagWrapper.java
@@ -64,7 +64,7 @@ public class DirtyTagWrapper {
public static String unwrapString(String checkString){
//remove the ept and bpt tags
String[] splitted =checkString.split("(<ept ([^<>])*>)|(</ept>)|(<bpt ([^<>])*>)|(</bpt>)|(<sub([^<>])*>)|(</sub>)|(<ex ([^<>])*/>)");
- StringBuffer workBuffer= new StringBuffer();
+ StringBuilder workBuffer= new StringBuilder();
for(int i=0;i<splitted.length;i++){
workBuffer.append(splitted[i]);
}
@@ -74,7 +74,7 @@ public class DirtyTagWrapper {
//remove the nsub tags
splitted =string.split("(<sub([^<>])*>)|(</sub>)");
- StringBuffer returnBuffer= new StringBuffer();
+ StringBuilder returnBuffer= new StringBuilder();
for(int i=0;i<splitted.length;i++){
returnBuffer.append(splitted[i]);
}
@@ -182,7 +182,7 @@ public class DirtyTagWrapper {
tagString=null;
TagPair start;
- StringBuffer returnBuffer=new StringBuffer();
+ StringBuilder returnBuffer=new StringBuilder();
while(tagList.size()>0){
try{
start=new TagPair(tagList);
diff --git a/main/l10ntools/java/l10nconv/java/com/sun/star/tooling/DirtyTags/TagPair.java b/main/l10ntools/java/l10nconv/java/com/sun/star/tooling/DirtyTags/TagPair.java
index a56411efde..c5003c0ab7 100644
--- a/main/l10ntools/java/l10nconv/java/com/sun/star/tooling/DirtyTags/TagPair.java
+++ b/main/l10ntools/java/l10nconv/java/com/sun/star/tooling/DirtyTags/TagPair.java
@@ -198,7 +198,7 @@ public class TagPair {
}
public String toString(){
- StringBuffer outString= new StringBuffer(this.startTag.toString());
+ StringBuilder outString= new StringBuilder(this.startTag.toString());
TagPair help=new TagPair();
Iterator iter=enclosedTags.iterator();
outString.append(this.startingText);
@@ -216,7 +216,7 @@ public class TagPair {
public String getWrapped() throws IOException{
Iterator iter=enclosedTags.iterator();
- StringBuffer returnBuffer=new StringBuffer();
+ StringBuilder returnBuffer=new StringBuilder();
returnBuffer.append(wrap(this.startTag)+xmlString(this.startingText));
while(iter.hasNext()){
diff --git a/main/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/GSIWriter.java b/main/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/GSIWriter.java
index 7556aab977..a60eab995f 100644
--- a/main/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/GSIWriter.java
+++ b/main/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/GSIWriter.java
@@ -106,7 +106,7 @@ public class GSIWriter extends DataWriter {
*/
public final void writeData() throws java.io.IOException {
- StringBuffer buffer=new StringBuffer("");
+ StringBuilder buffer=new StringBuilder("");
if(this.sourceLanguage==null&&this.targetLanguage==null){
LanguageResolver lang =new LanguageResolver();
try {
@@ -144,14 +144,14 @@ public class GSIWriter extends DataWriter {
/**
* Create a line containing the source string from the data
* @param resType
- * @return The StringBuffer containing the line
+ * @return The StringBuilder containing the line
*/
- private StringBuffer getSourceLine(String resType){
- StringBuffer buffer =new StringBuffer(200);
+ private StringBuilder getSourceLine(String resType){
+ StringBuilder buffer =new StringBuilder(200);
String resString = "Source"+resType;
String help;
- if(EMPTY.equals((String)outData.get(resString))||" ".equals(outData.get(resString))) return new StringBuffer(EMPTY);
+ if(EMPTY.equals((String)outData.get(resString))||" ".equals(outData.get(resString))) return new StringBuilder(EMPTY);
else {
// put them together for output
buffer.append(this.blockNr);
@@ -179,13 +179,13 @@ public class GSIWriter extends DataWriter {
/**
* Create a line containing the target string from the data
* @param resType
- * @return The StringBuffer containing the line
+ * @return The StringBuilder containing the line
*/
- private StringBuffer getTargetLine(String resType){
- StringBuffer buffer =new StringBuffer(200);
+ private StringBuilder getTargetLine(String resType){
+ StringBuilder buffer =new StringBuilder(200);
String resString = "Target"+resType;
- if(EMPTY.equals((String)outData.get(resString))||" ".equals(outData.get(resString))) return new StringBuffer(EMPTY);
+ if(EMPTY.equals((String)outData.get(resString))||" ".equals(outData.get(resString))) return new StringBuilder(EMPTY);
else {
// put them together for output
buffer.append(this.blockNr);
diff --git a/main/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/SDFReader.java b/main/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/SDFReader.java
index 07ac35aa02..f923d47e33 100644
--- a/main/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/SDFReader.java
+++ b/main/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/SDFReader.java
@@ -593,7 +593,7 @@ public class SDFReader extends DataReader {
* @return the blockId as String
*/
private String getSDFBlockId(String[] splitLine) {
- StringBuffer BlockId = new StringBuffer("");
+ StringBuilder BlockId = new StringBuilder("");
for (int i = 0; i < 8; i++) {
BlockId.append(splitLine[i]);
}
diff --git a/main/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/SDFWriter.java b/main/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/SDFWriter.java
index 6a270352f7..4a93ca683b 100644
--- a/main/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/SDFWriter.java
+++ b/main/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/SDFWriter.java
@@ -99,7 +99,7 @@ public class SDFWriter extends DataWriter {
*/
public final void writeData() throws java.io.IOException {
- StringBuffer buffer=new StringBuffer("");
+ StringBuilder buffer=new StringBuilder("");
// get the values of the found fields
//create the two sdf lines
diff --git a/main/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/XLIFFWriter.java b/main/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/XLIFFWriter.java
index 548d42c34c..e8c2d15e79 100644
--- a/main/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/XLIFFWriter.java
+++ b/main/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/XLIFFWriter.java
@@ -211,9 +211,9 @@ public class XLIFFWriter extends DataWriter {
*/
private void writeTransUnit() throws IOException, DirtyTagWrapper.TagWrapperException {
try{
- StringBuffer writeBuffer = new StringBuffer(1000);
+ StringBuilder writeBuffer = new StringBuilder(1000);
- StringBuffer allLinesEnd = new StringBuffer(200);
+ StringBuilder allLinesEnd = new StringBuilder(200);
String sRessource = "";
int parts = 0;
if (data == null) {
diff --git a/main/l10ntools/source/filter/merge/FCFGMerge.java b/main/l10ntools/source/filter/merge/FCFGMerge.java
index 9804181bb1..34006015be 100644
--- a/main/l10ntools/source/filter/merge/FCFGMerge.java
+++ b/main/l10ntools/source/filter/merge/FCFGMerge.java
@@ -96,7 +96,7 @@ public class FCFGMerge
*/
private static void printCopyright()
{
- java.lang.StringBuffer sOut = new java.lang.StringBuffer(256);
+ java.lang.StringBuilder sOut = new java.lang.StringBuilder(256);
sOut.append("FCFGMerge\n");
sOut.append("Copyright: 2003 by Sun Microsystems, Inc.\n");
sOut.append("All Rights Reserved.\n");
@@ -109,7 +109,7 @@ public class FCFGMerge
*/
private static void printHelp()
{
- java.lang.StringBuffer sOut = new java.lang.StringBuffer(256);
+ java.lang.StringBuilder sOut = new java.lang.StringBuilder(256);
sOut.append("____________________________________________________________\n");
sOut.append("usage: FCFGMerge cfg=<file name>\n" );
sOut.append("parameters:\n" );
diff --git a/main/l10ntools/source/filter/merge/Merger.java b/main/l10ntools/source/filter/merge/Merger.java
index 0cb908d1f5..e2d1e0bec1 100644
--- a/main/l10ntools/source/filter/merge/Merger.java
+++ b/main/l10ntools/source/filter/merge/Merger.java
@@ -185,7 +185,7 @@ public class Merger
public synchronized void merge()
throws java.lang.Exception
{
- java.lang.StringBuffer sBuffer = new java.lang.StringBuffer(1000000);
+ java.lang.StringBuilder sBuffer = new java.lang.StringBuilder(1000000);
java.lang.String sPackage = m_aCfg.getString(PROP_PKG);
m_aLog.setGlobalInfo("create package \""+sPackage+"\" ...");
@@ -288,7 +288,7 @@ public class Merger
java.lang.String sSetName ,
java.util.Vector lFragments ,
int nPrettyTabs,
- java.lang.StringBuffer sBuffer )
+ java.lang.StringBuilder sBuffer )
throws java.lang.Exception
{
if (lFragments.size()<1)
diff --git a/main/l10ntools/source/filter/utils/AnalyzeStartupLog.java b/main/l10ntools/source/filter/utils/AnalyzeStartupLog.java
index b5be32c427..001a8947dd 100644
--- a/main/l10ntools/source/filter/utils/AnalyzeStartupLog.java
+++ b/main/l10ntools/source/filter/utils/AnalyzeStartupLog.java
@@ -80,7 +80,7 @@ public class AnalyzeStartupLog
}
// analyze it
- java.lang.StringBuffer sOut = new java.lang.StringBuffer(1000);
+ java.lang.StringBuilder sOut = new java.lang.StringBuilder(1000);
sOut.append("log;t_cfg_start;t_cfg_end;t_fwk_start;t_fwk_end;t_sfx_start;t_sfx_end;t_types_start;t_types_end;t_filters_start;t_filters_end;");
sOut.append("t_filters_swriter_start;t_filters_swriter_end;t_filters_sweb_start;t_filters_sweb_end;t_filters_sglobal_start;t_filters_sglobal_end;t_filters_scalc_start;t_filters_scalc_end;t_filters_sdraw_start;t_filters_sdraw_end;t_filters_simpress_start;t_filters_simpress_end;t_filters_schart_start;t_filters_schart_end;t_filters_smath_start;t_filters_smath_end;");
sOut.append("t_others_start;t_others_end;d_cfg;d_fwk;d_sfx;d_types;d_filters;d_others;d_complete\n");
diff --git a/main/l10ntools/source/filter/utils/Cache.java b/main/l10ntools/source/filter/utils/Cache.java
index 22f6720ea1..a30434c144 100644
--- a/main/l10ntools/source/filter/utils/Cache.java
+++ b/main/l10ntools/source/filter/utils/Cache.java
@@ -315,7 +315,7 @@ public class Cache
*/
public synchronized java.lang.String getStatistics()
{
- java.lang.StringBuffer sBuffer = new java.lang.StringBuffer(256);
+ java.lang.StringBuilder sBuffer = new java.lang.StringBuilder(256);
sBuffer.append("types = "+m_lTypes.size() +"\n");
sBuffer.append("filters = "+m_lFilters.size() +"\n");
@@ -505,7 +505,7 @@ public class Cache
if (nFormat != FORMAT_6Y)
throw new java.lang.Exception("HTML views are supported for the new 6.y format only yet.");
- java.lang.StringBuffer sRelationView = new java.lang.StringBuffer(1000);
+ java.lang.StringBuilder sRelationView = new java.lang.StringBuilder(1000);
sRelationView.append("<html><header><title>Relation View</title></header><body>");
sRelationView.append("<table border=1>");
sRelationView.append("<tr><td><b>type</b></td><td><b>detect service</b></td><td><b>preferred filter</b></td><td><b>frame loader</b></td><td><b>content handler</b></td></tr>");
@@ -566,7 +566,7 @@ public class Cache
lFilters2TypeRegistration.put(sType, lFilters);
}
- java.lang.StringBuffer sType2FiltersView = new java.lang.StringBuffer(1000);
+ java.lang.StringBuilder sType2FiltersView = new java.lang.StringBuilder(1000);
sType2FiltersView.append("<html><header><title>Type2Filters View</title></header><body>");
sType2FiltersView.append("<table border=1>");
sType2FiltersView.append("<tr><td><b>type</b></td><td><b>filters</b></td></tr>");
@@ -613,7 +613,7 @@ public class Cache
java.lang.String sEncoding)
throws java.lang.Exception
{
- java.lang.StringBuffer sXML = new java.lang.StringBuffer(500000);
+ java.lang.StringBuilder sXML = new java.lang.StringBuilder(500000);
for (int i=0; i<5; ++i)
{
@@ -723,7 +723,7 @@ public class Cache
// They are not supported for 6.0 types.
// pack all other properties to one "Data" string value
- java.lang.StringBuffer sData = new java.lang.StringBuffer(256);
+ java.lang.StringBuilder sData = new java.lang.StringBuilder(256);
sData.append(aMap.get(PROPNAME_PREFERRED));
sData.append(",");
@@ -820,7 +820,7 @@ public class Cache
aResultMap.put(PROPNAME_UINAME, aMap.get(PROPNAME_UINAME));
// but pack all other properties
- java.lang.StringBuffer sData = new java.lang.StringBuffer(256);
+ java.lang.StringBuilder sData = new java.lang.StringBuilder(256);
sData.append(aMap.get(PROPNAME_ORDER));
sData.append(",");
@@ -1585,7 +1585,7 @@ public class Cache
lNames.add(sItemName);
else
{
- java.lang.StringBuffer sBuffer = new java.lang.StringBuffer(1000);
+ java.lang.StringBuilder sBuffer = new java.lang.StringBuilder(1000);
sBuffer.append("entry ["+eItemType+"] \""+sItemName+"\" does not match.\n");
sBuffer.append("\torg items = {"+rItemProps+"}\n");
sBuffer.append("\treq items = {"+aPropSet+"}\n");
@@ -1730,7 +1730,7 @@ public class Cache
break;
}
- java.lang.StringBuffer sXML = new java.lang.StringBuffer(1000);
+ java.lang.StringBuilder sXML = new java.lang.StringBuilder(1000);
int nPrettyTabs = 1;
for (int t=0; t<nPrettyTabs; ++t)
sXML.append("\t");
@@ -2199,7 +2199,7 @@ public class Cache
// two preferred filters for the same type! => error
if (preferred1 && preferred2)
{
- java.lang.StringBuffer sMsg = new java.lang.StringBuffer(256);
+ java.lang.StringBuilder sMsg = new java.lang.StringBuilder(256);
sMsg.append("More the one preferred filter detected for the same type.\n");
sMsg.append("\ttype = \""+sTypeReg+"\"\n");
sMsg.append("\tfilter[1] = \""+sAlreadyRegisteredFilter+"\"\n");
@@ -2309,7 +2309,7 @@ public class Cache
java.lang.Object aAlreadyRegisteredDetector = aType.get(PROPNAME_DETECTSERVICE);
if (aAlreadyRegisteredDetector != null && ((java.lang.String)aAlreadyRegisteredDetector).length() > 0)
{
- java.lang.StringBuffer sMsg = new java.lang.StringBuffer(256);
+ java.lang.StringBuilder sMsg = new java.lang.StringBuilder(256);
sMsg.append("type \""+sTypeReg+"\" has ambiguous registrations of a detect service\n");
sMsg.append("\tdetect service[1] = \""+(java.lang.String)aAlreadyRegisteredDetector+"\"\n");
sMsg.append("\tdetect service[2] = \""+sDetector+"\"\n");
@@ -2341,7 +2341,7 @@ public class Cache
java.lang.String sAlreadyRegisteredLoader = (java.lang.String)aType.get(PROPNAME_FRAMELOADER);
if (sAlreadyRegisteredLoader != null && sAlreadyRegisteredLoader.length() > 0)
{
- java.lang.StringBuffer sMsg = new java.lang.StringBuffer(256);
+ java.lang.StringBuilder sMsg = new java.lang.StringBuilder(256);
sMsg.append("type \""+sTypeReg+"\" has ambiguous registrations of a frame loader\n");
sMsg.append("\tframe loader[1] = \""+sAlreadyRegisteredLoader+"\"\n");
sMsg.append("\tframe loader[2] = \""+sLoader+"\"\n");
@@ -2371,7 +2371,7 @@ public class Cache
java.lang.String sAlreadyRegisteredHandler = (java.lang.String)aType.get(PROPNAME_CONTENTHANDLER);
if (sAlreadyRegisteredHandler != null && sAlreadyRegisteredHandler.length() > 0)
{
- java.lang.StringBuffer sMsg = new java.lang.StringBuffer(256);
+ java.lang.StringBuilder sMsg = new java.lang.StringBuilder(256);
sMsg.append("type \""+sTypeReg+"\" has ambiguous registrations of a content handler\n");
sMsg.append("\tcontent handler[1] = \""+sAlreadyRegisteredHandler+"\"\n");
sMsg.append("\tcontent handler[2] = \""+sHandler+"\"\n");
diff --git a/main/l10ntools/source/filter/utils/FileHelper.java b/main/l10ntools/source/filter/utils/FileHelper.java
index bfabf69b41..e160ac169d 100644
--- a/main/l10ntools/source/filter/utils/FileHelper.java
+++ b/main/l10ntools/source/filter/utils/FileHelper.java
@@ -80,7 +80,7 @@ public class FileHelper
(sFileURL.startsWith("file://") == false)
)
{
- java.lang.StringBuffer sWorkBuffer = new java.lang.StringBuffer(sFileURL);
+ java.lang.StringBuilder sWorkBuffer = new java.lang.StringBuilder(sFileURL);
sWorkBuffer.insert(6,"//");
sFileURL = sWorkBuffer.toString();
}
@@ -259,7 +259,7 @@ public class FileHelper
int nLength = sName.length();
char[] lBuffer = sName.toCharArray();
- java.lang.StringBuffer sNewName = new java.lang.StringBuffer(nLength);
+ java.lang.StringBuilder sNewName = new java.lang.StringBuilder(nLength);
for (i=0; i<nLength; ++i)
{
char c = lBuffer[i];
@@ -391,7 +391,7 @@ public class FileHelper
*/
public static void readEncodedBufferFromFile(java.io.File aFile ,
java.lang.String sEncoding,
- java.lang.StringBuffer sBuffer )
+ java.lang.StringBuilder sBuffer )
throws java.io.IOException
{
if (sEncoding.equals("UTF-8Special"))
@@ -412,7 +412,7 @@ public class FileHelper
}
//___________________________________________
- private static void logEncodingData(java.lang.StringBuffer sLog ,
+ private static void logEncodingData(java.lang.StringBuilder sLog ,
int nUTF8 ,
int nByteOrg1 ,
int nByteOrg2 ,
@@ -464,7 +464,7 @@ public class FileHelper
//___________________________________________
public static void readAndCheckUTF8File(java.io.File aFile ,
- java.lang.StringBuffer sBuffer)
+ java.lang.StringBuilder sBuffer)
throws java.io.IOException
{
java.io.FileInputStream aByteStream = new java.io.FileInputStream(aFile.getAbsolutePath());
@@ -481,7 +481,7 @@ public class FileHelper
char nUTF8 = 0;
int i = 0;
int nEncodingType = 0;
- java.lang.StringBuffer sLog = new java.lang.StringBuffer();
+ java.lang.StringBuilder sLog = new java.lang.StringBuilder();
try
{
@@ -741,7 +741,7 @@ public class FileHelper
public static void writeEncodedBufferToFile(java.io.File aFile ,
java.lang.String sEncoding,
boolean bAppend ,
- java.lang.StringBuffer sBuffer )
+ java.lang.StringBuilder sBuffer )
throws java.io.IOException
{
java.io.FileOutputStream aByteStream = new java.io.FileOutputStream(aFile.getAbsolutePath(), bAppend);
diff --git a/main/l10ntools/source/filter/utils/XMLHelper.java b/main/l10ntools/source/filter/utils/XMLHelper.java
index 76304d5dab..615def6982 100644
--- a/main/l10ntools/source/filter/utils/XMLHelper.java
+++ b/main/l10ntools/source/filter/utils/XMLHelper.java
@@ -297,7 +297,7 @@ public class XMLHelper
int nPrettyTabs)
throws java.lang.Exception
{
- java.lang.StringBuffer sXML = new java.lang.StringBuffer(256);
+ java.lang.StringBuilder sXML = new java.lang.StringBuilder(256);
java.util.Iterator it1 = aPropSet.keySet().iterator();
while(it1.hasNext())
@@ -336,7 +336,7 @@ public class XMLHelper
}
// unknown type!
- java.lang.StringBuffer sMsg = new java.lang.StringBuffer(256);
+ java.lang.StringBuilder sMsg = new java.lang.StringBuilder(256);
sMsg.append("unsupported object type detected.");
sMsg.append("\ttype ? : \""+sProp+"\" = "+aVal);
sMsg.append("\tprop set: \""+aPropSet );
@@ -348,8 +348,8 @@ public class XMLHelper
public static java.lang.String encodeHTMLSigns(java.lang.String sValue)
{
- java.lang.StringBuffer sSource = new java.lang.StringBuffer(sValue);
- java.lang.StringBuffer sDestination = new java.lang.StringBuffer(1000 );
+ java.lang.StringBuilder sSource = new java.lang.StringBuilder(sValue);
+ java.lang.StringBuilder sDestination = new java.lang.StringBuilder(1000 );
for (int i=0; i<sSource.length(); ++i)
{
@@ -393,7 +393,7 @@ public class XMLHelper
int nPrettyTabs)
throws java.lang.Exception
{
- java.lang.StringBuffer sXML = new java.lang.StringBuffer(256);
+ java.lang.StringBuilder sXML = new java.lang.StringBuilder(256);
for (int t=0; t<nPrettyTabs; ++t)
sXML.append("\t");
@@ -461,7 +461,7 @@ public class XMLHelper
int nPrettyTabs)
throws java.lang.Exception
{
- java.lang.StringBuffer sXML = new java.lang.StringBuffer(256);
+ java.lang.StringBuilder sXML = new java.lang.StringBuilder(256);
for (int t=0; t<nPrettyTabs; ++t)
sXML.append("\t");
@@ -485,7 +485,7 @@ public class XMLHelper
// at the end of the following loop ...
int d = 0;
- java.lang.StringBuffer sValBuff = new java.lang.StringBuffer(256);
+ java.lang.StringBuilder sValBuff = new java.lang.StringBuilder(256);
for (int i=0; i<c; ++i)
{
// get the next list item
@@ -566,7 +566,7 @@ public class XMLHelper
int nPrettyTabs)
throws java.lang.Exception
{
- java.lang.StringBuffer sXML = new java.lang.StringBuffer(256);
+ java.lang.StringBuilder sXML = new java.lang.StringBuilder(256);
int c = aValue.size();
if (c < 1)
@@ -776,7 +776,7 @@ public class XMLHelper
java.lang.String sPackage ,
boolean bLanguagePack)
{
- java.lang.StringBuffer sHeader = new java.lang.StringBuffer(256);
+ java.lang.StringBuilder sHeader = new java.lang.StringBuilder(256);
if (bLanguagePack)
{
diff --git a/main/odk/examples/DevelopersGuide/Charts/ChartInCalc.java b/main/odk/examples/DevelopersGuide/Charts/ChartInCalc.java
index 169b7fa8b8..27c581e71a 100644
--- a/main/odk/examples/DevelopersGuide/Charts/ChartInCalc.java
+++ b/main/odk/examples/DevelopersGuide/Charts/ChartInCalc.java
@@ -196,13 +196,13 @@ public class ChartInCalc
0x0000ff - 0x40 * i ));
if( 1 == i )
{
- StringBuffer sUrl = new StringBuffer("file:///");
+ StringBuilder sUrl = new StringBuilder("file:///");
try {
/* for use without net it's easier to load a local graphic */
java.io.File sourceFile = new java.io.File("bullet.gif");
sUrl.append(sourceFile.getCanonicalPath().replace('\\', '/'));
} catch (java.io.IOException e) {
- sUrl = new StringBuffer("http://graphics.openoffice.org/chart/bullet1.gif");
+ sUrl = new StringBuilder("http://graphics.openoffice.org/chart/bullet1.gif");
}
// set a bitmap via URL as symbol for the first series
diff --git a/main/odk/examples/DevelopersGuide/Components/Addons/JobsAddon/AsyncJob.java b/main/odk/examples/DevelopersGuide/Components/Addons/JobsAddon/AsyncJob.java
index be04745052..18b1120d7e 100644
--- a/main/odk/examples/DevelopersGuide/Components/Addons/JobsAddon/AsyncJob.java
+++ b/main/odk/examples/DevelopersGuide/Components/Addons/JobsAddon/AsyncJob.java
@@ -341,7 +341,7 @@ public class AsyncJob extends WeakBase implements XServiceInfo, XAsyncJob
com.sun.star.beans.NamedValue[] lEnvironment ,
com.sun.star.beans.NamedValue[] lDynamicData )
{
- java.lang.StringBuffer sOut = new java.lang.StringBuffer(1024);
+ java.lang.StringBuilder sOut = new java.lang.StringBuilder(1024);
sOut.append("list \"Config\": ");
if (lGenericConfig==null)
diff --git a/main/odk/examples/DevelopersGuide/Config/ConfigExamples.java b/main/odk/examples/DevelopersGuide/Config/ConfigExamples.java
index 82e6ef6f42..d26efd8b86 100644
--- a/main/odk/examples/DevelopersGuide/Config/ConfigExamples.java
+++ b/main/odk/examples/DevelopersGuide/Config/ConfigExamples.java
@@ -360,7 +360,7 @@ public class ConfigExamples
public int subdivision_y;
public String toString() {
- StringBuffer aBuffer = new StringBuffer();
+ StringBuilder aBuffer = new StringBuilder();
aBuffer.append("[ Grid is "); aBuffer.append(visible ? "VISIBLE" : "HIDDEN");
aBuffer.append("; resolution = (" + resolution_x + "," + resolution_y + ")");
aBuffer.append("; subdivision = (" + subdivision_x + "," + subdivision_y + ")");
diff --git a/main/odk/examples/DevelopersGuide/Drawing/DrawViewDemo.java b/main/odk/examples/DevelopersGuide/Drawing/DrawViewDemo.java
index 728b222361..d75348c9ac 100644
--- a/main/odk/examples/DevelopersGuide/Drawing/DrawViewDemo.java
+++ b/main/odk/examples/DevelopersGuide/Drawing/DrawViewDemo.java
@@ -72,7 +72,7 @@ public class DrawViewDemo
pPropValues[ 0 ].Value = new Boolean( true );
java.io.File sourceFile = new java.io.File(args[0]);
- StringBuffer sUrl = new StringBuffer("file:///");
+ StringBuilder sUrl = new StringBuilder("file:///");
sUrl.append(sourceFile.getCanonicalPath().replace('\\', '/'));
xComponent = Helper.createDocument( xOfficeContext,
diff --git a/main/odk/examples/DevelopersGuide/Drawing/GraphicExportDemo.java b/main/odk/examples/DevelopersGuide/Drawing/GraphicExportDemo.java
index 72b3087e8b..db3b044f5e 100644
--- a/main/odk/examples/DevelopersGuide/Drawing/GraphicExportDemo.java
+++ b/main/odk/examples/DevelopersGuide/Drawing/GraphicExportDemo.java
@@ -65,7 +65,7 @@ public class GraphicExportDemo
pPropValues[ 0 ].Value = new Boolean( true );
java.io.File sourceFile = new java.io.File(args[0]);
- StringBuffer sUrl = new StringBuffer("file:///");
+ StringBuilder sUrl = new StringBuilder("file:///");
sUrl.append(sourceFile.getCanonicalPath().replace('\\', '/'));
xComponent = Helper.createDocument( xOfficeContext,
diff --git a/main/odk/examples/DevelopersGuide/Forms/URLHelper.java b/main/odk/examples/DevelopersGuide/Forms/URLHelper.java
index a391f949e1..86af071f31 100644
--- a/main/odk/examples/DevelopersGuide/Forms/URLHelper.java
+++ b/main/odk/examples/DevelopersGuide/Forms/URLHelper.java
@@ -58,7 +58,7 @@ public class URLHelper
(sFileURL.startsWith("file://") == false)
)
{
- StringBuffer sWorkBuffer = new StringBuffer(sFileURL);
+ StringBuilder sWorkBuffer = new StringBuilder(sFileURL);
sWorkBuffer.insert(6,"//");
sFileURL = sWorkBuffer.toString();
}
diff --git a/main/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java b/main/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java
index 4a80618c97..5eac6acfe1 100644
--- a/main/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java
+++ b/main/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java
@@ -1029,7 +1029,7 @@ public class FunctionHelper
( sFileURL.startsWith("file://")==false )
)
{
- StringBuffer sWorkBuffer = new StringBuffer(sFileURL);
+ StringBuilder sWorkBuffer = new StringBuilder(sFileURL);
sWorkBuffer.insert(6,"//");
sFileURL = sWorkBuffer.toString();
}
diff --git a/main/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/AsciiReplaceFilter.java b/main/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/AsciiReplaceFilter.java
index 4dc37c5fdb..389371be6e 100644
--- a/main/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/AsciiReplaceFilter.java
+++ b/main/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/AsciiReplaceFilter.java
@@ -424,7 +424,7 @@ public class AsciiReplaceFilter
try
{
- StringBuffer sBuffer = new StringBuffer(100000);
+ StringBuilder sBuffer = new StringBuilder(100000);
byte[][] lData = new byte[1][];
int nRead = aOptions.m_xInput.readBytes( lData, 4096 );
@@ -556,7 +556,7 @@ public class AsciiReplaceFilter
try
{
- StringBuffer sBuffer = new StringBuffer(xText.getString());
+ StringBuilder sBuffer = new StringBuilder(xText.getString());
String sText = implts_replace(sBuffer,aOptions);
measure("get text from model");
@@ -595,11 +595,11 @@ public class AsciiReplaceFilter
}
/**
- * helper function to convert the used StringBuffer into a String value.
+ * helper function to convert the used StringBuilder into a String value.
* And we use this chance to have a look on optional filter options
* which can invite replacing of strings.
*/
- private String implts_replace( StringBuffer rBuffer, FilterOptions aOptions )
+ private String implts_replace( StringBuilder rBuffer, FilterOptions aOptions )
{
// replace complete strings first
// Because it's easier on a buffer than on a string
diff --git a/main/odk/examples/DevelopersGuide/Text/TextDocuments.java b/main/odk/examples/DevelopersGuide/Text/TextDocuments.java
index 2bbae13d4c..7c3732ca16 100644
--- a/main/odk/examples/DevelopersGuide/Text/TextDocuments.java
+++ b/main/odk/examples/DevelopersGuide/Text/TextDocuments.java
@@ -193,7 +193,7 @@ public class TextDocuments {
// load template with User fields and bookmark
java.io.File sourceFile = new java.io.File("TextTemplateWithUserFields.odt");
- StringBuffer sTemplateFileUrl = new StringBuffer("file:///");
+ StringBuilder sTemplateFileUrl = new StringBuilder("file:///");
sTemplateFileUrl.append(sourceFile.getCanonicalPath().replace('\\', '/'));
XComponent xTemplateComponent =
@@ -405,7 +405,7 @@ public class TextDocuments {
PropertyValue[] loadProps = new PropertyValue[0];
java.io.File sourceFile = new java.io.File("PrintDemo.odt");
- StringBuffer sLoadFileUrl = new StringBuffer("file:///");
+ StringBuilder sLoadFileUrl = new StringBuilder("file:///");
sLoadFileUrl.append(sourceFile.getCanonicalPath().replace('\\', '/'));
XComponent xDoc = xComponentLoader.loadComponentFromURL(
@@ -413,7 +413,7 @@ public class TextDocuments {
if ( xDoc != null ) {
sourceFile = new java.io.File(sOutputDir);
- StringBuffer sStoreFileUrl = new StringBuffer();
+ StringBuilder sStoreFileUrl = new StringBuilder();
sStoreFileUrl.append(sourceFile.toURL().toString());
sStoreFileUrl.append("somepopularfileformat.doc");
diff --git a/main/odk/examples/DevelopersGuide/UCB/Helper.java b/main/odk/examples/DevelopersGuide/UCB/Helper.java
index 4c27ba39ee..b0c8c1f631 100644
--- a/main/odk/examples/DevelopersGuide/UCB/Helper.java
+++ b/main/odk/examples/DevelopersGuide/UCB/Helper.java
@@ -170,7 +170,7 @@ public class Helper {
File file = new File( systemPath );
String url = file.toURL().toString();
if ( url.charAt( 6 ) != '/' ) { // file:/xxx vs. file:///xxxx
- StringBuffer buf1 = new StringBuffer( "file:///" );
+ StringBuilder buf1 = new StringBuilder( "file:///" );
buf1.append( url.substring( 6 ) );
url = buf1.toString();
}
@@ -187,7 +187,7 @@ public class Helper {
{
// get url of current dir.
String url = getAbsoluteFileURLFromSystemPath( "" );
- StringBuffer buf = new StringBuffer( url );
+ StringBuilder buf = new StringBuilder( url );
if ( !url.endsWith( File.separator ) )
buf.append( File.separator );
buf.append( relativeURL );
@@ -198,7 +198,7 @@ public class Helper {
{
try
{
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
if ( workDir != null && workDir.length() > 0 ) {
buf.append( workDir );
buf.append( File.separator );
@@ -208,7 +208,7 @@ public class Helper {
File file = new File( buf.toString() );
String url = file.toURL().toString();
if ( url.charAt( 6 ) != '/' ) { // file:/xxx vs. file:///xxxx
- StringBuffer buf1 = new StringBuffer( "file:///" );
+ StringBuilder buf1 = new StringBuilder( "file:///" );
buf1.append( url.substring( 6 ) );
url = buf1.toString();
}
diff --git a/main/odk/examples/java/DocumentHandling/DocumentLoader.java b/main/odk/examples/java/DocumentHandling/DocumentLoader.java
index 91340f841c..bc58b19e32 100644
--- a/main/odk/examples/java/DocumentHandling/DocumentLoader.java
+++ b/main/odk/examples/java/DocumentHandling/DocumentLoader.java
@@ -59,7 +59,7 @@ public class DocumentLoader {
String sUrl = args[0];
if ( sUrl.indexOf("private:") != 0) {
java.io.File sourceFile = new java.io.File(args[0]);
- StringBuffer sbTmp = new StringBuffer("file:///");
+ StringBuilder sbTmp = new StringBuilder("file:///");
sbTmp.append(sourceFile.getCanonicalPath().replace('\\', '/'));
sUrl = sbTmp.toString();
}
diff --git a/main/odk/examples/java/DocumentHandling/DocumentPrinter.java b/main/odk/examples/java/DocumentHandling/DocumentPrinter.java
index 4562209be0..420c4d16cf 100644
--- a/main/odk/examples/java/DocumentHandling/DocumentPrinter.java
+++ b/main/odk/examples/java/DocumentHandling/DocumentPrinter.java
@@ -55,7 +55,7 @@ public class DocumentPrinter {
com.sun.star.frame.XComponentLoader.class, oDesktop);
java.io.File sourceFile = new java.io.File(args[1]);
- StringBuffer sUrl = new StringBuffer("file:///");
+ StringBuilder sUrl = new StringBuilder("file:///");
sUrl.append(sourceFile.getCanonicalPath().replace('\\', '/'));
// Load a Writer document, which will be automatically displayed
diff --git a/main/odk/examples/java/DocumentHandling/DocumentSaver.java b/main/odk/examples/java/DocumentHandling/DocumentSaver.java
index 859761dad0..8d39d2c0f1 100644
--- a/main/odk/examples/java/DocumentHandling/DocumentSaver.java
+++ b/main/odk/examples/java/DocumentHandling/DocumentSaver.java
@@ -65,11 +65,11 @@ public class DocumentSaver {
com.sun.star.frame.XComponentLoader.class, oDesktop);
java.io.File sourceFile = new java.io.File(args[0]);
- StringBuffer sLoadUrl = new StringBuffer("file:///");
+ StringBuilder sLoadUrl = new StringBuilder("file:///");
sLoadUrl.append(sourceFile.getCanonicalPath().replace('\\', '/'));
sourceFile = new java.io.File(args[1]);
- StringBuffer sSaveUrl = new StringBuffer("file:///");
+ StringBuilder sSaveUrl = new StringBuilder("file:///");
sSaveUrl.append(sourceFile.getCanonicalPath().replace('\\', '/'));
com.sun.star.beans.PropertyValue[] propertyValue =
diff --git a/main/odk/examples/java/Text/GraphicsInserter.java b/main/odk/examples/java/Text/GraphicsInserter.java
index 8ae22e93bc..0986711e0b 100644
--- a/main/odk/examples/java/Text/GraphicsInserter.java
+++ b/main/odk/examples/java/Text/GraphicsInserter.java
@@ -127,7 +127,7 @@ public class GraphicsInserter {
try {
// Creating a string for the graphic url
java.io.File sourceFile = new java.io.File(args[0]);
- StringBuffer sUrl = new StringBuffer("file:///");
+ StringBuilder sUrl = new StringBuilder("file:///");
sUrl.append(sourceFile.getCanonicalPath().replace('\\', '/'));
System.out.println( "insert graphic \"" + sUrl + "\"");
diff --git a/main/odk/source/com/sun/star/lib/loader/InstallationFinder.java b/main/odk/source/com/sun/star/lib/loader/InstallationFinder.java
index 6d7cb5158f..e41fc88ff2 100644
--- a/main/odk/source/com/sun/star/lib/loader/InstallationFinder.java
+++ b/main/odk/source/com/sun/star/lib/loader/InstallationFinder.java
@@ -475,7 +475,7 @@ final class InstallationFinder {
{
return null;
}
- StringBuffer buf = new StringBuffer(prefix);
+ StringBuilder buf = new StringBuilder(prefix);
int n = oooUrl.indexOf('/', prefix.length());
if (n < 0) {
n = oooUrl.length();
diff --git a/main/ooxml/source/framework/OOXMLViewer/src/org/apache/openoffice/ooxml/viewer/StreamView.java b/main/ooxml/source/framework/OOXMLViewer/src/org/apache/openoffice/ooxml/viewer/StreamView.java
index 61d497d02a..665b4013b1 100644
--- a/main/ooxml/source/framework/OOXMLViewer/src/org/apache/openoffice/ooxml/viewer/StreamView.java
+++ b/main/ooxml/source/framework/OOXMLViewer/src/org/apache/openoffice/ooxml/viewer/StreamView.java
@@ -187,7 +187,7 @@ public class StreamView
private String GetPackagePathForTreePath (final TreePath aPath)
{
- final StringBuffer sPath = new StringBuffer("");
+ final StringBuilder sPath = new StringBuilder("");
final Object aNodes[] = aPath.getPath();
for (int nIndex=1; nIndex<aNodes.length; ++nIndex)
{
diff --git a/main/ooxml/source/framework/OOXMLViewer/src/org/apache/openoffice/ooxml/viewer/xml/XMLScanner.java b/main/ooxml/source/framework/OOXMLViewer/src/org/apache/openoffice/ooxml/viewer/xml/XMLScanner.java
index 7e83c22584..e787ccf1ee 100644
--- a/main/ooxml/source/framework/OOXMLViewer/src/org/apache/openoffice/ooxml/viewer/xml/XMLScanner.java
+++ b/main/ooxml/source/framework/OOXMLViewer/src/org/apache/openoffice/ooxml/viewer/xml/XMLScanner.java
@@ -297,7 +297,7 @@ public class XMLScanner
private void ScanWhitespace ()
{
- final StringBuffer aBuffer = new StringBuffer();
+ final StringBuilder aBuffer = new StringBuilder();
final int nStartOffset = mnOffset;
while (true)
diff --git a/main/ooxml/source/framework/SchemaParser/src/org/apache/openoffice/ooxml/schema/generator/ParserTablesGenerator.java b/main/ooxml/source/framework/SchemaParser/src/org/apache/openoffice/ooxml/schema/generator/ParserTablesGenerator.java
index 99cfbe1161..6e04ccf37e 100644
--- a/main/ooxml/source/framework/SchemaParser/src/org/apache/openoffice/ooxml/schema/generator/ParserTablesGenerator.java
+++ b/main/ooxml/source/framework/SchemaParser/src/org/apache/openoffice/ooxml/schema/generator/ParserTablesGenerator.java
@@ -342,7 +342,7 @@ public class ParserTablesGenerator
{
final int nCurrentIndex = nIndex++;
- final StringBuffer aLine = new StringBuffer();
+ final StringBuilder aLine = new StringBuilder();
aLine.append(String.format(
"simple-type %5d %1d %c ",
maTypeNameToIdMap.get(aEntry.getKey()),
@@ -395,7 +395,7 @@ public class ParserTablesGenerator
private static void AppendStringDescription (
- final StringBuffer aLine,
+ final StringBuilder aLine,
final StringNode aType)
{
aLine.append("S ");
@@ -432,7 +432,7 @@ public class ParserTablesGenerator
private static void AppendNumberDescription (
- final StringBuffer aLine,
+ final StringBuilder aLine,
final NumberNode<?> aType)
{
aLine.append("N ");
@@ -495,7 +495,7 @@ public class ParserTablesGenerator
private static void AppendDateTimeDescription (
- final StringBuffer aLine,
+ final StringBuilder aLine,
final DateTimeNode aType)
{
aLine.append("D");
@@ -505,7 +505,7 @@ public class ParserTablesGenerator
private static void AppendBlobDescription (
- final StringBuffer aLine,
+ final StringBuilder aLine,
final BlobNode aType)
{
aLine.append("B ");
diff --git a/main/ooxml/source/framework/SchemaParser/src/org/apache/openoffice/ooxml/schema/generator/html/HtmlGenerator.java b/main/ooxml/source/framework/SchemaParser/src/org/apache/openoffice/ooxml/schema/generator/html/HtmlGenerator.java
index 189554766a..b6111ddbc9 100644
--- a/main/ooxml/source/framework/SchemaParser/src/org/apache/openoffice/ooxml/schema/generator/html/HtmlGenerator.java
+++ b/main/ooxml/source/framework/SchemaParser/src/org/apache/openoffice/ooxml/schema/generator/html/HtmlGenerator.java
@@ -594,7 +594,7 @@ public class HtmlGenerator
if ( ! aIterator.hasNext())
return "";
- final StringBuffer aBuffer = new StringBuffer(aIterator.next());
+ final StringBuilder aBuffer = new StringBuilder(aIterator.next());
while (aIterator.hasNext())
{
aBuffer.append(sSeparator);
diff --git a/main/ooxml/source/framework/SchemaParser/src/org/apache/openoffice/ooxml/schema/model/complex/Any.java b/main/ooxml/source/framework/SchemaParser/src/org/apache/openoffice/ooxml/schema/model/complex/Any.java
index cc2573b86d..652a624f85 100644
--- a/main/ooxml/source/framework/SchemaParser/src/org/apache/openoffice/ooxml/schema/model/complex/Any.java
+++ b/main/ooxml/source/framework/SchemaParser/src/org/apache/openoffice/ooxml/schema/model/complex/Any.java
@@ -88,7 +88,7 @@ public class Any
@Override
public String toString ()
{
- final StringBuffer aBuffer = new StringBuffer();
+ final StringBuilder aBuffer = new StringBuilder();
aBuffer.append("any processContents=");
aBuffer.append(meProcessContents.toString());
aBuffer.append(", namespaces=");
diff --git a/main/ooxml/source/framework/SchemaParser/src/org/apache/openoffice/ooxml/schema/model/simple/Restriction.java b/main/ooxml/source/framework/SchemaParser/src/org/apache/openoffice/ooxml/schema/model/simple/Restriction.java
index 8ee71d02f0..5e6ab5095c 100644
--- a/main/ooxml/source/framework/SchemaParser/src/org/apache/openoffice/ooxml/schema/model/simple/Restriction.java
+++ b/main/ooxml/source/framework/SchemaParser/src/org/apache/openoffice/ooxml/schema/model/simple/Restriction.java
@@ -92,7 +92,7 @@ public class Restriction
@Override
public String toString ()
{
- final StringBuffer aBuffer = new StringBuffer("restriction based on ");
+ final StringBuilder aBuffer = new StringBuilder("restriction based on ");
aBuffer.append(maBaseType.GetDisplayName());
if (msMinInclusive != null)
diff --git a/main/ooxml/source/framework/SchemaParser/src/org/apache/openoffice/ooxml/schema/simple/NumberNode.java b/main/ooxml/source/framework/SchemaParser/src/org/apache/openoffice/ooxml/schema/simple/NumberNode.java
index 6cbb320c69..5a70ce0c3d 100644
--- a/main/ooxml/source/framework/SchemaParser/src/org/apache/openoffice/ooxml/schema/simple/NumberNode.java
+++ b/main/ooxml/source/framework/SchemaParser/src/org/apache/openoffice/ooxml/schema/simple/NumberNode.java
@@ -121,7 +121,7 @@ public class NumberNode<T extends Comparable<T>>
@Override
public String toString ()
{
- final StringBuffer sMessage = new StringBuffer();
+ final StringBuilder sMessage = new StringBuilder();
sMessage.append(meType);
if (maEnumeration != null)
{
diff --git a/main/ooxml/source/framework/SchemaParser/src/org/apache/openoffice/ooxml/schema/simple/StringNode.java b/main/ooxml/source/framework/SchemaParser/src/org/apache/openoffice/ooxml/schema/simple/StringNode.java
index b88da5c7e4..bdaee9505e 100644
--- a/main/ooxml/source/framework/SchemaParser/src/org/apache/openoffice/ooxml/schema/simple/StringNode.java
+++ b/main/ooxml/source/framework/SchemaParser/src/org/apache/openoffice/ooxml/schema/simple/StringNode.java
@@ -116,7 +116,7 @@ public class StringNode
@Override
public String toString ()
{
- final StringBuffer aBuffer = new StringBuffer();
+ final StringBuilder aBuffer = new StringBuilder();
aBuffer.append(String.format("string (%s)", meType));
if (maEnumerationValueIds != null)
{
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/convwatch/DB.java b/main/qadevOOo/java/OOoRunner/src/main/java/convwatch/DB.java
index 43bdc54286..0ab50678f4 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/convwatch/DB.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/convwatch/DB.java
@@ -224,7 +224,7 @@ public class DB extends DBHelper
// ExecSQL(aCon, sDeleteOld);
//
// String sValueLine = "type, filename, basename, fileformat, buildid, resolution, date";
- // StringBuffer aDataLine = new StringBuffer();
+ // StringBuilder aDataLine = new StringBuilder();
// aDataLine.append( Quote(_sSourceType) ) . append( sComma ) .
// append( Quote( sFilename) ) . append( sComma ) .
// append( Quote( _sBasename) ) . append( sComma ) .
@@ -278,7 +278,7 @@ public class DB extends DBHelper
while( aResultSet.next() )
{
- StringBuffer aResult = new StringBuffer();
+ StringBuilder aResult = new StringBuilder();
try
{
Object aObj = null;
@@ -390,7 +390,7 @@ public class DB extends DBHelper
private String getWhereClause()
{
- StringBuffer aWhereClause = new StringBuffer();
+ StringBuilder aWhereClause = new StringBuilder();
// WHERE environment='' and referenceversion='' and currentversion='' and documentpool=''
// aWhere.append( "environment" ). append(sEqual) . append(Quote(m_sEnvironment)) .
// append(sAND) .
@@ -478,7 +478,7 @@ public class DB extends DBHelper
String sValueLine="dbdistinct2, environment, sourceversion, sourcename, sourcecreatortype, destinationversion, destinationname, destinationcreatortype, documentpoolpath, documentpool, mailfeedback, state, special, parentdistinct, startdate";
String sDocumentPoolDir = _sDocumentPoolDir.replace('\\', '/');
- StringBuffer aDataLine = new StringBuffer();
+ StringBuilder aDataLine = new StringBuilder();
aDataLine.append( Quote(getDBDistinct()) ) . append( sComma ) .
append( Quote( getEnvironment()) ) . append( sComma ) .
append( Quote( _sSourceVersion) ) . append( sComma ) .
@@ -522,7 +522,7 @@ public class DB extends DBHelper
// Connection aCon = new ShareConnection().getConnection();
//
// String sValueLine = "environment, referenceversion, currentversion, documentpool, name, state";
- // StringBuffer aDataLine = new StringBuffer();
+ // StringBuilder aDataLine = new StringBuilder();
// aDataLine.append( Quote(m_sEnvironment) ) . append( sComma ) .
// append( Quote( m_sSourceVersion) ) . append( sComma ) .
// append( Quote( m_sDestinationVersion) ) . append( sComma ) .
@@ -539,7 +539,7 @@ public class DB extends DBHelper
// Connection aCon = new ShareConnection().getConnection();
//
// String sValueLine = "type, filename, fileformat, buildid, date";
- // StringBuffer aDataLine = new StringBuffer();
+ // StringBuilder aDataLine = new StringBuilder();
// aDataLine.append( "1" ) . append( sComma ) .
// append( Quote( _sFilename) ) . append( sComma ) .
// append( Quote( _sFileFormat) ) . append( sComma ) .
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/convwatch/DBHelper.java b/main/qadevOOo/java/OOoRunner/src/main/java/convwatch/DBHelper.java
index f656584812..d5de402b38 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/convwatch/DBHelper.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/convwatch/DBHelper.java
@@ -113,7 +113,7 @@ public class DBHelper
//
// aInsertStr = "INSERT INTO " + _sTableName + " (" + value_names + " ) VALUES (" + values + ")";
// ExecSQL(_aCon, aInsertStr);
- StringBuffer aInsertStr = new StringBuffer();
+ StringBuilder aInsertStr = new StringBuilder();
aInsertStr.append( "INSERT INTO " ) . append( _sTableName );
aInsertStr.append( " (").append( value_names ).append ( ")" );
@@ -133,7 +133,7 @@ public class DBHelper
//
// aUpdateStr = "UPDATE " + _sTableName + " SET " + _sSet + " WHERE " + _sWhere;
// ExecSQL( _aCon, aUpdateStr );
- StringBuffer aUpdateStr = new StringBuffer();
+ StringBuilder aUpdateStr = new StringBuilder();
aUpdateStr.append( "UPDATE " ).append( _sTableName )
.append( " SET " ).append( _sSet )
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/convwatch/EnhancedComplexTestCase.java b/main/qadevOOo/java/OOoRunner/src/main/java/convwatch/EnhancedComplexTestCase.java
index 5c43842244..a1c244d44a 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/convwatch/EnhancedComplexTestCase.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/convwatch/EnhancedComplexTestCase.java
@@ -49,7 +49,7 @@ public abstract class EnhancedComplexTestCase extends ComplexTestCase
bBackValue = aHandler.executeSynchronously();
TimeHelper.waitInSeconds(1, "wait after ProcessHandler.executeSynchronously()");
- StringBuffer aBuffer = new StringBuffer();
+ StringBuilder aBuffer = new StringBuilder();
aBuffer.append(aHandler.getErrorText()).append(aHandler.getOutputText());
String sText = aBuffer.toString();
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/convwatch/GraphicalDifferenceCheck.java b/main/qadevOOo/java/OOoRunner/src/main/java/convwatch/GraphicalDifferenceCheck.java
index 6b77f8f94a..778819ce15 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/convwatch/GraphicalDifferenceCheck.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/convwatch/GraphicalDifferenceCheck.java
@@ -317,7 +317,7 @@ public class GraphicalDifferenceCheck
{
// find the adequate XML StarOffice output filter to save the document and adequate suffix
- StringBuffer suffix = new StringBuffer();
+ StringBuilder suffix = new StringBuilder();
String exportFilter = getXMLOutputFilterforXComponent(xComponent, suffix);
if(resultDocName == null)
resultDocName = "OOoTestDocument";
@@ -353,7 +353,7 @@ public class GraphicalDifferenceCheck
}
- private static String getXMLOutputFilterforXComponent(XComponent xComponent, StringBuffer suffix){
+ private static String getXMLOutputFilterforXComponent(XComponent xComponent, StringBuilder suffix){
XServiceInfo xSI = UnoRuntime.queryInterface(XServiceInfo.class, xComponent);
if (xSI.supportsService("com.sun.star.text.TextDocument")){
resetBuffer(suffix, ".sxw");
@@ -374,7 +374,7 @@ public class GraphicalDifferenceCheck
return null;
}
- private static StringBuffer resetBuffer(StringBuffer sb, String suffix)
+ private static StringBuilder resetBuffer(StringBuilder sb, String suffix)
{
if(sb != null)
{
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/convwatch/HTMLOutputter.java b/main/qadevOOo/java/OOoRunner/src/main/java/convwatch/HTMLOutputter.java
index 4d4075d205..1848f4c44e 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/convwatch/HTMLOutputter.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/convwatch/HTMLOutputter.java
@@ -110,7 +110,7 @@ public class HTMLOutputter
String getHREF(String _sHREF, String _sPathInfo)
{
- StringBuffer a = new StringBuffer();
+ StringBuilder a = new StringBuilder();
if (! OSHelper.isWindows())
{
// System.out.println("Tu'nix system.");
@@ -142,7 +142,7 @@ public class HTMLOutputter
// {
// // int index = 0;
// // remove "X:" and insert "/tausch"
- // StringBuffer sbUNIXPath = new StringBuffer( _sHREF.substring(0, index) );
+ // StringBuilder sbUNIXPath = new StringBuilder( _sHREF.substring(0, index) );
// sbUNIXPath.append("/tausch");
// sbUNIXPath.append(_sHREF.substring(index + 2));
// String sUNIXPath = sbUNIXPath.toString();
@@ -165,7 +165,7 @@ public class HTMLOutputter
String tableDataCell(String _sValue)
{
- StringBuffer a = new StringBuffer();
+ StringBuilder a = new StringBuilder();
a.append("<TD>");
a.append(_sValue);
a.append("</TD>");
@@ -174,7 +174,7 @@ public class HTMLOutputter
String tableHeaderCell(String _sValue)
{
- StringBuffer a = new StringBuffer();
+ StringBuilder a = new StringBuilder();
a.append("<TH>");
a.append(_sValue);
a.append("</TH>");
@@ -224,7 +224,7 @@ public class HTMLOutputter
// -----------------------------------------------------------------------------
String stronghtml(String _sValue)
{
- StringBuffer a = new StringBuffer();
+ StringBuilder a = new StringBuilder();
a.append("<STRONG>");
a.append(_sValue);
a.append("</STRONG>");
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/convwatch/StringHelper.java b/main/qadevOOo/java/OOoRunner/src/main/java/convwatch/StringHelper.java
index a283c4a24a..9b2e30a86a 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/convwatch/StringHelper.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/convwatch/StringHelper.java
@@ -86,7 +86,7 @@
// LLA: moved to helper.StringHelper public static String createValueString(int _nValue, int _nLen)
// LLA: moved to helper.StringHelper {
// LLA: moved to helper.StringHelper String sValue = String.valueOf(_nValue);
-// LLA: moved to helper.StringHelper StringBuffer a = new StringBuffer();
+// LLA: moved to helper.StringHelper StringBuilder a = new StringBuilder();
// LLA: moved to helper.StringHelper while (_nLen > sValue.length())
// LLA: moved to helper.StringHelper {
// LLA: moved to helper.StringHelper a.append('0');
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/graphical/HTMLResult.java b/main/qadevOOo/java/OOoRunner/src/main/java/graphical/HTMLResult.java
index fa2290586a..1eed79b8fe 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/graphical/HTMLResult.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/graphical/HTMLResult.java
@@ -133,7 +133,7 @@ public class HTMLResult
*/
private String getHREF(String _sHREF, String _sPathInfo)
{
- StringBuffer a = new StringBuffer();
+ StringBuilder a = new StringBuilder();
a.append("<a href=\"");
a.append(_sHREF);
a.append("\">");
@@ -149,7 +149,7 @@ public class HTMLResult
*/
private String tableDataCell(String _sValue)
{
- StringBuffer a = new StringBuffer();
+ StringBuilder a = new StringBuilder();
a.append("<td>");
a.append(_sValue);
a.append("</td>");
@@ -163,7 +163,7 @@ public class HTMLResult
*/
private String tableHeaderCell(String _sValue)
{
- StringBuffer a = new StringBuffer();
+ StringBuilder a = new StringBuilder();
a.append("<th>");
a.append(_sValue);
a.append("</th>");
@@ -197,7 +197,7 @@ public class HTMLResult
// -----------------------------------------------------------------------------
private String stronghtml(String _sValue)
{
- StringBuffer a = new StringBuffer();
+ StringBuilder a = new StringBuilder();
a.append("<strong>");
a.append(_sValue);
a.append("</strong>");
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/helper/ProcessHandler.java b/main/qadevOOo/java/OOoRunner/src/main/java/helper/ProcessHandler.java
index 4ddc69961e..e7ca5aec6f 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/helper/ProcessHandler.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/helper/ProcessHandler.java
@@ -55,7 +55,7 @@ class Pump extends Thread
private LineNumberReader reader;
private String pref;
- private StringBuffer buf = new StringBuffer(256);
+ private StringBuilder buf = new StringBuilder(256);
private PrintWriter log;
private boolean bOutput;
@@ -104,7 +104,7 @@ class Pump extends Thread
/**
* Returns the text collected from input stream.
*/
- public String getStringBuffer()
+ public String getStringBuilder()
{
return buf.toString();
}
@@ -766,7 +766,7 @@ public class ProcessHandler
}
else
{
- return stdout.getStringBuffer();
+ return stdout.getStringBuilder();
}
}
@@ -782,7 +782,7 @@ public class ProcessHandler
}
else
{
- return stderr.getStringBuffer();
+ return stderr.getStringBuilder();
}
}
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/helper/StringHelper.java b/main/qadevOOo/java/OOoRunner/src/main/java/helper/StringHelper.java
index 22bb1b3255..9f0f166290 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/helper/StringHelper.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/helper/StringHelper.java
@@ -108,7 +108,7 @@ public class StringHelper
public static String createValueString(int _nValue, int _nLen)
{
String sValue = String.valueOf(_nValue);
- StringBuffer a = new StringBuffer();
+ StringBuilder a = new StringBuilder();
while (_nLen > sValue.length())
{
a.append('0');
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/helper/URLHelper.java b/main/qadevOOo/java/OOoRunner/src/main/java/helper/URLHelper.java
index e78926cee5..cd24bd0173 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/helper/URLHelper.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/helper/URLHelper.java
@@ -80,7 +80,7 @@ public class URLHelper
(sFileURL.startsWith("file://") == false)
)
{
- StringBuffer sWorkBuffer = new StringBuffer(sFileURL);
+ StringBuilder sWorkBuffer = new StringBuilder(sFileURL);
sWorkBuffer.insert(6,"//");
sFileURL = sWorkBuffer.toString();
}
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/org/openoffice/Runner.java b/main/qadevOOo/java/OOoRunner/src/main/java/org/openoffice/Runner.java
index 621af9a5a2..13a81c405d 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/org/openoffice/Runner.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/org/openoffice/Runner.java
@@ -78,7 +78,7 @@ public class Runner
long sec = (_nTime / 1000) % 60;
long min = (_nTime / (60 * 1000)) % 60;
long hour = _nTime / (60 * 60 * 1000);
- StringBuffer aTime = new StringBuffer();
+ StringBuilder aTime = new StringBuilder();
aTime.append(helper.StringHelper.createValueString((int) hour, 2)).
append(':').
append(helper.StringHelper.createValueString((int) min, 2)).
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/stats/InternalLogWriter.java b/main/qadevOOo/java/OOoRunner/src/main/java/stats/InternalLogWriter.java
index 37b7412bbf..5e9a7a3a80 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/stats/InternalLogWriter.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/stats/InternalLogWriter.java
@@ -26,14 +26,14 @@ import java.io.PrintWriter;
import java.io.StringWriter;
/**
- * Write all logs into a java.io.PrintWriter, i.e. a StringBuffer.
+ * Write all logs into a java.io.PrintWriter, i.e. a StringBuilder.
* Log is gathered there.
*/
public class InternalLogWriter extends PrintWriter
implements share.LogWriter {
/** log active **/
boolean active;
- /** write all output to a StringBuffer **/
+ /** write all output to a StringBuilder **/
static StringWriter writer = new StringWriter();
/**
@@ -56,7 +56,7 @@ public class InternalLogWriter extends PrintWriter
}
/**
- * Method to print a line that is added to the StringBuffer.
+ * Method to print a line that is added to the StringBuilder.
* @param msg The message that is printed.
*/
public void println(String msg) {
@@ -65,7 +65,7 @@ public class InternalLogWriter extends PrintWriter
}
/**
- * Method to print to the StringBuffer.
+ * Method to print to the StringBuilder.
* @param msg The message that is printed.
*/
public void print(String msg) {
@@ -76,7 +76,7 @@ public class InternalLogWriter extends PrintWriter
/**
* Is used to sum up the information.
- * The summary is also added to the StringBuffer.
+ * The summary is also added to the StringBuilder.
* @param entry The description entry.
* @return True, if a summary could be created.
*/
@@ -99,9 +99,9 @@ public class InternalLogWriter extends PrintWriter
/**
* Return all the written stuff.
- * @return All that was written to the StringBuffer with the
+ * @return All that was written to the StringBuilder with the
* 'println()', 'print()' and 'summarize()' methods.
- * The StringBuffer is emptied afterwards.
+ * The StringBuilder is emptied afterwards.
**/
public String getLog() {
String message = writer.getBuffer().toString();
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/util/utils.java b/main/qadevOOo/java/OOoRunner/src/main/java/util/utils.java
index acc19dfb5f..264df9daca 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/util/utils.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/util/utils.java
@@ -877,13 +877,13 @@ public class utils {
*/
public static String replaceAll13(String originalString, String searchString, String replaceString) {
- StringBuffer changeStringBuffer = new StringBuffer(originalString);
+ StringBuilder changeStringBuilder = new StringBuilder(originalString);
int searchLength = searchString.length();
int replaceLength = replaceString.length();
int index = originalString.indexOf(searchString);
while (index != -1) {
- changeStringBuffer = changeStringBuffer.replace(index, index + searchLength, replaceString);
- originalString = changeStringBuffer.toString();
+ changeStringBuilder = changeStringBuilder.replace(index, index + searchLength, replaceString);
+ originalString = changeStringBuilder.toString();
index = originalString.indexOf(searchString, index + replaceLength);
}
return originalString;
diff --git a/main/reportbuilder/java/com/sun/star/report/SDBCReportData.java b/main/reportbuilder/java/com/sun/star/report/SDBCReportData.java
index 32d00e3da0..3c1b666138 100644
--- a/main/reportbuilder/java/com/sun/star/report/SDBCReportData.java
+++ b/main/reportbuilder/java/com/sun/star/report/SDBCReportData.java
@@ -210,9 +210,9 @@ public class SDBCReportData implements DataSource
return date;
}
- private static StringBuffer getTimeString(final int hours, final int minutes, final int seconds)
+ private static StringBuilder getTimeString(final int hours, final int minutes, final int seconds)
{
- final StringBuffer timeString = new StringBuffer();
+ final StringBuilder timeString = new StringBuilder();
if (hours < 10)
{
timeString.append('0');
@@ -233,11 +233,11 @@ public class SDBCReportData implements DataSource
return timeString;
}
- static private StringBuffer getDateString(final int years, final int months, final int days)
+ static private StringBuilder getDateString(final int years, final int months, final int days)
{
- final StringBuffer str = new StringBuffer();
+ final StringBuilder str = new StringBuilder();
str.append(years);
- final StringBuffer str2 = new StringBuffer("0000");
+ final StringBuilder str2 = new StringBuilder("0000");
str2.delete(0, str.length());
str.insert(0, str2);
str.append('-');
@@ -276,7 +276,7 @@ public class SDBCReportData implements DataSource
if (obj instanceof DateTime)
{
final DateTime unoTs = (DateTime) obj;
- final StringBuffer str = getDateString(unoTs.Year, unoTs.Month, unoTs.Day);
+ final StringBuilder str = getDateString(unoTs.Year, unoTs.Month, unoTs.Day);
str.append(' ');
str.append(getTimeString(unoTs.Hours, unoTs.Minutes, unoTs.Seconds));
str.append('.');
diff --git a/main/reportbuilder/java/com/sun/star/report/SDBCReportDataFactory.java b/main/reportbuilder/java/com/sun/star/report/SDBCReportDataFactory.java
index 63cdfbe8dd..aa376c79ce 100644
--- a/main/reportbuilder/java/com/sun/star/report/SDBCReportDataFactory.java
+++ b/main/reportbuilder/java/com/sun/star/report/SDBCReportDataFactory.java
@@ -237,7 +237,7 @@ public class SDBCReportDataFactory implements DataSourceFactory
private String getOrderStatement(final int commandType, final String command, final List groupExpressions)
{
- final StringBuffer order = new StringBuffer();
+ final StringBuilder order = new StringBuilder();
final int count = groupExpressions.size();
if (count != 0)
{
@@ -491,7 +491,7 @@ public class SDBCReportDataFactory implements DataSourceFactory
// create the new filter
final String quote = connection.getMetaData().getIdentifierQuoteString();
- final StringBuffer oldFilter = new StringBuffer();
+ final StringBuilder oldFilter = new StringBuilder();
oldFilter.append(composer.getFilter());
if (oldFilter.length() != 0)
{
@@ -539,7 +539,7 @@ public class SDBCReportDataFactory implements DataSourceFactory
WrappedTargetException,
NoSuchElementException
{
- final StringBuffer order = new StringBuffer(getOrderStatement(commandType, command, (ArrayList) parameters.get(GROUP_EXPRESSIONS)));
+ final StringBuilder order = new StringBuilder(getOrderStatement(commandType, command, (ArrayList) parameters.get(GROUP_EXPRESSIONS)));
if (order.length() > 0 && commandType != CommandType.TABLE)
{
String statement = command;
diff --git a/main/reportbuilder/java/com/sun/star/report/pentaho/DefaultNameGenerator.java b/main/reportbuilder/java/com/sun/star/report/pentaho/DefaultNameGenerator.java
index 768b01849a..493a530fa9 100644
--- a/main/reportbuilder/java/com/sun/star/report/pentaho/DefaultNameGenerator.java
+++ b/main/reportbuilder/java/com/sun/star/report/pentaho/DefaultNameGenerator.java
@@ -76,7 +76,7 @@ public class DefaultNameGenerator
name = "file";
}
- StringBuffer firstFileName = new StringBuffer();
+ StringBuilder firstFileName = new StringBuilder();
firstFileName.append(name);
final String suffix;
if (mimeType != null)
diff --git a/main/reportbuilder/java/com/sun/star/report/pentaho/SOFormulaParser.java b/main/reportbuilder/java/com/sun/star/report/pentaho/SOFormulaParser.java
index f452b1c445..4c5fc514f1 100644
--- a/main/reportbuilder/java/com/sun/star/report/pentaho/SOFormulaParser.java
+++ b/main/reportbuilder/java/com/sun/star/report/pentaho/SOFormulaParser.java
@@ -249,7 +249,7 @@ public final class SOFormulaParser extends ComponentBase
public String printFormula(com.sun.star.sheet.FormulaToken[] aTokens, com.sun.star.table.CellAddress aReferencePos)
{
- final StringBuffer ret = new StringBuffer();
+ final StringBuilder ret = new StringBuilder();
for (int i = 0; i < aTokens.length; i++)
{
final FormulaToken formulaToken = aTokens[i];
diff --git a/main/reportbuilder/java/com/sun/star/report/pentaho/StarFunctionDescription.java b/main/reportbuilder/java/com/sun/star/report/pentaho/StarFunctionDescription.java
index 0298988782..cc1a6728d8 100644
--- a/main/reportbuilder/java/com/sun/star/report/pentaho/StarFunctionDescription.java
+++ b/main/reportbuilder/java/com/sun/star/report/pentaho/StarFunctionDescription.java
@@ -141,7 +141,7 @@ public final class StarFunctionDescription extends WeakBase
public String getSignature()
{
final int count = functionDescription.getParameterCount();
- final StringBuffer signature = new StringBuffer(getName());
+ final StringBuilder signature = new StringBuilder(getName());
signature.append('(');
for (int i = 0; i < count; i++)
{
@@ -184,7 +184,7 @@ public final class StarFunctionDescription extends WeakBase
throw new com.sun.star.lang.IllegalArgumentException();
}
- final StringBuffer formula = new StringBuffer(getName());
+ final StringBuilder formula = new StringBuilder(getName());
formula.append('(');
for (int i = 0; i < arguments.length; ++i)
{
diff --git a/main/reportbuilder/java/com/sun/star/report/pentaho/output/OfficeDocumentReportTarget.java b/main/reportbuilder/java/com/sun/star/report/pentaho/output/OfficeDocumentReportTarget.java
index f1241e7dba..bb0f0dd9d9 100644
--- a/main/reportbuilder/java/com/sun/star/report/pentaho/output/OfficeDocumentReportTarget.java
+++ b/main/reportbuilder/java/com/sun/star/report/pentaho/output/OfficeDocumentReportTarget.java
@@ -1255,7 +1255,7 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget
return "";
}
final char[] chars = name.toCharArray();
- final StringBuffer buffer = new StringBuffer();
+ final StringBuilder buffer = new StringBuilder();
for (int i = 0; i < chars.length; i++)
{
final char aChar = chars[i];
@@ -1363,7 +1363,7 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget
{
final OfficeStyle imageStyle = deriveStyle(OfficeToken.GRAPHIC, OfficeToken.GRAPHICS);
final Element graphProperties = produceFirstChild(imageStyle, OfficeNamespaces.STYLE_NS, OfficeToken.GRAPHIC_PROPERTIES);
- final StringBuffer buffer = new StringBuffer();
+ final StringBuilder buffer = new StringBuilder();
buffer.append("rect(");
buffer.append(clipHeight / 2);
buffer.append(imageAreaHeightVal.getType().getType());
@@ -1386,7 +1386,7 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget
{
final OfficeStyle imageStyle = deriveStyle(OfficeToken.GRAPHIC, OfficeToken.GRAPHICS);
final Element graphProperties = produceFirstChild(imageStyle, OfficeNamespaces.STYLE_NS, OfficeToken.GRAPHIC_PROPERTIES);
- final StringBuffer buffer = new StringBuffer();
+ final StringBuilder buffer = new StringBuilder();
buffer.append("rect(0cm ");
buffer.append(clipWidth / 2);
buffer.append(imageAreaWidthVal.getType().getType());
@@ -1404,7 +1404,7 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget
{
final OfficeStyle imageStyle = deriveStyle(OfficeToken.GRAPHIC, OfficeToken.GRAPHICS);
final Element graphProperties = produceFirstChild(imageStyle, OfficeNamespaces.STYLE_NS, OfficeToken.GRAPHIC_PROPERTIES);
- final StringBuffer buffer = new StringBuffer();
+ final StringBuilder buffer = new StringBuilder();
buffer.append("rect(");
buffer.append(clipHeight / 2);
buffer.append(imageAreaHeightVal.getType().getType());
diff --git a/main/reportbuilder/java/com/sun/star/report/pentaho/output/text/PageContext.java b/main/reportbuilder/java/com/sun/star/report/pentaho/output/text/PageContext.java
index 7809632f21..5b61b58e93 100644
--- a/main/reportbuilder/java/com/sun/star/report/pentaho/output/text/PageContext.java
+++ b/main/reportbuilder/java/com/sun/star/report/pentaho/output/text/PageContext.java
@@ -174,7 +174,7 @@ public class PageContext
return getFooter();
}
- final StringBuffer b = new StringBuffer();
+ final StringBuilder b = new StringBuilder();
PageContext pc = this;
while (pc != null)
@@ -201,7 +201,7 @@ public class PageContext
return getHeader();
}
- final StringBuffer b = new StringBuffer();
+ final StringBuilder b = new StringBuilder();
b.append(parent.getPageHeaderContent());
b.append(getHeader());
diff --git a/main/ridljar/java/ridl/src/main/java/com/sun/star/uno/Type.java b/main/ridljar/java/ridl/src/main/java/com/sun/star/uno/Type.java
index 411db96c74..228222c645 100644
--- a/main/ridljar/java/ridl/src/main/java/com/sun/star/uno/Type.java
+++ b/main/ridljar/java/ridl/src/main/java/com/sun/star/uno/Type.java
@@ -543,7 +543,7 @@ public class Type {
return _typeName.equals(TYPE_NAME_ANY) ? Object.class : null;
case TypeClass.SEQUENCE_value:
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
int offset = 0;
for (; _typeName.startsWith("[]", offset); offset += "[]".length())
{
diff --git a/main/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java b/main/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
index f0e840cbbe..e4a2567857 100644
--- a/main/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
+++ b/main/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
@@ -321,7 +321,7 @@ public class ScriptMetaData extends ScriptEntry implements Cloneable {
if ( sourceUrl != null )
{
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
InputStream in = sourceUrl.openStream();
byte[] contents = new byte[1024];
diff --git a/main/scripting/java/com/sun/star/script/framework/provider/PathUtils.java b/main/scripting/java/com/sun/star/script/framework/provider/PathUtils.java
index dc5b9b54eb..782f02eb30 100644
--- a/main/scripting/java/com/sun/star/script/framework/provider/PathUtils.java
+++ b/main/scripting/java/com/sun/star/script/framework/provider/PathUtils.java
@@ -66,7 +66,7 @@ public class PathUtils {
}
static public String make_url( String baseUrl, String url )
{
- StringBuffer buff = new StringBuffer( baseUrl.length() + url.length() ); buff.append( baseUrl );
+ StringBuilder buff = new StringBuilder( baseUrl.length() + url.length() ); buff.append( baseUrl );
StringTokenizer t = new StringTokenizer( url, "/");
while ( t.hasMoreElements() )
{
diff --git a/main/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java b/main/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
index 5daeb671f6..9757411253 100644
--- a/main/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
+++ b/main/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
@@ -76,7 +76,7 @@ public class ScriptEditorForBeanShell
ScriptEditorForBeanShell.class.getResource("template.bsh");
InputStream in = url.openStream();
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
byte[] b = new byte[1024];
int len = 0;
diff --git a/main/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptSourceModel.java b/main/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptSourceModel.java
index 1829e8e249..fa8d80662b 100644
--- a/main/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptSourceModel.java
+++ b/main/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptSourceModel.java
@@ -40,7 +40,7 @@ public class ScriptSourceModel {
}
private String load() throws IOException {
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
InputStream in = file.openStream();
byte[] contents = new byte[1024];
diff --git a/main/scripting/java/com/sun/star/script/framework/provider/java/ScriptDescriptor.java b/main/scripting/java/com/sun/star/script/framework/provider/java/ScriptDescriptor.java
index 2a0d14abd8..47fdce7ac0 100644
--- a/main/scripting/java/com/sun/star/script/framework/provider/java/ScriptDescriptor.java
+++ b/main/scripting/java/com/sun/star/script/framework/provider/java/ScriptDescriptor.java
@@ -185,7 +185,7 @@ public class ScriptDescriptor
*/
public String toString()
{
- StringBuffer description = new StringBuffer( m_name );
+ StringBuilder description = new StringBuilder( m_name );
Class[] types = getArgumentTypes();
description.append( " (" );
diff --git a/main/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java b/main/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java
index aba030a08a..a75b2abb1f 100644
--- a/main/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java
+++ b/main/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java
@@ -64,7 +64,7 @@ public class ScriptEditorForJavaScript implements ScriptEditor
ScriptEditorForJavaScript.class.getResource("template.js");
InputStream in = url.openStream();
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
byte[] b = new byte[1024];
int len = 0;
diff --git a/main/scripting/java/org/openoffice/idesupport/SVersionRCFile.java b/main/scripting/java/org/openoffice/idesupport/SVersionRCFile.java
index dccd75e746..5e4d5a00ab 100644
--- a/main/scripting/java/org/openoffice/idesupport/SVersionRCFile.java
+++ b/main/scripting/java/org/openoffice/idesupport/SVersionRCFile.java
@@ -167,7 +167,7 @@ public class SVersionRCFile {
if (System.getProperty("os.name").startsWith("Windows"))
path = path.replace(File.separatorChar, '/');
- StringBuffer buf = new StringBuffer(FILE_URL_PREFIX);
+ StringBuilder buf = new StringBuilder(FILE_URL_PREFIX);
buf.append(path);
if (f.isDirectory())
diff --git a/main/scripting/java/org/openoffice/idesupport/filter/BinaryOnlyFilter.java b/main/scripting/java/org/openoffice/idesupport/filter/BinaryOnlyFilter.java
index 72753fd0f1..f96cc50f0f 100644
--- a/main/scripting/java/org/openoffice/idesupport/filter/BinaryOnlyFilter.java
+++ b/main/scripting/java/org/openoffice/idesupport/filter/BinaryOnlyFilter.java
@@ -42,7 +42,7 @@ public class BinaryOnlyFilter implements FileFilter {
}
public String toString() {
- /* StringBuffer buf = new StringBuffer(DESCRIPTION + ": ");
+ /* StringBuilder buf = new StringBuilder(DESCRIPTION + ": ");
for (int i = 0; i < EXTENSIONS.length - 1; i++)
buf.append("<" + EXTENSIONS[i] + "> ");
diff --git a/main/scripting/java/org/openoffice/idesupport/filter/ExceptParcelFilter.java b/main/scripting/java/org/openoffice/idesupport/filter/ExceptParcelFilter.java
index cb6093ba6a..d1a66bcbe2 100644
--- a/main/scripting/java/org/openoffice/idesupport/filter/ExceptParcelFilter.java
+++ b/main/scripting/java/org/openoffice/idesupport/filter/ExceptParcelFilter.java
@@ -46,7 +46,7 @@ public class ExceptParcelFilter implements FileFilter {
}
public String toString() {
- StringBuffer buf = new StringBuffer(DESCRIPTION + ": ");
+ StringBuilder buf = new StringBuilder(DESCRIPTION + ": ");
buf.append("<" + this.parcelName + ">");
diff --git a/main/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelFolderSupport.java b/main/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelFolderSupport.java
index f7947c93fc..11f4bffd3f 100644
--- a/main/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelFolderSupport.java
+++ b/main/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelFolderSupport.java
@@ -229,7 +229,7 @@ public class ParcelFolderSupport implements ParcelFolderCookie
if ( classpath.startsWith("\"") && classpath.endsWith("\"") )
{
- StringBuffer buff = new StringBuffer(classpath);
+ StringBuilder buff = new StringBuilder(classpath);
buff.delete(0,1);
buff.delete( buff.length() - 1, buff.length() );
classpath = buff.toString();
diff --git a/main/scripting/workben/installer/InstUtil.java b/main/scripting/workben/installer/InstUtil.java
index 1e39badbea..3fc47e0c6b 100644
--- a/main/scripting/workben/installer/InstUtil.java
+++ b/main/scripting/workben/installer/InstUtil.java
@@ -34,10 +34,10 @@ public class InstUtil {
public static File buildSversionLocation() throws IOException {
File theFile = null;
- StringBuffer str = new StringBuffer();
+ StringBuilder str = new StringBuilder();
str.append(System.getProperty("user.home"));
str.append(File.separator);
- StringBuffer thePath = new StringBuffer(str.toString());
+ StringBuilder thePath = new StringBuilder(str.toString());
String os = System.getProperty("os.name");
@@ -133,10 +133,10 @@ public class InstUtil {
File theFile = null;
Properties results = new Properties();
- StringBuffer str = new StringBuffer();
+ StringBuilder str = new StringBuilder();
str.append(System.getProperty("user.home"));
str.append(File.separator);
- StringBuffer thePath = new StringBuffer(str.toString());
+ StringBuilder thePath = new StringBuilder(str.toString());
String os = System.getProperty("os.name");
@@ -191,10 +191,10 @@ public class InstUtil {
File theFile = null;
Properties results = new Properties();
- StringBuffer str = new StringBuffer();
+ StringBuilder str = new StringBuilder();
str.append(System.getProperty("user.home"));
str.append(File.separator);
- StringBuffer thePath = new StringBuffer(str.toString());
+ StringBuilder thePath = new StringBuilder(str.toString());
String os = System.getProperty("os.name");
thePath.append(".jedit");
diff --git a/main/scripting/workben/mod/_scripting/TestDataLoader.java b/main/scripting/workben/mod/_scripting/TestDataLoader.java
index 95f48f79e0..0d93f61f53 100644
--- a/main/scripting/workben/mod/_scripting/TestDataLoader.java
+++ b/main/scripting/workben/mod/_scripting/TestDataLoader.java
@@ -105,7 +105,7 @@ public class TestDataLoader {
if (tokens.countTokens() == 1)
value = tokens.nextToken();
else {
- StringBuffer buf = new StringBuffer(tokens.nextToken());
+ StringBuilder buf = new StringBuilder(tokens.nextToken());
while (tokens.hasMoreTokens())
buf.append(separator).append(tokens.nextToken());
value = buf.toString();
diff --git a/main/sw/qa/complex/writer/CheckBookmarks.java b/main/sw/qa/complex/writer/CheckBookmarks.java
index 2ea8088ca0..b2611c4508 100644
--- a/main/sw/qa/complex/writer/CheckBookmarks.java
+++ b/main/sw/qa/complex/writer/CheckBookmarks.java
@@ -66,7 +66,7 @@ class BookmarkHashes {
static public java.math.BigInteger getBookmarksHash(XTextDocument xDoc)
throws com.sun.star.uno.Exception, java.security.NoSuchAlgorithmException
{
- StringBuffer buffer = new StringBuffer("");
+ StringBuilder buffer = new StringBuilder("");
XBookmarksSupplier xBookmarksSupplier = UnoRuntime.queryInterface(
XBookmarksSupplier.class,
xDoc);
diff --git a/main/swext/mediawiki/src/com/sun/star/wiki/Helper.java b/main/swext/mediawiki/src/com/sun/star/wiki/Helper.java
index ab0c51da03..1b78307afe 100644
--- a/main/swext/mediawiki/src/com/sun/star/wiki/Helper.java
+++ b/main/swext/mediawiki/src/com/sun/star/wiki/Helper.java
@@ -448,7 +448,7 @@ public class Helper
InputStreamReader aInputReader = new InputStreamReader( new FileInputStream( aFile ), "UTF-8" );
BufferedReader aBufReader = new BufferedReader( aInputReader );
- StringBuffer aBuf = new StringBuffer();
+ StringBuilder aBuf = new StringBuilder();
String sEachLine = aBufReader.readLine();
while( sEachLine != null )
diff --git a/main/toolkit/test/accessibility/AccessibleRelationHandler.java b/main/toolkit/test/accessibility/AccessibleRelationHandler.java
index c59f0fa731..64f961b4a4 100644
--- a/main/toolkit/test/accessibility/AccessibleRelationHandler.java
+++ b/main/toolkit/test/accessibility/AccessibleRelationHandler.java
@@ -78,7 +78,7 @@ class AccessibleRelationHandler
{
AccessibleRelation aRelation = xRelation.getRelation( i );
- StringBuffer aBuffer = new StringBuffer();
+ StringBuilder aBuffer = new StringBuilder();
aBuffer.append (NameProvider.getRelationName (aRelation.RelationType));
aBuffer.append( ": " );
diff --git a/main/toolkit/test/accessibility/AccessibleTextHandler.java b/main/toolkit/test/accessibility/AccessibleTextHandler.java
index 6dd1e3e609..7752be458c 100644
--- a/main/toolkit/test/accessibility/AccessibleTextHandler.java
+++ b/main/toolkit/test/accessibility/AccessibleTextHandler.java
@@ -249,7 +249,7 @@ class AccessibleTextHandler extends NodeHandler
nChars = 30;
// build up string
- StringBuffer aChars = new StringBuffer();
+ StringBuilder aChars = new StringBuilder();
try
{
aChars.append( "[" );
@@ -281,7 +281,7 @@ class AccessibleTextHandler extends NodeHandler
* back and forth */
private String bounds( XAccessibleText xText )
{
- StringBuffer aBuffer = new StringBuffer( "bounds: " );
+ StringBuilder aBuffer = new StringBuilder( "bounds: " );
try
{
// iterate over characters
diff --git a/main/unodevtools/source/skeletonmaker/javacompskeleton.cxx b/main/unodevtools/source/skeletonmaker/javacompskeleton.cxx
index cb344eabfa..e3e5fb48e0 100644
--- a/main/unodevtools/source/skeletonmaker/javacompskeleton.cxx
+++ b/main/unodevtools/source/skeletonmaker/javacompskeleton.cxx
@@ -390,7 +390,7 @@ void generateXCompatibilityNamesBodies(std::ostream& o)
" com.sun.star.sheet.LocalizedName[] seqLocalizedNames =\n"
" new com.sun.star.sheet.LocalizedName[0];\n\n try {\n";
- o << " StringBuffer path = new StringBuffer(aProgrammaticName);\n"
+ o << " StringBuilder path = new StringBuilder(aProgrammaticName);\n"
" path.append(\"/CompatibilityName\");\n"
" String hname = path.toString();\n\n";
@@ -416,8 +416,8 @@ void generateXCompatibilityNamesBodies(std::ostream& o)
" if (nToken >= 1) aLocale.Language = tokens[0];\n"
" if (nToken >= 2) aLocale.Country = tokens[1];\n"
" if (nToken >= 3) {\n"
- " StringBuffer buf = \n"
- " new StringBuffer(tokens[2]);\n"
+ " StringBuilder buf = \n"
+ " new StringBuilder(tokens[2]);\n"
" for (int t=3; t < nToken; ++t)\n"
" buf.append(tokens[t]);\n\n"
" aLocale.Variant = buf.toString();\n"
@@ -660,7 +660,7 @@ void generateAddinConstructorAndHelper(std::ostream& o,
o << " String sReadOnlyView = "
"\"com.sun.star.configuration.ConfigurationAccess\";\n\n";
- o << " StringBuffer sPath = new StringBuffer(\n"
+ o << " StringBuilder sPath = new StringBuilder(\n"
" \"/org.openoffice.Office.CalcAddIns/AddInInfo/\");\n"
" sPath.append(sADDIN_SERVICENAME);\n"
" sPath.append(\"/AddInFunctions\");\n\n";
@@ -713,8 +713,8 @@ void generateAddinConstructorAndHelper(std::ostream& o,
o << " // addin configuration property helper function:\n"
" String getAddinProperty(String funcName, "
"String paramName, String propName)\n {\n"
- " try {\n StringBuffer buf = "
- "new StringBuffer(funcName);\n\n"
+ " try {\n StringBuilder buf = "
+ "new StringBuilder(funcName);\n\n"
" if (paramName.length() > 0) {\n"
" buf.append(\"/Parameters/\");\n"
" buf.append(paramName);\n }\n\n";
diff --git a/main/vcl/qa/complex/memCheck/CheckMemoryUsage.java b/main/vcl/qa/complex/memCheck/CheckMemoryUsage.java
index 36bd2c7ee6..98e0144257 100644
--- a/main/vcl/qa/complex/memCheck/CheckMemoryUsage.java
+++ b/main/vcl/qa/complex/memCheck/CheckMemoryUsage.java
@@ -398,7 +398,7 @@ public class CheckMemoryUsage
private String createModeName(String _sSub, int _nCount)
{
- StringBuffer aBuf = new StringBuffer();
+ StringBuilder aBuf = new StringBuilder();
aBuf.append(_sSub);
aBuf.append('_').append(m_sDocumentName).append('_').append(m_sExtension);
aBuf.append('_').append(_nCount);
diff --git a/main/wizards/com/sun/star/wizards/common/FileAccess.java b/main/wizards/com/sun/star/wizards/common/FileAccess.java
index fe121154f3..c4bd03a4d3 100644
--- a/main/wizards/com/sun/star/wizards/common/FileAccess.java
+++ b/main/wizards/com/sun/star/wizards/common/FileAccess.java
@@ -315,7 +315,7 @@ public class FileAccess
String sVariant = aLocale.Variant;
// de-DE-Bayrisch
- StringBuffer aLocaleAll = new StringBuffer();
+ StringBuilder aLocaleAll = new StringBuilder();
aLocaleAll.append(sLanguage).append('-').append(sCountry).append('-').append(sVariant);
String sPath = _sPath + "/" + aLocaleAll.toString();
@@ -327,7 +327,7 @@ public class FileAccess
}
// de-DE
- StringBuffer aLocaleLang_Country = new StringBuffer();
+ StringBuilder aLocaleLang_Country = new StringBuilder();
aLocaleLang_Country.append(sLanguage).append('-').append(sCountry);
sPath = _sPath + "/" + aLocaleLang_Country.toString();
@@ -337,7 +337,7 @@ public class FileAccess
}
// de
- StringBuffer aLocaleLang = new StringBuffer();
+ StringBuilder aLocaleLang = new StringBuilder();
aLocaleLang.append(sLanguage);
sPath = _sPath + "/" + aLocaleLang.toString();
diff --git a/main/wizards/com/sun/star/wizards/common/NumericalHelper.java b/main/wizards/com/sun/star/wizards/common/NumericalHelper.java
index f32232034a..92edabf68b 100644
--- a/main/wizards/com/sun/star/wizards/common/NumericalHelper.java
+++ b/main/wizards/com/sun/star/wizards/common/NumericalHelper.java
@@ -1367,11 +1367,11 @@ public class NumericalHelper
private static class TransformNumToHex
{
- private StringBuffer val;
+ private StringBuilder val;
public TransformNumToHex(long number)
{
- val = new StringBuffer();
+ val = new StringBuilder();
transform(number);
}
@@ -1544,7 +1544,7 @@ public class NumericalHelper
public static String getRomanEquivalent(int n)
throws Exception
{
- StringBuffer romanNumber = new StringBuffer();
+ StringBuilder romanNumber = new StringBuilder();
try
{
if (n > MAX_NUMBER || n < MIN_NUMBER)
@@ -1561,7 +1561,7 @@ public class NumericalHelper
int symbolIndex = 0;
for (int i = number.length() - 1; i >= 0; i--)
{
- StringBuffer romanDigit = new StringBuffer();
+ StringBuilder romanDigit = new StringBuilder();
int b = (int) number.charAt(i) - ASCII_CODE_0;
if (b == FOUR)
{ // special case IV
diff --git a/main/wizards/com/sun/star/wizards/db/SQLQueryComposer.java b/main/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
index a9d827f5ca..79236266c5 100644
--- a/main/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
+++ b/main/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
@@ -430,7 +430,7 @@ public class SQLQueryComposer
{
continue;
}
- final StringBuffer textualValue = new StringBuffer((String) structuredFilter[i][j].Value);
+ final StringBuilder textualValue = new StringBuilder((String) structuredFilter[i][j].Value);
switch (structuredFilter[i][j].Handle)
{
case SQLFilterOperator.EQUAL:
diff --git a/main/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java b/main/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java
index 1ff16c22d8..35d0d82015 100644
--- a/main/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java
+++ b/main/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java
@@ -706,7 +706,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter
protected String convertToFieldName(String _sElementName)
{
- final StringBuffer aDataField = new StringBuffer(32);
+ final StringBuilder aDataField = new StringBuilder(32);
aDataField.append("field:[").append(_sElementName).append(']');
return aDataField.toString();
@@ -1573,7 +1573,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter
m_aLabelWidthMap = new HashMap();
}
// At first, try to get the Width out of a HashMap (Cache)
- StringBuffer aKey = new StringBuffer(40);
+ StringBuilder aKey = new StringBuilder(40);
final String sKey = aKey.append(_sLabel).append(_nCharWeight).append(_nCharHeight).toString();
if (m_aLabelWidthMap.containsKey(sKey))
{
diff --git a/main/wizards/com/sun/star/wizards/ui/event/UnoDataAware.java b/main/wizards/com/sun/star/wizards/ui/event/UnoDataAware.java
index e92d8d8989..f722d6e2dd 100644
--- a/main/wizards/com/sun/star/wizards/ui/event/UnoDataAware.java
+++ b/main/wizards/com/sun/star/wizards/ui/event/UnoDataAware.java
@@ -84,7 +84,7 @@ public class UnoDataAware extends DataAware
{
if (value.getClass().isArray())
{
- StringBuffer sb = new StringBuffer("[");
+ StringBuilder sb = new StringBuilder("[");
for (int i = 0; i < ((short[]) value).length; i++)
{
sb.append(((short[]) value)[i]).append(" , ");
diff --git a/main/xmerge/java/aportisdoc/src/main/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocDecoder.java b/main/xmerge/java/aportisdoc/src/main/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocDecoder.java
index feadd97ad1..7689a0360a 100644
--- a/main/xmerge/java/aportisdoc/src/main/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocDecoder.java
+++ b/main/xmerge/java/aportisdoc/src/main/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocDecoder.java
@@ -73,7 +73,7 @@ final class DocDecoder implements DocConstants {
dumpHeader(header);
// store all the characters in textBuffer
- StringBuffer textBuffer = new StringBuffer(header.textLen);
+ StringBuilder textBuffer = new StringBuilder(header.textLen);
switch (header.version) {
diff --git a/main/xmerge/java/aportisdoc/src/main/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocEncoder.java b/main/xmerge/java/aportisdoc/src/main/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocEncoder.java
index 12ab9bd5af..f8a94bbbef 100644
--- a/main/xmerge/java/aportisdoc/src/main/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocEncoder.java
+++ b/main/xmerge/java/aportisdoc/src/main/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocEncoder.java
@@ -41,7 +41,7 @@ import org.openoffice.xmerge.converter.palm.Record;
final class DocEncoder implements DocConstants {
/** Text buffer to contain text section. */
- private StringBuffer textBuffer = null;
+ private StringBuilder textBuffer = null;
/** Length of text section. */
private int textLen = 0;
@@ -57,7 +57,7 @@ final class DocEncoder implements DocConstants {
*/
DocEncoder() {
- textBuffer = new StringBuffer(TEXT_RECORD_SIZE);
+ textBuffer = new StringBuilder(TEXT_RECORD_SIZE);
}
diff --git a/main/xmerge/java/aportisdoc/src/main/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentSerializerImpl.java b/main/xmerge/java/aportisdoc/src/main/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentSerializerImpl.java
index 178fad8032..271a2ff33b 100644
--- a/main/xmerge/java/aportisdoc/src/main/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentSerializerImpl.java
+++ b/main/xmerge/java/aportisdoc/src/main/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentSerializerImpl.java
@@ -273,7 +273,7 @@ public final class DocumentSerializerImpl
// this is for text:s tags.
NamedNodeMap map = node.getAttributes();
Node attr = map.getNamedItem(ATTRIBUTE_SPACE_COUNT);
- StringBuffer space = new StringBuffer(SPACE_CHAR);
+ StringBuilder space = new StringBuilder(SPACE_CHAR);
int count = 1;
if (attr != null) {
diff --git a/main/xmerge/java/pexcel/src/main/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PocketExcelEncoder.java b/main/xmerge/java/pexcel/src/main/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PocketExcelEncoder.java
index 6facd97cca..0ff2ce3594 100644
--- a/main/xmerge/java/pexcel/src/main/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PocketExcelEncoder.java
+++ b/main/xmerge/java/pexcel/src/main/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PocketExcelEncoder.java
@@ -107,8 +107,8 @@ final class PocketExcelEncoder extends SpreadsheetEncoder {
Debug.log(Debug.TRACE,"Strip Formula (Before) : " + formula);
- StringBuffer inFormula = new StringBuffer(formula);
- StringBuffer outFormula = new StringBuffer();
+ StringBuilder inFormula = new StringBuilder(formula);
+ StringBuilder outFormula = new StringBuilder();
boolean inBrace = false;
boolean firstCharAfterBrace = false;
diff --git a/main/xmerge/java/pexcel/src/main/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaHelper.java b/main/xmerge/java/pexcel/src/main/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaHelper.java
index fcd3bea254..d586061571 100644
--- a/main/xmerge/java/pexcel/src/main/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaHelper.java
+++ b/main/xmerge/java/pexcel/src/main/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaHelper.java
@@ -100,7 +100,7 @@ public class FormulaHelper {
Vector parseTokens = decoder.getTokenVector(formula);
Vector infixTokens = compiler.RPN2Infix(parseTokens);
- StringBuffer buff = new StringBuffer();
+ StringBuilder buff = new StringBuilder();
for (Enumeration e = infixTokens.elements();e.hasMoreElements();) {
Token t = (Token)e.nextElement();
buff.append(t.toString());
diff --git a/main/xmerge/java/pexcel/src/main/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaParser.java b/main/xmerge/java/pexcel/src/main/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaParser.java
index 181b65098d..333cbc0213 100644
--- a/main/xmerge/java/pexcel/src/main/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaParser.java
+++ b/main/xmerge/java/pexcel/src/main/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaParser.java
@@ -479,7 +479,7 @@ public class FormulaParser {
private void expression() throws FormulaParsingException {
if (look == '"') { //Extract a quoted string...
- StringBuffer buff = new StringBuffer();
+ StringBuilder buff = new StringBuilder();
boolean success = true;
success = getChar();
while (look != '"' && success) {
@@ -545,7 +545,7 @@ public class FormulaParser {
}
private String makeErrorString() {
- StringBuffer buff = new StringBuffer();
+ StringBuilder buff = new StringBuilder();
for (int i=0; i<index-1; i++) {
buff.append(' ');
}
diff --git a/main/xmerge/java/pexcel/src/main/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenDecoder.java b/main/xmerge/java/pexcel/src/main/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenDecoder.java
index 959bb4bf46..384f651d31 100644
--- a/main/xmerge/java/pexcel/src/main/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenDecoder.java
+++ b/main/xmerge/java/pexcel/src/main/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenDecoder.java
@@ -192,7 +192,7 @@ public class TokenDecoder {
Debug.log(Debug.TRACE,"Expected " + len + " bytes. Could only read " + numRead + " bytes.");
//throw new IOException("Expected " + len + " bytes. Could only read " + numRead + " bytes.");
}
- StringBuffer outputString = new StringBuffer();
+ StringBuilder outputString = new StringBuilder();
outputString.append('"');
try {
Debug.log(Debug.TRACE,"Using LE encoding");
diff --git a/main/xmerge/java/pocketword/src/main/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentSerializerImpl.java b/main/xmerge/java/pocketword/src/main/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentSerializerImpl.java
index 216cfc775b..7a22f8ec4b 100644
--- a/main/xmerge/java/pocketword/src/main/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentSerializerImpl.java
+++ b/main/xmerge/java/pocketword/src/main/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentSerializerImpl.java
@@ -279,7 +279,7 @@ public final class DocumentSerializerImpl
case Node.ELEMENT_NODE:
if (child.getNodeName().equals(TAG_SPACE)) {
- StringBuffer sb = new StringBuffer("");
+ StringBuilder sb = new StringBuilder("");
int count = 1;
NamedNodeMap map = child.getAttributes();
diff --git a/main/xmerge/java/pocketword/src/main/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/Paragraph.java b/main/xmerge/java/pocketword/src/main/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/Paragraph.java
index 5530a2cb31..2c8762f570 100644
--- a/main/xmerge/java/pocketword/src/main/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/Paragraph.java
+++ b/main/xmerge/java/pocketword/src/main/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/Paragraph.java
@@ -172,7 +172,7 @@ class Paragraph implements PocketWordConstants {
int totalLength = data.length;
- StringBuffer sb = new StringBuffer("");
+ StringBuilder sb = new StringBuilder("");
// Setup text style information
int mask = TextStyle.BOLD | TextStyle.ITALIC | TextStyle.UNDERLINE
@@ -200,7 +200,7 @@ class Paragraph implements PocketWordConstants {
if (sawText) {
// Style change so dump previous segment and style info
addTextSegment(sb.toString(), ts);
- sb = new StringBuffer("");
+ sb = new StringBuilder("");
sawText = false;
}
@@ -655,7 +655,7 @@ class Paragraph implements PocketWordConstants {
// In courier, can have no more than 29 chars per line
int chunkStart = 0;
- StringBuffer sb = new StringBuffer("");
+ StringBuilder sb = new StringBuilder("");
// Line Descriptor info should be eliminated each time
lineDescriptors = new Vector(1, 1);
diff --git a/main/xmerge/java/xmerge/src/main/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java b/main/xmerge/java/xmerge/src/main/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java
index 573baab580..8cfba9e03e 100644
--- a/main/xmerge/java/xmerge/src/main/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java
+++ b/main/xmerge/java/xmerge/src/main/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java
@@ -1041,7 +1041,7 @@ public abstract class OfficeDocument
private static Reader hack(InputStream is) throws IOException {
BufferedReader br = new BufferedReader(new InputStreamReader(is, "UTF-8"));
- StringBuffer buffer = new StringBuffer();
+ StringBuilder buffer = new StringBuilder();
String str = null;
@@ -1109,7 +1109,7 @@ public abstract class OfficeDocument
BufferedReader br = new BufferedReader(new InputStreamReader(is, "UTF-8"));
char[] charArray = new char[4096];
- StringBuffer sBuf = new StringBuffer();
+ StringBuilder sBuf = new StringBuilder();
int n = 0;
while ((n=br.read(charArray, 0, charArray.length)) > 0)
sBuf.append(charArray, 0, n);
diff --git a/main/xmerge/java/xmerge/src/main/java/org/openoffice/xmerge/converter/xml/OfficeDocumentException.java b/main/xmerge/java/xmerge/src/main/java/org/openoffice/xmerge/converter/xml/OfficeDocumentException.java
index c31cf11e92..a0e01b4ab1 100644
--- a/main/xmerge/java/xmerge/src/main/java/org/openoffice/xmerge/converter/xml/OfficeDocumentException.java
+++ b/main/xmerge/java/xmerge/src/main/java/org/openoffice/xmerge/converter/xml/OfficeDocumentException.java
@@ -40,7 +40,7 @@ import org.openoffice.xmerge.util.Resources;
public final class OfficeDocumentException extends IOException {
- StringBuffer message = null;
+ StringBuilder message = null;
/**
@@ -51,7 +51,7 @@ public final class OfficeDocumentException extends IOException {
*/
public OfficeDocumentException(SAXException e) {
super(e.toString());
- message = new StringBuffer();
+ message = new StringBuilder();
if (e instanceof SAXParseException) {
String msgParseError =
Resources.getInstance().getString("PARSE_ERROR");
diff --git a/main/xmerge/java/xmerge/src/main/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentSerializer.java b/main/xmerge/java/xmerge/src/main/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentSerializer.java
index 7d9d4c3a30..568f95351d 100644
--- a/main/xmerge/java/xmerge/src/main/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentSerializer.java
+++ b/main/xmerge/java/xmerge/src/main/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentSerializer.java
@@ -821,7 +821,7 @@ public abstract class SxcDocumentSerializer implements OfficeConstants,
int len = nodeList.getLength();
- StringBuffer buffer = new StringBuffer();
+ StringBuilder buffer = new StringBuilder();
for (int i = 0; i < len; i++) {
diff --git a/main/xmerge/java/xmerge/src/main/java/org/openoffice/xmerge/merger/diff/CharacterParser.java b/main/xmerge/java/xmerge/src/main/java/org/openoffice/xmerge/merger/diff/CharacterParser.java
index c965258ad9..981208cd25 100644
--- a/main/xmerge/java/xmerge/src/main/java/org/openoffice/xmerge/merger/diff/CharacterParser.java
+++ b/main/xmerge/java/xmerge/src/main/java/org/openoffice/xmerge/merger/diff/CharacterParser.java
@@ -89,7 +89,7 @@ public class CharacterParser {
private void parseNodes() {
- StringBuffer strBuf = new StringBuffer();
+ StringBuilder strBuf = new StringBuilder();
/* create the character array by iterate the textnode iterator */
Node currentNode = (Node)(textNodes.start());
diff --git a/main/xmerge/java/xmerge/src/main/java/org/openoffice/xmerge/util/Debug.java b/main/xmerge/java/xmerge/src/main/java/org/openoffice/xmerge/util/Debug.java
index a6fddddc12..eaeb5e8503 100644
--- a/main/xmerge/java/xmerge/src/main/java/org/openoffice/xmerge/util/Debug.java
+++ b/main/xmerge/java/xmerge/src/main/java/org/openoffice/xmerge/util/Debug.java
@@ -317,7 +317,7 @@ public final class Debug {
*/
public static String byteArrayToHexString(byte bytes[]) {
- StringBuffer buff = new StringBuffer();
+ StringBuilder buff = new StringBuilder();
for (int i = 0; i < bytes.length; i++) {
diff --git a/main/xmerge/java/xmerge/src/main/java/org/openoffice/xmerge/util/XmlUtil.java b/main/xmerge/java/xmerge/src/main/java/org/openoffice/xmerge/util/XmlUtil.java
index 394e7bf9f4..c2fa62806f 100644
--- a/main/xmerge/java/xmerge/src/main/java/org/openoffice/xmerge/util/XmlUtil.java
+++ b/main/xmerge/java/xmerge/src/main/java/org/openoffice/xmerge/util/XmlUtil.java
@@ -173,7 +173,7 @@ public final class XmlUtil {
break;
}
- StringBuffer buffer = new StringBuffer("name=\"");
+ StringBuilder buffer = new StringBuilder("name=\"");
buffer.append(node.getNodeName());
buffer.append("\" type=\"");
buffer.append(str);
diff --git a/main/xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/MinicalcEncoder.java b/main/xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/MinicalcEncoder.java
index d81ece97cc..b53e379ef8 100644
--- a/main/xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/MinicalcEncoder.java
+++ b/main/xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/MinicalcEncoder.java
@@ -199,8 +199,8 @@ final class MinicalcEncoder extends SpreadsheetEncoder {
*/
protected String parseFormula(String formula) {
- StringBuffer inFormula = new StringBuffer(formula);
- StringBuffer outFormula = new StringBuffer();
+ StringBuilder inFormula = new StringBuilder(formula);
+ StringBuilder outFormula = new StringBuilder();
boolean inBrace = false;
boolean firstCharAfterBrace = false;
diff --git a/main/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/DocumentSerializerImpl.java b/main/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/DocumentSerializerImpl.java
index d971740784..b308c6db8f 100644
--- a/main/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/DocumentSerializerImpl.java
+++ b/main/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/DocumentSerializerImpl.java
@@ -297,7 +297,7 @@ implements OfficeConstants, DocumentSerializer {
// this is for text:s tags.
NamedNodeMap map = child.getAttributes();
Node attr = map.getNamedItem(ATTRIBUTE_SPACE_COUNT);
- StringBuffer space = new StringBuffer(" ");
+ StringBuilder space = new StringBuilder(" ");
int count = 1;
if (attr != null) {
diff --git a/main/xmlsecurity/tools/uno/TestTool.java b/main/xmlsecurity/tools/uno/TestTool.java
index 008bf5b592..40b1d20e00 100644
--- a/main/xmlsecurity/tools/uno/TestTool.java
+++ b/main/xmlsecurity/tools/uno/TestTool.java
@@ -888,7 +888,7 @@ public class TestTool extends JFrame implements ActionListener
try
{
fis = new FileInputStream(f);
- StringBuffer commandBuffer = new StringBuffer();
+ StringBuilder commandBuffer = new StringBuilder();
m_logFileOutputStream = new FileOutputStream("TestTool-log.txt");
m_bIsBatchRunning = true;
@@ -967,7 +967,7 @@ public class TestTool extends JFrame implements ActionListener
m_logFileOutputStream.write("command end \n\n".getBytes());
}
- commandBuffer = new StringBuffer();
+ commandBuffer = new StringBuilder();
}
}
diff --git a/test/testcommon/source/org/openoffice/test/common/FileUtil.java b/test/testcommon/source/org/openoffice/test/common/FileUtil.java
index c3231e41e2..3bcbf14d62 100644
--- a/test/testcommon/source/org/openoffice/test/common/FileUtil.java
+++ b/test/testcommon/source/org/openoffice/test/common/FileUtil.java
@@ -281,7 +281,7 @@ public class FileUtil {
}
public static String readStreamAsString(InputStream inputStream, String charsetName) {
- StringBuffer strBuffer = new StringBuffer(10240);
+ StringBuilder strBuffer = new StringBuilder(10240);
BufferedReader reader = null;
try {
reader = new BufferedReader(charsetName == null ? new InputStreamReader(inputStream) : new InputStreamReader(inputStream, charsetName));
diff --git a/test/testcommon/source/org/openoffice/test/common/Installer.java b/test/testcommon/source/org/openoffice/test/common/Installer.java
index 8ce2d61f08..011c62f2df 100644
--- a/test/testcommon/source/org/openoffice/test/common/Installer.java
+++ b/test/testcommon/source/org/openoffice/test/common/Installer.java
@@ -101,7 +101,7 @@ public class Installer implements Runnable {
FileUtil.deleteFile(installTempDir);
installTempDir.mkdirs();
if (packFile.getName().endsWith(".gz")) {
- StringBuffer output = new StringBuffer();
+ StringBuilder output = new StringBuilder();
if (SystemUtil.exec(new String[] { "tar", "-zxpf", packFile.getAbsolutePath(), "-C", installTempDir.getAbsolutePath() }, output) != 0)
throw new RuntimeException(MessageFormat.format("{0} can not be installed! Cause: {1}", packFile, output));
} else {
diff --git a/test/testcommon/source/org/openoffice/test/common/ReportUploader.java b/test/testcommon/source/org/openoffice/test/common/ReportUploader.java
index 5195076476..ee24665177 100644
--- a/test/testcommon/source/org/openoffice/test/common/ReportUploader.java
+++ b/test/testcommon/source/org/openoffice/test/common/ReportUploader.java
@@ -94,7 +94,7 @@ public class ReportUploader extends RunListener {
out = connection.getOutputStream();
fis = new FileInputStream(reportZip);
- StringBuffer params = new StringBuffer();
+ StringBuilder params = new StringBuilder();
params.append(prefix + boundary + newLine);
params.append("Content-Disposition: form-data; name=\"name\"");
params.append(newLine + newLine);
diff --git a/test/testcommon/source/org/openoffice/test/common/StreamPump.java b/test/testcommon/source/org/openoffice/test/common/StreamPump.java
index 67f6b27991..b4a3469869 100644
--- a/test/testcommon/source/org/openoffice/test/common/StreamPump.java
+++ b/test/testcommon/source/org/openoffice/test/common/StreamPump.java
@@ -26,14 +26,14 @@ import java.io.InputStream;
import java.io.InputStreamReader;
/**
- * Pump data from input stream into a StringBuffer
+ * Pump data from input stream into a StringBuilder
*
*/
public class StreamPump extends Thread {
- StringBuffer stringBuffer = null;
+ StringBuilder stringBuffer = null;
InputStream inputStream = null;
- public StreamPump(StringBuffer stringBuffer, InputStream inputStream) {
+ public StreamPump(StringBuilder stringBuffer, InputStream inputStream) {
this.stringBuffer = stringBuffer;
this.inputStream = inputStream;
}
diff --git a/test/testcommon/source/org/openoffice/test/common/SystemUtil.java b/test/testcommon/source/org/openoffice/test/common/SystemUtil.java
index 038e11ba47..a0a6f1bfca 100644
--- a/test/testcommon/source/org/openoffice/test/common/SystemUtil.java
+++ b/test/testcommon/source/org/openoffice/test/common/SystemUtil.java
@@ -66,7 +66,7 @@ public class SystemUtil {
static {
if (isLinux()) {
- StringBuffer output = new StringBuffer();
+ StringBuilder output = new StringBuilder();
if (exec(new String[]{"lsb_release", "-is"}, output) == 0)
osName = output.toString().trim();
output.setLength(0);
@@ -180,7 +180,7 @@ public class SystemUtil {
* @return
*/
public static int execScript(String content) {
- StringBuffer output = new StringBuffer();
+ StringBuilder output = new StringBuilder();
int code = execScript(content, output, output);
LOG.info(content + "\n" + "Exit Code: " + code + "\n" + output);
return code;
@@ -193,7 +193,7 @@ public class SystemUtil {
* @param error
* @return
*/
- public static int execScript(String content, StringBuffer output, StringBuffer error) {
+ public static int execScript(String content, StringBuilder output, StringBuilder error) {
File file = null;
try {
file = FileUtil.getUniqueFile(SCRIPT_TEMP_DIR, "tempscript", ".bat");
@@ -221,7 +221,7 @@ public class SystemUtil {
* @param error
* @return
*/
- public static Process backgroundExec(String[] cmd, String[] env, File dir, StringBuffer output, StringBuffer error) {
+ public static Process backgroundExec(String[] cmd, String[] env, File dir, StringBuilder output, StringBuilder error) {
try {
Process process = Runtime.getRuntime().exec(cmd, env, dir);
StreamPump inputPump = new StreamPump(output, process.getInputStream());
@@ -243,7 +243,7 @@ public class SystemUtil {
* @param error
* @return
*/
- public static int exec(String[] cmd, String[] env, File dir, StringBuffer output, StringBuffer error) {
+ public static int exec(String[] cmd, String[] env, File dir, StringBuilder output, StringBuilder error) {
Process process = null;
try {
LOG.log(Level.FINE, "exec: " + Arrays.toString(cmd));
@@ -268,7 +268,7 @@ public class SystemUtil {
}
}
- public static int exec(String[] cmd, StringBuffer output) {
+ public static int exec(String[] cmd, StringBuilder output) {
return exec(cmd, null, null, output, output);
}
@@ -292,7 +292,7 @@ public class SystemUtil {
public static List<HashMap<String, Object>> getProcesses() {
List<HashMap<String, Object>> ret = new ArrayList<HashMap<String, Object>>();
try {
- StringBuffer output = new StringBuffer();
+ StringBuilder output = new StringBuilder();
if (isWindows()) {
File file = new File(SCRIPT_TEMP_DIR, "ps.vbs");
// if (!file.exists()) {
@@ -317,7 +317,7 @@ public class SystemUtil {
while ((line = reader.readLine()) != null) {
HashMap<String, Object> p = new HashMap<String, Object>();
StringTokenizer tokenizer = new StringTokenizer(line, " ", true);
- StringBuffer last = new StringBuffer();
+ StringBuilder last = new StringBuilder();
int col = 0;
while (tokenizer.hasMoreTokens()) {
String token = tokenizer.nextToken();
@@ -395,7 +395,7 @@ public class SystemUtil {
*/
public static HashMap<String, Object> getProcessPerfData(String processId) {
try {
- StringBuffer output = new StringBuffer();
+ StringBuilder output = new StringBuilder();
if (isWindows()) {
File file = new File(SCRIPT_TEMP_DIR, "pps.vbs");
String contents = "Set wmi=GetObject(\"Winmgmts:\")\n\r"
@@ -480,7 +480,7 @@ public class SystemUtil {
ArrayList<String> arguments = new ArrayList<String>();
StringTokenizer tokenizer = new StringTokenizer(line, "\"\' ", true);
int state = 0;
- StringBuffer current = new StringBuffer();
+ StringBuilder current = new StringBuilder();
while (tokenizer.hasMoreTokens()) {
String token = tokenizer.nextToken();
switch (state) {
@@ -506,7 +506,7 @@ public class SystemUtil {
} else if (" ".equals(token)) {
if (current.length() > 0) {
arguments.add(current.toString());
- current = new StringBuffer();
+ current = new StringBuilder();
}
} else {
current.append(token);
diff --git a/test/testcommon/source/org/openoffice/test/vcl/client/VclHookException.java b/test/testcommon/source/org/openoffice/test/vcl/client/VclHookException.java
index 6c70261c6b..7754793043 100644
--- a/test/testcommon/source/org/openoffice/test/vcl/client/VclHookException.java
+++ b/test/testcommon/source/org/openoffice/test/vcl/client/VclHookException.java
@@ -353,7 +353,7 @@ public class VclHookException extends RuntimeException {
Pattern pattern = Pattern.compile("\\(\\$([^\\)]*)\\)");
Matcher matcher = pattern.matcher(originalMsg);
- StringBuffer result = new StringBuffer();
+ StringBuilder result = new StringBuilder();
while (matcher.find()) {
String rep = properties.getProperty(matcher.group(1), matcher.group()).replace("$", "\\$");
matcher.appendReplacement(result, rep);
diff --git a/test/testuno/source/testlib/uno/DBUtil.java b/test/testuno/source/testlib/uno/DBUtil.java
index 0d19898ef3..337befcf8b 100644
--- a/test/testuno/source/testlib/uno/DBUtil.java
+++ b/test/testuno/source/testlib/uno/DBUtil.java
@@ -123,7 +123,7 @@ public class DBUtil {
*/
static public void dropTable(final String _name, final boolean _ifExists)
throws SQLException {
- final StringBuffer dropStatement = new StringBuffer("DROP TABLE \"");
+ final StringBuilder dropStatement = new StringBuilder("DROP TABLE \"");
dropStatement.append(_name);
if (_ifExists) {
dropStatement.append("\" IF EXISTS");
@@ -145,7 +145,7 @@ public class DBUtil {
*/
static public void createTable(String _name, HsqlColumnDescriptor[] _columns)
throws SQLException {
- StringBuffer createStatement = new StringBuffer(
+ StringBuilder createStatement = new StringBuilder(
"CREATE CACHED TABLE \"");
createStatement.append(_name);
createStatement.append("\" ( ");
@@ -187,7 +187,7 @@ public class DBUtil {
foreignKeysForTable += "\"" + columns[i].getName() + "\"";
foreignKeys.put(foreignTable, foreignKeysForTable);
- final StringBuffer foreignKeyRefsForTable = new StringBuffer(
+ final StringBuilder foreignKeyRefsForTable = new StringBuilder(
foreignKeyRefs.containsKey(foreignTable) ? (String) foreignKeyRefs
.get(foreignTable) : "");
if (foreignKeyRefsForTable.length() > 0) {
diff --git a/test/testuno/source/testlib/uno/TestUtil.java b/test/testuno/source/testlib/uno/TestUtil.java
index d41c1a0c77..1bac79b723 100644
--- a/test/testuno/source/testlib/uno/TestUtil.java
+++ b/test/testuno/source/testlib/uno/TestUtil.java
@@ -172,7 +172,7 @@ public class TestUtil {
* @return
*/
public static String connectByOperator(double[] number, String operator) throws Exception{
- StringBuffer buffer = new StringBuffer();
+ StringBuilder buffer = new StringBuilder();
for (int i = 0; i < number.length; i++) {
buffer.append(number[i]);
(openoffice) 03/19: vcl: GTK upgrade - replace direct widget struct access with public APIs
Posted by ji...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jimjag pushed a commit to branch AOO50X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 2f8cc657ee18c03d027f1602f71b13c142366c06
Author: Pedro Giffuni <pf...@apache.org>
AuthorDate: Thu Sep 24 21:11:48 2026 -0500
vcl: GTK upgrade - replace direct widget struct access with public APIs
Replace direct access to GTK internal struct members (m_pWindow->window,
->style) with public GTK2 APIs (gtk_widget_get_window, gtk_widget_get_style)
through safe accessor methods getGdkWindow() and getXWindow() on GtkSalFrame.
- Add getGdkWindow()/getXWindow() accessors on GtkSalFrame with null guards
- Update GtkSalGraphics::GetGdkWindow() to use gtk_widget_get_window()
- Remove unused GetGtkWidget() (0 callers)
- Replace all m_pWindow->window accesses with getGdkWindow()/getXWindow()
- Replace GTK_WIDGET(m_pWindow)->window with GetGdkWindow()
- Replace m_pWindow->style with gtk_widget_get_style()
- Replace m_pSocket->window with gtk_widget_get_window(m_pSocket)
- Replace GDK_WINDOW_XWINDOW(GTK_WIDGET(pParent->getWindow())->window) with
pParent->getXWindow()
- Add DeInit() call before graphics deletion in GraphicsHolder destructor
- Sync window/drawable when returning existing cached graphics instance
- Detach/resync all allocated graphics (pGraphics != NULL), not just bInUse,
in createNewWindow() and moveToScreen()
- Reset m_pWindow = NULL in GtkSalGraphics destructor
- Guard gdkDrawable and GetGdkWindow() against NULL to prevent painting when
widget is unmapped or destroyed
(cherry picked from commit 36a7f761274e9e8303baaeefd1658f24d3b410f1)
---
main/vcl/inc/unx/gtk/gtkframe.hxx | 6 ++
main/vcl/inc/unx/gtk/gtkgdi.hxx | 3 +-
main/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 12 +++-
main/vcl/unx/gtk/window/gtkframe.cxx | 89 +++++++++++++++------------
main/vcl/unx/gtk/window/gtkobject.cxx | 8 +--
5 files changed, 68 insertions(+), 50 deletions(-)
diff --git a/main/vcl/inc/unx/gtk/gtkframe.hxx b/main/vcl/inc/unx/gtk/gtkframe.hxx
index a948ffdd2f..465db520a0 100644
--- a/main/vcl/inc/unx/gtk/gtkframe.hxx
+++ b/main/vcl/inc/unx/gtk/gtkframe.hxx
@@ -279,6 +279,12 @@ public:
GtkSalDisplay* getDisplay();
GdkDisplay* getGdkDisplay();
GtkWidget* getWindow() const { return m_pWindow; }
+ GdkWindow* getGdkWindow() const { return m_pWindow ? gtk_widget_get_window( m_pWindow ) : NULL; }
+ XLIB_Window getXWindow() const
+ {
+ GdkWindow* pWin = getGdkWindow();
+ return pWin ? GDK_WINDOW_XWINDOW( pWin ) : None;
+ }
GtkFixed* getFixedContainer() const { return m_pFixedContainer; }
GdkWindow* getForeignParent() const { return m_pForeignParent; }
GdkNativeWindow getForeignParentWindow() const { return m_aForeignParentWindow; }
diff --git a/main/vcl/inc/unx/gtk/gtkgdi.hxx b/main/vcl/inc/unx/gtk/gtkgdi.hxx
index 8a9aca4a06..5f22658cc6 100644
--- a/main/vcl/inc/unx/gtk/gtkgdi.hxx
+++ b/main/vcl/inc/unx/gtk/gtkgdi.hxx
@@ -43,8 +43,7 @@ public:
{}
virtual ~GtkSalGraphics();
- inline GtkWidget* GetGtkWidget() const { return m_pWindow; }
- inline GdkWindow* GetGdkWindow() const { return m_pWindow->window; }
+ inline GdkWindow* GetGdkWindow() const { return m_pWindow ? gtk_widget_get_window( m_pWindow ) : NULL; }
inline GtkSalFrame* GetGtkFrame() const { return static_cast<GtkSalFrame*>(m_pFrame); }
void SetWindow( GtkWidget* window ) { m_pWindow = window; }
diff --git a/main/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/main/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index bbd90a254b..e5dd8a36c0 100644
--- a/main/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/main/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -52,6 +52,7 @@ sal_Bool GtkSalGraphics::bNeedButtonStyleAsEditBackgroundWorkaround = sal_False;
GtkSalGraphics::~GtkSalGraphics()
{
+ m_pWindow = NULL;
}
@@ -494,7 +495,7 @@ void GtkSalGraphics::copyBits( const SalTwoRect& rPosAry,
if( pFrame && m_pWindow )
{
/* #i64117# some themes set the background pixmap VERY frequently */
- GdkWindow* pWin = GTK_WIDGET(m_pWindow)->window;
+ GdkWindow* pWin = GetGdkWindow();
if( pWin )
{
aWin = GDK_WINDOW_XWINDOW(pWin);
@@ -738,6 +739,8 @@ sal_Bool GtkSalGraphics::drawNativeControl( ControlType nType,
clipList aClip;
GdkDrawable* gdkDrawable = GDK_DRAWABLE( GetGdkWindow() );
+ if( !gdkDrawable )
+ return sal_False;
GdkPixmap* pixmap = NULL;
Rectangle aPixmapRect;
if( ( bNeedPixmapPaint )
@@ -2321,7 +2324,7 @@ sal_Bool GtkSalGraphics::NWPaintGTKTabItem( ControlType nType, ControlPart,
paintRect.width = pixmapRect.GetWidth();
paintRect.height = pixmapRect.GetHeight();
- gtk_paint_flat_box( m_pWindow->style, pixmap, GTK_STATE_NORMAL,
+ gtk_paint_flat_box( gtk_widget_get_style( m_pWindow ), pixmap, GTK_STATE_NORMAL,
GTK_SHADOW_NONE, &paintRect, m_pWindow, "base", 0, 0, -1, -1);
NWSetWidgetState( gWidgetData[m_nScreen].gNotebookWidget, nState, stateType );
@@ -3628,7 +3631,10 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings )
GdkPixmap* GtkSalGraphics::NWGetPixmapFromScreen( Rectangle srcRect )
{
// Create a new pixmap to hold the composite of the window background and the control
- GdkPixmap * pPixmap = gdk_pixmap_new( GDK_DRAWABLE(GetGdkWindow()), srcRect.GetWidth(), srcRect.GetHeight(), -1 );
+ GdkWindow* pWin = GetGdkWindow();
+ if( !pWin )
+ return NULL;
+ GdkPixmap * pPixmap = gdk_pixmap_new( GDK_DRAWABLE(pWin), srcRect.GetWidth(), srcRect.GetHeight(), -1 );
GdkGC * pPixmapGC = gdk_gc_new( pPixmap );
if( !pPixmap || !pPixmapGC )
diff --git a/main/vcl/unx/gtk/window/gtkframe.cxx b/main/vcl/unx/gtk/window/gtkframe.cxx
index 67cb16d5f3..3e9cc9c4b1 100644
--- a/main/vcl/unx/gtk/window/gtkframe.cxx
+++ b/main/vcl/unx/gtk/window/gtkframe.cxx
@@ -377,6 +377,8 @@ void GtkSalFrame::doKeyCallback( guint state,
GtkSalFrame::GraphicsHolder::~GraphicsHolder()
{
+ if( pGraphics )
+ pGraphics->DeInit();
delete pGraphics;
}
@@ -424,8 +426,8 @@ GtkSalFrame::~GtkSalFrame()
m_pParent->m_aChildren.remove( this );
// Early explicit removal of registered native and foreign window IDs
- if( m_pWindow && m_pWindow->window )
- getDisplay()->deregisterFrameWindow( GDK_WINDOW_XWINDOW(m_pWindow->window), this );
+ if( m_pWindow && getGdkWindow() )
+ getDisplay()->deregisterFrameWindow( getXWindow(), this );
if( m_aForeignParentWindow != None )
getDisplay()->deregisterFrameWindow( (XLIB_Window)m_aForeignParentWindow, this );
if( m_aForeignTopLevelWindow != None )
@@ -440,7 +442,7 @@ GtkSalFrame::~GtkSalFrame()
if( m_hBackgroundPixmap )
{
XSetWindowBackgroundPixmap( getDisplay()->GetDisplay(),
- GDK_WINDOW_XWINDOW(m_pWindow->window),
+ getXWindow(),
None );
XFreePixmap( getDisplay()->GetDisplay(), m_hBackgroundPixmap );
}
@@ -603,8 +605,8 @@ void GtkSalFrame::InitCommon()
SalDisplay* pDisp = GetX11SalData()->GetDisplay();
m_aSystemData.nSize = sizeof( SystemChildData );
m_aSystemData.pDisplay = pDisp->GetDisplay();
- if( m_pWindow && m_pWindow->window )
- m_aSystemData.aWindow = GDK_WINDOW_XWINDOW(m_pWindow->window);
+ if( m_pWindow && getGdkWindow() )
+ m_aSystemData.aWindow = getXWindow();
else
m_aSystemData.aWindow = None;
m_aSystemData.pSalFrame = this;
@@ -661,7 +663,7 @@ void GtkSalFrame::InitCommon()
* some paint issues
*/
XSetWindowBackgroundPixmap( getDisplay()->GetDisplay(),
- GDK_WINDOW_XWINDOW(m_pWindow->window),
+ getXWindow(),
m_hBackgroundPixmap );
}
@@ -965,7 +967,7 @@ void GtkSalFrame::Init( SystemParentData* pSysData )
if( ! m_bWindowIsGtkPlug )
{
XReparentWindow( getDisplay()->GetDisplay(),
- GDK_WINDOW_XWINDOW(m_pWindow->window),
+ getXWindow(),
(XLIB_Window)pSysData->aWindow,
0, 0 );
}
@@ -1006,7 +1008,7 @@ void GtkSalFrame::SetExtendedFrameStyle( SalExtStyle nStyle )
pClass->res_name = const_cast<char*>(aResHint.getStr());
pClass->res_class = const_cast<char*>(X11SalData::getFrameClassName());
XSetClassHint( getDisplay()->GetDisplay(),
- GDK_WINDOW_XWINDOW(m_pWindow->window),
+ getXWindow(),
pClass );
XFree( pClass );
}
@@ -1030,7 +1032,12 @@ SalGraphics* GtkSalFrame::GetGraphics()
if( ! m_aGraphics[i].pGraphics )
{
m_aGraphics[i].pGraphics = new GtkSalGraphics( m_pWindow );
- m_aGraphics[i].pGraphics->Init( this, GDK_WINDOW_XWINDOW(m_pWindow->window), m_nScreen );
+ m_aGraphics[i].pGraphics->Init( this, getXWindow(), m_nScreen );
+ }
+ else
+ {
+ m_aGraphics[i].pGraphics->SetWindow( m_pWindow );
+ m_aGraphics[i].pGraphics->SetDrawable( getXWindow(), m_nScreen );
}
return m_aGraphics[i].pGraphics;
}
@@ -1772,8 +1779,8 @@ void GtkSalFrame::moveToScreen( int nScreen )
gtk_widget_realize( m_pWindow );
// update system data
GtkSalDisplay* pDisp = getDisplay();
- if( m_pWindow && m_pWindow->window )
- m_aSystemData.aWindow = GDK_WINDOW_XWINDOW(m_pWindow->window);
+ if( m_pWindow && getGdkWindow() )
+ m_aSystemData.aWindow = getXWindow();
else
m_aSystemData.aWindow = None;
m_aSystemData.pVisual = pDisp->GetVisual( m_nScreen ).GetVisual();
@@ -1787,8 +1794,8 @@ void GtkSalFrame::moveToScreen( int nScreen )
// update graphics if necessary
for( unsigned int i = 0; i < sizeof(m_aGraphics)/sizeof(m_aGraphics[0]); i++ )
{
- if( m_aGraphics[i].bInUse )
- m_aGraphics[i].pGraphics->SetDrawable( GDK_WINDOW_XWINDOW(m_pWindow->window), m_nScreen );
+ if( m_aGraphics[i].pGraphics )
+ m_aGraphics[i].pGraphics->SetDrawable( getXWindow(), m_nScreen );
}
updateScreenNumber();
}
@@ -2092,7 +2099,7 @@ void GtkSalFrame::StartPresentation( sal_Bool bStart )
}
#ifdef ENABLE_DBUS
m_nGSMCookie = dbus_inhibit_gsm(g_get_application_name(), "presentation",
- GDK_WINDOW_XID(m_pWindow->window));
+ getXWindow());
#endif
}
else
@@ -2124,10 +2131,10 @@ void GtkSalFrame::ToTop( sal_uInt16 nFlags )
gtk_window_present( GTK_WINDOW(m_pWindow) );
else
{
- // gdk_window_focus( m_pWindow->window, gdk_x11_get_server_time(GTK_WIDGET (m_pWindow)->window) );
+ // gdk_window_focus( getGdkWindow(), gdk_x11_get_server_time(GTK_WIDGET (m_pWindow)->window) );
/* #i99360# ugly workaround an X11 library bug */
guint32 nUserTime= getDisplay()->GetLastUserEventTime( true );
- gdk_window_focus( m_pWindow->window, nUserTime );
+ gdk_window_focus( getGdkWindow(), nUserTime );
}
/* need to do an XSetInputFocus here because
* gdk_window_focus will ask a EWMH compliant WM to put the focus
@@ -2139,7 +2146,7 @@ void GtkSalFrame::ToTop( sal_uInt16 nFlags )
// sad but true: this can cause an XError, we need to catch that
// to do this we need to synchronize with the XServer
getDisplay()->GetXLib()->PushXErrorLevel( true );
- XSetInputFocus( getDisplay()->GetDisplay(), GDK_WINDOW_XWINDOW( m_pWindow->window ), RevertToParent, CurrentTime );
+ XSetInputFocus( getDisplay()->GetDisplay(), getXWindow(), RevertToParent, CurrentTime );
XSync( getDisplay()->GetDisplay(), False );
getDisplay()->GetXLib()->PopXErrorLevel();
}
@@ -2158,7 +2165,7 @@ void GtkSalFrame::SetPointer( PointerStyle ePointerStyle )
{
m_ePointerStyle = ePointerStyle;
GdkCursor *pCursor = getDisplay()->getCursor( ePointerStyle );
- gdk_window_set_cursor( m_pWindow->window, pCursor );
+ gdk_window_set_cursor( getGdkWindow(), pCursor );
m_pCurrentCursor = pCursor;
// #i80791# use grabPointer the same way as CaptureMouse, respective float grab
@@ -2193,7 +2200,7 @@ void GtkSalFrame::grabPointer( sal_Bool bGrab, sal_Bool bOwnerEvents )
{
const int nMask = ( GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK );
- gdk_pointer_grab( m_pWindow->window, bOwnerEvents,
+ gdk_pointer_grab( getGdkWindow(), bOwnerEvents,
(GdkEventMask) nMask, NULL, m_pCurrentCursor,
GDK_CURRENT_TIME );
}
@@ -2206,7 +2213,7 @@ void GtkSalFrame::grabPointer( sal_Bool bGrab, sal_Bool bOwnerEvents )
// this is of course a bad hack, especially as we cannot
// set the right cursor this way
XGrabPointer( getDisplay()->GetDisplay(),
- GDK_WINDOW_XWINDOW( m_pWindow->window),
+ getXWindow(),
bOwnerEvents,
PointerMotionMask | ButtonPressMask | ButtonReleaseMask,
GrabModeAsync,
@@ -2254,7 +2261,7 @@ void GtkSalFrame::SetPointerPos( long nX, long nY )
// #i38648# ask for the next motion hint
gint x, y;
GdkModifierType mask;
- gdk_window_get_pointer( pFrame->m_pWindow->window, &x, &y, &mask );
+ gdk_window_get_pointer( pFrame->getGdkWindow(), &x, &y, &mask );
}
void GtkSalFrame::Flush()
@@ -2340,7 +2347,7 @@ SalBitmap* GtkSalFrame::SnapShot()
return NULL;
X11SalBitmap *pBmp = new X11SalBitmap;
- GdkWindow *pWin = m_pWindow->window;
+ GdkWindow *pWin = getGdkWindow();
if( pBmp->SnapShot( GDK_DISPLAY_XDISPLAY( getGdkDisplay() ),
GDK_WINDOW_XID( pWin ) ) )
return pBmp;
@@ -2437,7 +2444,7 @@ void GtkSalFrame::createNewWindow( XLIB_Window aNewParent, bool bXEmbed, int nSc
// free xrender resources
for( unsigned int i = 0; i < sizeof(m_aGraphics)/sizeof(m_aGraphics[0]); i++ )
- if( m_aGraphics[i].bInUse )
+ if( m_aGraphics[i].pGraphics )
m_aGraphics[i].pGraphics->SetDrawable( None, m_nScreen );
// first deinit frame
@@ -2448,8 +2455,8 @@ void GtkSalFrame::createNewWindow( XLIB_Window aNewParent, bool bXEmbed, int nSc
}
if( m_pRegion )
gdk_region_destroy( m_pRegion );
- if( m_pWindow && m_pWindow->window )
- getDisplay()->deregisterFrameWindow( GDK_WINDOW_XWINDOW(m_pWindow->window), this );
+ if( m_pWindow && getGdkWindow() )
+ getDisplay()->deregisterFrameWindow( getXWindow(), this );
if( m_aForeignParentWindow != None )
getDisplay()->deregisterFrameWindow( (XLIB_Window)m_aForeignParentWindow, this );
if( m_aForeignTopLevelWindow != None )
@@ -2493,9 +2500,9 @@ void GtkSalFrame::createNewWindow( XLIB_Window aNewParent, bool bXEmbed, int nSc
// update graphics
for( unsigned int i = 0; i < sizeof(m_aGraphics)/sizeof(m_aGraphics[0]); i++ )
{
- if( m_aGraphics[i].bInUse )
+ if( m_aGraphics[i].pGraphics )
{
- m_aGraphics[i].pGraphics->SetDrawable( GDK_WINDOW_XWINDOW(m_pWindow->window), m_nScreen );
+ m_aGraphics[i].pGraphics->SetDrawable( getXWindow(), m_nScreen );
m_aGraphics[i].pGraphics->SetWindow( m_pWindow );
}
}
@@ -2525,7 +2532,7 @@ bool GtkSalFrame::SetPluginParent( SystemParentData* pSysParent )
void GtkSalFrame::ResetClipRegion()
{
if( m_pWindow )
- gdk_window_shape_combine_region( m_pWindow->window, NULL, 0, 0 );
+ gdk_window_shape_combine_region( getGdkWindow(), NULL, 0, 0 );
}
void GtkSalFrame::BeginSetClipRegion( sal_uLong )
@@ -2552,7 +2559,7 @@ void GtkSalFrame::UnionClipRegion( long nX, long nY, long nWidth, long nHeight )
void GtkSalFrame::EndSetClipRegion()
{
if( m_pWindow && m_pRegion )
- gdk_window_shape_combine_region( m_pWindow->window, m_pRegion, 0, 0 );
+ gdk_window_shape_combine_region( getGdkWindow(), m_pRegion, 0, 0 );
}
bool GtkSalFrame::dispatchXEvent( const XEvent* pEvent )
@@ -2565,16 +2572,16 @@ bool GtkSalFrame::dispatchXEvent( const XEvent* pEvent )
Atom nDesktopAtom = pAdaptor->getAtom( vcl_sal::WMAdaptor::NET_WM_DESKTOP );
if( pEvent->xproperty.atom == nDesktopAtom &&
pEvent->xproperty.state == PropertyNewValue &&
- m_pWindow && m_pWindow->window )
+ m_pWindow && getGdkWindow() )
{
- m_nWorkArea = pAdaptor->getWindowWorkArea( GDK_WINDOW_XWINDOW( m_pWindow->window) );
+ m_nWorkArea = pAdaptor->getWindowWorkArea( getXWindow() );
}
}
else if( pEvent->type == ConfigureNotify )
{
if( m_pForeignParent &&
m_pWindow &&
- m_pWindow->window &&
+ getGdkWindow() &&
pEvent->xconfigure.window == m_aForeignParentWindow )
{
bHandled = true;
@@ -2591,7 +2598,7 @@ bool GtkSalFrame::dispatchXEvent( const XEvent* pEvent )
}
}
else if( m_pForeignTopLevel &&
- m_pWindow && m_pWindow->window &&
+ m_pWindow && getGdkWindow() &&
pEvent->xconfigure.window == m_aForeignTopLevelWindow )
{
bHandled = true;
@@ -2599,7 +2606,7 @@ bool GtkSalFrame::dispatchXEvent( const XEvent* pEvent )
int x = 0, y = 0;
XLIB_Window aChild;
XTranslateCoordinates( getDisplay()->GetDisplay(),
- GDK_WINDOW_XWINDOW( m_pWindow->window),
+ getXWindow(),
getDisplay()->GetRootWindow( getDisplay()->GetDefaultScreenNumber() ),
0, 0,
&x, &y,
@@ -2614,8 +2621,8 @@ bool GtkSalFrame::dispatchXEvent( const XEvent* pEvent )
}
else if( pEvent->type == ClientMessage &&
pEvent->xclient.message_type == getDisplay()->getWMAdaptor()->getAtom( vcl_sal::WMAdaptor::XEMBED ) &&
- m_pWindow && m_pWindow->window &&
- pEvent->xclient.window == GDK_WINDOW_XWINDOW(m_pWindow->window) &&
+ m_pWindow && getGdkWindow() &&
+ pEvent->xclient.window == getXWindow() &&
m_bWindowIsGtkPlug
)
{
@@ -2627,7 +2634,7 @@ bool GtkSalFrame::dispatchXEvent( const XEvent* pEvent )
{
GdkEventFocus aEvent;
aEvent.type = GDK_FOCUS_CHANGE;
- aEvent.window = m_pWindow->window;
+ aEvent.window = getGdkWindow();
aEvent.send_event = sal_True;
aEvent.in = (pEvent->xclient.data.l[1] == 1);
signalFocus( m_pWindow, &aEvent, this );
@@ -2647,7 +2654,7 @@ void GtkSalFrame::SetBackgroundBitmap( SalBitmap* pBitmap )
if( m_hBackgroundPixmap )
{
XSetWindowBackgroundPixmap( getDisplay()->GetDisplay(),
- GDK_WINDOW_XWINDOW(m_pWindow->window),
+ getXWindow(),
None );
XFreePixmap( getDisplay()->GetDisplay(), m_hBackgroundPixmap );
m_hBackgroundPixmap = None;
@@ -2660,7 +2667,7 @@ void GtkSalFrame::SetBackgroundBitmap( SalBitmap* pBitmap )
{
m_hBackgroundPixmap =
XCreatePixmap( getDisplay()->GetDisplay(),
- GDK_WINDOW_XWINDOW(m_pWindow->window),
+ getXWindow(),
aSize.Width(),
aSize.Height(),
getDisplay()->GetVisual(m_nScreen).GetDepth() );
@@ -2676,7 +2683,7 @@ void GtkSalFrame::SetBackgroundBitmap( SalBitmap* pBitmap )
aTwoRect,
getDisplay()->GetCopyGC(m_nScreen) );
XSetWindowBackgroundPixmap( getDisplay()->GetDisplay(),
- GDK_WINDOW_XWINDOW(m_pWindow->window),
+ getXWindow(),
m_hBackgroundPixmap );
}
}
@@ -2934,7 +2941,7 @@ IMPL_LINK( GtkSalFrame, ImplDelayedFullScreenHdl, void*, EMPTYARG )
XEvent aEvent;
aEvent.type = ClientMessage;
aEvent.xclient.display = getDisplay()->GetDisplay();
- aEvent.xclient.window = GDK_WINDOW_XWINDOW(m_pWindow->window);
+ aEvent.xclient.window = getXWindow();
aEvent.xclient.message_type = nStateAtom;
aEvent.xclient.format = 32;
aEvent.xclient.data.l[0] = 1;
diff --git a/main/vcl/unx/gtk/window/gtkobject.cxx b/main/vcl/unx/gtk/window/gtkobject.cxx
index 5ab103fecd..1ddd9b65bd 100644
--- a/main/vcl/unx/gtk/window/gtkobject.cxx
+++ b/main/vcl/unx/gtk/window/gtkobject.cxx
@@ -54,7 +54,7 @@ GtkSalObject::GtkSalObject( GtkSalFrame* pParent, sal_Bool bShow )
SalDisplay* pDisp = GetX11SalData()->GetDisplay();
m_aSystemData.nSize = sizeof( SystemChildData );
m_aSystemData.pDisplay = pDisp->GetDisplay();
- m_aSystemData.aWindow = GDK_WINDOW_XWINDOW(m_pSocket->window);
+ m_aSystemData.aWindow = GDK_WINDOW_XWINDOW(gtk_widget_get_window(m_pSocket));
m_aSystemData.pSalFrame = NULL;
m_aSystemData.pWidget = m_pSocket;
m_aSystemData.pVisual = pDisp->GetVisual(pParent->getScreenNumber()).GetVisual();
@@ -62,7 +62,7 @@ GtkSalObject::GtkSalObject( GtkSalFrame* pParent, sal_Bool bShow )
m_aSystemData.nDepth = pDisp->GetVisual(pParent->getScreenNumber()).GetDepth();
m_aSystemData.aColormap = pDisp->GetColormap(pParent->getScreenNumber()).GetXColormap();
m_aSystemData.pAppContext = NULL;
- m_aSystemData.aShellWindow = GDK_WINDOW_XWINDOW(GTK_WIDGET(pParent->getWindow())->window);
+ m_aSystemData.aShellWindow = pParent->getXWindow();
m_aSystemData.pShellWidget = GTK_WIDGET(pParent->getWindow());
g_signal_connect( G_OBJECT(m_pSocket), "button-press-event", G_CALLBACK(signalButton), this );
@@ -97,7 +97,7 @@ GtkSalObject::~GtkSalObject()
void GtkSalObject::ResetClipRegion()
{
if( m_pSocket )
- gdk_window_shape_combine_region( m_pSocket->window, NULL, 0, 0 );
+ gdk_window_shape_combine_region( gtk_widget_get_window(m_pSocket), NULL, 0, 0 );
}
sal_uInt16 GtkSalObject::GetClipRegionType()
@@ -126,7 +126,7 @@ void GtkSalObject::UnionClipRegion( long nX, long nY, long nWidth, long nHeight
void GtkSalObject::EndSetClipRegion()
{
if( m_pSocket )
- gdk_window_shape_combine_region( m_pSocket->window, m_pRegion, 0, 0 );
+ gdk_window_shape_combine_region( gtk_widget_get_window(m_pSocket), m_pRegion, 0, 0 );
}
void GtkSalObject::SetPosSize( long nX, long nY, long nWidth, long nHeight )
(openoffice) 01/19: vcl: GTK2 ownership and lifecycle audit.
Posted by ji...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jimjag pushed a commit to branch AOO50X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 213edfc39efe3b786ed388fdd6fb4586d825ee2c
Author: Pedro Giffuni <pf...@apache.org>
AuthorDate: Sat Sep 12 00:08:00 2026 -0500
vcl: GTK2 ownership and lifecycle audit.
Re-architected the GTK2 backend event dispatch pipeline in Apache OpenOffice
by replacing linear frame searches with a centralized, O(1) X11 window-to-frame
lookup map (m_aWindowFrameMap).
Separated low-level X11 event routing into GtkSalFrame::dispatchXEvent() with
explicit event consumption semantics while enforcing lifecycle invariants and
registration safety.
Changes
Implemented findFrameByXWindow(), registerFrameWindow(), and
deregisterFrameWindow() using std::map<XLIB_Window, GtkSalFrame*> in
GtkSalDisplay (gtkdata.hxx, gtkdata.cxx), rejecting duplicate registrations
with diagnostic logging.
Replaced linear m_aFrames scans in GtkSalDisplay::filterGdkEvent and
GtkSalDisplay::Dispatch with direct map lookup.
Extracted GtkSalFrame::dispatchXEvent() in gtkframe.hxx and gtkframe.cxx
to handle PropertyNotify, foreign-window ConfigureNotify, and _NET_WM_XEMBED
client messages with explicit handling indicators, while retaining legacy
Dispatch() as a continuation wrapper.
Hardened GtkSalFrame lifecycle state handling (InitCommon, moveToScreen,
createNewWindow, and ~GtkSalFrame) to deregister old X11 window IDs prior to
widget realization/recreation and cleanly reset intermediate window state.
Verification
Audited all call sites and lifecycle paths (InitCommon, createNewWindow,
moveToScreen, frame destruction, and foreign window resizing) to confirm
window IDs are registered only after realization and deregistered before
widget teardown.
Verified that dispatchXEvent() null guards protect against unrealized
widget access and that legacy callers of Dispatch() retain identical
continuation semantics.
Produced with JetBrain's CLion with some help from ChatGPT
(cherry picked from commit e1397ed79746b1482a549a3b8499549cff06c5f4)
---
main/vcl/inc/unx/gtk/gtkdata.hxx | 11 +++++
main/vcl/inc/unx/gtk/gtkframe.hxx | 7 +--
main/vcl/unx/gtk/app/gtkdata.cxx | 90 +++++++++++++++++++++++++++-------
main/vcl/unx/gtk/window/gtkframe.cxx | 95 ++++++++++++++++++++++++++++++++----
4 files changed, 172 insertions(+), 31 deletions(-)
diff --git a/main/vcl/inc/unx/gtk/gtkdata.hxx b/main/vcl/inc/unx/gtk/gtkdata.hxx
index 614008b57f..20a35b4e70 100644
--- a/main/vcl/inc/unx/gtk/gtkdata.hxx
+++ b/main/vcl/inc/unx/gtk/gtkdata.hxx
@@ -24,6 +24,8 @@
#ifndef _VCL_GTKDATA_HXX
#define _VCL_GTKDATA_HXX
+#include <map>
+
#include <tools/prex.h>
#include <gdk/gdk.h>
#include <gdk/gdkx.h>
@@ -53,6 +55,12 @@ class GtkSalDisplay : public SalDisplay
GdkDisplay* m_pGdkDisplay;
GdkCursor *m_aCursors[ POINTER_COUNT ];
bool m_bStartupCompleted;
+ /*
+ * Each live X11 window ID may be associated with at most one frame.
+ * Window IDs must be deregistered before destruction or reassignment.
+ * Duplicate registration is a lifecycle error and is not overwritten.
+ */
+ std::map< XLIB_Window, GtkSalFrame* > m_aWindowFrameMap;
GdkCursor* getFromXPM( const char *pBitmap, const char *pMask,
int nWidth, int nHeight, int nXHot, int nYHot );
@@ -63,6 +71,9 @@ public:
GdkDisplay* GetGdkDisplay() const { return m_pGdkDisplay; }
virtual void deregisterFrame( SalFrame* pFrame );
+ GtkSalFrame* findFrameByXWindow( XLIB_Window aWindow ) const;
+ void registerFrameWindow( XLIB_Window aWindow, GtkSalFrame* pFrame );
+ void deregisterFrameWindow( XLIB_Window aWindow, GtkSalFrame* pFrame = NULL );
GdkCursor *getCursor( PointerStyle ePointerStyle );
virtual int CaptureMouse( SalFrame* pFrame );
virtual long Dispatch( XEvent *pEvent );
diff --git a/main/vcl/inc/unx/gtk/gtkframe.hxx b/main/vcl/inc/unx/gtk/gtkframe.hxx
index f6e336f51d..a948ffdd2f 100644
--- a/main/vcl/inc/unx/gtk/gtkframe.hxx
+++ b/main/vcl/inc/unx/gtk/gtkframe.hxx
@@ -269,9 +269,10 @@ public:
GtkSalFrame( SalFrame* pParent, sal_uLong nStyle );
GtkSalFrame( SystemParentData* pSysData );
- // dispatches an event, returns true if dispatched
- // and false else; if true was returned the event should
- // be swallowed
+ // Dispatches an XEvent; true means handled and swallowed.
+ bool dispatchXEvent( const XEvent* pEvent );
+
+ // Legacy wrapper: true means continue, false means swallowed.
bool Dispatch( const XEvent* pEvent );
void grabPointer( sal_Bool bGrab, sal_Bool bOwnerEvents = sal_False );
diff --git a/main/vcl/unx/gtk/app/gtkdata.cxx b/main/vcl/unx/gtk/app/gtkdata.cxx
index ee91cbc3a1..21a33225a4 100644
--- a/main/vcl/unx/gtk/app/gtkdata.cxx
+++ b/main/vcl/unx/gtk/app/gtkdata.cxx
@@ -94,9 +94,69 @@ void GtkSalDisplay::deregisterFrame( SalFrame* pFrame )
static_cast<GtkSalFrame*>(m_pCapture)->grabPointer( FALSE );
m_pCapture = NULL;
}
+ for( std::map< XLIB_Window, GtkSalFrame* >::iterator it = m_aWindowFrameMap.begin();
+ it != m_aWindowFrameMap.end(); )
+ {
+ if( it->second == static_cast<GtkSalFrame*>(pFrame) )
+ {
+ std::map< XLIB_Window, GtkSalFrame* >::iterator itNext = it;
+ ++itNext;
+ m_aWindowFrameMap.erase( it );
+ it = itNext;
+ }
+ else
+ ++it;
+ }
SalDisplay::deregisterFrame( pFrame );
}
+/*
+ * Each live X11 window ID may be associated with at most one frame.
+ * Window IDs must be deregistered before destruction or reassignment.
+ * Duplicate registration is a lifecycle error and is not overwritten.
+ */
+void GtkSalDisplay::registerFrameWindow( XLIB_Window aWindow, GtkSalFrame* pFrame )
+{
+ if( aWindow != None && pFrame != NULL )
+ {
+ std::map< XLIB_Window, GtkSalFrame* >::iterator it =
+ m_aWindowFrameMap.find( aWindow );
+
+ if( it != m_aWindowFrameMap.end() && it->second != pFrame )
+ {
+ OSL_TRACE(
+ "GtkSalDisplay::registerFrameWindow: refusing duplicate "
+ "mapping for X window %lu",
+ static_cast<unsigned long>(aWindow) );
+ return;
+ }
+
+ m_aWindowFrameMap[ aWindow ] = pFrame;
+ }
+}
+
+void GtkSalDisplay::deregisterFrameWindow( XLIB_Window aWindow, GtkSalFrame* pFrame )
+{
+ if( aWindow == None )
+ return;
+ std::map< XLIB_Window, GtkSalFrame* >::iterator it = m_aWindowFrameMap.find( aWindow );
+ if( it != m_aWindowFrameMap.end() )
+ {
+ if( pFrame == NULL || it->second == pFrame )
+ m_aWindowFrameMap.erase( it );
+ }
+}
+
+GtkSalFrame* GtkSalDisplay::findFrameByXWindow( XLIB_Window aWindow ) const
+{
+ if( aWindow == None )
+ return NULL;
+ std::map< XLIB_Window, GtkSalFrame* >::const_iterator it = m_aWindowFrameMap.find( aWindow );
+ if( it != m_aWindowFrameMap.end() )
+ return it->second;
+ return NULL;
+}
+
extern "C" {
GdkFilterReturn call_filterGdkEvent( GdkXEvent* sys_event,
GdkEvent* event,
@@ -157,19 +217,11 @@ GdkFilterReturn GtkSalDisplay::filterGdkEvent( GdkXEvent* sys_event,
}
// let's see if one of our frames wants to swallow these events
// get the frame
- for( std::list< SalFrame* >::const_iterator it = pDisplay->m_aFrames.begin();
- it != pDisplay->m_aFrames.end(); ++it )
+ GtkSalFrame* pFrame = pDisplay->findFrameByXWindow( pEvent->xany.window );
+ if( pFrame )
{
- GtkSalFrame* pFrame = static_cast<GtkSalFrame*>(*it);
- if( (GdkNativeWindow)pFrame->GetSystemData()->aWindow == pEvent->xany.window ||
- ( pFrame->getForeignParent() && pFrame->getForeignParentWindow() == pEvent->xany.window ) ||
- ( pFrame->getForeignTopLevel() && pFrame->getForeignTopLevelWindow() == pEvent->xany.window )
- )
- {
- if( ! pFrame->Dispatch( pEvent ) )
- aFilterReturn = GDK_FILTER_REMOVE;
- break;
- }
+ if( pFrame->dispatchXEvent( pEvent ) )
+ aFilterReturn = GDK_FILTER_REMOVE;
}
X11SalObject::Dispatch( pEvent );
}
@@ -250,13 +302,15 @@ long GtkSalDisplay::Dispatch( XEvent* pEvent )
{
if( GetDisplay() == pEvent->xany.display )
{
- // let's see if one of our frames wants to swallow these events
- // get the child frame
- for( std::list< SalFrame* >::const_iterator it = m_aFrames.begin();
- it != m_aFrames.end(); ++it )
+ GtkSalFrame* pFrame = findFrameByXWindow( pEvent->xany.window );
+ if( pFrame )
{
- if( (GdkNativeWindow)(*it)->GetSystemData()->aWindow == pEvent->xany.window )
- return static_cast<GtkSalFrame*>(*it)->Dispatch( pEvent );
+ /*
+ * dispatchXEvent() returns true when the frame handled the event.
+ * This method returns a GdkFilterReturn, not the legacy Dispatch()
+ * continuation boolean.
+ */
+ return pFrame->dispatchXEvent( pEvent ) ? GDK_FILTER_REMOVE : GDK_FILTER_CONTINUE;
}
}
diff --git a/main/vcl/unx/gtk/window/gtkframe.cxx b/main/vcl/unx/gtk/window/gtkframe.cxx
index 578bcb16ff..e622639eab 100644
--- a/main/vcl/unx/gtk/window/gtkframe.cxx
+++ b/main/vcl/unx/gtk/window/gtkframe.cxx
@@ -382,6 +382,11 @@ GtkSalFrame::GraphicsHolder::~GraphicsHolder()
GtkSalFrame::GtkSalFrame( SalFrame* pParent, sal_uLong nStyle )
{
+ memset( &m_aSystemData, 0, sizeof(m_aSystemData) );
+ m_aForeignParentWindow = None;
+ m_aForeignTopLevelWindow = None;
+ m_pForeignParent = NULL;
+ m_pForeignTopLevel = NULL;
m_nScreen = getDisplay()->GetDefaultScreenNumber();
getDisplay()->registerFrame( this );
m_bDefaultPos = true;
@@ -392,6 +397,11 @@ GtkSalFrame::GtkSalFrame( SalFrame* pParent, sal_uLong nStyle )
GtkSalFrame::GtkSalFrame( SystemParentData* pSysData )
{
+ memset( &m_aSystemData, 0, sizeof(m_aSystemData) );
+ m_aForeignParentWindow = None;
+ m_aForeignTopLevelWindow = None;
+ m_pForeignParent = NULL;
+ m_pForeignTopLevel = NULL;
m_nScreen = getDisplay()->GetDefaultScreenNumber();
getDisplay()->registerFrame( this );
getDisplay()->setHaveSystemChildFrame();
@@ -413,6 +423,15 @@ GtkSalFrame::~GtkSalFrame()
if( m_pParent )
m_pParent->m_aChildren.remove( this );
+ // Early explicit removal of registered native and foreign window IDs
+ if( m_pWindow && m_pWindow->window )
+ getDisplay()->deregisterFrameWindow( GDK_WINDOW_XWINDOW(m_pWindow->window), this );
+ if( m_aForeignParentWindow != None )
+ getDisplay()->deregisterFrameWindow( (XLIB_Window)m_aForeignParentWindow, this );
+ if( m_aForeignTopLevelWindow != None )
+ getDisplay()->deregisterFrameWindow( (XLIB_Window)m_aForeignTopLevelWindow, this );
+
+ // Final safety net cleanup for frame list and window map
getDisplay()->deregisterFrame( this );
if( m_pRegion )
@@ -573,6 +592,10 @@ void GtkSalFrame::InitCommon()
// show the widgets
gtk_widget_show( GTK_WIDGET(m_pFixedContainer) );
+ XLIB_Window aOldWindow = (XLIB_Window)m_aSystemData.aWindow;
+ if( aOldWindow != None )
+ getDisplay()->deregisterFrameWindow( aOldWindow, this );
+
// realize the window, we need an XWindow id
gtk_widget_realize( m_pWindow );
@@ -580,7 +603,10 @@ void GtkSalFrame::InitCommon()
SalDisplay* pDisp = GetX11SalData()->GetDisplay();
m_aSystemData.nSize = sizeof( SystemChildData );
m_aSystemData.pDisplay = pDisp->GetDisplay();
- m_aSystemData.aWindow = GDK_WINDOW_XWINDOW(m_pWindow->window);
+ if( m_pWindow && m_pWindow->window )
+ m_aSystemData.aWindow = GDK_WINDOW_XWINDOW(m_pWindow->window);
+ else
+ m_aSystemData.aWindow = None;
m_aSystemData.pSalFrame = this;
m_aSystemData.pWidget = m_pWindow;
m_aSystemData.pVisual = pDisp->GetVisual( m_nScreen ).GetVisual();
@@ -591,6 +617,9 @@ void GtkSalFrame::InitCommon()
m_aSystemData.aShellWindow = m_aSystemData.aWindow;
m_aSystemData.pShellWidget = m_aSystemData.pWidget;
+ if( m_aSystemData.aWindow != None )
+ getDisplay()->registerFrameWindow( (XLIB_Window)m_aSystemData.aWindow, this );
+
// fake an initial geometry, gets updated via configure event or SetPosSize
if( m_bDefaultPos || m_bDefaultSize )
@@ -916,6 +945,11 @@ void GtkSalFrame::Init( SystemParentData* pSysData )
m_nStyle = SAL_FRAME_STYLE_PLUG;
InitCommon();
+ if( m_aForeignParentWindow != None )
+ getDisplay()->registerFrameWindow( (XLIB_Window)m_aForeignParentWindow, this );
+ if( m_aForeignTopLevelWindow != None && m_aForeignTopLevelWindow != m_aForeignParentWindow )
+ getDisplay()->registerFrameWindow( (XLIB_Window)m_aForeignTopLevelWindow, this );
+
m_pForeignParent = gdk_window_foreign_new_for_display( getGdkDisplay(), m_aForeignParentWindow );
gdk_window_set_events( m_pForeignParent, GDK_STRUCTURE_MASK );
int x_ret, y_ret;
@@ -1729,17 +1763,26 @@ void GtkSalFrame::moveToScreen( int nScreen )
{
m_nScreen = nScreen;
gtk_window_set_screen( GTK_WINDOW(m_pWindow), pScreen );
+ XLIB_Window aOldWin = (XLIB_Window)m_aSystemData.aWindow;
+ if( aOldWin != None )
+ getDisplay()->deregisterFrameWindow( aOldWin, this );
+
// realize the window, we need an XWindow id
gtk_widget_realize( m_pWindow );
// update system data
GtkSalDisplay* pDisp = getDisplay();
- m_aSystemData.aWindow = GDK_WINDOW_XWINDOW(m_pWindow->window);
+ if( m_pWindow && m_pWindow->window )
+ m_aSystemData.aWindow = GDK_WINDOW_XWINDOW(m_pWindow->window);
+ else
+ m_aSystemData.aWindow = None;
m_aSystemData.pVisual = pDisp->GetVisual( m_nScreen ).GetVisual();
m_aSystemData.nScreen = nScreen;
m_aSystemData.nDepth = pDisp->GetVisual( m_nScreen ).GetDepth();
m_aSystemData.aColormap = pDisp->GetColormap( m_nScreen ).GetXColormap();
m_aSystemData.pAppContext = NULL;
m_aSystemData.aShellWindow = m_aSystemData.aWindow;
+ if( m_aSystemData.aWindow != None )
+ pDisp->registerFrameWindow( (XLIB_Window)m_aSystemData.aWindow, this );
// update graphics if necessary
for( unsigned int i = 0; i < sizeof(m_aGraphics)/sizeof(m_aGraphics[0]); i++ )
{
@@ -2404,14 +2447,34 @@ void GtkSalFrame::createNewWindow( XLIB_Window aNewParent, bool bXEmbed, int nSc
}
if( m_pRegion )
gdk_region_destroy( m_pRegion );
+ if( m_pWindow && m_pWindow->window )
+ getDisplay()->deregisterFrameWindow( GDK_WINDOW_XWINDOW(m_pWindow->window), this );
+ if( m_aForeignParentWindow != None )
+ getDisplay()->deregisterFrameWindow( (XLIB_Window)m_aForeignParentWindow, this );
+ if( m_aForeignTopLevelWindow != None )
+ getDisplay()->deregisterFrameWindow( (XLIB_Window)m_aForeignTopLevelWindow, this );
if( m_pFixedContainer )
gtk_widget_destroy( GTK_WIDGET(m_pFixedContainer) );
if( m_pWindow )
gtk_widget_destroy( m_pWindow );
+ m_pFixedContainer = NULL;
+ m_pWindow = NULL;
+
+ m_aSystemData.aWindow = None;
+ m_aSystemData.aShellWindow = None;
+ m_aForeignParentWindow = None;
+ m_aForeignTopLevelWindow = None;
+
if( m_pForeignParent )
+ {
g_object_unref( G_OBJECT(m_pForeignParent) );
+ m_pForeignParent = NULL;
+ }
if( m_pForeignTopLevel )
+ {
g_object_unref( G_OBJECT(m_pForeignTopLevel) );
+ m_pForeignTopLevel = NULL;
+ }
// init new window
m_bDefaultPos = m_bDefaultSize = false;
@@ -2491,25 +2554,29 @@ void GtkSalFrame::EndSetClipRegion()
gdk_window_shape_combine_region( m_pWindow->window, m_pRegion, 0, 0 );
}
-bool GtkSalFrame::Dispatch( const XEvent* pEvent )
+bool GtkSalFrame::dispatchXEvent( const XEvent* pEvent )
{
- bool bContinueDispatch = true;
+ bool bHandled = false;
if( pEvent->type == PropertyNotify )
{
vcl_sal::WMAdaptor* pAdaptor = getDisplay()->getWMAdaptor();
Atom nDesktopAtom = pAdaptor->getAtom( vcl_sal::WMAdaptor::NET_WM_DESKTOP );
if( pEvent->xproperty.atom == nDesktopAtom &&
- pEvent->xproperty.state == PropertyNewValue )
+ pEvent->xproperty.state == PropertyNewValue &&
+ m_pWindow && m_pWindow->window )
{
m_nWorkArea = pAdaptor->getWindowWorkArea( GDK_WINDOW_XWINDOW( m_pWindow->window) );
}
}
else if( pEvent->type == ConfigureNotify )
{
- if( m_pForeignParent && pEvent->xconfigure.window == m_aForeignParentWindow )
+ if( m_pForeignParent &&
+ m_pWindow &&
+ m_pWindow->window &&
+ pEvent->xconfigure.window == m_aForeignParentWindow )
{
- bContinueDispatch = false;
+ bHandled = true;
gtk_window_resize( GTK_WINDOW(m_pWindow), pEvent->xconfigure.width, pEvent->xconfigure.height );
if( ( sal::static_int_cast< int >(maGeometry.nWidth) !=
pEvent->xconfigure.width ) ||
@@ -2522,9 +2589,11 @@ bool GtkSalFrame::Dispatch( const XEvent* pEvent )
getDisplay()->SendInternalEvent( this, NULL, SALEVENT_RESIZE );
}
}
- else if( m_pForeignTopLevel && pEvent->xconfigure.window == m_aForeignTopLevelWindow )
+ else if( m_pForeignTopLevel &&
+ m_pWindow && m_pWindow->window &&
+ pEvent->xconfigure.window == m_aForeignTopLevelWindow )
{
- bContinueDispatch = false;
+ bHandled = true;
// update position
int x = 0, y = 0;
XLIB_Window aChild;
@@ -2544,6 +2613,7 @@ bool GtkSalFrame::Dispatch( const XEvent* pEvent )
}
else if( pEvent->type == ClientMessage &&
pEvent->xclient.message_type == getDisplay()->getWMAdaptor()->getAtom( vcl_sal::WMAdaptor::XEMBED ) &&
+ m_pWindow && m_pWindow->window &&
pEvent->xclient.window == GDK_WINDOW_XWINDOW(m_pWindow->window) &&
m_bWindowIsGtkPlug
)
@@ -2563,7 +2633,12 @@ bool GtkSalFrame::Dispatch( const XEvent* pEvent )
}
}
- return bContinueDispatch;
+ return bHandled;
+}
+
+bool GtkSalFrame::Dispatch( const XEvent* pEvent )
+{
+ return !dispatchXEvent( pEvent );
}
void GtkSalFrame::SetBackgroundBitmap( SalBitmap* pBitmap )
(openoffice) 15/19: Fix the build-breaking regression in 8a6d05c5839d3bb0755d29b6ff1d93273263d245 caused by removing the sourcelevel property but not removing a reference to it.
Posted by ji...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jimjag pushed a commit to branch AOO50X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 84d507fed83e9ba3dfbaff96cf8ba5fe57b4d210
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Mon Oct 5 19:55:53 2026 +0200
Fix the build-breaking regression in 8a6d05c5839d3bb0755d29b6ff1d93273263d245
caused by removing the sourcelevel property but not removing
a reference to it.
Patch by: me
(cherry picked from commit 5221cf3a962813b63a7cbddd28fd7b281ed549ef)
---
main/swext/mediawiki/build.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/main/swext/mediawiki/build.xml b/main/swext/mediawiki/build.xml
index bd7e5783d6..b11c7ac2b6 100644
--- a/main/swext/mediawiki/build.xml
+++ b/main/swext/mediawiki/build.xml
@@ -71,7 +71,7 @@
<target name="compile" depends="init">
<javac debug="${debug}" debuglevel="lines,vars,source" destdir="${classes}" classpathref="classpath"
- source="${sourcelevel}" verbose="${verbose}" includeantruntime="false">
+ verbose="${verbose}" includeantruntime="false">
<src path="src"/>
</javac>
</target>
(openoffice) 18/19: Update README.md
Posted by ji...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jimjag pushed a commit to branch AOO50X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 6e2027afb83c59ee82bac216d1a125cd786f1da4
Author: Matthias Seidel <ms...@apache.org>
AuthorDate: Tue Oct 13 15:32:36 2026 +0200
Update README.md
(cherry picked from commit 0104261783566beff8bcabd2b607423b32142d24)
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index a31b989a2c..ce95e8aa2e 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@ Currently supported platforms include:
- FreeBSD
- OS/2
-OpenOffice is used by millions of users worldwide and with more than 398 million downloads it is one of the most successful open source projects.
+OpenOffice is used by millions of users worldwide and with more than 408 million downloads it is one of the most successful open source projects.
# Getting the latest sources via Git
(openoffice) 11/19: Remove unnecessary casts on the return values from UnoRuntime.queryInterface().
Posted by ji...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jimjag pushed a commit to branch AOO50X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit cb508685aba5ea4e031f44271452f293dcf987a5
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Sat Oct 3 10:20:41 2026 +0200
Remove unnecessary casts on the return values from UnoRuntime.queryInterface().
Patch by: me
(cherry picked from commit f44a16118bea57f8bcef4ba642542011bc077ed8)
---
.../org/openoffice/accessibility/AccessBridge.java | 4 +-
.../accessibility/WindowsAccessBridgeAdapter.java | 2 +-
.../java/accessibility/AbstractButton.java | 4 +-
.../accessibility/AccessibleComponentImpl.java | 2 +-
.../accessibility/AccessibleHypertextImpl.java | 4 +-
.../accessibility/AccessibleObjectFactory.java | 2 +-
.../java/accessibility/AccessibleTextImpl.java | 2 +-
.../openoffice/java/accessibility/ComboBox.java | 2 +-
.../openoffice/java/accessibility/Component.java | 12 +-
.../openoffice/java/accessibility/Container.java | 8 +-
.../java/accessibility/DescendantManager.java | 4 +-
.../org/openoffice/java/accessibility/Dialog.java | 2 +-
.../org/openoffice/java/accessibility/Frame.java | 2 +-
.../org/openoffice/java/accessibility/Icon.java | 2 +-
.../org/openoffice/java/accessibility/Label.java | 2 +-
.../org/openoffice/java/accessibility/List.java | 12 +-
.../org/openoffice/java/accessibility/Menu.java | 2 +-
.../java/accessibility/MenuContainer.java | 2 +-
.../openoffice/java/accessibility/Paragraph.java | 4 +-
.../openoffice/java/accessibility/ScrollBar.java | 4 +-
.../org/openoffice/java/accessibility/Table.java | 14 +-
.../java/accessibility/TextComponent.java | 6 +-
.../java/accessibility/ToggleButton.java | 2 +-
.../org/openoffice/java/accessibility/ToolTip.java | 2 +-
.../org/openoffice/java/accessibility/Tree.java | 16 +-
.../org/openoffice/java/accessibility/Window.java | 2 +-
.../accessibility/logging/XAccessibleEventLog.java | 4 +-
.../accessibility/logging/XAccessibleTextLog.java | 2 +-
.../accessibility/awb/AccessibilityWorkBench.java | 2 +-
.../accessibility/awb/canvas/CanvasShape.java | 4 +-
.../accessibility/awb/tree/ToolkitNode.java | 6 +-
.../accessibility/awb/view/ComponentView.java | 4 +-
.../accessibility/awb/view/EditableTextView.java | 4 +-
.../accessibility/awb/view/FocusView.java | 4 +-
.../accessibility/awb/view/SelectionView.java | 4 +-
.../awb/view/ServiceInterfaceView.java | 6 +-
.../accessibility/awb/view/TableView.java | 2 +-
.../accessibility/awb/view/TextView.java | 6 +-
.../awb/view/text/TextActionDialog.java | 6 +-
.../accessibility/misc/InformationWriter.java | 28 +-
.../accessibility/misc/OfficeConnection.java | 4 +-
.../accessibility/misc/SimpleOffice.java | 28 +-
main/avmedia/source/java/FrameGrabber.java | 2 +-
.../com/sun/star/beans/LocalOfficeConnection.java | 6 +-
.../java/com/sun/star/beans/LocalOfficeWindow.java | 14 +-
.../java/com/sun/star/comp/beans/Controller.java | 2 +-
.../main/java/com/sun/star/comp/beans/Frame.java | 4 +-
.../sun/star/comp/beans/LocalOfficeConnection.java | 10 +-
.../com/sun/star/comp/beans/LocalOfficeWindow.java | 14 +-
.../main/java/com/sun/star/comp/beans/OOoBean.java | 28 +-
.../com/sun/star/comp/beans/OfficeDocument.java | 6 +-
.../main/java/com/sun/star/comp/beans/Wrapper.java | 2 +-
main/chart2/qa/complex/chart2/TestCaseOldAPI.java | 76 +-
.../qa/complex/connectivity/HsqlDriverTest.java | 16 +-
.../complex/connectivity/JdbcLongVarCharTest.java | 10 +-
.../connectivity/dbase/DBaseDateFunctions.java | 10 +-
.../connectivity/dbase/DBaseNumericFunctions.java | 10 +-
.../complex/connectivity/dbase/DBaseSqlTests.java | 6 +-
.../connectivity/dbase/DBaseStringFunctions.java | 10 +-
.../complex/connectivity/hsqldb/TestCacheSize.java | 22 +-
.../qa/connectivity/tools/HsqlDatabase.java | 6 +-
.../connectivity/qa/connectivity/tools/RowSet.java | 4 +-
main/dbaccess/qa/complex/dbaccess/RowSet.java | 2 +-
.../comp/extensionoptions/OptionsEventHandler.java | 22 +-
main/embeddedobj/qa/complex/embedding/Test01.java | 16 +-
.../embeddedobj/test/Container1/BitmapPainter.java | 2 +-
main/embeddedobj/test/Container1/EmbedContApp.java | 72 +-
.../test/Container1/EmbedContFrame.java | 6 +-
main/embeddedobj/test/Container1/PaintThread.java | 2 +-
main/embeddedobj/test/Container1/WindowHelper.java | 12 +-
.../qa/integration/extensions/ConsoleWait.java | 2 +-
.../qa/integration/extensions/Frame.java | 12 +-
.../qa/integration/extensions/MethodHandler.java | 4 +-
.../qa/integration/extensions/ObjectInspector.java | 8 +-
.../qa/integration/extensions/ServicesHandler.java | 6 +-
main/extensions/test/pgp/TestPGP.java | 6 +-
.../detection/typeDetection/TypeDetection.java | 2 +-
.../comp/xsltfilter/XSLTFilterOLEExtracter.java | 26 +-
.../sun/star/comp/xsltfilter/XSLTransformer.java | 2 +-
.../integration/complex/forms/tools/ResultSet.java | 4 +-
main/forms/qa/integration/forms/CellBinding.java | 38 +-
.../qa/integration/forms/ControlValidation.java | 2 +-
.../forms/qa/integration/forms/DocumentHelper.java | 36 +-
.../qa/integration/forms/DocumentViewHelper.java | 12 +-
main/forms/qa/integration/forms/FormComponent.java | 18 +-
.../qa/integration/forms/FormControlTest.java | 26 +-
main/forms/qa/integration/forms/FormLayer.java | 10 +-
main/forms/qa/integration/forms/ListSelection.java | 16 +-
main/forms/qa/integration/forms/RadioButtons.java | 4 +-
.../integration/forms/SingleControlValidation.java | 6 +-
.../qa/integration/forms/SpreadsheetDocument.java | 10 +-
.../qa/integration/forms/SpreadsheetView.java | 8 +-
.../qa/integration/forms/TableCellTextBinding.java | 2 +-
main/forms/qa/integration/forms/ValueBinding.java | 6 +-
.../qa/integration/forms/XMLFormSettings.java | 10 +-
main/forms/qa/integration/xforms/Model.java | 6 +-
main/forms/qa/integration/xforms/XMLDocument.java | 6 +-
.../qa/complex/api_internal/CheckAPI.java | 2 +-
.../qa/complex/framework/recovery/CrashThread.java | 6 +-
.../complex/framework/recovery/RecoveryTest.java | 38 +-
.../complex/framework/recovery/RecoveryTools.java | 8 +-
.../qa/complex/imageManager/CheckImageManager.java | 2 +-
.../complex/loadAllDocuments/StreamSimulator.java | 6 +-
main/framework/source/services/backingcomp.cxx | 8 +-
.../Accessibility/ConnectionTask.java | 6 +-
.../Accessibility/EventListenerProxy.java | 4 +-
.../Accessibility/GraphicalDisplay.java | 2 +-
.../Accessibility/RegistrationThread.java | 2 +-
.../Accessibility/TextualDisplay.java | 2 +-
.../CreatingDialogs/SampleDialog.java | 30 +-
.../DevelopersGuide/Charts/CalcHelper.java | 40 +-
.../DevelopersGuide/Charts/ChartHelper.java | 36 +-
.../DevelopersGuide/Charts/ChartInCalc.java | 30 +-
.../DevelopersGuide/Charts/ChartInDraw.java | 16 +-
.../DevelopersGuide/Charts/ChartInWriter.java | 8 +-
.../examples/DevelopersGuide/Charts/Helper.java | 6 +-
.../Charts/JavaSampleChartAddIn.java | 50 +-
.../Charts/ListenAtCalcRangeInDraw.java | 16 +-
.../Charts/SelectionChangeListener.java | 22 +-
.../Components/Addons/JobsAddon/AsyncJob.java | 6 +-
.../ProtocolHandlerAddon.java | 8 +-
.../JavaComponent/TestJavaComponent.java | 4 +-
.../dialogcomponent/DialogComponent.java | 14 +-
.../DevelopersGuide/Config/ConfigExamples.java | 86 +--
.../DevelopersGuide/Database/CodeSamples.java | 34 +-
.../DevelopersGuide/Database/OpenQuery.java | 14 +-
.../examples/DevelopersGuide/Database/RowSet.java | 32 +-
.../examples/DevelopersGuide/Database/Sales.java | 30 +-
.../DevelopersGuide/Database/SalesMan.java | 4 +-
.../examples/DevelopersGuide/Database/sdbcx.java | 62 +-
.../DevelopersGuide/Drawing/ChangeOrderDemo.java | 6 +-
.../Drawing/ControlAndSelectDemo.java | 20 +-
.../DevelopersGuide/Drawing/CustomShowDemo.java | 20 +-
.../DevelopersGuide/Drawing/DrawViewDemo.java | 6 +-
.../DevelopersGuide/Drawing/DrawingDemo.java | 18 +-
.../Drawing/FillAndLineStyleDemo.java | 4 +-
.../DevelopersGuide/Drawing/GluePointDemo.java | 14 +-
.../DevelopersGuide/Drawing/GraphicExportDemo.java | 8 +-
.../examples/DevelopersGuide/Drawing/Helper.java | 4 +-
.../DevelopersGuide/Drawing/LayerDemo.java | 10 +-
.../Drawing/ObjectTransformationDemo.java | 6 +-
.../DevelopersGuide/Drawing/Organigram.java | 18 +-
.../DevelopersGuide/Drawing/PageHelper.java | 32 +-
.../DevelopersGuide/Drawing/PresentationDemo.java | 20 +-
.../DevelopersGuide/Drawing/ShapeHelper.java | 18 +-
.../DevelopersGuide/Drawing/StyleDemo.java | 22 +-
.../examples/DevelopersGuide/Drawing/TextDemo.java | 6 +-
.../FirstSteps/FirstLoadComponent.java | 36 +-
.../FirstSteps/HelloTextTableShape.java | 84 +--
.../DevelopersGuide/Forms/ButtonOperator.java | 2 +-
.../DevelopersGuide/Forms/ControlLock.java | 4 +-
.../DevelopersGuide/Forms/DataAwareness.java | 12 +-
.../Forms/DocumentBasedExample.java | 6 +-
.../DevelopersGuide/Forms/DocumentHelper.java | 38 +-
.../DevelopersGuide/Forms/DocumentViewHelper.java | 14 +-
.../examples/DevelopersGuide/Forms/FLTools.java | 14 +-
.../examples/DevelopersGuide/Forms/FormLayer.java | 12 +-
.../DevelopersGuide/Forms/GridFieldValidator.java | 4 +-
.../DevelopersGuide/Forms/HsqlDatabase.java | 18 +-
.../DevelopersGuide/Forms/KeyGenerator.java | 20 +-
.../odk/examples/DevelopersGuide/Forms/RowSet.java | 10 +-
.../DevelopersGuide/Forms/SalesFilter.java | 2 +-
.../Forms/SingleControlValidation.java | 6 +-
.../DevelopersGuide/Forms/SpreadsheetDocument.java | 10 +-
.../Forms/SpreadsheetValueBinding.java | 6 +-
.../DevelopersGuide/Forms/SpreadsheetView.java | 8 +-
.../Forms/TableCellTextBinding.java | 2 +-
main/odk/examples/DevelopersGuide/Forms/UNO.java | 18 +-
.../DevelopersGuide/Forms/ValueBinding.java | 6 +-
.../DevelopersGuide/GUI/DialogDocument.java | 12 +-
.../DevelopersGuide/GUI/ImageControlSample.java | 12 +-
.../examples/DevelopersGuide/GUI/MessageBox.java | 16 +-
.../GUI/RoadmapItemStateChangeListener.java | 2 +-
.../examples/DevelopersGuide/GUI/SystemDialog.java | 22 +-
.../DevelopersGuide/GUI/UnoDialogSample.java | 188 ++---
.../DevelopersGuide/GUI/UnoDialogSample2.java | 14 +-
main/odk/examples/DevelopersGuide/GUI/UnoMenu.java | 18 +-
.../odk/examples/DevelopersGuide/GUI/UnoMenu2.java | 8 +-
.../OfficeDev/Clipboard/Clipboard.java | 14 +-
.../OfficeDev/ContextMenuInterceptor.java | 28 +-
.../OfficeDev/DesktopEnvironment/DocumentView.java | 2 +-
.../DesktopEnvironment/FunctionHelper.java | 54 +-
.../OfficeDev/DesktopEnvironment/Interceptor.java | 4 +-
.../DesktopEnvironment/StatusListener.java | 2 +-
.../DisableCommands/DisableCommandsTest.java | 32 +-
.../AsciiFilter/AsciiReplaceFilter.java | 16 +-
.../AsciiFilter/FilterOptions.java | 2 +-
.../FlatXmlFilter_java/FlatXml.java | 6 +-
.../OfficeDev/Linguistic/LinguisticExamples.java | 4 +-
.../OfficeDev/Linguistic/OneInstanceFactory.java | 6 +-
.../OfficeDev/Linguistic/SampleHyphenator.java | 2 +-
.../OfficeDev/Linguistic/SampleSpellChecker.java | 2 +-
.../OfficeDev/Linguistic/SampleThesaurus.java | 2 +-
.../DevelopersGuide/OfficeDev/MenuElement.java | 4 +-
.../DevelopersGuide/OfficeDev/Number_Formats.java | 22 +-
.../OfficeDev/PathSettings/PathSettingsTest.java | 2 +-
.../PathSubstitution/PathSubstitutionTest.java | 2 +-
.../OfficeDev/TerminationTest/TerminationTest.java | 2 +-
.../InterprocessConn/ConnectionAwareClient.java | 14 +-
.../ProfUNO/InterprocessConn/UrlResolver.java | 2 +-
.../SimpleBootstrap_java/SimpleBootstrap_java.java | 2 +-
.../SayHello/SayHello/SayHello.java | 4 +-
.../ScriptSelector/ScriptSelector.java | 10 +-
.../Spreadsheet/GeneralTableSample.java | 28 +-
.../Spreadsheet/SpreadsheetDocHelper.java | 34 +-
.../Spreadsheet/SpreadsheetSample.java | 182 ++---
.../DevelopersGuide/Spreadsheet/ViewSample.java | 18 +-
.../DevelopersGuide/Text/TextDocuments.java | 228 +++---
.../DevelopersGuide/UCB/ChildrenRetriever.java | 6 +-
main/odk/examples/DevelopersGuide/UCB/Helper.java | 8 +-
.../DevelopersGuide/UCB/PropertiesComposer.java | 4 +-
.../DevelopersGuide/UCB/PropertiesRetriever.java | 2 +-
.../DevelopersGuide/UCB/ResourceCreator.java | 2 +-
.../java/ConverterServlet/ConverterServlet.java | 16 +-
.../java/DocumentHandling/DocumentConverter.java | 8 +-
.../java/DocumentHandling/DocumentLoader.java | 2 +-
.../java/DocumentHandling/DocumentPrinter.java | 4 +-
.../java/DocumentHandling/DocumentSaver.java | 8 +-
main/odk/examples/java/Drawing/SDraw.java | 26 +-
.../EmbedDocument/Container1/EmbedContApp.java | 52 +-
.../EmbedDocument/Container1/EmbedContFrame.java | 6 +-
.../EmbeddedObject/OwnEmbeddedObject.java | 34 +-
main/odk/examples/java/Inspector/Inspector.java | 30 +-
.../examples/java/Inspector/InspectorAddon.java | 8 +-
.../odk/examples/java/Inspector/InspectorPane.java | 4 +-
main/odk/examples/java/Inspector/Introspector.java | 28 +-
.../java/Inspector/ProtocolHandlerAddon.java | 8 +-
main/odk/examples/java/Inspector/TDocSupplier.java | 14 +-
.../odk/examples/java/Inspector/TestInspector.java | 4 +-
main/odk/examples/java/Inspector/UnoNode.java | 12 +-
.../examples/java/Inspector/UnoPropertyNode.java | 2 +-
.../odk/examples/java/NotesAccess/NotesAccess.java | 8 +-
.../examples/java/Spreadsheet/ChartTypeChange.java | 42 +-
.../examples/java/Spreadsheet/EuroAdaption.java | 28 +-
main/odk/examples/java/Spreadsheet/SCalc.java | 38 +-
.../java/Storage/StorageFunctionality.java | 8 +-
main/odk/examples/java/Storage/Test01.java | 6 +-
main/odk/examples/java/Storage/Test02.java | 4 +-
main/odk/examples/java/Storage/Test03.java | 8 +-
main/odk/examples/java/Storage/Test04.java | 8 +-
main/odk/examples/java/Storage/Test05.java | 4 +-
main/odk/examples/java/Storage/Test06.java | 4 +-
main/odk/examples/java/Storage/Test07.java | 8 +-
main/odk/examples/java/Storage/Test08.java | 10 +-
main/odk/examples/java/Storage/Test09.java | 6 +-
main/odk/examples/java/Storage/TestHelper.java | 44 +-
main/odk/examples/java/Text/BookmarkInsertion.java | 18 +-
main/odk/examples/java/Text/GraphicsInserter.java | 12 +-
main/odk/examples/java/Text/HardFormatting.java | 18 +-
main/odk/examples/java/Text/SWriter.java | 24 +-
main/odk/examples/java/Text/StyleCreation.java | 16 +-
.../examples/java/Text/StyleInitialization.java | 30 +-
.../examples/java/Text/TextDocumentStructure.java | 22 +-
main/odk/examples/java/Text/TextReplace.java | 12 +-
main/odk/examples/java/Text/WriterSelector.java | 20 +-
main/odk/examples/java/ToDo/ToDo.java | 34 +-
.../offapi/com/sun/star/document/FilterFactory.idl | 2 +-
.../sun/star/form/PropertyBrowserController.idl | 4 +-
main/offapi/com/sun/star/frame/XDispatch.idl | 2 +-
.../com/sun/star/text/XDependentTextField.idl | 2 +-
.../qa/ofopxmlstorages/StorageUnitTest.java | 2 +-
main/package/qa/ofopxmlstorages/Test03.java | 6 +-
main/package/qa/ofopxmlstorages/Test04.java | 2 +-
main/package/qa/ofopxmlstorages/Test07.java | 4 +-
main/package/qa/ofopxmlstorages/TestHelper.java | 44 +-
main/package/qa/storages/BorderedStream.java | 4 +-
.../package/qa/storages/RegressionTest_114358.java | 6 +-
.../package/qa/storages/RegressionTest_125919.java | 6 +-
.../package/qa/storages/RegressionTest_i26398.java | 2 +-
.../package/qa/storages/RegressionTest_i27773.java | 6 +-
.../package/qa/storages/RegressionTest_i29169.java | 6 +-
.../package/qa/storages/RegressionTest_i29321.java | 2 +-
.../package/qa/storages/RegressionTest_i30400.java | 8 +-
.../package/qa/storages/RegressionTest_i30677.java | 6 +-
.../package/qa/storages/RegressionTest_i35095.java | 4 +-
.../package/qa/storages/RegressionTest_i46848.java | 6 +-
.../package/qa/storages/RegressionTest_i49755.java | 6 +-
.../package/qa/storages/RegressionTest_i55821.java | 4 +-
.../package/qa/storages/RegressionTest_i59886.java | 10 +-
.../package/qa/storages/RegressionTest_i61909.java | 4 +-
.../package/qa/storages/RegressionTest_i84234.java | 4 +-
main/package/qa/storages/StorageUnitTest.java | 2 +-
main/package/qa/storages/Test01.java | 6 +-
main/package/qa/storages/Test02.java | 4 +-
main/package/qa/storages/Test03.java | 8 +-
main/package/qa/storages/Test04.java | 8 +-
main/package/qa/storages/Test05.java | 4 +-
main/package/qa/storages/Test06.java | 4 +-
main/package/qa/storages/Test07.java | 8 +-
main/package/qa/storages/Test08.java | 10 +-
main/package/qa/storages/Test09.java | 6 +-
main/package/qa/storages/Test10.java | 6 +-
main/package/qa/storages/Test11.java | 4 +-
main/package/qa/storages/Test12.java | 6 +-
main/package/qa/storages/Test13.java | 6 +-
main/package/qa/storages/Test14.java | 6 +-
main/package/qa/storages/Test15.java | 12 +-
main/package/qa/storages/Test16.java | 6 +-
main/package/qa/storages/Test17.java | 4 +-
main/package/qa/storages/Test18.java | 6 +-
main/package/qa/storages/TestHelper.java | 98 +--
.../src/main/java/basicrunner/BasicHandler.java | 12 +-
.../java/basicrunner/BasicHandlerProvider.java | 4 +-
.../java/basicrunner/basichelper/Connector.java | 2 +-
.../main/java/basicrunner/basichelper/Filter.java | 4 +-
.../java/basicrunner/basichelper/ThreadRunner.java | 8 +-
.../java/convwatch/GraphicalDifferenceCheck.java | 4 +-
.../java/convwatch/GraphicalTestArguments.java | 2 +-
.../main/java/convwatch/ReportDesignerTest.java | 24 +-
.../OpenOfficeDatabaseReportExtractor.java | 6 +-
.../src/main/java/helper/ConfigHelper.java | 26 +-
.../src/main/java/helper/ConfigurationRead.java | 6 +-
.../main/java/helper/ContextMenuInterceptor.java | 14 +-
.../OOoRunner/src/main/java/helper/InetTools.java | 6 +-
.../src/main/java/helper/StreamSimulator.java | 6 +-
.../src/main/java/helper/UnoProvider.java | 2 +-
.../ifc/accessibility/_XAccessibleComponent.java | 16 +-
.../_XAccessibleEventBroadcaster.java | 2 +-
.../_XAccessibleExtendedComponent.java | 2 +-
.../ifc/accessibility/_XAccessibleSelection.java | 6 +-
.../java/ifc/accessibility/_XAccessibleTable.java | 4 +-
.../java/ifc/accessibility/_XAccessibleText.java | 6 +-
.../src/main/java/ifc/awt/_XScrollBar.java | 6 +-
.../src/main/java/ifc/awt/_XSpinValue.java | 6 +-
.../src/main/java/ifc/awt/_XTopWindow.java | 2 +-
.../main/java/ifc/awt/_XUserInputInterception.java | 2 +-
.../src/main/java/ifc/beans/_XFastPropertySet.java | 4 +-
.../main/java/ifc/beans/_XMultiPropertyStates.java | 4 +-
.../src/main/java/ifc/beans/_XPropertyState.java | 2 +-
.../java/ifc/beans/_XTolerantMultiPropertySet.java | 4 +-
.../src/main/java/ifc/bridge/_XBridge.java | 2 +-
.../src/main/java/ifc/bridge/_XBridgeFactory.java | 4 +-
.../src/main/java/ifc/bridge/_XUnoUrlResolver.java | 6 +-
.../src/main/java/ifc/chart/_BarDiagram.java | 2 +-
.../main/java/ifc/chart/_Chart3DBarProperties.java | 4 +-
.../main/java/ifc/chart/_ChartAxisYSupplier.java | 2 +-
.../main/java/ifc/chart/_ChartAxisZSupplier.java | 2 +-
.../src/main/java/ifc/chart/_ChartStatistics.java | 2 +-
.../java/ifc/chart/_ChartTwoAxisXSupplier.java | 2 +-
.../java/ifc/chart/_ChartTwoAxisYSupplier.java | 2 +-
.../src/main/java/ifc/chart/_Diagram.java | 2 +-
.../src/main/java/ifc/chart/_Dim3DDiagram.java | 2 +-
.../src/main/java/ifc/chart/_LineDiagram.java | 2 +-
.../src/main/java/ifc/chart/_StackableDiagram.java | 2 +-
.../src/main/java/ifc/chart/_StockDiagram.java | 2 +-
.../src/main/java/ifc/chart/_XChartData.java | 4 +-
.../src/main/java/ifc/chart/_XChartDataArray.java | 2 +-
.../java/ifc/configuration/backend/_XBackend.java | 2 +-
.../ifc/configuration/backend/_XLayerHandler.java | 6 +-
.../java/ifc/configuration/backend/_XSchema.java | 4 +-
.../src/main/java/ifc/connection/_XAcceptor.java | 4 +-
.../src/main/java/ifc/connection/_XConnector.java | 2 +-
.../src/main/java/ifc/container/_XChild.java | 2 +-
.../src/main/java/ifc/container/_XContainer.java | 4 +-
.../main/java/ifc/container/_XIndexReplace.java | 4 +-
.../src/main/java/ifc/container/_XNameReplace.java | 6 +-
.../clipboard/_XClipboardNotifier.java | 4 +-
.../src/main/java/ifc/document/_LinkTarget.java | 2 +-
.../src/main/java/ifc/document/_Settings.java | 2 +-
.../java/ifc/document/_XDocumentInfoSupplier.java | 2 +-
.../java/ifc/document/_XDocumentInsertable.java | 2 +-
.../main/java/ifc/document/_XEventBroadcaster.java | 4 +-
.../src/main/java/ifc/document/_XFilter.java | 2 +-
.../ifc/document/_XStandaloneDocumentInfo.java | 4 +-
.../main/java/ifc/document/_XViewDataSupplier.java | 2 +-
.../java/ifc/drawing/_DrawingDocumentDrawView.java | 8 +-
.../main/java/ifc/drawing/_GraphicObjectShape.java | 4 +-
.../java/ifc/drawing/_LineShapeDescriptor.java | 2 +-
.../main/java/ifc/drawing/_ShapeDescriptor.java | 2 +-
.../main/java/ifc/drawing/_XConnectorShape.java | 4 +-
.../src/main/java/ifc/drawing/_XControlShape.java | 2 +-
.../java/ifc/drawing/_XDrawPageDuplicator.java | 2 +-
.../src/main/java/ifc/drawing/_XLayerSupplier.java | 2 +-
.../src/main/java/ifc/drawing/_XShapeBinder.java | 2 +-
.../src/main/java/ifc/drawing/_XShapeCombiner.java | 2 +-
.../main/java/ifc/drawing/_XShapeDescriptor.java | 2 +-
.../src/main/java/ifc/drawing/_XShapeGrouper.java | 2 +-
.../main/java/ifc/form/_XChangeBroadcaster.java | 4 +-
.../ifc/form/_XDatabaseParameterBroadcaster.java | 2 +-
.../src/main/java/ifc/form/_XFormController.java | 4 +-
.../OOoRunner/src/main/java/ifc/form/_XSubmit.java | 2 +-
.../validation/_XValidatableFormComponent.java | 2 +-
.../validation/_XValidityConstraintListener.java | 2 +-
.../src/main/java/ifc/frame/_XDispatch.java | 2 +-
.../main/java/ifc/frame/_XDispatchProvider.java | 4 +-
.../main/java/ifc/frame/_XDispatchRecorder.java | 2 +-
.../java/ifc/frame/_XDispatchRecorderSupplier.java | 8 +-
.../main/java/ifc/frame/_XDocumentTemplates.java | 8 +-
.../src/main/java/ifc/frame/_XFrameLoader.java | 2 +-
.../java/ifc/frame/_XSynchronousFrameLoader.java | 4 +-
.../src/main/java/ifc/io/_XActiveDataSink.java | 2 +-
.../src/main/java/ifc/io/_XActiveDataSource.java | 2 +-
.../src/main/java/ifc/io/_XConnectable.java | 2 +-
.../src/main/java/ifc/io/_XDataInputStream.java | 2 +-
.../src/main/java/ifc/io/_XInputStream.java | 2 +-
.../src/main/java/ifc/io/_XObjectInputStream.java | 4 +-
.../src/main/java/ifc/io/_XObjectOutputStream.java | 4 +-
.../src/main/java/ifc/io/_XPersistObject.java | 28 +-
.../java/ifc/loader/_XImplementationLoader.java | 2 +-
.../main/java/ifc/reflection/_XProxyFactory.java | 2 +-
.../ifc/script/_XInvocationAdapterFactory.java | 4 +-
.../ifc/script/_XInvocationAdapterFactory2.java | 4 +-
.../main/java/ifc/sdb/_DataAccessDescriptor.java | 12 +-
.../java/ifc/sdb/_XSingleSelectQueryAnalyzer.java | 2 +-
.../java/ifc/sdb/_XSingleSelectQueryComposer.java | 4 +-
.../src/main/java/ifc/sdbc/_XCloseable.java | 2 +-
.../src/main/java/ifc/sdbc/_XParameters.java | 4 +-
.../src/main/java/ifc/sdbc/_XResultSet.java | 4 +-
.../src/main/java/ifc/sdbc/_XResultSetUpdate.java | 2 +-
.../src/main/java/ifc/sdbc/_XRowUpdate.java | 4 +-
.../src/main/java/ifc/sdbcx/_XColumnsSupplier.java | 2 +-
.../java/ifc/sdbcx/_XDataDefinitionSupplier.java | 2 +-
.../src/main/java/ifc/sdbcx/_XDeleteRows.java | 4 +-
.../src/main/java/ifc/sdbcx/_XTablesSupplier.java | 2 +-
.../main/java/ifc/sheet/_FunctionDescription.java | 2 +-
.../src/main/java/ifc/sheet/_Scenario.java | 2 +-
.../OOoRunner/src/main/java/ifc/sheet/_Shape.java | 4 +-
.../ifc/sheet/_SpreadsheetDocumentSettings.java | 4 +-
.../java/ifc/sheet/_XActivationBroadcaster.java | 2 +-
.../main/java/ifc/sheet/_XArrayFormulaRange.java | 2 +-
.../main/java/ifc/sheet/_XCellRangeMovement.java | 18 +-
.../main/java/ifc/sheet/_XCellRangeReferrer.java | 2 +-
.../src/main/java/ifc/sheet/_XCellRangesQuery.java | 6 +-
.../src/main/java/ifc/sheet/_XCellSeries.java | 2 +-
.../main/java/ifc/sheet/_XDataPilotDescriptor.java | 6 +-
.../java/ifc/sheet/_XDataPilotFieldGrouping.java | 4 +-
.../src/main/java/ifc/sheet/_XDataPilotTable2.java | 20 +-
.../main/java/ifc/sheet/_XDocumentAuditing.java | 26 +-
.../ifc/sheet/_XEnhancedMouseClickBroadcaster.java | 4 +-
.../src/main/java/ifc/sheet/_XFormulaQuery.java | 2 +-
.../src/main/java/ifc/sheet/_XGoalSeek.java | 6 +-
.../main/java/ifc/sheet/_XMultipleOperation.java | 6 +-
.../src/main/java/ifc/sheet/_XNamedRanges.java | 6 +-
.../src/main/java/ifc/sheet/_XRangeSelection.java | 18 +-
.../main/java/ifc/sheet/_XScenarioEnhanced.java | 2 +-
.../src/main/java/ifc/sheet/_XSheetAnnotation.java | 4 +-
.../java/ifc/sheet/_XSheetAnnotationAnchor.java | 4 +-
.../src/main/java/ifc/sheet/_XSheetAuditing.java | 12 +-
.../src/main/java/ifc/sheet/_XSheetCellCursor.java | 38 +-
.../src/main/java/ifc/sheet/_XSheetFilterable.java | 8 +-
.../main/java/ifc/sheet/_XSheetFilterableEx.java | 2 +-
.../src/main/java/ifc/sheet/_XSheetOutline.java | 2 +-
.../src/main/java/ifc/sheet/_XSpreadsheet.java | 2 +-
.../java/ifc/sheet/_XSubTotalCalculatable.java | 2 +-
.../src/main/java/ifc/sheet/_XUsedAreaCursor.java | 4 +-
.../main/java/ifc/system/_XSystemShellExecute.java | 2 +-
.../src/main/java/ifc/table/_TableColumn.java | 2 +-
.../src/main/java/ifc/table/_XAutoFormattable.java | 6 +-
.../src/main/java/ifc/table/_XCellCursor.java | 14 +-
.../src/main/java/ifc/table/_XTableColumns.java | 4 +-
.../main/java/ifc/task/_XInteractionHandler.java | 4 +-
.../src/main/java/ifc/text/_BaseIndex.java | 8 +-
.../src/main/java/ifc/text/_MailMerge.java | 12 +-
.../src/main/java/ifc/text/_TextColumns.java | 2 +-
.../src/main/java/ifc/text/_TextGraphicObject.java | 4 +-
.../src/main/java/ifc/text/_XDocumentIndex.java | 4 +-
.../java/ifc/text/_XRelativeTextContentInsert.java | 2 +-
.../main/java/ifc/text/_XTextFieldsSupplier.java | 12 +-
.../src/main/java/ifc/text/_XTextRangeCompare.java | 2 +-
.../ucb/_XCachedDynamicResultSetStubFactory.java | 2 +-
.../src/main/java/ifc/ucb/_XCommandProcessor.java | 2 +-
.../java/ifc/ucb/_XContentProviderManager.java | 4 +-
.../src/main/java/ifc/ucb/_XSimpleFileAccess.java | 2 +-
.../ifc/ucb/_XSortedDynamicResultSetFactory.java | 6 +-
.../java/ifc/ui/_XContextMenuInterception.java | 10 +-
.../ui/_XModuleUIConfigurationManagerSupplier.java | 2 +-
.../main/java/ifc/ui/_XUIConfigurationManager.java | 18 +-
.../main/java/ifc/ui/dialogs/_XControlAccess.java | 2 +-
.../java/ifc/ui/dialogs/_XExecutableDialog.java | 4 +-
.../java/ifc/ui/dialogs/_XFilePickerNotifier.java | 8 +-
.../src/main/java/ifc/uno/_XComponentContext.java | 2 +-
.../src/main/java/ifc/util/_XCloneable.java | 4 +-
.../src/main/java/ifc/util/_XImportable.java | 2 +-
.../src/main/java/ifc/view/_XControlAccess.java | 8 +-
.../main/java/ifc/view/_XPrintJobBroadcaster.java | 2 +-
.../src/main/java/ifc/view/_XPrintable.java | 2 +-
.../src/main/java/lib/MultiPropertyTest.java | 2 +-
.../src/main/java/lib/TestParameters.java | 2 +-
.../src/main/java/mod/_basctl/AccessibleShape.java | 8 +-
.../mod/_cached/CachedContentResultSetFactory.java | 8 +-
.../_cached/CachedContentResultSetStubFactory.java | 6 +-
.../mod/_cached/CachedDynamicResultSetFactory.java | 8 +-
.../_cached/CachedDynamicResultSetStubFactory.java | 6 +-
.../main/java/mod/_cnt/ChaosContentProvider.java | 2 +-
.../main/java/mod/_cnt/CntUnoDataContainer.java | 2 +-
.../mod/_dbaccess/ConnectionLineAccessibility.java | 16 +-
.../java/mod/_dbaccess/JoinViewAccessibility.java | 16 +-
.../main/java/mod/_dbaccess/ODatabaseContext.java | 8 +-
.../main/java/mod/_dbaccess/ODatabaseSource.java | 8 +-
.../java/mod/_dbaccess/ODatasourceBrowser.java | 16 +-
.../src/main/java/mod/_dbaccess/OQueryDesign.java | 28 +-
.../main/java/mod/_dbaccess/OSQLMessageDialog.java | 4 +-
.../mod/_dbaccess/OSingleSelectQueryComposer.java | 16 +-
.../main/java/mod/_dbaccess/SbaXGridControl.java | 32 +-
.../mod/_dbaccess/TableWindowAccessibility.java | 18 +-
.../src/main/java/mod/_forms/GenericModelTest.java | 16 +-
.../src/main/java/mod/_forms/OButtonControl.java | 6 +-
.../src/main/java/mod/_forms/OCheckBoxControl.java | 8 +-
.../src/main/java/mod/_forms/OComboBoxControl.java | 8 +-
.../src/main/java/mod/_forms/OCurrencyControl.java | 8 +-
.../src/main/java/mod/_forms/ODatabaseForm.java | 40 +-
.../src/main/java/mod/_forms/ODateControl.java | 8 +-
.../src/main/java/mod/_forms/OEditControl.java | 10 +-
.../main/java/mod/_forms/OFileControlModel.java | 8 +-
.../main/java/mod/_forms/OFormattedControl.java | 8 +-
.../src/main/java/mod/_forms/OFormsCollection.java | 4 +-
.../main/java/mod/_forms/OGridControlModel.java | 14 +-
.../src/main/java/mod/_forms/OGroupBoxControl.java | 4 +-
.../src/main/java/mod/_forms/OHiddenModel.java | 4 +-
.../main/java/mod/_forms/OImageButtonControl.java | 6 +-
.../main/java/mod/_forms/OImageControlControl.java | 6 +-
.../src/main/java/mod/_forms/OListBoxControl.java | 10 +-
.../src/main/java/mod/_forms/OListBoxModel.java | 4 +-
.../java/mod/_forms/ONavigationBarControl.java | 4 +-
.../src/main/java/mod/_forms/ONumericControl.java | 8 +-
.../src/main/java/mod/_forms/OPatternControl.java | 8 +-
.../main/java/mod/_forms/ORadioButtonControl.java | 6 +-
.../src/main/java/mod/_forms/OScrollBarModel.java | 2 +-
.../src/main/java/mod/_forms/OSpinButtonModel.java | 2 +-
.../src/main/java/mod/_forms/OTimeControl.java | 8 +-
.../src/main/java/mod/_forms/OTimeModel.java | 4 +-
.../main/java/mod/_fwk/ControlMenuController.java | 6 +-
.../OOoRunner/src/main/java/mod/_fwk/Desktop.java | 2 +-
.../src/main/java/mod/_fwk/DispatchRecorder.java | 8 +-
.../src/main/java/mod/_fwk/DocumentProperties.java | 4 +-
.../OOoRunner/src/main/java/mod/_fwk/Frame.java | 4 +-
.../src/main/java/mod/_fwk/JobExecutor.java | 24 +-
.../src/main/java/mod/_fwk/LayoutManager.java | 6 +-
.../src/main/java/mod/_fwk/ModuleManager.java | 14 +-
.../mod/_fwk/ModuleUIConfigurationManager.java | 18 +-
.../main/java/mod/_fwk/ObjectMenuController.java | 2 +-
.../java/mod/_fwk/PopupMenuControllerFactory.java | 8 +-
.../java/mod/_fwk/StatusBarControllerFactory.java | 4 +-
.../main/java/mod/_fwk/UIConfigurationManager.java | 12 +-
.../java/mod/_fwk/UIElementFactoryManager.java | 2 +-
.../main/java/mod/_fwl/ContentHandlerFactory.java | 2 +-
.../src/main/java/mod/_fwl/FilterFactory.java | 2 +-
.../src/main/java/mod/_fwl/FrameLoaderFactory.java | 2 +-
.../src/main/java/mod/_fwl/PathSettings.java | 2 +-
.../src/main/java/mod/_fwl/TypeDetection.java | 4 +-
.../OOoRunner/src/main/java/mod/_lng/DicList.java | 2 +-
.../src/main/java/mod/_lnn/Hyphenator.java | 2 +-
.../src/main/java/mod/_lnn/SpellChecker.java | 2 +-
.../src/main/java/mod/_pcr/ObjectInspector.java | 18 +-
.../main/java/mod/_pcr/ObjectInspectorModel.java | 8 +-
.../_rdbtdp/RegistryTypeDescriptionProvider.java | 6 +-
.../RegistryTypeDescriptionProvider.java | 6 +-
.../main/java/mod/_remotebridge.uno/various.java | 16 +-
.../src/main/java/mod/_remotebridge/various.java | 16 +-
.../AccessibleEditableTextPara_HeaderFooter.java | 18 +-
.../AccessibleEditableTextPara_PreviewCell.java | 10 +-
.../src/main/java/mod/_sc/ScAccessibleCell.java | 12 +-
.../src/main/java/mod/_sc/ScAccessibleCsvCell.java | 8 +-
.../src/main/java/mod/_sc/ScAccessibleCsvGrid.java | 6 +-
.../main/java/mod/_sc/ScAccessibleCsvRuler.java | 10 +-
.../main/java/mod/_sc/ScAccessibleDocument.java | 2 +-
.../mod/_sc/ScAccessibleDocumentPagePreview.java | 14 +-
.../main/java/mod/_sc/ScAccessiblePageHeader.java | 14 +-
.../java/mod/_sc/ScAccessiblePageHeaderArea.java | 14 +-
.../main/java/mod/_sc/ScAccessiblePreviewCell.java | 10 +-
.../mod/_sc/ScAccessiblePreviewHeaderCell.java | 18 +-
.../java/mod/_sc/ScAccessiblePreviewTable.java | 12 +-
.../main/java/mod/_sc/ScAccessibleSpreadsheet.java | 6 +-
.../src/main/java/mod/_sc/ScAnnotationObj.java | 10 +-
.../main/java/mod/_sc/ScAnnotationShapeObj.java | 16 +-
.../main/java/mod/_sc/ScAnnotationTextCursor.java | 12 +-
.../src/main/java/mod/_sc/ScAnnotationsObj.java | 14 +-
.../src/main/java/mod/_sc/ScAreaLinkObj.java | 4 +-
.../src/main/java/mod/_sc/ScAreaLinksObj.java | 6 +-
.../main/java/mod/_sc/ScAutoFormatFieldObj.java | 4 +-
.../src/main/java/mod/_sc/ScAutoFormatObj.java | 4 +-
.../src/main/java/mod/_sc/ScAutoFormatsObj.java | 4 +-
.../src/main/java/mod/_sc/ScCellCursorObj.java | 8 +-
.../src/main/java/mod/_sc/ScCellFieldObj.java | 14 +-
.../src/main/java/mod/_sc/ScCellFieldsObj.java | 12 +-
.../java/mod/_sc/ScCellFormatsEnumeration.java | 8 +-
.../src/main/java/mod/_sc/ScCellFormatsObj.java | 6 +-
.../OOoRunner/src/main/java/mod/_sc/ScCellObj.java | 8 +-
.../src/main/java/mod/_sc/ScCellRangeObj.java | 10 +-
.../src/main/java/mod/_sc/ScCellRangesObj.java | 10 +-
.../src/main/java/mod/_sc/ScCellSearchObj.java | 6 +-
.../src/main/java/mod/_sc/ScCellTextCursor.java | 6 +-
.../src/main/java/mod/_sc/ScCellsEnumeration.java | 10 +-
.../src/main/java/mod/_sc/ScCellsObj.java | 10 +-
.../src/main/java/mod/_sc/ScChartObj.java | 10 +-
.../src/main/java/mod/_sc/ScChartsObj.java | 10 +-
.../java/mod/_sc/ScConsolidationDescriptor.java | 4 +-
.../src/main/java/mod/_sc/ScDDELinkObj.java | 6 +-
.../src/main/java/mod/_sc/ScDDELinksObj.java | 4 +-
.../java/mod/_sc/ScDataPilotFieldGroupItemObj.java | 34 +-
.../java/mod/_sc/ScDataPilotFieldGroupObj.java | 32 +-
.../java/mod/_sc/ScDataPilotFieldGroupsObj.java | 28 +-
.../src/main/java/mod/_sc/ScDataPilotFieldObj.java | 12 +-
.../main/java/mod/_sc/ScDataPilotFieldsObj.java | 6 +-
.../src/main/java/mod/_sc/ScDataPilotItemObj.java | 16 +-
.../src/main/java/mod/_sc/ScDataPilotItemsObj.java | 14 +-
.../src/main/java/mod/_sc/ScDataPilotTableObj.java | 12 +-
.../main/java/mod/_sc/ScDataPilotTablesObj.java | 6 +-
.../src/main/java/mod/_sc/ScDatabaseRangeObj.java | 16 +-
.../src/main/java/mod/_sc/ScDatabaseRangesObj.java | 4 +-
.../main/java/mod/_sc/ScDocumentConfiguration.java | 2 +-
.../src/main/java/mod/_sc/ScDrawPageObj.java | 6 +-
.../src/main/java/mod/_sc/ScDrawPagesObj.java | 4 +-
.../main/java/mod/_sc/ScFilterDescriptorBase.java | 6 +-
.../java/mod/_sc/ScFunctionDescriptionObj.java | 2 +-
.../src/main/java/mod/_sc/ScFunctionListObj.java | 2 +-
.../src/main/java/mod/_sc/ScHeaderFieldObj.java | 12 +-
.../src/main/java/mod/_sc/ScHeaderFieldsObj.java | 12 +-
.../java/mod/_sc/ScHeaderFooterContentObj.java | 6 +-
.../java/mod/_sc/ScHeaderFooterTextCursor.java | 6 +-
.../main/java/mod/_sc/ScHeaderFooterTextObj.java | 6 +-
.../main/java/mod/_sc/ScImportDescriptorBase.java | 8 +-
...ndexEnumeration_CellAnnotationsEnumeration.java | 8 +-
...cIndexEnumeration_CellAreaLinksEnumeration.java | 8 +-
.../ScIndexEnumeration_DDELinksEnumeration.java | 6 +-
...ndexEnumeration_DataPilotFieldsEnumeration.java | 8 +-
...IndexEnumeration_DataPilotItemsEnumeration.java | 16 +-
...ndexEnumeration_DataPilotTablesEnumeration.java | 8 +-
...IndexEnumeration_DatabaseRangesEnumeration.java | 6 +-
...Enumeration_FunctionDescriptionEnumeration.java | 4 +-
.../ScIndexEnumeration_LabelRangesEnumeration.java | 8 +-
.../ScIndexEnumeration_NamedRangesEnumeration.java | 8 +-
.../ScIndexEnumeration_ScenariosEnumeration.java | 12 +-
...ndexEnumeration_SheetCellRangesEnumeration.java | 10 +-
.../ScIndexEnumeration_SheetLinksEnumeration.java | 12 +-
...numeration_SpreadsheetViewPanesEnumeration.java | 8 +-
...ScIndexEnumeration_SpreadsheetsEnumeration.java | 6 +-
...IndexEnumeration_SubTotalFieldsEnumeration.java | 10 +-
...ndexEnumeration_TableAutoFormatEnumeration.java | 4 +-
.../ScIndexEnumeration_TableChartsEnumeration.java | 12 +-
...ScIndexEnumeration_TableColumnsEnumeration.java | 8 +-
...umeration_TableConditionalEntryEnumeration.java | 10 +-
.../ScIndexEnumeration_TableRowsEnumeration.java | 8 +-
.../ScIndexEnumeration_TextFieldEnumeration.java | 12 +-
.../src/main/java/mod/_sc/ScLabelRangeObj.java | 6 +-
.../src/main/java/mod/_sc/ScLabelRangesObj.java | 6 +-
.../src/main/java/mod/_sc/ScModelObj.java | 16 +-
.../src/main/java/mod/_sc/ScNamedRangeObj.java | 6 +-
.../src/main/java/mod/_sc/ScNamedRangesObj.java | 8 +-
.../main/java/mod/_sc/ScRecentFunctionsObj.java | 4 +-
.../src/main/java/mod/_sc/ScScenariosObj.java | 10 +-
.../src/main/java/mod/_sc/ScShapeObj.java | 2 +-
.../src/main/java/mod/_sc/ScSheetLinkObj.java | 10 +-
.../src/main/java/mod/_sc/ScSheetLinksObj.java | 10 +-
.../main/java/mod/_sc/ScSortDescriptorBase.java | 8 +-
.../java/mod/_sc/ScSpreadsheetSettingsObj.java | 2 +-
.../src/main/java/mod/_sc/ScStyleFamiliesObj.java | 4 +-
.../src/main/java/mod/_sc/ScStyleFamilyObj.java | 10 +-
.../src/main/java/mod/_sc/ScStyleObj.java | 18 +-
.../java/mod/_sc/ScSubTotalDescriptorBase.java | 6 +-
.../src/main/java/mod/_sc/ScSubTotalFieldObj.java | 8 +-
.../src/main/java/mod/_sc/ScTabViewObj.java | 18 +-
.../src/main/java/mod/_sc/ScTableColumnObj.java | 8 +-
.../src/main/java/mod/_sc/ScTableColumnsObj.java | 6 +-
.../main/java/mod/_sc/ScTableConditionalEntry.java | 8 +-
.../java/mod/_sc/ScTableConditionalFormat.java | 8 +-
.../src/main/java/mod/_sc/ScTableRowObj.java | 8 +-
.../src/main/java/mod/_sc/ScTableRowsObj.java | 6 +-
.../src/main/java/mod/_sc/ScTableSheetObj.java | 12 +-
.../src/main/java/mod/_sc/ScTableSheetsObj.java | 4 +-
.../main/java/mod/_sc/ScTableValidationObj.java | 6 +-
.../mod/_sc/ScUniqueCellFormatsEnumeration.java | 10 +-
.../main/java/mod/_sc/ScUniqueCellFormatsObj.java | 8 +-
.../src/main/java/mod/_sc/ScViewPaneObj.java | 12 +-
.../src/main/java/mod/_sc/XMLContentExporter.java | 6 +-
.../src/main/java/mod/_sc/XMLContentImporter.java | 4 +-
.../src/main/java/mod/_sc/XMLExporter.java | 8 +-
.../src/main/java/mod/_sc/XMLImporter.java | 6 +-
.../src/main/java/mod/_sc/XMLMetaExporter.java | 6 +-
.../src/main/java/mod/_sc/XMLMetaImporter.java | 8 +-
.../src/main/java/mod/_sc/XMLSettingsExporter.java | 6 +-
.../src/main/java/mod/_sc/XMLSettingsImporter.java | 8 +-
.../src/main/java/mod/_sc/XMLStylesExporter.java | 6 +-
.../src/main/java/mod/_sc/XMLStylesImporter.java | 8 +-
.../OOoRunner/src/main/java/mod/_sch/AccArea.java | 4 +-
.../OOoRunner/src/main/java/mod/_sch/AccAxis.java | 4 +-
.../src/main/java/mod/_sch/AccDataPoint.java | 4 +-
.../src/main/java/mod/_sch/AccDataSeries.java | 4 +-
.../src/main/java/mod/_sch/AccDiagram.java | 4 +-
.../OOoRunner/src/main/java/mod/_sch/AccFloor.java | 6 +-
.../OOoRunner/src/main/java/mod/_sch/AccGrid.java | 4 +-
.../src/main/java/mod/_sch/AccLegend.java | 4 +-
.../src/main/java/mod/_sch/AccLegendEntry.java | 4 +-
.../main/java/mod/_sch/AccStatisticsObject.java | 6 +-
.../OOoRunner/src/main/java/mod/_sch/AccTitle.java | 4 +-
.../OOoRunner/src/main/java/mod/_sch/AccWall.java | 6 +-
.../main/java/mod/_sch/AccessibleDocumentView.java | 2 +-
.../src/main/java/mod/_sch/ChXChartAxis.java | 2 +-
.../src/main/java/mod/_sch/ChXChartDocument.java | 2 +-
.../src/main/java/mod/_sch/ChXChartView.java | 6 +-
.../src/main/java/mod/_sch/ChXDataPoint.java | 2 +-
.../src/main/java/mod/_sch/ChXDataRow.java | 2 +-
.../src/main/java/mod/_sch/ChXDiagram.java | 16 +-
.../src/main/java/mod/_sch/ChartArea.java | 2 +-
.../src/main/java/mod/_sch/ChartGrid.java | 2 +-
.../src/main/java/mod/_sch/ChartLegend.java | 2 +-
.../java/mod/_sd/AccessibleDrawDocumentView.java | 8 +-
.../main/java/mod/_sd/AccessibleOutlineView.java | 8 +-
.../src/main/java/mod/_sd/AccessibleSlideView.java | 8 +-
.../main/java/mod/_sd/DrawController_DrawView.java | 22 +-
.../java/mod/_sd/DrawController_HandoutView.java | 26 +-
.../java/mod/_sd/DrawController_NotesView.java | 26 +-
.../java/mod/_sd/DrawController_OutlineView.java | 26 +-
.../mod/_sd/DrawController_PresentationView.java | 26 +-
.../src/main/java/mod/_sd/SdDocLinkTargets.java | 2 +-
.../src/main/java/mod/_sd/SdDrawPage.java | 8 +-
.../src/main/java/mod/_sd/SdDrawPagesAccess.java | 2 +-
.../src/main/java/mod/_sd/SdGenericDrawPage.java | 6 +-
.../OOoRunner/src/main/java/mod/_sd/SdLayer.java | 6 +-
.../src/main/java/mod/_sd/SdLayerManager.java | 8 +-
.../src/main/java/mod/_sd/SdMasterPage.java | 6 +-
.../src/main/java/mod/_sd/SdMasterPagesAccess.java | 2 +-
.../src/main/java/mod/_sd/SdPageLinkTargets.java | 6 +-
.../src/main/java/mod/_sd/SdUnoDrawView.java | 22 +-
.../src/main/java/mod/_sd/SdUnoOutlineView.java | 18 +-
.../src/main/java/mod/_sd/SdUnoPresView.java | 24 +-
.../src/main/java/mod/_sd/SdUnoSlideView.java | 12 +-
.../main/java/mod/_sd/SdXCustomPresentation.java | 12 +-
.../java/mod/_sd/SdXCustomPresentationAccess.java | 6 +-
.../src/main/java/mod/_sd/SdXImpressDocument.java | 8 +-
.../src/main/java/mod/_sd/SdXPresentation.java | 6 +-
.../OOoRunner/src/main/java/mod/_sd/SdXShape.java | 10 +-
.../java/mod/_servicemgr.uno/OServiceManager.java | 6 +-
.../src/main/java/mod/_sfx/DocumentTemplates.java | 2 +-
.../main/java/mod/_sfx/StandaloneDocumentInfo.java | 2 +-
.../src/main/java/mod/_sm/SmEditAccessible.java | 6 +-
.../src/main/java/mod/_sm/SmGraphicAccessible.java | 6 +-
.../src/main/java/mod/_sm/XMLExporter.java | 4 +-
.../src/main/java/mod/_sm/XMLImporter.java | 2 +-
.../src/main/java/mod/_sm/XMLMetaExporter.java | 4 +-
.../src/main/java/mod/_sm/XMLMetaImporter.java | 4 +-
.../src/main/java/mod/_sm/XMLSettingsExporter.java | 4 +-
.../src/main/java/mod/_sm/XMLSettingsImporter.java | 2 +-
.../src/main/java/mod/_smgr/OServiceManager.java | 6 +-
.../src/main/java/mod/_stm/DataInputStream.java | 10 +-
.../src/main/java/mod/_stm/DataOutputStream.java | 10 +-
.../main/java/mod/_stm/MarkableInputStream.java | 8 +-
.../main/java/mod/_stm/MarkableOutputStream.java | 12 +-
.../src/main/java/mod/_stm/ObjectInputStream.java | 24 +-
.../src/main/java/mod/_stm/ObjectOutputStream.java | 28 +-
.../OOoRunner/src/main/java/mod/_stm/Pipe.java | 2 +-
.../OOoRunner/src/main/java/mod/_stm/Pump.java | 4 +-
.../java/mod/_streams.uno/DataInputStream.java | 10 +-
.../java/mod/_streams.uno/DataOutputStream.java | 10 +-
.../java/mod/_streams.uno/MarkableInputStream.java | 8 +-
.../mod/_streams.uno/MarkableOutputStream.java | 12 +-
.../java/mod/_streams.uno/ObjectInputStream.java | 24 +-
.../java/mod/_streams.uno/ObjectOutputStream.java | 28 +-
.../src/main/java/mod/_streams.uno/Pipe.java | 2 +-
.../src/main/java/mod/_streams.uno/Pump.java | 4 +-
.../java/mod/_svtools/AccessibleBrowseBox.java | 8 +-
.../mod/_svtools/AccessibleBrowseBoxHeaderBar.java | 10 +-
.../_svtools/AccessibleBrowseBoxHeaderCell.java | 8 +-
.../mod/_svtools/AccessibleBrowseBoxTable.java | 8 +-
.../mod/_svtools/AccessibleBrowseBoxTableCell.java | 8 +-
.../mod/_svtools/AccessibleIconChoiceCtrl.java | 16 +-
.../_svtools/AccessibleIconChoiceCtrlEntry.java | 12 +-
.../main/java/mod/_svtools/AccessibleTabBar.java | 4 +-
.../java/mod/_svtools/AccessibleTabBarPage.java | 8 +-
.../mod/_svtools/AccessibleTabBarPageList.java | 10 +-
.../java/mod/_svtools/AccessibleTreeListBox.java | 6 +-
.../mod/_svtools/AccessibleTreeListBoxEntry.java | 12 +-
.../main/java/mod/_svx/AccessibleControlShape.java | 2 +-
.../java/mod/_svx/AccessibleEditableTextPara.java | 8 +-
.../main/java/mod/_svx/AccessibleGraphicShape.java | 2 +-
.../src/main/java/mod/_svx/AccessibleOLEShape.java | 4 +-
.../main/java/mod/_svx/AccessiblePageShape.java | 4 +-
.../_svx/AccessiblePresentationGraphicShape.java | 8 +-
.../mod/_svx/AccessiblePresentationOLEShape.java | 8 +-
.../java/mod/_svx/AccessiblePresentationShape.java | 8 +-
.../src/main/java/mod/_svx/AccessibleShape.java | 2 +-
.../src/main/java/mod/_svx/GraphicExporter.java | 8 +-
.../src/main/java/mod/_svx/SvxDrawPage.java | 8 +-
.../mod/_svx/SvxGraphCtrlAccessibleContext.java | 20 +-
.../src/main/java/mod/_svx/SvxGraphicObject.java | 8 +-
.../OOoRunner/src/main/java/mod/_svx/SvxShape.java | 4 +-
.../src/main/java/mod/_svx/SvxShapeCircle.java | 6 +-
.../src/main/java/mod/_svx/SvxShapeCollection.java | 2 +-
.../src/main/java/mod/_svx/SvxShapeConnector.java | 8 +-
.../src/main/java/mod/_svx/SvxShapeControl.java | 4 +-
.../main/java/mod/_svx/SvxShapeDimensioning.java | 4 +-
.../src/main/java/mod/_svx/SvxShapeGroup.java | 12 +-
.../main/java/mod/_svx/SvxShapePolyPolygon.java | 10 +-
.../java/mod/_svx/SvxShapePolyPolygonBezier.java | 10 +-
.../main/java/mod/_svx/SvxUnoNumberingRules.java | 4 +-
.../src/main/java/mod/_svx/SvxUnoText.java | 4 +-
.../src/main/java/mod/_svx/SvxUnoTextContent.java | 4 +-
.../main/java/mod/_svx/SvxUnoTextContentEnum.java | 4 +-
.../src/main/java/mod/_svx/SvxUnoTextCursor.java | 2 +-
.../src/main/java/mod/_svx/SvxUnoTextField.java | 6 +-
.../src/main/java/mod/_svx/SvxUnoTextRange.java | 6 +-
.../java/mod/_svx/SvxUnoTextRangeEnumeration.java | 6 +-
.../src/main/java/mod/_sw/CharacterStyle.java | 20 +-
.../java/mod/_sw/ConditionalParagraphStyle.java | 18 +-
.../OOoRunner/src/main/java/mod/_sw/PageStyle.java | 18 +-
.../src/main/java/mod/_sw/ParagraphStyle.java | 18 +-
.../java/mod/_sw/SwAccessibleDocumentPageView.java | 6 +-
.../java/mod/_sw/SwAccessibleDocumentView.java | 4 +-
.../main/java/mod/_sw/SwAccessibleEndnoteView.java | 10 +-
.../main/java/mod/_sw/SwAccessibleFooterView.java | 8 +-
.../java/mod/_sw/SwAccessibleFootnoteView.java | 8 +-
.../main/java/mod/_sw/SwAccessibleHeaderView.java | 6 +-
.../main/java/mod/_sw/SwAccessiblePageView.java | 16 +-
.../java/mod/_sw/SwAccessibleParagraphView.java | 2 +-
.../java/mod/_sw/SwAccessibleTableCellView.java | 4 +-
.../main/java/mod/_sw/SwAccessibleTableView.java | 4 +-
.../mod/_sw/SwAccessibleTextEmbeddedObject.java | 4 +-
.../java/mod/_sw/SwAccessibleTextFrameView.java | 8 +-
.../mod/_sw/SwAccessibleTextGraphicObject.java | 6 +-
.../main/java/mod/_sw/SwXAutoTextContainer.java | 2 +-
.../src/main/java/mod/_sw/SwXAutoTextEntry.java | 6 +-
.../src/main/java/mod/_sw/SwXAutoTextGroup.java | 6 +-
.../src/main/java/mod/_sw/SwXBookmark.java | 2 +-
.../src/main/java/mod/_sw/SwXBookmarks.java | 2 +-
.../OOoRunner/src/main/java/mod/_sw/SwXCell.java | 2 +-
.../src/main/java/mod/_sw/SwXCellRange.java | 4 +-
.../src/main/java/mod/_sw/SwXChapterNumbering.java | 2 +-
.../src/main/java/mod/_sw/SwXDocumentIndex.java | 4 +-
.../main/java/mod/_sw/SwXDocumentIndexMark.java | 6 +-
.../src/main/java/mod/_sw/SwXDocumentIndexes.java | 2 +-
.../src/main/java/mod/_sw/SwXDrawPage.java | 4 +-
.../main/java/mod/_sw/SwXEndnoteProperties.java | 8 +-
.../src/main/java/mod/_sw/SwXFieldEnumeration.java | 10 +-
.../src/main/java/mod/_sw/SwXFieldMaster.java | 2 +-
.../src/main/java/mod/_sw/SwXFootnote.java | 6 +-
.../main/java/mod/_sw/SwXFootnoteProperties.java | 6 +-
.../src/main/java/mod/_sw/SwXFootnoteText.java | 6 +-
.../src/main/java/mod/_sw/SwXFootnotes.java | 6 +-
.../OOoRunner/src/main/java/mod/_sw/SwXFrames.java | 6 +-
.../src/main/java/mod/_sw/SwXHeadFootText.java | 6 +-
.../java/mod/_sw/SwXLineNumberingProperties.java | 2 +-
.../src/main/java/mod/_sw/SwXMailMerge.java | 26 +-
.../src/main/java/mod/_sw/SwXNumberingRules.java | 8 +-
.../src/main/java/mod/_sw/SwXParagraph.java | 12 +-
.../main/java/mod/_sw/SwXParagraphEnumeration.java | 2 +-
.../src/main/java/mod/_sw/SwXPrintSettings.java | 2 +-
.../src/main/java/mod/_sw/SwXPropertySetInfo.java | 2 +-
.../src/main/java/mod/_sw/SwXReferenceMark.java | 8 +-
.../src/main/java/mod/_sw/SwXReferenceMarks.java | 12 +-
.../OOoRunner/src/main/java/mod/_sw/SwXShape.java | 4 +-
.../OOoRunner/src/main/java/mod/_sw/SwXStyle.java | 16 +-
.../src/main/java/mod/_sw/SwXStyleFamilies.java | 4 +-
.../src/main/java/mod/_sw/SwXStyleFamily.java | 8 +-
.../src/main/java/mod/_sw/SwXTableCellText.java | 2 +-
.../src/main/java/mod/_sw/SwXTextColumns.java | 6 +-
.../src/main/java/mod/_sw/SwXTextCursor.java | 4 +-
.../src/main/java/mod/_sw/SwXTextDefaults.java | 2 +-
.../src/main/java/mod/_sw/SwXTextDocument.java | 32 +-
.../main/java/mod/_sw/SwXTextEmbeddedObject.java | 14 +-
.../main/java/mod/_sw/SwXTextEmbeddedObjects.java | 8 +-
.../src/main/java/mod/_sw/SwXTextField.java | 10 +-
.../src/main/java/mod/_sw/SwXTextFieldMasters.java | 2 +-
.../src/main/java/mod/_sw/SwXTextFieldTypes.java | 2 +-
.../src/main/java/mod/_sw/SwXTextFrame.java | 8 +-
.../src/main/java/mod/_sw/SwXTextFrameText.java | 4 +-
.../main/java/mod/_sw/SwXTextGraphicObject.java | 10 +-
.../main/java/mod/_sw/SwXTextGraphicObjects.java | 6 +-
.../src/main/java/mod/_sw/SwXTextPortion.java | 8 +-
.../java/mod/_sw/SwXTextPortionEnumeration.java | 4 +-
.../src/main/java/mod/_sw/SwXTextRanges.java | 2 +-
.../src/main/java/mod/_sw/SwXTextSearch.java | 2 +-
.../src/main/java/mod/_sw/SwXTextSection.java | 20 +-
.../src/main/java/mod/_sw/SwXTextSections.java | 8 +-
.../src/main/java/mod/_sw/SwXTextTable.java | 12 +-
.../src/main/java/mod/_sw/SwXTextTableRow.java | 2 +-
.../src/main/java/mod/_sw/SwXTextTables.java | 4 +-
.../src/main/java/mod/_sw/SwXTextView.java | 20 +-
.../src/main/java/mod/_sw/SwXTextViewCursor.java | 2 +-
.../src/main/java/mod/_sw/SwXViewSettings.java | 2 +-
.../src/main/java/mod/_sw/XMLContentExporter.java | 2 +-
.../src/main/java/mod/_sw/XMLContentImporter.java | 4 +-
.../src/main/java/mod/_sw/XMLExporter.java | 2 +-
.../src/main/java/mod/_sw/XMLImporter.java | 4 +-
.../src/main/java/mod/_sw/XMLMetaExporter.java | 6 +-
.../src/main/java/mod/_sw/XMLMetaImporter.java | 6 +-
.../src/main/java/mod/_sw/XMLSettingsExporter.java | 4 +-
.../src/main/java/mod/_sw/XMLSettingsImporter.java | 2 +-
.../src/main/java/mod/_sw/XMLStylesExporter.java | 4 +-
.../src/main/java/mod/_sw/XMLStylesImporter.java | 2 +-
.../java/mod/_tdmgr/TypeDescriptionManager.java | 4 +-
.../main/java/mod/_toolkit/AccessibleButton.java | 16 +-
.../main/java/mod/_toolkit/AccessibleCheckBox.java | 16 +-
.../main/java/mod/_toolkit/AccessibleComboBox.java | 18 +-
.../mod/_toolkit/AccessibleDropDownComboBox.java | 2 +-
.../mod/_toolkit/AccessibleDropDownListBox.java | 2 +-
.../src/main/java/mod/_toolkit/AccessibleEdit.java | 16 +-
.../java/mod/_toolkit/AccessibleFixedText.java | 18 +-
.../src/main/java/mod/_toolkit/AccessibleList.java | 18 +-
.../main/java/mod/_toolkit/AccessibleListBox.java | 18 +-
.../main/java/mod/_toolkit/AccessibleListItem.java | 16 +-
.../src/main/java/mod/_toolkit/AccessibleMenu.java | 6 +-
.../main/java/mod/_toolkit/AccessibleMenuBar.java | 2 +-
.../main/java/mod/_toolkit/AccessibleMenuItem.java | 10 +-
.../java/mod/_toolkit/AccessibleMenuSeparator.java | 2 +-
.../java/mod/_toolkit/AccessiblePopupMenu.java | 12 +-
.../java/mod/_toolkit/AccessibleRadioButton.java | 20 +-
.../java/mod/_toolkit/AccessibleScrollBar.java | 6 +-
.../java/mod/_toolkit/AccessibleStatusBar.java | 2 +-
.../java/mod/_toolkit/AccessibleStatusBarItem.java | 4 +-
.../java/mod/_toolkit/AccessibleTabControl.java | 16 +-
.../main/java/mod/_toolkit/AccessibleTabPage.java | 18 +-
.../main/java/mod/_toolkit/AccessibleToolBox.java | 4 +-
.../java/mod/_toolkit/AccessibleToolBoxItem.java | 6 +-
.../main/java/mod/_toolkit/AccessibleWindow.java | 8 +-
.../java/mod/_toolkit/MutableTreeDataModel.java | 2 +-
.../main/java/mod/_toolkit/MutableTreeNode.java | 6 +-
.../src/main/java/mod/_toolkit/TabController.java | 6 +-
.../src/main/java/mod/_toolkit/Toolkit.java | 8 +-
.../main/java/mod/_toolkit/UnoControlButton.java | 2 +-
.../main/java/mod/_toolkit/UnoControlCheckBox.java | 4 +-
.../main/java/mod/_toolkit/UnoControlComboBox.java | 6 +-
.../java/mod/_toolkit/UnoControlContainer.java | 14 +-
.../java/mod/_toolkit/UnoControlCurrencyField.java | 6 +-
.../java/mod/_toolkit/UnoControlDateField.java | 4 +-
.../main/java/mod/_toolkit/UnoControlDialog.java | 24 +-
.../java/mod/_toolkit/UnoControlDialogModel.java | 18 +-
.../src/main/java/mod/_toolkit/UnoControlEdit.java | 6 +-
.../java/mod/_toolkit/UnoControlFileControl.java | 6 +-
.../java/mod/_toolkit/UnoControlFixedText.java | 4 +-
.../mod/_toolkit/UnoControlFormattedField.java | 8 +-
.../main/java/mod/_toolkit/UnoControlGroupBox.java | 4 +-
.../java/mod/_toolkit/UnoControlImageControl.java | 6 +-
.../main/java/mod/_toolkit/UnoControlListBox.java | 6 +-
.../java/mod/_toolkit/UnoControlNumericField.java | 8 +-
.../java/mod/_toolkit/UnoControlPatternField.java | 6 +-
.../java/mod/_toolkit/UnoControlRadioButton.java | 4 +-
.../java/mod/_toolkit/UnoControlTimeField.java | 6 +-
.../java/mod/_toolkit/UnoScrollBarControl.java | 6 +-
.../java/mod/_toolkit/UnoSpinButtonControl.java | 4 +-
.../src/main/java/mod/_toolkit/UnoTreeControl.java | 32 +-
.../mod/_typemgr.uno/TypeDescriptionManager.java | 4 +-
.../main/java/mod/_ucb/UniversalContentBroker.java | 2 +-
.../java/mod/_ucpchelp/CHelpContentProvider.java | 2 +-
.../java/mod/_ucpdav/WebDAVContentProvider.java | 2 +-
.../src/main/java/mod/_ucpfile/FileProvider.java | 2 +-
.../main/java/mod/_ucpftp/FTPContentProvider.java | 2 +-
.../mod/_ucphier/HierarchyContentProvider.java | 2 +-
.../java/mod/_ucppkg/PackageContentProvider.java | 2 +-
.../src/main/java/mod/_ucprmt/ContentProvider.java | 2 +-
.../main/java/mod/_ucprmt/ProviderAcceptor.java | 2 +-
.../src/main/java/mod/_ucprmt/ProxyProvider.java | 2 +-
.../java/mod/_xmloff/Chart/XMLContentExporter.java | 4 +-
.../java/mod/_xmloff/Chart/XMLContentImporter.java | 2 +-
.../main/java/mod/_xmloff/Chart/XMLExporter.java | 4 +-
.../main/java/mod/_xmloff/Chart/XMLImporter.java | 2 +-
.../java/mod/_xmloff/Chart/XMLStylesExporter.java | 2 +-
.../java/mod/_xmloff/Draw/XMLContentExporter.java | 12 +-
.../java/mod/_xmloff/Draw/XMLContentImporter.java | 4 +-
.../main/java/mod/_xmloff/Draw/XMLExporter.java | 12 +-
.../main/java/mod/_xmloff/Draw/XMLImporter.java | 4 +-
.../java/mod/_xmloff/Draw/XMLMetaExporter.java | 6 +-
.../java/mod/_xmloff/Draw/XMLMetaImporter.java | 4 +-
.../java/mod/_xmloff/Draw/XMLSettingsExporter.java | 6 +-
.../java/mod/_xmloff/Draw/XMLSettingsImporter.java | 4 +-
.../java/mod/_xmloff/Draw/XMLStylesExporter.java | 8 +-
.../java/mod/_xmloff/Draw/XMLStylesImporter.java | 4 +-
.../mod/_xmloff/Impress/XMLContentExporter.java | 6 +-
.../mod/_xmloff/Impress/XMLContentImporter.java | 4 +-
.../main/java/mod/_xmloff/Impress/XMLExporter.java | 6 +-
.../main/java/mod/_xmloff/Impress/XMLImporter.java | 4 +-
.../java/mod/_xmloff/Impress/XMLMetaExporter.java | 6 +-
.../java/mod/_xmloff/Impress/XMLMetaImporter.java | 4 +-
.../mod/_xmloff/Impress/XMLSettingsExporter.java | 10 +-
.../mod/_xmloff/Impress/XMLSettingsImporter.java | 4 +-
.../mod/_xmloff/Impress/XMLStylesExporter.java | 8 +-
.../mod/_xmloff/Impress/XMLStylesImporter.java | 4 +-
.../src/main/java/util/AccessibilityTools.java | 6 +-
.../src/main/java/util/BasicMacroTools.java | 22 +-
.../OOoRunner/src/main/java/util/CalcTools.java | 6 +-
.../java/OOoRunner/src/main/java/util/DBTools.java | 38 +-
.../OOoRunner/src/main/java/util/DesktopTools.java | 32 +-
.../OOoRunner/src/main/java/util/DrawTools.java | 4 +-
.../OOoRunner/src/main/java/util/FormTools.java | 52 +-
.../OOoRunner/src/main/java/util/FrameDsc.java | 4 +-
.../OOoRunner/src/main/java/util/InstCreator.java | 14 +-
.../src/main/java/util/RegistryTools.java | 2 +-
.../src/main/java/util/SOfficeFactory.java | 48 +-
.../OOoRunner/src/main/java/util/SysUtils.java | 6 +-
.../java/OOoRunner/src/main/java/util/UITools.java | 46 +-
.../OOoRunner/src/main/java/util/WriterTools.java | 12 +-
.../OOoRunner/src/main/java/util/XMLTools.java | 22 +-
.../src/main/java/util/db/DataSource.java | 6 +-
.../src/main/java/util/db/DatabaseDocument.java | 8 +-
.../java/OOoRunner/src/main/java/util/dbg.java | 6 +-
.../java/OOoRunner/src/main/java/util/utils.java | 26 +-
.../backend/org/openoffice/JavaSystemBackend.java | 2 +-
.../java/com/sun/star/report/SDBCReportData.java | 12 +-
.../com/sun/star/report/SDBCReportDataFactory.java | 24 +-
.../java/com/sun/star/report/SOImageService.java | 6 +-
.../com/sun/star/report/StorageRepository.java | 12 +-
.../sun/star/report/pentaho/SOFormulaParser.java | 2 +-
.../star/report/pentaho/SOReportJobFactory.java | 16 +-
.../complex/reportdesign/ReportDesignerTest.java | 2 +-
main/sc/qa/complex/calcPreview/ViewForwarder.java | 2 +-
main/sc/source/ui/vba/vbachart.cxx | 8 +-
.../examples/beanshell/Capitalise/capitalise.bsh | 12 +-
.../examples/beanshell/HelloWorld/helloworld.bsh | 2 +-
.../beanshell/Highlight/ButtonPressHandler.bsh | 14 +-
.../examples/beanshell/Highlight/ShowDialog.bsh | 4 +-
.../examples/beanshell/Highlight/highlighter.bsh | 6 +-
.../examples/beanshell/MemoryUsage/memusage.bsh | 26 +-
.../examples/beanshell/WordCount/wordcount.bsh | 8 +-
.../examples/java/HelloWorld/HelloWorld.java | 2 +-
.../examples/java/Highlight/HighlightText.java | 18 +-
.../examples/java/MemoryUsage/MemoryUsage.java | 26 +-
.../examples/java/Newsgroup/MimeConfiguration.java | 2 +-
.../examples/java/Newsgroup/OfficeAttachment.java | 2 +-
.../examples/java/selector/ScriptSelector.java | 16 +-
.../script/framework/security/SecurityDialog.java | 48 +-
.../script/framework/browse/DialogFactory.java | 62 +-
.../script/framework/browse/ParcelBrowseNode.java | 2 +-
.../framework/browse/ProviderBrowseNode.java | 2 +-
.../script/framework/browse/ScriptBrowseNode.java | 2 +-
.../star/script/framework/container/Parcel.java | 2 +-
.../framework/container/ParcelContainer.java | 8 +-
.../script/framework/container/ScriptMetaData.java | 2 +-
.../framework/container/UnoPkgContainer.java | 2 +-
.../star/script/framework/io/UCBStreamHandler.java | 2 +-
.../star/script/framework/io/XStorageHelper.java | 14 +-
.../framework/provider/EditorScriptContext.java | 4 +-
.../script/framework/provider/ScriptContext.java | 2 +-
.../script/framework/provider/ScriptProvider.java | 24 +-
.../framework/provider/beanshell/template.bsh | 2 +-
.../idesupport/localoffice/LocalOfficeImpl.java | 10 +-
.../office/resources/templates/HelloWorld.java_ | 2 +-
.../workben/ifc/scripting/ScriptingUtils.java | 8 +-
.../workben/ifc/scripting/SecurityDialogUtil.java | 8 +-
.../workben/ifc/scripting/_XScriptInfoAccess.java | 2 +-
.../workben/ifc/scripting/_XScriptInvocation.java | 10 +-
.../ifc/scripting/_XScriptNameResolver.java | 8 +-
.../workben/ifc/scripting/_XScriptSecurity.java | 20 +-
.../ifc/scripting/_XScriptStorageManager.java | 2 +-
.../scripting/workben/mod/_scripting/Dispatch.java | 4 +-
.../scripting/workben/mod/_scripting/Function.java | 4 +-
.../workben/mod/_scripting/FunctionProvider.java | 2 +-
.../workben/mod/_scripting/ScriptInfo.java | 4 +-
.../workben/mod/_scripting/ScriptStorage.java | 2 +-
.../mod/_scripting/ScriptStorageManager.java | 4 +-
main/sfx2/qa/complex/sfx2/DocumentInfo.java | 2 +-
main/sfx2/qa/complex/sfx2/DocumentProperties.java | 4 +-
.../accessibility/AccessibleRelationSet.java | 20 +-
.../sw/qa/complex/checkColor/CheckChangeColor.java | 6 +-
.../CheckIndeterminateState.java | 4 +-
main/sw/qa/complex/writer/CheckBookmarks.java | 18 +-
.../sw/qa/complex/writer/CheckCrossReferences.java | 36 +-
main/sw/qa/complex/writer/CheckFlies.java | 12 +-
main/sw/qa/complex/writer/LoadSaveTest.java | 8 +-
.../complex/writer/TextPortionEnumerationTest.java | 218 +++---
.../mediawiki/src/com/sun/star/wiki/Helper.java | 58 +-
.../sun/star/wiki/MainThreadDialogExecutor.java | 2 +-
.../mediawiki/src/com/sun/star/wiki/Settings.java | 20 +-
.../src/com/sun/star/wiki/WikiDialog.java | 32 +-
.../src/com/sun/star/wiki/WikiEditorImpl.java | 20 +-
.../sun/star/wiki/WikiOptionsEventHandlerImpl.java | 6 +-
main/toolkit/test/accessibility/AccTreeNode.java | 14 +-
.../test/accessibility/AccessibilityTreeModel.java | 2 +-
.../test/accessibility/AccessibilityWorkBench.java | 2 +-
.../accessibility/AccessibleActionHandler.java | 4 +-
.../test/accessibility/AccessibleCellHandler.java | 4 +-
.../accessibility/AccessibleComponentHandler.java | 2 +-
.../AccessibleEditableTextHandler.java | 4 +-
.../AccessibleExtendedComponentHandler.java | 4 +-
.../accessibility/AccessibleHyperlinkHandler.java | 4 +-
.../accessibility/AccessibleHypertextHandler.java | 4 +-
.../test/accessibility/AccessibleImageHandler.java | 4 +-
.../accessibility/AccessibleRelationHandler.java | 2 +-
.../accessibility/AccessibleSelectionHandler.java | 2 +-
.../test/accessibility/AccessibleTableHandler.java | 4 +-
.../test/accessibility/AccessibleTextHandler.java | 2 +-
.../test/accessibility/AccessibleUNOHandler.java | 4 +-
.../test/accessibility/ChildEventHandler.java | 4 +-
main/toolkit/test/accessibility/EventHandler.java | 4 +-
.../test/accessibility/InformationWriter.java | 28 +-
.../test/accessibility/OfficeConnection.java | 4 +-
.../toolkit/test/accessibility/QueuedListener.java | 4 +-
main/toolkit/test/accessibility/SimpleOffice.java | 28 +-
.../test/accessibility/TextUpdateListener.java | 2 +-
.../test/accessibility/TopWindowListener.java | 4 +-
main/toolkit/test/accessibility/ov/FocusView.java | 4 +-
.../test/accessibility/ov/ListeningObjectView.java | 4 +-
.../test/accessibility/ov/SelectionView.java | 4 +-
main/toolkit/test/accessibility/ov/TextView.java | 4 +-
main/ucb/qa/complex/tdoc/_XChild.java | 2 +-
main/ucb/qa/complex/tdoc/_XCommandProcessor.java | 4 +-
.../com/sun/star/comp/ucb/GlobalTransfer_Test.java | 8 +-
.../source/skeletonmaker/javacompskeleton.cxx | 2 +-
.../com/sun/star/wizards/common/FileAccess.java | 4 +-
.../com/sun/star/wizards/db/TableDescriptor.java | 2 +-
.../sun/star/wizards/report/CallReportWizard.java | 2 +-
.../sun/star/wizards/report/ReportFinalizer.java | 2 +-
.../sun/star/wizards/report/ReportLayouter.java | 2 +-
.../layout/ReportBuilderLayouter.java | 6 +-
.../com/sun/star/wizards/ui/ButtonList.java | 2 +-
.../sun/star/wizards/ui/CommandFieldSelection.java | 2 +-
.../com/sun/star/wizards/ui/DocumentPreview.java | 6 +-
.../wizards/com/sun/star/wizards/ui/ImageList.java | 4 +-
.../wizards/com/sun/star/wizards/ui/UnoDialog.java | 6 +-
.../com/sun/star/wizards/ui/WizardDialog.java | 2 +-
.../com/sun/star/wizards/web/WWD_Events.java | 2 +-
.../star/wizards/web/export/AbstractExporter.java | 2 +-
.../XMergeBridge/src/main/java/XMergeBridge.java | 14 +-
main/xmlsecurity/tools/uno/EncryptionEntity.java | 24 +-
main/xmlsecurity/tools/uno/SecurityEntity.java | 6 +-
main/xmlsecurity/tools/uno/SignatureEntity.java | 26 +-
main/xmlsecurity/tools/uno/TestTool.java | 12 +-
.../tools/uno/XMLSecurityFrameworkController.java | 22 +-
.../source/api/i18n/XBreakIteratorTest.java | 2 +-
test/testuno/source/fvt/mix/MixedTest.java | 4 +-
.../fvt/mix/sc/sheet/InsertCalcSheetTest.java | 18 +-
.../fvt/mix/sc/sheet/InsertExcelSheetTest.java | 18 +-
test/testuno/source/fvt/uno/db/DBAccess.java | 16 +-
test/testuno/source/fvt/uno/ffc/FFCTest.java | 6 +-
.../source/fvt/uno/sc/cell/DeleteContents.java | 10 +-
.../source/fvt/uno/sc/cell/InsertDeleteCells.java | 24 +-
.../source/fvt/uno/sc/data/AdvanceFilter.java | 18 +-
test/testuno/source/fvt/uno/sc/data/DataSort.java | 16 +-
.../fvt/uno/sc/data/StandardFilterOption.java | 114 +--
.../source/fvt/uno/sc/data/StardarFilterTest.java | 16 +-
.../source/fvt/uno/sc/data/SubTotalsFunction.java | 4 +-
.../source/fvt/uno/sc/data/SubtotalsForGroup.java | 8 +-
.../source/fvt/uno/sc/data/ValidityTypeTest.java | 6 +-
.../source/fvt/uno/sc/formula/TestFormulaDocs.java | 10 +-
.../fvt/uno/sc/formula/TestFormulaRoundTrip.java | 6 +-
.../source/fvt/uno/sc/object/DrawingObject.java | 14 +-
.../source/fvt/uno/sc/rowcolumn/CellMerge.java | 6 +-
.../CreateShowHideEditDeleteComments.java | 28 +-
.../uno/sc/rowcolumn/InsertDeleteRowAndColumn.java | 12 +-
.../uno/sc/rowcolumn/ResizeHideShowRowColumn.java | 48 +-
.../source/fvt/uno/sc/sheet/SheetBasicTest.java | 6 +-
.../fvt/uno/sd/animation/CustomAnimation.java | 26 +-
.../source/fvt/uno/sd/animation/TextAnimation.java | 22 +-
.../fvt/uno/sd/bullet/CheckBuildInBullet.java | 12 +-
.../source/fvt/uno/sd/bullet/CheckBulletStyle.java | 12 +-
.../fvt/uno/sd/bullet/GraphicBulletFromFile.java | 12 +-
.../fvt/uno/sd/bullet/NumberingBulletTypes.java | 12 +-
.../fvt/uno/sd/bullet/NumberingProperty.java | 56 +-
.../fvt/uno/sd/character/CheckCharacterStyle.java | 28 +-
.../testuno/source/fvt/uno/sd/chart/ChartData.java | 24 +-
.../source/fvt/uno/sd/chart/ChartProperties.java | 80 +-
.../source/fvt/uno/sd/chart/ChartTypes.java | 26 +-
.../fvt/uno/sd/file/CheckFileProperties.java | 14 +-
.../fvt/uno/sd/graphic/GraphicPro_Border.java | 24 +-
.../fvt/uno/sd/graphic/GraphicPro_Position.java | 12 +-
.../source/fvt/uno/sd/graphic/GraphicPro_Size.java | 12 +-
.../fvt/uno/sd/paragraph/ParagraphStyle.java | 22 +-
.../uno/sd/paragraph/ParagraphTextProperty.java | 20 +-
.../source/fvt/uno/sd/shape/ShapeProperties.java | 56 +-
.../source/fvt/uno/sd/shape/ShapeTypes.java | 22 +-
.../source/fvt/uno/sd/slideshow/CustomShow.java | 26 +-
.../source/fvt/uno/sd/slideshow/SlideShow.java | 22 +-
.../source/fvt/uno/sd/textbox/FillProperties.java | 30 +-
.../source/fvt/uno/sd/textbox/LineProperties.java | 22 +-
test/testuno/source/fvt/uno/sw/DocumentTest.java | 32 +-
.../source/fvt/uno/sw/bookmark/CheckBookmarks.java | 12 +-
.../source/fvt/uno/sw/breaks/CheckBreaks.java | 20 +-
.../sw/crossreference/CheckCrossReferences.java | 38 +-
.../fvt/uno/sw/field/CheckDateTimeField.java | 30 +-
.../source/fvt/uno/sw/field/PageCountField.java | 10 +-
.../source/fvt/uno/sw/field/PageNumberField.java | 10 +-
.../source/fvt/uno/sw/field/SubjectField.java | 8 +-
.../source/fvt/uno/sw/field/TitleField.java | 8 +-
.../source/fvt/uno/sw/frame/CheckFrames.java | 8 +-
.../source/fvt/uno/sw/frame/FrameAnchorType.java | 16 +-
.../source/fvt/uno/sw/frame/FrameBackColor.java | 24 +-
.../source/fvt/uno/sw/frame/FrameBackGraphic.java | 16 +-
.../source/fvt/uno/sw/frame/FrameBorder.java | 22 +-
.../uno/sw/frame/FrameBorderSpacingtoContent.java | 24 +-
.../source/fvt/uno/sw/frame/FrameDescription.java | 14 +-
.../source/fvt/uno/sw/frame/FrameHyperlink.java | 16 +-
.../source/fvt/uno/sw/frame/FramePosition.java | 16 +-
.../source/fvt/uno/sw/frame/FrameShadow.java | 18 +-
.../testuno/source/fvt/uno/sw/frame/FrameSize.java | 24 +-
.../source/fvt/uno/sw/frame/FrameWrapType.java | 18 +-
.../source/fvt/uno/sw/frame/InsertFrame.java | 14 +-
.../fvt/uno/sw/paragraph/ParagraphAlignment.java | 64 +-
.../fvt/uno/sw/paragraph/ParagraphBackColor.java | 16 +-
.../fvt/uno/sw/paragraph/ParagraphBackGraphic.java | 192 ++---
.../fvt/uno/sw/paragraph/ParagraphBorder.java | 32 +-
.../fvt/uno/sw/paragraph/ParagraphDropcap.java | 40 +-
.../sw/paragraph/ParagraphIndentAndSpacing.java | 32 +-
.../fvt/uno/sw/paragraph/ParagraphInsertBreak.java | 224 +++---
.../fvt/uno/sw/paragraph/ParagraphLineSpacing.java | 140 ++--
.../ParagraphNumberingAndBulletAlignment.java | 96 +--
.../ParagraphNumberingAndBulletCharacterStyle.java | 832 ++++++++++-----------
...agraphNumberingAndBulletIndentAtAndAlignAt.java | 32 +-
.../ParagraphNumberingAndBulletTabStop.java | 32 +-
...aragraphNumberingAndBullet_CharacterBullet.java | 64 +-
.../ParagraphNumberingAndBullet_Graphic.java | 32 +-
...agraphNumberingAndBullet_Graphic_Alignment.java | 288 +++----
...hNumberingAndBullet_Graphic_WidthAndHeight.java | 32 +-
...ngAndBullet_Number_BeforeAndAfterCharacter.java | 32 +-
...ragraphNumberingAndBullet_Number_StartWith.java | 32 +-
.../ParagraphNumberingAndBullet_Numbering.java | 256 +++----
.../sw/paragraph/ParagraphOutlineAndNumbering.java | 32 +-
.../fvt/uno/sw/paragraph/ParagraphShadow.java | 100 +--
.../uno/sw/paragraph/ParagraphSpacingtoBorder.java | 16 +-
.../source/fvt/uno/sw/paragraph/ParagraphTabs.java | 100 +--
.../sw/paragraph/ParagraphTexttoTextAlignment.java | 80 +-
.../fvt/uno/sw/puretext/CharacterBackColor.java | 16 +-
.../source/fvt/uno/sw/puretext/CharacterBlink.java | 16 +-
.../fvt/uno/sw/puretext/CharacterChangeCase.java | 80 +-
.../source/fvt/uno/sw/puretext/CharacterColor.java | 16 +-
.../fvt/uno/sw/puretext/CharacterEmphasis.java | 16 +-
.../fvt/uno/sw/puretext/CharacterFontname.java | 16 +-
.../fvt/uno/sw/puretext/CharacterHidden.java | 16 +-
.../fvt/uno/sw/puretext/CharacterHyperlink.java | 16 +-
.../fvt/uno/sw/puretext/CharacterLocale.java | 18 +-
.../fvt/uno/sw/puretext/CharacterOutline.java | 16 +-
.../fvt/uno/sw/puretext/CharacterPosition.java | 48 +-
.../fvt/uno/sw/puretext/CharacterRelief.java | 16 +-
.../puretext/CharacterRotationAndScaleWidth.java | 48 +-
.../fvt/uno/sw/puretext/CharacterShadow.java | 16 +-
.../source/fvt/uno/sw/puretext/CharacterSize.java | 16 +-
.../fvt/uno/sw/puretext/CharacterSpacing.java | 48 +-
.../uno/sw/puretext/CharacterStrikeThrough.java | 16 +-
.../source/fvt/uno/sw/puretext/CharacterStyle.java | 16 +-
.../fvt/uno/sw/puretext/CharacterUnderline.java | 16 +-
.../uno/sw/puretext/InsertCharacterToTable.java | 30 +-
.../source/fvt/uno/sw/table/TableBasic.java | 326 ++++----
.../uno/sw/table/TableBorderSpacingtoContent.java | 32 +-
.../source/fvt/uno/sw/table/TableCellProtect.java | 32 +-
.../source/fvt/uno/sw/table/TableInsertBreak.java | 416 +++++------
.../testuno/source/fvt/uno/sw/table/TableName.java | 32 +-
.../fvt/uno/sw/table/TableVerticalAlignment.java | 96 +--
.../source/org/openoffice/test/uno/UnoApp.java | 26 +-
test/testuno/source/pvt/uno/Conversion.java | 2 +-
test/testuno/source/testlib/uno/ChartUtil.java | 16 +-
test/testuno/source/testlib/uno/DBUtil.java | 8 +-
test/testuno/source/testlib/uno/GraphicUtil.java | 18 +-
test/testuno/source/testlib/uno/PageUtil.java | 6 +-
test/testuno/source/testlib/uno/SCUtil.java | 90 +--
test/testuno/source/testlib/uno/SDUtil.java | 14 +-
test/testuno/source/testlib/uno/SWUtil.java | 58 +-
test/testuno/source/testlib/uno/ShapeUtil.java | 34 +-
test/testuno/source/testlib/uno/TestUtil.java | 2 +-
1235 files changed, 8265 insertions(+), 8265 deletions(-)
diff --git a/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/accessibility/AccessBridge.java b/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/accessibility/AccessBridge.java
index ac5194c69f..70f66a11c9 100644
--- a/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/accessibility/AccessBridge.java
+++ b/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/accessibility/AccessBridge.java
@@ -182,7 +182,7 @@ public class AccessBridge {
* XTopWindowListener
*/
public void windowOpened(com.sun.star.lang.EventObject event) {
- XAccessible xAccessible = (XAccessible) UnoRuntime.queryInterface(XAccessible.class,
+ XAccessible xAccessible = UnoRuntime.queryInterface(XAccessible.class,
event.Source);
java.awt.Window w = getTopWindow(xAccessible);
}
@@ -203,7 +203,7 @@ public class AccessBridge {
}
public void windowClosed(com.sun.star.lang.EventObject event) {
- XAccessible xAccessible = (XAccessible) UnoRuntime.queryInterface(XAccessible.class,
+ XAccessible xAccessible = UnoRuntime.queryInterface(XAccessible.class,
event.Source);
java.awt.Window w = removeTopWindow(xAccessible);
diff --git a/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/accessibility/WindowsAccessBridgeAdapter.java b/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/accessibility/WindowsAccessBridgeAdapter.java
index 631677e583..3731301179 100644
--- a/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/accessibility/WindowsAccessBridgeAdapter.java
+++ b/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/accessibility/WindowsAccessBridgeAdapter.java
@@ -68,7 +68,7 @@ public class WindowsAccessBridgeAdapter {
"/singletons/com.sun.star.java.theJavaVirtualMachine");
if (AnyConverter.isObject(any)) {
- XJavaVM xJavaVM = (XJavaVM) UnoRuntime.queryInterface(XJavaVM.class,
+ XJavaVM xJavaVM = UnoRuntime.queryInterface(XJavaVM.class,
AnyConverter.toObject(new Type(XJavaVM.class), any));
if (xJavaVM != null) {
diff --git a/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/AbstractButton.java b/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/AbstractButton.java
index 448ed0a848..884e648d9e 100644
--- a/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/AbstractButton.java
+++ b/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/AbstractButton.java
@@ -62,7 +62,7 @@ public abstract class AbstractButton extends Component {
return null;
try {
- XAccessibleText unoAccessibleText = (XAccessibleText)
+ XAccessibleText unoAccessibleText =
UnoRuntime.queryInterface(XAccessibleText.class,unoAccessibleComponent);
if (unoAccessibleText != null) {
return new AccessibleTextImpl(unoAccessibleText);
@@ -142,7 +142,7 @@ public abstract class AbstractButton extends Component {
XAccessibleContext xAccessibleContext = unoAccessibleContext;
if (xAccessibleContext != null) {
// Query for XAccessibleAction interface
- XAccessibleAction xAccessibleAction = (XAccessibleAction)
+ XAccessibleAction xAccessibleAction =
UnoRuntime.queryInterface(XAccessibleAction.class, xAccessibleContext);
if (xAccessibleAction != null) {
diff --git a/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/AccessibleComponentImpl.java b/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/AccessibleComponentImpl.java
index ac2f955449..a08644f4fe 100644
--- a/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/AccessibleComponentImpl.java
+++ b/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/AccessibleComponentImpl.java
@@ -41,7 +41,7 @@ public class AccessibleComponentImpl implements javax.accessibility.AccessibleCo
protected boolean hasState(short state) {
try {
- XAccessibleContext unoAccessibleContext = (XAccessibleContext)
+ XAccessibleContext unoAccessibleContext =
UnoRuntime.queryInterface(XAccessibleContext.class, unoObject);
// All UNO accessibility implementations must support XAccessibleContext
// and return a valid XAccessibleStateSet ..
diff --git a/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/AccessibleHypertextImpl.java b/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/AccessibleHypertextImpl.java
index 803ac4d83e..4f71da2d84 100644
--- a/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/AccessibleHypertextImpl.java
+++ b/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/AccessibleHypertextImpl.java
@@ -141,13 +141,13 @@ public class AccessibleHypertextImpl extends AccessibleTextImpl
public static javax.accessibility.AccessibleText get(com.sun.star.uno.XInterface unoObject) {
try {
- XAccessibleHypertext unoAccessibleHypertext = (XAccessibleHypertext)
+ XAccessibleHypertext unoAccessibleHypertext =
UnoRuntime.queryInterface(XAccessibleHypertext.class, unoObject);
if (unoAccessibleHypertext != null) {
return new AccessibleHypertextImpl(unoAccessibleHypertext);
}
- XAccessibleText unoAccessibleText = (XAccessibleText)
+ XAccessibleText unoAccessibleText =
UnoRuntime.queryInterface(XAccessibleText.class, unoObject);
if (unoAccessibleText != null) {
return new AccessibleTextImpl(unoAccessibleText);
diff --git a/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/AccessibleObjectFactory.java b/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/AccessibleObjectFactory.java
index 91a81ad38b..35f60be45a 100644
--- a/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/AccessibleObjectFactory.java
+++ b/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/AccessibleObjectFactory.java
@@ -488,7 +488,7 @@ public class AccessibleObjectFactory {
if (xAccessibleContext != null) {
short role = xAccessibleContext.getAccessibleRole();
XAccessibleStateSet xAccessibleStateSet = xAccessibleContext.getAccessibleStateSet();
- XAccessibleComponent xAccessibleComponent = (XAccessibleComponent)
+ XAccessibleComponent xAccessibleComponent =
UnoRuntime.queryInterface(XAccessibleComponent.class, xAccessibleContext);
java.awt.Window w;
diff --git a/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/AccessibleTextImpl.java b/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/AccessibleTextImpl.java
index 9b1d435b54..2235d3f4e6 100644
--- a/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/AccessibleTextImpl.java
+++ b/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/AccessibleTextImpl.java
@@ -80,7 +80,7 @@ public class AccessibleTextImpl implements javax.accessibility.AccessibleText {
public static javax.accessibility.AccessibleText get(com.sun.star.uno.XInterface unoObject) {
try {
- XAccessibleText unoAccessibleText = (XAccessibleText)
+ XAccessibleText unoAccessibleText =
UnoRuntime.queryInterface(XAccessibleText.class, unoObject);
if (unoAccessibleText != null) {
return new AccessibleTextImpl(unoAccessibleText);
diff --git a/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/ComboBox.java b/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/ComboBox.java
index 8fd3270fe5..5910f4f765 100644
--- a/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/ComboBox.java
+++ b/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/ComboBox.java
@@ -73,7 +73,7 @@ public class ComboBox extends Container {
/** Gets the AccessibleAction associated with this object that supports one or more actions */
public javax.accessibility.AccessibleAction getAccessibleAction() {
if (unoAccessibleAction == null) {
- unoAccessibleAction = (XAccessibleAction) UnoRuntime.queryInterface(XAccessibleAction.class,
+ unoAccessibleAction = UnoRuntime.queryInterface(XAccessibleAction.class,
unoAccessibleContext);
if (unoAccessibleAction == null) {
diff --git a/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/Component.java b/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/Component.java
index a3b3d4058b..04c0bd9666 100644
--- a/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/Component.java
+++ b/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/Component.java
@@ -43,11 +43,11 @@ public abstract class Component extends java.awt.Component {
super();
unoAccessible = xAccessible;
unoAccessibleContext = xAccessibleContext;
- unoAccessibleComponent = (XAccessibleComponent)
+ unoAccessibleComponent =
UnoRuntime.queryInterface(XAccessibleComponent.class, xAccessibleContext);
// Add the event listener right away, because the global focus notification doesn't
// work yet...
- XAccessibleEventBroadcaster broadcaster = (XAccessibleEventBroadcaster)
+ XAccessibleEventBroadcaster broadcaster =
UnoRuntime.queryInterface(XAccessibleEventBroadcaster.class,
unoAccessibleComponent);
if (broadcaster != null) {
@@ -130,7 +130,7 @@ public abstract class Component extends java.awt.Component {
java.util.ArrayList list = new java.util.ArrayList(targetSet.length);
for (int i=0; i < targetSet.length; i++) {
java.awt.Component c = AccessibleObjectFactory.getAccessibleComponent(
- (XAccessible) UnoRuntime.queryInterface(XAccessible.class, targetSet[i]));
+ UnoRuntime.queryInterface(XAccessible.class, targetSet[i]));
if (c != null) {
list.add(c);
}
@@ -664,7 +664,7 @@ public abstract class Component extends java.awt.Component {
public String getToolTipText() {
try {
- XAccessibleExtendedComponent unoAccessibleExtendedComponent = (XAccessibleExtendedComponent)
+ XAccessibleExtendedComponent unoAccessibleExtendedComponent =
UnoRuntime.queryInterface(XAccessibleExtendedComponent.class, unoAccessibleComponent);
if (unoAccessibleExtendedComponent != null) {
return unoAccessibleExtendedComponent.getToolTipText();
@@ -677,7 +677,7 @@ public abstract class Component extends java.awt.Component {
public String getTitledBorderText() {
try {
- XAccessibleExtendedComponent unoAccessibleExtendedComponent = (XAccessibleExtendedComponent)
+ XAccessibleExtendedComponent unoAccessibleExtendedComponent =
UnoRuntime.queryInterface(XAccessibleExtendedComponent.class, unoAccessibleComponent);
if (unoAccessibleExtendedComponent != null) {
return unoAccessibleExtendedComponent.getTitledBorderText();
@@ -690,7 +690,7 @@ public abstract class Component extends java.awt.Component {
public javax.accessibility.AccessibleKeyBinding getAccessibleKeyBinding() {
try {
- XAccessibleAction unoAccessibleAction = (XAccessibleAction)
+ XAccessibleAction unoAccessibleAction =
UnoRuntime.queryInterface(XAccessibleAction.class, unoAccessibleComponent);
if (unoAccessibleAction != null) {
XAccessibleKeyBinding unoAccessibleKeyBinding = unoAccessibleAction.getAccessibleActionKeyBinding(0);
diff --git a/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/Container.java b/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/Container.java
index 141a219428..81c5d0f674 100644
--- a/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/Container.java
+++ b/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/Container.java
@@ -44,13 +44,13 @@ public class Container extends java.awt.Container implements javax.accessibility
accessibleRole = role;
unoAccessible = xAccessible;
unoAccessibleContext = xAccessibleContext;
- unoAccessibleComponent = (XAccessibleComponent)
+ unoAccessibleComponent =
UnoRuntime.queryInterface(XAccessibleComponent.class,
xAccessibleContext);
// Add the event listener right away, because the global focus notification doesn't
// work yet...
- XAccessibleEventBroadcaster broadcaster = (XAccessibleEventBroadcaster)
+ XAccessibleEventBroadcaster broadcaster =
UnoRuntime.queryInterface(XAccessibleEventBroadcaster.class,
unoAccessibleContext);
if (broadcaster != null) {
@@ -133,7 +133,7 @@ public class Container extends java.awt.Container implements javax.accessibility
java.util.ArrayList list = new java.util.ArrayList(targetSet.length);
for (int i=0; i < targetSet.length; i++) {
java.awt.Component c = AccessibleObjectFactory.getAccessibleComponent(
- (XAccessible) UnoRuntime.queryInterface(XAccessible.class, targetSet[i]));
+ UnoRuntime.queryInterface(XAccessible.class, targetSet[i]));
if (c != null) {
list.add(c);
}
@@ -572,7 +572,7 @@ public class Container extends java.awt.Container implements javax.accessibility
/** Returns the AccessibleSelection interface for this object */
public javax.accessibility.AccessibleSelection getAccessibleSelection() {
try {
- XAccessibleSelection unoAccessibleSelection = (XAccessibleSelection)
+ XAccessibleSelection unoAccessibleSelection =
UnoRuntime.queryInterface(XAccessibleSelection.class, unoAccessibleContext);
if (unoAccessibleSelection != null) {
return new AccessibleSelectionImpl(unoAccessibleSelection);
diff --git a/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/DescendantManager.java b/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/DescendantManager.java
index 6282da7a5f..92e1dd9ed5 100644
--- a/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/DescendantManager.java
+++ b/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/DescendantManager.java
@@ -51,7 +51,7 @@ public abstract class DescendantManager extends Component {
protected class AccessibleDescendantManagerListener
extends AccessibleUNOComponentListener {
protected AccessibleDescendantManagerListener() {
- unoAccessibleSelection = (XAccessibleSelection) UnoRuntime.queryInterface(XAccessibleSelection.class,
+ unoAccessibleSelection = UnoRuntime.queryInterface(XAccessibleSelection.class,
unoAccessibleContext);
}
@@ -74,7 +74,7 @@ public abstract class DescendantManager extends Component {
extends AccessibleUNOComponent
implements javax.accessibility.AccessibleSelection {
protected AccessibleDescendantManager() {
- unoAccessibleSelection = (XAccessibleSelection) UnoRuntime.queryInterface(XAccessibleSelection.class,
+ unoAccessibleSelection = UnoRuntime.queryInterface(XAccessibleSelection.class,
unoAccessibleContext);
}
diff --git a/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/Dialog.java b/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/Dialog.java
index 89343e52ba..c276b78265 100644
--- a/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/Dialog.java
+++ b/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/Dialog.java
@@ -55,7 +55,7 @@ public class Dialog extends java.awt.Dialog implements javax.accessibility.Acces
private void initialize(XAccessibleComponent xAccessibleComponent) {
unoAccessibleComponent = xAccessibleComponent;
eventQueue = java.awt.Toolkit.getDefaultToolkit().getSystemEventQueue();
- XAccessibleEventBroadcaster broadcaster = (XAccessibleEventBroadcaster)
+ XAccessibleEventBroadcaster broadcaster =
UnoRuntime.queryInterface(XAccessibleEventBroadcaster.class,
xAccessibleComponent);
if (broadcaster != null) {
diff --git a/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/Frame.java b/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/Frame.java
index 1fdde7acc4..161c206b65 100644
--- a/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/Frame.java
+++ b/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/Frame.java
@@ -47,7 +47,7 @@ public class Frame extends java.awt.Frame implements javax.accessibility.Accessi
private void initialize(XAccessibleComponent xAccessibleComponent) {
unoAccessibleComponent = xAccessibleComponent;
eventQueue = java.awt.Toolkit.getDefaultToolkit().getSystemEventQueue();
- XAccessibleEventBroadcaster broadcaster = (XAccessibleEventBroadcaster)
+ XAccessibleEventBroadcaster broadcaster =
UnoRuntime.queryInterface(XAccessibleEventBroadcaster.class,
unoAccessibleComponent);
if (broadcaster != null) {
diff --git a/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/Icon.java b/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/Icon.java
index 61c20b1949..6f6ee32977 100644
--- a/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/Icon.java
+++ b/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/Icon.java
@@ -52,7 +52,7 @@ public class Icon extends Component implements javax.accessibility.Accessible {
/** Gets the AccessibleText associated with this object presenting text on the display */
public javax.accessibility.AccessibleIcon[] getAccessibleIcon() {
try {
- XAccessibleImage unoAccessibleImage = (XAccessibleImage) UnoRuntime.queryInterface(XAccessibleImage.class,
+ XAccessibleImage unoAccessibleImage = UnoRuntime.queryInterface(XAccessibleImage.class,
unoAccessibleComponent);
if (unoAccessibleImage != null) {
diff --git a/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/Label.java b/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/Label.java
index e9c2632956..52820b613f 100644
--- a/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/Label.java
+++ b/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/Label.java
@@ -65,7 +65,7 @@ public class Label extends Component implements javax.accessibility.Accessible {
return null;
try {
- XAccessibleText unoAccessibleText = (XAccessibleText) UnoRuntime.queryInterface(XAccessibleText.class,
+ XAccessibleText unoAccessibleText = UnoRuntime.queryInterface(XAccessibleText.class,
unoAccessibleContext);
if (unoAccessibleText != null) {
diff --git a/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/List.java b/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/List.java
index ab6581d95e..7d07aad84d 100644
--- a/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/List.java
+++ b/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/List.java
@@ -238,7 +238,7 @@ public class List extends DescendantManager implements javax.accessibility.Acces
try {
java.util.ArrayList list = new java.util.ArrayList(targetSet.length);
for (int i=0; i < targetSet.length; i++) {
- XAccessible xAccessible = (XAccessible) UnoRuntime.queryInterface(
+ XAccessible xAccessible = UnoRuntime.queryInterface(
XAccessible.class, targetSet[i]);
if (xAccessible != null) {
list.add(new ListItem(xAccessible));
@@ -380,7 +380,7 @@ public class List extends DescendantManager implements javax.accessibility.Acces
/** Gets the AccessibleComponent associated with this object that has a graphical representation */
public javax.accessibility.AccessibleComponent getAccessibleComponent() {
try {
- XAccessibleComponent unoAccessibleComponent = (XAccessibleComponent)
+ XAccessibleComponent unoAccessibleComponent =
UnoRuntime.queryInterface(XAccessibleComponent.class, unoAccessibleContext);
return (unoAccessibleComponent != null) ?
new AccessibleComponentImpl(unoAccessibleComponent) : null;
@@ -392,7 +392,7 @@ public class List extends DescendantManager implements javax.accessibility.Acces
/** Gets the AccessibleAction associated with this object that has a graphical representation */
public javax.accessibility.AccessibleAction getAccessibleAction() {
try {
- XAccessibleAction unoAccessibleAction = (XAccessibleAction)
+ XAccessibleAction unoAccessibleAction =
UnoRuntime.queryInterface(XAccessibleAction.class, unoAccessibleContext);
return (unoAccessibleAction != null) ?
new AccessibleActionImpl(unoAccessibleAction) : null;
@@ -408,7 +408,7 @@ public class List extends DescendantManager implements javax.accessibility.Acces
return null;
try {
- XAccessibleText unoAccessibleText = (XAccessibleText)
+ XAccessibleText unoAccessibleText =
UnoRuntime.queryInterface(XAccessibleText.class, unoAccessibleContext);
return (unoAccessibleText != null) ?
new AccessibleTextImpl(unoAccessibleText) : null;
@@ -420,7 +420,7 @@ public class List extends DescendantManager implements javax.accessibility.Acces
/** Gets the AccessibleValue associated with this object that has a graphical representation */
public javax.accessibility.AccessibleValue getAccessibleValue() {
try {
- XAccessibleValue unoAccessibleValue = (XAccessibleValue)
+ XAccessibleValue unoAccessibleValue =
UnoRuntime.queryInterface(XAccessibleValue.class, unoAccessibleContext);
return (unoAccessibleValue != null) ?
new AccessibleValueImpl(unoAccessibleValue) : null;
@@ -432,7 +432,7 @@ public class List extends DescendantManager implements javax.accessibility.Acces
/** Gets the AccessibleText associated with this object presenting text on the display */
public javax.accessibility.AccessibleIcon[] getAccessibleIcon() {
try {
- XAccessibleImage unoAccessibleImage = (XAccessibleImage)
+ XAccessibleImage unoAccessibleImage =
UnoRuntime.queryInterface(XAccessibleImage.class, unoAccessibleContext);
if (unoAccessibleImage != null) {
javax.accessibility.AccessibleIcon[] icons = { new AccessibleIconImpl(unoAccessibleImage) };
diff --git a/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/Menu.java b/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/Menu.java
index c3f6bb4c3c..e139283884 100644
--- a/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/Menu.java
+++ b/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/Menu.java
@@ -177,7 +177,7 @@ public class Menu extends AbstractButton
protected class AccessibleMenu extends AccessibleAbstractButton
implements javax.accessibility.AccessibleSelection {
protected AccessibleMenu() {
- unoAccessibleSelection = (XAccessibleSelection) UnoRuntime.queryInterface(XAccessibleSelection.class,
+ unoAccessibleSelection = UnoRuntime.queryInterface(XAccessibleSelection.class,
unoAccessibleContext);
}
diff --git a/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/MenuContainer.java b/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/MenuContainer.java
index 12eb457a6a..bca95e273f 100644
--- a/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/MenuContainer.java
+++ b/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/MenuContainer.java
@@ -72,7 +72,7 @@ public class MenuContainer extends Container implements javax.accessibility.Acce
protected class AccessibleMenuContainer extends AccessibleContainer implements javax.accessibility.AccessibleSelection {
protected AccessibleMenuContainer() {
- unoAccessibleSelection = (XAccessibleSelection) UnoRuntime.queryInterface(XAccessibleSelection.class,
+ unoAccessibleSelection = UnoRuntime.queryInterface(XAccessibleSelection.class,
unoAccessibleContext);
}
diff --git a/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/Paragraph.java b/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/Paragraph.java
index 4aad0766eb..c610162225 100644
--- a/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/Paragraph.java
+++ b/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/Paragraph.java
@@ -133,7 +133,7 @@ public class Paragraph extends Container implements javax.accessibility.Accessib
return null;
try {
- XAccessibleEditableText unoAccessibleText = (XAccessibleEditableText)
+ XAccessibleEditableText unoAccessibleText =
UnoRuntime.queryInterface(XAccessibleEditableText.class,
unoAccessibleComponent);
if (unoAccessibleText != null) {
@@ -149,7 +149,7 @@ public class Paragraph extends Container implements javax.accessibility.Accessib
/** Gets the AccessibleAction associated with this object that has a graphical representation */
public javax.accessibility.AccessibleAction getAccessibleAction() {
try {
- XAccessibleAction unoAccessibleAction = (XAccessibleAction)
+ XAccessibleAction unoAccessibleAction =
UnoRuntime.queryInterface(XAccessibleAction.class, unoAccessibleComponent);
return (unoAccessibleAction != null) ?
new AccessibleActionImpl(unoAccessibleAction) : null;
diff --git a/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/ScrollBar.java b/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/ScrollBar.java
index 4647f012a9..1d57964357 100644
--- a/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/ScrollBar.java
+++ b/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/ScrollBar.java
@@ -54,7 +54,7 @@ public class ScrollBar extends Component implements SwingConstants, javax.access
*/
protected AccessibleScrollBar() {
super();
- unoAccessibleAction = (XAccessibleAction) UnoRuntime.queryInterface(
+ unoAccessibleAction = UnoRuntime.queryInterface(
XAccessibleAction.class, unoAccessibleContext);
if (unoAccessibleAction != null) {
actionCount = unoAccessibleAction.getAccessibleActionCount();
@@ -73,7 +73,7 @@ public class ScrollBar extends Component implements SwingConstants, javax.access
/** Gets the AccessibleValue associated with this object that has a graphical representation */
public javax.accessibility.AccessibleValue getAccessibleValue() {
try {
- XAccessibleValue unoAccessibleValue = (XAccessibleValue)
+ XAccessibleValue unoAccessibleValue =
UnoRuntime.queryInterface(XAccessibleValue.class, unoAccessibleContext);
return (unoAccessibleValue != null) ?
new AccessibleValueImpl(unoAccessibleValue) : null;
diff --git a/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/Table.java b/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/Table.java
index 76df466026..b8f592bbb2 100644
--- a/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/Table.java
+++ b/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/Table.java
@@ -135,7 +135,7 @@ public class Table extends DescendantManager implements javax.accessibility.Acce
protected XAccessibleTable unoAccessibleTable;
public AccessibleTable() {
- unoAccessibleTable = (XAccessibleTable) UnoRuntime.queryInterface(XAccessibleTable.class, unoAccessibleContext);
+ unoAccessibleTable = UnoRuntime.queryInterface(XAccessibleTable.class, unoAccessibleContext);
}
/** Gets the role of this object */
@@ -464,7 +464,7 @@ public class Table extends DescendantManager implements javax.accessibility.Acce
try {
java.util.ArrayList list = new java.util.ArrayList(targetSet.length);
for (int i=0; i < targetSet.length; i++) {
- XAccessible xAccessible = (XAccessible) UnoRuntime.queryInterface(
+ XAccessible xAccessible = UnoRuntime.queryInterface(
XAccessible.class, targetSet[i]);
if (xAccessible != null) {
list.add(new TableCell(xAccessible));
@@ -655,7 +655,7 @@ public class Table extends DescendantManager implements javax.accessibility.Acce
/** Gets the AccessibleComponent associated with this object that has a graphical representation */
public javax.accessibility.AccessibleComponent getAccessibleComponent() {
try {
- XAccessibleComponent unoAccessibleComponent = (XAccessibleComponent)
+ XAccessibleComponent unoAccessibleComponent =
UnoRuntime.queryInterface(XAccessibleComponent.class, unoAccessibleContext);
return (unoAccessibleComponent != null) ?
new AccessibleComponentImpl(unoAccessibleComponent) : null;
@@ -667,7 +667,7 @@ public class Table extends DescendantManager implements javax.accessibility.Acce
/** Gets the AccessibleAction associated with this object that has a graphical representation */
public javax.accessibility.AccessibleAction getAccessibleAction() {
try {
- XAccessibleAction unoAccessibleAction = (XAccessibleAction)
+ XAccessibleAction unoAccessibleAction =
UnoRuntime.queryInterface(XAccessibleAction.class, unoAccessibleContext);
return (unoAccessibleAction != null) ?
new AccessibleActionImpl(unoAccessibleAction) : null;
@@ -683,7 +683,7 @@ public class Table extends DescendantManager implements javax.accessibility.Acce
return null;
try {
- XAccessibleText unoAccessibleText = (XAccessibleText)
+ XAccessibleText unoAccessibleText =
UnoRuntime.queryInterface(XAccessibleText.class, unoAccessibleContext);
return (unoAccessibleText != null) ?
new AccessibleTextImpl(unoAccessibleText) : null;
@@ -695,7 +695,7 @@ public class Table extends DescendantManager implements javax.accessibility.Acce
/** Gets the AccessibleValue associated with this object that has a graphical representation */
public javax.accessibility.AccessibleValue getAccessibleValue() {
try {
- XAccessibleValue unoAccessibleValue = (XAccessibleValue)
+ XAccessibleValue unoAccessibleValue =
UnoRuntime.queryInterface(XAccessibleValue.class, unoAccessibleContext);
return (unoAccessibleValue != null) ?
new AccessibleValueImpl(unoAccessibleValue) : null;
@@ -707,7 +707,7 @@ public class Table extends DescendantManager implements javax.accessibility.Acce
/** Gets the AccessibleText associated with this object presenting text on the display */
public javax.accessibility.AccessibleIcon[] getAccessibleIcon() {
try {
- XAccessibleImage unoAccessibleImage = (XAccessibleImage)
+ XAccessibleImage unoAccessibleImage =
UnoRuntime.queryInterface(XAccessibleImage.class, unoAccessibleContext);
if (unoAccessibleImage != null) {
javax.accessibility.AccessibleIcon[] icons = { new AccessibleIconImpl(unoAccessibleImage) };
diff --git a/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/TextComponent.java b/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/TextComponent.java
index 4034b3db0a..4e8c0d02d2 100644
--- a/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/TextComponent.java
+++ b/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/TextComponent.java
@@ -91,7 +91,7 @@ public class TextComponent extends Component implements javax.accessibility.Acce
return null;
try {
- XAccessibleText unoAccessibleText = (XAccessibleText)
+ XAccessibleText unoAccessibleText =
UnoRuntime.queryInterface(XAccessibleText.class,unoAccessibleComponent);
if (unoAccessibleText != null) {
return new AccessibleTextImpl(unoAccessibleText);
@@ -106,7 +106,7 @@ public class TextComponent extends Component implements javax.accessibility.Acce
/** Gets the AccessibleEditableText associated with this object presenting text on the display */
public javax.accessibility.AccessibleEditableText getAccessibleEditableText() {
try {
- XAccessibleEditableText unoAccessibleText = (XAccessibleEditableText)
+ XAccessibleEditableText unoAccessibleText =
UnoRuntime.queryInterface(XAccessibleEditableText.class,unoAccessibleComponent);
if (unoAccessibleText != null) {
return new AccessibleEditableTextImpl(unoAccessibleText);
@@ -121,7 +121,7 @@ public class TextComponent extends Component implements javax.accessibility.Acce
/** Gets the AccessibleAction associated with this object that has a graphical representation */
public javax.accessibility.AccessibleAction getAccessibleAction() {
try {
- XAccessibleAction unoAccessibleAction = (XAccessibleAction)
+ XAccessibleAction unoAccessibleAction =
UnoRuntime.queryInterface(XAccessibleAction.class, unoAccessibleComponent);
return (unoAccessibleAction != null) ?
new AccessibleActionImpl(unoAccessibleAction) : null;
diff --git a/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/ToggleButton.java b/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/ToggleButton.java
index 171eb4e44b..225cf1b58b 100644
--- a/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/ToggleButton.java
+++ b/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/ToggleButton.java
@@ -45,7 +45,7 @@ class ToggleButton extends AbstractButton implements javax.accessibility.Accessi
/** Gets the AccessibleValue associated with this object that has a graphical representation */
public javax.accessibility.AccessibleValue getAccessibleValue() {
try {
- XAccessibleValue unoAccessibleValue = (XAccessibleValue) UnoRuntime.queryInterface(XAccessibleValue.class,
+ XAccessibleValue unoAccessibleValue = UnoRuntime.queryInterface(XAccessibleValue.class,
unoAccessibleContext);
return (unoAccessibleValue != null)
diff --git a/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/ToolTip.java b/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/ToolTip.java
index a4c8347cbf..c7f65d2028 100644
--- a/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/ToolTip.java
+++ b/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/ToolTip.java
@@ -59,7 +59,7 @@ public class ToolTip extends Component implements javax.accessibility.Accessible
return null;
try {
- XAccessibleText unoAccessibleText = (XAccessibleText) UnoRuntime.queryInterface(XAccessibleText.class,
+ XAccessibleText unoAccessibleText = UnoRuntime.queryInterface(XAccessibleText.class,
unoAccessibleComponent);
if (unoAccessibleText != null) {
diff --git a/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/Tree.java b/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/Tree.java
index a8b9652955..4c24e272b0 100644
--- a/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/Tree.java
+++ b/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/Tree.java
@@ -141,7 +141,7 @@ public class Tree extends DescendantManager implements javax.accessibility.Acces
protected XAccessibleTable unoAccessibleTable;
public AccessibleTree() {
- unoAccessibleTable = (XAccessibleTable) UnoRuntime.queryInterface(XAccessibleTable.class, unoAccessibleContext);
+ unoAccessibleTable = UnoRuntime.queryInterface(XAccessibleTable.class, unoAccessibleContext);
}
/*
@@ -474,7 +474,7 @@ public class Tree extends DescendantManager implements javax.accessibility.Acces
try {
java.util.ArrayList list = new java.util.ArrayList(targetSet.length);
for (int i=0; i < targetSet.length; i++) {
- XAccessible xAccessible = (XAccessible) UnoRuntime.queryInterface(
+ XAccessible xAccessible = UnoRuntime.queryInterface(
XAccessible.class, targetSet[i]);
if (xAccessible != null) {
list.add(new TreeItem(xAccessible));
@@ -515,7 +515,7 @@ public class Tree extends DescendantManager implements javax.accessibility.Acces
public AccessibleTreeItem(XAccessibleContext xAccessibleContext) {
unoAccessibleContext = xAccessibleContext;
- unoAccessibleSelection = (XAccessibleSelection)
+ unoAccessibleSelection =
UnoRuntime.queryInterface(XAccessibleSelection.class, xAccessibleContext);
}
@@ -619,7 +619,7 @@ public class Tree extends DescendantManager implements javax.accessibility.Acces
/** Gets the AccessibleComponent associated with this object that has a graphical representation */
public javax.accessibility.AccessibleComponent getAccessibleComponent() {
try {
- XAccessibleComponent unoAccessibleComponent = (XAccessibleComponent)
+ XAccessibleComponent unoAccessibleComponent =
UnoRuntime.queryInterface(XAccessibleComponent.class, unoAccessibleContext);
return (unoAccessibleComponent != null) ?
new AccessibleComponentImpl(unoAccessibleComponent) : null;
@@ -636,7 +636,7 @@ public class Tree extends DescendantManager implements javax.accessibility.Acces
/** Gets the AccessibleAction associated with this object that has a graphical representation */
public javax.accessibility.AccessibleAction getAccessibleAction() {
try {
- XAccessibleAction unoAccessibleAction = (XAccessibleAction)
+ XAccessibleAction unoAccessibleAction =
UnoRuntime.queryInterface(XAccessibleAction.class, unoAccessibleContext);
return (unoAccessibleAction != null) ?
new AccessibleActionImpl(unoAccessibleAction) : null;
@@ -652,7 +652,7 @@ public class Tree extends DescendantManager implements javax.accessibility.Acces
return null;
try {
- XAccessibleText unoAccessibleText = (XAccessibleText)
+ XAccessibleText unoAccessibleText =
UnoRuntime.queryInterface(XAccessibleText.class, unoAccessibleContext);
return (unoAccessibleText != null) ?
new AccessibleTextImpl(unoAccessibleText) : null;
@@ -664,7 +664,7 @@ public class Tree extends DescendantManager implements javax.accessibility.Acces
/** Gets the AccessibleValue associated with this object that has a graphical representation */
public javax.accessibility.AccessibleValue getAccessibleValue() {
try {
- XAccessibleValue unoAccessibleValue = (XAccessibleValue)
+ XAccessibleValue unoAccessibleValue =
UnoRuntime.queryInterface(XAccessibleValue.class, unoAccessibleContext);
return (unoAccessibleValue != null) ?
new AccessibleValueImpl(unoAccessibleValue) : null;
@@ -676,7 +676,7 @@ public class Tree extends DescendantManager implements javax.accessibility.Acces
/** Gets the AccessibleText associated with this object presenting text on the display */
public javax.accessibility.AccessibleIcon[] getAccessibleIcon() {
try {
- XAccessibleImage unoAccessibleImage = (XAccessibleImage)
+ XAccessibleImage unoAccessibleImage =
UnoRuntime.queryInterface(XAccessibleImage.class, unoAccessibleContext);
if (unoAccessibleImage != null) {
javax.accessibility.AccessibleIcon[] icons = { new AccessibleIconImpl(unoAccessibleImage) };
diff --git a/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/Window.java b/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/Window.java
index 8ad3ad055e..7ad623293f 100644
--- a/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/Window.java
+++ b/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/Window.java
@@ -42,7 +42,7 @@ public class Window extends java.awt.Window implements javax.accessibility.Acces
private void initialize(XAccessibleComponent xAccessibleComponent) {
unoAccessibleComponent = xAccessibleComponent;
eventQueue = java.awt.Toolkit.getDefaultToolkit().getSystemEventQueue();
- XAccessibleEventBroadcaster broadcaster = (XAccessibleEventBroadcaster)
+ XAccessibleEventBroadcaster broadcaster =
UnoRuntime.queryInterface(XAccessibleEventBroadcaster.class,
unoAccessibleComponent);
if (broadcaster != null) {
diff --git a/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/logging/XAccessibleEventLog.java b/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/logging/XAccessibleEventLog.java
index 645d1c1524..e5009ab708 100644
--- a/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/logging/XAccessibleEventLog.java
+++ b/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/logging/XAccessibleEventLog.java
@@ -47,7 +47,7 @@ public class XAccessibleEventLog implements XAccessibleEventListener {
}
public static void addEventListener(XAccessibleContext xac, java.awt.Component c) {
- XAccessibleEventBroadcaster broadcaster = (XAccessibleEventBroadcaster)
+ XAccessibleEventBroadcaster broadcaster =
UnoRuntime.queryInterface(XAccessibleEventBroadcaster.class, xac);
if (broadcaster != null) {
broadcaster.addEventListener(XAccessibleEventLog.get());
@@ -142,7 +142,7 @@ public class XAccessibleEventLog implements XAccessibleEventListener {
}
protected static void logMessage(Object o, String s) {
- XAccessibleContext xac = (XAccessibleContext) UnoRuntime.queryInterface(XAccessibleContext.class, o);
+ XAccessibleContext xac = UnoRuntime.queryInterface(XAccessibleContext.class, o);
if( xac != null ) {
String oid = UnoRuntime.generateOid(xac);
synchronized (proxyList) {
diff --git a/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/logging/XAccessibleTextLog.java b/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/logging/XAccessibleTextLog.java
index 3227ef03fd..1b4f0c5694 100644
--- a/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/logging/XAccessibleTextLog.java
+++ b/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/logging/XAccessibleTextLog.java
@@ -43,7 +43,7 @@ public class XAccessibleTextLog
private void setName(
com.sun.star.accessibility.XAccessibleText xAccessibleText) {
try {
- com.sun.star.accessibility.XAccessibleContext unoAccessibleContext = (com.sun.star.accessibility.XAccessibleContext) com.sun.star.uno.UnoRuntime.queryInterface(com.sun.star.accessibility.XAccessibleContext.class,
+ com.sun.star.accessibility.XAccessibleContext unoAccessibleContext = com.sun.star.uno.UnoRuntime.queryInterface(com.sun.star.accessibility.XAccessibleContext.class,
xAccessibleText);
if (unoAccessibleContext != null) {
diff --git a/main/accessibility/workben/org/openoffice/accessibility/awb/AccessibilityWorkBench.java b/main/accessibility/workben/org/openoffice/accessibility/awb/AccessibilityWorkBench.java
index 5fdda61afc..c8c78d826f 100644
--- a/main/accessibility/workben/org/openoffice/accessibility/awb/AccessibilityWorkBench.java
+++ b/main/accessibility/workben/org/openoffice/accessibility/awb/AccessibilityWorkBench.java
@@ -621,7 +621,7 @@ public class AccessibilityWorkBench
// XEventListener
public void disposing (EventObject aSourceObj)
{
- XFrame xFrame = (XFrame)UnoRuntime.queryInterface(
+ XFrame xFrame = UnoRuntime.queryInterface(
XFrame.class, aSourceObj.Source);
if( xFrame != null )
diff --git a/main/accessibility/workben/org/openoffice/accessibility/awb/canvas/CanvasShape.java b/main/accessibility/workben/org/openoffice/accessibility/awb/canvas/CanvasShape.java
index d7b736c637..4a113ddbb1 100644
--- a/main/accessibility/workben/org/openoffice/accessibility/awb/canvas/CanvasShape.java
+++ b/main/accessibility/workben/org/openoffice/accessibility/awb/canvas/CanvasShape.java
@@ -89,7 +89,7 @@ class CanvasShape implements XAccessibleEventListener
{
if (maNode instanceof XAccessible) {
mxContext = ((XAccessible) maNode).getAccessibleContext();
- mxComponent = (XAccessibleComponent)UnoRuntime.queryInterface(
+ mxComponent = UnoRuntime.queryInterface(
XAccessibleComponent.class, mxContext);
}
@@ -257,7 +257,7 @@ class CanvasShape implements XAccessibleEventListener
{
XAccessibleText xText = null;
// get XAccessibleText
- xText = (XAccessibleText)UnoRuntime.queryInterface(
+ xText = UnoRuntime.queryInterface(
XAccessibleText.class, mxContext);
// Draw every character in the text string.
diff --git a/main/accessibility/workben/org/openoffice/accessibility/awb/tree/ToolkitNode.java b/main/accessibility/workben/org/openoffice/accessibility/awb/tree/ToolkitNode.java
index d563139ec6..503b78003d 100644
--- a/main/accessibility/workben/org/openoffice/accessibility/awb/tree/ToolkitNode.java
+++ b/main/accessibility/workben/org/openoffice/accessibility/awb/tree/ToolkitNode.java
@@ -110,7 +110,7 @@ public class ToolkitNode extends DefaultMutableTreeNode
/** Returns the XAccessible interface corresponding to the toplevel window */
private AccessibilityNode getTopWindowNode(XTopWindow w) {
- XAccessible xAccessible = (XAccessible)
+ XAccessible xAccessible =
UnoRuntime.queryInterface(XAccessible.class, w);
if (xAccessible != null) {
// XTopWindows usually have an accessible parent, which is the
@@ -144,7 +144,7 @@ public class ToolkitNode extends DefaultMutableTreeNode
}
public void windowClosed(com.sun.star.lang.EventObject eventObject) {
- XAccessible xAccessible = (XAccessible) UnoRuntime.queryInterface(
+ XAccessible xAccessible = UnoRuntime.queryInterface(
XAccessible.class, eventObject.Source);
if (xAccessible != null) {
AccessibilityNode node = treeModel.findNode(xAccessible);
@@ -188,7 +188,7 @@ public class ToolkitNode extends DefaultMutableTreeNode
}
public void windowOpened(com.sun.star.lang.EventObject eventObject) {
- final XTopWindow xTopWindow = (XTopWindow) UnoRuntime.queryInterface(
+ final XTopWindow xTopWindow = UnoRuntime.queryInterface(
XTopWindow.class, eventObject.Source);
if (xTopWindow != null) {
final ToolkitNode tn = this;
diff --git a/main/accessibility/workben/org/openoffice/accessibility/awb/view/ComponentView.java b/main/accessibility/workben/org/openoffice/accessibility/awb/view/ComponentView.java
index ddf634f332..94aa1d3a59 100644
--- a/main/accessibility/workben/org/openoffice/accessibility/awb/view/ComponentView.java
+++ b/main/accessibility/workben/org/openoffice/accessibility/awb/view/ComponentView.java
@@ -76,7 +76,7 @@ public class ComponentView
public void SetObject (XAccessibleContext xContext)
{
- mxComponent = (XAccessibleComponent)UnoRuntime.queryInterface(
+ mxComponent = UnoRuntime.queryInterface(
XAccessibleComponent.class, xContext);
super.SetObject (xContext);
}
@@ -132,7 +132,7 @@ public class ComponentView
"Bounding box conflicts with size";
XAccessible xParent = mxContext.getAccessibleParent();
XAccessibleComponent xParentComponent =
- (XAccessibleComponent)UnoRuntime.queryInterface(
+ UnoRuntime.queryInterface(
XAccessibleComponent.class, xParent);
if (xParentComponent == null)
{
diff --git a/main/accessibility/workben/org/openoffice/accessibility/awb/view/EditableTextView.java b/main/accessibility/workben/org/openoffice/accessibility/awb/view/EditableTextView.java
index 60d60e7122..d85c10affa 100644
--- a/main/accessibility/workben/org/openoffice/accessibility/awb/view/EditableTextView.java
+++ b/main/accessibility/workben/org/openoffice/accessibility/awb/view/EditableTextView.java
@@ -46,7 +46,7 @@ public class EditableTextView
XAccessibleContext xContext)
{
XAccessibleEditableText xEditableText =
- (XAccessibleEditableText)UnoRuntime.queryInterface(
+ UnoRuntime.queryInterface(
XAccessibleEditableText.class, xContext);
if (xEditableText != null)
return new EditableTextView (aContainer);
@@ -82,7 +82,7 @@ public class EditableTextView
*/
public void SetObject (XAccessibleContext xObject)
{
- mxEditableText = (XAccessibleEditableText)UnoRuntime.queryInterface(
+ mxEditableText = UnoRuntime.queryInterface(
XAccessibleEditableText.class, xObject);
super.SetObject (xObject);
}
diff --git a/main/accessibility/workben/org/openoffice/accessibility/awb/view/FocusView.java b/main/accessibility/workben/org/openoffice/accessibility/awb/view/FocusView.java
index 61b86343d0..d7fad3c4c7 100644
--- a/main/accessibility/workben/org/openoffice/accessibility/awb/view/FocusView.java
+++ b/main/accessibility/workben/org/openoffice/accessibility/awb/view/FocusView.java
@@ -51,7 +51,7 @@ public class FocusView
ObjectViewContainer aContainer,
XAccessibleContext xContext)
{
- XAccessibleComponent xComponent = (XAccessibleComponent)UnoRuntime.queryInterface(
+ XAccessibleComponent xComponent = UnoRuntime.queryInterface(
XAccessibleComponent.class, xContext);
if (xComponent != null)
return new FocusView (aContainer);
@@ -88,7 +88,7 @@ public class FocusView
*/
public void SetObject (XAccessibleContext xObject)
{
- mxComponent = (XAccessibleComponent)UnoRuntime.queryInterface(
+ mxComponent = UnoRuntime.queryInterface(
XAccessibleComponent.class, xObject);
super.SetObject (xObject);
}
diff --git a/main/accessibility/workben/org/openoffice/accessibility/awb/view/SelectionView.java b/main/accessibility/workben/org/openoffice/accessibility/awb/view/SelectionView.java
index 7b13be06e6..9e2070e5aa 100644
--- a/main/accessibility/workben/org/openoffice/accessibility/awb/view/SelectionView.java
+++ b/main/accessibility/workben/org/openoffice/accessibility/awb/view/SelectionView.java
@@ -70,7 +70,7 @@ class SelectionView
ObjectViewContainer aContainer,
XAccessibleContext xContext)
{
- XAccessibleSelection xSelection = (XAccessibleSelection)UnoRuntime.queryInterface(
+ XAccessibleSelection xSelection = UnoRuntime.queryInterface(
XAccessibleSelection.class, xContext);
if (xSelection != null)
return new SelectionView(aContainer);
@@ -147,7 +147,7 @@ class SelectionView
public void SetObject (XAccessibleContext xContext)
{
- mxSelection = (XAccessibleSelection)UnoRuntime.queryInterface(
+ mxSelection = UnoRuntime.queryInterface(
XAccessibleSelection.class, xContext);
super.SetObject (xContext);
}
diff --git a/main/accessibility/workben/org/openoffice/accessibility/awb/view/ServiceInterfaceView.java b/main/accessibility/workben/org/openoffice/accessibility/awb/view/ServiceInterfaceView.java
index c18549986f..8af95e8a84 100644
--- a/main/accessibility/workben/org/openoffice/accessibility/awb/view/ServiceInterfaceView.java
+++ b/main/accessibility/workben/org/openoffice/accessibility/awb/view/ServiceInterfaceView.java
@@ -109,7 +109,7 @@ public class ServiceInterfaceView
private void CreateImplementationNameTree ()
{
- XServiceInfo xServiceInfo = (XServiceInfo)UnoRuntime.queryInterface(
+ XServiceInfo xServiceInfo = UnoRuntime.queryInterface(
XServiceInfo.class, mxContext);
maImplementationNameRoot.removeAllChildren();
if (xServiceInfo != null)
@@ -124,7 +124,7 @@ public class ServiceInterfaceView
private void CreateServiceTree ()
{
- XServiceInfo xServiceInfo = (XServiceInfo)UnoRuntime.queryInterface(
+ XServiceInfo xServiceInfo = UnoRuntime.queryInterface(
XServiceInfo.class, mxContext);
maServiceRoot.removeAllChildren();
if (xServiceInfo != null)
@@ -142,7 +142,7 @@ public class ServiceInterfaceView
private void CreateInterfaceTree ()
{
- XTypeProvider xTypeProvider = (XTypeProvider)UnoRuntime.queryInterface(
+ XTypeProvider xTypeProvider = UnoRuntime.queryInterface(
XTypeProvider.class, mxContext);
maInterfaceRoot.removeAllChildren();
if (xTypeProvider != null)
diff --git a/main/accessibility/workben/org/openoffice/accessibility/awb/view/TableView.java b/main/accessibility/workben/org/openoffice/accessibility/awb/view/TableView.java
index 04b5f89039..9b78f9109e 100644
--- a/main/accessibility/workben/org/openoffice/accessibility/awb/view/TableView.java
+++ b/main/accessibility/workben/org/openoffice/accessibility/awb/view/TableView.java
@@ -71,7 +71,7 @@ public class TableView
public void SetObject (XAccessibleContext xContext)
{
- mxTable = (XAccessibleTable)UnoRuntime.queryInterface(
+ mxTable = UnoRuntime.queryInterface(
XAccessibleTable.class, xContext);
super.SetObject (xContext);
}
diff --git a/main/accessibility/workben/org/openoffice/accessibility/awb/view/TextView.java b/main/accessibility/workben/org/openoffice/accessibility/awb/view/TextView.java
index 911f807a44..209fda0285 100644
--- a/main/accessibility/workben/org/openoffice/accessibility/awb/view/TextView.java
+++ b/main/accessibility/workben/org/openoffice/accessibility/awb/view/TextView.java
@@ -74,7 +74,7 @@ public class TextView
ObjectViewContainer aContainer,
XAccessibleContext xContext)
{
- XAccessibleText xText = (XAccessibleText)UnoRuntime.queryInterface(
+ XAccessibleText xText = UnoRuntime.queryInterface(
XAccessibleText.class, xContext);
if (xText != null)
return new TextView (aContainer);
@@ -130,7 +130,7 @@ public class TextView
*/
public void SetObject (XAccessibleContext xObject)
{
- mxText = (XAccessibleText)UnoRuntime.queryInterface(
+ mxText = UnoRuntime.queryInterface(
XAccessibleText.class, xObject);
maCaretSpinnerModel = new CaretSpinnerModel(mxText);
maCaretPositionSpinner.setModel (maCaretSpinnerModel);
@@ -178,7 +178,7 @@ public class TextView
maCaretPositionSpinner.setValue (new Integer (mxText.getCaretPosition()));
// Multi line methods.
- XAccessibleMultiLineText xMultiText = (XAccessibleMultiLineText)
+ XAccessibleMultiLineText xMultiText =
UnoRuntime.queryInterface( XAccessibleMultiLineText.class, mxText );
if( null != xMultiText ) {
diff --git a/main/accessibility/workben/org/openoffice/accessibility/awb/view/text/TextActionDialog.java b/main/accessibility/workben/org/openoffice/accessibility/awb/view/text/TextActionDialog.java
index ef53977385..7c1452b1c1 100644
--- a/main/accessibility/workben/org/openoffice/accessibility/awb/view/text/TextActionDialog.java
+++ b/main/accessibility/workben/org/openoffice/accessibility/awb/view/text/TextActionDialog.java
@@ -86,7 +86,7 @@ class TextActionDialog
maText.setEditable (false);
aContent.add (maText, BorderLayout.CENTER);
- XAccessibleText xText = (XAccessibleText)UnoRuntime.queryInterface(
+ XAccessibleText xText = UnoRuntime.queryInterface(
XAccessibleText.class, mxContext);
String sText = xText.getText();
maText.setText (sText);
@@ -154,13 +154,13 @@ class TextActionDialog
try
{
XAccessibleText xText =
- (XAccessibleText)UnoRuntime.queryInterface(
+ UnoRuntime.queryInterface(
XAccessibleText.class, mxContext);
if (xText != null)
bSuccess = bSuccess && TextAction (xText);
XAccessibleEditableText xEditableText =
- (XAccessibleEditableText)UnoRuntime.queryInterface(
+ UnoRuntime.queryInterface(
XAccessibleEditableText.class, mxContext);
if (xEditableText != null)
bSuccess = bSuccess && EditableTextAction (xEditableText);
diff --git a/main/accessibility/workben/org/openoffice/accessibility/misc/InformationWriter.java b/main/accessibility/workben/org/openoffice/accessibility/misc/InformationWriter.java
index 2dd25c65f5..b5b9b718aa 100644
--- a/main/accessibility/workben/org/openoffice/accessibility/misc/InformationWriter.java
+++ b/main/accessibility/workben/org/openoffice/accessibility/misc/InformationWriter.java
@@ -95,7 +95,7 @@ public class InformationWriter
{
try
{
- XPropertySet xPropertySet = (XPropertySet) UnoRuntime.queryInterface(
+ XPropertySet xPropertySet = UnoRuntime.queryInterface(
XPropertySet.class, xObject);
maOut.println (prefix +
xPropertySet.getPropertyValue (name));
@@ -113,24 +113,24 @@ public class InformationWriter
{
try
{
- XIndexAccess xShapeList = (XIndexAccess) UnoRuntime.queryInterface(
+ XIndexAccess xShapeList = UnoRuntime.queryInterface(
XIndexAccess.class, xPage);
maOut.println ("There are " + xShapeList.getCount()
+ " shapes");
for (int i=0; i<xShapeList.getCount(); i++)
{
- XShape xShape = (XShape) UnoRuntime.queryInterface(
+ XShape xShape = UnoRuntime.queryInterface(
XShape.class, xShapeList.getByIndex (i));
XShapeDescriptor xShapeDescriptor =
- (XShapeDescriptor) UnoRuntime.queryInterface(
+ UnoRuntime.queryInterface(
XShapeDescriptor.class, xShape);
String sName = xShapeDescriptor.getShapeType ();
maOut.println (" shape " + i + " : " + sName);
XPropertySet xPropertySet =
- (XPropertySet) UnoRuntime.queryInterface(
+ UnoRuntime.queryInterface(
XPropertySet.class, xShape);
Integer nZOrder =
(Integer) xPropertySet.getPropertyValue ("ZOrder");
@@ -154,7 +154,7 @@ public class InformationWriter
try
{
maOut.println ("Services:");
- XMultiServiceFactory xMSF = (XMultiServiceFactory) UnoRuntime.queryInterface (
+ XMultiServiceFactory xMSF = UnoRuntime.queryInterface (
XMultiServiceFactory.class,
xObject
);
@@ -184,7 +184,7 @@ public class InformationWriter
{
System.out.println ("Info:");
// Use interface XServiceName to retrieve name of (main) service.
- XServiceName xSN = (XServiceName) UnoRuntime.queryInterface (
+ XServiceName xSN = UnoRuntime.queryInterface (
XServiceName.class, xObject);
if (xSN == null)
maOut.println (" interface XServiceName not supported");
@@ -195,7 +195,7 @@ public class InformationWriter
// Use interface XServiceInfo to retrieve information about
// supported services.
- XServiceInfo xSI = (XServiceInfo) UnoRuntime.queryInterface (
+ XServiceInfo xSI = UnoRuntime.queryInterface (
XServiceInfo.class, xObject);
if (xSI == null)
maOut.println (" interface XServiceInfo not supported");
@@ -223,7 +223,7 @@ public class InformationWriter
maOut.println ("Interfaces:");
// Use interface XTypeProvider to retrieve a list of supported
// interfaces.
- XTypeProvider xTP = (XTypeProvider) UnoRuntime.queryInterface (
+ XTypeProvider xTP = UnoRuntime.queryInterface (
XTypeProvider.class, xObject);
if (xTP == null)
maOut.println (" interface XTypeProvider not supported");
@@ -259,12 +259,12 @@ public class InformationWriter
// Get XAccessibleContext object if given object does not
// already support this interface.
XAccessibleContext xContext
- = (XAccessibleContext) UnoRuntime.queryInterface (
+ = UnoRuntime.queryInterface (
XAccessibleContext.class, xObject);
if (xContext == null)
{
XAccessible xAccessible
- = (XAccessible) UnoRuntime.queryInterface (
+ = UnoRuntime.queryInterface (
XAccessible.class, xObject);
if (xAccessible == null)
{
@@ -319,7 +319,7 @@ public class InformationWriter
if (xStateSet != null)
{
XIndexAccess xStates =
- (XIndexAccess) UnoRuntime.queryInterface (
+ UnoRuntime.queryInterface (
XIndexAccess.class, xStateSet);
maOut.print (xStates.getCount() + " (");
for (int i=0; i<xStates.getCount(); i++)
@@ -359,7 +359,7 @@ public class InformationWriter
try
{
XAccessibleComponent xComponent =
- (XAccessibleComponent) UnoRuntime.queryInterface (
+ UnoRuntime.queryInterface (
XAccessibleComponent.class, xObject);
// Print information about the accessible context.
@@ -424,7 +424,7 @@ public class InformationWriter
public void showProperties (XInterface xObject)
{
- XPropertySet xSet = (XPropertySet) UnoRuntime.queryInterface (
+ XPropertySet xSet = UnoRuntime.queryInterface (
XPropertySet.class, xObject);
if (xSet == null)
maOut.println ("object does not support XPropertySet");
diff --git a/main/accessibility/workben/org/openoffice/accessibility/misc/OfficeConnection.java b/main/accessibility/workben/org/openoffice/accessibility/misc/OfficeConnection.java
index 77a8091cde..83a7f34f53 100644
--- a/main/accessibility/workben/org/openoffice/accessibility/misc/OfficeConnection.java
+++ b/main/accessibility/workben/org/openoffice/accessibility/misc/OfficeConnection.java
@@ -109,14 +109,14 @@ public class OfficeConnection
XMultiServiceFactory aLocalServiceManager =
Bootstrap.createSimpleServiceManager();
XUnoUrlResolver aURLResolver =
- (XUnoUrlResolver) UnoRuntime.queryInterface (
+ UnoRuntime.queryInterface (
XUnoUrlResolver.class,
aLocalServiceManager.createInstance (
"com.sun.star.bridge.UnoUrlResolver")
);
maServiceManager =
- (XMultiServiceFactory) UnoRuntime.queryInterface (
+ UnoRuntime.queryInterface (
XMultiServiceFactory.class,
aURLResolver.resolve (sConnectString)
);
diff --git a/main/accessibility/workben/org/openoffice/accessibility/misc/SimpleOffice.java b/main/accessibility/workben/org/openoffice/accessibility/misc/SimpleOffice.java
index 968ab09eee..8e9f4c061e 100644
--- a/main/accessibility/workben/org/openoffice/accessibility/misc/SimpleOffice.java
+++ b/main/accessibility/workben/org/openoffice/accessibility/misc/SimpleOffice.java
@@ -92,7 +92,7 @@ public class SimpleOffice
{
// Load the document from the specified URL.
XComponentLoader xLoader =
- (XComponentLoader)UnoRuntime.queryInterface(
+ UnoRuntime.queryInterface(
XComponentLoader.class, mxDesktop);
XComponent xComponent = xLoader.loadComponentFromURL (
@@ -102,7 +102,7 @@ public class SimpleOffice
new PropertyValue[0]
);
- xModel = (XModel) UnoRuntime.queryInterface(
+ xModel = UnoRuntime.queryInterface(
XModel.class, xComponent);
}
catch (java.lang.NullPointerException e)
@@ -127,13 +127,13 @@ public class SimpleOffice
try
{
XTasksSupplier xTasksSupplier =
- (XTasksSupplier) UnoRuntime.queryInterface(
+ UnoRuntime.queryInterface(
XTasksSupplier.class, mxDesktop);
XEnumerationAccess xEA = xTasksSupplier.getTasks();
XEnumeration xE = xEA.createEnumeration();
while (xE.hasMoreElements())
{
- XTask xTask = (XTask) UnoRuntime.queryInterface(
+ XTask xTask = UnoRuntime.queryInterface(
XTask.class, xE.nextElement());
MessageArea.print (xTask.getName());
}
@@ -149,7 +149,7 @@ public class SimpleOffice
public XModel GetModel (XDrawView xView)
{
- XController xController = (XController) UnoRuntime.queryInterface(
+ XController xController = UnoRuntime.queryInterface(
XController.class, xView);
if (xController != null)
return xController.getModel();
@@ -181,7 +181,7 @@ public class SimpleOffice
MessageArea.println ("Connected successfully.");
// Create a new desktop.
- mxDesktop = (XDesktop) UnoRuntime.queryInterface(
+ mxDesktop = UnoRuntime.queryInterface(
XDesktop.class,
xMSF.createInstance ("com.sun.star.frame.Desktop")
);
@@ -210,7 +210,7 @@ public class SimpleOffice
OfficeConnection.Instance().GetServiceManager ();
if (xMSF != null)
{
- xToolkit = (XExtendedToolkit) UnoRuntime.queryInterface(
+ xToolkit = UnoRuntime.queryInterface(
XExtendedToolkit.class,
xMSF.createInstance ("stardiv.Toolkit.VCLXToolkit")
);
@@ -232,7 +232,7 @@ public class SimpleOffice
XAccessible xAccessible = null;
try
{
- xAccessible = (XAccessible) UnoRuntime.queryInterface(
+ xAccessible = UnoRuntime.queryInterface(
XAccessible.class, xObject);
}
catch (Exception e)
@@ -287,7 +287,7 @@ public class SimpleOffice
*/
public XWindow GetCurrentWindow ()
{
- return GetCurrentWindow ((XModel) UnoRuntime.queryInterface(
+ return GetCurrentWindow (UnoRuntime.queryInterface(
XModel.class, GetDesktop()));
}
@@ -326,7 +326,7 @@ public class SimpleOffice
public XDrawPage GetCurrentDrawPage ()
{
return GetCurrentDrawPage (
- (XDrawView) UnoRuntime.queryInterface(
+ UnoRuntime.queryInterface(
XDrawView.class,
GetCurrentView()));
}
@@ -382,7 +382,7 @@ public class SimpleOffice
if (xController == null)
MessageArea.println ("can't get controller to retrieve current view");
- xView = (XDrawView) UnoRuntime.queryInterface(
+ xView = UnoRuntime.queryInterface(
XDrawView.class, xController);
if (xView == null)
MessageArea.println ("could not cast controller into view");
@@ -401,7 +401,7 @@ public class SimpleOffice
// Return the accessible object of the document window.
public static XAccessible GetAccessibleDocumentWindow (XDrawPage xPage)
{
- XIndexAccess xShapeList = (XIndexAccess) UnoRuntime.queryInterface(
+ XIndexAccess xShapeList = UnoRuntime.queryInterface(
XIndexAccess.class, xPage);
if (xShapeList.getCount() > 0)
{
@@ -411,11 +411,11 @@ public class SimpleOffice
// the object directly is implemented.
XShape xShape = null;
try{
- xShape = (XShape) UnoRuntime.queryInterface(
+ xShape = UnoRuntime.queryInterface(
XShape.class, xShapeList.getByIndex (0));
} catch (Exception e)
{}
- XAccessible xAccessible = (XAccessible) UnoRuntime.queryInterface (
+ XAccessible xAccessible = UnoRuntime.queryInterface (
XAccessible.class, xShape);
return xAccessible;
}
diff --git a/main/avmedia/source/java/FrameGrabber.java b/main/avmedia/source/java/FrameGrabber.java
index c9b0ce8ad2..9725f95b01 100644
--- a/main/avmedia/source/java/FrameGrabber.java
+++ b/main/avmedia/source/java/FrameGrabber.java
@@ -96,7 +96,7 @@ public class FrameGrabber implements com.sun.star.lang.XServiceInfo,
javax.imageio.ImageIO.write( (java.awt.image.BufferedImage) aImage, "png", aTempFile );
com.sun.star.graphic.XGraphicProvider aProvider =
- (com.sun.star.graphic.XGraphicProvider) UnoRuntime.queryInterface(
+ UnoRuntime.queryInterface(
com.sun.star.graphic.XGraphicProvider.class,
maFactory.createInstance("com.sun.star.graphic.GraphicProvider") );
diff --git a/main/bean/java/officebean/src/main/java/com/sun/star/beans/LocalOfficeConnection.java b/main/bean/java/officebean/src/main/java/com/sun/star/beans/LocalOfficeConnection.java
index 13acef31c1..067059591a 100644
--- a/main/bean/java/officebean/src/main/java/com/sun/star/beans/LocalOfficeConnection.java
+++ b/main/bean/java/officebean/src/main/java/com/sun/star/beans/LocalOfficeConnection.java
@@ -226,7 +226,7 @@ public class LocalOfficeConnection
// query for the XUnoUrlResolver interface
XUnoUrlResolver xUrlResolver =
- (XUnoUrlResolver) UnoRuntime.queryInterface( XUnoUrlResolver.class, urlResolver );
+ UnoRuntime.queryInterface( XUnoUrlResolver.class, urlResolver );
// try to connect to soffice
Object aInitialObject = null;
@@ -266,10 +266,10 @@ public class LocalOfficeConnection
// XComponentContext
if( null != aInitialObject )
{
- XPropertySet xPropertySet = (XPropertySet)
+ XPropertySet xPropertySet =
UnoRuntime.queryInterface( XPropertySet.class, aInitialObject);
Object xContext = xPropertySet.getPropertyValue("DefaultContext");
- XComponentContext xComponentContext = (XComponentContext) UnoRuntime.queryInterface(
+ XComponentContext xComponentContext = UnoRuntime.queryInterface(
XComponentContext.class, xContext);
return xComponentContext;
}
diff --git a/main/bean/java/officebean/src/main/java/com/sun/star/beans/LocalOfficeWindow.java b/main/bean/java/officebean/src/main/java/com/sun/star/beans/LocalOfficeWindow.java
index 3a151ca69b..998aa067e8 100644
--- a/main/bean/java/officebean/src/main/java/com/sun/star/beans/LocalOfficeWindow.java
+++ b/main/bean/java/officebean/src/main/java/com/sun/star/beans/LocalOfficeWindow.java
@@ -114,10 +114,10 @@ public class LocalOfficeWindow
{
compfactory = mConnection.getComponentContext().getServiceManager();
XMultiServiceFactory factory;
- factory = (XMultiServiceFactory)UnoRuntime.queryInterface(
+ factory = UnoRuntime.queryInterface(
XMultiServiceFactory.class, compfactory);
Object object = factory.createInstance( "com.sun.star.awt.Toolkit");
- return (XToolkit)UnoRuntime.queryInterface(XToolkit.class, object);
+ return UnoRuntime.queryInterface(XToolkit.class, object);
}
else
return null;
@@ -129,13 +129,13 @@ public class LocalOfficeWindow
if ( !bPeer )
{
// set real parent
- XVclWindowPeer xVclWindowPeer = (XVclWindowPeer)UnoRuntime.queryInterface(
+ XVclWindowPeer xVclWindowPeer = UnoRuntime.queryInterface(
XVclWindowPeer.class, mWindow);
xVclWindowPeer.setProperty( "PluginParent", getNativeWindow() );
bPeer = true;
// show document window
- XWindow aWindow = (XWindow)UnoRuntime.queryInterface(XWindow.class, mWindow);
+ XWindow aWindow = UnoRuntime.queryInterface(XWindow.class, mWindow);
aWindow.setVisible( true );
}
}
@@ -146,11 +146,11 @@ public class LocalOfficeWindow
if ( bPeer )
{
// hide document window
- XWindow aWindow = (XWindow)UnoRuntime.queryInterface(XWindow.class, mWindow);
+ XWindow aWindow = UnoRuntime.queryInterface(XWindow.class, mWindow);
aWindow.setVisible( false );
// set null parent
- XVclWindowPeer xVclWindowPeer = (XVclWindowPeer)UnoRuntime.queryInterface(
+ XVclWindowPeer xVclWindowPeer = UnoRuntime.queryInterface(
XVclWindowPeer.class, mWindow);
xVclWindowPeer.setProperty( "PluginParent", 0L );
bPeer = false;
@@ -233,7 +233,7 @@ public class LocalOfficeWindow
addComponentListener( new ComponentEventHandler() );
// set initial visibility
- XWindow aWindow = (XWindow)UnoRuntime.queryInterface(XWindow.class, mWindow);
+ XWindow aWindow = UnoRuntime.queryInterface(XWindow.class, mWindow);
aWindow.setVisible( bPeer );
}
catch (com.sun.star.uno.Exception exp) {
diff --git a/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/Controller.java b/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/Controller.java
index a82bb167c5..f92728355e 100644
--- a/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/Controller.java
+++ b/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/Controller.java
@@ -41,7 +41,7 @@ public class Controller
{
super( xController );
this.xController = xController;
- xDispatchProvider = (com.sun.star.frame.XDispatchProvider)
+ xDispatchProvider =
UnoRuntime.queryInterface( com.sun.star.frame.XDispatchProvider.class,
xController );
}
diff --git a/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/Frame.java b/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/Frame.java
index 430d8dfb46..0d4abcc9de 100644
--- a/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/Frame.java
+++ b/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/Frame.java
@@ -44,10 +44,10 @@ public class Frame
{
super( xFrame );
this.xFrame = xFrame;
- xDispatchProvider = (com.sun.star.frame.XDispatchProvider)
+ xDispatchProvider =
UnoRuntime.queryInterface( com.sun.star.frame.XDispatchProvider.class,
xFrame );
- xDispatchProviderInterception = (com.sun.star.frame.XDispatchProviderInterception)
+ xDispatchProviderInterception =
UnoRuntime.queryInterface( com.sun.star.frame.XDispatchProviderInterception.class,
xFrame );
}
diff --git a/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/LocalOfficeConnection.java b/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/LocalOfficeConnection.java
index aaaf54e494..16eba0f28a 100644
--- a/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/LocalOfficeConnection.java
+++ b/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/LocalOfficeConnection.java
@@ -264,7 +264,7 @@ public class LocalOfficeConnection
// to the office including the bridge needs to be terminated.
if (mBridge != null)
{
- XComponent comp = (XComponent)UnoRuntime.queryInterface(
+ XComponent comp = UnoRuntime.queryInterface(
XComponent.class, mBridge);
if (comp != null)
comp.dispose();
@@ -350,10 +350,10 @@ public class LocalOfficeConnection
// XComponentContext
if( null != aInitialObject )
{
- XPropertySet xPropertySet = (XPropertySet)
+ XPropertySet xPropertySet =
UnoRuntime.queryInterface( XPropertySet.class, aInitialObject);
Object xContext = xPropertySet.getPropertyValue("DefaultContext");
- XComponentContext xComponentContext = (XComponentContext) UnoRuntime.queryInterface(
+ XComponentContext xComponentContext = UnoRuntime.queryInterface(
XComponentContext.class, xContext);
return xComponentContext;
}
@@ -432,7 +432,7 @@ public class LocalOfficeConnection
XMultiComponentFactory xLocalServiceManager = xLocalContext.getServiceManager();
try {
- xBridgeFactory = (XBridgeFactory)UnoRuntime.queryInterface(
+ xBridgeFactory = UnoRuntime.queryInterface(
XBridgeFactory.class,
xLocalServiceManager.createInstanceWithContext(
"com.sun.star.bridge.BridgeFactory", xLocalContext));
@@ -448,7 +448,7 @@ public class LocalOfficeConnection
} catch (com.sun.star.uno.Exception e) {
throw new com.sun.star.uno.RuntimeException(e.getMessage());
}
- XConnector connector_xConnector = (XConnector)UnoRuntime.queryInterface(XConnector.class, connector);
+ XConnector connector_xConnector = UnoRuntime.queryInterface(XConnector.class, connector);
// connect to the server
XConnection xConnection = connector_xConnector.connect(conDcp);
// create the bridge name. This should not be necessary if we pass an
diff --git a/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/LocalOfficeWindow.java b/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/LocalOfficeWindow.java
index e7e2183785..3fa2837447 100644
--- a/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/LocalOfficeWindow.java
+++ b/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/LocalOfficeWindow.java
@@ -118,10 +118,10 @@ public class LocalOfficeWindow
{
compfactory = mConnection.getComponentContext().getServiceManager();
XMultiServiceFactory factory;
- factory = (XMultiServiceFactory)UnoRuntime.queryInterface(
+ factory = UnoRuntime.queryInterface(
XMultiServiceFactory.class, compfactory);
Object object = factory.createInstance( "com.sun.star.awt.Toolkit");
- return (XToolkit)UnoRuntime.queryInterface(XToolkit.class, object);
+ return UnoRuntime.queryInterface(XToolkit.class, object);
}
else
return null;
@@ -133,13 +133,13 @@ public class LocalOfficeWindow
if ( !bPeer )
{
// set real parent
- XVclWindowPeer xVclWindowPeer = (XVclWindowPeer)UnoRuntime.queryInterface(
+ XVclWindowPeer xVclWindowPeer = UnoRuntime.queryInterface(
XVclWindowPeer.class, mWindow);
xVclWindowPeer.setProperty( "PluginParent", getWrappedWindowHandle());
bPeer = true;
// show document window
- XWindow aWindow = (XWindow)UnoRuntime.queryInterface(XWindow.class, mWindow);
+ XWindow aWindow = UnoRuntime.queryInterface(XWindow.class, mWindow);
aWindow.setVisible( true );
}
}
@@ -150,11 +150,11 @@ public class LocalOfficeWindow
if ( bPeer )
{
// hide document window
- XWindow aWindow = (XWindow)UnoRuntime.queryInterface(XWindow.class, mWindow);
+ XWindow aWindow = UnoRuntime.queryInterface(XWindow.class, mWindow);
aWindow.setVisible( false );
// set null parent
- XVclWindowPeer xVclWindowPeer = (XVclWindowPeer)UnoRuntime.queryInterface(
+ XVclWindowPeer xVclWindowPeer = UnoRuntime.queryInterface(
XVclWindowPeer.class, mWindow);
xVclWindowPeer.setProperty( "PluginParent", 0L );
bPeer = false;
@@ -214,7 +214,7 @@ public class LocalOfficeWindow
// set initial visibility
- XWindow aWindow = (XWindow)UnoRuntime.queryInterface(XWindow.class, mWindow);
+ XWindow aWindow = UnoRuntime.queryInterface(XWindow.class, mWindow);
aWindow.setVisible( bPeer );
}
catch (com.sun.star.uno.Exception exp) {
diff --git a/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/OOoBean.java b/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/OOoBean.java
index 43dd81df77..3fc6893796 100644
--- a/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/OOoBean.java
+++ b/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/OOoBean.java
@@ -299,7 +299,7 @@ public class OOoBean
{
com.sun.star.lang.XMultiComponentFactory aFactory =
iConn.getComponentContext().getServiceManager();
- xServiceFactory = (com.sun.star.lang.XMultiServiceFactory)
+ xServiceFactory =
UnoRuntime.queryInterface(
com.sun.star.lang.XMultiServiceFactory.class, aFactory );
}
@@ -328,7 +328,7 @@ public class OOoBean
try
{
Object aObject = getMultiServiceFactory().createInstance( "com.sun.star.frame.Desktop");
- xDesktop = (com.sun.star.frame.XDesktop) UnoRuntime.queryInterface(
+ xDesktop = UnoRuntime.queryInterface(
com.sun.star.frame.XDesktop.class, aObject );
}
catch ( com.sun.star.uno.Exception aExc )
@@ -385,7 +385,7 @@ public class OOoBean
new CallWatchThread( nOOoCallTimeOut, "clear" );
// By closing the frame we avoid that dialogs are displayed, for example when
// the document is modified.
- com.sun.star.util.XCloseable xCloseable = (com.sun.star.util.XCloseable)
+ com.sun.star.util.XCloseable xCloseable =
UnoRuntime.queryInterface( com.sun.star.util.XCloseable.class, aFrame );
if ( xCloseable != null )
{
@@ -419,7 +419,7 @@ public class OOoBean
{
try
{
- com.sun.star.lang.XComponent xComp = (com.sun.star.lang.XComponent)
+ com.sun.star.lang.XComponent xComp =
UnoRuntime.queryInterface(
com.sun.star.lang.XComponent.class, xURLTransformer );
if ( xComp != null )
@@ -577,23 +577,23 @@ public class OOoBean
{
// create the frame
com.sun.star.awt.XWindow xWindow =
- (com.sun.star.awt.XWindow) UnoRuntime.queryInterface(
+ UnoRuntime.queryInterface(
com.sun.star.awt.XWindow.class, xFrameWindow.getUNOWindowPeer());
Object xFrame = xServiceFactory.createInstance( "com.sun.star.frame.Frame");
- aFrame = new Frame( (com.sun.star.frame.XFrame)UnoRuntime.queryInterface(
+ aFrame = new Frame( UnoRuntime.queryInterface(
com.sun.star.frame.XFrame.class, xFrame ) );
aFrame.initialize( xWindow );
aFrame.setName( aFrame.toString() );
// register the frame at the desktop
com.sun.star.frame.XFrames xFrames =
- ( (com.sun.star.frame.XFramesSupplier)UnoRuntime.queryInterface(
+ ( UnoRuntime.queryInterface(
com.sun.star.frame.XFramesSupplier.class, getOOoDesktop() ) ).getFrames();
xFrames.append( aFrame );
}
// Initializes the slot command execution environment.
- xURLTransformer = (com.sun.star.util.XURLTransformer) UnoRuntime.queryInterface(
+ xURLTransformer = UnoRuntime.queryInterface(
com.sun.star.util.XURLTransformer.class,
xServiceFactory.createInstance( "com.sun.star.util.URLTransformer") );
@@ -607,7 +607,7 @@ public class OOoBean
}
// get XComponentLoader from frame
- com.sun.star.frame.XComponentLoader xLoader = (com.sun.star.frame.XComponentLoader)
+ com.sun.star.frame.XComponentLoader xLoader =
UnoRuntime.queryInterface( com.sun.star.frame.XComponentLoader.class, aFrame );
if ( xLoader == null )
{
@@ -672,7 +672,7 @@ public class OOoBean
// Get document's XModifiable interface if any.
aDocument = new OfficeDocument(
- (com.sun.star.frame.XModel) UnoRuntime.queryInterface(
+ UnoRuntime.queryInterface(
com.sun.star.frame.XModel.class, xComponent ) );
bLoaded = true;
}
@@ -1026,10 +1026,10 @@ public class OOoBean
which can be obtained from a frame, to control toolbars. For example:
<pre>
com.sun.star.beans.XPropertySet xPropSet =
- (com.sun.star.beans.XPropertySet) UnoRuntime.queryInterface(
+ UnoRuntime.queryInterface(
com.sun.star.beans.XPropertySet.class, aFrame );
com.sun.star.frame.XLayoutManager xLayoutManager =
- (com.sun.star.frame.XLayoutManager) UnoRuntime.queryInterface(
+ UnoRuntime.queryInterface(
com.sun.star.frame.XLayoutManager.class,
xPropSet.getPropertyValue( "LayoutManager" ) );
xLayoutManager.showElement("private:resource/menubar/menubar");
@@ -1092,10 +1092,10 @@ xLayoutManager.showElement("private:resource/menubar/menubar");
try
{
com.sun.star.beans.XPropertySet xPropSet =
- (com.sun.star.beans.XPropertySet) UnoRuntime.queryInterface(
+ UnoRuntime.queryInterface(
com.sun.star.beans.XPropertySet.class, aFrame );
com.sun.star.frame.XLayoutManager xLayoutManager =
- (com.sun.star.frame.XLayoutManager) UnoRuntime.queryInterface(
+ UnoRuntime.queryInterface(
com.sun.star.frame.XLayoutManager.class,
xPropSet.getPropertyValue( "LayoutManager" ) );
if ( bNewValue )
diff --git a/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/OfficeDocument.java b/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/OfficeDocument.java
index ecdd43ab88..53fe008105 100644
--- a/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/OfficeDocument.java
+++ b/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/OfficeDocument.java
@@ -52,13 +52,13 @@ public class OfficeDocument extends Wrapper
super( xModel );
this.xModel = xModel;
- this.xModifiable = (com.sun.star.util.XModifiable)
+ this.xModifiable =
UnoRuntime.queryInterface(
com.sun.star.util.XModifiable.class, xModel );
- this.xPrintable = (com.sun.star.view.XPrintable)
+ this.xPrintable =
UnoRuntime.queryInterface(
com.sun.star.view.XPrintable.class, xModel );
- this.xStorable = (com.sun.star.frame.XStorable)
+ this.xStorable =
UnoRuntime.queryInterface(
com.sun.star.frame.XStorable.class, xModel );
}
diff --git a/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/Wrapper.java b/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/Wrapper.java
index 6d3f5aefe9..97f3395680 100644
--- a/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/Wrapper.java
+++ b/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/Wrapper.java
@@ -56,7 +56,7 @@ class Wrapper
public Wrapper( com.sun.star.uno.XInterface xProxy )
{
xQueryInterface = (com.sun.star.uno.IQueryInterface) xProxy;
- xComponent = (com.sun.star.lang.XComponent)
+ xComponent =
UnoRuntime.queryInterface(
com.sun.star.lang.XComponent.class, xProxy );
}
diff --git a/main/chart2/qa/complex/chart2/TestCaseOldAPI.java b/main/chart2/qa/complex/chart2/TestCaseOldAPI.java
index 53b30db410..9e4c352824 100644
--- a/main/chart2/qa/complex/chart2/TestCaseOldAPI.java
+++ b/main/chart2/qa/complex/chart2/TestCaseOldAPI.java
@@ -95,7 +95,7 @@ public class TestCaseOldAPI {
else
mxChartModel = createChartModel();
- mxOldDoc = (XChartDocument) UnoRuntime.queryInterface(
+ mxOldDoc = UnoRuntime.queryInterface(
XChartDocument.class, mxChartModel );
}
@@ -103,7 +103,7 @@ public class TestCaseOldAPI {
public void after()
{
- XCloseable xCloseable = (XCloseable) UnoRuntime.queryInterface(
+ XCloseable xCloseable = UnoRuntime.queryInterface(
XCloseable.class, mxChartModel );
assertTrue( "document is no XCloseable", xCloseable != null );
@@ -128,7 +128,7 @@ public class TestCaseOldAPI {
{
try
{
- XPropertySet xDocProp = (XPropertySet) UnoRuntime.queryInterface(
+ XPropertySet xDocProp = UnoRuntime.queryInterface(
XPropertySet.class, mxOldDoc );
assertTrue( "Chart Document is no XPropertySet", xDocProp != null );
xDocProp.setPropertyValue( "HasMainTitle", new Boolean( true ));
@@ -136,7 +136,7 @@ public class TestCaseOldAPI {
xDocProp.getPropertyValue( "HasMainTitle" )));
XShape xTitleShape = mxOldDoc.getTitle();
- XPropertySet xTitleProp = (XPropertySet) UnoRuntime.queryInterface(
+ XPropertySet xTitleProp = UnoRuntime.queryInterface(
XPropertySet.class, xTitleShape );
// set property via old API
@@ -178,7 +178,7 @@ public class TestCaseOldAPI {
{
try
{
- XPropertySet xDocProp = (XPropertySet) UnoRuntime.queryInterface(
+ XPropertySet xDocProp = UnoRuntime.queryInterface(
XPropertySet.class, mxOldDoc );
assertTrue( "Chart Document is no XPropertySet", xDocProp != null );
xDocProp.setPropertyValue( "HasSubTitle", new Boolean( true ));
@@ -186,7 +186,7 @@ public class TestCaseOldAPI {
xDocProp.getPropertyValue( "HasSubTitle" )));
XShape xTitleShape = mxOldDoc.getSubTitle();
- XPropertySet xTitleProp = (XPropertySet) UnoRuntime.queryInterface(
+ XPropertySet xTitleProp = UnoRuntime.queryInterface(
XPropertySet.class, xTitleShape );
// set Property via old API
@@ -227,7 +227,7 @@ public class TestCaseOldAPI {
XDiagram xDia = mxOldDoc.getDiagram();
if( xDia != null )
{
- X3DDisplay xDisp = (X3DDisplay) UnoRuntime.queryInterface(
+ X3DDisplay xDisp = UnoRuntime.queryInterface(
X3DDisplay.class, xDia );
assertTrue( "X3DDisplay not supported", xDisp != null );
@@ -245,7 +245,7 @@ public class TestCaseOldAPI {
"com.sun.star.chart.BarDiagram" ));
// Diagram properties
- xProp = (XPropertySet) UnoRuntime.queryInterface( XPropertySet.class, xDia );
+ xProp = UnoRuntime.queryInterface( XPropertySet.class, xDia );
assertTrue( "Diagram is no property set", xProp != null );
// y-axis
@@ -262,10 +262,10 @@ public class TestCaseOldAPI {
// assertTrue( "Adding y-axis title", bNewYAxisTitle == bYAxisTitle );
// set title text
-// XAxisYSupplier xYAxisSuppl = (XAxisYSupplier) UnoRuntime.queryInterface(
+// XAxisYSupplier xYAxisSuppl = UnoRuntime.queryInterface(
// XAxisYSupplier.class, mxOldDoc.getDiagram() );
// assertTrue( "Diagram is no y-axis supplier", xYAxisSuppl != null );
-// XPropertySet xAxisTitleProp = (XPropertySet) UnoRuntime.queryInterface(
+// XPropertySet xAxisTitleProp = UnoRuntime.queryInterface(
// XPropertySet.class, xYAxisSuppl.getYAxisTitle() );
// assertTrue( "Y-Axis Title is no XPropertySet", xAxisTitleProp != null );
// xAxisTitleProp.setPropertyValue( "String", "New y axis title" );
@@ -277,7 +277,7 @@ public class TestCaseOldAPI {
xProp.getPropertyValue( "HasSecondaryYAxis" ));
assertTrue( "Adding a second y-axis does not work", bNewSecYAxisValue == bSecondaryYAxis );
- XTwoAxisYSupplier xSecYAxisSuppl = (XTwoAxisYSupplier) UnoRuntime.queryInterface(
+ XTwoAxisYSupplier xSecYAxisSuppl = UnoRuntime.queryInterface(
XTwoAxisYSupplier.class, xDia );
assertTrue( "XTwoAxisYSupplier not implemented", xSecYAxisSuppl != null );
assertTrue( "No second y-axis found", xSecYAxisSuppl.getSecondaryYAxis() != null );
@@ -285,7 +285,7 @@ public class TestCaseOldAPI {
// move diagram
{
- XShape xDiagramShape = (XShape) UnoRuntime.queryInterface(
+ XShape xDiagramShape = UnoRuntime.queryInterface(
XShape.class, xDia );
Point aOldPos = xDiagramShape.getPosition();
@@ -305,7 +305,7 @@ public class TestCaseOldAPI {
// size diagram
{
- XShape xDiagramShape = (XShape) UnoRuntime.queryInterface(
+ XShape xDiagramShape = UnoRuntime.queryInterface(
XShape.class, xDia );
Size aOldSize = xDiagramShape.getSize();
@@ -336,7 +336,7 @@ public class TestCaseOldAPI {
{
try
{
- XAxisYSupplier xYAxisSuppl = (XAxisYSupplier) UnoRuntime.queryInterface(
+ XAxisYSupplier xYAxisSuppl = UnoRuntime.queryInterface(
XAxisYSupplier.class, mxOldDoc.getDiagram() );
assertTrue( "Diagram is no y-axis supplier", xYAxisSuppl != null );
@@ -434,7 +434,7 @@ public class TestCaseOldAPI {
XShape xLegend = mxOldDoc.getLegend();
assertTrue( "No Legend returned", xLegend != null );
- XPropertySet xLegendProp = (XPropertySet) UnoRuntime.queryInterface(
+ XPropertySet xLegendProp = UnoRuntime.queryInterface(
XPropertySet.class, xLegend );
assertTrue( "Legend is no property set", xLegendProp != null );
@@ -514,7 +514,7 @@ public class TestCaseOldAPI {
@Test
public void testChartType()
{
- XMultiServiceFactory xFact = (XMultiServiceFactory) UnoRuntime.queryInterface(
+ XMultiServiceFactory xFact = UnoRuntime.queryInterface(
XMultiServiceFactory.class, mxOldDoc );
assertTrue( "document is no factory", xFact != null );
@@ -535,13 +535,13 @@ public class TestCaseOldAPI {
if( bServiceFound )
{
- XDiagram xDia = (XDiagram) UnoRuntime.queryInterface(
+ XDiagram xDia = UnoRuntime.queryInterface(
XDiagram.class, xFact.createInstance( aMyServiceName ));
assertTrue( aMyServiceName + " could not be created", xDia != null );
mxOldDoc.setDiagram( xDia );
- XPropertySet xDiaProp = (XPropertySet) UnoRuntime.queryInterface(
+ XPropertySet xDiaProp = UnoRuntime.queryInterface(
XPropertySet.class, xDia );
assertTrue( "Diagram is no XPropertySet", xDiaProp != null );
@@ -563,7 +563,7 @@ public class TestCaseOldAPI {
// reset to bar-chart
// aMyServiceName = new String( "com.sun.star.chart.BarDiagram" );
-// XDiagram xDia = (XDiagram) UnoRuntime.queryInterface(
+// XDiagram xDia = UnoRuntime.queryInterface(
// XDiagram.class, xFact.createInstance( aMyServiceName ));
// assertTrue( aMyServiceName + " could not be created", xDia != null );
@@ -581,11 +581,11 @@ public class TestCaseOldAPI {
public void testAggregation()
{
// query to new type
- XChartDocument xDiaProv = (XChartDocument) UnoRuntime.queryInterface(
+ XChartDocument xDiaProv = UnoRuntime.queryInterface(
XChartDocument.class, mxOldDoc );
assertTrue( "query to new interface failed", xDiaProv != null );
- com.sun.star.chart.XChartDocument xDoc = (com.sun.star.chart.XChartDocument) UnoRuntime.queryInterface(
+ com.sun.star.chart.XChartDocument xDoc = UnoRuntime.queryInterface(
com.sun.star.chart.XChartDocument.class, xDiaProv );
assertTrue( "querying back to old interface failed", xDoc != null );
}
@@ -598,7 +598,7 @@ public class TestCaseOldAPI {
{
XDiagram xDia = mxOldDoc.getDiagram();
assertTrue( "Invalid Diagram", xDia != null );
- XMultiServiceFactory xFact = (XMultiServiceFactory) UnoRuntime.queryInterface(
+ XMultiServiceFactory xFact = UnoRuntime.queryInterface(
XMultiServiceFactory.class, mxOldDoc );
assertTrue( "document is no factory", xFact != null );
@@ -614,7 +614,7 @@ public class TestCaseOldAPI {
// note: the FillGradient property is optional, however it was
// supported in the old chart's API
- XNameContainer xGradientTable = (XNameContainer) UnoRuntime.queryInterface(
+ XNameContainer xGradientTable = UnoRuntime.queryInterface(
XNameContainer.class,
xFact.createInstance( "com.sun.star.drawing.GradientTable" ));
assertTrue( "no gradient table", xGradientTable != null );
@@ -656,7 +656,7 @@ public class TestCaseOldAPI {
// note: the FillHatch property is optional, however it was
// supported in the old chart's API
- XNameContainer xHatchTable = (XNameContainer) UnoRuntime.queryInterface(
+ XNameContainer xHatchTable = UnoRuntime.queryInterface(
XNameContainer.class,
xFact.createInstance( "com.sun.star.drawing.HatchTable" ));
assertTrue( "no hatch table", xHatchTable != null );
@@ -717,7 +717,7 @@ public class TestCaseOldAPI {
{
try
{
- XPropertySet xDiaProp = (XPropertySet) UnoRuntime.queryInterface(
+ XPropertySet xDiaProp = UnoRuntime.queryInterface(
XPropertySet.class, mxOldDoc.getDiagram() );
ChartDataRowSource eNewSource = ChartDataRowSource.ROWS;
@@ -748,7 +748,7 @@ public class TestCaseOldAPI {
XChartData xData = mxOldDoc.getData();
- XChartDataArray xDataArray = (XChartDataArray) UnoRuntime.queryInterface(
+ XChartDataArray xDataArray = UnoRuntime.queryInterface(
XChartDataArray.class, xData );
assertTrue( "document has no XChartDataArray", xDataArray != null );
@@ -773,18 +773,18 @@ public class TestCaseOldAPI {
{
setStockData_Type4();
- XMultiServiceFactory xFact = (XMultiServiceFactory) UnoRuntime.queryInterface(
+ XMultiServiceFactory xFact = UnoRuntime.queryInterface(
XMultiServiceFactory.class, mxOldDoc );
assertTrue( "document is no factory", xFact != null );
String aMyServiceName = new String( "com.sun.star.chart.StockDiagram" );
- XDiagram xDia = (XDiagram) UnoRuntime.queryInterface(
+ XDiagram xDia = UnoRuntime.queryInterface(
XDiagram.class, xFact.createInstance( aMyServiceName ));
assertTrue( aMyServiceName + " could not be created", xDia != null );
mxOldDoc.setDiagram( xDia );
- XPropertySet xDiaProp = (XPropertySet) UnoRuntime.queryInterface(
+ XPropertySet xDiaProp = UnoRuntime.queryInterface(
XPropertySet.class, xDia );
assertTrue( "Diagram is no XPropertySet", xDiaProp != null );
@@ -795,7 +795,7 @@ public class TestCaseOldAPI {
assertTrue( "Has UpDown", AnyConverter.toBoolean( xDiaProp.getPropertyValue( "UpDown" )));
// MinMaxLine
- XStatisticDisplay xMinMaxProvider = (XStatisticDisplay) UnoRuntime.queryInterface(
+ XStatisticDisplay xMinMaxProvider = UnoRuntime.queryInterface(
XStatisticDisplay.class, xDia );
assertTrue( "Diagram is no XStatisticDisplay", xMinMaxProvider != null );
XPropertySet xMinMaxProp = xMinMaxProvider.getMinMaxLine();
@@ -819,7 +819,7 @@ public class TestCaseOldAPI {
{
try
{
- XMultiServiceFactory xFact = (XMultiServiceFactory) UnoRuntime.queryInterface(
+ XMultiServiceFactory xFact = UnoRuntime.queryInterface(
XMultiServiceFactory.class, mxOldDoc );
assertTrue( "document is no factory", xFact != null );
@@ -855,7 +855,7 @@ public class TestCaseOldAPI {
"First Row", "Second Row", "Third Row"
};
- XPropertySet xDiaProp = (XPropertySet) UnoRuntime.queryInterface(
+ XPropertySet xDiaProp = UnoRuntime.queryInterface(
XPropertySet.class, mxOldDoc.getDiagram() );
ChartDataRowSource eNewSource = ChartDataRowSource.ROWS;
xDiaProp.setPropertyValue( "DataRowSource", eNewSource );
@@ -865,7 +865,7 @@ public class TestCaseOldAPI {
xDiaProp.getPropertyValue( "DataRowSource" )) == eNewSource );
XChartData xData = mxOldDoc.getData();
- XChartDataArray xDataArray = (XChartDataArray) UnoRuntime.queryInterface(
+ XChartDataArray xDataArray = UnoRuntime.queryInterface(
XChartDataArray.class, xData );
assertTrue( "document has no XChartDataArray", xDataArray != null );
@@ -882,7 +882,7 @@ public class TestCaseOldAPI {
// refetch data
xData = mxOldDoc.getData();
- xDataArray = (XChartDataArray) UnoRuntime.queryInterface(
+ xDataArray = UnoRuntime.queryInterface(
XChartDataArray.class, xData );
assertTrue( "document has no XChartDataArray", xDataArray != null );
@@ -923,11 +923,11 @@ public class TestCaseOldAPI {
XModel aResult = null;
try
{
- XComponentLoader aLoader = (XComponentLoader) UnoRuntime.queryInterface(
+ XComponentLoader aLoader = UnoRuntime.queryInterface(
XComponentLoader.class,
xMSF.createInstance( "com.sun.star.frame.Desktop" ) );
- aResult = (XModel) UnoRuntime.queryInterface(
+ aResult = UnoRuntime.queryInterface(
XModel.class,
aLoader.loadComponentFromURL( "private:factory/" + sDocType,
"_blank",
@@ -950,7 +950,7 @@ public class TestCaseOldAPI {
XModel aResult = null;
try
{
- aResult = (XModel) UnoRuntime.queryInterface(
+ aResult = UnoRuntime.queryInterface(
XModel.class,
xMSF.createInstance( "com.sun.star.comp.chart2.ChartModel" ) );
}
@@ -969,7 +969,7 @@ public class TestCaseOldAPI {
{
XComponentContext xResult = null;
- XPropertySet xProp = (XPropertySet) UnoRuntime.queryInterface(
+ XPropertySet xProp = UnoRuntime.queryInterface(
XPropertySet.class, xFact );
if( xProp != null )
try
diff --git a/main/connectivity/qa/complex/connectivity/HsqlDriverTest.java b/main/connectivity/qa/complex/connectivity/HsqlDriverTest.java
index 863c83d298..e3370a665b 100644
--- a/main/connectivity/qa/complex/connectivity/HsqlDriverTest.java
+++ b/main/connectivity/qa/complex/connectivity/HsqlDriverTest.java
@@ -73,7 +73,7 @@ public class HsqlDriverTest {
}
try{
- XDocumentSubStorageSupplier doc = (XDocumentSubStorageSupplier)UnoRuntime.queryInterface(XDocumentSubStorageSupplier.class,ds);
+ XDocumentSubStorageSupplier doc = UnoRuntime.queryInterface(XDocumentSubStorageSupplier.class,ds);
XStorage stor = doc.getDocumentSubStorage("database",4);
try{
if ( stor.isStreamElement("db.log") )
@@ -91,9 +91,9 @@ public class HsqlDriverTest {
if ( stor.isStreamElement("db.script.new") )
stor.removeElement("db.script.new");
} catch(Exception e){}
- XStorable mod = (XStorable)UnoRuntime.queryInterface(XStorable.class,ds);
+ XStorable mod = UnoRuntime.queryInterface(XStorable.class,ds);
mod.store();
- XComponent xComp = (XComponent)UnoRuntime.queryInterface(XComponent.class,stor);
+ XComponent xComp = UnoRuntime.queryInterface(XComponent.class,stor);
if ( xComp != null )
xComp.dispose();
} catch(Exception e){}
@@ -101,14 +101,14 @@ public class HsqlDriverTest {
com.sun.star.beans.PropertyValue[] info = null;
XDriver drv = null;
try{
- XDocumentSubStorageSupplier doc = (XDocumentSubStorageSupplier)UnoRuntime.queryInterface(XDocumentSubStorageSupplier.class,ds);
- XModel mod = (XModel)UnoRuntime.queryInterface(XModel.class,ds);
+ XDocumentSubStorageSupplier doc = UnoRuntime.queryInterface(XDocumentSubStorageSupplier.class,ds);
+ XModel mod = UnoRuntime.queryInterface(XModel.class,ds);
XStorage stor = doc.getDocumentSubStorage("database",4);
info = new com.sun.star.beans.PropertyValue[]{
new com.sun.star.beans.PropertyValue("Storage",0,stor,PropertyState.DIRECT_VALUE)
,new com.sun.star.beans.PropertyValue("URL",0,mod.getURL(),PropertyState.DIRECT_VALUE)
};
- drv = (XDriver)UnoRuntime.queryInterface(XDriver.class, xMSF.createInstance("com.sun.star.sdbcx.comp.hsqldb.Driver"));
+ drv = UnoRuntime.queryInterface(XDriver.class, xMSF.createInstance("com.sun.star.sdbcx.comp.hsqldb.Driver"));
TestCacheSize test = new TestCacheSize(xMSF,info,drv);
@@ -124,7 +124,7 @@ public class HsqlDriverTest {
} catch(Exception e){}
try{
- XStorable mod2 = (XStorable)UnoRuntime.queryInterface(XStorable.class,ds);
+ XStorable mod2 = UnoRuntime.queryInterface(XStorable.class,ds);
mod2.store();
} catch(Exception e){}
}catch(Exception e){}
@@ -140,7 +140,7 @@ public class HsqlDriverTest {
new com.sun.star.beans.PropertyValue("JavaDriverClass",0,"org.hsqldb.jdbcDriver",PropertyState.DIRECT_VALUE)
,new com.sun.star.beans.PropertyValue("ParameterNameSubstitution",0, false,PropertyState.DIRECT_VALUE)
};
- drv = (XDriver)UnoRuntime.queryInterface(XDriver.class,xMSF.createInstance("com.sun.star.comp.sdbc.JDBCDriver"));
+ drv = UnoRuntime.queryInterface(XDriver.class,xMSF.createInstance("com.sun.star.comp.sdbc.JDBCDriver"));
TestCacheSize test = new TestCacheSize(xMSF,info,drv);
test.setURL("jdbc:hsqldb:g:\\hsql\\db");
diff --git a/main/connectivity/qa/complex/connectivity/JdbcLongVarCharTest.java b/main/connectivity/qa/complex/connectivity/JdbcLongVarCharTest.java
index 213cf4a22b..b4cb859b22 100644
--- a/main/connectivity/qa/complex/connectivity/JdbcLongVarCharTest.java
+++ b/main/connectivity/qa/complex/connectivity/JdbcLongVarCharTest.java
@@ -77,18 +77,18 @@ public class JdbcLongVarCharTest
// get the remote office component context
XMultiServiceFactory xServiceManager = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
Object x = xServiceManager.createInstance("com.sun.star.sdbc.DriverManager");
- com.sun.star.sdbc.XDriverAccess xDriverAccess = (XDriverAccess) UnoRuntime.queryInterface(XDriverAccess.class, x);
+ com.sun.star.sdbc.XDriverAccess xDriverAccess = UnoRuntime.queryInterface(XDriverAccess.class, x);
com.sun.star.sdbc.XDriver xDriver = xDriverAccess.getDriverByURL(url);
xConnection = xDriver.connect(url, prop);
//Object prepStmnt = xConnection.prepareStatement("SELECT * FROM t1 WHERE t1.c1 = ?");
Object prepStmnt = xConnection.prepareStatement("SELECT * FROM i90114 WHERE i90114.c1 = ?");
- ((XParameters) UnoRuntime.queryInterface(XParameters.class, prepStmnt)).clearParameters();
- ((XParameters) UnoRuntime.queryInterface(XParameters.class, prepStmnt)).setInt(1, 1);
+ (UnoRuntime.queryInterface(XParameters.class, prepStmnt)).clearParameters();
+ (UnoRuntime.queryInterface(XParameters.class, prepStmnt)).setInt(1, 1);
XResultSet xResultSet = ((XPreparedStatement) prepStmnt).executeQuery();
- XRow xRow = (XRow) UnoRuntime.queryInterface(XRow.class, xResultSet);
+ XRow xRow = UnoRuntime.queryInterface(XRow.class, xResultSet);
- XResultSetMetaDataSupplier xRsMetaSup = (XResultSetMetaDataSupplier) UnoRuntime.queryInterface(XResultSetMetaDataSupplier.class, xResultSet);
+ XResultSetMetaDataSupplier xRsMetaSup = UnoRuntime.queryInterface(XResultSetMetaDataSupplier.class, xResultSet);
XResultSetMetaData xRsMetaData = xRsMetaSup.getMetaData();
int nColumnCount = xRsMetaData.getColumnCount();
diff --git a/main/connectivity/qa/complex/connectivity/dbase/DBaseDateFunctions.java b/main/connectivity/qa/complex/connectivity/dbase/DBaseDateFunctions.java
index 2b5117cec2..19083373a7 100644
--- a/main/connectivity/qa/complex/connectivity/dbase/DBaseDateFunctions.java
+++ b/main/connectivity/qa/complex/connectivity/dbase/DBaseDateFunctions.java
@@ -42,12 +42,12 @@ public class DBaseDateFunctions
public void testFunctions() throws com.sun.star.uno.Exception, com.sun.star.beans.UnknownPropertyException
{
- final XRowSet xRowRes = (XRowSet) UnoRuntime.queryInterface(XRowSet.class,
+ final XRowSet xRowRes = UnoRuntime.queryInterface(XRowSet.class,
m_xORB.createInstance("com.sun.star.sdb.RowSet"));
System.out.println("starting DateTime function test!");
// set the properties needed to connect to a database
- final XPropertySet xProp = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, xRowRes);
+ final XPropertySet xProp = UnoRuntime.queryInterface(XPropertySet.class, xRowRes);
xProp.setPropertyValue("DataSourceName", "Bibliography");
xProp.setPropertyValue("CommandType", Integer.valueOf(com.sun.star.sdb.CommandType.COMMAND));
@@ -71,13 +71,13 @@ public class DBaseDateFunctions
private XRow execute(final XRowSet xRowRes, final String sql) throws com.sun.star.uno.Exception, com.sun.star.beans.UnknownPropertyException
{
- final XPropertySet xProp = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, xRowRes);
+ final XPropertySet xProp = UnoRuntime.queryInterface(XPropertySet.class, xRowRes);
xProp.setPropertyValue("Command", "SELECT " + sql + where);
xRowRes.execute();
- final XResultSet xRes = (XResultSet) UnoRuntime.queryInterface(XResultSet.class, xRowRes);
+ final XResultSet xRes = UnoRuntime.queryInterface(XResultSet.class, xRowRes);
assertTrue("No valid row! ", xRes.next());
- return (XRow) UnoRuntime.queryInterface(XRow.class, xRes);
+ return UnoRuntime.queryInterface(XRow.class, xRes);
}
private void dayofweek(final XRowSet xRowRes) throws com.sun.star.uno.Exception, com.sun.star.beans.UnknownPropertyException
diff --git a/main/connectivity/qa/complex/connectivity/dbase/DBaseNumericFunctions.java b/main/connectivity/qa/complex/connectivity/dbase/DBaseNumericFunctions.java
index 59a356316a..8176ba0d61 100644
--- a/main/connectivity/qa/complex/connectivity/dbase/DBaseNumericFunctions.java
+++ b/main/connectivity/qa/complex/connectivity/dbase/DBaseNumericFunctions.java
@@ -41,12 +41,12 @@ public class DBaseNumericFunctions
public void testFunctions() throws com.sun.star.uno.Exception, com.sun.star.beans.UnknownPropertyException
{
- final XRowSet xRowRes = (XRowSet) UnoRuntime.queryInterface(XRowSet.class,
+ final XRowSet xRowRes = UnoRuntime.queryInterface(XRowSet.class,
m_xORB.createInstance("com.sun.star.sdb.RowSet"));
System.out.println("starting Numeric function test");
// set the properties needed to connect to a database
- final XPropertySet xProp = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, xRowRes);
+ final XPropertySet xProp = UnoRuntime.queryInterface(XPropertySet.class, xRowRes);
xProp.setPropertyValue("DataSourceName", "Bibliography");
xProp.setPropertyValue("CommandType", Integer.valueOf(com.sun.star.sdb.CommandType.COMMAND));
@@ -76,13 +76,13 @@ public class DBaseNumericFunctions
private XRow execute(final XRowSet xRowRes,final String sql) throws com.sun.star.uno.Exception, com.sun.star.beans.UnknownPropertyException
{
- final XPropertySet xProp = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, xRowRes);
+ final XPropertySet xProp = UnoRuntime.queryInterface(XPropertySet.class, xRowRes);
xProp.setPropertyValue("Command", "SELECT " + sql + where);
xRowRes.execute();
- final XResultSet xRes = (XResultSet) UnoRuntime.queryInterface(XResultSet.class, xRowRes);
+ final XResultSet xRes = UnoRuntime.queryInterface(XResultSet.class, xRowRes);
assertTrue("No valid row! ", xRes.next());
- return (XRow) UnoRuntime.queryInterface(XRow.class, xRes);
+ return UnoRuntime.queryInterface(XRow.class, xRes);
}
private void abs(final XRowSet xRowRes) throws com.sun.star.uno.Exception, com.sun.star.beans.UnknownPropertyException
diff --git a/main/connectivity/qa/complex/connectivity/dbase/DBaseSqlTests.java b/main/connectivity/qa/complex/connectivity/dbase/DBaseSqlTests.java
index 44f511064b..1f2fba2ad4 100644
--- a/main/connectivity/qa/complex/connectivity/dbase/DBaseSqlTests.java
+++ b/main/connectivity/qa/complex/connectivity/dbase/DBaseSqlTests.java
@@ -38,12 +38,12 @@ public class DBaseSqlTests
public void testFunctions() throws com.sun.star.uno.Exception, com.sun.star.beans.UnknownPropertyException
{
- final XRowSet xRowRes = (XRowSet) UnoRuntime.queryInterface(XRowSet.class,
+ final XRowSet xRowRes = UnoRuntime.queryInterface(XRowSet.class,
m_xORB.createInstance("com.sun.star.sdb.RowSet"));
System.out.println("starting SQL test");
// set the properties needed to connect to a database
- final XPropertySet xProp = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, xRowRes);
+ final XPropertySet xProp = UnoRuntime.queryInterface(XPropertySet.class, xRowRes);
xProp.setPropertyValue("DataSourceName", "Bibliography");
xProp.setPropertyValue("CommandType", Integer.valueOf(com.sun.star.sdb.CommandType.COMMAND));
@@ -71,7 +71,7 @@ public class DBaseSqlTests
{
try
{
- final XPropertySet xProp = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, xRowRes);
+ final XPropertySet xProp = UnoRuntime.queryInterface(XPropertySet.class, xRowRes);
xProp.setPropertyValue("Command", "SELECT " + sql);
xRowRes.execute();
}
diff --git a/main/connectivity/qa/complex/connectivity/dbase/DBaseStringFunctions.java b/main/connectivity/qa/complex/connectivity/dbase/DBaseStringFunctions.java
index 37de1ab6a1..3ec78d60fc 100644
--- a/main/connectivity/qa/complex/connectivity/dbase/DBaseStringFunctions.java
+++ b/main/connectivity/qa/complex/connectivity/dbase/DBaseStringFunctions.java
@@ -41,12 +41,12 @@ public class DBaseStringFunctions
public void testFunctions() throws com.sun.star.uno.Exception, com.sun.star.beans.UnknownPropertyException
{
- final XRowSet xRowRes = (XRowSet) UnoRuntime.queryInterface(XRowSet.class,
+ final XRowSet xRowRes = UnoRuntime.queryInterface(XRowSet.class,
m_xORB.createInstance("com.sun.star.sdb.RowSet"));
System.out.println("starting String function test");
// set the properties needed to connect to a database
- final XPropertySet xProp = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, xRowRes);
+ final XPropertySet xProp = UnoRuntime.queryInterface(XPropertySet.class, xRowRes);
xProp.setPropertyValue("DataSourceName", "Bibliography");
xProp.setPropertyValue("CommandType", Integer.valueOf(com.sun.star.sdb.CommandType.COMMAND));
@@ -71,13 +71,13 @@ public class DBaseStringFunctions
private XRow execute(final XRowSet xRowRes, String sql) throws com.sun.star.uno.Exception, com.sun.star.beans.UnknownPropertyException
{
- final XPropertySet xProp = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, xRowRes);
+ final XPropertySet xProp = UnoRuntime.queryInterface(XPropertySet.class, xRowRes);
xProp.setPropertyValue("Command", "SELECT " + sql + where);
xRowRes.execute();
- final XResultSet xRes = (XResultSet) UnoRuntime.queryInterface(XResultSet.class, xRowRes);
+ final XResultSet xRes = UnoRuntime.queryInterface(XResultSet.class, xRowRes);
assertTrue("No valid row! ", xRes.next());
- return (XRow) UnoRuntime.queryInterface(XRow.class, xRes);
+ return UnoRuntime.queryInterface(XRow.class, xRes);
}
private void upper(final XRowSet xRowRes) throws com.sun.star.uno.Exception, com.sun.star.beans.UnknownPropertyException
diff --git a/main/connectivity/qa/complex/connectivity/hsqldb/TestCacheSize.java b/main/connectivity/qa/complex/connectivity/hsqldb/TestCacheSize.java
index 6c4db8bdee..4b763b16ce 100644
--- a/main/connectivity/qa/complex/connectivity/hsqldb/TestCacheSize.java
+++ b/main/connectivity/qa/complex/connectivity/hsqldb/TestCacheSize.java
@@ -290,7 +290,7 @@ public class TestCacheSize {
XPreparedStatement ps = cConnection.prepareStatement(
"INSERT INTO test (firstname,lastname,zip,filler) VALUES (?,?,?,?)");
- XParameters para = (XParameters)UnoRuntime.queryInterface(XParameters.class,ps);
+ XParameters para = UnoRuntime.queryInterface(XParameters.class,ps);
para.setString(1, "Julia");
para.setString(2, "Clancy");
@@ -319,12 +319,12 @@ public class TestCacheSize {
&& i % deleteWhileInsertInterval == 0) {
sStatement.execute("CALL IDENTITY();");
- XMultipleResults mrs = (XMultipleResults)UnoRuntime.queryInterface(XMultipleResults.class,sStatement);
+ XMultipleResults mrs = UnoRuntime.queryInterface(XMultipleResults.class,sStatement);
XResultSet rs = mrs.getResultSet();
rs.next();
- XRow row = (XRow)UnoRuntime.queryInterface(XRow.class,rs);
+ XRow row = UnoRuntime.queryInterface(XRow.class,rs);
int lastId = row.getInt(1);
sStatement.execute(
@@ -353,7 +353,7 @@ public class TestCacheSize {
XPreparedStatement ps = cConnection.prepareStatement(
"INSERT INTO test2 (id1, id2, firstname,lastname,zip,filler) VALUES (?,?,?,?,?,?)");
- XParameters para = (XParameters)UnoRuntime.queryInterface(XParameters.class,ps);
+ XParameters para = UnoRuntime.queryInterface(XParameters.class,ps);
para.setString(3, "Julia");
para.setString(4, "Clancy");
@@ -419,9 +419,9 @@ public class TestCacheSize {
// use primary index
sStatement.execute("SELECT count(*) from TEST");
- XMultipleResults mrs = (XMultipleResults)UnoRuntime.queryInterface(XMultipleResults.class,sStatement);
+ XMultipleResults mrs = UnoRuntime.queryInterface(XMultipleResults.class,sStatement);
rs = mrs.getResultSet();
- XRow row = (XRow)UnoRuntime.queryInterface(XRow.class,rs);
+ XRow row = UnoRuntime.queryInterface(XRow.class,rs);
rs.next();
System.out.println("Row Count: " + row.getInt(1));
@@ -471,7 +471,7 @@ public class TestCacheSize {
try {
XPreparedStatement ps = cConnection.prepareStatement(
"SELECT TOP 1 firstname,lastname,zip,filler FROM test WHERE zip = ?");
- XParameters para = (XParameters)UnoRuntime.queryInterface(XParameters.class,ps);
+ XParameters para = UnoRuntime.queryInterface(XParameters.class,ps);
for (; i < bigrows; i++) {
para.setInt(1, randomgen.nextInt(smallrows));
@@ -500,7 +500,7 @@ public class TestCacheSize {
try {
XPreparedStatement ps = cConnection.prepareStatement(
"SELECT firstname,lastname,zip,filler FROM test WHERE id = ?");
- XParameters para = (XParameters)UnoRuntime.queryInterface(XParameters.class,ps);
+ XParameters para = UnoRuntime.queryInterface(XParameters.class,ps);
for (i = 0; i < bigrows; i++) {
para.setInt(1, randomgen.nextInt(bigrows - 1));
@@ -524,7 +524,7 @@ public class TestCacheSize {
try {
XPreparedStatement ps = cConnection.prepareStatement(
"SELECT zip FROM zip WHERE zip = ?");
- XParameters para = (XParameters)UnoRuntime.queryInterface(XParameters.class,ps);
+ XParameters para = UnoRuntime.queryInterface(XParameters.class,ps);
for (i = 0; i < bigrows; i++) {
para.setInt(1, randomgen.nextInt(smallrows - 1));
@@ -556,7 +556,7 @@ public class TestCacheSize {
try {
XPreparedStatement ps = cConnection.prepareStatement(
"UPDATE test SET filler = filler || zip WHERE zip = ?");
- XParameters para = (XParameters)UnoRuntime.queryInterface(XParameters.class,ps);
+ XParameters para = UnoRuntime.queryInterface(XParameters.class,ps);
for (; i < smallrows; i++) {
int random = randomgen.nextInt(smallrows - 1);
@@ -583,7 +583,7 @@ public class TestCacheSize {
try {
XPreparedStatement ps = cConnection.prepareStatement(
"UPDATE test SET zip = zip + 1 WHERE id = ?");
- XParameters para = (XParameters)UnoRuntime.queryInterface(XParameters.class,ps);
+ XParameters para = UnoRuntime.queryInterface(XParameters.class,ps);
for (i = 0; i < bigrows; i++) {
int random = randomgen.nextInt(bigrows - 1);
diff --git a/main/connectivity/qa/connectivity/tools/HsqlDatabase.java b/main/connectivity/qa/connectivity/tools/HsqlDatabase.java
index 83107e2ec5..7b9b062a78 100644
--- a/main/connectivity/qa/connectivity/tools/HsqlDatabase.java
+++ b/main/connectivity/qa/connectivity/tools/HsqlDatabase.java
@@ -69,14 +69,14 @@ public class HsqlDatabase extends AbstractDatabase
documentFile.delete();
m_databaseDocumentFile = URLHelper.getFileURLFromSystemPath(documentFile);
- m_databaseDocument = (XOfficeDatabaseDocument) UnoRuntime.queryInterface(
+ m_databaseDocument = UnoRuntime.queryInterface(
XOfficeDatabaseDocument.class, m_orb.createInstance("com.sun.star.sdb.OfficeDatabaseDocument"));
m_dataSource = new DataSource(m_orb, m_databaseDocument.getDataSource());
- final XPropertySet dsProperties = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, m_databaseDocument.getDataSource());
+ final XPropertySet dsProperties = UnoRuntime.queryInterface(XPropertySet.class, m_databaseDocument.getDataSource());
dsProperties.setPropertyValue("URL", "sdbc:embedded:hsqldb");
- final XStorable storable = (XStorable) UnoRuntime.queryInterface(XStorable.class, m_databaseDocument);
+ final XStorable storable = UnoRuntime.queryInterface(XStorable.class, m_databaseDocument);
storable.storeAsURL( m_databaseDocumentFile, new PropertyValue[]
{ new PropertyValue( "PickListEntry", 0, false, PropertyState.DIRECT_VALUE )
} );
diff --git a/main/connectivity/qa/connectivity/tools/RowSet.java b/main/connectivity/qa/connectivity/tools/RowSet.java
index 3885368da9..6ee64cc22f 100644
--- a/main/connectivity/qa/connectivity/tools/RowSet.java
+++ b/main/connectivity/qa/connectivity/tools/RowSet.java
@@ -71,9 +71,9 @@ public class RowSet implements XRowSet, XRow
// misc
public int getColumnCount()
{
- XColumnsSupplier suppCols = (XColumnsSupplier)UnoRuntime.queryInterface(
+ XColumnsSupplier suppCols = UnoRuntime.queryInterface(
XColumnsSupplier.class, m_rowSet );
- XIndexAccess columns = (XIndexAccess)UnoRuntime.queryInterface(
+ XIndexAccess columns = UnoRuntime.queryInterface(
XIndexAccess.class, suppCols.getColumns() );
return columns.getCount();
}
diff --git a/main/dbaccess/qa/complex/dbaccess/RowSet.java b/main/dbaccess/qa/complex/dbaccess/RowSet.java
index 2da991832f..2122d78ad1 100644
--- a/main/dbaccess/qa/complex/dbaccess/RowSet.java
+++ b/main/dbaccess/qa/complex/dbaccess/RowSet.java
@@ -354,7 +354,7 @@ public class RowSet extends TestCase
System.out.println("testing Thread");
try
{
- // final XRow _row = (XRow)UnoRuntime.queryInterface(XRow.class,_resultSet);
+ // final XRow _row = UnoRuntime.queryInterface(XRow.class,_resultSet);
_resultSet.beforeFirst();
final int numberOfThreads = 10;
diff --git a/main/desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/OptionsEventHandler.java b/main/desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/OptionsEventHandler.java
index 138adc5502..3130716d42 100644
--- a/main/desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/OptionsEventHandler.java
+++ b/main/desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/OptionsEventHandler.java
@@ -90,7 +90,7 @@ public class OptionsEventHandler {
//pages.
XMultiServiceFactory xConfig;
try {
- xConfig = (XMultiServiceFactory) UnoRuntime.queryInterface(
+ xConfig = UnoRuntime.queryInterface(
XMultiServiceFactory.class,
m_cmpCtx.getServiceManager().createInstanceWithContext(
"com.sun.star.configuration.ConfigurationProvider", m_cmpCtx));
@@ -110,7 +110,7 @@ public class OptionsEventHandler {
//We get the com.sun.star.container.XNameAccess from the instance of
//ConfigurationUpdateAccess and save it for later use.
try {
- m_xAccessLeaves = (XNameAccess) UnoRuntime.queryInterface(
+ m_xAccessLeaves = UnoRuntime.queryInterface(
XNameAccess.class, xConfig.createInstanceWithArguments(
"com.sun.star.configuration.ConfigurationUpdateAccess", args));
@@ -206,7 +206,7 @@ public class OptionsEventHandler {
//To access the separate controls of the window we need to obtain the
//XControlContainer from the window implementation
- XControlContainer xContainer = (XControlContainer) UnoRuntime.queryInterface(
+ XControlContainer xContainer = UnoRuntime.queryInterface(
XControlContainer.class, aWindow);
if (xContainer == null)
throw new com.sun.star.uno.Exception(
@@ -230,7 +230,7 @@ public class OptionsEventHandler {
//From the control we get the model, which in turn supports the
//XPropertySet interface, which we finally use to get the data from
//the control.
- XPropertySet xProp = (XPropertySet) UnoRuntime.queryInterface(
+ XPropertySet xProp = UnoRuntime.queryInterface(
XPropertySet.class, xControl.getModel());
if (xProp == null)
@@ -256,7 +256,7 @@ public class OptionsEventHandler {
//com.sun.star.container.XNameAccess. The XNameAccess is used to get the
//particular registry node which represents this options page.
//Fortunately the name of the window is the same as the registry node.
- XPropertySet xLeaf = (XPropertySet) UnoRuntime.queryInterface(
+ XPropertySet xLeaf = UnoRuntime.queryInterface(
XPropertySet.class, m_xAccessLeaves.getByName(sWindowName));
if (xLeaf == null)
throw new com.sun.star.uno.Exception(
@@ -268,7 +268,7 @@ public class OptionsEventHandler {
//Committing the changes will cause or changes to be written to the registry.
XChangesBatch xUpdateCommit =
- (XChangesBatch) UnoRuntime.queryInterface(XChangesBatch.class, m_xAccessLeaves);
+ UnoRuntime.queryInterface(XChangesBatch.class, m_xAccessLeaves);
xUpdateCommit.commitChanges();
}
@@ -285,7 +285,7 @@ public class OptionsEventHandler {
//To access the separate controls of the window we need to obtain the
//XControlContainer from window implementation
- XControlContainer xContainer = (XControlContainer) UnoRuntime.queryInterface(
+ XControlContainer xContainer = UnoRuntime.queryInterface(
XControlContainer.class, aWindow);
if (xContainer == null)
throw new com.sun.star.uno.Exception(
@@ -301,7 +301,7 @@ public class OptionsEventHandler {
//of com.sun.star.configuration.ConfigurationUpdateAccess which supports
//com.sun.star.container.XNameAccess. We obtain now the section
//of the registry which is assigned to this options page.
- XPropertySet xLeaf = (XPropertySet) UnoRuntime.queryInterface(
+ XPropertySet xLeaf = UnoRuntime.queryInterface(
XPropertySet.class, m_xAccessLeaves.getByName(sWindowName));
if (xLeaf == null)
throw new com.sun.star.uno.Exception(
@@ -325,7 +325,7 @@ public class OptionsEventHandler {
//From the control we get the model, which in turn supports the
//XPropertySet interface, which we finally use to set the data at the
//control
- XPropertySet xProp = (XPropertySet) UnoRuntime.queryInterface(
+ XPropertySet xProp = UnoRuntime.queryInterface(
XPropertySet.class, xControl.getModel());
if (xProp == null)
@@ -350,7 +350,7 @@ public class OptionsEventHandler {
//We need to get the control model of the window. Therefore the first step is
//to query for it.
- XControl xControlDlg = (XControl) UnoRuntime.queryInterface(
+ XControl xControlDlg = UnoRuntime.queryInterface(
XControl.class, aWindow);
if (xControlDlg == null)
@@ -364,7 +364,7 @@ public class OptionsEventHandler {
"Cannot obtain XControlModel from XWindow in method external_event.", this);
//The model itself does not provide any information except that its
//implementation supports XPropertySet which is used to access the data.
- XPropertySet xPropDlg = (XPropertySet) UnoRuntime.queryInterface(
+ XPropertySet xPropDlg = UnoRuntime.queryInterface(
XPropertySet.class, xModelDlg);
if (xPropDlg == null)
throw new com.sun.star.uno.Exception(
diff --git a/main/embeddedobj/qa/complex/embedding/Test01.java b/main/embeddedobj/qa/complex/embedding/Test01.java
index db97fb5c8b..980f10141f 100644
--- a/main/embeddedobj/qa/complex/embedding/Test01.java
+++ b/main/embeddedobj/qa/complex/embedding/Test01.java
@@ -56,7 +56,7 @@ public class Test01 {
try
{
Object oDoc = m_xMSF.createInstance( "com.sun.star.comp.Draw.DrawingDocument" );
- XLoadable xLoad = (XLoadable) UnoRuntime.queryInterface( XLoadable.class, oDoc );
+ XLoadable xLoad = UnoRuntime.queryInterface( XLoadable.class, oDoc );
if ( xLoad == null )
{
m_aTestHelper.Error( "Can not get XLoadable!" );
@@ -65,7 +65,7 @@ public class Test01 {
xLoad.initNew();
- XDrawPagesSupplier xDPSupply = (XDrawPagesSupplier) UnoRuntime.queryInterface( XDrawPagesSupplier.class, oDoc );
+ XDrawPagesSupplier xDPSupply = UnoRuntime.queryInterface( XDrawPagesSupplier.class, oDoc );
if ( xDPSupply == null )
{
m_aTestHelper.Error( "Can not get XDrawPagesSupplier!" );
@@ -86,14 +86,14 @@ public class Test01 {
}
Object oPage = xDrawPages.getByIndex( 0 );
- XDrawPage xPage = (XDrawPage) UnoRuntime.queryInterface( XDrawPage.class, oPage );
+ XDrawPage xPage = UnoRuntime.queryInterface( XDrawPage.class, oPage );
if ( xPage == null )
{
m_aTestHelper.Error( "Can not get access to drawing page!" );
return false;
}
- XMultiServiceFactory xDrFactory = ( XMultiServiceFactory ) UnoRuntime.queryInterface( XMultiServiceFactory.class, oDoc );
+ XMultiServiceFactory xDrFactory = UnoRuntime.queryInterface( XMultiServiceFactory.class, oDoc );
if ( xDrFactory == null )
{
m_aTestHelper.Error( "Can not get drawing factory!" );
@@ -101,14 +101,14 @@ public class Test01 {
}
Object oShape = xDrFactory.createInstance( "com.sun.star.drawing.OLE2Shape" );
- XShape xShape = ( XShape ) UnoRuntime.queryInterface( XShape.class, oShape );
+ XShape xShape = UnoRuntime.queryInterface( XShape.class, oShape );
if ( xShape == null )
{
m_aTestHelper.Error( "Can not create new shape!" );
return false;
}
- XPropertySet xShapeProps = ( XPropertySet ) UnoRuntime.queryInterface( XPropertySet.class, oShape );
+ XPropertySet xShapeProps = UnoRuntime.queryInterface( XPropertySet.class, oShape );
if ( xShapeProps == null )
{
m_aTestHelper.Error( "Can not get access to shapes properties!" );
@@ -119,7 +119,7 @@ public class Test01 {
xShapeProps.setPropertyValue( "CLSID", "078B7ABA-54FC-457F-8551-6147e776a997" );
Object oEmbObj = xShapeProps.getPropertyValue( "EmbeddedObject" );
- XEmbeddedObject xEmbObj = ( XEmbeddedObject ) UnoRuntime.queryInterface( XEmbeddedObject.class, oEmbObj );
+ XEmbeddedObject xEmbObj = UnoRuntime.queryInterface( XEmbeddedObject.class, oEmbObj );
if ( xEmbObj == null )
{
m_aTestHelper.Error( "Embedded object can not be accessed!" );
@@ -134,7 +134,7 @@ public class Test01 {
}
Object oReplacement = xShapeProps.getPropertyValue( "Graphic" );
- XGraphic xReplGraph = ( XGraphic ) UnoRuntime.queryInterface( XGraphic.class, oReplacement );
+ XGraphic xReplGraph = UnoRuntime.queryInterface( XGraphic.class, oReplacement );
if ( xReplGraph == null )
{
m_aTestHelper.Error( "The replacement graphic should be available!" );
diff --git a/main/embeddedobj/test/Container1/BitmapPainter.java b/main/embeddedobj/test/Container1/BitmapPainter.java
index 75a76acf6f..8cf3256a83 100644
--- a/main/embeddedobj/test/Container1/BitmapPainter.java
+++ b/main/embeddedobj/test/Container1/BitmapPainter.java
@@ -263,7 +263,7 @@ class BitmapPainter implements XPaintListener, XMouseListener, XMouseMotionListe
System.out.println( "The bitmap is going to be painted!" );
try {
- XDevice xDevice = (XDevice)UnoRuntime.queryInterface( XDevice.class, m_xWindow );
+ XDevice xDevice = UnoRuntime.queryInterface( XDevice.class, m_xWindow );
if ( xDevice != null )
{
System.out.println( "Step1" );
diff --git a/main/embeddedobj/test/Container1/EmbedContApp.java b/main/embeddedobj/test/Container1/EmbedContApp.java
index f8be1a693e..a9ab378bb2 100644
--- a/main/embeddedobj/test/Container1/EmbedContApp.java
+++ b/main/embeddedobj/test/Container1/EmbedContApp.java
@@ -176,7 +176,7 @@ public class EmbedContApp extends Applet
try {
Object oTransformer = m_xServiceFactory.createInstance( "com.sun.star.util.URLTransformer" );
- m_xTransformer = (XURLTransformer)UnoRuntime.queryInterface( XURLTransformer.class, oTransformer );
+ m_xTransformer = UnoRuntime.queryInterface( XURLTransformer.class, oTransformer );
} catch( Exception e ) { System.exit( 0 ); }
m_oActionsNumberLock = new Object();
@@ -187,7 +187,7 @@ public class EmbedContApp extends Applet
try {
Object oJob = m_xServiceFactory.createInstance( "com.sun.star.comp.thread.MainThreadExecutor" );
- m_xMainThreadExecutor = (XJob)UnoRuntime.queryInterface( XJob.class, oJob );
+ m_xMainThreadExecutor = UnoRuntime.queryInterface( XJob.class, oJob );
} catch( Exception e ) {}
if ( m_xMainThreadExecutor == null )
@@ -314,7 +314,7 @@ public class EmbedContApp extends Applet
if ( m_xEmbedObj != null )
{
try {
- XEmbedPersist xPersist = (XEmbedPersist)UnoRuntime.queryInterface( XEmbedPersist.class, m_xEmbedObj );
+ XEmbedPersist xPersist = UnoRuntime.queryInterface( XEmbedPersist.class, m_xEmbedObj );
if ( xPersist != null )
{
xPersist.storeOwn();
@@ -464,7 +464,7 @@ public class EmbedContApp extends Applet
if ( nState == EmbedStates.EMBED_INPLACE_ACTIVE
|| nState == EmbedStates.EMBED_UI_ACTIVE )
{
- XInplaceObject xInplObj = (XInplaceObject)UnoRuntime.queryInterface( XInplaceObject.class, m_xEmbedObj );
+ XInplaceObject xInplObj = UnoRuntime.queryInterface( XInplaceObject.class, m_xEmbedObj );
if ( xInplObj != null )
{
xInplObj.setObjectRects( aPosRect, aPosRect ); // show the whole object
@@ -579,7 +579,7 @@ public class EmbedContApp extends Applet
if ( m_bLinkObj )
storeLinkToStorage();
- XTransactedObject xTransact = (XTransactedObject)UnoRuntime.queryInterface( XTransactedObject.class,
+ XTransactedObject xTransact = UnoRuntime.queryInterface( XTransactedObject.class,
m_xStorage );
if ( xTransact != null )
xTransact.commit();
@@ -694,12 +694,12 @@ public class EmbedContApp extends Applet
if ( m_xStorage != null )
{
try {
- XNameAccess xNameAccess = (XNameAccess)UnoRuntime.queryInterface( XNameAccess.class,
+ XNameAccess xNameAccess = UnoRuntime.queryInterface( XNameAccess.class,
m_xStorage );
if ( xNameAccess != null && xNameAccess.hasByName( "LinkName" ) )
m_xStorage.removeElement( "LinkName" );
- XLinkageSupport xLinkage = (XLinkageSupport)UnoRuntime.queryInterface( XLinkageSupport.class,
+ XLinkageSupport xLinkage = UnoRuntime.queryInterface( XLinkageSupport.class,
m_xEmbedObj );
if ( xLinkage != null )
{
@@ -868,7 +868,7 @@ public class EmbedContApp extends Applet
com.sun.star.awt.Size aBitmapSize = new com.sun.star.awt.Size( 200, 100 );
- XVisualObject xVisObj = (XVisualObject)UnoRuntime.queryInterface( XVisualObject.class, m_xEmbedObj );
+ XVisualObject xVisObj = UnoRuntime.queryInterface( XVisualObject.class, m_xEmbedObj );
try {
com.sun.star.awt.Size aVisSize = xVisObj.getVisAreaSize( Aspects.MSASPECT_CONTENT );
m_nXPixelSize = aVisSize.Width / aBitmapSize.Width;
@@ -910,13 +910,13 @@ public class EmbedContApp extends Applet
if ( nState == EmbedStates.EMBED_UI_ACTIVE || nState == EmbedStates.EMBED_INPLACE_ACTIVE
|| nState == EmbedStates.EMBED_ACTIVE || nState == EmbedStates.EMBED_RUNNING )
{
- XComponentSupplier xCompProv = (XComponentSupplier)UnoRuntime.queryInterface(
+ XComponentSupplier xCompProv = UnoRuntime.queryInterface(
XComponentSupplier.class,
m_xEmbedObj );
if ( xCompProv != null )
{
XCloseable xCloseable = xCompProv.getComponent();
- XTransferable xTransfer = (XTransferable)UnoRuntime.queryInterface(
+ XTransferable xTransfer = UnoRuntime.queryInterface(
XTransferable.class,
xCloseable );
if ( xTransfer != null )
@@ -1282,7 +1282,7 @@ public class EmbedContApp extends Applet
// create embedded object based on the class ID
try {
Object oEmbedCreator = m_xServiceFactory.createInstance( "com.sun.star.embed.EmbeddedObjectCreator" );
- XEmbedObjectCreator xEmbedCreator = (XEmbedObjectCreator)UnoRuntime.queryInterface(
+ XEmbedObjectCreator xEmbedCreator = UnoRuntime.queryInterface(
XEmbedObjectCreator.class,
oEmbedCreator );
if ( xEmbedCreator != null )
@@ -1292,7 +1292,7 @@ public class EmbedContApp extends Applet
m_xStorage,
"EmbedSub",
new PropertyValue[0] );
- xEmbObj = (XEmbeddedObject)UnoRuntime.queryInterface( XEmbeddedObject.class, oEmbObj );
+ xEmbObj = UnoRuntime.queryInterface( XEmbeddedObject.class, oEmbObj );
}
else
JOptionPane.showMessageDialog( m_aFrame,
@@ -1317,7 +1317,7 @@ public class EmbedContApp extends Applet
try {
Object oLinkCreator = m_xServiceFactory.createInstance( "com.sun.star.embed.EmbeddedObjectCreator" );
- XLinkCreator xLinkCreator = (XLinkCreator)UnoRuntime.queryInterface(
+ XLinkCreator xLinkCreator = UnoRuntime.queryInterface(
XLinkCreator.class,
oLinkCreator );
if ( xLinkCreator != null )
@@ -1328,7 +1328,7 @@ public class EmbedContApp extends Applet
aMedDescr[1].Name = "ReadOnly";
aMedDescr[1].Value = (Object) new Boolean( false );
Object oEmbObj = xLinkCreator.createInstanceLink( m_xStorage, "EmbedSub", aMedDescr, new PropertyValue[0] );
- xEmbObj = (XEmbeddedObject)UnoRuntime.queryInterface( XEmbeddedObject.class, oEmbObj );
+ xEmbObj = UnoRuntime.queryInterface( XEmbeddedObject.class, oEmbObj );
}
else
JOptionPane.showMessageDialog( m_aFrame,
@@ -1351,7 +1351,7 @@ public class EmbedContApp extends Applet
XEmbeddedObject xEmbObj = null;
try {
Object oEmbedCreator = m_xServiceFactory.createInstance( "com.sun.star.embed.EmbeddedObjectCreator" );
- XEmbedObjectCreator xEmbedCreator = (XEmbedObjectCreator)UnoRuntime.queryInterface(
+ XEmbedObjectCreator xEmbedCreator = UnoRuntime.queryInterface(
XEmbedObjectCreator.class,
oEmbedCreator );
if ( xEmbedCreator != null )
@@ -1365,7 +1365,7 @@ public class EmbedContApp extends Applet
"EmbedSub",
aMedDescr,
new PropertyValue[0] );
- xEmbObj = (XEmbeddedObject)UnoRuntime.queryInterface( XEmbeddedObject.class, oEmbObj );
+ xEmbObj = UnoRuntime.queryInterface( XEmbeddedObject.class, oEmbObj );
}
else
JOptionPane.showMessageDialog( m_aFrame,
@@ -1401,7 +1401,7 @@ public class EmbedContApp extends Applet
if ( m_xEmbedObj != null )
{
try {
- XCloseable xClose = (XCloseable)UnoRuntime.queryInterface( XCloseable.class, m_xEmbedObj );
+ XCloseable xClose = UnoRuntime.queryInterface( XCloseable.class, m_xEmbedObj );
if ( xClose != null )
xClose.close( true );
}
@@ -1413,7 +1413,7 @@ public class EmbedContApp extends Applet
if ( m_xStorage != null )
{
try {
- XComponent xComponent = (XComponent)UnoRuntime.queryInterface( XComponent.class, m_xStorage );
+ XComponent xComponent = UnoRuntime.queryInterface( XComponent.class, m_xStorage );
if ( xComponent != null )
xComponent.dispose();
}
@@ -1429,13 +1429,13 @@ public class EmbedContApp extends Applet
try {
Object oStorageFactory = m_xServiceFactory.createInstance( "com.sun.star.embed.StorageFactory" );
- XSingleServiceFactory xStorageFactory = (XSingleServiceFactory)UnoRuntime.queryInterface(
+ XSingleServiceFactory xStorageFactory = UnoRuntime.queryInterface(
XSingleServiceFactory.class,
oStorageFactory );
if ( xStorageFactory != null )
{
Object oStorage = xStorageFactory.createInstance();
- xTempStorage = (XStorage)UnoRuntime.queryInterface( XStorage.class, oStorage );
+ xTempStorage = UnoRuntime.queryInterface( XStorage.class, oStorage );
}
else
JOptionPane.showMessageDialog( m_aFrame,
@@ -1455,12 +1455,12 @@ public class EmbedContApp extends Applet
{
try {
Object oStorageFactory = m_xServiceFactory.createInstance( "com.sun.star.embed.StorageFactory" );
- XSingleServiceFactory xStorageFactory = (XSingleServiceFactory)UnoRuntime.queryInterface(
+ XSingleServiceFactory xStorageFactory = UnoRuntime.queryInterface(
XSingleServiceFactory.class,
oStorageFactory );
if ( xStorageFactory != null )
{
- XEmbedPersist xPersist = (XEmbedPersist)UnoRuntime.queryInterface( XEmbedPersist.class, m_xEmbedObj );
+ XEmbedPersist xPersist = UnoRuntime.queryInterface( XEmbedPersist.class, m_xEmbedObj );
if ( xPersist != null )
{
Object aArgs[] = new Object[2];
@@ -1468,7 +1468,7 @@ public class EmbedContApp extends Applet
aArgs[1] = new Integer( ElementModes.ELEMENT_READWRITE );
Object oStorage = xStorageFactory.createInstanceWithArguments( aArgs );
- XStorage xTargetStorage = (XStorage)UnoRuntime.queryInterface( XStorage.class, oStorage );
+ XStorage xTargetStorage = UnoRuntime.queryInterface( XStorage.class, oStorage );
PropertyValue aProps[] = { new PropertyValue() };
aProps[0].Name = "StoreVisualReplacement";
@@ -1478,13 +1478,13 @@ public class EmbedContApp extends Applet
xPersist.saveCompleted( true );
// the object must be already based on new storage
- XComponent xComponent = (XComponent)UnoRuntime.queryInterface( XComponent.class, m_xStorage );
+ XComponent xComponent = UnoRuntime.queryInterface( XComponent.class, m_xStorage );
xComponent.dispose();
m_xStorage = xTargetStorage;
m_bOwnFile = true;
- XTransactedObject xTransact = (XTransactedObject)UnoRuntime.queryInterface( XTransactedObject.class,
+ XTransactedObject xTransact = UnoRuntime.queryInterface( XTransactedObject.class,
m_xStorage );
if ( xTransact != null )
xTransact.commit();
@@ -1510,7 +1510,7 @@ public class EmbedContApp extends Applet
try
{
Object oStorageFactory = m_xServiceFactory.createInstance( "com.sun.star.embed.StorageFactory" );
- XSingleServiceFactory xStorageFactory = (XSingleServiceFactory)UnoRuntime.queryInterface(
+ XSingleServiceFactory xStorageFactory = UnoRuntime.queryInterface(
XSingleServiceFactory.class,
oStorageFactory );
Object aArgs[] = new Object[2];
@@ -1518,14 +1518,14 @@ public class EmbedContApp extends Applet
aArgs[1] = new Integer( ElementModes.ELEMENT_READWRITE );
Object oStorage = xStorageFactory.createInstanceWithArguments( aArgs );
- XStorage xTargetStorage = (XStorage)UnoRuntime.queryInterface( XStorage.class, oStorage );
+ XStorage xTargetStorage = UnoRuntime.queryInterface( XStorage.class, oStorage );
Object oEmbedCreator = m_xServiceFactory.createInstance( "com.sun.star.embed.EmbeddedObjectCreator" );
- XEmbedObjectCreator xEmbedCreator = (XEmbedObjectCreator)UnoRuntime.queryInterface(
+ XEmbedObjectCreator xEmbedCreator = UnoRuntime.queryInterface(
XEmbedObjectCreator.class,
oEmbedCreator );
- XNameAccess xNameAccess = (XNameAccess)UnoRuntime.queryInterface( XNameAccess.class,
+ XNameAccess xNameAccess = UnoRuntime.queryInterface( XNameAccess.class,
xTargetStorage );
if ( xNameAccess == null )
{
@@ -1560,7 +1560,7 @@ public class EmbedContApp extends Applet
false,
new PropertyValue[0] );
- m_xEmbedObj = (XEmbeddedObject)UnoRuntime.queryInterface( XEmbeddedObject.class, oEmbObj );
+ m_xEmbedObj = UnoRuntime.queryInterface( XEmbeddedObject.class, oEmbObj );
if ( m_xEmbedObj != null )
{
@@ -1589,7 +1589,7 @@ public class EmbedContApp extends Applet
if ( xLinkStream != null )
{
XOutputStream xLinkOutStream = xLinkStream.getOutputStream();
- XTruncate xTruncate = (XTruncate) UnoRuntime.queryInterface( XTruncate.class,
+ XTruncate xTruncate = UnoRuntime.queryInterface( XTruncate.class,
xLinkOutStream );
if ( xLinkOutStream != null && xTruncate != null )
{
@@ -1603,7 +1603,7 @@ public class EmbedContApp extends Applet
xLinkOutStream.writeBytes( aLinkBytes );
xLinkOutStream.closeOutput();
- XComponent xComponent = (XComponent) UnoRuntime.queryInterface( XComponent.class,
+ XComponent xComponent = UnoRuntime.queryInterface( XComponent.class,
xLinkStream );
if ( xComponent != null )
xComponent.dispose();
@@ -1636,7 +1636,7 @@ public class EmbedContApp extends Applet
{
try {
Object oStorageFactory = m_xServiceFactory.createInstance( "com.sun.star.embed.StorageFactory" );
- XSingleServiceFactory xStorageFactory = (XSingleServiceFactory)UnoRuntime.queryInterface(
+ XSingleServiceFactory xStorageFactory = UnoRuntime.queryInterface(
XSingleServiceFactory.class,
oStorageFactory );
if ( xStorageFactory != null )
@@ -1646,9 +1646,9 @@ public class EmbedContApp extends Applet
aArgs[1] = new Integer( ElementModes.ELEMENT_READWRITE );
Object oStorage = xStorageFactory.createInstanceWithArguments( aArgs );
- XStorage xTargetStorage = (XStorage)UnoRuntime.queryInterface( XStorage.class, oStorage );
+ XStorage xTargetStorage = UnoRuntime.queryInterface( XStorage.class, oStorage );
- XComponent xComponent = (XComponent)UnoRuntime.queryInterface( XComponent.class, m_xStorage );
+ XComponent xComponent = UnoRuntime.queryInterface( XComponent.class, m_xStorage );
xComponent.dispose();
m_xStorage = xTargetStorage;
@@ -1656,7 +1656,7 @@ public class EmbedContApp extends Applet
storeLinkToStorage();
- XTransactedObject xTransact = (XTransactedObject)UnoRuntime.queryInterface( XTransactedObject.class,
+ XTransactedObject xTransact = UnoRuntime.queryInterface( XTransactedObject.class,
m_xStorage );
if ( xTransact != null )
xTransact.commit();
diff --git a/main/embeddedobj/test/Container1/EmbedContFrame.java b/main/embeddedobj/test/Container1/EmbedContFrame.java
index 20774357d8..12be421d1c 100644
--- a/main/embeddedobj/test/Container1/EmbedContFrame.java
+++ b/main/embeddedobj/test/Container1/EmbedContFrame.java
@@ -120,15 +120,15 @@ public class EmbedContFrame extends Frame
// create a connector, so that it can contact the office
Object oUrlResolver = xLocalServiceManager.createInstanceWithContext( "com.sun.star.bridge.UnoUrlResolver",
xComponentContext );
- XUnoUrlResolver xUrlResolver = (XUnoUrlResolver)UnoRuntime.queryInterface( XUnoUrlResolver.class, oUrlResolver );
+ XUnoUrlResolver xUrlResolver = UnoRuntime.queryInterface( XUnoUrlResolver.class, oUrlResolver );
Object oInitialObject = xUrlResolver.resolve( sConnectionString );
- XNamingService xName = (XNamingService)UnoRuntime.queryInterface( XNamingService.class, oInitialObject );
+ XNamingService xName = UnoRuntime.queryInterface( XNamingService.class, oInitialObject );
XMultiServiceFactory xMSF = null;
if( xName != null ) {
Object oMSF = xName.getRegisteredObject( "StarOffice.ServiceManager" );
- xMSF = (XMultiServiceFactory)UnoRuntime.queryInterface( XMultiServiceFactory.class, oMSF );
+ xMSF = UnoRuntime.queryInterface( XMultiServiceFactory.class, oMSF );
}
else
System.out.println( "Error: Can't get XNamingService interface from url resolver!" );
diff --git a/main/embeddedobj/test/Container1/PaintThread.java b/main/embeddedobj/test/Container1/PaintThread.java
index 00beaf18cf..d6d9ce47b1 100644
--- a/main/embeddedobj/test/Container1/PaintThread.java
+++ b/main/embeddedobj/test/Container1/PaintThread.java
@@ -130,7 +130,7 @@ class PaintThread extends java.lang.Thread
if ( bPaint )
{
// System.out.println( "The bitmap is going to be painted!" );
- XDevice xDevice = (XDevice)UnoRuntime.queryInterface( XDevice.class, m_xWindow );
+ XDevice xDevice = UnoRuntime.queryInterface( XDevice.class, m_xWindow );
if ( xDevice != null )
{
// System.out.println( "Step1" );
diff --git a/main/embeddedobj/test/Container1/WindowHelper.java b/main/embeddedobj/test/Container1/WindowHelper.java
index 88578a90bb..0bc5d1db6c 100644
--- a/main/embeddedobj/test/Container1/WindowHelper.java
+++ b/main/embeddedobj/test/Container1/WindowHelper.java
@@ -53,7 +53,7 @@ class WindowHelper {
// get access to toolkit of remote office to create the container window of new target frame
try{
- xToolkit = (XToolkit)UnoRuntime.queryInterface( XToolkit.class,
+ xToolkit = UnoRuntime.queryInterface( XToolkit.class,
xFactory.createInstance("com.sun.star.awt.Toolkit") );
}
catch( Exception ex )
@@ -61,7 +61,7 @@ class WindowHelper {
return null;
}
- XSystemChildFactory xChildFactory = (XSystemChildFactory)UnoRuntime.queryInterface(
+ XSystemChildFactory xChildFactory = UnoRuntime.queryInterface(
XSystemChildFactory.class,
xToolkit);
@@ -82,7 +82,7 @@ class WindowHelper {
{
JavaWindowPeerFake aWrapper = new JavaWindowPeerFake(aParent);
- XWindowPeer xParentPeer = (XWindowPeer)UnoRuntime.queryInterface(
+ XWindowPeer xParentPeer = UnoRuntime.queryInterface(
XWindowPeer.class,
aWrapper);
@@ -111,7 +111,7 @@ class WindowHelper {
xPeer = xToolkit.createWindow( aDescriptor );
}
- xWindow = (XWindow)UnoRuntime.queryInterface( XWindow.class, xPeer);
+ xWindow = UnoRuntime.queryInterface( XWindow.class, xPeer);
if ( xWindow != null )
xWindow.setPosSize( (int)aBounds.getX(),
(int)aBounds.getY(),
@@ -138,11 +138,11 @@ class WindowHelper {
XBitmap xResult = null;
try {
- XSingleServiceFactory xBitmapFactory = (XSingleServiceFactory)UnoRuntime.queryInterface(
+ XSingleServiceFactory xBitmapFactory = UnoRuntime.queryInterface(
XSingleServiceFactory.class,
xFactory.createInstance( "com.sun.star.embed.BitmapCreator" ) );
- xResult = (XBitmap)UnoRuntime.queryInterface(
+ xResult = UnoRuntime.queryInterface(
XBitmap.class,
xBitmapFactory.createInstanceWithArguments( aArgs ) );
}
diff --git a/main/extensions/qa/integration/extensions/ConsoleWait.java b/main/extensions/qa/integration/extensions/ConsoleWait.java
index ed9aaa526c..8f4e1ed284 100644
--- a/main/extensions/qa/integration/extensions/ConsoleWait.java
+++ b/main/extensions/qa/integration/extensions/ConsoleWait.java
@@ -80,7 +80,7 @@ public class ConsoleWait implements com.sun.star.lang.XEventListener
public ConsoleWait( Object _disposable )
{
m_disposable = _disposable;
- XComponent component = (XComponent)UnoRuntime.queryInterface( XComponent.class, _disposable );
+ XComponent component = UnoRuntime.queryInterface( XComponent.class, _disposable );
if ( component != null )
component.addEventListener( this );
}
diff --git a/main/extensions/qa/integration/extensions/Frame.java b/main/extensions/qa/integration/extensions/Frame.java
index 9c70e038b3..c20b1c3424 100644
--- a/main/extensions/qa/integration/extensions/Frame.java
+++ b/main/extensions/qa/integration/extensions/Frame.java
@@ -51,12 +51,12 @@ public class Frame implements XFrame,
{
if ( _frameComponent != null )
{
- m_frame = (XFrame)UnoRuntime.queryInterface( XFrame.class, _frameComponent );
- m_dispatchProvider = (XDispatchProvider)UnoRuntime.queryInterface( XDispatchProvider.class, _frameComponent );
- m_dispatchProviderInterception = (XDispatchProviderInterception)UnoRuntime.queryInterface( XDispatchProviderInterception.class, _frameComponent );
- m_framesSupplier = (XFramesSupplier)UnoRuntime.queryInterface( XFramesSupplier.class, _frameComponent );
- m_statusIndicatorFactory = (XStatusIndicatorFactory)UnoRuntime.queryInterface( XStatusIndicatorFactory.class, _frameComponent );
- m_closeable = (XCloseable)UnoRuntime.queryInterface( XCloseable.class, _frameComponent );
+ m_frame = UnoRuntime.queryInterface( XFrame.class, _frameComponent );
+ m_dispatchProvider = UnoRuntime.queryInterface( XDispatchProvider.class, _frameComponent );
+ m_dispatchProviderInterception = UnoRuntime.queryInterface( XDispatchProviderInterception.class, _frameComponent );
+ m_framesSupplier = UnoRuntime.queryInterface( XFramesSupplier.class, _frameComponent );
+ m_statusIndicatorFactory = UnoRuntime.queryInterface( XStatusIndicatorFactory.class, _frameComponent );
+ m_closeable = UnoRuntime.queryInterface( XCloseable.class, _frameComponent );
}
}
diff --git a/main/extensions/qa/integration/extensions/MethodHandler.java b/main/extensions/qa/integration/extensions/MethodHandler.java
index 3094d4dca8..9ca9dd2b07 100644
--- a/main/extensions/qa/integration/extensions/MethodHandler.java
+++ b/main/extensions/qa/integration/extensions/MethodHandler.java
@@ -50,7 +50,7 @@ public class MethodHandler implements XPropertyHandler
try
{
- m_introspection = (XIntrospection)UnoRuntime.queryInterface( XIntrospection.class,
+ m_introspection = UnoRuntime.queryInterface( XIntrospection.class,
m_context.getServiceManager().createInstanceWithContext( "com.sun.star.beans.Introspection", m_context )
);
}
@@ -101,7 +101,7 @@ public class MethodHandler implements XPropertyHandler
descriptor.IndentLevel = 0;
try
{
- XPropertyControl control = (XPropertyControl)UnoRuntime.queryInterface(
+ XPropertyControl control = UnoRuntime.queryInterface(
XPropertyControl.class, _propertyControlFactory.createPropertyControl(
PropertyControlType.TextField, true ) );
diff --git a/main/extensions/qa/integration/extensions/ObjectInspector.java b/main/extensions/qa/integration/extensions/ObjectInspector.java
index b095b183a8..d6c0ecbb2f 100644
--- a/main/extensions/qa/integration/extensions/ObjectInspector.java
+++ b/main/extensions/qa/integration/extensions/ObjectInspector.java
@@ -72,8 +72,8 @@ public class ObjectInspector
public void before() throws com.sun.star.uno.Exception, java.lang.Exception
{
m_orb = UnoRuntime.queryInterface(XMultiServiceFactory.class, officeConnection.getComponentContext().getServiceManager());
- m_context = (XComponentContext)UnoRuntime.queryInterface( XComponentContext.class,
- ((XPropertySet)UnoRuntime.queryInterface( XPropertySet.class, m_orb )).getPropertyValue( "DefaultContext" ) );
+ m_context = UnoRuntime.queryInterface( XComponentContext.class,
+ (UnoRuntime.queryInterface( XPropertySet.class, m_orb )).getPropertyValue( "DefaultContext" ) );
m_desktop = new Frame( m_orb.createInstance( "com.sun.star.frame.Desktop" ) );
}
@@ -160,7 +160,7 @@ public class ObjectInspector
/* ------------------------------------------------------------------ */
private com.sun.star.awt.XWindow createFloatingWindow() throws com.sun.star.uno.Exception
{
- com.sun.star.awt.XToolkit toolkit = (com.sun.star.awt.XToolkit)UnoRuntime.queryInterface(
+ com.sun.star.awt.XToolkit toolkit = UnoRuntime.queryInterface(
com.sun.star.awt.XToolkit.class, m_orb.createInstance( "com.sun.star.awt.Toolkit" ) );
com.sun.star.awt.WindowDescriptor windowDescriptor = new com.sun.star.awt.WindowDescriptor();
@@ -176,7 +176,7 @@ public class ObjectInspector
+ com.sun.star.awt.WindowAttribute.CLOSEABLE
+ com.sun.star.awt.VclWindowPeerAttribute.CLIPCHILDREN;
- return (com.sun.star.awt.XWindow)UnoRuntime.queryInterface( com.sun.star.awt.XWindow.class,
+ return UnoRuntime.queryInterface( com.sun.star.awt.XWindow.class,
toolkit.createWindow( windowDescriptor ) );
}
}
diff --git a/main/extensions/qa/integration/extensions/ServicesHandler.java b/main/extensions/qa/integration/extensions/ServicesHandler.java
index e61886fd3b..2c3d99ef94 100644
--- a/main/extensions/qa/integration/extensions/ServicesHandler.java
+++ b/main/extensions/qa/integration/extensions/ServicesHandler.java
@@ -68,7 +68,7 @@ public class ServicesHandler implements XPropertyHandler
// the OpenHyperlink command, to be dispatched to the Desktop
com.sun.star.util.URL dispatchURL[] = { new com.sun.star.util.URL() };
dispatchURL[0].Complete = ".uno:OpenHyperlink";
- com.sun.star.util.XURLTransformer transformer = (com.sun.star.util.XURLTransformer)UnoRuntime.queryInterface(
+ com.sun.star.util.XURLTransformer transformer = UnoRuntime.queryInterface(
com.sun.star.util.XURLTransformer.class,
m_context.getServiceManager().createInstanceWithContext( "com.sun.star.util.URLTransformer", m_context ) );
transformer.parseStrict( dispatchURL );
@@ -135,7 +135,7 @@ public class ServicesHandler implements XPropertyHandler
descriptor.IndentLevel = 0;
try
{
- XHyperlinkControl hyperlinkControl = (XHyperlinkControl)UnoRuntime.queryInterface(
+ XHyperlinkControl hyperlinkControl = UnoRuntime.queryInterface(
XHyperlinkControl.class, _propertyControlFactory.createPropertyControl( PropertyControlType.HyperlinkField, true ) );
hyperlinkControl.addActionListener( new ClickHandler( m_context, _propertyName ) );
@@ -186,7 +186,7 @@ public class ServicesHandler implements XPropertyHandler
public void inspect(Object _component) throws com.sun.star.lang.NullPointerException
{
- XServiceInfo serviceInfo = (XServiceInfo)UnoRuntime.queryInterface( XServiceInfo.class, _component );
+ XServiceInfo serviceInfo = UnoRuntime.queryInterface( XServiceInfo.class, _component );
if ( serviceInfo != null )
m_supportedServices = serviceInfo.getSupportedServiceNames();
}
diff --git a/main/extensions/test/pgp/TestPGP.java b/main/extensions/test/pgp/TestPGP.java
index 98add4e582..07a68f7dbe 100644
--- a/main/extensions/test/pgp/TestPGP.java
+++ b/main/extensions/test/pgp/TestPGP.java
@@ -66,18 +66,18 @@ public class TestPGP {
static void doSomething(Object r) throws com.sun.star.uno.Exception, IOException, Exception {
- XNamingService rName = (XNamingService)UnoRuntime.queryInterface(XNamingService.class, r);
+ XNamingService rName = UnoRuntime.queryInterface(XNamingService.class, r);
if(rName != null) {
System.err.println("got the remote naming service !");
Object rXsmgr = rName.getRegisteredObject("StarOffice.ServiceManager");
- XMultiServiceFactory rSmgr = (XMultiServiceFactory)UnoRuntime.queryInterface(XMultiServiceFactory.class, rXsmgr);
+ XMultiServiceFactory rSmgr = UnoRuntime.queryInterface(XMultiServiceFactory.class, rXsmgr);
if(rSmgr != null) {
System.err.println("got the remote service manager !");
}
- XSet set= (XSet)UnoRuntime.queryInterface(XSet.class, rSmgr);
+ XSet set= UnoRuntime.queryInterface(XSet.class, rSmgr);
if( set == null) {
System.err.println(" couldn't get XSet from ServiceFactory");
return;
diff --git a/main/filter/qa/complex/filter/detection/typeDetection/TypeDetection.java b/main/filter/qa/complex/filter/detection/typeDetection/TypeDetection.java
index 0cd279069b..1a16cc1e3e 100644
--- a/main/filter/qa/complex/filter/detection/typeDetection/TypeDetection.java
+++ b/main/filter/qa/complex/filter/detection/typeDetection/TypeDetection.java
@@ -214,7 +214,7 @@ public class TypeDetection {
XInterface oObj = (XInterface) oInterface ;
System.out.println("ImplName: "+utils.getImplName(oObj));
- m_xDetection = (XTypeDetection)
+ m_xDetection =
UnoRuntime.queryInterface(XTypeDetection.class, oInterface);
// create instance of helper class
helper = new Helper(xMSF);
diff --git a/main/filter/source/xsltfilter/com/sun/star/comp/xsltfilter/XSLTFilterOLEExtracter.java b/main/filter/source/xsltfilter/com/sun/star/comp/xsltfilter/XSLTFilterOLEExtracter.java
index d43b54438c..4c472e4492 100644
--- a/main/filter/source/xsltfilter/com/sun/star/comp/xsltfilter/XSLTFilterOLEExtracter.java
+++ b/main/filter/source/xsltfilter/com/sun/star/comp/xsltfilter/XSLTFilterOLEExtracter.java
@@ -109,7 +109,7 @@ public class XSLTFilterOLEExtracter {
if (aName.equals("oledata.mso")) {
try {
//get the length and seek to 0
- XSeekable xSeek = (XSeekable) UnoRuntime.queryInterface(XSeekable.class, m_RootStream);
+ XSeekable xSeek = UnoRuntime.queryInterface(XSeekable.class, m_RootStream);
int oleLength = (int) xSeek.getLength();
xSeek.seek(0);
xSeek = null;
@@ -138,14 +138,14 @@ public class XSLTFilterOLEExtracter {
if (oSubStream == null) {
return "Not Found:" + aName;
}
- XInputStream xSubStream = (XInputStream) UnoRuntime.queryInterface(XInputStream.class,
+ XInputStream xSubStream = UnoRuntime.queryInterface(XInputStream.class,
oSubStream);
if (xSubStream == null) {
return "Not Found:" + aName;
}
//The first four byte are the length of the uncompressed data
byte pLength[][] = new byte[1][4];
- XSeekable xSeek = (XSeekable) UnoRuntime.queryInterface(XSeekable.class, xSubStream);
+ XSeekable xSeek = UnoRuntime.queryInterface(XSeekable.class, xSubStream);
xSeek.seek(0);
xSeek = null;
//Get the uncompressed length
@@ -182,7 +182,7 @@ public class XSLTFilterOLEExtracter {
XStream xTempFileStream = null;
try {
Object oTempFile = xMSF.createInstance("com.sun.star.io.TempFile");
- xTempFileStream = (XStream) UnoRuntime.queryInterface(XStream.class, oTempFile);
+ xTempFileStream = UnoRuntime.queryInterface(XStream.class, oTempFile);
} catch (Exception e) {
}
@@ -203,7 +203,7 @@ public class XSLTFilterOLEExtracter {
xOutput.flush();
//Get the input stream and seek to begin
XInputStream xInput = m_RootStream.getInputStream();
- XSeekable xSeek = (XSeekable) UnoRuntime.queryInterface(XSeekable.class, xInput);
+ XSeekable xSeek = UnoRuntime.queryInterface(XSeekable.class, xInput);
xSeek.seek(0);
oledata = null;
xSeek = null;
@@ -214,7 +214,7 @@ public class XSLTFilterOLEExtracter {
Object oTempStorage = m_xMSF.createInstanceWithArguments("com.sun.star.embed.OLESimpleStorage", pArgs);
pArgs = null;
- m_Storage = (XNameContainer) UnoRuntime.queryInterface(XNameContainer.class, oTempStorage);
+ m_Storage = UnoRuntime.queryInterface(XNameContainer.class, oTempStorage);
} catch (Exception e) {
e.printStackTrace();
}
@@ -230,7 +230,7 @@ public class XSLTFilterOLEExtracter {
Object oTempStorage = m_xMSF.createInstanceWithArguments("com.sun.star.embed.OLESimpleStorage", pArgs);
pArgs = null;
- m_Storage = (XNameContainer) UnoRuntime.queryInterface(XNameContainer.class, oTempStorage);
+ m_Storage = UnoRuntime.queryInterface(XNameContainer.class, oTempStorage);
} catch (Exception e) {
e.printStackTrace();
}
@@ -269,13 +269,13 @@ public class XSLTFilterOLEExtracter {
//write the compressed data to the temp stream
xOutput.writeBytes(compressedBytes);
//seek to 0
- XSeekable xSeek = (XSeekable) UnoRuntime.queryInterface(XSeekable.class, xInput);
+ XSeekable xSeek = UnoRuntime.queryInterface(XSeekable.class, xInput);
xSeek.seek(0);
xSeek = null;
oledata = null;
//insert the temp stream as a sub stream and use an XTransactedObject to commit it immediately
- XTransactedObject xTransact = (XTransactedObject) UnoRuntime.queryInterface(XTransactedObject.class, m_Storage);
+ XTransactedObject xTransact = UnoRuntime.queryInterface(XTransactedObject.class, m_Storage);
m_Storage.insertByName(aName, xInput);
xTransact.commit();
xTransact = null;
@@ -323,7 +323,7 @@ public class XSLTFilterOLEExtracter {
Object x = xComponentContext.getServiceManager().createInstanceWithContext(
"com.sun.star.connection.Connector", xComponentContext);
- XConnector xConnector = (XConnector) UnoRuntime.queryInterface(XConnector.class, x);
+ XConnector xConnector = UnoRuntime.queryInterface(XConnector.class, x);
String a[] = parseUnoUrl(sConnectionString);
if (null == a) {
@@ -336,7 +336,7 @@ public class XSLTFilterOLEExtracter {
x = xComponentContext.getServiceManager().createInstanceWithContext(
"com.sun.star.bridge.BridgeFactory", xComponentContext);
- XBridgeFactory xBridgeFactory = (XBridgeFactory) UnoRuntime.queryInterface(
+ XBridgeFactory xBridgeFactory = UnoRuntime.queryInterface(
XBridgeFactory.class, x);
// create a nameless bridge with no instance provider
@@ -344,7 +344,7 @@ public class XSLTFilterOLEExtracter {
XBridge bridge = xBridgeFactory.createBridge("", a[1], m_Connection, null);
// query for the XComponent interface and add this as event listener
- XComponent xComponent = (XComponent) UnoRuntime.queryInterface(
+ XComponent xComponent = UnoRuntime.queryInterface(
XComponent.class, bridge);
// get the remote instance
@@ -356,7 +356,7 @@ public class XSLTFilterOLEExtracter {
"Server didn't provide an instance for" + a[2], null);
}
- XMultiServiceFactory xFac = (XMultiServiceFactory) UnoRuntime.queryInterface(XMultiServiceFactory.class, x);
+ XMultiServiceFactory xFac = UnoRuntime.queryInterface(XMultiServiceFactory.class, x);
return xFac;
}
protected static boolean DEBUG = false;
diff --git a/main/filter/source/xsltfilter/com/sun/star/comp/xsltfilter/XSLTransformer.java b/main/filter/source/xsltfilter/com/sun/star/comp/xsltfilter/XSLTransformer.java
index d0cedc96ab..ac88ffc35a 100644
--- a/main/filter/source/xsltfilter/com/sun/star/comp/xsltfilter/XSLTransformer.java
+++ b/main/filter/source/xsltfilter/com/sun/star/comp/xsltfilter/XSLTransformer.java
@@ -237,7 +237,7 @@ public class XSLTransformer
l.started();
}
- XSeekable xseek = (XSeekable) UnoRuntime.queryInterface(XSeekable.class, m_xis);
+ XSeekable xseek = UnoRuntime.queryInterface(XSeekable.class, m_xis);
if (xseek != null) {
xseek.seek(0);
}
diff --git a/main/forms/qa/integration/complex/forms/tools/ResultSet.java b/main/forms/qa/integration/complex/forms/tools/ResultSet.java
index a45f7355c5..ef6bdfe8e0 100644
--- a/main/forms/qa/integration/complex/forms/tools/ResultSet.java
+++ b/main/forms/qa/integration/complex/forms/tools/ResultSet.java
@@ -51,8 +51,8 @@ public class ResultSet implements XResultSet, XRow
public ResultSet( final Object _resultSet )
{
- m_resultSet = (XResultSet)UnoRuntime.queryInterface( XResultSet.class, _resultSet );
- m_row = (XRow)UnoRuntime.queryInterface( XRow.class, _resultSet );
+ m_resultSet = UnoRuntime.queryInterface( XResultSet.class, _resultSet );
+ m_row = UnoRuntime.queryInterface( XRow.class, _resultSet );
}
public
diff --git a/main/forms/qa/integration/forms/CellBinding.java b/main/forms/qa/integration/forms/CellBinding.java
index d14aaf3a4c..12a86ab7f2 100644
--- a/main/forms/qa/integration/forms/CellBinding.java
+++ b/main/forms/qa/integration/forms/CellBinding.java
@@ -90,7 +90,7 @@ public class CellBinding
// close our document
if ( m_document != null )
{
- XCloseable closeDoc = (XCloseable)UnoRuntime.queryInterface( XCloseable.class,
+ XCloseable closeDoc = UnoRuntime.queryInterface( XCloseable.class,
m_document.getDocument() );
closeDoc.close( true );
}
@@ -404,7 +404,7 @@ public class CellBinding
*/
private boolean verifyVoidCell( short col, short row, String failErrorMessage ) throws com.sun.star.uno.Exception
{
- XCellRangeData cell = (XCellRangeData)UnoRuntime.queryInterface( XCellRangeData.class,
+ XCellRangeData cell = UnoRuntime.queryInterface( XCellRangeData.class,
m_document.getSheet( 0 ).getCellByPosition( col, row )
);
Object cellContent = cell.getDataArray()[0][0];
@@ -421,7 +421,7 @@ public class CellBinding
*/
private boolean verifyNumericCellContent( short col, short row, double value, String failErrorMessage ) throws com.sun.star.uno.Exception
{
- XCell cell = (XCell)UnoRuntime.queryInterface( XCell.class,
+ XCell cell = UnoRuntime.queryInterface( XCell.class,
m_document.getSheet( 0 ).getCellByPosition( col, row )
);
if ( cell.getValue() != value )
@@ -437,7 +437,7 @@ public class CellBinding
*/
private boolean verifyStringCellContent( short col, short row, String text, String failErrorMessage ) throws com.sun.star.uno.Exception
{
- XTextRange cell = (XTextRange)UnoRuntime.queryInterface( XTextRange.class,
+ XTextRange cell = UnoRuntime.queryInterface( XTextRange.class,
m_document.getSheet( 0 ).getCellByPosition( col, row )
);
if ( !cell.getString().equals( text ) )
@@ -453,7 +453,7 @@ public class CellBinding
*/
private void setCellText( short col, short row, String text ) throws com.sun.star.uno.Exception
{
- XTextRange cell = (XTextRange)UnoRuntime.queryInterface( XTextRange.class,
+ XTextRange cell = UnoRuntime.queryInterface( XTextRange.class,
m_document.getSheet( 0 ).getCellByPosition( col, row )
);
cell.setString( text );
@@ -464,7 +464,7 @@ public class CellBinding
*/
private void setCellValue( short col, short row, double value ) throws com.sun.star.uno.Exception
{
- XCell cell = (XCell)UnoRuntime.queryInterface( XCell.class,
+ XCell cell = UnoRuntime.queryInterface( XCell.class,
m_document.getSheet( 0 ).getCellByPosition( col, row )
);
cell.setValue( value );
@@ -477,7 +477,7 @@ public class CellBinding
{
// as long as #i29130# is not fixed, we do not set the cell to "empty", but to
// an invalid formular, which serves well for our purpose
- XCellRangeFormula cell = (XCellRangeFormula)UnoRuntime.queryInterface( XCellRangeFormula.class,
+ XCellRangeFormula cell = UnoRuntime.queryInterface( XCellRangeFormula.class,
m_document.getSheet( 0 ).getCellByPosition( col, row )
);
String[][] args = new String[][] { new String[] { "=INVALID_FUNCTION()" } };
@@ -490,7 +490,7 @@ public class CellBinding
*/
private void bindToCell( XPropertySet controlModel, short column, short row, String _bindingServiceName ) throws com.sun.star.uno.Exception
{
- XBindableValue bindableModel = (XBindableValue)UnoRuntime.queryInterface( XBindableValue.class,
+ XBindableValue bindableModel = UnoRuntime.queryInterface( XBindableValue.class,
controlModel
);
@@ -503,7 +503,7 @@ public class CellBinding
parameters[0].Name = "BoundCell";
parameters[0].Value = address;
- XValueBinding cellBinding = (XValueBinding)UnoRuntime.queryInterface( XValueBinding.class,
+ XValueBinding cellBinding = UnoRuntime.queryInterface( XValueBinding.class,
m_document.createInstanceWithArguments( _bindingServiceName, parameters )
);
@@ -526,10 +526,10 @@ public class CellBinding
CellRangeAddress listSourceAddress = new CellRangeAddress( (short)0, (int)_sourceCol, (int)_rowStart, (int)_sourceCol, (int)_rowEnd );
NamedValue addressParameter = new NamedValue( "CellRange", listSourceAddress );
- XListEntrySource listSource = (XListEntrySource)UnoRuntime.queryInterface( XListEntrySource.class,
+ XListEntrySource listSource = UnoRuntime.queryInterface( XListEntrySource.class,
m_document.createInstanceWithArguments( "com.sun.star.table.CellRangeListSource", new NamedValue[]{ addressParameter } )
);
- XListEntrySink listSink = (XListEntrySink)UnoRuntime.queryInterface( XListEntrySink.class,
+ XListEntrySink listSink = UnoRuntime.queryInterface( XListEntrySink.class,
_listSink );
listSink.setListEntrySource( listSource );
}
@@ -539,10 +539,10 @@ public class CellBinding
*/
private void simulateUserRadioCheck( XPropertySet radioModel ) throws com.sun.star.uno.Exception
{
- XAccessible accessible = (XAccessible)UnoRuntime.queryInterface(
+ XAccessible accessible = UnoRuntime.queryInterface(
XAccessible.class, m_document.getCurrentView().getControl( radioModel ) );
- XAccessibleValue xValue = (XAccessibleValue)UnoRuntime.queryInterface(
+ XAccessibleValue xValue = UnoRuntime.queryInterface(
XAccessibleValue.class, accessible.getAccessibleContext() );
Integer newValue = new Integer( 1 );
@@ -554,10 +554,10 @@ public class CellBinding
*/
private void simulateUserCheckBoxCheck( XPropertySet checkBox, short state ) throws com.sun.star.uno.Exception
{
- XAccessible accessible = (XAccessible)UnoRuntime.queryInterface(
+ XAccessible accessible = UnoRuntime.queryInterface(
XAccessible.class, m_document.getCurrentView().getControl( checkBox ) );
- XAccessibleValue xValue = (XAccessibleValue)UnoRuntime.queryInterface(
+ XAccessibleValue xValue = UnoRuntime.queryInterface(
XAccessibleValue.class, accessible.getAccessibleContext() );
xValue.setCurrentValue( new Short( state ) );
@@ -568,7 +568,7 @@ public class CellBinding
*/
private void simulateUserListBoxSelection( XPropertySet _listBox, String _selectEntry ) throws com.sun.star.uno.Exception
{
- XListBox listBoxControl = (XListBox)UnoRuntime.queryInterface(
+ XListBox listBoxControl = UnoRuntime.queryInterface(
XListBox.class, m_document.getCurrentView().getControl( _listBox ) );
listBoxControl.selectItem( _selectEntry, true );
}
@@ -578,14 +578,14 @@ public class CellBinding
*/
private void simulateUserTextInput( XPropertySet controlModel, String text ) throws com.sun.star.uno.Exception
{
- XAccessible accessible = (XAccessible)UnoRuntime.queryInterface(
+ XAccessible accessible = UnoRuntime.queryInterface(
XAccessible.class, m_document.getCurrentView().getControl( controlModel ) );
XAccessibleContext context = accessible.getAccessibleContext();
- XServiceInfo si = (XServiceInfo)UnoRuntime.queryInterface( XServiceInfo.class,
+ XServiceInfo si = UnoRuntime.queryInterface( XServiceInfo.class,
accessible.getAccessibleContext() );
- XAccessibleEditableText textAccess = (XAccessibleEditableText)UnoRuntime.queryInterface(
+ XAccessibleEditableText textAccess = UnoRuntime.queryInterface(
XAccessibleEditableText.class, accessible.getAccessibleContext() );
textAccess.setText( text );
diff --git a/main/forms/qa/integration/forms/ControlValidation.java b/main/forms/qa/integration/forms/ControlValidation.java
index 1f56c29a1f..53754907c9 100644
--- a/main/forms/qa/integration/forms/ControlValidation.java
+++ b/main/forms/qa/integration/forms/ControlValidation.java
@@ -105,7 +105,7 @@ public class ControlValidation implements com.sun.star.lang.XEventListener
// close our document
if ( m_document != null )
{
- XCloseable closeDoc = (XCloseable)UnoRuntime.queryInterface( XCloseable.class,
+ XCloseable closeDoc = UnoRuntime.queryInterface( XCloseable.class,
m_document.getDocument() );
closeDoc.close( true );
}
diff --git a/main/forms/qa/integration/forms/DocumentHelper.java b/main/forms/qa/integration/forms/DocumentHelper.java
index cccd47c51b..1cd2a98c02 100644
--- a/main/forms/qa/integration/forms/DocumentHelper.java
+++ b/main/forms/qa/integration/forms/DocumentHelper.java
@@ -72,7 +72,7 @@ public class DocumentHelper
/* ------------------------------------------------------------------ */
protected static XComponent implLoadAsComponent( XMultiServiceFactory orb, String documentOrFactoryURL, final PropertyValue[] i_args ) throws com.sun.star.uno.Exception
{
- XComponentLoader aLoader = (XComponentLoader)UnoRuntime.queryInterface(
+ XComponentLoader aLoader = UnoRuntime.queryInterface(
XComponentLoader.class,
orb.createInstance( "com.sun.star.frame.Desktop" )
);
@@ -94,7 +94,7 @@ public class DocumentHelper
{
XComponent document = implLoadAsComponent( orb, documentOrFactoryURL, i_args );
- XServiceInfo xSI = (XServiceInfo)UnoRuntime.queryInterface( XServiceInfo.class,
+ XServiceInfo xSI = UnoRuntime.queryInterface( XServiceInfo.class,
document );
if ( xSI.supportsService( "com.sun.star.sheet.SpreadsheetDocument" ) )
return new SpreadsheetDocument( orb, document );
@@ -162,7 +162,7 @@ public class DocumentHelper
public DocumentViewHelper getCurrentView( )
{
// get the model interface for the document
- XModel xDocModel = (XModel)UnoRuntime.queryInterface(XModel.class, m_documentComponent );
+ XModel xDocModel = UnoRuntime.queryInterface(XModel.class, m_documentComponent );
// get the current controller for the document - as a controller is tied to a view,
// this gives us the currently active view for the document.
XController xController = xDocModel.getCurrentController();
@@ -193,7 +193,7 @@ public class DocumentHelper
getCurrentView().dispatch( ".uno:Reload" );
- m_documentComponent = (XComponent)UnoRuntime.queryInterface( XComponent.class,
+ m_documentComponent = UnoRuntime.queryInterface( XComponent.class,
frame.getController().getModel() );
XModel newModel = getCurrentView().getController().getModel();
@@ -227,7 +227,7 @@ public class DocumentHelper
}
// outta here
- return (XIndexContainer)UnoRuntime.queryInterface( XIndexContainer.class, xNewForm );
+ return UnoRuntime.queryInterface( XIndexContainer.class, xNewForm );
}
/* ------------------------------------------------------------------ */
@@ -242,7 +242,7 @@ public class DocumentHelper
public XIndexContainer createSubForm( Object aParentContainer, String sInitialName )
throws com.sun.star.uno.Exception
{
- XIndexContainer xParentContainer = (XIndexContainer)UnoRuntime.queryInterface(
+ XIndexContainer xParentContainer = UnoRuntime.queryInterface(
XIndexContainer.class, aParentContainer );
return createSubForm( xParentContainer, sInitialName );
}
@@ -270,13 +270,13 @@ public class DocumentHelper
*/
static public DocumentHelper getDocumentForComponent( Object aFormComponent, XMultiServiceFactory orb )
{
- XChild xChild = (XChild)UnoRuntime.queryInterface( XChild.class, aFormComponent );
+ XChild xChild = UnoRuntime.queryInterface( XChild.class, aFormComponent );
XModel xModel = null;
while ( ( null != xChild ) && ( null == xModel ) )
{
XInterface xParent = (XInterface)xChild.getParent();
- xModel = (XModel)UnoRuntime.queryInterface( XModel.class, xParent );
- xChild = (XChild)UnoRuntime.queryInterface( XChild.class, xParent );
+ xModel = UnoRuntime.queryInterface( XModel.class, xParent );
+ xChild = UnoRuntime.queryInterface( XChild.class, xParent );
}
return new DocumentHelper( orb, xModel );
@@ -303,7 +303,7 @@ public class DocumentHelper
*/
public DocumentType classify( )
{
- XServiceInfo xSI = (XServiceInfo)UnoRuntime.queryInterface(
+ XServiceInfo xSI = UnoRuntime.queryInterface(
XServiceInfo.class, m_documentComponent );
if ( xSI.supportsService( "com.sun.star.text.TextDocument" ) )
@@ -326,11 +326,11 @@ public class DocumentHelper
*/
protected XDrawPage getDrawPage( int index ) throws com.sun.star.lang.IndexOutOfBoundsException, com.sun.star.lang.WrappedTargetException
{
- XDrawPagesSupplier xSuppPages = (XDrawPagesSupplier)UnoRuntime.queryInterface(
+ XDrawPagesSupplier xSuppPages = UnoRuntime.queryInterface(
XDrawPagesSupplier.class, getDocument() );
XDrawPages xPages = xSuppPages.getDrawPages();
- return (XDrawPage)UnoRuntime.queryInterface( XDrawPage.class, xPages.getByIndex( index ) );
+ return UnoRuntime.queryInterface( XDrawPage.class, xPages.getByIndex( index ) );
}
/* ------------------------------------------------------------------ */
@@ -341,18 +341,18 @@ public class DocumentHelper
XDrawPage xReturn;
// in case of a Writer document, this is rather easy: simply ask the XDrawPageSupplier
- XDrawPageSupplier xSuppPage = (XDrawPageSupplier)UnoRuntime.queryInterface(
+ XDrawPageSupplier xSuppPage = UnoRuntime.queryInterface(
XDrawPageSupplier.class, getDocument() );
if ( null != xSuppPage )
xReturn = xSuppPage.getDrawPage();
else
{ // the model itself is no draw page supplier - okay, it may be a Writer or Calc document
// (or any other multi-page document)
- XDrawPagesSupplier xSuppPages = (XDrawPagesSupplier)UnoRuntime.queryInterface(
+ XDrawPagesSupplier xSuppPages = UnoRuntime.queryInterface(
XDrawPagesSupplier.class, getDocument() );
XDrawPages xPages = xSuppPages.getDrawPages();
- xReturn = (XDrawPage)UnoRuntime.queryInterface( XDrawPage.class, xPages.getByIndex( 0 ) );
+ xReturn = UnoRuntime.queryInterface( XDrawPage.class, xPages.getByIndex( 0 ) );
// Note that this is no really error-proof code: If the document model does not support the
// XDrawPagesSupplier interface, or if the pages collection returned is empty, this will break.
@@ -366,7 +366,7 @@ public class DocumentHelper
*/
protected XNameContainer getFormComponentTreeRoot( ) throws com.sun.star.uno.Exception
{
- XFormsSupplier xSuppForms = (XFormsSupplier)UnoRuntime.queryInterface(
+ XFormsSupplier xSuppForms = UnoRuntime.queryInterface(
XFormsSupplier.class, getMainDrawPage( ) );
XNameContainer xFormsCollection = null;
@@ -382,7 +382,7 @@ public class DocumentHelper
*/
public XInterface createInstance( String serviceSpecifier ) throws com.sun.star.uno.Exception
{
- XMultiServiceFactory xORB = (XMultiServiceFactory)UnoRuntime.queryInterface( XMultiServiceFactory.class,
+ XMultiServiceFactory xORB = UnoRuntime.queryInterface( XMultiServiceFactory.class,
m_documentComponent );
return (XInterface)xORB.createInstance( serviceSpecifier );
}
@@ -392,7 +392,7 @@ public class DocumentHelper
*/
public XInterface createInstanceWithArguments( String serviceSpecifier, Object[] arguments ) throws com.sun.star.uno.Exception
{
- XMultiServiceFactory xORB = (XMultiServiceFactory)UnoRuntime.queryInterface( XMultiServiceFactory.class,
+ XMultiServiceFactory xORB = UnoRuntime.queryInterface( XMultiServiceFactory.class,
m_documentComponent );
return (XInterface) xORB.createInstanceWithArguments( serviceSpecifier, arguments );
}
diff --git a/main/forms/qa/integration/forms/DocumentViewHelper.java b/main/forms/qa/integration/forms/DocumentViewHelper.java
index 1ec55a5250..19570c4f8a 100644
--- a/main/forms/qa/integration/forms/DocumentViewHelper.java
+++ b/main/forms/qa/integration/forms/DocumentViewHelper.java
@@ -99,12 +99,12 @@ public class DocumentViewHelper
// go get the current view
XController xController = (XController)query( XController.class );
// go get the dispatch provider of it's frame
- XDispatchProvider xProvider = (XDispatchProvider)UnoRuntime.queryInterface(
+ XDispatchProvider xProvider = UnoRuntime.queryInterface(
XDispatchProvider.class, xController.getFrame() );
if ( null != xProvider )
{
// need an URLTransformer
- XURLTransformer xTransformer = (XURLTransformer)UnoRuntime.queryInterface(
+ XURLTransformer xTransformer = UnoRuntime.queryInterface(
XURLTransformer.class, m_orb.createInstance( "com.sun.star.util.URLTransformer" ) );
xTransformer.parseStrict( aURL );
@@ -160,14 +160,14 @@ public class DocumentViewHelper
/* ------------------------------------------------------------------ */
public XControl getControl( Object aModel ) throws com.sun.star.uno.Exception
{
- XControlModel xModel = (XControlModel)UnoRuntime.queryInterface( XControlModel.class, aModel );
+ XControlModel xModel = UnoRuntime.queryInterface( XControlModel.class, aModel );
return getControl( xModel );
}
/* ------------------------------------------------------------------ */
public Object getControl( Object aModel, Class aInterfaceClass ) throws com.sun.star.uno.Exception
{
- XControlModel xModel = (XControlModel)UnoRuntime.queryInterface( XControlModel.class, aModel );
+ XControlModel xModel = UnoRuntime.queryInterface( XControlModel.class, aModel );
return UnoRuntime.queryInterface( aInterfaceClass, getControl( xModel ) );
}
@@ -211,7 +211,7 @@ public class DocumentViewHelper
XControl xControl = getControl( xModel );
// the focus can be set to an XWindow only
- XWindow xControlWindow = (XWindow)UnoRuntime.queryInterface( XWindow.class,
+ XWindow xControlWindow = UnoRuntime.queryInterface( XWindow.class,
xControl );
// grab the focus
@@ -234,7 +234,7 @@ public class DocumentViewHelper
XPropertySet xControlProps = dbfTools.queryPropertySet( xForm.getByIndex( i ) );
if ( FormComponentType.FIXEDTEXT != ((Short)xControlProps.getPropertyValue( "ClassId" )).shortValue() )
{
- XControlModel xControlModel = (XControlModel)UnoRuntime.queryInterface(
+ XControlModel xControlModel = UnoRuntime.queryInterface(
XControlModel.class, xControlProps );
// set the focus to this control
grabControlFocus( xControlModel );
diff --git a/main/forms/qa/integration/forms/FormComponent.java b/main/forms/qa/integration/forms/FormComponent.java
index b8eb6ead84..affba70d41 100644
--- a/main/forms/qa/integration/forms/FormComponent.java
+++ b/main/forms/qa/integration/forms/FormComponent.java
@@ -52,16 +52,16 @@ public class FormComponent
/* ------------------------------------------------------------------ */
public FormComponent( XDrawPage drawPage )
{
- XFormsSupplier supp = (XFormsSupplier)UnoRuntime.queryInterface(
+ XFormsSupplier supp = UnoRuntime.queryInterface(
XFormsSupplier.class, drawPage );
m_component = supp.getForms();
m_nameAccess = (XNameAccess)m_component;
- m_indexAccess = (XIndexAccess)UnoRuntime.queryInterface(
+ m_indexAccess = UnoRuntime.queryInterface(
XIndexAccess.class, m_component );
- m_child = (XChild)UnoRuntime.queryInterface(
+ m_child = UnoRuntime.queryInterface(
XChild.class, m_component );
- m_named = (XNamed)UnoRuntime.queryInterface(
+ m_named = UnoRuntime.queryInterface(
XNamed.class, m_component );
}
@@ -69,13 +69,13 @@ public class FormComponent
public FormComponent( Object element )
{
m_component = element;
- m_nameAccess = (XNameAccess)UnoRuntime.queryInterface(
+ m_nameAccess = UnoRuntime.queryInterface(
XNameAccess.class, m_component );
- m_indexAccess = (XIndexAccess)UnoRuntime.queryInterface(
+ m_indexAccess = UnoRuntime.queryInterface(
XIndexAccess.class, m_component );
- m_child = (XChild)UnoRuntime.queryInterface(
+ m_child = UnoRuntime.queryInterface(
XChild.class, m_component );
- m_named = (XNamed)UnoRuntime.queryInterface(
+ m_named = UnoRuntime.queryInterface(
XNamed.class, m_component );
}
@@ -184,7 +184,7 @@ public class FormComponent
/* ------------------------------------------------------------------ */
public String getImplementationName()
{
- XServiceInfo si = (XServiceInfo)UnoRuntime.queryInterface(
+ XServiceInfo si = UnoRuntime.queryInterface(
XServiceInfo.class, m_component );
if ( si != null )
return si.getImplementationName();
diff --git a/main/forms/qa/integration/forms/FormControlTest.java b/main/forms/qa/integration/forms/FormControlTest.java
index f230de4c1f..590ae66861 100644
--- a/main/forms/qa/integration/forms/FormControlTest.java
+++ b/main/forms/qa/integration/forms/FormControlTest.java
@@ -471,7 +471,7 @@ public class FormControlTest implements XSQLErrorListener
// close our document
if ( m_document != null )
{
- XCloseable closeDoc = (XCloseable)UnoRuntime.queryInterface( XCloseable.class,
+ XCloseable closeDoc = UnoRuntime.queryInterface( XCloseable.class,
m_document.getDocument() );
closeDoc.close( true );
}
@@ -483,9 +483,9 @@ public class FormControlTest implements XSQLErrorListener
{
m_orb = UnoRuntime.queryInterface(XMultiServiceFactory.class, officeConnection.getComponentContext().getServiceManager());
- XNameAccess databaseContext = (XNameAccess)UnoRuntime.queryInterface( XNameAccess.class,
+ XNameAccess databaseContext = UnoRuntime.queryInterface( XNameAccess.class,
m_orb.createInstance( "com.sun.star.sdb.DatabaseContext" ) );
- XNamingService namingService = (XNamingService)UnoRuntime.queryInterface( XNamingService.class,
+ XNamingService namingService = UnoRuntime.queryInterface( XNamingService.class,
databaseContext );
// revoke the data source, if it previously existed
@@ -497,11 +497,11 @@ public class FormControlTest implements XSQLErrorListener
String documentURL = m_databaseDocument.getDocumentURL();
namingService.registerObject( m_dataSourceName, databaseContext.getByName( documentURL ) );
- m_dataSource = (XDataSource)UnoRuntime.queryInterface( XDataSource.class,
+ m_dataSource = UnoRuntime.queryInterface( XDataSource.class,
databaseContext.getByName( m_dataSourceName ) );
m_dataSourceProps = dbfTools.queryPropertySet( m_dataSource );
- XPropertySet dataSourceSettings = (XPropertySet)UnoRuntime.queryInterface( XPropertySet.class,
+ XPropertySet dataSourceSettings = UnoRuntime.queryInterface( XPropertySet.class,
m_dataSourceProps.getPropertyValue( "Settings" ) );
dataSourceSettings.setPropertyValue( "FormsCheckRequiredFields", new Boolean( false ) );
@@ -513,9 +513,9 @@ public class FormControlTest implements XSQLErrorListener
*/
private XPropertySet getControlModel( String name ) throws com.sun.star.uno.Exception, java.lang.Exception
{
- XNameAccess nameAccess = (XNameAccess)UnoRuntime.queryInterface( XNameAccess.class,
+ XNameAccess nameAccess = UnoRuntime.queryInterface( XNameAccess.class,
m_masterForm );
- return (XPropertySet)UnoRuntime.queryInterface( XPropertySet.class,
+ return UnoRuntime.queryInterface( XPropertySet.class,
nameAccess.getByName( name ) );
}
@@ -565,7 +565,7 @@ public class FormControlTest implements XSQLErrorListener
m_document.getCurrentView( ).toggleFormDesignMode( );
m_masterFormController = m_document.getCurrentView().getFormController( m_masterForm );
- XSQLErrorBroadcaster errorBroadcaster = (XSQLErrorBroadcaster)UnoRuntime.queryInterface( XSQLErrorBroadcaster.class,
+ XSQLErrorBroadcaster errorBroadcaster = UnoRuntime.queryInterface( XSQLErrorBroadcaster.class,
m_masterFormController );
errorBroadcaster.addSQLErrorListener( this );
@@ -812,21 +812,21 @@ public class FormControlTest implements XSQLErrorListener
/* ------------------------------------------------------------------ */
private void moveToInsertRow() throws com.sun.star.uno.Exception, java.lang.Exception
{
- XResultSetUpdate xResultSet = (XResultSetUpdate)UnoRuntime.queryInterface( XResultSetUpdate.class, m_masterForm );
+ XResultSetUpdate xResultSet = UnoRuntime.queryInterface( XResultSetUpdate.class, m_masterForm );
xResultSet.moveToInsertRow( );
}
/* ------------------------------------------------------------------ */
private void moveToFirst() throws com.sun.star.uno.Exception, java.lang.Exception
{
- XResultSet xResultSet = (XResultSet)UnoRuntime.queryInterface( XResultSet.class, m_masterForm );
+ XResultSet xResultSet = UnoRuntime.queryInterface( XResultSet.class, m_masterForm );
xResultSet.first( );
}
/* ------------------------------------------------------------------ */
private void moveToNext() throws com.sun.star.uno.Exception, java.lang.Exception
{
- XResultSet xResultSet = (XResultSet)UnoRuntime.queryInterface( XResultSet.class, m_masterForm );
+ XResultSet xResultSet = UnoRuntime.queryInterface( XResultSet.class, m_masterForm );
xResultSet.next( );
}
@@ -839,7 +839,7 @@ public class FormControlTest implements XSQLErrorListener
URL[] url = new URL[] { new URL() };
url[0].Complete = slotURL;
- XURLTransformer xTransformer = (XURLTransformer)UnoRuntime.queryInterface(
+ XURLTransformer xTransformer = UnoRuntime.queryInterface(
XURLTransformer.class, m_orb.createInstance( "com.sun.star.util.URLTransformer" ) );
xTransformer.parseStrict( url );
@@ -929,7 +929,7 @@ public class FormControlTest implements XSQLErrorListener
XPropertySet xImageModel = getControlModel( "f_blob" );
// check if the image control properly says that there currently is no image on the first record
- XImageProducerSupplier xSuppProducer = (XImageProducerSupplier)UnoRuntime.queryInterface( XImageProducerSupplier.class,
+ XImageProducerSupplier xSuppProducer = UnoRuntime.queryInterface( XImageProducerSupplier.class,
xImageModel );
XImageProducer xProducer = xSuppProducer.getImageProducer();
diff --git a/main/forms/qa/integration/forms/FormLayer.java b/main/forms/qa/integration/forms/FormLayer.java
index 82b89844dc..49efea73c5 100644
--- a/main/forms/qa/integration/forms/FormLayer.java
+++ b/main/forms/qa/integration/forms/FormLayer.java
@@ -319,15 +319,15 @@ public class FormLayer
*/
public XPropertySet getControlModel( int[] _accessPath ) throws com.sun.star.uno.Exception
{
- XIndexAccess indexAcc = (XIndexAccess)UnoRuntime.queryInterface( XIndexAccess.class,
+ XIndexAccess indexAcc = UnoRuntime.queryInterface( XIndexAccess.class,
m_document.getFormComponentTreeRoot() );
XPropertySet controlModel = null;
int i=0;
while ( ( indexAcc != null ) && ( i < _accessPath.length ) )
{
- controlModel = (XPropertySet)UnoRuntime.queryInterface( XPropertySet.class,
+ controlModel = UnoRuntime.queryInterface( XPropertySet.class,
indexAcc.getByIndex( _accessPath[i] ) );
- indexAcc = (XIndexAccess)UnoRuntime.queryInterface( XIndexAccess.class,
+ indexAcc = UnoRuntime.queryInterface( XIndexAccess.class,
controlModel );
++i;
}
@@ -344,9 +344,9 @@ public class FormLayer
int i=0;
while ( ( nameAcc != null ) && ( i < _accessPath.length ) )
{
- controlModel = (XPropertySet)UnoRuntime.queryInterface( XPropertySet.class,
+ controlModel = UnoRuntime.queryInterface( XPropertySet.class,
nameAcc.getByName( _accessPath[i] ) );
- nameAcc = (XNameAccess)UnoRuntime.queryInterface( XNameAccess.class,
+ nameAcc = UnoRuntime.queryInterface( XNameAccess.class,
controlModel );
++i;
}
diff --git a/main/forms/qa/integration/forms/ListSelection.java b/main/forms/qa/integration/forms/ListSelection.java
index 2c8695984f..bfdd4561bd 100644
--- a/main/forms/qa/integration/forms/ListSelection.java
+++ b/main/forms/qa/integration/forms/ListSelection.java
@@ -134,12 +134,12 @@ public class ListSelection extends integration.forms.TestCase
XSpreadsheet activeSheet = view.getActiveSheet();
// Accessibility access to the list box control in this sheet
- XAccessible accessibleListBox = (XAccessible)UnoRuntime.queryInterface(
+ XAccessible accessibleListBox = UnoRuntime.queryInterface(
XAccessible.class, getListBoxControl( activeSheet ) );
XAccessibleContext context = accessibleListBox.getAccessibleContext();
// the first "accessible child" of a list box is its list
- XAccessibleSelection accessibleList = (XAccessibleSelection)UnoRuntime.queryInterface(
+ XAccessibleSelection accessibleList = UnoRuntime.queryInterface(
XAccessibleSelection.class, context.getAccessibleChild( 1 ) );
int selectPosition = generator.nextInt( 5 );
@@ -154,7 +154,7 @@ public class ListSelection extends integration.forms.TestCase
}
catch( java.lang.InterruptedException e ) { }
- XNamed sheetName = (XNamed)UnoRuntime.queryInterface( XNamed.class, view.getActiveSheet() );
+ XNamed sheetName = UnoRuntime.queryInterface( XNamed.class, view.getActiveSheet() );
assertTrue( "sheet was not selected as expected!", sheetName.getName().equals( selectSheetName ) );
}
}
@@ -171,7 +171,7 @@ public class ListSelection extends integration.forms.TestCase
try
{
XPropertySet docProps = dbfTools.queryPropertySet( m_document.getDocument() );
- XLibraryContainer basicLibs = (XLibraryContainer)UnoRuntime.queryInterface(
+ XLibraryContainer basicLibs = UnoRuntime.queryInterface(
XLibraryContainer.class, docProps.getPropertyValue( "BasicLibraries" ) );
XNameContainer basicLib = basicLibs.createLibrary( "default" );
@@ -218,7 +218,7 @@ public class ListSelection extends integration.forms.TestCase
{
XIndexContainer parentForm = (XIndexContainer)dbfTools.getParent( controlModel, XIndexContainer.class );
- XEventAttacherManager manager = (XEventAttacherManager)UnoRuntime.queryInterface(
+ XEventAttacherManager manager = UnoRuntime.queryInterface(
XEventAttacherManager.class, parentForm );
int containerPosition = -1;
@@ -264,7 +264,7 @@ public class ListSelection extends integration.forms.TestCase
String[] newSheetNames = new String[] { "first", "second", "third", "forth", "fifth" };
// give the first one the right name
- XNamed sheet = (XNamed)UnoRuntime.queryInterface( XNamed.class,
+ XNamed sheet = UnoRuntime.queryInterface( XNamed.class,
sheets.getByName( sheetNames[ 0 ] )
);
sheet.setName( newSheetNames[ 0 ] );
@@ -308,7 +308,7 @@ public class ListSelection extends integration.forms.TestCase
/* ------------------------------------------------------------------ */
protected XControlModel getListBoxModel( XSpreadsheet sheet )
{
- XDrawPageSupplier suppPage = (XDrawPageSupplier)UnoRuntime.queryInterface(
+ XDrawPageSupplier suppPage = UnoRuntime.queryInterface(
XDrawPageSupplier.class, sheet );
FormComponent formsRoot = new FormComponent( suppPage.getDrawPage() );
XControlModel listBoxModel = (XControlModel)formsRoot.getByIndex( 0 ).
@@ -319,7 +319,7 @@ public class ListSelection extends integration.forms.TestCase
/* ------------------------------------------------------------------ */
protected XListBox getListBoxControl( XSpreadsheet sheet ) throws com.sun.star.uno.Exception
{
- return (XListBox)UnoRuntime.queryInterface(
+ return UnoRuntime.queryInterface(
XListBox.class, m_document.getCurrentView().getControl( getListBoxModel( sheet ) ) );
}
}
diff --git a/main/forms/qa/integration/forms/RadioButtons.java b/main/forms/qa/integration/forms/RadioButtons.java
index 7c723b1d31..c71a42f716 100644
--- a/main/forms/qa/integration/forms/RadioButtons.java
+++ b/main/forms/qa/integration/forms/RadioButtons.java
@@ -280,7 +280,7 @@ public class RadioButtons
// close our document
if ( m_document != null )
{
- XCloseable closeDoc = (XCloseable)UnoRuntime.queryInterface( XCloseable.class,
+ XCloseable closeDoc = UnoRuntime.queryInterface( XCloseable.class,
m_document.getDocument() );
closeDoc.close( true );
}
@@ -320,7 +320,7 @@ public class RadioButtons
{
XPropertySet xRadio = getRadioModel( groupName, refValue, form );
- XRadioButton radioButton = (XRadioButton)UnoRuntime.queryInterface(
+ XRadioButton radioButton = UnoRuntime.queryInterface(
XRadioButton.class, m_document.getCurrentView().getControl( xRadio ) );
radioButton.setState( true );
}
diff --git a/main/forms/qa/integration/forms/SingleControlValidation.java b/main/forms/qa/integration/forms/SingleControlValidation.java
index 471dc0505f..1cc4f6f622 100644
--- a/main/forms/qa/integration/forms/SingleControlValidation.java
+++ b/main/forms/qa/integration/forms/SingleControlValidation.java
@@ -113,7 +113,7 @@ public class SingleControlValidation implements XFormComponentValidityListener
if ( controls[ i ].getPropertySetInfo().hasPropertyByName( "Border" ) )
controls[ i ].setPropertyValue( "Border", new Short( (short)2 ) );
- XValidatableFormComponent xComp = (XValidatableFormComponent)UnoRuntime.queryInterface( XValidatableFormComponent.class,
+ XValidatableFormComponent xComp = UnoRuntime.queryInterface( XValidatableFormComponent.class,
controls[ i ] );
xComp.addFormComponentValidityListener( this );
}
@@ -135,7 +135,7 @@ public class SingleControlValidation implements XFormComponentValidityListener
m_explanationField = m_formLayer.createControlAndShape( "FixedText", columnPos, controlPos, 70, 4, null );
m_explanationField.setPropertyValue( "Label", new String( "" ) );
- XValidatable xValidatable = (XValidatable)UnoRuntime.queryInterface( XValidatable.class, m_inputField );
+ XValidatable xValidatable = UnoRuntime.queryInterface( XValidatable.class, m_inputField );
xValidatable.setValidator( m_validator );
}
catch( java.lang.Exception e )
@@ -161,7 +161,7 @@ public class SingleControlValidation implements XFormComponentValidityListener
{
if ( m_inputField.equals( eventObject.Source ) )
{
- XValidatableFormComponent xComp = (XValidatableFormComponent)UnoRuntime.queryInterface( XValidatableFormComponent.class,
+ XValidatableFormComponent xComp = UnoRuntime.queryInterface( XValidatableFormComponent.class,
eventObject.Source );
// the current value
Object value = xComp.getCurrentValue();
diff --git a/main/forms/qa/integration/forms/SpreadsheetDocument.java b/main/forms/qa/integration/forms/SpreadsheetDocument.java
index c1642a84d3..9336ee0c96 100644
--- a/main/forms/qa/integration/forms/SpreadsheetDocument.java
+++ b/main/forms/qa/integration/forms/SpreadsheetDocument.java
@@ -58,7 +58,7 @@ public class SpreadsheetDocument extends DocumentHelper
*/
public XSpreadsheets getSheets() throws com.sun.star.uno.Exception
{
- XSpreadsheetDocument spreadsheetDoc = (XSpreadsheetDocument)UnoRuntime.queryInterface( XSpreadsheetDocument.class,
+ XSpreadsheetDocument spreadsheetDoc = UnoRuntime.queryInterface( XSpreadsheetDocument.class,
getDocument()
);
return spreadsheetDoc.getSheets();
@@ -69,10 +69,10 @@ public class SpreadsheetDocument extends DocumentHelper
*/
public XCellRange getSheet( int index ) throws com.sun.star.uno.Exception
{
- XIndexAccess sheets = (XIndexAccess)UnoRuntime.queryInterface( XIndexAccess.class,
+ XIndexAccess sheets = UnoRuntime.queryInterface( XIndexAccess.class,
getSheets()
);
- return (XCellRange)UnoRuntime.queryInterface( XCellRange.class,
+ return UnoRuntime.queryInterface( XCellRange.class,
sheets.getByIndex( index )
);
}
@@ -103,7 +103,7 @@ public class SpreadsheetDocument extends DocumentHelper
{
CellAddress address = new CellAddress( sheet, column, row );
Object[] initParam = new Object[] { new NamedValue( "BoundCell", address ) };
- cellBinding = (com.sun.star.form.binding.XValueBinding)UnoRuntime.queryInterface(
+ cellBinding = UnoRuntime.queryInterface(
com.sun.star.form.binding.XValueBinding.class,
createInstanceWithArguments(
supportIntegerValues ? "com.sun.star.table.ListPositionCellBinding"
@@ -132,7 +132,7 @@ public class SpreadsheetDocument extends DocumentHelper
CellRangeAddress rangeAddress = new CellRangeAddress( sheet, column,
topRow, column, bottomRow );
Object[] initParam = new Object[] { new NamedValue( "CellRange", rangeAddress ) };
- entrySource = (com.sun.star.form.binding.XListEntrySource)UnoRuntime.queryInterface(
+ entrySource = UnoRuntime.queryInterface(
com.sun.star.form.binding.XListEntrySource.class,
createInstanceWithArguments(
"com.sun.star.table.CellRangeListSource", initParam ) );
diff --git a/main/forms/qa/integration/forms/SpreadsheetView.java b/main/forms/qa/integration/forms/SpreadsheetView.java
index ac167374d7..c4971c2a07 100644
--- a/main/forms/qa/integration/forms/SpreadsheetView.java
+++ b/main/forms/qa/integration/forms/SpreadsheetView.java
@@ -57,16 +57,16 @@ public class SpreadsheetView extends integration.forms.DocumentViewHelper
try
{
// get the sheet to activate
- XSpreadsheetDocument doc = (XSpreadsheetDocument)UnoRuntime.queryInterface(
+ XSpreadsheetDocument doc = UnoRuntime.queryInterface(
XSpreadsheetDocument.class, getDocument().getDocument() );
- XIndexAccess sheets = (XIndexAccess)UnoRuntime.queryInterface(
+ XIndexAccess sheets = UnoRuntime.queryInterface(
XIndexAccess.class, doc.getSheets() );
- XSpreadsheet sheet = (XSpreadsheet)UnoRuntime.queryInterface(
+ XSpreadsheet sheet = UnoRuntime.queryInterface(
XSpreadsheet.class, sheets.getByIndex( sheetIndex ) );
// activate
- XSpreadsheetView view = (XSpreadsheetView)UnoRuntime.queryInterface(
+ XSpreadsheetView view = UnoRuntime.queryInterface(
XSpreadsheetView.class, getController() );
view.setActiveSheet( sheet );
}
diff --git a/main/forms/qa/integration/forms/TableCellTextBinding.java b/main/forms/qa/integration/forms/TableCellTextBinding.java
index bf36da5b91..fae698a90b 100644
--- a/main/forms/qa/integration/forms/TableCellTextBinding.java
+++ b/main/forms/qa/integration/forms/TableCellTextBinding.java
@@ -60,7 +60,7 @@ public class TableCellTextBinding
/** Creates a new instance of TableCellTextBinding */
public TableCellTextBinding( XCell cell )
{
- m_cellText = (XTextRange)UnoRuntime.queryInterface( XTextRange.class, cell );
+ m_cellText = UnoRuntime.queryInterface( XTextRange.class, cell );
m_newCellText = new String();
m_listeners = new java.util.LinkedList();
diff --git a/main/forms/qa/integration/forms/ValueBinding.java b/main/forms/qa/integration/forms/ValueBinding.java
index d467d3b527..73df57cc89 100644
--- a/main/forms/qa/integration/forms/ValueBinding.java
+++ b/main/forms/qa/integration/forms/ValueBinding.java
@@ -97,11 +97,11 @@ public class ValueBinding extends integration.forms.TestCase
// insert a table with exactly one cell. The content of this table will be synced with
// the content of a form control
- XTextDocument textDoc = (XTextDocument)UnoRuntime.queryInterface( XTextDocument.class, m_document.getDocument() );
+ XTextDocument textDoc = UnoRuntime.queryInterface( XTextDocument.class, m_document.getDocument() );
XText documentText = textDoc.getText();
XTextCursor textCursor = documentText.createTextCursor();
- XTextTable table = (XTextTable)UnoRuntime.queryInterface( XTextTable.class,
+ XTextTable table = UnoRuntime.queryInterface( XTextTable.class,
m_document.createInstance( "com.sun.star.text.TextTable" )
);
table.initialize( 1, 1 );
@@ -113,7 +113,7 @@ public class ValueBinding extends integration.forms.TestCase
// create a value binding for the first cell of the table
XValueBinding cellBinding = new TableCellTextBinding( table.getCellByName( "A1" ) );
// and bind it to the control
- XBindableValue bindable = (XBindableValue)UnoRuntime.queryInterface(
+ XBindableValue bindable = UnoRuntime.queryInterface(
XBindableValue.class, textControl
);
bindable.setValueBinding( cellBinding );
diff --git a/main/forms/qa/integration/forms/XMLFormSettings.java b/main/forms/qa/integration/forms/XMLFormSettings.java
index 454fc8c9f9..e104bee310 100644
--- a/main/forms/qa/integration/forms/XMLFormSettings.java
+++ b/main/forms/qa/integration/forms/XMLFormSettings.java
@@ -115,7 +115,7 @@ public class XMLFormSettings
File tempFile = File.createTempFile( "xmlforms", ".odt" );
tempFile.deleteOnExit();
String fileURL = tempFile.toURL().toExternalForm();
- XStorable store = (XStorable)UnoRuntime.queryInterface( XStorable.class,
+ XStorable store = UnoRuntime.queryInterface( XStorable.class,
m_document.getDocument() );
store.storeAsURL( fileURL, new PropertyValue[] {} );
assertTrue( "document still modified after saving it", !m_document.isModified() );
@@ -133,7 +133,7 @@ public class XMLFormSettings
{
if ( m_document != null )
{
- XCloseable closeDoc = (XCloseable)UnoRuntime.queryInterface( XCloseable.class,
+ XCloseable closeDoc = UnoRuntime.queryInterface( XCloseable.class,
m_document.getDocument() );
closeDoc.close( true );
}
@@ -142,9 +142,9 @@ public class XMLFormSettings
/* ------------------------------------------------------------------ */
private static void impl_bind( XPropertySet _control, XPropertySet _binding ) throws IncompatibleTypesException
{
- XBindableValue bindableControl = (XBindableValue)UnoRuntime.queryInterface(
+ XBindableValue bindableControl = UnoRuntime.queryInterface(
XBindableValue.class, _control );
- XValueBinding binding = (XValueBinding)UnoRuntime.queryInterface(
+ XValueBinding binding = UnoRuntime.queryInterface(
XValueBinding.class, _binding );
bindableControl.setValueBinding( binding );
}
@@ -225,7 +225,7 @@ public class XMLFormSettings
*/
private void impl_storeDocument() throws IOException
{
- XStorable store = (XStorable)UnoRuntime.queryInterface( XStorable.class,
+ XStorable store = UnoRuntime.queryInterface( XStorable.class,
m_document.getDocument() );
store.store();
assertTrue( "document still modified after saving it", !m_document.isModified() );
diff --git a/main/forms/qa/integration/xforms/Model.java b/main/forms/qa/integration/xforms/Model.java
index edf7088515..82d9512f2a 100644
--- a/main/forms/qa/integration/xforms/Model.java
+++ b/main/forms/qa/integration/xforms/Model.java
@@ -48,9 +48,9 @@ public class Model
protected Model( Object _model )
{
- m_model = (XModel)UnoRuntime.queryInterface( XModel.class, _model );
- m_modelProps = (XPropertySet)UnoRuntime.queryInterface( XPropertySet.class, _model );
- m_helper = (XFormsUIHelper1)UnoRuntime.queryInterface( XFormsUIHelper1.class,
+ m_model = UnoRuntime.queryInterface( XModel.class, _model );
+ m_modelProps = UnoRuntime.queryInterface( XPropertySet.class, _model );
+ m_helper = UnoRuntime.queryInterface( XFormsUIHelper1.class,
m_model );
}
diff --git a/main/forms/qa/integration/xforms/XMLDocument.java b/main/forms/qa/integration/xforms/XMLDocument.java
index 63f94297cc..c0bcdc2f3f 100644
--- a/main/forms/qa/integration/xforms/XMLDocument.java
+++ b/main/forms/qa/integration/xforms/XMLDocument.java
@@ -64,7 +64,7 @@ public class XMLDocument extends integration.forms.DocumentHelper
/* ------------------------------------------------------------------ */
private void impl_initialize( XComponent _document )
{
- m_formsSupplier = (XFormsSupplier)UnoRuntime.queryInterface( XFormsSupplier.class,
+ m_formsSupplier = UnoRuntime.queryInterface( XFormsSupplier.class,
_document );
if ( m_formsSupplier == null )
@@ -98,10 +98,10 @@ public class XMLDocument extends integration.forms.DocumentHelper
XModel newModel = null;
try
{
- newModel = (XModel) UnoRuntime.queryInterface( XModel.class,
+ newModel = UnoRuntime.queryInterface( XModel.class,
getOrb().createInstance( "com.sun.star.xforms.Model" ) );
newModel.setID(_modelName);
- XFormsUIHelper1 modelHelper = (XFormsUIHelper1) UnoRuntime.queryInterface(
+ XFormsUIHelper1 modelHelper = UnoRuntime.queryInterface(
XFormsUIHelper1.class, newModel );
modelHelper.newInstance( "Instance 1", new String(), true );
newModel.initialize();
diff --git a/main/framework/qa/complex/api_internal/CheckAPI.java b/main/framework/qa/complex/api_internal/CheckAPI.java
index b709f5d5ef..70ac32a232 100644
--- a/main/framework/qa/complex/api_internal/CheckAPI.java
+++ b/main/framework/qa/complex/api_internal/CheckAPI.java
@@ -128,7 +128,7 @@ public class CheckAPI {
if ( param.get("job1")==null )
{
// get all test jobs from runner service
- XPropertyAccess xPropAcc = (XPropertyAccess)UnoRuntime.queryInterface(XPropertyAccess.class, oObj);
+ XPropertyAccess xPropAcc = UnoRuntime.queryInterface(XPropertyAccess.class, oObj);
props = xPropAcc.getPropertyValues();
}
else {
diff --git a/main/framework/qa/complex/framework/recovery/CrashThread.java b/main/framework/qa/complex/framework/recovery/CrashThread.java
index cd907435f7..5eb444db7f 100644
--- a/main/framework/qa/complex/framework/recovery/CrashThread.java
+++ b/main/framework/qa/complex/framework/recovery/CrashThread.java
@@ -48,13 +48,13 @@ public class CrashThread extends Thread {
public void run() {
try{
- XModel xModel = (XModel) UnoRuntime.queryInterface(XModel.class, xDoc);
+ XModel xModel = UnoRuntime.queryInterface(XModel.class, xDoc);
XController xController = xModel.getCurrentController();
- XDispatchProvider xDispProv = (XDispatchProvider) UnoRuntime.queryInterface(
+ XDispatchProvider xDispProv = UnoRuntime.queryInterface(
XDispatchProvider.class,
xController);
- XURLTransformer xParser = (XURLTransformer) UnoRuntime.queryInterface(
+ XURLTransformer xParser = UnoRuntime.queryInterface(
XURLTransformer.class,
msf.createInstance(
"com.sun.star.util.URLTransformer"));
diff --git a/main/framework/qa/complex/framework/recovery/RecoveryTest.java b/main/framework/qa/complex/framework/recovery/RecoveryTest.java
index f040355901..e39f203e27 100644
--- a/main/framework/qa/complex/framework/recovery/RecoveryTest.java
+++ b/main/framework/qa/complex/framework/recovery/RecoveryTest.java
@@ -258,10 +258,10 @@ public class RecoveryTest {
while (allComp.hasMoreElements()){
try{
// get all components from the desktop
- XComponent xComponent = (XComponent) UnoRuntime.queryInterface(
+ XComponent xComponent = UnoRuntime.queryInterface(
XComponent.class, allComp.nextElement());
- XModel xModel = (XModel) UnoRuntime.queryInterface(XModel.class, xComponent);
+ XModel xModel = UnoRuntime.queryInterface(XModel.class, xComponent);
String frameName = xModel.getCurrentController().getFrame().getName();
@@ -340,7 +340,7 @@ public class RecoveryTest {
assertTrue("could not get Recovery Window",(oDialog != null));
- XWindow xWindow = (XWindow) UnoRuntime.queryInterface(XWindow.class, oDialog);
+ XWindow xWindow = UnoRuntime.queryInterface(XWindow.class, oDialog);
UITools oUITools = new UITools(xMSF, xWindow);
@@ -377,7 +377,7 @@ public class RecoveryTest {
XDialog oDialog = rt.getActiveDialog(xMSF);
assertTrue("could not get CrashReporter Dialog", oDialog != null);
- XWindow xWindow = (XWindow) UnoRuntime.queryInterface(XWindow.class, oDialog);
+ XWindow xWindow = UnoRuntime.queryInterface(XWindow.class, oDialog);
System.out.println(oDialog.getTitle());
@@ -442,7 +442,7 @@ public class RecoveryTest {
assertTrue("could not get Recovery Dialog at start of office", (oDialog != null));
- XWindow xWindow = (XWindow) UnoRuntime.queryInterface(XWindow.class, oDialog);
+ XWindow xWindow = UnoRuntime.queryInterface(XWindow.class, oDialog);
System.out.println("got the following dialog: '" +oDialog.getTitle() + "'");
UITools oUITools = new UITools(xMSF, xWindow);
@@ -644,7 +644,7 @@ public class RecoveryTest {
System.out.println("creating Impress document '" + frameName + "'");
XComponent xImpressDoc = createNewImpressDoc(frameName);
if (withContent) fillImpressDocWithContent(xImpressDoc);
- positioningDocument((XModel) UnoRuntime.queryInterface(XModel.class,
+ positioningDocument(UnoRuntime.queryInterface(XModel.class,
xImpressDoc));
}
@@ -652,7 +652,7 @@ public class RecoveryTest {
System.out.println("creating Draw document '" + frameName + "'");
XComponent xDrawDoc = createNewDrawDoc(frameName);
if (withContent) fillDrawDocWithContent(xDrawDoc);
- positioningDocument((XModel) UnoRuntime.queryInterface(XModel.class,
+ positioningDocument(UnoRuntime.queryInterface(XModel.class,
xDrawDoc));
}
@@ -660,7 +660,7 @@ public class RecoveryTest {
System.out.println("creating Calc document '" + frameName + "'");
XSpreadsheetDocument xSpreadsheetDoc = createNewCalcDoc(frameName);
if (withContent) fillCalcDocWithContent(xSpreadsheetDoc);
- positioningDocument((XModel) UnoRuntime.queryInterface(XModel.class,
+ positioningDocument(UnoRuntime.queryInterface(XModel.class,
xSpreadsheetDoc));
}
@@ -706,7 +706,7 @@ public class RecoveryTest {
System.out.println("creating Math document '" + frameName + "'");
XComponent xMathDoc = createNewMathDoc(frameName);
if (withContent) fillMathDocWithContent(xMathDoc);
- positioningDocument((XModel) UnoRuntime.queryInterface(XModel.class,
+ positioningDocument(UnoRuntime.queryInterface(XModel.class,
xMathDoc));
}
@@ -724,7 +724,7 @@ public class RecoveryTest {
private void fillMathDocWithContent(XComponent xMathDoc){
// setting a formula in document
final String expFormula = "sum a cdot b";
- final XPropertySet xPS = (XPropertySet) UnoRuntime.queryInterface
+ final XPropertySet xPS = UnoRuntime.queryInterface
(XPropertySet.class, xMathDoc);
try {
xPS.setPropertyValue("Formula", expFormula);
@@ -758,19 +758,19 @@ public class RecoveryTest {
private void fillImpressDocWithContent(XComponent xImpressDoc){
System.out.println( "get presentation" );
- XPresentationSupplier oPS = (XPresentationSupplier)
+ XPresentationSupplier oPS =
UnoRuntime.queryInterface(XPresentationSupplier.class, xImpressDoc);
XInterface oObj = oPS.getPresentation();
System.out.println( "get custom presentation" );
- XCustomPresentationSupplier oCPS = (XCustomPresentationSupplier)
+ XCustomPresentationSupplier oCPS =
UnoRuntime.queryInterface(
XCustomPresentationSupplier.class, xImpressDoc);
XNameContainer xCP = oCPS.getCustomPresentations();
XInterface oInstance = null;
- XSingleServiceFactory oSingleMSF = (XSingleServiceFactory)
+ XSingleServiceFactory oSingleMSF =
UnoRuntime.queryInterface(XSingleServiceFactory.class, xCP);
try{
@@ -806,10 +806,10 @@ public class RecoveryTest {
}
private void fillDrawDocWithContent(XComponent xDrawDoc){
- XDrawPagesSupplier oDPS = (XDrawPagesSupplier)
+ XDrawPagesSupplier oDPS =
UnoRuntime.queryInterface(XDrawPagesSupplier.class, xDrawDoc);
XDrawPages oDPn = oDPS.getDrawPages();
- XIndexAccess oDPi = (XIndexAccess)
+ XIndexAccess oDPi =
UnoRuntime.queryInterface(XIndexAccess.class, oDPn);
XDrawPage oDP = null;
try {
@@ -828,7 +828,7 @@ public class RecoveryTest {
// get a Shape
System.out.println( "getting Shape" );
- XShapes oShapes = (XShapes) UnoRuntime.queryInterface
+ XShapes oShapes = UnoRuntime.queryInterface
(XShapes.class, oDP);
XInterface oObj = SOF.createShape
(xDrawDoc, 5000, 3500, 7500, 5000, "Rectangle");
@@ -843,7 +843,7 @@ public class RecoveryTest {
oShapes.add((XShape) oShape);
- XPropertySet oShapeProps = (XPropertySet)
+ XPropertySet oShapeProps =
UnoRuntime.queryInterface(XPropertySet.class, oObj);
XStyle aStyle = null;
try {
@@ -869,7 +869,7 @@ public class RecoveryTest {
System.out.println("creating Writer document '" + frameName + "'");
XTextDocument xTextDoc = createNewWriterDoc(frameName);
if (withContent) fillWriterDocWithContent(xTextDoc);
- positioningDocument((XModel) UnoRuntime.queryInterface(XModel.class,
+ positioningDocument(UnoRuntime.queryInterface(XModel.class,
xTextDoc));
}
@@ -938,7 +938,7 @@ public class RecoveryTest {
XCellRange testRange = oSheet.getCellRangeByName("$A$1:$D$4");
- XSheetCellRange testSheetRange = (XSheetCellRange) UnoRuntime.queryInterface(
+ XSheetCellRange testSheetRange = UnoRuntime.queryInterface(
XSheetCellRange.class,
testRange);
oSheet.getCellByPosition(1, 1).setValue(1);
diff --git a/main/framework/qa/complex/framework/recovery/RecoveryTools.java b/main/framework/qa/complex/framework/recovery/RecoveryTools.java
index 3623485e6a..0aca7be42e 100644
--- a/main/framework/qa/complex/framework/recovery/RecoveryTools.java
+++ b/main/framework/qa/complex/framework/recovery/RecoveryTools.java
@@ -76,7 +76,7 @@ public class RecoveryTools {
*/
public XDialog getActiveDialog( XMultiServiceFactory xMSF){
XWindow xWin = getActiveWindow(xMSF);
- return (XDialog) UnoRuntime.queryInterface(XDialog.class, xWin);
+ return UnoRuntime.queryInterface(XDialog.class, xWin);
}
public XWindow getActiveWindow( XMultiServiceFactory xMSF){
@@ -87,10 +87,10 @@ public class RecoveryTools {
return null;
}
- XExtendedToolkit tk = (XExtendedToolkit)
+ XExtendedToolkit tk =
UnoRuntime.queryInterface(XExtendedToolkit.class, xToolKit);
Object atw = tk.getActiveTopWindow();
- return (XWindow) UnoRuntime.queryInterface(XWindow.class, atw);
+ return UnoRuntime.queryInterface(XWindow.class, atw);
}
/**
@@ -214,7 +214,7 @@ public class RecoveryTools {
*/
public boolean closeOffice(XMultiServiceFactory xMSF) {
try {
- XDesktop desk = (XDesktop) UnoRuntime.queryInterface(
+ XDesktop desk = UnoRuntime.queryInterface(
XDesktop.class, xMSF.createInstance(
"com.sun.star.frame.Desktop"));
xMSF = null;
diff --git a/main/framework/qa/complex/imageManager/CheckImageManager.java b/main/framework/qa/complex/imageManager/CheckImageManager.java
index 475da8cacc..f54f967dd0 100644
--- a/main/framework/qa/complex/imageManager/CheckImageManager.java
+++ b/main/framework/qa/complex/imageManager/CheckImageManager.java
@@ -131,7 +131,7 @@ public class CheckImageManager {
assertTrue(testObjectName + "::XUIConfig.addConfigurationListener", _xUIConfig._addConfigurationListener());
assertTrue(testObjectName + "::XUIConfig.removeConfigurationListener", _xUIConfig._removeConfigurationListener());
- XUIConfigurationPersistence xUIConfigPersistence = (XUIConfigurationPersistence)UnoRuntime.queryInterface(XUIConfiguration.class, xImageManager);
+ XUIConfigurationPersistence xUIConfigPersistence = UnoRuntime.queryInterface(XUIConfigurationPersistence.class, xImageManager);
_XUIConfigurationPersistence _xUIConfigPersistence = new _XUIConfigurationPersistence(param, xUIConfigPersistence);
_xUIConfigPersistence.before();
assertTrue(testObjectName + "::XUIConfigPersistence.isModified", _xUIConfigPersistence._isModified());
diff --git a/main/framework/qa/complex/loadAllDocuments/StreamSimulator.java b/main/framework/qa/complex/loadAllDocuments/StreamSimulator.java
index a61445f955..db465ef04f 100644
--- a/main/framework/qa/complex/loadAllDocuments/StreamSimulator.java
+++ b/main/framework/qa/complex/loadAllDocuments/StreamSimulator.java
@@ -88,7 +88,7 @@ public class StreamSimulator implements com.sun.star.io.XInputStream ,
try
{
- XSimpleFileAccess xHelper = (XSimpleFileAccess)
+ XSimpleFileAccess xHelper =
UnoRuntime.queryInterface(XSimpleFileAccess.class,
xMSF.createInstance("com.sun.star.ucb.SimpleFileAccess"));
@@ -99,14 +99,14 @@ public class StreamSimulator implements com.sun.star.io.XInputStream ,
if (bInput)
{
m_xInStream = xHelper.openFileRead(m_sFileName);
- m_xSeek = (com.sun.star.io.XSeekable)UnoRuntime.queryInterface(
+ m_xSeek = UnoRuntime.queryInterface(
com.sun.star.io.XSeekable.class,
m_xInStream);
}
else
{
m_xOutStream = xHelper.openFileWrite(m_sFileName);
- m_xSeek = (com.sun.star.io.XSeekable)UnoRuntime.queryInterface(
+ m_xSeek = UnoRuntime.queryInterface(
com.sun.star.io.XSeekable.class,
m_xOutStream);
}
diff --git a/main/framework/source/services/backingcomp.cxx b/main/framework/source/services/backingcomp.cxx
index c45ef1720d..6bc092de01 100644
--- a/main/framework/source/services/backingcomp.cxx
+++ b/main/framework/source/services/backingcomp.cxx
@@ -402,12 +402,12 @@ css::uno::Reference< css::lang::XSingleServiceFactory > BackingComp::impl_create
May he will do the following things:
<listing>
- XController xBackingComp = (XController)UnoRuntime.queryInterface(
+ XController xBackingComp = UnoRuntime.queryInterface(
XController.class,
xSMGR.createInstance(SERVICENAME_STARTMODULE));
// at this time XWindow isn't present at this instance!
- XWindow xBackingComp = (XWindow)UnoRuntime.queryInterface(
+ XWindow xBackingComp = UnoRuntime.queryInterface(
XWindow.class,
xBackingComp);
@@ -416,7 +416,7 @@ css::uno::Reference< css::lang::XSingleServiceFactory > BackingComp::impl_create
// the component window. From now we offer the window interfaces!
xBackingComp.attachFrame(xFrame);
- XWindow xBackingComp = (XWindow)UnoRuntime.queryInterface(
+ XWindow xBackingComp = UnoRuntime.queryInterface(
XWindow.class,
xBackingComp);
@@ -425,7 +425,7 @@ css::uno::Reference< css::lang::XSingleServiceFactory > BackingComp::impl_create
// But that had no effect to our view state.
// We must be started to create our UI elements like e.g. menu, title, background ...
- XInitialization xBackingInit = (XInitialization)UnoRuntime.queryInterface(
+ XInitialization xBackingInit = UnoRuntime.queryInterface(
XInitialization.class,
xBackingComp);
diff --git a/main/odk/examples/DevelopersGuide/Accessibility/ConnectionTask.java b/main/odk/examples/DevelopersGuide/Accessibility/ConnectionTask.java
index 471ada3c75..00932deb10 100644
--- a/main/odk/examples/DevelopersGuide/Accessibility/ConnectionTask.java
+++ b/main/odk/examples/DevelopersGuide/Accessibility/ConnectionTask.java
@@ -91,7 +91,7 @@ class ConnectionTask
com.sun.star.lang.EventObject aEvent = new com.sun.star.lang.EventObject();
for (int i=0; i<nTopWindowCount; i++)
{
- XAccessible xAccessible = (XAccessible) UnoRuntime.queryInterface(
+ XAccessible xAccessible = UnoRuntime.queryInterface(
XAccessible.class,
xToolkit.getTopWindow(i));
XAccessibleContext xContext = xAccessible.getAccessibleContext();
@@ -132,7 +132,7 @@ class ConnectionTask
{
if (xFactory != null)
{
- xToolkit = (XExtendedToolkit) UnoRuntime.queryInterface(
+ xToolkit = UnoRuntime.queryInterface(
XExtendedToolkit.class,
xFactory.createInstance ("stardiv.Toolkit.VCLXToolkit"));
}
@@ -167,7 +167,7 @@ class ConnectionTask
com.sun.star.lang.XMultiComponentFactory xMCF =
xCmpContext.getServiceManager();
- return (XMultiServiceFactory) UnoRuntime.queryInterface (
+ return UnoRuntime.queryInterface (
XMultiServiceFactory.class, xMCF);
}
diff --git a/main/odk/examples/DevelopersGuide/Accessibility/EventListenerProxy.java b/main/odk/examples/DevelopersGuide/Accessibility/EventListenerProxy.java
index b6d2ff6922..07f1c06e6d 100644
--- a/main/odk/examples/DevelopersGuide/Accessibility/EventListenerProxy.java
+++ b/main/odk/examples/DevelopersGuide/Accessibility/EventListenerProxy.java
@@ -163,7 +163,7 @@ class EventListenerProxy
public void run()
{
maListener.windowOpened (
- (XAccessible) UnoRuntime.queryInterface(
+ UnoRuntime.queryInterface(
XAccessible.class,
aEvent.Source));
}
@@ -181,7 +181,7 @@ class EventListenerProxy
public void run()
{
maListener.windowClosed (
- (XAccessible) UnoRuntime.queryInterface(
+ UnoRuntime.queryInterface(
XAccessible.class,
aEvent.Source));
}
diff --git a/main/odk/examples/DevelopersGuide/Accessibility/GraphicalDisplay.java b/main/odk/examples/DevelopersGuide/Accessibility/GraphicalDisplay.java
index 27a75e820b..f51942791d 100644
--- a/main/odk/examples/DevelopersGuide/Accessibility/GraphicalDisplay.java
+++ b/main/odk/examples/DevelopersGuide/Accessibility/GraphicalDisplay.java
@@ -105,7 +105,7 @@ public class GraphicalDisplay
// When the context supports the XAccessibleComponent interface
// then draw its outline.
XAccessibleComponent xComponent =
- (XAccessibleComponent)UnoRuntime.queryInterface(
+ UnoRuntime.queryInterface(
XAccessibleComponent.class, xContext);
if (xComponent != null)
{
diff --git a/main/odk/examples/DevelopersGuide/Accessibility/RegistrationThread.java b/main/odk/examples/DevelopersGuide/Accessibility/RegistrationThread.java
index aa5f667e5e..4f0e5b4fe5 100644
--- a/main/odk/examples/DevelopersGuide/Accessibility/RegistrationThread.java
+++ b/main/odk/examples/DevelopersGuide/Accessibility/RegistrationThread.java
@@ -99,7 +99,7 @@ public class RegistrationThread
{
// Register the root node.
XAccessibleEventBroadcaster xBroadcaster =
- (XAccessibleEventBroadcaster) UnoRuntime.queryInterface (
+ UnoRuntime.queryInterface (
XAccessibleEventBroadcaster.class,
xRoot);
if (xBroadcaster != null)
diff --git a/main/odk/examples/DevelopersGuide/Accessibility/TextualDisplay.java b/main/odk/examples/DevelopersGuide/Accessibility/TextualDisplay.java
index a4669d7160..8fe091fc23 100644
--- a/main/odk/examples/DevelopersGuide/Accessibility/TextualDisplay.java
+++ b/main/odk/examples/DevelopersGuide/Accessibility/TextualDisplay.java
@@ -145,7 +145,7 @@ class TextualDisplay
// Try to cast the given accessible context to the
// XAccessibleComponent interface.
XAccessibleComponent xComponent =
- (XAccessibleComponent)UnoRuntime.queryInterface(
+ UnoRuntime.queryInterface(
XAccessibleComponent.class, xContext);
if (xComponent != null)
{
diff --git a/main/odk/examples/DevelopersGuide/BasicAndDialogs/CreatingDialogs/SampleDialog.java b/main/odk/examples/DevelopersGuide/BasicAndDialogs/CreatingDialogs/SampleDialog.java
index 8b0eb9e802..ed6366a04b 100644
--- a/main/odk/examples/DevelopersGuide/BasicAndDialogs/CreatingDialogs/SampleDialog.java
+++ b/main/odk/examples/DevelopersGuide/BasicAndDialogs/CreatingDialogs/SampleDialog.java
@@ -134,7 +134,7 @@ public class SampleDialog extends WeakBase implements XServiceInfo, XJobExecutor
// create the dialog model and set the properties
Object dialogModel = xMultiComponentFactory.createInstanceWithContext(
"com.sun.star.awt.UnoControlDialogModel", _xComponentContext );
- XPropertySet xPSetDialog = ( XPropertySet )UnoRuntime.queryInterface(
+ XPropertySet xPSetDialog = UnoRuntime.queryInterface(
XPropertySet.class, dialogModel );
xPSetDialog.setPropertyValue( "PositionX", new Integer( 100 ) );
xPSetDialog.setPropertyValue( "PositionY", new Integer( 100 ) );
@@ -143,13 +143,13 @@ public class SampleDialog extends WeakBase implements XServiceInfo, XJobExecutor
xPSetDialog.setPropertyValue( "Title", new String( "Runtime Dialog Demo" ) );
// get the service manager from the dialog model
- XMultiServiceFactory xMultiServiceFactory = ( XMultiServiceFactory )UnoRuntime.queryInterface(
+ XMultiServiceFactory xMultiServiceFactory = UnoRuntime.queryInterface(
XMultiServiceFactory.class, dialogModel );
// create the button model and set the properties
Object buttonModel = xMultiServiceFactory.createInstance(
"com.sun.star.awt.UnoControlButtonModel" );
- XPropertySet xPSetButton = ( XPropertySet )UnoRuntime.queryInterface(
+ XPropertySet xPSetButton = UnoRuntime.queryInterface(
XPropertySet.class, buttonModel );
xPSetButton.setPropertyValue( "PositionX", new Integer( 20 ) );
xPSetButton.setPropertyValue( "PositionY", new Integer( 70 ) );
@@ -162,7 +162,7 @@ public class SampleDialog extends WeakBase implements XServiceInfo, XJobExecutor
// create the label model and set the properties
Object labelModel = xMultiServiceFactory.createInstance(
"com.sun.star.awt.UnoControlFixedTextModel" );
- XPropertySet xPSetLabel = ( XPropertySet )UnoRuntime.queryInterface(
+ XPropertySet xPSetLabel = UnoRuntime.queryInterface(
XPropertySet.class, labelModel );
xPSetLabel.setPropertyValue( "PositionX", new Integer( 40 ) );
xPSetLabel.setPropertyValue( "PositionY", new Integer( 30 ) );
@@ -175,7 +175,7 @@ public class SampleDialog extends WeakBase implements XServiceInfo, XJobExecutor
// create a Cancel button model and set the properties
Object cancelButtonModel = xMultiServiceFactory.createInstance(
"com.sun.star.awt.UnoControlButtonModel" );
- XPropertySet xPSetCancelButton = ( XPropertySet )UnoRuntime.queryInterface(
+ XPropertySet xPSetCancelButton = UnoRuntime.queryInterface(
XPropertySet.class, cancelButtonModel );
xPSetCancelButton.setPropertyValue( "PositionX", new Integer( 80 ) );
xPSetCancelButton.setPropertyValue( "PositionY", new Integer( 70 ) );
@@ -187,7 +187,7 @@ public class SampleDialog extends WeakBase implements XServiceInfo, XJobExecutor
xPSetCancelButton.setPropertyValue( "Label", new String( "Cancel" ) );
// insert the control models into the dialog model
- XNameContainer xNameCont = ( XNameContainer )UnoRuntime.queryInterface(
+ XNameContainer xNameCont = UnoRuntime.queryInterface(
XNameContainer.class, dialogModel );
xNameCont.insertByName( _buttonName, buttonModel );
xNameCont.insertByName( _labelName, labelModel );
@@ -196,37 +196,37 @@ public class SampleDialog extends WeakBase implements XServiceInfo, XJobExecutor
// create the dialog control and set the model
Object dialog = xMultiComponentFactory.createInstanceWithContext(
"com.sun.star.awt.UnoControlDialog", _xComponentContext );
- XControl xControl = ( XControl )UnoRuntime.queryInterface(
+ XControl xControl = UnoRuntime.queryInterface(
XControl.class, dialog );
- XControlModel xControlModel = ( XControlModel )UnoRuntime.queryInterface(
+ XControlModel xControlModel = UnoRuntime.queryInterface(
XControlModel.class, dialogModel );
xControl.setModel( xControlModel );
// add an action listener to the button control
- XControlContainer xControlCont = ( XControlContainer )UnoRuntime.queryInterface(
+ XControlContainer xControlCont = UnoRuntime.queryInterface(
XControlContainer.class, dialog );
Object objectButton = xControlCont.getControl( "Button1" );
- XButton xButton = ( XButton )UnoRuntime.queryInterface(
+ XButton xButton = UnoRuntime.queryInterface(
XButton.class, objectButton );
xButton.addActionListener( new ActionListenerImpl( xControlCont ) );
// create a peer
Object toolkit = xMultiComponentFactory.createInstanceWithContext(
"com.sun.star.awt.ExtToolkit", _xComponentContext );
- XToolkit xToolkit = ( XToolkit )UnoRuntime.queryInterface(
+ XToolkit xToolkit = UnoRuntime.queryInterface(
XToolkit.class, toolkit );
- XWindow xWindow = ( XWindow )UnoRuntime.queryInterface(
+ XWindow xWindow = UnoRuntime.queryInterface(
XWindow.class, xControl );
xWindow.setVisible( false );
xControl.createPeer( xToolkit, null );
// execute the dialog
- XDialog xDialog = ( XDialog )UnoRuntime.queryInterface(
+ XDialog xDialog = UnoRuntime.queryInterface(
XDialog.class, dialog );
xDialog.execute();
// dispose the dialog
- XComponent xComponent = ( XComponent )UnoRuntime.queryInterface(
+ XComponent xComponent = UnoRuntime.queryInterface(
XComponent.class, dialog );
xComponent.dispose();
}
@@ -256,7 +256,7 @@ public class SampleDialog extends WeakBase implements XServiceInfo, XJobExecutor
// set label text
Object label = _xControlCont.getControl( "Label1" );
- XFixedText xLabel = ( XFixedText )UnoRuntime.queryInterface(
+ XFixedText xLabel = UnoRuntime.queryInterface(
XFixedText.class, label );
xLabel.setText( _labelPrefix + _nCounts );
}
diff --git a/main/odk/examples/DevelopersGuide/Charts/CalcHelper.java b/main/odk/examples/DevelopersGuide/Charts/CalcHelper.java
index 08751ac009..bb1f2b2493 100644
--- a/main/odk/examples/DevelopersGuide/Charts/CalcHelper.java
+++ b/main/odk/examples/DevelopersGuide/Charts/CalcHelper.java
@@ -82,13 +82,13 @@ public class CalcHelper
public XSpreadsheet getChartSheet() throws RuntimeException
{
- XNameAccess aSheetsNA = (XNameAccess) UnoRuntime.queryInterface(
+ XNameAccess aSheetsNA = UnoRuntime.queryInterface(
XNameAccess.class, maSpreadSheetDoc.getSheets() );
XSpreadsheet aSheet = null;
try
{
- aSheet = (XSpreadsheet) UnoRuntime.queryInterface(
+ aSheet = UnoRuntime.queryInterface(
XSpreadsheet.class, aSheetsNA.getByName( msChartSheetName ) );
}
catch( NoSuchElementException ex )
@@ -105,7 +105,7 @@ public class CalcHelper
public XSpreadsheet getDataSheet() throws RuntimeException
{
- XNameAccess aSheetsNA = (XNameAccess) UnoRuntime.queryInterface(
+ XNameAccess aSheetsNA = UnoRuntime.queryInterface(
XNameAccess.class, maSpreadSheetDoc.getSheets() );
XSpreadsheet aSheet = null;
@@ -113,7 +113,7 @@ public class CalcHelper
{
try
{
- aSheet = (XSpreadsheet) UnoRuntime.queryInterface(
+ aSheet = UnoRuntime.queryInterface(
XSpreadsheet.class, aSheetsNA.getByName( msDataSheetName ) );
}
catch( NoSuchElementException ex )
@@ -149,7 +149,7 @@ public class CalcHelper
// get the sheet to insert the chart
try
{
- aSheet = (XTableChartsSupplier) UnoRuntime.queryInterface(
+ aSheet = UnoRuntime.queryInterface(
XTableChartsSupplier.class, getChartSheet() );
}
catch( Exception ex )
@@ -159,7 +159,7 @@ public class CalcHelper
}
XTableCharts aChartCollection = aSheet.getCharts();
- XNameAccess aChartCollectionNA = (XNameAccess) UnoRuntime.queryInterface(
+ XNameAccess aChartCollectionNA = UnoRuntime.queryInterface(
XNameAccess.class, aChartCollection );
if( aChartCollectionNA != null &&
@@ -176,21 +176,21 @@ public class CalcHelper
try
{
- XTableChart aTableChart = (XTableChart) UnoRuntime.queryInterface(
+ XTableChart aTableChart = UnoRuntime.queryInterface(
XTableChart.class, aChartCollectionNA.getByName( sChartName ));
// the table chart is an embedded object which contains the chart document
- aResult = (XChartDocument) UnoRuntime.queryInterface(
+ aResult = UnoRuntime.queryInterface(
XChartDocument.class,
- ((XEmbeddedObjectSupplier) UnoRuntime.queryInterface(
+ (UnoRuntime.queryInterface(
XEmbeddedObjectSupplier.class,
aTableChart )).getEmbeddedObject());
// create a diagram via the factory and set this as new diagram
aResult.setDiagram(
- (XDiagram) UnoRuntime.queryInterface(
+ UnoRuntime.queryInterface(
XDiagram.class,
- ((XMultiServiceFactory) UnoRuntime.queryInterface(
+ (UnoRuntime.queryInterface(
XMultiServiceFactory.class,
aResult )).createInstance( sChartServiceName )));
}
@@ -218,7 +218,7 @@ public class CalcHelper
try
{
XSpreadsheet aSheet = getDataSheet();
- XCellRange aSheetRange = (XCellRange) UnoRuntime.queryInterface( XCellRange.class, aSheet );
+ XCellRange aSheetRange = UnoRuntime.queryInterface( XCellRange.class, aSheet );
aRange = aSheetRange.getCellRangeByPosition(
0, 0,
@@ -281,7 +281,7 @@ public class CalcHelper
try
{
XSpreadsheet aSheet = getDataSheet();
- XCellRange aSheetRange = (XCellRange) UnoRuntime.queryInterface( XCellRange.class, aSheet );
+ XCellRange aSheetRange = UnoRuntime.queryInterface( XCellRange.class, aSheet );
aRange = aSheetRange.getCellRangeByPosition(
0, 0,
@@ -296,7 +296,7 @@ public class CalcHelper
int nFactorCol = nColumnCount + 2;
(aSheet.getCellByPosition( nFactorCol - 1, 0 )).setValue( 0.2 );
- XText xCellText = (XText) UnoRuntime.queryInterface( XText.class, aSheet.getCellByPosition( nFactorCol - 1, 1 ) );
+ XText xCellText = UnoRuntime.queryInterface( XText.class, aSheet.getCellByPosition( nFactorCol - 1, 1 ) );
xCellText.setString( "Change the factor above and\nwatch the changes in the chart" );
for( nCol = 0; nCol < nColumnCount; nCol++ )
@@ -337,9 +337,9 @@ public class CalcHelper
*/
public void raiseChartSheet()
{
- ((XSpreadsheetView) UnoRuntime.queryInterface(
+ (UnoRuntime.queryInterface(
XSpreadsheetView.class,
- ((XModel) UnoRuntime.queryInterface(
+ (UnoRuntime.queryInterface(
XModel.class,
maSpreadSheetDoc )).getCurrentController()) ).setActiveSheet( getChartSheet() );
}
@@ -362,9 +362,9 @@ public class CalcHelper
if( maSpreadSheetDoc != null )
{
XSpreadsheets aSheets = maSpreadSheetDoc.getSheets();
- XNameContainer aSheetsNC = (XNameContainer) UnoRuntime.queryInterface(
+ XNameContainer aSheetsNC = UnoRuntime.queryInterface(
XNameContainer.class, aSheets );
- XIndexAccess aSheetsIA = (XIndexAccess) UnoRuntime.queryInterface(
+ XIndexAccess aSheetsIA = UnoRuntime.queryInterface(
XIndexAccess.class, aSheets );
if( aSheets != null &&
@@ -377,11 +377,11 @@ public class CalcHelper
for( int i = aSheetsIA.getCount() - 1; i > 0; i-- )
{
aSheetsNC.removeByName(
- ( (XNamed) UnoRuntime.queryInterface(
+ ( UnoRuntime.queryInterface(
XNamed.class, aSheetsIA.getByIndex( i ) )).getName() );
}
- XNamed aFirstSheet = (XNamed) UnoRuntime.queryInterface(
+ XNamed aFirstSheet = UnoRuntime.queryInterface(
XNamed.class,
aSheetsIA.getByIndex( 0 ));
diff --git a/main/odk/examples/DevelopersGuide/Charts/ChartHelper.java b/main/odk/examples/DevelopersGuide/Charts/ChartHelper.java
index be869c6dbc..b6eeac7e85 100644
--- a/main/odk/examples/DevelopersGuide/Charts/ChartHelper.java
+++ b/main/odk/examples/DevelopersGuide/Charts/ChartHelper.java
@@ -77,7 +77,7 @@ public class ChartHelper
{
XChartDocument aResult = null;
- XMultiServiceFactory aFact = (XMultiServiceFactory)
+ XMultiServiceFactory aFact =
UnoRuntime.queryInterface(XMultiServiceFactory.class,
maContainerDocument );
@@ -85,19 +85,19 @@ public class ChartHelper
{
try
{
- XTextContent xTextContent = (XTextContent)UnoRuntime.queryInterface(
+ XTextContent xTextContent = UnoRuntime.queryInterface(
XTextContent.class,
aFact.createInstance("com.sun.star.text.TextEmbeddedObject"));
if ( xTextContent != null )
{
- XPropertySet xPropSet = (XPropertySet)UnoRuntime.queryInterface(
+ XPropertySet xPropSet = UnoRuntime.queryInterface(
XPropertySet.class, xTextContent);
Any aAny = new Any(String.class, msChartClassID);
xPropSet.setPropertyValue("CLSID", aAny );
- XTextDocument xTextDoc = (XTextDocument)
+ XTextDocument xTextDoc =
UnoRuntime.queryInterface(XTextDocument.class,
maContainerDocument);
XText xText = xTextDoc.getText();
@@ -107,7 +107,7 @@ public class ChartHelper
xText.insertTextContent( xCursor, xTextContent, true );
// set size and position
- XShape xShape = (XShape)UnoRuntime.queryInterface(
+ XShape xShape = UnoRuntime.queryInterface(
XShape.class, xTextContent);
xShape.setSize( aExtent );
@@ -123,16 +123,16 @@ public class ChartHelper
xPropSet.setPropertyValue("HoriOrientPosition", aAny );
// retrieve the chart document as model of the OLE shape
- aResult = (XChartDocument) UnoRuntime.queryInterface(
+ aResult = UnoRuntime.queryInterface(
XChartDocument.class,
xPropSet.getPropertyValue( "Model" ));
// create a diagram via the factory and set this as
// new diagram
aResult.setDiagram(
- (XDiagram) UnoRuntime.queryInterface(
+ UnoRuntime.queryInterface(
XDiagram.class,
- ((XMultiServiceFactory) UnoRuntime.queryInterface(
+ (UnoRuntime.queryInterface(
XMultiServiceFactory.class,
aResult )).createInstance(sChartServiceName )));
}
@@ -156,7 +156,7 @@ public class ChartHelper
XShapes aPage = null;
// try interface for multiple pages in a document
- XDrawPagesSupplier aSupplier = (XDrawPagesSupplier)
+ XDrawPagesSupplier aSupplier =
UnoRuntime.queryInterface(XDrawPagesSupplier.class,
maContainerDocument );
@@ -165,7 +165,7 @@ public class ChartHelper
try
{
// get first page
- aPage = (XShapes) UnoRuntime.queryInterface(
+ aPage = UnoRuntime.queryInterface(
XShapes.class, aSupplier.getDrawPages().getByIndex( 0 ) );
}
catch( Exception ex )
@@ -177,20 +177,20 @@ public class ChartHelper
else
{
// try interface for single draw page (e.g. spreadsheet)
- XDrawPageSupplier aOnePageSupplier = (XDrawPageSupplier)
+ XDrawPageSupplier aOnePageSupplier =
UnoRuntime.queryInterface(XDrawPageSupplier.class,
maContainerDocument );
if( aOnePageSupplier != null )
{
- aPage = (XShapes) UnoRuntime.queryInterface(
+ aPage = UnoRuntime.queryInterface(
XShapes.class, aOnePageSupplier.getDrawPage());
}
}
if( aPage != null )
{
- XMultiServiceFactory aFact = (XMultiServiceFactory)
+ XMultiServiceFactory aFact =
UnoRuntime.queryInterface(XMultiServiceFactory.class,
maContainerDocument );
@@ -199,7 +199,7 @@ public class ChartHelper
try
{
// create an OLE shape
- XShape aShape = (XShape) UnoRuntime.queryInterface(
+ XShape aShape = UnoRuntime.queryInterface(
XShape.class,
aFact.createInstance( "com.sun.star.drawing.OLE2Shape" ));
@@ -209,7 +209,7 @@ public class ChartHelper
aShape.setSize( aExtent );
// make the OLE shape a chart
- XPropertySet aShapeProp = (XPropertySet)
+ XPropertySet aShapeProp =
UnoRuntime.queryInterface(XPropertySet.class, aShape );
if( aShapeProp != null )
{
@@ -217,16 +217,16 @@ public class ChartHelper
aShapeProp.setPropertyValue( "CLSID", msChartClassID );
// retrieve the chart document as model of the OLE shape
- aResult = (XChartDocument) UnoRuntime.queryInterface(
+ aResult = UnoRuntime.queryInterface(
XChartDocument.class,
aShapeProp.getPropertyValue( "Model" ));
// create a diagram via the factory and set this as
// new diagram
aResult.setDiagram(
- (XDiagram) UnoRuntime.queryInterface(
+ UnoRuntime.queryInterface(
XDiagram.class,
- ((XMultiServiceFactory) UnoRuntime.queryInterface(
+ (UnoRuntime.queryInterface(
XMultiServiceFactory.class,
aResult )).createInstance(sChartServiceName )));
}
diff --git a/main/odk/examples/DevelopersGuide/Charts/ChartInCalc.java b/main/odk/examples/DevelopersGuide/Charts/ChartInCalc.java
index 74e919dc87..169b7fa8b8 100644
--- a/main/odk/examples/DevelopersGuide/Charts/ChartInCalc.java
+++ b/main/odk/examples/DevelopersGuide/Charts/ChartInCalc.java
@@ -77,7 +77,7 @@ public class ChartInCalc
// insert a cell range with 4 columns and 24 rows filled with random numbers
XCellRange aRange = aCalcHelper.insertRandomRange( 4, 24 );
- CellRangeAddress aRangeAddress = ((XCellRangeAddressable) UnoRuntime.queryInterface(
+ CellRangeAddress aRangeAddress = (UnoRuntime.queryInterface(
XCellRangeAddressable.class, aRange)).getRangeAddress();
// change view to sheet containing the chart
@@ -147,7 +147,7 @@ public class ChartInCalc
public void lockControllers()
throws RuntimeException
{
- ((XModel) UnoRuntime.queryInterface( XModel.class, maChartDocument )).lockControllers();
+ (UnoRuntime.queryInterface( XModel.class, maChartDocument )).lockControllers();
}
// ____________________
@@ -155,7 +155,7 @@ public class ChartInCalc
public void unlockControllers()
throws RuntimeException
{
- ((XModel) UnoRuntime.queryInterface( XModel.class, maChartDocument )).unlockControllers();
+ (UnoRuntime.queryInterface( XModel.class, maChartDocument )).unlockControllers();
}
// ____________________
@@ -164,7 +164,7 @@ public class ChartInCalc
throws RuntimeException, UnknownPropertyException, PropertyVetoException,
com.sun.star.lang.IllegalArgumentException, WrappedTargetException
{
- XPropertySet aDiaProp = (XPropertySet) UnoRuntime.queryInterface( XPropertySet.class, maDiagram );
+ XPropertySet aDiaProp = UnoRuntime.queryInterface( XPropertySet.class, maDiagram );
if( aDiaProp != null )
{
@@ -234,7 +234,7 @@ public class ChartInCalc
// determine the maximum value of the first series
int nMaxIndex = 0;
- XChartDataArray aDataArray = (XChartDataArray) UnoRuntime.queryInterface(
+ XChartDataArray aDataArray = UnoRuntime.queryInterface(
XChartDataArray.class, maChartDocument.getData());
double aData[][] = aDataArray.getData();
@@ -290,7 +290,7 @@ public class ChartInCalc
throws RuntimeException, UnknownPropertyException, PropertyVetoException,
com.sun.star.lang.IllegalArgumentException, WrappedTargetException
{
- XPropertySet aWall = ((X3DDisplay) UnoRuntime.queryInterface(
+ XPropertySet aWall = (UnoRuntime.queryInterface(
X3DDisplay.class, maDiagram )).getWall();
// change background color of area
@@ -305,12 +305,12 @@ public class ChartInCalc
com.sun.star.lang.IllegalArgumentException, WrappedTargetException
{
// change main title
- XPropertySet aDocProp = (XPropertySet) UnoRuntime.queryInterface(
+ XPropertySet aDocProp = UnoRuntime.queryInterface(
XPropertySet.class, maChartDocument );
aDocProp.setPropertyValue( "HasMainTitle", new Boolean( true ));
XShape aTitle = maChartDocument.getTitle();
- XPropertySet aTitleProp = (XPropertySet) UnoRuntime.queryInterface( XPropertySet.class, aTitle );
+ XPropertySet aTitleProp = UnoRuntime.queryInterface( XPropertySet.class, aTitle );
// set new text
if( aTitleProp != null )
@@ -320,8 +320,8 @@ public class ChartInCalc
}
// align title with y axis
- XShape aAxis = (XShape) UnoRuntime.queryInterface(
- XShape.class, ((XAxisYSupplier) UnoRuntime.queryInterface(
+ XShape aAxis = UnoRuntime.queryInterface(
+ XShape.class, (UnoRuntime.queryInterface(
XAxisYSupplier.class, maDiagram )).getYAxis() );
if( aAxis != null &&
@@ -341,7 +341,7 @@ public class ChartInCalc
MalformedNumberFormatException
{
// x axis
- XPropertySet aAxisProp = ((XAxisXSupplier) UnoRuntime.queryInterface(
+ XPropertySet aAxisProp = (UnoRuntime.queryInterface(
XAxisXSupplier.class, maDiagram )).getXAxis();
if( aAxisProp != null )
{
@@ -350,12 +350,12 @@ public class ChartInCalc
}
// change number format for y axis
- aAxisProp = ((XAxisYSupplier) UnoRuntime.queryInterface(
+ aAxisProp = (UnoRuntime.queryInterface(
XAxisYSupplier.class, maDiagram )).getYAxis();
// add a new custom number format and get the new key
int nNewNumberFormat = 0;
- XNumberFormatsSupplier aNumFmtSupp = (XNumberFormatsSupplier) UnoRuntime.queryInterface(
+ XNumberFormatsSupplier aNumFmtSupp = UnoRuntime.queryInterface(
XNumberFormatsSupplier.class, maChartDocument );
if( aNumFmtSupp != null )
@@ -380,9 +380,9 @@ public class ChartInCalc
com.sun.star.lang.IllegalArgumentException, WrappedTargetException
{
// y major grid
- XPropertySet aGridProp = (XPropertySet) UnoRuntime.queryInterface(
+ XPropertySet aGridProp = UnoRuntime.queryInterface(
XPropertySet.class,
- ( (XAxisYSupplier) UnoRuntime.queryInterface(
+ ( UnoRuntime.queryInterface(
XAxisYSupplier.class, maDiagram )).getYMainGrid());
if( aGridProp != null )
diff --git a/main/odk/examples/DevelopersGuide/Charts/ChartInDraw.java b/main/odk/examples/DevelopersGuide/Charts/ChartInDraw.java
index c04bd55985..716dc61fba 100644
--- a/main/odk/examples/DevelopersGuide/Charts/ChartInDraw.java
+++ b/main/odk/examples/DevelopersGuide/Charts/ChartInDraw.java
@@ -125,7 +125,7 @@ public class ChartInDraw
public void lockControllers()
throws RuntimeException
{
- ((XModel) UnoRuntime.queryInterface( XModel.class, maChartDocument )).lockControllers();
+ (UnoRuntime.queryInterface( XModel.class, maChartDocument )).lockControllers();
}
// ____________________
@@ -133,7 +133,7 @@ public class ChartInDraw
public void unlockControllers()
throws RuntimeException
{
- ((XModel) UnoRuntime.queryInterface( XModel.class, maChartDocument )).unlockControllers();
+ (UnoRuntime.queryInterface( XModel.class, maChartDocument )).unlockControllers();
}
// ____________________
@@ -158,7 +158,7 @@ public class ChartInDraw
throws RuntimeException, UnknownPropertyException, PropertyVetoException,
com.sun.star.lang.IllegalArgumentException, WrappedTargetException
{
- XPropertySet aWall = ((X3DDisplay) UnoRuntime.queryInterface(
+ XPropertySet aWall = (UnoRuntime.queryInterface(
X3DDisplay.class, maDiagram )).getWall();
// change background color of area
@@ -173,12 +173,12 @@ public class ChartInDraw
com.sun.star.lang.IllegalArgumentException, WrappedTargetException
{
// change main title
- XPropertySet aDocProp = (XPropertySet) UnoRuntime.queryInterface(
+ XPropertySet aDocProp = UnoRuntime.queryInterface(
XPropertySet.class, maChartDocument );
aDocProp.setPropertyValue( "HasMainTitle", new Boolean( true ));
XShape aTitle = maChartDocument.getTitle();
- XPropertySet aTitleProp = (XPropertySet) UnoRuntime.queryInterface( XPropertySet.class, aTitle );
+ XPropertySet aTitleProp = UnoRuntime.queryInterface( XPropertySet.class, aTitle );
// set new text
if( aTitleProp != null )
@@ -194,7 +194,7 @@ public class ChartInDraw
com.sun.star.lang.IllegalArgumentException, WrappedTargetException
{
XShape aLegend = maChartDocument.getLegend();
- XPropertySet aLegendProp = (XPropertySet) UnoRuntime.queryInterface( XPropertySet.class, aLegend );
+ XPropertySet aLegendProp = UnoRuntime.queryInterface( XPropertySet.class, aLegend );
aLegendProp.setPropertyValue( "Alignment", ChartLegendPosition.LEFT );
aLegendProp.setPropertyValue( "FillStyle", FillStyle.SOLID );
@@ -208,7 +208,7 @@ public class ChartInDraw
com.sun.star.lang.IllegalArgumentException, WrappedTargetException,
com.sun.star.lang.IndexOutOfBoundsException
{
- XPropertySet aDiaProp = (XPropertySet) UnoRuntime.queryInterface( XPropertySet.class, maDiagram );
+ XPropertySet aDiaProp = UnoRuntime.queryInterface( XPropertySet.class, maDiagram );
Boolean aTrue = new Boolean( true );
aDiaProp.setPropertyValue( "Dim3D", aTrue );
@@ -217,7 +217,7 @@ public class ChartInDraw
aDiaProp.setPropertyValue( "SolidType", new Integer( ChartSolidType.CYLINDER ));
// change floor color to Magenta6
- XPropertySet aFloor = ((X3DDisplay) UnoRuntime.queryInterface(
+ XPropertySet aFloor = (UnoRuntime.queryInterface(
X3DDisplay.class, maDiagram )).getFloor();
aFloor.setPropertyValue( "FillColor", new Integer( 0x6b2394 ));
diff --git a/main/odk/examples/DevelopersGuide/Charts/ChartInWriter.java b/main/odk/examples/DevelopersGuide/Charts/ChartInWriter.java
index 2ae62d2fdf..fba45ed30f 100644
--- a/main/odk/examples/DevelopersGuide/Charts/ChartInWriter.java
+++ b/main/odk/examples/DevelopersGuide/Charts/ChartInWriter.java
@@ -79,7 +79,7 @@ public class ChartInWriter
Helper aHelper = new Helper( args );
ChartHelper aChartHelper = new ChartHelper(
- (XModel) UnoRuntime.queryInterface( XModel.class,
+ UnoRuntime.queryInterface( XModel.class,
aHelper.createTextDocument()));
// the unit for measures is 1/100th of a millimeter
@@ -132,7 +132,7 @@ public class ChartInWriter
public void lockControllers()
throws RuntimeException
{
- ((XModel) UnoRuntime.queryInterface( XModel.class, maChartDocument )).lockControllers();
+ (UnoRuntime.queryInterface( XModel.class, maChartDocument )).lockControllers();
}
// ____________________
@@ -140,7 +140,7 @@ public class ChartInWriter
public void unlockControllers()
throws RuntimeException
{
- ((XModel) UnoRuntime.queryInterface( XModel.class, maChartDocument )).unlockControllers();
+ (UnoRuntime.queryInterface( XModel.class, maChartDocument )).unlockControllers();
}
// ____________________
@@ -149,7 +149,7 @@ public class ChartInWriter
throws RuntimeException, UnknownPropertyException, PropertyVetoException,
com.sun.star.lang.IllegalArgumentException, WrappedTargetException
{
- XPropertySet aWall = ((X3DDisplay) UnoRuntime.queryInterface(
+ XPropertySet aWall = (UnoRuntime.queryInterface(
X3DDisplay.class, maDiagram )).getWall();
// change background color of area
diff --git a/main/odk/examples/DevelopersGuide/Charts/Helper.java b/main/odk/examples/DevelopersGuide/Charts/Helper.java
index e8e8283bf2..a4854b9043 100644
--- a/main/odk/examples/DevelopersGuide/Charts/Helper.java
+++ b/main/odk/examples/DevelopersGuide/Charts/Helper.java
@@ -88,7 +88,7 @@ public class Helper
public XSpreadsheetDocument createSpreadsheetDocument()
{
- return (XSpreadsheetDocument) UnoRuntime.queryInterface(
+ return UnoRuntime.queryInterface(
XSpreadsheetDocument.class, createDocument( "scalc" ));
}
@@ -120,12 +120,12 @@ public class Helper
XModel aResult = null;
try
{
- XComponentLoader aLoader = (XComponentLoader)
+ XComponentLoader aLoader =
UnoRuntime.queryInterface(XComponentLoader.class,
maMCFactory.createInstanceWithContext("com.sun.star.frame.Desktop",
maContext) );
- aResult = (XModel) UnoRuntime.queryInterface(
+ aResult = UnoRuntime.queryInterface(
XModel.class,
aLoader.loadComponentFromURL( "private:factory/" + sDocType,
"_blank",
diff --git a/main/odk/examples/DevelopersGuide/Charts/JavaSampleChartAddIn.java b/main/odk/examples/DevelopersGuide/Charts/JavaSampleChartAddIn.java
index 1fb7606547..cc441188d1 100644
--- a/main/odk/examples/DevelopersGuide/Charts/JavaSampleChartAddIn.java
+++ b/main/odk/examples/DevelopersGuide/Charts/JavaSampleChartAddIn.java
@@ -75,10 +75,10 @@ public class JavaSampleChartAddIn extends WeakBase implements
{
if( aArguments.length > 0 )
{
- maChartDocument = (XChartDocument) UnoRuntime.queryInterface(
+ maChartDocument = UnoRuntime.queryInterface(
XChartDocument.class, aArguments[ 0 ]);
- XPropertySet aDocProp = (XPropertySet) UnoRuntime.queryInterface(
+ XPropertySet aDocProp = UnoRuntime.queryInterface(
XPropertySet.class, maChartDocument );
if( aDocProp != null )
{
@@ -87,14 +87,14 @@ public class JavaSampleChartAddIn extends WeakBase implements
}
// get the draw page
- XDrawPageSupplier aPageSupp = (XDrawPageSupplier) UnoRuntime.queryInterface(
+ XDrawPageSupplier aPageSupp = UnoRuntime.queryInterface(
XDrawPageSupplier.class, maChartDocument );
if( aPageSupp != null )
- maDrawPage = (XDrawPage) UnoRuntime.queryInterface(
+ maDrawPage = UnoRuntime.queryInterface(
XDrawPage.class, aPageSupp.getDrawPage() );
// get a factory for creating shapes
- maShapeFactory = (XMultiServiceFactory) UnoRuntime.queryInterface(
+ maShapeFactory = UnoRuntime.queryInterface(
XMultiServiceFactory.class, maChartDocument );
}
}
@@ -107,13 +107,13 @@ public class JavaSampleChartAddIn extends WeakBase implements
maTopLine == null )
{
// try to recycle loaded shapes
- XPropertySet aDocProp = (XPropertySet) UnoRuntime.queryInterface(
+ XPropertySet aDocProp = UnoRuntime.queryInterface(
XPropertySet.class, maChartDocument );
if( aDocProp != null )
{
try
{
- XIndexAccess aShapesIA = (XIndexAccess) UnoRuntime.queryInterface(
+ XIndexAccess aShapesIA = UnoRuntime.queryInterface(
XIndexAccess.class, aDocProp.getPropertyValue( "AdditionalShapes" ));
if( aShapesIA != null &&
aShapesIA.getCount() > 0 )
@@ -122,11 +122,11 @@ public class JavaSampleChartAddIn extends WeakBase implements
String aName;
for( int i = aShapesIA.getCount() - 1; i >= 0; --i )
{
- aShape = (XShape) UnoRuntime.queryInterface(
+ aShape = UnoRuntime.queryInterface(
XShape.class, aShapesIA.getByIndex( i ));
if( aShape != null )
{
- XPropertySet aProp = (XPropertySet) UnoRuntime.queryInterface(
+ XPropertySet aProp = UnoRuntime.queryInterface(
XPropertySet.class, aShape );
aName = (String) aProp.getPropertyValue( "Name" );
@@ -154,12 +154,12 @@ public class JavaSampleChartAddIn extends WeakBase implements
{
if( maTopLine == null )
{
- maTopLine = (XShape) UnoRuntime.queryInterface(
+ maTopLine = UnoRuntime.queryInterface(
XShape.class, maShapeFactory.createInstance( "com.sun.star.drawing.LineShape" ));
maDrawPage.add( maTopLine );
// make line red and thicker
- XPropertySet aShapeProp = (XPropertySet) UnoRuntime.queryInterface(
+ XPropertySet aShapeProp = UnoRuntime.queryInterface(
XPropertySet.class, maTopLine );
aShapeProp.setPropertyValue( "LineColor", new Integer( 0xe01010 ));
@@ -177,12 +177,12 @@ public class JavaSampleChartAddIn extends WeakBase implements
{
if( maBottomLine == null )
{
- maBottomLine = (XShape) UnoRuntime.queryInterface(
+ maBottomLine = UnoRuntime.queryInterface(
XShape.class, maShapeFactory.createInstance( "com.sun.star.drawing.LineShape" ));
maDrawPage.add( maBottomLine );
// make line green and thicker
- XPropertySet aShapeProp = (XPropertySet) UnoRuntime.queryInterface(
+ XPropertySet aShapeProp = UnoRuntime.queryInterface(
XPropertySet.class, maBottomLine );
aShapeProp.setPropertyValue( "LineColor", new Integer( 0x10e010 ));
@@ -206,17 +206,17 @@ public class JavaSampleChartAddIn extends WeakBase implements
// --------------
// get data
- XChartDataArray aDataArray = (XChartDataArray) UnoRuntime.queryInterface(
+ XChartDataArray aDataArray = UnoRuntime.queryInterface(
XChartDataArray.class, maChartDocument.getData());
double aData[][] = aDataArray.getData();
// get axes
XDiagram aDiagram = maChartDocument.getDiagram();
- XShape aXAxis = (XShape) UnoRuntime.queryInterface(
- XShape.class, ((XAxisXSupplier) UnoRuntime.queryInterface(
+ XShape aXAxis = UnoRuntime.queryInterface(
+ XShape.class, (UnoRuntime.queryInterface(
XAxisXSupplier.class, aDiagram )).getXAxis() );
- XShape aYAxis = (XShape) UnoRuntime.queryInterface(
- XShape.class, ((XAxisYSupplier) UnoRuntime.queryInterface(
+ XShape aYAxis = UnoRuntime.queryInterface(
+ XShape.class, (UnoRuntime.queryInterface(
XAxisYSupplier.class, aDiagram )).getYAxis() );
// calculate points for hull
@@ -248,11 +248,11 @@ public class JavaSampleChartAddIn extends WeakBase implements
// apply point sequences to lines
try
{
- XPropertySet aShapeProp = (XPropertySet) UnoRuntime.queryInterface(
+ XPropertySet aShapeProp = UnoRuntime.queryInterface(
XPropertySet.class, maTopLine );
aShapeProp.setPropertyValue( "PolyPolygon", aMaxPtSeq );
- aShapeProp = (XPropertySet) UnoRuntime.queryInterface(
+ aShapeProp = UnoRuntime.queryInterface(
XPropertySet.class, maBottomLine );
aShapeProp.setPropertyValue( "PolyPolygon", aMinPtSeq );
}
@@ -325,20 +325,20 @@ public class JavaSampleChartAddIn extends WeakBase implements
// XShape : XDiagram
public Size getSize() throws RuntimeException
{
- return ((XShape) UnoRuntime.queryInterface( XShape.class, maChartDocument.getDiagram())).getSize();
+ return (UnoRuntime.queryInterface( XShape.class, maChartDocument.getDiagram())).getSize();
}
public void setSize( Size aSize ) throws RuntimeException, PropertyVetoException
{
- ((XShape) UnoRuntime.queryInterface( XShape.class, maChartDocument.getDiagram())).setSize( aSize );
+ (UnoRuntime.queryInterface( XShape.class, maChartDocument.getDiagram())).setSize( aSize );
}
public Point getPosition() throws RuntimeException
{
- return ((XShape) UnoRuntime.queryInterface( XShape.class, maChartDocument.getDiagram())).getPosition();
+ return (UnoRuntime.queryInterface( XShape.class, maChartDocument.getDiagram())).getPosition();
}
public void setPosition( Point aPos ) throws RuntimeException
{
- ((XShape) UnoRuntime.queryInterface( XShape.class, maChartDocument.getDiagram())).setPosition( aPos );
+ (UnoRuntime.queryInterface( XShape.class, maChartDocument.getDiagram())).setPosition( aPos );
}
// XShapeDescriptor : XShape : XDiagram
@@ -365,7 +365,7 @@ public class JavaSampleChartAddIn extends WeakBase implements
if( aAxis != null )
{
- XPropertySet aAxisProp = (XPropertySet) UnoRuntime.queryInterface(
+ XPropertySet aAxisProp = UnoRuntime.queryInterface(
XPropertySet.class, aAxis );
try
diff --git a/main/odk/examples/DevelopersGuide/Charts/ListenAtCalcRangeInDraw.java b/main/odk/examples/DevelopersGuide/Charts/ListenAtCalcRangeInDraw.java
index d0c4ab110b..a04d0b15bf 100644
--- a/main/odk/examples/DevelopersGuide/Charts/ListenAtCalcRangeInDraw.java
+++ b/main/odk/examples/DevelopersGuide/Charts/ListenAtCalcRangeInDraw.java
@@ -103,7 +103,7 @@ public class ListenAtCalcRangeInDraw implements XChartDataChangeEventListener
"com.sun.star.chart.XYDiagram" );
// attach the data coming from the cell range to the chart
- maChartData = (XChartData) UnoRuntime.queryInterface( XChartData.class, aRange );
+ maChartData = UnoRuntime.queryInterface( XChartData.class, aRange );
maChartDocument.attachData( maChartData );
}
@@ -113,16 +113,16 @@ public class ListenAtCalcRangeInDraw implements XChartDataChangeEventListener
{
try
{
- ((XPropertySet) UnoRuntime.queryInterface(
+ (UnoRuntime.queryInterface(
XPropertySet.class, maChartDocument )).setPropertyValue(
"HasSubTitle", new Boolean( true ));
// start listening for death of spreadsheet
- ((XComponent) UnoRuntime.queryInterface(
+ (UnoRuntime.queryInterface(
XComponent.class, maSheetDoc )).addEventListener( this );
// start listening for death of chart
- ((XComponent) UnoRuntime.queryInterface(
+ (UnoRuntime.queryInterface(
XComponent.class, maChartDocument )).addEventListener( this );
//start listening for change of data
@@ -154,9 +154,9 @@ public class ListenAtCalcRangeInDraw implements XChartDataChangeEventListener
maChartData.removeChartDataChangeEventListener( this );
// remove dispose listeners
- ((XComponent) UnoRuntime.queryInterface(
+ (UnoRuntime.queryInterface(
XComponent.class, maSheetDoc )).removeEventListener( this );
- ((XComponent) UnoRuntime.queryInterface(
+ (UnoRuntime.queryInterface(
XComponent.class, maChartDocument )).removeEventListener( this );
System.exit( 0 );
@@ -172,11 +172,11 @@ public class ListenAtCalcRangeInDraw implements XChartDataChangeEventListener
try
{
- XPropertySet aDocProp = (XPropertySet) UnoRuntime.queryInterface(
+ XPropertySet aDocProp = UnoRuntime.queryInterface(
XPropertySet.class, maChartDocument );
aDocProp.setPropertyValue( "HasMainTitle", new Boolean( true ));
- ((XPropertySet) UnoRuntime.queryInterface(
+ (UnoRuntime.queryInterface(
XPropertySet.class, maChartDocument.getSubTitle())).setPropertyValue(
"String", aTitle );
diff --git a/main/odk/examples/DevelopersGuide/Charts/SelectionChangeListener.java b/main/odk/examples/DevelopersGuide/Charts/SelectionChangeListener.java
index cfefee0f14..6d83d0ac2c 100644
--- a/main/odk/examples/DevelopersGuide/Charts/SelectionChangeListener.java
+++ b/main/odk/examples/DevelopersGuide/Charts/SelectionChangeListener.java
@@ -75,7 +75,7 @@ public class SelectionChangeListener implements XSelectionChangeListener {
// insert a cell range with 4 columns and 12 rows filled with random numbers
XCellRange aRange = aCalcHelper.insertRandomRange( 4, 12 );
- CellRangeAddress aRangeAddress = ((XCellRangeAddressable) UnoRuntime.queryInterface(
+ CellRangeAddress aRangeAddress = (UnoRuntime.queryInterface(
XCellRangeAddressable.class, aRange)).getRangeAddress();
// change view to sheet containing the chart
@@ -105,9 +105,9 @@ public class SelectionChangeListener implements XSelectionChangeListener {
while( bTrying ) {
// start listening for selection changes
- XSelectionSupplier aSelSupp = (XSelectionSupplier) UnoRuntime.queryInterface(
+ XSelectionSupplier aSelSupp = UnoRuntime.queryInterface(
XSelectionSupplier.class,
- (((XModel) UnoRuntime.queryInterface(
+ ((UnoRuntime.queryInterface(
XModel.class, maChartDocument )).getCurrentController()) );
if( aSelSupp != null ) {
aSelSupp.addSelectionChangeListener( this );
@@ -116,7 +116,7 @@ public class SelectionChangeListener implements XSelectionChangeListener {
}
// start listening for death of Controller
- XComponent aComp = (XComponent) UnoRuntime.queryInterface( XComponent.class, aSelSupp );
+ XComponent aComp = UnoRuntime.queryInterface( XComponent.class, aSelSupp );
if( aComp != null ) {
aComp.addEventListener( this );
System.out.println( "Successfully attached as dispose listener" );
@@ -136,13 +136,13 @@ public class SelectionChangeListener implements XSelectionChangeListener {
System.out.println( "disposing called. detaching as listener" );
// stop listening for selection changes
- XSelectionSupplier aCtrl = (XSelectionSupplier) UnoRuntime.queryInterface(
+ XSelectionSupplier aCtrl = UnoRuntime.queryInterface(
XSelectionSupplier.class, aSourceObj );
if( aCtrl != null )
aCtrl.removeSelectionChangeListener( this );
// remove as dispose listener
- XComponent aComp = (XComponent) UnoRuntime.queryInterface( XComponent.class, aSourceObj );
+ XComponent aComp = UnoRuntime.queryInterface( XComponent.class, aSourceObj );
if( aComp != null )
aComp.removeEventListener( this );
@@ -154,7 +154,7 @@ public class SelectionChangeListener implements XSelectionChangeListener {
// XSelectionChangeListener
public void selectionChanged( EventObject aEvent ) {
- XController aCtrl = (XController) UnoRuntime.queryInterface( XController.class, aEvent.Source );
+ XController aCtrl = UnoRuntime.queryInterface( XController.class, aEvent.Source );
if( aCtrl != null ) {
XMultiComponentFactory mMCF = maContext.getServiceManager();
@@ -187,17 +187,17 @@ public class SelectionChangeListener implements XSelectionChangeListener {
Object oDesktop = mMCF.createInstanceWithContext("com.sun.star.frame.Desktop", maContext);
Object oToolKit = mMCF.createInstanceWithContext("com.sun.star.awt.Toolkit", maContext);
- aDesktop = (XDesktop) UnoRuntime.queryInterface(XDesktop.class, oDesktop);
- aToolKit = (XInterface) UnoRuntime.queryInterface(XInterface.class, oToolKit);
+ aDesktop = UnoRuntime.queryInterface(XDesktop.class, oDesktop);
+ aToolKit = UnoRuntime.queryInterface(XInterface.class, oToolKit);
} catch (Exception ex) {
ex.printStackTrace();
}
XWindow xWin = aDesktop.getCurrentFrame().getContainerWindow();
- XWindowPeer aWinPeer = (XWindowPeer) UnoRuntime.queryInterface(XWindowPeer.class, xWin);
+ XWindowPeer aWinPeer = UnoRuntime.queryInterface(XWindowPeer.class, xWin);
int button = com.sun.star.awt.MessageBoxButtons.BUTTONS_OK;
- XMessageBoxFactory aMBF = (XMessageBoxFactory) UnoRuntime.queryInterface(XMessageBoxFactory.class, aToolKit);
+ XMessageBoxFactory aMBF = UnoRuntime.queryInterface(XMessageBoxFactory.class, aToolKit);
XMessageBox xMB = aMBF.createMessageBox(aWinPeer, MessageBoxType.INFOBOX, button, "Event-Notify", "Listener was called, selection has changed");
xMB.execute();
}
diff --git a/main/odk/examples/DevelopersGuide/Components/Addons/JobsAddon/AsyncJob.java b/main/odk/examples/DevelopersGuide/Components/Addons/JobsAddon/AsyncJob.java
index ed47b26474..be04745052 100644
--- a/main/odk/examples/DevelopersGuide/Components/Addons/JobsAddon/AsyncJob.java
+++ b/main/odk/examples/DevelopersGuide/Components/Addons/JobsAddon/AsyncJob.java
@@ -253,7 +253,7 @@ public class AsyncJob extends WeakBase implements XServiceInfo, XAsyncJob
try
{
// get access to the office toolkit environment
- com.sun.star.awt.XToolkit xKit = (com.sun.star.awt.XToolkit)UnoRuntime.queryInterface(
+ com.sun.star.awt.XToolkit xKit = UnoRuntime.queryInterface(
com.sun.star.awt.XToolkit.class,
m_xCmpCtx.getServiceManager().createInstanceWithContext("com.sun.star.awt.Toolkit",
m_xCmpCtx));
@@ -267,13 +267,13 @@ public class AsyncJob extends WeakBase implements XServiceInfo, XAsyncJob
com.sun.star.awt.WindowAttribute.CLOSEABLE;
aDescriptor.Type = com.sun.star.awt.WindowClass.MODALTOP;
aDescriptor.ParentIndex = 1;
- aDescriptor.Parent = (com.sun.star.awt.XWindowPeer)UnoRuntime.queryInterface(
+ aDescriptor.Parent = UnoRuntime.queryInterface(
com.sun.star.awt.XWindowPeer.class,
xParent);
// create the info box window
com.sun.star.awt.XWindowPeer xPeer = xKit.createWindow(aDescriptor);
- com.sun.star.awt.XMessageBox xInfoBox = (com.sun.star.awt.XMessageBox)UnoRuntime.queryInterface(
+ com.sun.star.awt.XMessageBox xInfoBox = UnoRuntime.queryInterface(
com.sun.star.awt.XMessageBox.class,
xPeer);
if (xInfoBox == null)
diff --git a/main/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_java/ProtocolHandlerAddon.java b/main/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_java/ProtocolHandlerAddon.java
index 65d89ab8a4..06f70a6519 100644
--- a/main/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_java/ProtocolHandlerAddon.java
+++ b/main/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_java/ProtocolHandlerAddon.java
@@ -93,12 +93,12 @@ public class ProtocolHandlerAddon {
if ( object.length > 0 )
{
- m_xFrame = ( XFrame ) UnoRuntime.queryInterface(
+ m_xFrame = UnoRuntime.queryInterface(
XFrame.class, object[ 0 ] );
}
// Create the toolkit to have access to it later
- m_xToolkit = (XToolkit) UnoRuntime.queryInterface(
+ m_xToolkit = UnoRuntime.queryInterface(
XToolkit.class,
m_xCmpCtx.getServiceManager().createInstanceWithContext("com.sun.star.awt.Toolkit",
m_xCmpCtx));
@@ -204,7 +204,7 @@ public class ProtocolHandlerAddon {
aDescriptor.Type = WindowClass.MODALTOP;
aDescriptor.WindowServiceName = new String( "infobox" );
aDescriptor.ParentIndex = -1;
- aDescriptor.Parent = (XWindowPeer)UnoRuntime.queryInterface(
+ aDescriptor.Parent = UnoRuntime.queryInterface(
XWindowPeer.class, m_xFrame.getContainerWindow());
aDescriptor.Bounds = new Rectangle(0,0,300,200);
aDescriptor.WindowAttributes = WindowAttribute.BORDER |
@@ -213,7 +213,7 @@ public class ProtocolHandlerAddon {
XWindowPeer xPeer = m_xToolkit.createWindow( aDescriptor );
if ( null != xPeer ) {
- XMessageBox xMsgBox = (XMessageBox)UnoRuntime.queryInterface(
+ XMessageBox xMsgBox = UnoRuntime.queryInterface(
XMessageBox.class, xPeer);
if ( null != xMsgBox )
{
diff --git a/main/odk/examples/DevelopersGuide/Components/JavaComponent/TestJavaComponent.java b/main/odk/examples/DevelopersGuide/Components/JavaComponent/TestJavaComponent.java
index 0979a94db3..1dfd00c48c 100644
--- a/main/odk/examples/DevelopersGuide/Components/JavaComponent/TestJavaComponent.java
+++ b/main/odk/examples/DevelopersGuide/Components/JavaComponent/TestJavaComponent.java
@@ -43,7 +43,7 @@ public class TestJavaComponent
XMultiComponentFactory serviceManager, Object singleFactory )
throws com.sun.star.uno.Exception
{
- XSet set = (XSet ) UnoRuntime.queryInterface( XSet.class, serviceManager );
+ XSet set = UnoRuntime.queryInterface( XSet.class, serviceManager );
set.insert( singleFactory );
}
@@ -51,7 +51,7 @@ public class TestJavaComponent
XMultiComponentFactory serviceManager, Object singleFactory )
throws com.sun.star.uno.Exception
{
- XSet set = (XSet ) UnoRuntime.queryInterface( XSet.class, serviceManager );
+ XSet set = UnoRuntime.queryInterface( XSet.class, serviceManager );
set.remove( singleFactory );
}
diff --git a/main/odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java b/main/odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java
index 45874bbf04..18c5caf312 100644
--- a/main/odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java
+++ b/main/odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java
@@ -75,7 +75,7 @@ public class DialogComponent {
try {
// Create the toolkit to have access to it later
- m_xToolkit = (XToolkit) UnoRuntime.queryInterface(
+ m_xToolkit = UnoRuntime.queryInterface(
XToolkit.class,
m_xCmpCtx.getServiceManager().createInstanceWithContext("com.sun.star.awt.Toolkit",
m_xCmpCtx));
@@ -106,7 +106,7 @@ public class DialogComponent {
"com.sun.star.awt.DialogProvider2", m_xCmpCtx );
}
- XDialogProvider2 xDialogProvider = (XDialogProvider2)
+ XDialogProvider2 xDialogProvider =
UnoRuntime.queryInterface( XDialogProvider2.class, obj );
XDialog xDialog = xDialogProvider.createDialogWithHandler( DialogURL, this );
@@ -120,13 +120,13 @@ public class DialogComponent {
}
public void copyText( XDialog xDialog, Object aEventObject ) {
- XControlContainer xControlContainer = (XControlContainer)UnoRuntime.queryInterface(
+ XControlContainer xControlContainer = UnoRuntime.queryInterface(
XControlContainer.class, xDialog );
String aTextPropertyStr = "Text";
String aText = "";
XControl xTextField1Control = xControlContainer.getControl( "TextField1" );
XControlModel xControlModel1 = xTextField1Control.getModel();
- XPropertySet xPropertySet1 = (XPropertySet)UnoRuntime.queryInterface(
+ XPropertySet xPropertySet1 = UnoRuntime.queryInterface(
XPropertySet.class, xControlModel1 );
try
{
@@ -138,7 +138,7 @@ public class DialogComponent {
XControl xTextField2Control = xControlContainer.getControl( "TextField2" );
XControlModel xControlModel2 = xTextField2Control.getModel();
- XPropertySet xPropertySet2 = (XPropertySet)UnoRuntime.queryInterface(
+ XPropertySet xPropertySet2 = UnoRuntime.queryInterface(
XPropertySet.class, xControlModel2 );
try
{
@@ -251,7 +251,7 @@ public class DialogComponent {
aDescriptor.Type = WindowClass.MODALTOP;
aDescriptor.WindowServiceName = new String( "infobox" );
aDescriptor.ParentIndex = -1;
- aDescriptor.Parent = (XWindowPeer)UnoRuntime.queryInterface(
+ aDescriptor.Parent = UnoRuntime.queryInterface(
XWindowPeer.class, m_xFrame.getContainerWindow());
aDescriptor.Bounds = new Rectangle(0,0,300,200);
aDescriptor.WindowAttributes = WindowAttribute.BORDER |
@@ -260,7 +260,7 @@ public class DialogComponent {
XWindowPeer xPeer = m_xToolkit.createWindow( aDescriptor );
if ( null != xPeer ) {
- XMessageBox xMsgBox = (XMessageBox)UnoRuntime.queryInterface(
+ XMessageBox xMsgBox = UnoRuntime.queryInterface(
XMessageBox.class, xPeer);
if ( null != xMsgBox )
{
diff --git a/main/odk/examples/DevelopersGuide/Config/ConfigExamples.java b/main/odk/examples/DevelopersGuide/Config/ConfigExamples.java
index aacad47857..82e6ef6f42 100644
--- a/main/odk/examples/DevelopersGuide/Config/ConfigExamples.java
+++ b/main/odk/examples/DevelopersGuide/Config/ConfigExamples.java
@@ -174,7 +174,7 @@ public class ConfigExamples
{
// check the provider implementation
XServiceInfo xProviderServices =
- (XServiceInfo) UnoRuntime.queryInterface( XServiceInfo.class, xProvider );
+ UnoRuntime.queryInterface( XServiceInfo.class, xProvider );
if (xProviderServices == null ||
!xProviderServices.supportsService("com.sun.star.configuration.ConfigurationProvider"))
@@ -212,7 +212,7 @@ public class ConfigExamples
final String sProviderService = "com.sun.star.configuration.ConfigurationProvider";
// create the provider and return it as a XMultiServiceFactory
- XMultiServiceFactory xProvider = (XMultiServiceFactory)
+ XMultiServiceFactory xProvider =
UnoRuntime.queryInterface(XMultiServiceFactory.class,
mxServiceManager.createInstanceWithContext(sProviderService,
mxContext));
@@ -384,7 +384,7 @@ public class ConfigExamples
// accessing a single nested value
XHierarchicalPropertySet xProperties =
- (XHierarchicalPropertySet)UnoRuntime.queryInterface(XHierarchicalPropertySet.class, xViewRoot);
+ UnoRuntime.queryInterface(XHierarchicalPropertySet.class, xViewRoot);
Object aVisible = xProperties.getHierarchicalPropertyValue("Option/VisibleGrid");
options.visible = ((Boolean) aVisible).booleanValue();
@@ -393,7 +393,7 @@ public class ConfigExamples
Object xSubdivision = xProperties.getHierarchicalPropertyValue("Subdivision");
XMultiPropertySet xSubdivProperties =
- (XMultiPropertySet)UnoRuntime.queryInterface(XMultiPropertySet.class, xSubdivision);
+ UnoRuntime.queryInterface(XMultiPropertySet.class, xSubdivision);
// variables for multi-element access
String[] aElementNames = new String[2];
@@ -410,7 +410,7 @@ public class ConfigExamples
Object xResolution = xProperties.getHierarchicalPropertyValue("Resolution");
XMultiHierarchicalPropertySet xResolutionProperties =
- (XMultiHierarchicalPropertySet)
+
UnoRuntime.queryInterface(XMultiHierarchicalPropertySet.class, xResolution);
aElementNames[0] = "XAxis/Metric";
@@ -424,7 +424,7 @@ public class ConfigExamples
// all options have been retrieved - clean up and return
// we are done with the view - dispose it
- ((XComponent)UnoRuntime.queryInterface(XComponent.class, xViewRoot)).dispose();
+ (UnoRuntime.queryInterface(XComponent.class, xViewRoot)).dispose();
return options;
}
@@ -445,7 +445,7 @@ public class ConfigExamples
{
// First process this as an element (preorder traversal)
XHierarchicalName xElementPath =
- (XHierarchicalName) UnoRuntime.queryInterface(XHierarchicalName.class, xElement);
+ UnoRuntime.queryInterface(XHierarchicalName.class, xElement);
String sPath = xElementPath.getHierarchicalName();
@@ -453,7 +453,7 @@ public class ConfigExamples
// now process this as a container
XNameAccess xChildAccess =
- (XNameAccess) UnoRuntime.queryInterface(XNameAccess.class, xElement);
+ UnoRuntime.queryInterface(XNameAccess.class, xElement);
// get a list of child elements
String[] aElementNames = xChildAccess.getElementNames();
@@ -467,7 +467,7 @@ public class ConfigExamples
if ( aAnyConv.isObject(aChild) && !aAnyConv.isArray(aChild) )
{
// then get an interface
- XInterface xChildElement = (XInterface)UnoRuntime.queryInterface(XInterface.class, aChild);
+ XInterface xChildElement = UnoRuntime.queryInterface(XInterface.class, aChild);
// and continue processing child elements recursively
browseElementRecursively( xChildElement, aProcessor );
@@ -505,7 +505,7 @@ public class ConfigExamples
// This assumes that the processor
// does not keep a reference to the elements in processStructuralElement
- ((XComponent) UnoRuntime.queryInterface(XComponent.class,xViewRoot)).dispose();
+ (UnoRuntime.queryInterface(XComponent.class,xViewRoot)).dispose();
xViewRoot = null;
}
@@ -544,11 +544,11 @@ public class ConfigExamples
public void processStructuralElement( String sPath_, XInterface xElement_) {
// get template information, to detect instances of the 'Filter' template
XTemplateInstance xInstance =
- ( XTemplateInstance )UnoRuntime.queryInterface( XTemplateInstance .class,xElement_);
+ UnoRuntime.queryInterface( XTemplateInstance .class,xElement_);
// only select the Filter entries
if (xInstance != null && xInstance.getTemplateName().endsWith("Filter")) {
- XNamed xNamed = (XNamed)UnoRuntime.queryInterface(XNamed.class,xElement_);
+ XNamed xNamed = UnoRuntime.queryInterface(XNamed.class,xElement_);
System.out.println("Filter " + xNamed.getName() + " (" + sPath_ + ")");
}
}
@@ -574,7 +574,7 @@ public class ConfigExamples
// set up the initial values and register listeners
// get a data access interface, to supply the view with a model
XMultiHierarchicalPropertySet xProperties =
- (XMultiHierarchicalPropertySet)
+
UnoRuntime.queryInterface(XMultiHierarchicalPropertySet.class, xViewRoot);
dialog.setModel( xProperties );
@@ -584,7 +584,7 @@ public class ConfigExamples
XChangesListener xListener = dialog.createChangesListener( );
XChangesNotifier xNotifier =
- (XChangesNotifier)UnoRuntime.queryInterface(XChangesNotifier.class, xViewRoot);
+ UnoRuntime.queryInterface(XChangesNotifier.class, xViewRoot);
xNotifier.addChangesListener( xListener );
@@ -595,7 +595,7 @@ public class ConfigExamples
{
// changes have been applied to the view here
XChangesBatch xUpdateControl =
- (XChangesBatch) UnoRuntime.queryInterface(XChangesBatch.class,xViewRoot);
+ UnoRuntime.queryInterface(XChangesBatch.class,xViewRoot);
try
{
@@ -612,7 +612,7 @@ public class ConfigExamples
xNotifier.removeChangesListener( xListener );
// we are done with the view - dispose it
- ((XComponent)UnoRuntime.queryInterface(XComponent.class, xViewRoot)).dispose();
+ (UnoRuntime.queryInterface(XComponent.class, xViewRoot)).dispose();
}
/** A class that changes some grid options settings
@@ -716,7 +716,7 @@ public class ConfigExamples
try
{
XHierarchicalPropertySet xHPS =
- (XHierarchicalPropertySet)UnoRuntime.queryInterface(XHierarchicalPropertySet.class, mxModel);
+ UnoRuntime.queryInterface(XHierarchicalPropertySet.class, mxModel);
final String sSetting = "Option/VisibleGrid";
@@ -744,7 +744,7 @@ public class ConfigExamples
{
Object xOtherViewRoot = createUpdatableView(xKey);
- XNameReplace aReplace = (XNameReplace)UnoRuntime.queryInterface(XNameReplace.class, xOtherViewRoot);
+ XNameReplace aReplace = UnoRuntime.queryInterface(XNameReplace.class, xOtherViewRoot);
String aItemNames [] = aReplace.getElementNames();
for (int i=0; i < aItemNames.length; ++i) {
@@ -773,12 +773,12 @@ public class ConfigExamples
// commit the changes
XChangesBatch xUpdateControl =
- (XChangesBatch) UnoRuntime.queryInterface(XChangesBatch.class,xOtherViewRoot);
+ UnoRuntime.queryInterface(XChangesBatch.class,xOtherViewRoot);
xUpdateControl.commitChanges();
// we are done with the view - dispose it
- ((XComponent)UnoRuntime.queryInterface(XComponent.class, xOtherViewRoot)).dispose();
+ (UnoRuntime.queryInterface(XComponent.class, xOtherViewRoot)).dispose();
}
catch (Exception e)
{
@@ -800,13 +800,13 @@ public class ConfigExamples
// resetting a single nested value
XHierarchicalNameAccess xHierarchicalAccess =
- (XHierarchicalNameAccess)UnoRuntime.queryInterface(XHierarchicalNameAccess.class, xViewRoot);
+ UnoRuntime.queryInterface(XHierarchicalNameAccess.class, xViewRoot);
// get using absolute name
Object xOptions = xHierarchicalAccess.getByHierarchicalName(cGridOptionsPath + "/Option");
XPropertyState xOptionState =
- (XPropertyState)UnoRuntime.queryInterface(XPropertyState.class, xOptions);
+ UnoRuntime.queryInterface(XPropertyState.class, xOptions);
xOptionState.setPropertyToDefault("VisibleGrid");
@@ -815,9 +815,9 @@ public class ConfigExamples
Object xResolutionY = xHierarchicalAccess.getByHierarchicalName("Resolution/YAxis");
XPropertyState xResolutionStateX =
- (XPropertyState)UnoRuntime.queryInterface(XPropertyState.class, xResolutionX);
+ UnoRuntime.queryInterface(XPropertyState.class, xResolutionX);
XPropertyState xResolutionStateY =
- (XPropertyState)UnoRuntime.queryInterface(XPropertyState.class, xResolutionY);
+ UnoRuntime.queryInterface(XPropertyState.class, xResolutionY);
xResolutionStateX.setPropertyToDefault("Metric");
xResolutionStateY.setPropertyToDefault("Metric");
@@ -826,18 +826,18 @@ public class ConfigExamples
Object xSubdivision = xHierarchicalAccess.getByHierarchicalName("Subdivision");
XMultiPropertyStates xSubdivisionStates =
- (XMultiPropertyStates)UnoRuntime.queryInterface(XMultiPropertyStates.class, xSubdivision);
+ UnoRuntime.queryInterface(XMultiPropertyStates.class, xSubdivision);
xSubdivisionStates.setAllPropertiesToDefault();
// commit the changes
XChangesBatch xUpdateControl =
- (XChangesBatch) UnoRuntime.queryInterface(XChangesBatch.class,xViewRoot);
+ UnoRuntime.queryInterface(XChangesBatch.class,xViewRoot);
xUpdateControl.commitChanges();
// we are done with the view - dispose it
- ((XComponent)UnoRuntime.queryInterface(XComponent.class, xViewRoot)).dispose();
+ (UnoRuntime.queryInterface(XComponent.class, xViewRoot)).dispose();
}
@@ -895,7 +895,7 @@ public class ConfigExamples
// set the values
XPropertySet xDataSourceProperties =
- (XPropertySet)UnoRuntime.queryInterface(XPropertySet.class, xDataSource);
+ UnoRuntime.queryInterface(XPropertySet.class, xDataSource);
xDataSourceProperties.setPropertyValue("URL", sDataSourceURL );
xDataSourceProperties.setPropertyValue("User", sUser );
@@ -918,12 +918,12 @@ public class ConfigExamples
// commit the changes
XChangesBatch xUpdateControl =
- (XChangesBatch) UnoRuntime.queryInterface(XChangesBatch.class,xViewRoot);
+ UnoRuntime.queryInterface(XChangesBatch.class,xViewRoot);
xUpdateControl.commitChanges();
// now clean up
- ((XComponent) UnoRuntime.queryInterface(XComponent.class, xViewRoot)).dispose();
+ (UnoRuntime.queryInterface(XComponent.class, xViewRoot)).dispose();
}
/** This method gets the DataSourceDescription for a data source.
@@ -951,7 +951,7 @@ public class ConfigExamples
xProvider.createInstanceWithArguments(cUpdatableView, aArguments);
XNameAccess xSetOfDataSources =
- (XNameAccess) UnoRuntime.queryInterface(XNameAccess.class,xViewRoot);
+ UnoRuntime.queryInterface(XNameAccess.class,xViewRoot);
Object xDataSourceDescriptor = null; // the result
if ( xSetOfDataSources .hasByName( sDataSourceName ))
@@ -960,7 +960,7 @@ public class ConfigExamples
try
{
// the view should point to the element directly, so we need to extend the path
- XHierarchicalName xComposePath = (XHierarchicalName)
+ XHierarchicalName xComposePath =
UnoRuntime.queryInterface(XHierarchicalName.class, xSetOfDataSources );
String sElementPath = xComposePath.composeHierarchicalName( sDataSourceName );
@@ -979,7 +979,7 @@ public class ConfigExamples
if ( xDataSourceDescriptor != null) // all went fine
{
// dispose the other view
- ((XComponent)UnoRuntime.queryInterface(XComponent.class, xViewRoot)).dispose();
+ (UnoRuntime.queryInterface(XComponent.class, xViewRoot)).dispose();
xViewRoot = null;
}
}
@@ -996,11 +996,11 @@ public class ConfigExamples
{
// get the container
XNameContainer xSetUpdate =
- (XNameContainer)UnoRuntime.queryInterface(XNameContainer.class, xViewRoot);
+ UnoRuntime.queryInterface(XNameContainer.class, xViewRoot);
// create a new detached set element (instance of DataSourceDescription)
XSingleServiceFactory xElementFactory =
- (XSingleServiceFactory)UnoRuntime.queryInterface(XSingleServiceFactory.class, xSetUpdate);
+ UnoRuntime.queryInterface(XSingleServiceFactory.class, xSetUpdate);
// the new element is the result !
xDataSourceDescriptor = xElementFactory.createInstance();
@@ -1021,16 +1021,16 @@ public class ConfigExamples
// get the settings set as a container
XNameContainer xSettingsContainer =
- (XNameContainer) UnoRuntime.queryInterface( XNameContainer.class, xSettingsSet);
+ UnoRuntime.queryInterface( XNameContainer.class, xSettingsSet);
// and get a factory interface for creating the entries
XSingleServiceFactory xSettingsFactory =
- (XSingleServiceFactory) UnoRuntime.queryInterface(XSingleServiceFactory.class, xSettingsSet);
+ UnoRuntime.queryInterface(XSingleServiceFactory.class, xSettingsSet);
// now insert the individual settings
for (int i = 0; i < aSettings.length; ++i) {
// create a DataSourceSetting object
- XPropertySet xSetting = (XPropertySet)
+ XPropertySet xSetting =
UnoRuntime.queryInterface( XPropertySet.class, xSettingsFactory.createInstance() );
// can set the value before inserting
@@ -1056,7 +1056,7 @@ public class ConfigExamples
do
{
XChild xParentAccess =
- (XChild) UnoRuntime.queryInterface(XChild.class,xResult);
+ UnoRuntime.queryInterface(XChild.class,xResult);
if (xParentAccess != null)
xParent = xParentAccess.getParent();
@@ -1077,10 +1077,10 @@ public class ConfigExamples
void renameSetItem(XNamed xNamedItem, String sNewName)
throws com.sun.star.uno.Exception
{
- XChild xChildItem = (XChild)
+ XChild xChildItem =
UnoRuntime.queryInterface(XChild.class, xNamedItem);
- XNameContainer xParentSet = (XNameContainer)
+ XNameContainer xParentSet =
UnoRuntime.queryInterface( XNameContainer.class, xChildItem.getParent() );
String sOldName = xNamedItem.getName();
@@ -1094,10 +1094,10 @@ public class ConfigExamples
void moveSetItem(XChild xChildItem, XNameContainer xNewParent)
throws com.sun.star.uno.Exception
{
- XNamed xNamedItem = (XNamed)
+ XNamed xNamedItem =
UnoRuntime.queryInterface(XNamed.class, xChildItem);
- XNameContainer xOldParent = (XNameContainer)
+ XNameContainer xOldParent =
UnoRuntime.queryInterface( XNameContainer.class, xChildItem.getParent() );
String sItemName = xNamedItem.getName();
diff --git a/main/odk/examples/DevelopersGuide/Database/CodeSamples.java b/main/odk/examples/DevelopersGuide/Database/CodeSamples.java
index 732b40ace8..dd7ffbbfb8 100644
--- a/main/odk/examples/DevelopersGuide/Database/CodeSamples.java
+++ b/main/odk/examples/DevelopersGuide/Database/CodeSamples.java
@@ -114,7 +114,7 @@ public class CodeSamples
{
System.out.println("Connection was created!");
// now we dispose the connection to close it
- XComponent xComponent = (XComponent)UnoRuntime.queryInterface(XComponent.class,con);
+ XComponent xComponent = UnoRuntime.queryInterface(XComponent.class,con);
if(xComponent != null)
{
// connections must be disposed
@@ -136,7 +136,7 @@ public class CodeSamples
xContext);
// query for the interface
com.sun.star.sdbc.XDriverManager xDriverManager;
- xDriverManager = (XDriverManager)UnoRuntime.queryInterface(XDriverManager.class,driverManager);
+ xDriverManager = UnoRuntime.queryInterface(XDriverManager.class,driverManager);
if(xDriverManager != null)
{
// first create the needed url
@@ -164,7 +164,7 @@ public class CodeSamples
xContext);
// query for the interface
com.sun.star.sdbc.XDriver xDriver;
- xDriver = (XDriver)UnoRuntime.queryInterface(XDriver.class,aDriver);
+ xDriver = UnoRuntime.queryInterface(XDriver.class,aDriver);
if(xDriver != null)
{
// first create the needed url
@@ -186,7 +186,7 @@ public class CodeSamples
public static void printDataSources() throws com.sun.star.uno.Exception
{
// create a DatabaseContext and print all DataSource names
- XNameAccess xNameAccess = (XNameAccess)UnoRuntime.queryInterface(
+ XNameAccess xNameAccess = UnoRuntime.queryInterface(
XNameAccess.class,
xMCF.createInstanceWithContext("com.sun.star.sdb.DatabaseContext",
xContext));
@@ -200,7 +200,7 @@ public class CodeSamples
{
XDatabaseMetaData dm = con.getMetaData();
XResultSet rsTables = dm.getTables(null,"%","SALES",null);
- XRow rowTB = (XRow)UnoRuntime.queryInterface(XRow.class, rsTables);
+ XRow rowTB = UnoRuntime.queryInterface(XRow.class, rsTables);
while ( rsTables.next() )
{
String catalog = rowTB.getString( 1 );
@@ -216,7 +216,7 @@ public class CodeSamples
System.out.println("Catalog: " + catalog + " Schema: " + schema + " Table: " + table + " Type: " + type);
System.out.println("------------------ Columns ------------------");
XResultSet rsColumns = dm.getColumns(catalog,schema,table,"%");
- XRow rowCL = (XRow)UnoRuntime.queryInterface(XRow.class, rsColumns);
+ XRow rowCL = UnoRuntime.queryInterface(XRow.class, rsColumns);
while ( rsColumns.next() )
{
System.out.println("Column: " + rowCL.getString( 4 ) + " Type: " + rowCL.getInt( 5 ) + " TypeName: " + rowCL.getString( 6 ) );
@@ -259,25 +259,25 @@ public class CodeSamples
// creates a new query definition
public static void createQuerydefinition() throws com.sun.star.uno.Exception
{
- XNameAccess xNameAccess = (XNameAccess)UnoRuntime.queryInterface(
+ XNameAccess xNameAccess = UnoRuntime.queryInterface(
XNameAccess.class,
xMCF.createInstanceWithContext("com.sun.star.sdb.DatabaseContext",
xContext));
// we use the first datasource
- XQueryDefinitionsSupplier xQuerySup = (XQueryDefinitionsSupplier)
+ XQueryDefinitionsSupplier xQuerySup =
UnoRuntime.queryInterface(XQueryDefinitionsSupplier.class,
xNameAccess.getByName( "Bibliography" ));
XNameAccess xQDefs = xQuerySup.getQueryDefinitions();
// create new query definition
- XSingleServiceFactory xSingleFac = (XSingleServiceFactory)
+ XSingleServiceFactory xSingleFac =
UnoRuntime.queryInterface(XSingleServiceFactory.class, xQDefs);
- XPropertySet xProp = (XPropertySet) UnoRuntime.queryInterface(
+ XPropertySet xProp = UnoRuntime.queryInterface(
XPropertySet.class,xSingleFac.createInstance());
xProp.setPropertyValue("Command","SELECT * FROM biblio");
xProp.setPropertyValue("EscapeProcessing",new Boolean(true));
- XNameContainer xCont = (XNameContainer) UnoRuntime.queryInterface(XNameContainer.class, xQDefs);
+ XNameContainer xCont = UnoRuntime.queryInterface(XNameContainer.class, xQDefs);
try
{
if ( xCont.hasByName("Query1") )
@@ -286,29 +286,29 @@ public class CodeSamples
catch(com.sun.star.uno.Exception e)
{}
xCont.insertByName("Query1",xProp);
- XDocumentDataSource xDs = (XDocumentDataSource)UnoRuntime.queryInterface(XDocumentDataSource.class, xQuerySup);
+ XDocumentDataSource xDs = UnoRuntime.queryInterface(XDocumentDataSource.class, xQuerySup);
- XStorable xStore = (XStorable)UnoRuntime.queryInterface(XStorable.class,xDs.getDatabaseDocument());
+ XStorable xStore = UnoRuntime.queryInterface(XStorable.class,xDs.getDatabaseDocument());
xStore.store();
}
// prints all column names from Query1
public static void printQueryColumnNames() throws com.sun.star.uno.Exception
{
- XNameAccess xNameAccess = (XNameAccess)UnoRuntime.queryInterface(
+ XNameAccess xNameAccess = UnoRuntime.queryInterface(
XNameAccess.class,
xMCF.createInstanceWithContext("com.sun.star.sdb.DatabaseContext",
xContext));
// we use the first datasource
- XDataSource xDS = (XDataSource)UnoRuntime.queryInterface(
+ XDataSource xDS = UnoRuntime.queryInterface(
XDataSource.class, xNameAccess.getByName( "Bibliography" ));
XConnection con = xDS.getConnection("","");
- XQueriesSupplier xQuerySup = (XQueriesSupplier)
+ XQueriesSupplier xQuerySup =
UnoRuntime.queryInterface(XQueriesSupplier.class, con);
XNameAccess xQDefs = xQuerySup.getQueries();
- XColumnsSupplier xColsSup = (XColumnsSupplier) UnoRuntime.queryInterface(
+ XColumnsSupplier xColsSup = UnoRuntime.queryInterface(
XColumnsSupplier.class,xQDefs.getByName("Query1"));
XNameAccess xCols = xColsSup.getColumns();
String aNames [] = xCols.getElementNames();
diff --git a/main/odk/examples/DevelopersGuide/Database/OpenQuery.java b/main/odk/examples/DevelopersGuide/Database/OpenQuery.java
index fc0ef6492e..31a40b5b1b 100644
--- a/main/odk/examples/DevelopersGuide/Database/OpenQuery.java
+++ b/main/odk/examples/DevelopersGuide/Database/OpenQuery.java
@@ -81,11 +81,11 @@ public class OpenQuery {
Object rowSet = xMCF.createInstanceWithContext(
"com.sun.star.sdb.RowSet", xContext);
- com.sun.star.sdbc.XRowSet xRowSet = (com.sun.star.sdbc.XRowSet)
+ com.sun.star.sdbc.XRowSet xRowSet =
UnoRuntime.queryInterface(com.sun.star.sdbc.XRowSet.class, rowSet);
// set the properties needed to connect to a database
- XPropertySet xProp = (XPropertySet)UnoRuntime.queryInterface(XPropertySet.class, xRowSet);
+ XPropertySet xProp = UnoRuntime.queryInterface(XPropertySet.class, xRowSet);
// the DataSourceName can be a data source registered with [PRODUCTNAME], among other possibilities
xProp.setPropertyValue("DataSourceName","Bibliography");
@@ -104,10 +104,10 @@ public class OpenQuery {
// prepare the XRow and XColumnLocate interface for column access
// XRow gets column values
- com.sun.star.sdbc.XRow xRow = (com.sun.star.sdbc.XRow)UnoRuntime.queryInterface(
+ com.sun.star.sdbc.XRow xRow = UnoRuntime.queryInterface(
com.sun.star.sdbc.XRow.class, xRowSet);
// XColumnLocate finds columns by name
- com.sun.star.sdbc.XColumnLocate xLoc = (com.sun.star.sdbc.XColumnLocate)
+ com.sun.star.sdbc.XColumnLocate xLoc =
UnoRuntime.queryInterface(
com.sun.star.sdbc.XColumnLocate.class, xRowSet);
@@ -123,12 +123,12 @@ public class OpenQuery {
}
// XResultSetUpdate for insertRow handling
- com.sun.star.sdbc.XResultSetUpdate xResultSetUpdate = (com.sun.star.sdbc.XResultSetUpdate)
+ com.sun.star.sdbc.XResultSetUpdate xResultSetUpdate =
UnoRuntime.queryInterface(
com.sun.star.sdbc.XResultSetUpdate.class, xRowSet);
// XRowUpdate for row updates
- com.sun.star.sdbc.XRowUpdate xRowUpdate = (com.sun.star.sdbc.XRowUpdate)
+ com.sun.star.sdbc.XRowUpdate xRowUpdate =
UnoRuntime.queryInterface(
com.sun.star.sdbc.XRowUpdate.class, xRowSet);
@@ -143,7 +143,7 @@ public class OpenQuery {
xResultSetUpdate.insertRow();
// throw away the row set
- com.sun.star.lang.XComponent xComp = (com.sun.star.lang.XComponent)UnoRuntime.queryInterface(
+ com.sun.star.lang.XComponent xComp = UnoRuntime.queryInterface(
com.sun.star.lang.XComponent.class, xRowSet);
xComp.dispose();
}
diff --git a/main/odk/examples/DevelopersGuide/Database/RowSet.java b/main/odk/examples/DevelopersGuide/Database/RowSet.java
index f02c1ee89b..c43a6693c5 100644
--- a/main/odk/examples/DevelopersGuide/Database/RowSet.java
+++ b/main/odk/examples/DevelopersGuide/Database/RowSet.java
@@ -73,7 +73,7 @@ public class RowSet
public static void printDataSources() throws com.sun.star.uno.Exception
{
// create a DatabaseContext and print all DataSource names
- XNameAccess xNameAccess = (XNameAccess)UnoRuntime.queryInterface(
+ XNameAccess xNameAccess = UnoRuntime.queryInterface(
XNameAccess.class,
xMCF.createInstanceWithContext("com.sun.star.sdb.DatabaseContext",
xContext));
@@ -85,13 +85,13 @@ public class RowSet
public static void useRowSet() throws com.sun.star.uno.Exception
{
// first we create our RowSet object
- XRowSet xRowRes = (XRowSet)UnoRuntime.queryInterface(
+ XRowSet xRowRes = UnoRuntime.queryInterface(
XRowSet.class,
xMCF.createInstanceWithContext("com.sun.star.sdb.RowSet", xContext));
System.out.println("RowSet created!");
// set the properties needed to connect to a database
- XPropertySet xProp = (XPropertySet)UnoRuntime.queryInterface(XPropertySet.class,xRowRes);
+ XPropertySet xProp = UnoRuntime.queryInterface(XPropertySet.class,xRowRes);
xProp.setPropertyValue("DataSourceName","Bibliography");
xProp.setPropertyValue("Command","biblio");
xProp.setPropertyValue("CommandType",new Integer(com.sun.star.sdb.CommandType.TABLE));
@@ -100,7 +100,7 @@ public class RowSet
System.out.println("RowSet executed!");
- XComponent xComp = (XComponent)UnoRuntime.queryInterface(XComponent.class,xRowRes);
+ XComponent xComp = UnoRuntime.queryInterface(XComponent.class,xRowRes);
xComp.dispose();
System.out.println("RowSet destroyed!");
}
@@ -108,13 +108,13 @@ public class RowSet
public static void showRowSetPrivileges() throws com.sun.star.uno.Exception
{
// first we create our RowSet object
- XRowSet xRowRes = (XRowSet)UnoRuntime.queryInterface(
+ XRowSet xRowRes = UnoRuntime.queryInterface(
XRowSet.class,
xMCF.createInstanceWithContext("com.sun.star.sdb.RowSet", xContext));
System.out.println("RowSet created!");
// set the properties needed to connect to a database
- XPropertySet xProp = (XPropertySet)UnoRuntime.queryInterface(XPropertySet.class,xRowRes);
+ XPropertySet xProp = UnoRuntime.queryInterface(XPropertySet.class,xRowRes);
xProp.setPropertyValue("DataSourceName","Bibliography");
xProp.setPropertyValue("Command","biblio");
xProp.setPropertyValue("CommandType",new Integer(com.sun.star.sdb.CommandType.TABLE));
@@ -134,7 +134,7 @@ public class RowSet
System.out.println("DELETE");
// now destroy the RowSet
- XComponent xComp = (XComponent)UnoRuntime.queryInterface(XComponent.class,xRowRes);
+ XComponent xComp = UnoRuntime.queryInterface(XComponent.class,xRowRes);
xComp.dispose();
System.out.println("RowSet destroyed!");
}
@@ -142,13 +142,13 @@ public class RowSet
public static void showRowSetRowCount() throws com.sun.star.uno.Exception
{
// first we create our RowSet object
- XRowSet xRowRes = (XRowSet)UnoRuntime.queryInterface(
+ XRowSet xRowRes = UnoRuntime.queryInterface(
XRowSet.class,
xMCF.createInstanceWithContext("com.sun.star.sdb.RowSet", xContext));
System.out.println("RowSet created!");
// set the properties needed to connect to a database
- XPropertySet xProp = (XPropertySet)UnoRuntime.queryInterface(XPropertySet.class,xRowRes);
+ XPropertySet xProp = UnoRuntime.queryInterface(XPropertySet.class,xRowRes);
xProp.setPropertyValue("DataSourceName","Bibliography");
xProp.setPropertyValue("Command","biblio");
xProp.setPropertyValue("CommandType",new Integer(com.sun.star.sdb.CommandType.TABLE));
@@ -159,14 +159,14 @@ public class RowSet
// now look if the RowCount is already final
System.out.println("The RowCount is final: " + xProp.getPropertyValue("IsRowCountFinal"));
- XResultSet xRes = (XResultSet)UnoRuntime.queryInterface(XResultSet.class,xRowRes);
+ XResultSet xRes = UnoRuntime.queryInterface(XResultSet.class,xRowRes);
xRes.last();
System.out.println("The RowCount is final: " + xProp.getPropertyValue("IsRowCountFinal"));
System.out.println("There are " + xProp.getPropertyValue("RowCount") + " rows!");
// now destroy the RowSet
- XComponent xComp = (XComponent)UnoRuntime.queryInterface(XComponent.class,xRowRes);
+ XComponent xComp = UnoRuntime.queryInterface(XComponent.class,xRowRes);
xComp.dispose();
System.out.println("RowSet destroyed!");
}
@@ -174,7 +174,7 @@ public class RowSet
public static void showRowSetEvents() throws com.sun.star.uno.Exception
{
// first we create our RowSet object
- XRowSet xRowRes = (XRowSet)UnoRuntime.queryInterface(
+ XRowSet xRowRes = UnoRuntime.queryInterface(
XRowSet.class,
xMCF.createInstanceWithContext("com.sun.star.sdb.RowSet", xContext));
@@ -182,12 +182,12 @@ public class RowSet
// add our Listener
System.out.println("Append our Listener!");
RowSetEventListener pRow = new RowSetEventListener();
- XRowSetApproveBroadcaster xApBroad = (XRowSetApproveBroadcaster)UnoRuntime.queryInterface(XRowSetApproveBroadcaster.class,xRowRes);
+ XRowSetApproveBroadcaster xApBroad = UnoRuntime.queryInterface(XRowSetApproveBroadcaster.class,xRowRes);
xApBroad.addRowSetApproveListener(pRow);
xRowRes.addRowSetListener(pRow);
// set the properties needed to connect to a database
- XPropertySet xProp = (XPropertySet)UnoRuntime.queryInterface(XPropertySet.class,xRowRes);
+ XPropertySet xProp = UnoRuntime.queryInterface(XPropertySet.class,xRowRes);
xProp.setPropertyValue("DataSourceName","Bibliography");
xProp.setPropertyValue("Command","biblio");
xProp.setPropertyValue("CommandType",new Integer(com.sun.star.sdb.CommandType.TABLE));
@@ -196,7 +196,7 @@ public class RowSet
System.out.println("RowSet executed!");
// do some movements to check if we got all notifications
- XResultSet xRes = (XResultSet)UnoRuntime.queryInterface(XResultSet.class,xRowRes);
+ XResultSet xRes = UnoRuntime.queryInterface(XResultSet.class,xRowRes);
System.out.println("beforeFirst");
xRes.beforeFirst();
// this should lead to no notifications because
@@ -222,7 +222,7 @@ public class RowSet
System.out.println("We stand after the last row: " + xRes.isAfterLast());
// now destroy the RowSet
- XComponent xComp = (XComponent)UnoRuntime.queryInterface(XComponent.class,xRowRes);
+ XComponent xComp = UnoRuntime.queryInterface(XComponent.class,xRowRes);
xComp.dispose();
System.out.println("RowSet destroyed!");
}
diff --git a/main/odk/examples/DevelopersGuide/Database/Sales.java b/main/odk/examples/DevelopersGuide/Database/Sales.java
index a4a8ac88d1..7eb2a007e6 100644
--- a/main/odk/examples/DevelopersGuide/Database/Sales.java
+++ b/main/odk/examples/DevelopersGuide/Database/Sales.java
@@ -96,7 +96,7 @@ public class Sales
String query = "SELECT NAME, PRICE FROM SALES " +
"WHERE SALENR = 1";
XResultSet rs = stmt.executeQuery(query);
- XRow row = (XRow)UnoRuntime.queryInterface(XRow.class, rs);
+ XRow row = UnoRuntime.queryInterface(XRow.class, rs);
while (rs.next()) {
String s = row.getString(1);
float n = row.getFloat(2);
@@ -109,13 +109,13 @@ public class Sales
{
// example for a programmatic way to do updates. This doesn't work with adabas.
XStatement stmt = con.createStatement();
- XPropertySet xProp = (XPropertySet)UnoRuntime.queryInterface(XPropertySet.class,stmt);
+ XPropertySet xProp = UnoRuntime.queryInterface(XPropertySet.class,stmt);
xProp.setPropertyValue("ResultSetType", new java.lang.Integer(ResultSetType.SCROLL_INSENSITIVE));
xProp.setPropertyValue("ResultSetConcurrency", new java.lang.Integer(ResultSetConcurrency.UPDATABLE));
XResultSet srs = stmt.executeQuery("SELECT NAME, PRICE FROM SALES");
- XRow row = (XRow)UnoRuntime.queryInterface(XRow.class,srs);
+ XRow row = UnoRuntime.queryInterface(XRow.class,srs);
srs.afterLast();
while (srs.previous()) {
@@ -125,10 +125,10 @@ public class Sales
}
srs.last();
- XRowUpdate updateRow = (XRowUpdate)UnoRuntime.queryInterface(XRowUpdate.class,srs);
+ XRowUpdate updateRow = UnoRuntime.queryInterface(XRowUpdate.class,srs);
updateRow.updateFloat(2, (float)0.69);
- XResultSetUpdate updateRs = ( XResultSetUpdate )UnoRuntime.queryInterface(
+ XResultSetUpdate updateRs = UnoRuntime.queryInterface(
XResultSetUpdate.class,srs);
updateRs.updateRow(); // this call updates the data in DBMS
@@ -148,14 +148,14 @@ public class Sales
// "VALUES (4, 102, 5, 'FTOP Darjeeling tea', '2002-01-02',150)");
//
// stmt = con.createStatement();
- XPropertySet xProp = (XPropertySet)UnoRuntime.queryInterface(XPropertySet.class,stmt);
+ XPropertySet xProp = UnoRuntime.queryInterface(XPropertySet.class,stmt);
xProp.setPropertyValue("ResultSetType", new java.lang.Integer(ResultSetType.SCROLL_INSENSITIVE));
xProp.setPropertyValue("ResultSetConcurrency", new java.lang.Integer(ResultSetConcurrency.UPDATABLE));
XResultSet rs = stmt.executeQuery("SELECT * FROM SALES");
- XRow row = (XRow)UnoRuntime.queryInterface(XRow.class,rs);
+ XRow row = UnoRuntime.queryInterface(XRow.class,rs);
// insert a new row
- XRowUpdate updateRow = (XRowUpdate)UnoRuntime.queryInterface(XRowUpdate.class,rs);
+ XRowUpdate updateRow = UnoRuntime.queryInterface(XRowUpdate.class,rs);
XResultSetUpdate updateRs = ( XResultSetUpdate )UnoRuntime. queryInterface(XResultSetUpdate.class,rs);
updateRs.moveToInsertRow();
updateRow.updateInt(1, 4);
@@ -172,11 +172,11 @@ public class Sales
{
// example for a programmatic way to do updates. This doesn't work with adabas.
XStatement stmt = con.createStatement();
- XPropertySet xProp = (XPropertySet)UnoRuntime.queryInterface(XPropertySet.class,stmt);
+ XPropertySet xProp = UnoRuntime.queryInterface(XPropertySet.class,stmt);
xProp.setPropertyValue("ResultSetType", new java.lang.Integer(ResultSetType.SCROLL_INSENSITIVE));
xProp.setPropertyValue("ResultSetConcurrency", new java.lang.Integer(ResultSetConcurrency.UPDATABLE));
XResultSet rs = stmt.executeQuery("SELECT * FROM SALES");
- XRow row = (XRow)UnoRuntime.queryInterface(XRow.class,rs);
+ XRow row = UnoRuntime.queryInterface(XRow.class,rs);
XResultSetUpdate updateRs = ( XResultSetUpdate )UnoRuntime. queryInterface(XResultSetUpdate.class,rs);
// move to the inserted row
@@ -192,16 +192,16 @@ public class Sales
insertRow();
XStatement stmt = con.createStatement();
- XPropertySet xProp = (XPropertySet)UnoRuntime.queryInterface(XPropertySet.class,stmt);
+ XPropertySet xProp = UnoRuntime.queryInterface(XPropertySet.class,stmt);
xProp.setPropertyValue("ResultSetType", new java.lang.Integer(ResultSetType.SCROLL_INSENSITIVE));
xProp.setPropertyValue("ResultSetConcurrency", new java.lang.Integer(ResultSetConcurrency.READ_ONLY));
XResultSet rs = stmt.executeQuery("SELECT NAME, PRICE FROM SALES");
- XRow row = (XRow)UnoRuntime.queryInterface(XRow.class, rs);
+ XRow row = UnoRuntime.queryInterface(XRow.class, rs);
rs.absolute(4);
float price1 = row.getFloat(2);
// modify the 4 row
- XRowUpdate updateRow = (XRowUpdate)UnoRuntime.queryInterface(XRowUpdate.class,rs);
+ XRowUpdate updateRow = UnoRuntime.queryInterface(XRowUpdate.class,rs);
XResultSetUpdate updateRs = ( XResultSetUpdate )UnoRuntime. queryInterface(XResultSetUpdate.class,rs);
updateRow.updateFloat(2, 150);
updateRs.updateRow();
@@ -221,11 +221,11 @@ public class Sales
public void displayColumnNames() throws com.sun.star.uno.Exception
{
XStatement stmt = con.createStatement();
- XPropertySet xProp = (XPropertySet)UnoRuntime.queryInterface(XPropertySet.class,stmt);
+ XPropertySet xProp = UnoRuntime.queryInterface(XPropertySet.class,stmt);
xProp.setPropertyValue("ResultSetType", new java.lang.Integer(ResultSetType.SCROLL_INSENSITIVE));
xProp.setPropertyValue("ResultSetConcurrency", new java.lang.Integer(ResultSetConcurrency.READ_ONLY));
XResultSet rs = stmt.executeQuery("SELECT NAME, PRICE FROM SALES");
- XResultSetMetaDataSupplier xRsMetaSup = (XResultSetMetaDataSupplier)
+ XResultSetMetaDataSupplier xRsMetaSup =
UnoRuntime.queryInterface(XResultSetMetaDataSupplier.class,rs);
XResultSetMetaData xRsMetaData = xRsMetaSup.getMetaData();
int nColumnCount = xRsMetaData.getColumnCount();
diff --git a/main/odk/examples/DevelopersGuide/Database/SalesMan.java b/main/odk/examples/DevelopersGuide/Database/SalesMan.java
index ece01cfcb7..5e07530309 100644
--- a/main/odk/examples/DevelopersGuide/Database/SalesMan.java
+++ b/main/odk/examples/DevelopersGuide/Database/SalesMan.java
@@ -94,7 +94,7 @@ public class SalesMan
{
XPreparedStatement updateStreet = con.prepareStatement(
"UPDATE SALESMAN SET STREET = ? WHERE SNR = ?");
- XParameters setPara = (XParameters)UnoRuntime.queryInterface(XParameters.class,updateStreet);
+ XParameters setPara = UnoRuntime.queryInterface(XParameters.class,updateStreet);
setPara.setString(1, "34 Main Road");
setPara.setInt(2, 1);
updateStreet.executeUpdate();
@@ -122,7 +122,7 @@ public class SalesMan
{
XStatement stmt = con.createStatement();
XResultSet rs = stmt.executeQuery("SELECT FIRSTNAME, LASTNAME, BIRTHDATE FROM SALESMAN");
- XRow row = (XRow)UnoRuntime.queryInterface(XRow.class,rs);
+ XRow row = UnoRuntime.queryInterface(XRow.class,rs);
while ( rs != null && rs.next() ) {
String fn = row.getString( 1 );
String ln = row.getString( 2 );
diff --git a/main/odk/examples/DevelopersGuide/Database/sdbcx.java b/main/odk/examples/DevelopersGuide/Database/sdbcx.java
index 3b1382a34d..8a98d9d913 100644
--- a/main/odk/examples/DevelopersGuide/Database/sdbcx.java
+++ b/main/odk/examples/DevelopersGuide/Database/sdbcx.java
@@ -46,7 +46,7 @@ public class sdbcx
test.createConnection();
test.displayTableProperties();
// now we dispose the connection to close it
- XComponent xComponent = (XComponent)UnoRuntime.queryInterface(XComponent.class,con);
+ XComponent xComponent = UnoRuntime.queryInterface(XComponent.class,con);
if(xComponent != null)
{
xComponent.dispose();
@@ -70,12 +70,12 @@ public class sdbcx
// create a connector, so that it can contact the office
Object xUrlResolver = xLocalServiceManager.createInstance( "com.sun.star.bridge.UnoUrlResolver" );
- XUnoUrlResolver urlResolver = (XUnoUrlResolver)UnoRuntime.queryInterface(
+ XUnoUrlResolver urlResolver = UnoRuntime.queryInterface(
XUnoUrlResolver.class, xUrlResolver );
Object rInitialObject = urlResolver.resolve( "uno:" + connectStr + ";urp;StarOffice.NamingService" );
- XNamingService rName = (XNamingService)UnoRuntime.queryInterface(
+ XNamingService rName = UnoRuntime.queryInterface(
XNamingService.class, rInitialObject );
XMultiServiceFactory xMSF = null;
@@ -83,7 +83,7 @@ public class sdbcx
System.err.println( "got the remote naming service !" );
Object rXsmgr = rName.getRegisteredObject("StarOffice.ServiceManager" );
- xMSF = (XMultiServiceFactory)
+ xMSF =
UnoRuntime.queryInterface( XMultiServiceFactory.class, rXsmgr );
}
@@ -102,7 +102,7 @@ public class sdbcx
Object aDriver = xORB.createInstance("com.sun.star.comp.sdbcx.adabas.ODriver");
// query for the interface
com.sun.star.sdbc.XDriver xDriver;
- xDriver = (XDriver)UnoRuntime.queryInterface(XDriver.class,aDriver);
+ xDriver = UnoRuntime.queryInterface(XDriver.class,aDriver);
if(xDriver != null)
{
// first create the needed URL
@@ -120,7 +120,7 @@ public class sdbcx
{
System.out.println("Connection could be created!");
// we the XDatabaseDefinitionSupplier interface from the driver to get the XTablesSupplier
- XDataDefinitionSupplier xDDSup = (XDataDefinitionSupplier)UnoRuntime.queryInterface(
+ XDataDefinitionSupplier xDDSup = UnoRuntime.queryInterface(
XDataDefinitionSupplier.class,xDriver);
if(xDDSup != null)
{
@@ -150,7 +150,7 @@ public class sdbcx
if(0 != aTableNames.length)
{
Object table = xTables.getByName(aTableNames[0]);
- XPropertySet xProp = (XPropertySet)UnoRuntime.queryInterface(XPropertySet.class,table);
+ XPropertySet xProp = UnoRuntime.queryInterface(XPropertySet.class,table);
System.out.println("Name: " + xProp.getPropertyValue("Name"));
System.out.println("CatalogName: " + xProp.getPropertyValue("CatalogName"));
System.out.println("SchemaName: " + xProp.getPropertyValue("SchemaName"));
@@ -182,7 +182,7 @@ public class sdbcx
public static void printKeys(XColumnsSupplier xColumnsSup) throws com.sun.star.uno.Exception,SQLException
{
System.out.println("Example printKeys");
- XKeysSupplier xKeysSup = (XKeysSupplier)UnoRuntime.queryInterface(XKeysSupplier.class,xColumnsSup);
+ XKeysSupplier xKeysSup = UnoRuntime.queryInterface(XKeysSupplier.class,xColumnsSup);
if(xKeysSup != null)
{
System.out.println("--- Keys ---");
@@ -190,9 +190,9 @@ public class sdbcx
for ( int i =0; i < xKeys.getCount(); i++)
{
Object key = xKeys.getByIndex(i);
- XPropertySet xProp = (XPropertySet)UnoRuntime.queryInterface(XPropertySet.class,key);
+ XPropertySet xProp = UnoRuntime.queryInterface(XPropertySet.class,key);
System.out.println(" " + xProp.getPropertyValue("Name"));
- XColumnsSupplier xKeyColumnsSup = ( XColumnsSupplier ) UnoRuntime.queryInterface(XColumnsSupplier.class,xProp);
+ XColumnsSupplier xKeyColumnsSup = UnoRuntime.queryInterface(XColumnsSupplier.class,xProp);
printColumns(xKeyColumnsSup);
}
}
@@ -204,7 +204,7 @@ public class sdbcx
public static void printIndexes(XColumnsSupplier xColumnsSup) throws com.sun.star.uno.Exception,SQLException
{
System.out.println("Example printIndexes");
- XIndexesSupplier xIndexesSup = (XIndexesSupplier)UnoRuntime.queryInterface(XIndexesSupplier.class,xColumnsSup);
+ XIndexesSupplier xIndexesSup = UnoRuntime.queryInterface(XIndexesSupplier.class,xColumnsSup);
if(xIndexesSup != null)
{
System.out.println("--- Indexes ---");
@@ -214,7 +214,7 @@ public class sdbcx
{
System.out.println(" " + aIndexNames[i]);
Object index = xIndexs.getByName(aIndexNames[i]);
- XColumnsSupplier xIndexColumnsSup = (XColumnsSupplier)UnoRuntime.queryInterface(XColumnsSupplier.class,index);
+ XColumnsSupplier xIndexColumnsSup = UnoRuntime.queryInterface(XColumnsSupplier.class,index);
printColumns(xIndexColumnsSup);
}
}
@@ -227,7 +227,7 @@ public class sdbcx
public static void printColumnProperties(Object column) throws com.sun.star.uno.Exception,SQLException
{
System.out.println("Example printColumnProperties");
- XPropertySet xProp = (XPropertySet)UnoRuntime.queryInterface(XPropertySet.class,column);
+ XPropertySet xProp = UnoRuntime.queryInterface(XPropertySet.class,column);
System.out.println("Name: " + xProp.getPropertyValue("Name"));
System.out.println("Type: " + xProp.getPropertyValue("Type"));
System.out.println("TypeName: " + xProp.getPropertyValue("TypeName"));
@@ -252,7 +252,7 @@ public class sdbcx
public static void printIndexProperties(Object index) throws com.sun.star.uno.Exception,SQLException
{
System.out.println("Example printIndexProperties");
- XPropertySet xProp = (XPropertySet)UnoRuntime.queryInterface(XPropertySet.class,index);
+ XPropertySet xProp = UnoRuntime.queryInterface(XPropertySet.class,index);
System.out.println("Name: " + xProp.getPropertyValue("Name"));
System.out.println("Catalog: " + xProp.getPropertyValue("Catalog"));
System.out.println("IsUnique: " + xProp.getPropertyValue("IsUnique"));
@@ -267,7 +267,7 @@ public class sdbcx
public static void printKeyProperties(Object key) throws com.sun.star.uno.Exception,SQLException
{
System.out.println("Example printKeyProperties");
- XPropertySet xProp = (XPropertySet)UnoRuntime.queryInterface(XPropertySet.class,key);
+ XPropertySet xProp = UnoRuntime.queryInterface(XPropertySet.class,key);
System.out.println("Name: " + xProp.getPropertyValue("Name"));
System.out.println("Type: " + xProp.getPropertyValue("Type"));
System.out.println("ReferencedTable: " + xProp.getPropertyValue("ReferencedTable"));
@@ -282,7 +282,7 @@ public class sdbcx
public static void printGroups(XTablesSupplier xTabSup) throws com.sun.star.uno.Exception,SQLException
{
System.out.println("Example printGroups");
- XGroupsSupplier xGroupsSup = (XGroupsSupplier)UnoRuntime.queryInterface(XGroupsSupplier.class,xTabSup);
+ XGroupsSupplier xGroupsSup = UnoRuntime.queryInterface(XGroupsSupplier.class,xTabSup);
if(xGroupsSup != null)
{
// the table must be at least support a XColumnsSupplier interface
@@ -292,10 +292,10 @@ public class sdbcx
for ( int i =0; i < aGroupNames.length; i++)
{
System.out.println(" " + aGroupNames[i]);
- XUsersSupplier xUsersSup = (XUsersSupplier)UnoRuntime.queryInterface(XUsersSupplier.class,xGroups.getByName(aGroupNames[i]));
+ XUsersSupplier xUsersSup = UnoRuntime.queryInterface(XUsersSupplier.class,xGroups.getByName(aGroupNames[i]));
if(xUsersSup != null)
{
- XAuthorizable xAuth = (XAuthorizable)UnoRuntime.queryInterface(XAuthorizable.class,xUsersSup);
+ XAuthorizable xAuth = UnoRuntime.queryInterface(XAuthorizable.class,xUsersSup);
// the table must be at least support a XColumnsSupplier interface
System.out.println("\t--- Users ---");
XNameAccess xUsers = xUsersSup.getUsers();
@@ -316,7 +316,7 @@ public class sdbcx
public static void createTableSalesMen(XNameAccess xTables) throws com.sun.star.uno.Exception,SQLException
{
System.out.println("Example createTableSalesMen");
- XDataDescriptorFactory xTabFac = (XDataDescriptorFactory)UnoRuntime.queryInterface(XDataDescriptorFactory.class,xTables);
+ XDataDescriptorFactory xTabFac = UnoRuntime.queryInterface(XDataDescriptorFactory.class,xTables);
if(xTabFac != null)
{
// create the new table
@@ -324,9 +324,9 @@ public class sdbcx
// set the name of the new table
xTable.setPropertyValue("Name","SALESMAN");
// append the columns
- XColumnsSupplier xColumSup = (XColumnsSupplier)UnoRuntime.queryInterface(XColumnsSupplier.class,xTable);
- XDataDescriptorFactory xColFac = (XDataDescriptorFactory)UnoRuntime.queryInterface(XDataDescriptorFactory.class,xColumSup.getColumns());
- XAppend xAppend = (XAppend)UnoRuntime.queryInterface(XAppend.class,xColFac);
+ XColumnsSupplier xColumSup = UnoRuntime.queryInterface(XColumnsSupplier.class,xTable);
+ XDataDescriptorFactory xColFac = UnoRuntime.queryInterface(XDataDescriptorFactory.class,xColumSup.getColumns());
+ XAppend xAppend = UnoRuntime.queryInterface(XAppend.class,xColFac);
// we only need one descriptor
XPropertySet xCol = xColFac.createDataDescriptor();
// create first column and append
@@ -362,15 +362,15 @@ public class sdbcx
xCol.setPropertyValue("Precision",new Integer(10)); // default value integer
xAppend.appendByDescriptor(xCol);
// now we create the primary key
- XKeysSupplier xKeySup = (XKeysSupplier)UnoRuntime.queryInterface(XKeysSupplier.class,xTable);
- XDataDescriptorFactory xKeyFac = (XDataDescriptorFactory)UnoRuntime.queryInterface(XDataDescriptorFactory.class,xKeySup.getKeys());
- XAppend xKeyAppend = (XAppend)UnoRuntime.queryInterface(XAppend.class,xKeyFac);
+ XKeysSupplier xKeySup = UnoRuntime.queryInterface(XKeysSupplier.class,xTable);
+ XDataDescriptorFactory xKeyFac = UnoRuntime.queryInterface(XDataDescriptorFactory.class,xKeySup.getKeys());
+ XAppend xKeyAppend = UnoRuntime.queryInterface(XAppend.class,xKeyFac);
XPropertySet xKey = xKeyFac.createDataDescriptor();
xKey.setPropertyValue("Type",new Integer(KeyType.PRIMARY));
// now append the columns to key
- XColumnsSupplier xKeyColumSup = (XColumnsSupplier)UnoRuntime.queryInterface(XColumnsSupplier.class,xKey);
- XDataDescriptorFactory xKeyColFac = (XDataDescriptorFactory)UnoRuntime.queryInterface(XDataDescriptorFactory.class,xKeyColumSup.getColumns());
- XAppend xKeyColAppend = (XAppend)UnoRuntime.queryInterface(XAppend.class,xKeyColFac);
+ XColumnsSupplier xKeyColumSup = UnoRuntime.queryInterface(XColumnsSupplier.class,xKey);
+ XDataDescriptorFactory xKeyColFac = UnoRuntime.queryInterface(XDataDescriptorFactory.class,xKeyColumSup.getColumns());
+ XAppend xKeyColAppend = UnoRuntime.queryInterface(XAppend.class,xKeyColFac);
// we only need one descriptor
XPropertySet xKeyCol = xKeyColFac.createDataDescriptor();
xKeyCol.setPropertyValue("Name","SNR");
@@ -379,7 +379,7 @@ public class sdbcx
// append the key
xKeyAppend.appendByDescriptor(xKey);
// the last step is to append the new table to the tables collection
- XAppend xTableAppend = (XAppend)UnoRuntime.queryInterface(XAppend.class,xTabFac);
+ XAppend xTableAppend = UnoRuntime.queryInterface(XAppend.class,xTabFac);
xTableAppend.appendByDescriptor(xTable);
}
}
@@ -391,7 +391,7 @@ public class sdbcx
public static void createUser(XNameAccess xUsers) throws com.sun.star.uno.Exception,SQLException
{
System.out.println("Example createUser");
- XDataDescriptorFactory xUserFac = (XDataDescriptorFactory)UnoRuntime.queryInterface(XDataDescriptorFactory.class,xUsers);
+ XDataDescriptorFactory xUserFac = UnoRuntime.queryInterface(XDataDescriptorFactory.class,xUsers);
if(xUserFac != null)
{
// create the new table
@@ -399,7 +399,7 @@ public class sdbcx
// set the name of the new table
xUser.setPropertyValue("Name","BOSS");
xUser.setPropertyValue("Password","BOSSWIFENAME");
- XAppend xAppend = (XAppend)UnoRuntime.queryInterface(XAppend.class,xUserFac);
+ XAppend xAppend = UnoRuntime.queryInterface(XAppend.class,xUserFac);
xAppend.appendByDescriptor(xUser);
}
}
diff --git a/main/odk/examples/DevelopersGuide/Drawing/ChangeOrderDemo.java b/main/odk/examples/DevelopersGuide/Drawing/ChangeOrderDemo.java
index 773584ae6c..1e9466830a 100644
--- a/main/odk/examples/DevelopersGuide/Drawing/ChangeOrderDemo.java
+++ b/main/odk/examples/DevelopersGuide/Drawing/ChangeOrderDemo.java
@@ -68,7 +68,7 @@ public class ChangeOrderDemo
// create two rectangles
XDrawPage xPage = PageHelper.getDrawPageByIndex( xDrawDoc, 0 );
- XShapes xShapes = (XShapes)
+ XShapes xShapes =
UnoRuntime.queryInterface( XShapes.class, xPage );
XShape xShape1 = ShapeHelper.createShape( xDrawDoc,
@@ -84,9 +84,9 @@ public class ChangeOrderDemo
ShapeHelper.addPortion( xShape1, "by changing the ZOrder it lie now on top", true );
xShapes.add( xShape2 );
- XPropertySet xPropSet1 = (XPropertySet)
+ XPropertySet xPropSet1 =
UnoRuntime.queryInterface( XPropertySet.class, xShape1 );
- XPropertySet xPropSet2 = (XPropertySet)
+ XPropertySet xPropSet2 =
UnoRuntime.queryInterface( XPropertySet.class, xShape2 );
int nOrderOfShape1 = ((Integer)xPropSet1.getPropertyValue( "ZOrder" )).intValue();
diff --git a/main/odk/examples/DevelopersGuide/Drawing/ControlAndSelectDemo.java b/main/odk/examples/DevelopersGuide/Drawing/ControlAndSelectDemo.java
index 13e1fe3511..bf9c2bd4eb 100644
--- a/main/odk/examples/DevelopersGuide/Drawing/ControlAndSelectDemo.java
+++ b/main/odk/examples/DevelopersGuide/Drawing/ControlAndSelectDemo.java
@@ -78,46 +78,46 @@ public class ControlAndSelectDemo
"private:factory/sdraw", "_blank", 0, pPropValues );
XMultiServiceFactory xFactory =
- (XMultiServiceFactory )UnoRuntime.queryInterface(
+ UnoRuntime.queryInterface(
XMultiServiceFactory.class, xComponent );
XDrawPagesSupplier xDrawPagesSupplier =
- (XDrawPagesSupplier)UnoRuntime.queryInterface(
+ UnoRuntime.queryInterface(
XDrawPagesSupplier.class, xComponent );
XDrawPages xDrawPages = xDrawPagesSupplier.getDrawPages();
- XDrawPage xDrawPage = (XDrawPage)UnoRuntime.queryInterface(
+ XDrawPage xDrawPage = UnoRuntime.queryInterface(
XDrawPage.class, xDrawPages.getByIndex( 0 ));
- XShapes xShapes = (XShapes)UnoRuntime.queryInterface(XShapes.class,
+ XShapes xShapes = UnoRuntime.queryInterface(XShapes.class,
xDrawPage );
// create and insert the ControlShape
Object xObj = xFactory.createInstance(
"com.sun.star.drawing.ControlShape" );
- XShape xShape = (XShape)UnoRuntime.queryInterface( XShape.class, xObj );
+ XShape xShape = UnoRuntime.queryInterface( XShape.class, xObj );
xShape.setPosition( new Point( 1000, 1000 ) );
xShape.setSize( new Size( 2000, 2000 ) );
xShapes.add( xShape );
// create and set the control
- XControlModel xControlModel = (XControlModel)UnoRuntime.queryInterface(
+ XControlModel xControlModel = UnoRuntime.queryInterface(
XControlModel.class,
xFactory.createInstance( "com.sun.star.form.component.GroupBox" ) );
- XControlShape xControlShape = (XControlShape)UnoRuntime.queryInterface(
+ XControlShape xControlShape = UnoRuntime.queryInterface(
XControlShape.class, xShape );
xControlShape.setControl( xControlModel );
// the following code will demonstrate how to
// make a selection that contains our new created ControlShape
- XModel xModel = (XModel)UnoRuntime.queryInterface( XModel.class,
+ XModel xModel = UnoRuntime.queryInterface( XModel.class,
xComponent );
XController xController = xModel.getCurrentController();
- XSelectionSupplier xSelectionSupplier =(XSelectionSupplier)
+ XSelectionSupplier xSelectionSupplier =
UnoRuntime.queryInterface( XSelectionSupplier.class, xController );
// take care to use the global service factory only and not the one
// that is provided by the component if you create the ShapeCollection
- XShapes xSelection = (XShapes)UnoRuntime.queryInterface( XShapes.class,
+ XShapes xSelection = UnoRuntime.queryInterface( XShapes.class,
xOfficeContext.getServiceManager().createInstanceWithContext(
"com.sun.star.drawing.ShapeCollection", xOfficeContext ) );
xSelection.add( xShape );
diff --git a/main/odk/examples/DevelopersGuide/Drawing/CustomShowDemo.java b/main/odk/examples/DevelopersGuide/Drawing/CustomShowDemo.java
index 7108daee85..83ff9202d2 100644
--- a/main/odk/examples/DevelopersGuide/Drawing/CustomShowDemo.java
+++ b/main/odk/examples/DevelopersGuide/Drawing/CustomShowDemo.java
@@ -83,7 +83,7 @@ public class CustomShowDemo
"private:factory/simpress", "_blank", 0, pPropValues );
XDrawPagesSupplier xDrawPagesSupplier =
- (XDrawPagesSupplier)UnoRuntime.queryInterface(
+ UnoRuntime.queryInterface(
XDrawPagesSupplier.class, xDrawDoc );
XDrawPages xDrawPages = xDrawPagesSupplier.getDrawPages();
@@ -97,9 +97,9 @@ public class CustomShowDemo
int i;
for ( i = 0; i < 10; i++ )
{
- XDrawPage xDrawPage = (XDrawPage)UnoRuntime.queryInterface(
+ XDrawPage xDrawPage = UnoRuntime.queryInterface(
XDrawPage.class, xDrawPages.getByIndex( i ));
- XNamed xPageName = (XNamed)UnoRuntime.queryInterface(
+ XNamed xPageName = UnoRuntime.queryInterface(
XNamed.class, xDrawPage );
xPageName.setName( aNameArray[ i ] );
@@ -107,7 +107,7 @@ public class CustomShowDemo
XShape xTextObj = ShapeHelper.createShape( xDrawDoc, new Point( 10000, 9000 ),
new Size( 10000, 5000 ),
"com.sun.star.drawing.TextShape" );
- XShapes xShapes = (XShapes)
+ XShapes xShapes =
UnoRuntime.queryInterface( XShapes.class, xDrawPage );
xShapes.add( xTextObj );
ShapeHelper.addPortion( xTextObj, aNameArray[ i ], true );
@@ -115,13 +115,13 @@ public class CustomShowDemo
/* create two custom shows, one will play slide 6 to 10 and is named "ShortVersion"
the other one will play slide 2 til 10 and is named "LongVersion" */
- XCustomPresentationSupplier xCustPresSupplier = (XCustomPresentationSupplier)
+ XCustomPresentationSupplier xCustPresSupplier =
UnoRuntime.queryInterface( XCustomPresentationSupplier.class, xDrawDoc );
/* the following container is a container for further container
which concludes the list of pages that are to play within a custom show */
XNameContainer xNameContainer = xCustPresSupplier.getCustomPresentations();
- XSingleServiceFactory xFactory = (XSingleServiceFactory)
+ XSingleServiceFactory xFactory =
UnoRuntime.queryInterface( XSingleServiceFactory.class, xNameContainer );
Object xObj;
@@ -130,7 +130,7 @@ public class CustomShowDemo
/* instantiate an IndexContainer that will take
a list of draw pages for the first custom show */
xObj = xFactory.createInstance();
- xContainer = (XIndexContainer)UnoRuntime.queryInterface( XIndexContainer.class, xObj );
+ xContainer = UnoRuntime.queryInterface( XIndexContainer.class, xObj );
for ( i = 5; i < 10; i++ )
xContainer.insertByIndex( xContainer.getCount(), xDrawPages.getByIndex( i ) );
xNameContainer.insertByName( "ShortVersion", xContainer );
@@ -138,7 +138,7 @@ public class CustomShowDemo
/* instantiate an IndexContainer that will take
a list of draw page for the second custom show */
xObj = xFactory.createInstance();
- xContainer = (XIndexContainer)UnoRuntime.queryInterface( XIndexContainer.class, xObj );
+ xContainer = UnoRuntime.queryInterface( XIndexContainer.class, xObj );
for ( i = 1; i < 10; i++ )
xContainer.insertByIndex( xContainer.getCount(), xDrawPages.getByIndex( i ) );
xNameContainer.insertByName( "LongVersion", xContainer );
@@ -146,10 +146,10 @@ public class CustomShowDemo
/* which custom show is to use
can been set in the presentation settings */
- XPresentationSupplier xPresSupplier = (XPresentationSupplier)
+ XPresentationSupplier xPresSupplier =
UnoRuntime.queryInterface( XPresentationSupplier.class, xDrawDoc );
XPresentation xPresentation = xPresSupplier.getPresentation();
- XPropertySet xPresPropSet = (XPropertySet)
+ XPropertySet xPresPropSet =
UnoRuntime.queryInterface( XPropertySet.class, xPresentation );
xPresPropSet.setPropertyValue( "CustomShow", "ShortVersion" );
}
diff --git a/main/odk/examples/DevelopersGuide/Drawing/DrawViewDemo.java b/main/odk/examples/DevelopersGuide/Drawing/DrawViewDemo.java
index e608d98b63..728b222361 100644
--- a/main/odk/examples/DevelopersGuide/Drawing/DrawViewDemo.java
+++ b/main/odk/examples/DevelopersGuide/Drawing/DrawViewDemo.java
@@ -79,14 +79,14 @@ public class DrawViewDemo
sUrl.toString(), "_blank", 0,
pPropValues );
XModel xModel =
- (XModel)UnoRuntime.queryInterface(
+ UnoRuntime.queryInterface(
XModel.class, xComponent );
// print all available properties of first view
System.out.println("*** print all available properties of first view");
XViewDataSupplier xViewDataSupplier =
- (XViewDataSupplier)UnoRuntime.queryInterface(
+ UnoRuntime.queryInterface(
XViewDataSupplier.class, xModel );
XIndexAccess xIndexAccess = xViewDataSupplier.getViewData();
if ( xIndexAccess.getCount() != 0 )
@@ -107,7 +107,7 @@ public class DrawViewDemo
System.out.println("*** print all properties that are supported by the controller");
XController xController = xModel.getCurrentController();
XPropertySet xPropSet =
- (XPropertySet)UnoRuntime.queryInterface(
+ UnoRuntime.queryInterface(
XPropertySet.class, xController );
XPropertySetInfo xPropSetInfo = xPropSet.getPropertySetInfo();
Property[] aPropSeq = xPropSetInfo.getProperties();
diff --git a/main/odk/examples/DevelopersGuide/Drawing/DrawingDemo.java b/main/odk/examples/DevelopersGuide/Drawing/DrawingDemo.java
index 3faedff3d7..544a82a13a 100644
--- a/main/odk/examples/DevelopersGuide/Drawing/DrawingDemo.java
+++ b/main/odk/examples/DevelopersGuide/Drawing/DrawingDemo.java
@@ -157,7 +157,7 @@ public class DrawingDemo
PageHelper.getDrawPageCount( xDrawDoc ) - 1 );
// each drawpage is supporting an XNamed interface
- XNamed xNamed = (XNamed)UnoRuntime.queryInterface(
+ XNamed xNamed = UnoRuntime.queryInterface(
XNamed.class, xLastPage );
// beware, the page must have an unique name
@@ -240,7 +240,7 @@ public class DrawingDemo
int nRndObjPosY = aRndGen.nextInt( nHalfHeight - nRndObjHeight )
+ nHalfHeight;
- XShapes xShapes = (XShapes)
+ XShapes xShapes =
UnoRuntime.queryInterface( XShapes.class, pPages[ i ] );
ShapeHelper.createAndInsertShape( xDrawDoc, xShapes,
new Point( nRndObjPosX, nRndObjPosY ),
@@ -274,15 +274,15 @@ public class DrawingDemo
xDrawPage = PageHelper.getMasterPageByIndex( xDrawDoc, 0 );
else
xDrawPage = PageHelper.getDrawPageByIndex( xDrawDoc, 0 );
- XShapes xShapes = (XShapes)
+ XShapes xShapes =
UnoRuntime.queryInterface( XShapes.class, xDrawPage );
xShapes.add( xPolyPolygonBezier );
- XPropertySet xShapeProperties = (XPropertySet)
+ XPropertySet xShapeProperties =
UnoRuntime.queryInterface( XPropertySet.class, xPolyPolygonBezier );
// get pagesize
- XPropertySet xPageProperties = (XPropertySet)
+ XPropertySet xPageProperties =
UnoRuntime.queryInterface( XPropertySet.class, xDrawPage );
int nPageWidth = ((Integer)xPageProperties.getPropertyValue( "Width" )).intValue() / 2;
int nPageHeight = ((Integer)xPageProperties.getPropertyValue( "Height" )).intValue() / 2;
@@ -360,11 +360,11 @@ public class DrawingDemo
// before it is possible to insert shapes,
// the group must have been added to the page
XDrawPage xDrawPage = PageHelper.getDrawPageByIndex( xDrawDoc, 0 );
- XShapes xShapes = (XShapes)
+ XShapes xShapes =
UnoRuntime.queryInterface( XShapes.class, xDrawPage );
xShapes.add( xGroup );
- XShapes xShapesGroup = (XShapes)
+ XShapes xShapesGroup =
UnoRuntime.queryInterface( XShapes.class, xGroup );
Size aPageSize = PageHelper.getPageSize( xDrawPage );
@@ -399,10 +399,10 @@ public class DrawingDemo
try
{
XDrawPage xDrawPage = PageHelper.getDrawPageByIndex( xDrawDoc, 0 );
- XShapeGrouper xShapeGrouper = (XShapeGrouper)
+ XShapeGrouper xShapeGrouper =
UnoRuntime.queryInterface( XShapeGrouper.class, xDrawPage );
- XShapes xShapesPage = (XShapes)
+ XShapes xShapesPage =
UnoRuntime.queryInterface( XShapes.class, xDrawPage );
xShapeGrouper.group( xShapesPage );
diff --git a/main/odk/examples/DevelopersGuide/Drawing/FillAndLineStyleDemo.java b/main/odk/examples/DevelopersGuide/Drawing/FillAndLineStyleDemo.java
index e6660f4345..2d880c328b 100644
--- a/main/odk/examples/DevelopersGuide/Drawing/FillAndLineStyleDemo.java
+++ b/main/odk/examples/DevelopersGuide/Drawing/FillAndLineStyleDemo.java
@@ -75,11 +75,11 @@ public class FillAndLineStyleDemo
new Size( 15000, 12000 ),
"com.sun.star.drawing.RectangleShape" );
- XShapes xShapes = (XShapes)
+ XShapes xShapes =
UnoRuntime.queryInterface( XShapes.class, xPage );
xShapes.add( xRectangle );
- XPropertySet xPropSet = (XPropertySet)
+ XPropertySet xPropSet =
UnoRuntime.queryInterface( XPropertySet.class, xRectangle );
/* apply a gradient fill style that goes from top left to bottom
diff --git a/main/odk/examples/DevelopersGuide/Drawing/GluePointDemo.java b/main/odk/examples/DevelopersGuide/Drawing/GluePointDemo.java
index 4888cf6d5f..6ec529ee4a 100644
--- a/main/odk/examples/DevelopersGuide/Drawing/GluePointDemo.java
+++ b/main/odk/examples/DevelopersGuide/Drawing/GluePointDemo.java
@@ -75,7 +75,7 @@ public class GluePointDemo
XDrawPage xPage = PageHelper.getDrawPageByIndex( xDrawDoc, 0 );
- XShapes xShapes = (XShapes)
+ XShapes xShapes =
UnoRuntime.queryInterface( XShapes.class, xPage );
// create two rectangles
@@ -97,7 +97,7 @@ public class GluePointDemo
xShapes.add( xShape2 );
xShapes.add( xConnector );
- XPropertySet xConnectorPropSet = (XPropertySet)
+ XPropertySet xConnectorPropSet =
UnoRuntime.queryInterface( XPropertySet.class, xConnector );
// Index value of 0 : the shape is connected at the top
@@ -131,19 +131,19 @@ public class GluePointDemo
aGluePoint.Position.Y = 0;
// create and insert a glue point at shape1
- xGluePointsSupplier = (XGluePointsSupplier)
+ xGluePointsSupplier =
UnoRuntime.queryInterface( XGluePointsSupplier.class, xShape1 );
xIndexContainer = xGluePointsSupplier.getGluePoints();
- xIdentifierContainer = (XIdentifierContainer)
+ xIdentifierContainer =
UnoRuntime.queryInterface( XIdentifierContainer.class,
xIndexContainer );
int nIndexOfGluePoint1 = xIdentifierContainer.insert( aGluePoint );
// create and insert a glue point at shape2
- xGluePointsSupplier = (XGluePointsSupplier)
+ xGluePointsSupplier =
UnoRuntime.queryInterface( XGluePointsSupplier.class, xShape2 );
xIndexContainer = xGluePointsSupplier.getGluePoints();
- xIdentifierContainer = (XIdentifierContainer)
+ xIdentifierContainer =
UnoRuntime.queryInterface( XIdentifierContainer.class,
xIndexContainer );
int nIndexOfGluePoint2 = xIdentifierContainer.insert( aGluePoint );
@@ -155,7 +155,7 @@ public class GluePointDemo
"com.sun.star.drawing.ConnectorShape" );
xShapes.add( xConnector2 );
- XPropertySet xConnector2PropSet = (XPropertySet)
+ XPropertySet xConnector2PropSet =
UnoRuntime.queryInterface( XPropertySet.class, xConnector2 );
xConnector2PropSet.setPropertyValue( "StartShape", xShape1 );
diff --git a/main/odk/examples/DevelopersGuide/Drawing/GraphicExportDemo.java b/main/odk/examples/DevelopersGuide/Drawing/GraphicExportDemo.java
index e7930881cc..72b3087e8b 100644
--- a/main/odk/examples/DevelopersGuide/Drawing/GraphicExportDemo.java
+++ b/main/odk/examples/DevelopersGuide/Drawing/GraphicExportDemo.java
@@ -75,7 +75,7 @@ public class GraphicExportDemo
Object GraphicExportFilter =
xOfficeContext.getServiceManager().createInstanceWithContext(
"com.sun.star.drawing.GraphicExportFilter", xOfficeContext);
- XExporter xExporter = (XExporter)
+ XExporter xExporter =
UnoRuntime.queryInterface( XExporter.class, GraphicExportFilter );
PropertyValue aProps[] = new PropertyValue[2];
@@ -101,10 +101,10 @@ public class GraphicExportDemo
{
XDrawPage xPage = PageHelper.getDrawPageByIndex( xComponent,
nPageIndex );
- XComponent xComp = (XComponent)
+ XComponent xComp =
UnoRuntime.queryInterface( XComponent.class, xPage );
xExporter.setSourceDocument( xComp );
- XFilter xFilter = (XFilter)
+ XFilter xFilter =
UnoRuntime.queryInterface( XFilter.class, xExporter );
xFilter.filter( aProps );
System.out.println( "*** graphics on page \"" + nPageIndex
@@ -118,7 +118,7 @@ public class GraphicExportDemo
// close the document
- com.sun.star.util.XCloseable xCloseable = (com.sun.star.util.XCloseable)
+ com.sun.star.util.XCloseable xCloseable =
UnoRuntime.queryInterface(com.sun.star.util.XCloseable.class,
xComponent);
diff --git a/main/odk/examples/DevelopersGuide/Drawing/Helper.java b/main/odk/examples/DevelopersGuide/Drawing/Helper.java
index 416a945250..e1904eaa83 100644
--- a/main/odk/examples/DevelopersGuide/Drawing/Helper.java
+++ b/main/odk/examples/DevelopersGuide/Drawing/Helper.java
@@ -56,12 +56,12 @@ public class Helper
{
com.sun.star.lang.XComponent xComponent = null;
com.sun.star.frame.XComponentLoader aLoader =
- (com.sun.star.frame.XComponentLoader)UnoRuntime.queryInterface(
+ UnoRuntime.queryInterface(
com.sun.star.frame.XComponentLoader.class,
xOfficeContext.getServiceManager().createInstanceWithContext(
"com.sun.star.frame.Desktop", xOfficeContext));
- xComponent = (com.sun.star.lang.XComponent)UnoRuntime.queryInterface(
+ xComponent = UnoRuntime.queryInterface(
com.sun.star.lang.XComponent.class, aLoader.loadComponentFromURL(
sURL, sTargetFrame, nSearchFlags, aArgs ) );
diff --git a/main/odk/examples/DevelopersGuide/Drawing/LayerDemo.java b/main/odk/examples/DevelopersGuide/Drawing/LayerDemo.java
index f8ade5dc45..f17b54a307 100644
--- a/main/odk/examples/DevelopersGuide/Drawing/LayerDemo.java
+++ b/main/odk/examples/DevelopersGuide/Drawing/LayerDemo.java
@@ -75,7 +75,7 @@ public class LayerDemo
// create two rectangles
XDrawPage xPage = PageHelper.getDrawPageByIndex( xDrawDoc, 0 );
- XShapes xShapes = (XShapes)
+ XShapes xShapes =
UnoRuntime.queryInterface( XShapes.class, xPage );
XShape xRect1 = ShapeHelper.createShape( xDrawDoc,
@@ -101,11 +101,11 @@ public class LayerDemo
// query for the XLayerManager
XLayerSupplier xLayerSupplier = (XLayerSupplier)
- (XLayerSupplier)UnoRuntime.queryInterface(
+ UnoRuntime.queryInterface(
XLayerSupplier.class, xDrawDoc );
XNameAccess xNameAccess = xLayerSupplier.getLayerManager();
XLayerManager xLayerManager = (XLayerManager)
- (XLayerManager)UnoRuntime.queryInterface(
+ UnoRuntime.queryInterface(
XLayerManager.class, xNameAccess );
// create a layer and set its properties
@@ -114,7 +114,7 @@ public class LayerDemo
xLayerManager.getCount() );
xLayerPropSet = (XPropertySet)
- (XPropertySet)UnoRuntime.queryInterface(
+ UnoRuntime.queryInterface(
XPropertySet.class, xNotVisibleAndEditable );
xLayerPropSet.setPropertyValue( "Name", "NotVisibleAndEditable" );
xLayerPropSet.setPropertyValue( "IsVisible", new Boolean( false ) );
@@ -125,7 +125,7 @@ public class LayerDemo
xLayerManager.getCount() );
xLayerPropSet = (XPropertySet)
- (XPropertySet)UnoRuntime.queryInterface(
+ UnoRuntime.queryInterface(
XPropertySet.class, xNotEditable );
xLayerPropSet.setPropertyValue( "Name", "NotEditable" );
xLayerPropSet.setPropertyValue( "IsVisible", new Boolean( true ) );
diff --git a/main/odk/examples/DevelopersGuide/Drawing/ObjectTransformationDemo.java b/main/odk/examples/DevelopersGuide/Drawing/ObjectTransformationDemo.java
index 3e61a0ae7e..a9b3761ad3 100644
--- a/main/odk/examples/DevelopersGuide/Drawing/ObjectTransformationDemo.java
+++ b/main/odk/examples/DevelopersGuide/Drawing/ObjectTransformationDemo.java
@@ -68,10 +68,10 @@ public class ObjectTransformationDemo
"private:factory/simpress", "_blank", 0, pPropValues );
XDrawPage xPage = PageHelper.getDrawPageByIndex( xDrawDoc, 0 );
- XPropertySet xPagePropSet= (XPropertySet)
+ XPropertySet xPagePropSet=
UnoRuntime.queryInterface( XPropertySet.class, xPage );
- XShapes xShapes = (XShapes)
+ XShapes xShapes =
UnoRuntime.queryInterface( XShapes.class, xPage );
@@ -80,7 +80,7 @@ public class ObjectTransformationDemo
"com.sun.star.drawing.RectangleShape" );
xShapes.add( xShape );
- XPropertySet xPropSet = (XPropertySet)
+ XPropertySet xPropSet =
UnoRuntime.queryInterface( XPropertySet.class, xShape );
HomogenMatrix3 aHomogenMatrix3 = (HomogenMatrix3)
diff --git a/main/odk/examples/DevelopersGuide/Drawing/Organigram.java b/main/odk/examples/DevelopersGuide/Drawing/Organigram.java
index 8caa1b8408..a1af880074 100644
--- a/main/odk/examples/DevelopersGuide/Drawing/Organigram.java
+++ b/main/odk/examples/DevelopersGuide/Drawing/Organigram.java
@@ -79,7 +79,7 @@ public class Organigram {
Object desktop = xRemoteServiceManager.createInstanceWithContext(
"com.sun.star.frame.Desktop", xRemoteContext);
- XComponentLoader xComponentLoader = (XComponentLoader)
+ XComponentLoader xComponentLoader =
UnoRuntime.queryInterface(XComponentLoader.class, desktop);
PropertyValue[] loadProps = new PropertyValue[0];
@@ -88,21 +88,21 @@ public class Organigram {
// get draw page by index
com.sun.star.drawing.XDrawPagesSupplier xDrawPagesSupplier =
- (com.sun.star.drawing.XDrawPagesSupplier)UnoRuntime.queryInterface(
+ UnoRuntime.queryInterface(
com.sun.star.drawing.XDrawPagesSupplier.class, xDrawComponent );
com.sun.star.drawing.XDrawPages xDrawPages =
xDrawPagesSupplier.getDrawPages();
Object drawPage = xDrawPages.getByIndex(0);
- com.sun.star.drawing.XDrawPage xDrawPage = (com.sun.star.drawing.XDrawPage)
+ com.sun.star.drawing.XDrawPage xDrawPage =
UnoRuntime.queryInterface(com.sun.star.drawing.XDrawPage.class,
drawPage);
com.sun.star.lang.XMultiServiceFactory xDocumentFactory =
- (com.sun.star.lang.XMultiServiceFactory)UnoRuntime.queryInterface(
+ UnoRuntime.queryInterface(
com.sun.star.lang.XMultiServiceFactory.class, xDrawComponent);
com.sun.star.beans.XPropertySet xPageProps =
- (com.sun.star.beans.XPropertySet)UnoRuntime.queryInterface(
+ UnoRuntime.queryInterface(
com.sun.star.beans.XPropertySet.class, xDrawPage);
int pageWidth = AnyConverter.toInt(xPageProps.getPropertyValue("Width"));
@@ -141,14 +141,14 @@ public class Organigram {
(levelCount[level] - 1) * horSpace) / 2
+ i * shapeWidth + i * horSpace;
Object shape = xDocumentFactory.createInstance("com.sun.star.drawing.RectangleShape");
- com.sun.star.drawing.XShape xShape = (com.sun.star.drawing.XShape)
+ com.sun.star.drawing.XShape xShape =
UnoRuntime.queryInterface(
com.sun.star.drawing.XShape.class, shape);
xShape.setPosition(new com.sun.star.awt.Point(shapeX, levelY));
xShape.setSize(new com.sun.star.awt.Size(shapeWidth, shapeHeight));
xDrawPage.add(xShape);
- com.sun.star.text.XText xText = (com.sun.star.text.XText)
+ com.sun.star.text.XText xText =
UnoRuntime.queryInterface(
com.sun.star.text.XText.class, xShape);
@@ -161,10 +161,10 @@ public class Organigram {
if (level == 1) {
Object connector = xDocumentFactory.createInstance("com.sun.star.drawing.ConnectorShape");
com.sun.star.beans.XPropertySet xConnectorProps =
- (com.sun.star.beans.XPropertySet)UnoRuntime.queryInterface(
+ UnoRuntime.queryInterface(
com.sun.star.beans.XPropertySet.class, connector);
com.sun.star.drawing.XShape xConnector =
- (com.sun.star.drawing.XShape)UnoRuntime.queryInterface(
+ UnoRuntime.queryInterface(
com.sun.star.drawing.XShape.class, connector);
xDrawPage.add(xConnector);
xConnectorProps.setPropertyValue("StartShape", xStartShape);
diff --git a/main/odk/examples/DevelopersGuide/Drawing/PageHelper.java b/main/odk/examples/DevelopersGuide/Drawing/PageHelper.java
index 7df652e73a..0b777a9b78 100644
--- a/main/odk/examples/DevelopersGuide/Drawing/PageHelper.java
+++ b/main/odk/examples/DevelopersGuide/Drawing/PageHelper.java
@@ -52,7 +52,7 @@ public class PageHelper
static public int getDrawPageCount( XComponent xComponent )
{
XDrawPagesSupplier xDrawPagesSupplier =
- (XDrawPagesSupplier)UnoRuntime.queryInterface(
+ UnoRuntime.queryInterface(
XDrawPagesSupplier.class, xComponent );
XDrawPages xDrawPages = xDrawPagesSupplier.getDrawPages();
return xDrawPages.getCount();
@@ -65,10 +65,10 @@ public class PageHelper
com.sun.star.lang.WrappedTargetException
{
XDrawPagesSupplier xDrawPagesSupplier =
- (XDrawPagesSupplier)UnoRuntime.queryInterface(
+ UnoRuntime.queryInterface(
XDrawPagesSupplier.class, xComponent );
XDrawPages xDrawPages = xDrawPagesSupplier.getDrawPages();
- return (XDrawPage)UnoRuntime.queryInterface(XDrawPage.class, xDrawPages.getByIndex( nIndex ));
+ return UnoRuntime.queryInterface(XDrawPage.class, xDrawPages.getByIndex( nIndex ));
}
/** creates and inserts a draw page into the giving position,
@@ -78,7 +78,7 @@ public class PageHelper
throws Exception
{
XDrawPagesSupplier xDrawPagesSupplier =
- (XDrawPagesSupplier)UnoRuntime.queryInterface(
+ UnoRuntime.queryInterface(
XDrawPagesSupplier.class, xComponent );
XDrawPages xDrawPages = xDrawPagesSupplier.getDrawPages();
return xDrawPages.insertNewByIndex( nIndex );
@@ -89,7 +89,7 @@ public class PageHelper
static public void removeDrawPage( XComponent xComponent, XDrawPage xDrawPage )
{
XDrawPagesSupplier xDrawPagesSupplier =
- (XDrawPagesSupplier)UnoRuntime.queryInterface(
+ UnoRuntime.queryInterface(
XDrawPagesSupplier.class, xComponent );
XDrawPages xDrawPages = xDrawPagesSupplier.getDrawPages();
xDrawPages.remove( xDrawPage );
@@ -101,7 +101,7 @@ public class PageHelper
throws com.sun.star.beans.UnknownPropertyException,
com.sun.star.lang.WrappedTargetException
{
- XPropertySet xPageProperties = (XPropertySet)
+ XPropertySet xPageProperties =
UnoRuntime.queryInterface( XPropertySet.class, xDrawPage );
return new Size(
((Integer)xPageProperties.getPropertyValue( "Width" )).intValue(),
@@ -115,7 +115,7 @@ public class PageHelper
static public int getMasterPageCount( XComponent xComponent )
{
XMasterPagesSupplier xMasterPagesSupplier =
- (XMasterPagesSupplier)UnoRuntime.queryInterface(
+ UnoRuntime.queryInterface(
XMasterPagesSupplier.class, xComponent );
XDrawPages xDrawPages = xMasterPagesSupplier.getMasterPages();
return xDrawPages.getCount();
@@ -128,10 +128,10 @@ public class PageHelper
com.sun.star.lang.WrappedTargetException
{
XMasterPagesSupplier xMasterPagesSupplier =
- (XMasterPagesSupplier)UnoRuntime.queryInterface(
+ UnoRuntime.queryInterface(
XMasterPagesSupplier.class, xComponent );
XDrawPages xDrawPages = xMasterPagesSupplier.getMasterPages();
- return (XDrawPage)UnoRuntime.queryInterface(XDrawPage.class, xDrawPages.getByIndex( nIndex ));
+ return UnoRuntime.queryInterface(XDrawPage.class, xDrawPages.getByIndex( nIndex ));
}
/** creates and inserts a new master page into the giving position,
@@ -140,7 +140,7 @@ public class PageHelper
static public XDrawPage insertNewMasterPageByIndex( XComponent xComponent, int nIndex )
{
XMasterPagesSupplier xMasterPagesSupplier =
- (XMasterPagesSupplier)UnoRuntime.queryInterface(
+ UnoRuntime.queryInterface(
XMasterPagesSupplier.class, xComponent );
XDrawPages xDrawPages = xMasterPagesSupplier.getMasterPages();
return xDrawPages.insertNewByIndex( nIndex );
@@ -151,7 +151,7 @@ public class PageHelper
static public void removeMasterPage( XComponent xComponent, XDrawPage xDrawPage )
{
XMasterPagesSupplier xMasterPagesSupplier =
- (XMasterPagesSupplier)UnoRuntime.queryInterface(
+ UnoRuntime.queryInterface(
XMasterPagesSupplier.class, xComponent );
XDrawPages xDrawPages = xMasterPagesSupplier.getMasterPages();
xDrawPages.remove( xDrawPage );
@@ -162,7 +162,7 @@ public class PageHelper
static public XDrawPage getMasterPage( XDrawPage xDrawPage )
{
XMasterPageTarget xMasterPageTarget =
- (XMasterPageTarget)UnoRuntime.queryInterface(
+ UnoRuntime.queryInterface(
XMasterPageTarget.class, xDrawPage );
return xMasterPageTarget.getMasterPage();
}
@@ -172,7 +172,7 @@ public class PageHelper
static public void setMasterPage( XDrawPage xDrawPage, XDrawPage xMasterPage )
{
XMasterPageTarget xMasterPageTarget =
- (XMasterPageTarget)UnoRuntime.queryInterface(
+ UnoRuntime.queryInterface(
XMasterPageTarget.class, xDrawPage );
xMasterPageTarget.setMasterPage( xMasterPage );
}
@@ -185,7 +185,7 @@ public class PageHelper
*/
static public boolean isImpressDocument( XComponent xComponent )
{
- XServiceInfo xInfo = (XServiceInfo)UnoRuntime.queryInterface(
+ XServiceInfo xInfo = UnoRuntime.queryInterface(
XServiceInfo.class, xComponent );
return xInfo.supportsService( "com.sun.star.presentation.PresentationDocument" );
}
@@ -195,7 +195,7 @@ public class PageHelper
static public XDrawPage getNotesPage( XDrawPage xDrawPage )
{
XPresentationPage aPresentationPage =
- (XPresentationPage)UnoRuntime.queryInterface(
+ UnoRuntime.queryInterface(
XPresentationPage.class, xDrawPage );
return aPresentationPage.getNotesPage();
}
@@ -205,7 +205,7 @@ public class PageHelper
static public XDrawPage getHandoutMasterPage( XComponent xComponent )
{
XHandoutMasterSupplier aHandoutMasterSupplier =
- (XHandoutMasterSupplier)UnoRuntime.queryInterface(
+ UnoRuntime.queryInterface(
XHandoutMasterSupplier.class, xComponent );
return aHandoutMasterSupplier.getHandoutMasterPage();
}
diff --git a/main/odk/examples/DevelopersGuide/Drawing/PresentationDemo.java b/main/odk/examples/DevelopersGuide/Drawing/PresentationDemo.java
index 154380fc12..58169c09ef 100644
--- a/main/odk/examples/DevelopersGuide/Drawing/PresentationDemo.java
+++ b/main/odk/examples/DevelopersGuide/Drawing/PresentationDemo.java
@@ -90,7 +90,7 @@ public class PresentationDemo
// set the slide transition for the first page
xPage = PageHelper.getDrawPageByIndex( xDrawDoc, 0 );
- xShapes = (XShapes)
+ xShapes =
UnoRuntime.queryInterface( XShapes.class, xPage );
// set slide transition effect
setSlideTransition( xPage,
@@ -115,7 +115,7 @@ public class PresentationDemo
// set the slide transition for the second page
xPage = PageHelper.getDrawPageByIndex( xDrawDoc, 1 );
- xShapes = (XShapes)
+ xShapes =
UnoRuntime.queryInterface( XShapes.class, xPage );
setSlideTransition( xPage,
com.sun.star.presentation.FadeEffect.FADE_FROM_RIGHT,
@@ -136,7 +136,7 @@ public class PresentationDemo
// the second object lets the presentation jump to page two
// by using a ClickAction.BOOKMARK;
xPage = PageHelper.getDrawPageByIndex( xDrawDoc, 2 );
- xShapes = (XShapes)
+ xShapes =
UnoRuntime.queryInterface( XShapes.class, xPage );
setSlideTransition( xPage,
com.sun.star.presentation.FadeEffect.ROLL_FROM_LEFT,
@@ -148,7 +148,7 @@ public class PresentationDemo
xShapes.add( xShape );
ShapeHelper.addPortion( xShape, "click to go", false );
ShapeHelper.addPortion( xShape, "to first page", true );
- xShapePropSet = (XPropertySet)
+ xShapePropSet =
UnoRuntime.queryInterface( XPropertySet.class, xShape );
xShapePropSet.setPropertyValue("Effect",
com.sun.star.presentation.AnimationEffect.FADE_FROM_BOTTOM );
@@ -162,7 +162,7 @@ public class PresentationDemo
xShapes.add( xShape );
ShapeHelper.addPortion( xShape, "click to go", false );
ShapeHelper.addPortion( xShape, "to the second page", true );
- xShapePropSet = (XPropertySet)
+ xShapePropSet =
UnoRuntime.queryInterface( XPropertySet.class, xShape );
xShapePropSet.setPropertyValue("Effect",
com.sun.star.presentation.AnimationEffect.FADE_FROM_BOTTOM );
@@ -170,7 +170,7 @@ public class PresentationDemo
xShapePropSet.setPropertyValue(
"OnClick", com.sun.star.presentation.ClickAction.BOOKMARK );
// set the name of page two, and use it with the bookmark action
- XNamed xPageName = (XNamed)UnoRuntime.queryInterface(
+ XNamed xPageName = UnoRuntime.queryInterface(
XNamed.class, PageHelper.getDrawPageByIndex( xDrawDoc, 1 ) );
xPageName.setName( "page two" );
xShapePropSet.setPropertyValue(
@@ -180,10 +180,10 @@ public class PresentationDemo
/* start an endless presentation which is displayed in
full-screen mode and placed on top */
- XPresentationSupplier xPresSupplier = (XPresentationSupplier)
+ XPresentationSupplier xPresSupplier =
UnoRuntime.queryInterface( XPresentationSupplier.class, xDrawDoc );
XPresentation xPresentation = xPresSupplier.getPresentation();
- XPropertySet xPresPropSet = (XPropertySet)
+ XPropertySet xPresPropSet =
UnoRuntime.queryInterface( XPropertySet.class, xPresentation );
xPresPropSet.setPropertyValue( "IsEndless", new Boolean( true ) );
xPresPropSet.setPropertyValue( "IsAlwaysOnTop", new Boolean( true ) );
@@ -207,13 +207,13 @@ public class PresentationDemo
// the following test is only sensible if you do not exactly know
// what type of page xPage is, for this purpose it can been tested
// if the com.sun.star.presentation.DrawPage service is supported
- XServiceInfo xInfo = (XServiceInfo)UnoRuntime.queryInterface(
+ XServiceInfo xInfo = UnoRuntime.queryInterface(
XServiceInfo.class, xPage );
if ( xInfo.supportsService( "com.sun.star.presentation.DrawPage" ) == true )
{
try
{
- XPropertySet xPropSet = (XPropertySet)
+ XPropertySet xPropSet =
UnoRuntime.queryInterface( XPropertySet.class, xPage );
xPropSet.setPropertyValue( "Effect", eEffect );
xPropSet.setPropertyValue( "Speed", eSpeed );
diff --git a/main/odk/examples/DevelopersGuide/Drawing/ShapeHelper.java b/main/odk/examples/DevelopersGuide/Drawing/ShapeHelper.java
index 58d0ae14bc..cbcdf25f06 100644
--- a/main/odk/examples/DevelopersGuide/Drawing/ShapeHelper.java
+++ b/main/odk/examples/DevelopersGuide/Drawing/ShapeHelper.java
@@ -55,7 +55,7 @@ public class ShapeHelper
{
XShape xShape = createShape( xDrawDoc, aPos, aSize, sShapeType );
xShapes.add( xShape );
- XPropertySet xPropSet = (XPropertySet)
+ XPropertySet xPropSet =
UnoRuntime.queryInterface( XPropertySet.class, xShape );
return xPropSet;
}
@@ -68,10 +68,10 @@ public class ShapeHelper
{
XShape xShape = null;
XMultiServiceFactory xFactory =
- (XMultiServiceFactory )UnoRuntime.queryInterface(
+ UnoRuntime.queryInterface(
XMultiServiceFactory.class, xDrawDoc );
Object xObj = xFactory.createInstance( sShapeType );
- xShape = (XShape)UnoRuntime.queryInterface(
+ xShape = UnoRuntime.queryInterface(
XShape.class, xObj );
xShape.setPosition( aPos );
xShape.setSize( aSize );
@@ -85,7 +85,7 @@ public class ShapeHelper
public static XPropertySet addPortion( XShape xShape, String sText, boolean bNewParagraph )
throws com.sun.star.lang.IllegalArgumentException
{
- XText xText = (XText)
+ XText xText =
UnoRuntime.queryInterface( XText.class, xShape );
XTextCursor xTextCursor = xText.createTextCursor();
@@ -95,11 +95,11 @@ public class ShapeHelper
xText.insertControlCharacter( xTextCursor, ControlCharacter.PARAGRAPH_BREAK, false );
xTextCursor.gotoEnd( false );
}
- XTextRange xTextRange = (XTextRange)
+ XTextRange xTextRange =
UnoRuntime.queryInterface( XTextRange.class, xTextCursor );
xTextRange.setString( sText );
xTextCursor.gotoEnd( true );
- XPropertySet xPropSet = (XPropertySet)
+ XPropertySet xPropSet =
UnoRuntime.queryInterface( XPropertySet.class, xTextRange );
return xPropSet;
}
@@ -112,7 +112,7 @@ public class ShapeHelper
com.sun.star.lang.WrappedTargetException,
com.sun.star.container.NoSuchElementException
{
- XEnumerationAccess xEnumerationAccess = (XEnumerationAccess)
+ XEnumerationAccess xEnumerationAccess =
UnoRuntime.queryInterface( XEnumerationAccess.class, xText );
if ( xEnumerationAccess.hasElements() )
{
@@ -122,9 +122,9 @@ public class ShapeHelper
Object xObj = xEnumeration.nextElement();
if ( xEnumeration.hasMoreElements() == false )
{
- XTextContent xTextContent = (XTextContent)UnoRuntime.queryInterface(
+ XTextContent xTextContent = UnoRuntime.queryInterface(
XTextContent.class, xObj );
- XPropertySet xParaPropSet = (XPropertySet)
+ XPropertySet xParaPropSet =
UnoRuntime.queryInterface( XPropertySet.class, xTextContent );
xParaPropSet.setPropertyValue( sPropName, aValue );
}
diff --git a/main/odk/examples/DevelopersGuide/Drawing/StyleDemo.java b/main/odk/examples/DevelopersGuide/Drawing/StyleDemo.java
index 5f3cc06311..c55c8a9f0a 100644
--- a/main/odk/examples/DevelopersGuide/Drawing/StyleDemo.java
+++ b/main/odk/examples/DevelopersGuide/Drawing/StyleDemo.java
@@ -80,10 +80,10 @@ public class StyleDemo
that is available within the styles of the document to red. It
will also print each family and style name to the standard output */
XModel xModel =
- (XModel)UnoRuntime.queryInterface(
+ UnoRuntime.queryInterface(
XModel.class, xComponent );
com.sun.star.style.XStyleFamiliesSupplier xSFS =
- (com.sun.star.style.XStyleFamiliesSupplier)
+
UnoRuntime.queryInterface(
com.sun.star.style.XStyleFamiliesSupplier.class, xModel );
@@ -100,7 +100,7 @@ public class StyleDemo
// and now all available styles
Object aFamilyObj = xFamilies.getByName( Families[ i ] );
com.sun.star.container.XNameAccess xStyles =
- (com.sun.star.container.XNameAccess)
+
UnoRuntime.queryInterface(
com.sun.star.container.XNameAccess.class, aFamilyObj );
String[] Styles = xStyles.getElementNames();
@@ -108,12 +108,12 @@ public class StyleDemo
{
System.out.println( " " + Styles[ j ] );
Object aStyleObj = xStyles.getByName( Styles[ j ] );
- com.sun.star.style.XStyle xStyle = (com.sun.star.style.XStyle)
+ com.sun.star.style.XStyle xStyle =
UnoRuntime.queryInterface(
com.sun.star.style.XStyle.class, aStyleObj );
// now we have the XStyle Interface and the CharColor for
// all styles is exemplary be set to red.
- XPropertySet xStylePropSet = (XPropertySet)
+ XPropertySet xStylePropSet =
UnoRuntime.queryInterface( XPropertySet.class, xStyle );
XPropertySetInfo xStylePropSetInfo =
xStylePropSet.getPropertySetInfo();
@@ -131,25 +131,25 @@ public class StyleDemo
the "graphics" family */
Object obj = xFamilies.getByName( "graphics" );
- com.sun.star.container.XNameAccess xStyles = (XNameAccess)
+ com.sun.star.container.XNameAccess xStyles =
UnoRuntime.queryInterface(com.sun.star.container.XNameAccess.class,
obj );
obj = xStyles.getByName( "title1" );
- com.sun.star.style.XStyle xTitle1Style = (com.sun.star.style.XStyle)
+ com.sun.star.style.XStyle xTitle1Style =
UnoRuntime.queryInterface( com.sun.star.style.XStyle.class, obj );
XDrawPagesSupplier xDrawPagesSupplier =
- (XDrawPagesSupplier)UnoRuntime.queryInterface(
+ UnoRuntime.queryInterface(
XDrawPagesSupplier.class, xComponent );
XDrawPages xDrawPages = xDrawPagesSupplier.getDrawPages();
- XDrawPage xDrawPage = (XDrawPage)UnoRuntime.queryInterface(
+ XDrawPage xDrawPage = UnoRuntime.queryInterface(
XDrawPage.class, xDrawPages.getByIndex( 0 ));
- XShapes xShapes = (XShapes)UnoRuntime.queryInterface(XShapes.class,
+ XShapes xShapes = UnoRuntime.queryInterface(XShapes.class,
xDrawPage );
XShape xShape = ShapeHelper.createShape( xComponent, new Point( 0, 0 ),
new Size( 5000, 5000 ), "com.sun.star.drawing.RectangleShape" );
xShapes.add( xShape );
- XPropertySet xPropSet = (XPropertySet)
+ XPropertySet xPropSet =
UnoRuntime.queryInterface( XPropertySet.class, xShape );
xPropSet.setPropertyValue( "Style", xTitle1Style );
diff --git a/main/odk/examples/DevelopersGuide/Drawing/TextDemo.java b/main/odk/examples/DevelopersGuide/Drawing/TextDemo.java
index ed14809e63..9363eb8029 100644
--- a/main/odk/examples/DevelopersGuide/Drawing/TextDemo.java
+++ b/main/odk/examples/DevelopersGuide/Drawing/TextDemo.java
@@ -72,7 +72,7 @@ public class TextDemo
"private:factory/sdraw", "_blank", 0, pPropValues );
XDrawPage xPage = PageHelper.getDrawPageByIndex( xDrawDoc, 0 );
- XShapes xShapes = (XShapes)
+ XShapes xShapes =
UnoRuntime.queryInterface( XShapes.class, xPage );
@@ -89,7 +89,7 @@ public class TextDemo
new Size( 15000, 7500 ),
"com.sun.star.drawing.RectangleShape" );
xShapes.add( xRectangle );
- xShapePropSet = (XPropertySet)
+ xShapePropSet =
UnoRuntime.queryInterface( XPropertySet.class, xRectangle );
@@ -117,7 +117,7 @@ public class TextDemo
new Size( 21000, 12500 ),
"com.sun.star.drawing.RectangleShape" );
xShapes.add( xRectangle );
- xShapePropSet = (XPropertySet)
+ xShapePropSet =
UnoRuntime.queryInterface( XPropertySet.class, xRectangle );
xShapePropSet.setPropertyValue( "TextFitToSize",
TextFitToSizeType.PROPORTIONAL );
diff --git a/main/odk/examples/DevelopersGuide/FirstSteps/FirstLoadComponent.java b/main/odk/examples/DevelopersGuide/FirstSteps/FirstLoadComponent.java
index 649ca63529..578a9d0c90 100644
--- a/main/odk/examples/DevelopersGuide/FirstSteps/FirstLoadComponent.java
+++ b/main/odk/examples/DevelopersGuide/FirstSteps/FirstLoadComponent.java
@@ -62,13 +62,13 @@ public class FirstLoadComponent {
Object desktop = xRemoteServiceManager.createInstanceWithContext(
"com.sun.star.frame.Desktop", xRemoteContext);
- XComponentLoader xComponentLoader = (XComponentLoader)
+ XComponentLoader xComponentLoader =
UnoRuntime.queryInterface(XComponentLoader.class, desktop);
PropertyValue[] loadProps = new PropertyValue[0];
XComponent xSpreadsheetComponent = xComponentLoader.loadComponentFromURL("private:factory/scalc", "_blank", 0, loadProps);
- XSpreadsheetDocument xSpreadsheetDocument = (XSpreadsheetDocument)
+ XSpreadsheetDocument xSpreadsheetDocument =
UnoRuntime.queryInterface(XSpreadsheetDocument.class,
xSpreadsheetComponent);
@@ -78,7 +78,7 @@ public class FirstLoadComponent {
System.out.println(elemType.getTypeName());
Object sheet = xSpreadsheets.getByName("MySheet");
- XSpreadsheet xSpreadsheet = (XSpreadsheet)UnoRuntime.queryInterface(
+ XSpreadsheet xSpreadsheet = UnoRuntime.queryInterface(
XSpreadsheet.class, sheet);
XCell xCell = xSpreadsheet.getCellByPosition(0, 0);
@@ -88,14 +88,14 @@ public class FirstLoadComponent {
xCell = xSpreadsheet.getCellByPosition(0, 2);
xCell.setFormula("=sum(A1:A2)");
- XPropertySet xCellProps = (XPropertySet)UnoRuntime.queryInterface(
+ XPropertySet xCellProps = UnoRuntime.queryInterface(
XPropertySet.class, xCell);
xCellProps.setPropertyValue("CellStyle", "Result");
- XModel xSpreadsheetModel = (XModel)UnoRuntime.queryInterface(
+ XModel xSpreadsheetModel = UnoRuntime.queryInterface(
XModel.class, xSpreadsheetComponent);
XController xSpreadsheetController = xSpreadsheetModel.getCurrentController();
- XSpreadsheetView xSpreadsheetView = (XSpreadsheetView)
+ XSpreadsheetView xSpreadsheetView =
UnoRuntime.queryInterface(XSpreadsheetView.class,
xSpreadsheetController);
xSpreadsheetView.setActiveSheet(xSpreadsheet);
@@ -127,7 +127,7 @@ public class FirstLoadComponent {
// *********************************************************
// example for use of XEnumerationAccess
- XCellRangesQuery xCellQuery = (XCellRangesQuery)
+ XCellRangesQuery xCellQuery =
UnoRuntime.queryInterface(XCellRangesQuery.class, sheet);
XSheetCellRanges xFormulaCells = xCellQuery.queryContentCells(
(short)com.sun.star.sheet.CellFlags.FORMULA);
@@ -136,8 +136,8 @@ public class FirstLoadComponent {
while (xFormulaEnum.hasMoreElements()) {
Object formulaCell = xFormulaEnum.nextElement();
- xCell = (XCell)UnoRuntime.queryInterface(XCell.class, formulaCell);
- XCellAddressable xCellAddress = (XCellAddressable)
+ xCell = UnoRuntime.queryInterface(XCell.class, formulaCell);
+ XCellAddressable xCellAddress =
UnoRuntime.queryInterface(XCellAddressable.class, xCell);
System.out.println("Formula cell in column " +
xCellAddress.getCellAddress().Column
@@ -226,13 +226,13 @@ public class FirstLoadComponent {
// try {
// Object desktop = xRemoteServiceManager.createInstanceWithContext(
// "com.sun.star.frame.Desktop", xRemoteContext);
-// XComponentLoader xComponentLoader = (XComponentLoader)
+// XComponentLoader xComponentLoader =
// UnoRuntime.queryInterface(XComponentLoader.class, desktop);
// PropertyValue[] loadProps = new PropertyValue[0];
// XComponent xSpreadsheetComponent = xComponentLoader.loadComponentFromURL("private:factory/scalc", "_blank", 0, loadProps);
-// XSpreadsheetDocument xSpreadsheetDocument = (XSpreadsheetDocument)
+// XSpreadsheetDocument xSpreadsheetDocument =
// UnoRuntime.queryInterface(XSpreadsheetDocument.class,
// xSpreadsheetComponent);
@@ -242,7 +242,7 @@ public class FirstLoadComponent {
// System.out.println(elemType.getTypeName());
// Object sheet = xSpreadsheets.getByName("MySheet");
-// XSpreadsheet xSpreadsheet = (XSpreadsheet)UnoRuntime.queryInterface(
+// XSpreadsheet xSpreadsheet = UnoRuntime.queryInterface(
// XSpreadsheet.class, sheet);
// XCell xCell = xSpreadsheet.getCellByPosition(0, 0);
@@ -252,14 +252,14 @@ public class FirstLoadComponent {
// xCell = xSpreadsheet.getCellByPosition(0, 2);
// xCell.setFormula("=sum(A1:A2)");
-// XPropertySet xCellProps = (XPropertySet)UnoRuntime.queryInterface(
+// XPropertySet xCellProps = UnoRuntime.queryInterface(
// XPropertySet.class, xCell);
// xCellProps.setPropertyValue("CellStyle", "Result");
-// XModel xSpreadsheetModel = (XModel)UnoRuntime.queryInterface(
+// XModel xSpreadsheetModel = UnoRuntime.queryInterface(
// XModel.class, xSpreadsheetComponent);
// XController xSpreadsheetController = xSpreadsheetModel.getCurrentController();
-// XSpreadsheetView xSpreadsheetView = (XSpreadsheetView)
+// XSpreadsheetView xSpreadsheetView =
// UnoRuntime.queryInterface(XSpreadsheetView.class,
// xSpreadsheetController);
// xSpreadsheetView.setActiveSheet(xSpreadsheet);
@@ -291,7 +291,7 @@ public class FirstLoadComponent {
// // *********************************************************
// // example for use of XEnumerationAccess
-// XCellRangesQuery xCellQuery = (XCellRangesQuery)
+// XCellRangesQuery xCellQuery =
// UnoRuntime.queryInterface(XCellRangesQuery.class, sheet);
// XSheetCellRanges xFormulaCells = xCellQuery.queryContentCells(
// (short)com.sun.star.sheet.CellFlags.FORMULA);
@@ -300,8 +300,8 @@ public class FirstLoadComponent {
// while (xFormulaEnum.hasMoreElements()) {
// Object formulaCell = xFormulaEnum.nextElement();
-// xCell = (XCell)UnoRuntime.queryInterface(XCell.class, formulaCell);
-// XCellAddressable xCellAddress = (XCellAddressable)
+// xCell = UnoRuntime.queryInterface(XCell.class, formulaCell);
+// XCellAddressable xCellAddress =
// UnoRuntime.queryInterface(XCellAddressable.class, xCell);
// System.out.println("Formula cell in column " +
// xCellAddress.getCellAddress().Column
diff --git a/main/odk/examples/DevelopersGuide/FirstSteps/HelloTextTableShape.java b/main/odk/examples/DevelopersGuide/FirstSteps/HelloTextTableShape.java
index d8f46fcd54..3357aab0f6 100644
--- a/main/odk/examples/DevelopersGuide/FirstSteps/HelloTextTableShape.java
+++ b/main/odk/examples/DevelopersGuide/FirstSteps/HelloTextTableShape.java
@@ -106,27 +106,27 @@ public class HelloTextTableShape {
try {
// create new writer document and get text, then manipulate text
XComponent xWriterComponent = newDocComponent("swriter");
- XTextDocument xTextDocument = (XTextDocument)UnoRuntime.queryInterface(
+ XTextDocument xTextDocument = UnoRuntime.queryInterface(
XTextDocument.class, xWriterComponent);
XText xText = xTextDocument.getText();
manipulateText(xText);
// get internal service factory of the document
- XMultiServiceFactory xWriterFactory = (XMultiServiceFactory)UnoRuntime.queryInterface(
+ XMultiServiceFactory xWriterFactory = UnoRuntime.queryInterface(
XMultiServiceFactory.class, xWriterComponent);
// insert TextTable and get cell text, then manipulate text in cell
Object table = xWriterFactory.createInstance("com.sun.star.text.TextTable");
- XTextContent xTextContentTable = (XTextContent)UnoRuntime.queryInterface(
+ XTextContent xTextContentTable = UnoRuntime.queryInterface(
XTextContent.class, table);
xText.insertTextContent(xText.getEnd(), xTextContentTable, false);
- XCellRange xCellRange = (XCellRange)UnoRuntime.queryInterface(
+ XCellRange xCellRange = UnoRuntime.queryInterface(
XCellRange.class, table);
XCell xCell = xCellRange.getCellByPosition(0, 1);
- XText xCellText = (XText)UnoRuntime.queryInterface(XText.class, xCell);
+ XText xCellText = UnoRuntime.queryInterface(XText.class, xCell);
manipulateText(xCellText);
manipulateTable(xCellRange);
@@ -134,21 +134,21 @@ public class HelloTextTableShape {
// insert RectangleShape and get shape text, then manipulate text
Object writerShape = xWriterFactory.createInstance(
"com.sun.star.drawing.RectangleShape");
- XShape xWriterShape = (XShape)UnoRuntime.queryInterface(
+ XShape xWriterShape = UnoRuntime.queryInterface(
XShape.class, writerShape);
xWriterShape.setSize(new Size(10000, 10000));
- XTextContent xTextContentShape = (XTextContent)UnoRuntime.queryInterface(
+ XTextContent xTextContentShape = UnoRuntime.queryInterface(
XTextContent.class, writerShape);
xText.insertTextContent(xText.getEnd(), xTextContentShape, false);
- XPropertySet xShapeProps = (XPropertySet)UnoRuntime.queryInterface(
+ XPropertySet xShapeProps = UnoRuntime.queryInterface(
XPropertySet.class, writerShape);
// wrap text inside shape
xShapeProps.setPropertyValue("TextContourFrame", new Boolean(true));
- XText xShapeText = (XText)UnoRuntime.queryInterface(XText.class, writerShape);
+ XText xShapeText = UnoRuntime.queryInterface(XText.class, writerShape);
manipulateText(xShapeText);
manipulateShape(xWriterShape);
@@ -157,22 +157,22 @@ public class HelloTextTableShape {
Object bookmark = xWriterFactory.createInstance ( "com.sun.star.text.Bookmark" );
// name the bookmark
- XNamed xNamed = (XNamed) UnoRuntime.queryInterface (
+ XNamed xNamed = UnoRuntime.queryInterface (
XNamed.class, bookmark );
xNamed.setName("MyUniqueBookmarkName");
// get XTextContent interface and insert it at the end of the document
- XTextContent xTextContent = (XTextContent) UnoRuntime.queryInterface (
+ XTextContent xTextContent = UnoRuntime.queryInterface (
XTextContent.class, bookmark );
//mxDocText.insertTextContent ( mxDocText.getEnd(), xTextContent, false );
xText.insertTextContent ( xText.getEnd(), xTextContent, false );
//query BookmarksSupplier
- XBookmarksSupplier xBookmarksSupplier = (XBookmarksSupplier)UnoRuntime.queryInterface(
+ XBookmarksSupplier xBookmarksSupplier = UnoRuntime.queryInterface(
XBookmarksSupplier.class, xWriterComponent);
XNameAccess xNamedBookmarks = xBookmarksSupplier.getBookmarks();
Object foundBookmark = xNamedBookmarks.getByName("MyUniqueBookmarkName");
- XTextContent xFoundBookmark = (XTextContent)UnoRuntime.queryInterface(XTextContent.class, foundBookmark);
+ XTextContent xFoundBookmark = UnoRuntime.queryInterface(XTextContent.class, foundBookmark);
XTextRange xFound = xFoundBookmark.getAnchor();
xFound.setString(" The throat mike, glued to her neck, "
+ "looked as much as possible like an analgesic dermadisk.");
@@ -181,13 +181,13 @@ public class HelloTextTableShape {
// first query the XTextTablesSupplier interface from our document
- XTextTablesSupplier xTablesSupplier = (XTextTablesSupplier) UnoRuntime.queryInterface(
+ XTextTablesSupplier xTablesSupplier = UnoRuntime.queryInterface(
XTextTablesSupplier.class, xWriterComponent);
// get the tables collection
XNameAccess xNamedTables = xTablesSupplier.getTextTables();
// now query the XIndexAccess from the tables collection
- XIndexAccess xIndexedTables = (XIndexAccess) UnoRuntime.queryInterface(
+ XIndexAccess xIndexedTables = UnoRuntime.queryInterface(
XIndexAccess.class, xNamedTables);
// we need properties
@@ -197,7 +197,7 @@ public class HelloTextTableShape {
for (int i = 0; i < xIndexedTables.getCount(); i++) {
//Object table = xIndexedTables.getByIndex(i);
table = xIndexedTables.getByIndex(i);
- xTableProps = (XPropertySet) UnoRuntime.queryInterface(
+ xTableProps = UnoRuntime.queryInterface(
XPropertySet.class, table);
xTableProps.setPropertyValue("BackColor", new Integer(0xC8FFB9));
}
@@ -215,50 +215,50 @@ public class HelloTextTableShape {
// create new calc document and manipulate cell text
XComponent xCalcComponent = newDocComponent("scalc");
XSpreadsheetDocument xSpreadsheetDocument =
- (XSpreadsheetDocument)UnoRuntime.queryInterface(
+ UnoRuntime.queryInterface(
XSpreadsheetDocument .class, xCalcComponent);
Object sheets = xSpreadsheetDocument.getSheets();
- XIndexAccess xIndexedSheets = (XIndexAccess)UnoRuntime.queryInterface(
+ XIndexAccess xIndexedSheets = UnoRuntime.queryInterface(
XIndexAccess.class, sheets);
Object sheet = xIndexedSheets.getByIndex(0);
//get cell A2 in first sheet
- XCellRange xSpreadsheetCells = (XCellRange)UnoRuntime.queryInterface(
+ XCellRange xSpreadsheetCells = UnoRuntime.queryInterface(
XCellRange.class, sheet);
XCell xCell = xSpreadsheetCells.getCellByPosition(0,1);
- XPropertySet xCellProps = (XPropertySet)UnoRuntime.queryInterface(
+ XPropertySet xCellProps = UnoRuntime.queryInterface(
XPropertySet.class, xCell);
xCellProps.setPropertyValue("IsTextWrapped", new Boolean(true));
- XText xCellText = (XText)UnoRuntime.queryInterface(XText.class, xCell);
+ XText xCellText = UnoRuntime.queryInterface(XText.class, xCell);
manipulateText(xCellText);
manipulateTable(xSpreadsheetCells);
// get internal service factory of the document
- XMultiServiceFactory xCalcFactory = (XMultiServiceFactory)UnoRuntime.queryInterface(
+ XMultiServiceFactory xCalcFactory = UnoRuntime.queryInterface(
XMultiServiceFactory.class, xCalcComponent);
// get Drawpage
- XDrawPageSupplier xDrawPageSupplier = (XDrawPageSupplier)UnoRuntime.queryInterface(XDrawPageSupplier.class, sheet);
+ XDrawPageSupplier xDrawPageSupplier = UnoRuntime.queryInterface(XDrawPageSupplier.class, sheet);
XDrawPage xDrawPage = xDrawPageSupplier.getDrawPage();
// create and insert RectangleShape and get shape text, then manipulate text
Object calcShape = xCalcFactory.createInstance(
"com.sun.star.drawing.RectangleShape");
- XShape xCalcShape = (XShape)UnoRuntime.queryInterface(
+ XShape xCalcShape = UnoRuntime.queryInterface(
XShape.class, calcShape);
xCalcShape.setSize(new Size(10000, 10000));
xCalcShape.setPosition(new Point(7000, 3000));
xDrawPage.add(xCalcShape);
- XPropertySet xShapeProps = (XPropertySet)UnoRuntime.queryInterface(
+ XPropertySet xShapeProps = UnoRuntime.queryInterface(
XPropertySet.class, calcShape);
// wrap text inside shape
xShapeProps.setPropertyValue("TextContourFrame", new Boolean(true));
- XText xShapeText = (XText)UnoRuntime.queryInterface(XText.class, calcShape);
+ XText xShapeText = UnoRuntime.queryInterface(XText.class, calcShape);
manipulateText(xShapeText);
manipulateShape(xCalcShape);
@@ -276,29 +276,29 @@ public class HelloTextTableShape {
//create new draw document and insert rectangle shape
XComponent xDrawComponent = newDocComponent("sdraw");
XDrawPagesSupplier xDrawPagesSupplier =
- (XDrawPagesSupplier)UnoRuntime.queryInterface(
+ UnoRuntime.queryInterface(
XDrawPagesSupplier.class, xDrawComponent);
Object drawPages = xDrawPagesSupplier.getDrawPages();
- XIndexAccess xIndexedDrawPages = (XIndexAccess)UnoRuntime.queryInterface(
+ XIndexAccess xIndexedDrawPages = UnoRuntime.queryInterface(
XIndexAccess.class, drawPages);
Object drawPage = xIndexedDrawPages.getByIndex(0);
- XDrawPage xDrawPage = (XDrawPage)UnoRuntime.queryInterface(XDrawPage.class, drawPage);
+ XDrawPage xDrawPage = UnoRuntime.queryInterface(XDrawPage.class, drawPage);
// get internal service factory of the document
XMultiServiceFactory xDrawFactory =
- (XMultiServiceFactory)UnoRuntime.queryInterface(
+ UnoRuntime.queryInterface(
XMultiServiceFactory.class, xDrawComponent);
Object drawShape = xDrawFactory.createInstance(
"com.sun.star.drawing.RectangleShape");
- XShape xDrawShape = (XShape)UnoRuntime.queryInterface(XShape.class, drawShape);
+ XShape xDrawShape = UnoRuntime.queryInterface(XShape.class, drawShape);
xDrawShape.setSize(new Size(10000, 20000));
xDrawShape.setPosition(new Point(5000, 5000));
xDrawPage.add(xDrawShape);
- XText xShapeText = (XText)UnoRuntime.queryInterface(XText.class, drawShape);
- XPropertySet xShapeProps = (XPropertySet)UnoRuntime.queryInterface(
+ XText xShapeText = UnoRuntime.queryInterface(XText.class, drawShape);
+ XPropertySet xShapeProps = UnoRuntime.queryInterface(
XPropertySet.class, drawShape);
// wrap text inside shape
@@ -323,7 +323,7 @@ public class HelloTextTableShape {
// create text cursor for selecting and formatting
XTextCursor xTextCursor = xText.createTextCursor();
- XPropertySet xCursorProps = (XPropertySet)UnoRuntime.queryInterface(
+ XPropertySet xCursorProps = UnoRuntime.queryInterface(
XPropertySet.class, xTextCursor);
// use cursor to select "He lay" and apply bold italic
@@ -353,32 +353,32 @@ public class HelloTextTableShape {
// enter column titles and a cell value
XCell xCell = xCellRange.getCellByPosition(0,0);
- XText xCellText = (XText)UnoRuntime.queryInterface(XText.class, xCell);
+ XText xCellText = UnoRuntime.queryInterface(XText.class, xCell);
xCellText.setString("Quotation");
xCell = xCellRange.getCellByPosition(1,0);
- xCellText = (XText)UnoRuntime.queryInterface(XText.class, xCell);
+ xCellText = UnoRuntime.queryInterface(XText.class, xCell);
xCellText.setString("Year");
xCell = xCellRange.getCellByPosition(1,1);
xCell.setValue(1940);
XCellRange xSelectedCells = xCellRange.getCellRangeByName("A1:B1");
- XPropertySet xCellProps = (XPropertySet)UnoRuntime.queryInterface(
+ XPropertySet xCellProps = UnoRuntime.queryInterface(
XPropertySet.class, xSelectedCells);
// format table headers and table borders
// we need to distinguish text and sheet tables:
// property name for cell colors is different in text and sheet cells
// we want to apply TableBorder to whole text table, but only to sheet cells with content
- XServiceInfo xServiceInfo = (XServiceInfo)UnoRuntime.queryInterface(
+ XServiceInfo xServiceInfo = UnoRuntime.queryInterface(
XServiceInfo.class, xCellRange);
if (xServiceInfo.supportsService("com.sun.star.sheet.Spreadsheet")) {
backColorPropertyName = "CellBackColor";
xSelectedCells = xCellRange.getCellRangeByName("A1:B2");
- xTableProps = (XPropertySet)UnoRuntime.queryInterface(
+ xTableProps = UnoRuntime.queryInterface(
XPropertySet.class, xSelectedCells);
}
else if (xServiceInfo.supportsService("com.sun.star.text.TextTable")) {
backColorPropertyName = "BackColor";
- xTableProps = (XPropertySet)UnoRuntime.queryInterface(
+ xTableProps = UnoRuntime.queryInterface(
XPropertySet.class, xCellRange);
}
// set cell background color
@@ -409,7 +409,7 @@ public class HelloTextTableShape {
}
protected void manipulateShape(XShape xShape) throws com.sun.star.uno.Exception {
- XPropertySet xShapeProps = (XPropertySet)UnoRuntime.queryInterface(XPropertySet.class, xShape);
+ XPropertySet xShapeProps = UnoRuntime.queryInterface(XPropertySet.class, xShape);
xShapeProps.setPropertyValue("FillColor", new Integer(0x99CCFF));
xShapeProps.setPropertyValue("LineColor", new Integer(0x000099));
xShapeProps.setPropertyValue("RotateAngle", new Integer(3000));
@@ -426,7 +426,7 @@ public class HelloTextTableShape {
xRemoteServiceManager = this.getRemoteServiceManager();
Object desktop = xRemoteServiceManager.createInstanceWithContext(
"com.sun.star.frame.Desktop", xRemoteContext);
- XComponentLoader xComponentLoader = (XComponentLoader)UnoRuntime.queryInterface(
+ XComponentLoader xComponentLoader = UnoRuntime.queryInterface(
XComponentLoader.class, desktop);
PropertyValue[] loadProps = new PropertyValue[0];
return xComponentLoader.loadComponentFromURL(loadUrl, "_blank", 0, loadProps);
diff --git a/main/odk/examples/DevelopersGuide/Forms/ButtonOperator.java b/main/odk/examples/DevelopersGuide/Forms/ButtonOperator.java
index eeada4d7c6..701b05d572 100644
--- a/main/odk/examples/DevelopersGuide/Forms/ButtonOperator.java
+++ b/main/odk/examples/DevelopersGuide/Forms/ButtonOperator.java
@@ -108,7 +108,7 @@ public class ButtonOperator implements XActionListener, XFeatureInvalidation
DocumentViewHelper aCurrentView = m_aDocument.getCurrentView();
// add a listener so we get noticed if the user presses the button
- XButton xButtonControl = (XButton)UnoRuntime.queryInterface( XButton.class,
+ XButton xButtonControl = UnoRuntime.queryInterface( XButton.class,
aCurrentView.getFormControl( _buttonModel ) );
xButtonControl.addActionListener( this );
diff --git a/main/odk/examples/DevelopersGuide/Forms/ControlLock.java b/main/odk/examples/DevelopersGuide/Forms/ControlLock.java
index 0ba41bed48..e227185d72 100644
--- a/main/odk/examples/DevelopersGuide/Forms/ControlLock.java
+++ b/main/odk/examples/DevelopersGuide/Forms/ControlLock.java
@@ -55,7 +55,7 @@ class LockControlModels extends ComponentTreeTraversal
if ( !super.shouldStepInto( xContainer ) )
return false; // don't try to be more clever than our base class
- XForm xForm = (XForm)UnoRuntime.queryInterface( XForm.class, xContainer );
+ XForm xForm = UnoRuntime.queryInterface( XForm.class, xContainer );
if ( ( null != xForm ) && ( m_nLevel > 1 ) )
// don't step into sub forms - we only handle the form we were originally
// applied to
@@ -159,7 +159,7 @@ class ControlLock implements XRowSetListener
m_bLockingEnabled = bLock;
// add or remove ourself as listener to get notified of cursor moves
- XRowSet xRowSet = (XRowSet)UnoRuntime.queryInterface(
+ XRowSet xRowSet = UnoRuntime.queryInterface(
XRowSet.class, m_xForm );
if ( m_bLockingEnabled )
{
diff --git a/main/odk/examples/DevelopersGuide/Forms/DataAwareness.java b/main/odk/examples/DevelopersGuide/Forms/DataAwareness.java
index e8abd71132..8bb4051f50 100644
--- a/main/odk/examples/DevelopersGuide/Forms/DataAwareness.java
+++ b/main/odk/examples/DevelopersGuide/Forms/DataAwareness.java
@@ -65,7 +65,7 @@ class PrintComponentTree extends ComponentTreeTraversal
public void handle( Object aFormComponent ) throws com.sun.star.uno.Exception
{
// the name of the child
- XNamed xName = (XNamed)UnoRuntime.queryInterface( XNamed.class, aFormComponent );
+ XNamed xName = UnoRuntime.queryInterface( XNamed.class, aFormComponent );
// if it's a form control model, check it's type
XPropertySet xProps = UNO.queryPropertySet( aFormComponent );
@@ -172,7 +172,7 @@ public class DataAwareness extends DocumentBasedExample implements XPropertyChan
{
String sObjectName;
- XNamed xNameAcc = (XNamed)UnoRuntime.queryInterface( XNamed.class, xContainer );
+ XNamed xNameAcc = UnoRuntime.queryInterface( XNamed.class, xContainer );
if ( null == xNameAcc )
sObjectName = new String( "<unnamed>" );
else
@@ -233,12 +233,12 @@ public class DataAwareness extends DocumentBasedExample implements XPropertyChan
// get the columns of our master form
- XColumnsSupplier xSuppCols = (XColumnsSupplier)UnoRuntime.queryInterface(
+ XColumnsSupplier xSuppCols = UnoRuntime.queryInterface(
XColumnsSupplier.class, xFormProps );
XNameAccess xCols = xSuppCols.getColumns();
// and update the date column with a NULL value
- XColumnUpdate xDateColumn = (XColumnUpdate)UnoRuntime.queryInterface(
+ XColumnUpdate xDateColumn = UnoRuntime.queryInterface(
XColumnUpdate.class, xCols.getByName( "SALEDATE" ) );
xDateColumn.updateNull();
@@ -633,7 +633,7 @@ public class DataAwareness extends DocumentBasedExample implements XPropertyChan
// the container to insert columns into
XIndexContainer xColumnContainer = UNO.queryIndexContainer( aGridModel );
// the factory for creating column models
- XGridColumnFactory xColumnFactory = (XGridColumnFactory)UnoRuntime.queryInterface(
+ XGridColumnFactory xColumnFactory = UnoRuntime.queryInterface(
XGridColumnFactory.class, aGridModel );
// (let) create the new col
@@ -902,7 +902,7 @@ public class DataAwareness extends DocumentBasedExample implements XPropertyChan
m_aSalesNameValidator.enableColumnWatch( false );
// remove our own reset listener from the form
- XNameAccess xMasterAsNames = (XNameAccess)UnoRuntime.queryInterface(
+ XNameAccess xMasterAsNames = UnoRuntime.queryInterface(
XNameAccess.class, m_xMasterForm );
XReset xFormReset = UNO.queryReset( xMasterAsNames.getByName( "Sales" ) );
xFormReset.removeResetListener( this );
diff --git a/main/odk/examples/DevelopersGuide/Forms/DocumentBasedExample.java b/main/odk/examples/DevelopersGuide/Forms/DocumentBasedExample.java
index ef8b01bb73..f85ef1c9ed 100644
--- a/main/odk/examples/DevelopersGuide/Forms/DocumentBasedExample.java
+++ b/main/odk/examples/DevelopersGuide/Forms/DocumentBasedExample.java
@@ -52,14 +52,14 @@ public abstract class DocumentBasedExample implements com.sun.star.lang.XEventLi
createInitialComponentContext( null );
final XMultiComponentFactory localServiceManager = componentContext.getServiceManager();
- final XUnoUrlResolver urlResolver = (XUnoUrlResolver) UnoRuntime.queryInterface(
+ final XUnoUrlResolver urlResolver = UnoRuntime.queryInterface(
XUnoUrlResolver.class, localServiceManager.createInstanceWithContext(
"com.sun.star.bridge.UnoUrlResolver", componentContext) );
final String connectStr = "uno:pipe,name=<pipename>;urp;StarOffice.ComponentContext";
final Object initialObject = urlResolver.resolve( connectStr );
- m_xCtx = (XComponentContext)UnoRuntime.queryInterface( XComponentContext.class,
+ m_xCtx = UnoRuntime.queryInterface( XComponentContext.class,
initialObject );
*/
@@ -166,7 +166,7 @@ public abstract class DocumentBasedExample implements com.sun.star.lang.XEventLi
// close our document
if ( m_document != null )
{
- XCloseable closeDoc = (XCloseable)
+ XCloseable closeDoc =
UnoRuntime.queryInterface( XCloseable.class,
m_document.getDocument() );
if (closeDoc != null)
diff --git a/main/odk/examples/DevelopersGuide/Forms/DocumentHelper.java b/main/odk/examples/DevelopersGuide/Forms/DocumentHelper.java
index f16a24f267..91417af329 100644
--- a/main/odk/examples/DevelopersGuide/Forms/DocumentHelper.java
+++ b/main/odk/examples/DevelopersGuide/Forms/DocumentHelper.java
@@ -66,7 +66,7 @@ public class DocumentHelper
public DocumentHelper( XComponentContext xContext, XComponent document )
{
m_remoteContext = xContext;
- m_orb = (XMultiServiceFactory)UnoRuntime.queryInterface(
+ m_orb = UnoRuntime.queryInterface(
XMultiServiceFactory.class, m_remoteContext.getServiceManager());
m_documentComponent = document;
}
@@ -74,7 +74,7 @@ public class DocumentHelper
/* ------------------------------------------------------------------ */
protected static XComponent implCreateBlankDocument( XComponentContext xCtx, String factoryURL ) throws com.sun.star.uno.Exception
{
- XComponentLoader aLoader = (XComponentLoader)UnoRuntime.queryInterface(
+ XComponentLoader aLoader = UnoRuntime.queryInterface(
XComponentLoader.class,
xCtx.getServiceManager().createInstanceWithContext(
"com.sun.star.frame.Desktop", xCtx ));
@@ -108,7 +108,7 @@ public class DocumentHelper
public DocumentViewHelper getCurrentView( )
{
// get the model interface for the document
- XModel xDocModel = (XModel)UnoRuntime.queryInterface(XModel.class, m_documentComponent );
+ XModel xDocModel = UnoRuntime.queryInterface(XModel.class, m_documentComponent );
// get the current controller for the document - as a controller is tied to a view,
// this gives us the currently active view for the document.
XController xController = xDocModel.getCurrentController();
@@ -145,7 +145,7 @@ public class DocumentHelper
}
// outta here
- return (XIndexContainer)UnoRuntime.queryInterface( XIndexContainer.class, xNewForm );
+ return UnoRuntime.queryInterface( XIndexContainer.class, xNewForm );
}
/* ------------------------------------------------------------------ */
@@ -160,7 +160,7 @@ public class DocumentHelper
public XIndexContainer createSubForm( Object aParentContainer, String sInitialName )
throws com.sun.star.uno.Exception
{
- XIndexContainer xParentContainer = (XIndexContainer)UnoRuntime.queryInterface(
+ XIndexContainer xParentContainer = UnoRuntime.queryInterface(
XIndexContainer.class, aParentContainer );
return createSubForm( xParentContainer, sInitialName );
}
@@ -177,8 +177,8 @@ public class DocumentHelper
public XIndexContainer createSiblingForm( Object aForm, String sInitialName ) throws com.sun.star.uno.Exception
{
// get the parent
- XChild xAsChild = (XChild)UnoRuntime.queryInterface( XChild.class, aForm );
- XIndexContainer xContainer = (XIndexContainer)UnoRuntime.queryInterface(
+ XChild xAsChild = UnoRuntime.queryInterface( XChild.class, aForm );
+ XIndexContainer xContainer = UnoRuntime.queryInterface(
XIndexContainer.class, xAsChild.getParent() );
// append a new form to this parent container
return createSubForm( xContainer, sInitialName );
@@ -189,13 +189,13 @@ public class DocumentHelper
*/
static public DocumentHelper getDocumentForComponent( Object aFormComponent, XComponentContext xCtx )
{
- XChild xChild = (XChild)UnoRuntime.queryInterface( XChild.class, aFormComponent );
+ XChild xChild = UnoRuntime.queryInterface( XChild.class, aFormComponent );
XModel xModel = null;
while ( ( null != xChild ) && ( null == xModel ) )
{
XInterface xParent = (XInterface)xChild.getParent();
- xModel = (XModel)UnoRuntime.queryInterface( XModel.class, xParent );
- xChild = (XChild)UnoRuntime.queryInterface( XChild.class, xParent );
+ xModel = UnoRuntime.queryInterface( XModel.class, xParent );
+ xChild = UnoRuntime.queryInterface( XChild.class, xParent );
}
return new DocumentHelper( xCtx, xModel );
@@ -220,7 +220,7 @@ public class DocumentHelper
*/
public DocumentType classify( )
{
- XServiceInfo xSI = (XServiceInfo)UnoRuntime.queryInterface(
+ XServiceInfo xSI = UnoRuntime.queryInterface(
XServiceInfo.class, m_documentComponent );
if ( xSI.supportsService( "com.sun.star.text.TextDocument" ) )
@@ -242,11 +242,11 @@ public class DocumentHelper
*/
protected XDrawPage getDrawPage( int index ) throws com.sun.star.lang.IndexOutOfBoundsException, com.sun.star.lang.WrappedTargetException
{
- XDrawPagesSupplier xSuppPages = (XDrawPagesSupplier)UnoRuntime.queryInterface(
+ XDrawPagesSupplier xSuppPages = UnoRuntime.queryInterface(
XDrawPagesSupplier.class, getDocument() );
XDrawPages xPages = xSuppPages.getDrawPages();
- return (XDrawPage)UnoRuntime.queryInterface( XDrawPage.class, xPages.getByIndex( index ) );
+ return UnoRuntime.queryInterface( XDrawPage.class, xPages.getByIndex( index ) );
}
/* ------------------------------------------------------------------ */
@@ -257,18 +257,18 @@ public class DocumentHelper
XDrawPage xReturn;
// in case of a Writer document, this is rather easy: simply ask the XDrawPageSupplier
- XDrawPageSupplier xSuppPage = (XDrawPageSupplier)UnoRuntime.queryInterface(
+ XDrawPageSupplier xSuppPage = UnoRuntime.queryInterface(
XDrawPageSupplier.class, getDocument() );
if ( null != xSuppPage )
xReturn = xSuppPage.getDrawPage();
else
{ // the model itself is no draw page supplier - okay, it may be a Writer or Calc document
// (or any other multi-page document)
- XDrawPagesSupplier xSuppPages = (XDrawPagesSupplier)UnoRuntime.queryInterface(
+ XDrawPagesSupplier xSuppPages = UnoRuntime.queryInterface(
XDrawPagesSupplier.class, getDocument() );
XDrawPages xPages = xSuppPages.getDrawPages();
- xReturn = (XDrawPage)UnoRuntime.queryInterface( XDrawPage.class, xPages.getByIndex( 0 ) );
+ xReturn = UnoRuntime.queryInterface( XDrawPage.class, xPages.getByIndex( 0 ) );
// Note that this is no really error-proof code: If the document model does not support the
// XDrawPagesSupplier interface, or if the pages collection returned is empty, this will break.
@@ -282,7 +282,7 @@ public class DocumentHelper
*/
protected XNameContainer getFormComponentTreeRoot( ) throws com.sun.star.uno.Exception
{
- XFormsSupplier xSuppForms = (XFormsSupplier)UnoRuntime.queryInterface(
+ XFormsSupplier xSuppForms = UnoRuntime.queryInterface(
XFormsSupplier.class, getMainDrawPage( ) );
XNameContainer xFormsCollection = null;
@@ -298,7 +298,7 @@ public class DocumentHelper
*/
public XInterface createInstance( String serviceSpecifier ) throws com.sun.star.uno.Exception
{
- XMultiServiceFactory xORB = (XMultiServiceFactory)UnoRuntime.queryInterface( XMultiServiceFactory.class,
+ XMultiServiceFactory xORB = UnoRuntime.queryInterface( XMultiServiceFactory.class,
m_documentComponent );
return (XInterface)xORB.createInstance( serviceSpecifier );
}
@@ -308,7 +308,7 @@ public class DocumentHelper
*/
public XInterface createInstanceWithArguments( String serviceSpecifier, Object[] arguments ) throws com.sun.star.uno.Exception
{
- XMultiServiceFactory xORB = (XMultiServiceFactory)UnoRuntime.queryInterface( XMultiServiceFactory.class,
+ XMultiServiceFactory xORB = UnoRuntime.queryInterface( XMultiServiceFactory.class,
m_documentComponent );
return (XInterface) xORB.createInstanceWithArguments( serviceSpecifier, arguments );
}
diff --git a/main/odk/examples/DevelopersGuide/Forms/DocumentViewHelper.java b/main/odk/examples/DevelopersGuide/Forms/DocumentViewHelper.java
index 596dfca3b6..52d7fd4186 100644
--- a/main/odk/examples/DevelopersGuide/Forms/DocumentViewHelper.java
+++ b/main/odk/examples/DevelopersGuide/Forms/DocumentViewHelper.java
@@ -95,12 +95,12 @@ class DocumentViewHelper
// go get the current view
XController xController = (XController)get( XController.class );
// go get the dispatch provider of it's frame
- XDispatchProvider xProvider = (XDispatchProvider)UnoRuntime.queryInterface(
+ XDispatchProvider xProvider = UnoRuntime.queryInterface(
XDispatchProvider.class, xController.getFrame() );
if ( null != xProvider )
{
// need an URLTransformer
- XURLTransformer xTransformer = (XURLTransformer)UnoRuntime.queryInterface(
+ XURLTransformer xTransformer = UnoRuntime.queryInterface(
XURLTransformer.class, m_orb.createInstance( "com.sun.star.util.URLTransformer" ) );
xTransformer.parseStrict( aURL );
@@ -125,7 +125,7 @@ class DocumentViewHelper
public XFormController getFormController( Object _form )
{
XFormLayerAccess formLayer = (XFormLayerAccess)get( XFormLayerAccess.class );
- return formLayer.getFormController( (XForm)UnoRuntime.queryInterface( XForm.class, _form ) );
+ return formLayer.getFormController( UnoRuntime.queryInterface( XForm.class, _form ) );
}
/* ------------------------------------------------------------------ */
@@ -146,14 +146,14 @@ class DocumentViewHelper
/* ------------------------------------------------------------------ */
public XControl getFormControl( Object aModel ) throws com.sun.star.uno.Exception
{
- XControlModel xModel = (XControlModel)UnoRuntime.queryInterface( XControlModel.class, aModel );
+ XControlModel xModel = UnoRuntime.queryInterface( XControlModel.class, aModel );
return getFormControl( xModel );
}
/* ------------------------------------------------------------------ */
public Object getFormControl( Object aModel, Class aInterfaceClass ) throws com.sun.star.uno.Exception
{
- XControlModel xModel = (XControlModel)UnoRuntime.queryInterface( XControlModel.class, aModel );
+ XControlModel xModel = UnoRuntime.queryInterface( XControlModel.class, aModel );
return UnoRuntime.queryInterface( aInterfaceClass, getFormControl( xModel ) );
}
@@ -184,7 +184,7 @@ class DocumentViewHelper
XControl xControl = getFormControl( xModel );
// the focus can be set to an XWindow only
- XWindow xControlWindow = (XWindow)UnoRuntime.queryInterface( XWindow.class,
+ XWindow xControlWindow = UnoRuntime.queryInterface( XWindow.class,
xControl );
// grab the focus
@@ -207,7 +207,7 @@ class DocumentViewHelper
XPropertySet xControlProps = UNO.queryPropertySet( xForm.getByIndex( i ) );
if ( FormComponentType.FIXEDTEXT != ((Short)xControlProps.getPropertyValue( "ClassId" )).shortValue() )
{
- XControlModel xControlModel = (XControlModel)UnoRuntime.queryInterface(
+ XControlModel xControlModel = UnoRuntime.queryInterface(
XControlModel.class, xControlProps );
// set the focus to this control
grabControlFocus( xControlModel );
diff --git a/main/odk/examples/DevelopersGuide/Forms/FLTools.java b/main/odk/examples/DevelopersGuide/Forms/FLTools.java
index 53fa37b9a1..a9242118b5 100644
--- a/main/odk/examples/DevelopersGuide/Forms/FLTools.java
+++ b/main/odk/examples/DevelopersGuide/Forms/FLTools.java
@@ -53,7 +53,7 @@ public class FLTools
URL[] aURL = new URL[] { new URL() };
aURL[0].Complete = sURL;
// need an URLTransformer
- XURLTransformer xTransformer = (XURLTransformer)UnoRuntime.queryInterface(
+ XURLTransformer xTransformer = UnoRuntime.queryInterface(
XURLTransformer.class,
xCtx.getServiceManager().createInstanceWithContext(
"com.sun.star.util.URLTransformer", xCtx ) );
@@ -67,7 +67,7 @@ public class FLTools
*/
public static String getName( Object aFormComponent ) throws com.sun.star.uno.Exception
{
- XNamed xNamed = (XNamed)UnoRuntime.queryInterface( XNamed.class,
+ XNamed xNamed = UnoRuntime.queryInterface( XNamed.class,
aFormComponent );
String sName = "";
if ( null != xNamed )
@@ -119,7 +119,7 @@ public class FLTools
int nIndex = -1;
// norm the element
- XInterface xElement = (XInterface)UnoRuntime.queryInterface(
+ XInterface xElement = UnoRuntime.queryInterface(
XInterface.class, aElement );
// get the container
@@ -131,7 +131,7 @@ public class FLTools
for ( int i = 0; i < nCount; ++i )
{
// compare with the element
- XInterface xCurrent = (XInterface)UnoRuntime.queryInterface(
+ XInterface xCurrent = UnoRuntime.queryInterface(
XInterface.class, xIndexCont.getByIndex( 0 ) );
if ( xCurrent.equals( xElement ) )
{ // found
@@ -150,7 +150,7 @@ public class FLTools
*/
static Object getParent( Object aComponent, Class aInterfaceClass )
{
- XChild xAsChild = (XChild)UnoRuntime.queryInterface( XChild.class, aComponent );
+ XChild xAsChild = UnoRuntime.queryInterface( XChild.class, aComponent );
return UnoRuntime.queryInterface( aInterfaceClass, xAsChild.getParent() );
}
@@ -168,7 +168,7 @@ public class FLTools
*/
static public void disposeComponent( Object xComp ) throws java.lang.RuntimeException
{
- XComponent xComponent = (XComponent)UnoRuntime.queryInterface( XComponent.class,
+ XComponent xComponent = UnoRuntime.queryInterface( XComponent.class,
xComp );
if ( null != xComponent )
xComponent.dispose();
@@ -179,7 +179,7 @@ public class FLTools
*/
static public Object getModel( Object aControl, Class aInterfaceClass )
{
- XControl xControl = (XControl)UnoRuntime.queryInterface(
+ XControl xControl = UnoRuntime.queryInterface(
XControl.class, aControl );
XControlModel xModel = null;
if ( null != xControl )
diff --git a/main/odk/examples/DevelopersGuide/Forms/FormLayer.java b/main/odk/examples/DevelopersGuide/Forms/FormLayer.java
index ecffa47927..63d2cc29cc 100644
--- a/main/odk/examples/DevelopersGuide/Forms/FormLayer.java
+++ b/main/odk/examples/DevelopersGuide/Forms/FormLayer.java
@@ -96,9 +96,9 @@ public class FormLayer
int nYPos, int nWidth, int nHeight, XIndexContainer xParentForm ) throws java.lang.Exception
{
// let the document create a shape
- XMultiServiceFactory xDocAsFactory = (XMultiServiceFactory)UnoRuntime.queryInterface(
+ XMultiServiceFactory xDocAsFactory = UnoRuntime.queryInterface(
XMultiServiceFactory.class, m_document.getDocument() );
- XControlShape xShape = (XControlShape)UnoRuntime.queryInterface( XControlShape.class,
+ XControlShape xShape = UnoRuntime.queryInterface( XControlShape.class,
xDocAsFactory.createInstance( "com.sun.star.drawing.ControlShape" ) );
// position and size of the shape
@@ -112,7 +112,7 @@ public class FormLayer
// create the form component (the model of a form control)
String sQualifiedComponentName = "com.sun.star.form.component." + sFormComponentService;
- XControlModel xModel = (XControlModel)UnoRuntime.queryInterface( XControlModel.class,
+ XControlModel xModel = UnoRuntime.queryInterface( XControlModel.class,
m_document.getOrb().createInstance( sQualifiedComponentName ) );
// insert the model into the form component hierarchy, if the caller gave us a location
@@ -127,7 +127,7 @@ public class FormLayer
// add the shape to the shapes collection of the document
XDrawPage pageWhereToInsert = ( m_insertPage != -1 ) ? m_document.getDrawPage( m_insertPage ) : m_document.getMainDrawPage();
- XShapes xDocShapes = (XShapes)UnoRuntime.queryInterface( XShapes.class, pageWhereToInsert );
+ XShapes xDocShapes = UnoRuntime.queryInterface( XShapes.class, pageWhereToInsert );
xDocShapes.add( xShape );
// some initializations which are the same for all controls
@@ -249,7 +249,7 @@ public class FormLayer
*/
public XPropertySet getRadioModelByRefValue( XPropertySet form, String name, String refValue ) throws com.sun.star.uno.Exception, java.lang.Exception
{
- XIndexAccess indexAccess = (XIndexAccess)UnoRuntime.queryInterface( XIndexAccess.class,
+ XIndexAccess indexAccess = UnoRuntime.queryInterface( XIndexAccess.class,
form );
for ( int i=0; i<indexAccess.getCount(); ++i )
@@ -274,7 +274,7 @@ public class FormLayer
*/
public XPropertySet getRadioModelByTag( XPropertySet form, String name, String tag ) throws com.sun.star.uno.Exception, java.lang.Exception
{
- XIndexAccess indexAccess = (XIndexAccess)UnoRuntime.queryInterface( XIndexAccess.class,
+ XIndexAccess indexAccess = UnoRuntime.queryInterface( XIndexAccess.class,
form );
for ( int i=0; i<indexAccess.getCount(); ++i )
diff --git a/main/odk/examples/DevelopersGuide/Forms/GridFieldValidator.java b/main/odk/examples/DevelopersGuide/Forms/GridFieldValidator.java
index 62b781fd93..b6db049160 100644
--- a/main/odk/examples/DevelopersGuide/Forms/GridFieldValidator.java
+++ b/main/odk/examples/DevelopersGuide/Forms/GridFieldValidator.java
@@ -65,7 +65,7 @@ class GridFieldValidator implements XUpdateListener
if ( bEnable == m_bWatching )
return;
- XUpdateBroadcaster xUpdate = (XUpdateBroadcaster)UnoRuntime.queryInterface(
+ XUpdateBroadcaster xUpdate = UnoRuntime.queryInterface(
XUpdateBroadcaster.class, m_xWatchedColumn );
if ( bEnable )
@@ -98,7 +98,7 @@ class GridFieldValidator implements XUpdateListener
);
// instantiate an interaction handler who can handle SQLExceptions
- XInteractionHandler xHandler = (XInteractionHandler)UnoRuntime.queryInterface(
+ XInteractionHandler xHandler = UnoRuntime.queryInterface(
XInteractionHandler.class,
m_xCtx.getServiceManager().createInstanceWithContext(
"com.sun.star.task.InteractionHandler", m_xCtx ) );
diff --git a/main/odk/examples/DevelopersGuide/Forms/HsqlDatabase.java b/main/odk/examples/DevelopersGuide/Forms/HsqlDatabase.java
index 736486258c..02e6b563a4 100644
--- a/main/odk/examples/DevelopersGuide/Forms/HsqlDatabase.java
+++ b/main/odk/examples/DevelopersGuide/Forms/HsqlDatabase.java
@@ -75,9 +75,9 @@ public class HsqlDatabase
{
m_databaseDocumentFile = _docURL;
- XNameAccess dbContext = (XNameAccess)UnoRuntime.queryInterface( XNameAccess.class,
+ XNameAccess dbContext = UnoRuntime.queryInterface( XNameAccess.class,
m_context.getServiceManager().createInstanceWithContext( "com.sun.star.sdb.DatabaseContext", m_context ) );
- XDocumentDataSource dataSource = (XDocumentDataSource)UnoRuntime.queryInterface( XDocumentDataSource.class,
+ XDocumentDataSource dataSource = UnoRuntime.queryInterface( XDocumentDataSource.class,
dbContext.getByName( _docURL ) );
m_databaseDocument = dataSource.getDatabaseDocument();
@@ -91,14 +91,14 @@ public class HsqlDatabase
documentFile.deleteOnExit();
m_databaseDocumentFile = URLHelper.getFileURLFromSystemPath( documentFile );
- m_databaseDocument = (XOfficeDatabaseDocument)UnoRuntime.queryInterface(
+ m_databaseDocument = UnoRuntime.queryInterface(
XOfficeDatabaseDocument.class, m_context.getServiceManager().createInstanceWithContext(
"com.sun.star.sdb.OfficeDatabaseDocument", m_context ) );
- XPropertySet dsProperties = (XPropertySet)UnoRuntime.queryInterface( XPropertySet.class, m_databaseDocument.getDataSource() );
+ XPropertySet dsProperties = UnoRuntime.queryInterface( XPropertySet.class, m_databaseDocument.getDataSource() );
dsProperties.setPropertyValue("URL", "sdbc:embedded:hsqldb");
- XStorable storable = (XStorable)UnoRuntime.queryInterface( XStorable.class, m_databaseDocument );
+ XStorable storable = UnoRuntime.queryInterface( XStorable.class, m_databaseDocument );
storable.storeAsURL( m_databaseDocumentFile, new PropertyValue[]{} );
}
@@ -130,7 +130,7 @@ public class HsqlDatabase
{
if ( m_databaseDocument != null )
{
- XStorable storeDoc = (XStorable)UnoRuntime.queryInterface( XStorable.class,
+ XStorable storeDoc = UnoRuntime.queryInterface( XStorable.class,
m_databaseDocument );
storeDoc.store();
}
@@ -144,7 +144,7 @@ public class HsqlDatabase
public void close()
{
// close connection
- XCloseable closeConn = (XCloseable)UnoRuntime.queryInterface( XCloseable.class,
+ XCloseable closeConn = UnoRuntime.queryInterface( XCloseable.class,
m_connection );
if ( closeConn != null )
{
@@ -159,7 +159,7 @@ public class HsqlDatabase
m_connection = null;
// close document
- com.sun.star.util.XCloseable closeDoc = (com.sun.star.util.XCloseable)UnoRuntime.queryInterface(
+ com.sun.star.util.XCloseable closeDoc = UnoRuntime.queryInterface(
com.sun.star.util.XCloseable.class, m_databaseDocument );
if ( closeDoc != null )
{
@@ -212,7 +212,7 @@ public class HsqlDatabase
*/
XModel getModel()
{
- return (XModel)UnoRuntime.queryInterface( XModel.class, m_databaseDocument );
+ return UnoRuntime.queryInterface( XModel.class, m_databaseDocument );
}
/** drops the table with a given name
diff --git a/main/odk/examples/DevelopersGuide/Forms/KeyGenerator.java b/main/odk/examples/DevelopersGuide/Forms/KeyGenerator.java
index f7ef34dbc0..a5b6879786 100644
--- a/main/odk/examples/DevelopersGuide/Forms/KeyGenerator.java
+++ b/main/odk/examples/DevelopersGuide/Forms/KeyGenerator.java
@@ -53,11 +53,11 @@ class UniqueColumnValue
if ( CommandType.COMMAND == aCommandType.intValue() )
{
// get the connection from the form
- XConnection xFormConn = (XConnection)UnoRuntime.queryInterface( XConnection.class,
+ XConnection xFormConn = UnoRuntime.queryInterface( XConnection.class,
xForm.getPropertyValue( "ActiveConnection" ) );
// and let it create a composer for us
XSQLQueryComposerFactory xComposerFac =
- (XSQLQueryComposerFactory)UnoRuntime.queryInterface(
+ UnoRuntime.queryInterface(
XSQLQueryComposerFactory.class, xFormConn );
XSQLQueryComposer xComposer = xComposerFac.createQueryComposer( );
@@ -65,7 +65,7 @@ class UniqueColumnValue
xComposer.setQuery( sCommand );
// and ask it for the table(s)
- XTablesSupplier xSuppTables = (XTablesSupplier)UnoRuntime.queryInterface(
+ XTablesSupplier xSuppTables = UnoRuntime.queryInterface(
XTablesSupplier.class, xComposer );
XNameAccess xTables = xSuppTables.getTables();
@@ -115,7 +115,7 @@ class UniqueColumnValue
protected int generatePrimaryKey( XPropertySet xForm, String sFieldName ) throws com.sun.star.uno.Exception
{
// get the current connection of the form
- XConnection xConn = (XConnection)UnoRuntime.queryInterface(
+ XConnection xConn = UnoRuntime.queryInterface(
XConnection.class, xForm.getPropertyValue( "ActiveConnection" ) );
// let it create a new statement
XStatement xStatement = xConn.createStatement();
@@ -130,7 +130,7 @@ class UniqueColumnValue
xResults.next( );
// get the value
- XRow xRow = (XRow)UnoRuntime.queryInterface( XRow.class, xResults );
+ XRow xRow = UnoRuntime.queryInterface( XRow.class, xResults );
int nFreeValue = xRow.getInt( 1 );
// dispose the temporary objects
@@ -154,10 +154,10 @@ class UniqueColumnValue
if ( ResultSetConcurrency.READ_ONLY != aConcurrency.intValue() )
{
// get the column object
- XColumnsSupplier xSuppCols = (XColumnsSupplier)UnoRuntime.queryInterface(
+ XColumnsSupplier xSuppCols = UnoRuntime.queryInterface(
XColumnsSupplier.class, xForm );
XNameAccess xCols = xSuppCols.getColumns();
- XColumnUpdate xCol = (XColumnUpdate)UnoRuntime.queryInterface(
+ XColumnUpdate xCol = UnoRuntime.queryInterface(
XColumnUpdate.class, xCols.getByName( sFieldName ) );
xCol.updateInt( generatePrimaryKey( xForm, sFieldName ) );
@@ -193,7 +193,7 @@ class KeyGeneratorForReset extends UniqueColumnValue implements XResetListener
*/
public void defaultNewRecordFocus( XPropertySet xForm ) throws com.sun.star.uno.Exception
{
- XIndexAccess xFormAsContainer = (XIndexAccess)UnoRuntime.queryInterface(
+ XIndexAccess xFormAsContainer = UnoRuntime.queryInterface(
XIndexAccess.class, xForm );
for ( int i = 0; i<xFormAsContainer.getCount(); ++i )
{
@@ -379,7 +379,7 @@ public class KeyGenerator
XReset xFormReset = UNO.queryReset( m_xForm );
xFormReset.removeResetListener( m_aResetKeyGenerator );
- XRowSetApproveBroadcaster xFormBroadcaster = (XRowSetApproveBroadcaster)UnoRuntime.queryInterface(
+ XRowSetApproveBroadcaster xFormBroadcaster = UnoRuntime.queryInterface(
XRowSetApproveBroadcaster.class, m_xForm );
xFormBroadcaster.removeRowSetApproveListener( m_aUpdateKeyGenerator );
@@ -394,7 +394,7 @@ public class KeyGenerator
// for resets
XReset xFormReset = UNO.queryReset( m_xForm );
// for approving actions
- XRowSetApproveBroadcaster xFormBroadcaster = (XRowSetApproveBroadcaster)UnoRuntime.queryInterface(
+ XRowSetApproveBroadcaster xFormBroadcaster = UnoRuntime.queryInterface(
XRowSetApproveBroadcaster.class, m_xForm );
if ( bGenerateOnReset )
diff --git a/main/odk/examples/DevelopersGuide/Forms/RowSet.java b/main/odk/examples/DevelopersGuide/Forms/RowSet.java
index dcbde98d05..e84dd03445 100644
--- a/main/odk/examples/DevelopersGuide/Forms/RowSet.java
+++ b/main/odk/examples/DevelopersGuide/Forms/RowSet.java
@@ -51,14 +51,14 @@ public class RowSet implements XRowSet, XRow
{
try
{
- m_rowSetProps = (XPropertySet)UnoRuntime.queryInterface(
+ m_rowSetProps = UnoRuntime.queryInterface(
XPropertySet.class, _context.getServiceManager().createInstanceWithContext( "com.sun.star.sdb.RowSet", _context ) );
m_rowSetProps.setPropertyValue( "DataSourceName", _dataSource );
m_rowSetProps.setPropertyValue( "CommandType", new Integer( _commandType ) );
m_rowSetProps.setPropertyValue( "Command", _command );
- m_rowSet = (XRowSet)UnoRuntime.queryInterface( XRowSet.class, m_rowSetProps );
- m_row = (XRow)UnoRuntime.queryInterface( XRow.class, m_rowSetProps );
+ m_rowSet = UnoRuntime.queryInterface( XRowSet.class, m_rowSetProps );
+ m_row = UnoRuntime.queryInterface( XRow.class, m_rowSetProps );
}
catch ( Exception e )
{
@@ -70,9 +70,9 @@ public class RowSet implements XRowSet, XRow
// misc
public int getColumnCount()
{
- XColumnsSupplier suppCols = (XColumnsSupplier)UnoRuntime.queryInterface(
+ XColumnsSupplier suppCols = UnoRuntime.queryInterface(
XColumnsSupplier.class, m_rowSet );
- XIndexAccess columns = (XIndexAccess)UnoRuntime.queryInterface(
+ XIndexAccess columns = UnoRuntime.queryInterface(
XIndexAccess.class, suppCols.getColumns() );
return columns.getCount();
}
diff --git a/main/odk/examples/DevelopersGuide/Forms/SalesFilter.java b/main/odk/examples/DevelopersGuide/Forms/SalesFilter.java
index 3bf15176fc..8644ae3429 100644
--- a/main/odk/examples/DevelopersGuide/Forms/SalesFilter.java
+++ b/main/odk/examples/DevelopersGuide/Forms/SalesFilter.java
@@ -427,7 +427,7 @@ class SalesFilter implements XActionListener, XPropertyChangeListener, XResetLis
m_xSalesForm.setPropertyValue( "ApplyFilter", new Boolean( true ) );
// and reload the form
- XLoadable xLoad = (XLoadable)UnoRuntime.queryInterface(
+ XLoadable xLoad = UnoRuntime.queryInterface(
XLoadable.class, m_xSalesForm );
xLoad.reload();
diff --git a/main/odk/examples/DevelopersGuide/Forms/SingleControlValidation.java b/main/odk/examples/DevelopersGuide/Forms/SingleControlValidation.java
index 0d43067d48..f3c95afbca 100644
--- a/main/odk/examples/DevelopersGuide/Forms/SingleControlValidation.java
+++ b/main/odk/examples/DevelopersGuide/Forms/SingleControlValidation.java
@@ -109,7 +109,7 @@ public class SingleControlValidation implements XFormComponentValidityListener
if ( controls[ i ].getPropertySetInfo().hasPropertyByName( "Border" ) )
controls[ i ].setPropertyValue( "Border", new Short( (short)2 ) );
- XValidatableFormComponent xComp = (XValidatableFormComponent)UnoRuntime.queryInterface( XValidatableFormComponent.class,
+ XValidatableFormComponent xComp = UnoRuntime.queryInterface( XValidatableFormComponent.class,
controls[ i ] );
xComp.addFormComponentValidityListener( this );
}
@@ -131,7 +131,7 @@ public class SingleControlValidation implements XFormComponentValidityListener
m_explanationField = m_formLayer.createControlAndShape( "FixedText", columnPos, controlPos, 70, 4, null );
m_explanationField.setPropertyValue( "Label", new String( "" ) );
- XValidatable xValidatable = (XValidatable)UnoRuntime.queryInterface( XValidatable.class, m_inputField );
+ XValidatable xValidatable = UnoRuntime.queryInterface( XValidatable.class, m_inputField );
xValidatable.setValidator( m_validator );
}
catch( java.lang.Exception e )
@@ -157,7 +157,7 @@ public class SingleControlValidation implements XFormComponentValidityListener
{
if ( m_inputField.equals( eventObject.Source ) )
{
- XValidatableFormComponent xComp = (XValidatableFormComponent)UnoRuntime.queryInterface( XValidatableFormComponent.class,
+ XValidatableFormComponent xComp = UnoRuntime.queryInterface( XValidatableFormComponent.class,
eventObject.Source );
// the current value
Object value = xComp.getCurrentValue();
diff --git a/main/odk/examples/DevelopersGuide/Forms/SpreadsheetDocument.java b/main/odk/examples/DevelopersGuide/Forms/SpreadsheetDocument.java
index 9c0d720752..c5da6e55ae 100644
--- a/main/odk/examples/DevelopersGuide/Forms/SpreadsheetDocument.java
+++ b/main/odk/examples/DevelopersGuide/Forms/SpreadsheetDocument.java
@@ -50,13 +50,13 @@ public class SpreadsheetDocument extends DocumentHelper
public XCellRange getSheet( int index ) throws com.sun.star.uno.Exception
{
- XSpreadsheetDocument spreadsheetDoc = (XSpreadsheetDocument)UnoRuntime.queryInterface( XSpreadsheetDocument.class,
+ XSpreadsheetDocument spreadsheetDoc = UnoRuntime.queryInterface( XSpreadsheetDocument.class,
m_documentComponent
);
- XIndexAccess sheets = (XIndexAccess)UnoRuntime.queryInterface( XIndexAccess.class,
+ XIndexAccess sheets = UnoRuntime.queryInterface( XIndexAccess.class,
spreadsheetDoc.getSheets()
);
- return (XCellRange)UnoRuntime.queryInterface( XCellRange.class,
+ return UnoRuntime.queryInterface( XCellRange.class,
sheets.getByIndex( index )
);
}
@@ -84,7 +84,7 @@ public class SpreadsheetDocument extends DocumentHelper
{
CellAddress address = new CellAddress( sheet, column, row );
Object[] initParam = new Object[] { new NamedValue( "BoundCell", address ) };
- cellBinding = (com.sun.star.form.binding.XValueBinding)UnoRuntime.queryInterface(
+ cellBinding = UnoRuntime.queryInterface(
com.sun.star.form.binding.XValueBinding.class,
createInstanceWithArguments(
supportIntegerValues ? "com.sun.star.table.ListPositionCellBinding"
@@ -112,7 +112,7 @@ public class SpreadsheetDocument extends DocumentHelper
CellRangeAddress rangeAddress = new CellRangeAddress( sheet, column,
topRow, column, bottomRow );
Object[] initParam = new Object[] { new NamedValue( "CellRange", rangeAddress ) };
- entrySource = (com.sun.star.form.binding.XListEntrySource)UnoRuntime.queryInterface(
+ entrySource = UnoRuntime.queryInterface(
com.sun.star.form.binding.XListEntrySource.class,
createInstanceWithArguments(
"com.sun.star.table.CellRangeListSource", initParam ) );
diff --git a/main/odk/examples/DevelopersGuide/Forms/SpreadsheetValueBinding.java b/main/odk/examples/DevelopersGuide/Forms/SpreadsheetValueBinding.java
index b59f217706..64247a5313 100644
--- a/main/odk/examples/DevelopersGuide/Forms/SpreadsheetValueBinding.java
+++ b/main/odk/examples/DevelopersGuide/Forms/SpreadsheetValueBinding.java
@@ -85,7 +85,7 @@ public class SpreadsheetValueBinding extends DocumentBasedExample
listSourceSheet, column, topRow, bottomRow );
// bind it to the list box
- XListEntrySink consumer = (XListEntrySink)UnoRuntime.queryInterface(
+ XListEntrySink consumer = UnoRuntime.queryInterface(
XListEntrySink.class, listBox );
consumer.setListEntrySource( entrySource );
@@ -98,7 +98,7 @@ public class SpreadsheetValueBinding extends DocumentBasedExample
String[] listContent = new String[] { "first", "second", "third", "forth", "fivth" };
for ( short row = topRow; row <= bottomRow; ++row )
{
- XTextRange cellText = (XTextRange)UnoRuntime.queryInterface(
+ XTextRange cellText = UnoRuntime.queryInterface(
XTextRange.class, exchangeSheet.getCellByPosition( column, row ) );
cellText.setString( listContent[row] );
}
@@ -115,7 +115,7 @@ public class SpreadsheetValueBinding extends DocumentBasedExample
/* ------------------------------------------------------------------ */
private void implBind( XPropertySet controlModel, XValueBinding binding ) throws com.sun.star.form.binding.IncompatibleTypesException
{
- XBindableValue bindable = (XBindableValue)UnoRuntime.queryInterface(
+ XBindableValue bindable = UnoRuntime.queryInterface(
XBindableValue.class, controlModel
);
bindable.setValueBinding( binding );
diff --git a/main/odk/examples/DevelopersGuide/Forms/SpreadsheetView.java b/main/odk/examples/DevelopersGuide/Forms/SpreadsheetView.java
index a04a3b0a7f..85ac4de409 100644
--- a/main/odk/examples/DevelopersGuide/Forms/SpreadsheetView.java
+++ b/main/odk/examples/DevelopersGuide/Forms/SpreadsheetView.java
@@ -52,16 +52,16 @@ public class SpreadsheetView extends DocumentViewHelper
try
{
// get the sheet to activate
- XSpreadsheetDocument doc = (XSpreadsheetDocument)UnoRuntime.queryInterface(
+ XSpreadsheetDocument doc = UnoRuntime.queryInterface(
XSpreadsheetDocument.class, getDocument().getDocument() );
- XIndexAccess sheets = (XIndexAccess)UnoRuntime.queryInterface(
+ XIndexAccess sheets = UnoRuntime.queryInterface(
XIndexAccess.class, doc.getSheets() );
- XSpreadsheet sheet = (XSpreadsheet)UnoRuntime.queryInterface(
+ XSpreadsheet sheet = UnoRuntime.queryInterface(
XSpreadsheet.class, sheets.getByIndex( sheetIndex ) );
// activate
- XSpreadsheetView view = (XSpreadsheetView)UnoRuntime.queryInterface(
+ XSpreadsheetView view = UnoRuntime.queryInterface(
XSpreadsheetView.class, getController() );
view.setActiveSheet( sheet );
}
diff --git a/main/odk/examples/DevelopersGuide/Forms/TableCellTextBinding.java b/main/odk/examples/DevelopersGuide/Forms/TableCellTextBinding.java
index d37877bfc6..245b900dbc 100644
--- a/main/odk/examples/DevelopersGuide/Forms/TableCellTextBinding.java
+++ b/main/odk/examples/DevelopersGuide/Forms/TableCellTextBinding.java
@@ -57,7 +57,7 @@ public class TableCellTextBinding
/** Creates a new instance of TableCellTextBinding */
public TableCellTextBinding( XCell cell )
{
- m_cellText = (XTextRange)UnoRuntime.queryInterface( XTextRange.class, cell );
+ m_cellText = UnoRuntime.queryInterface( XTextRange.class, cell );
m_newCellText = new String();
m_listeners = new java.util.LinkedList();
diff --git a/main/odk/examples/DevelopersGuide/Forms/UNO.java b/main/odk/examples/DevelopersGuide/Forms/UNO.java
index f966234548..b4e554dcce 100644
--- a/main/odk/examples/DevelopersGuide/Forms/UNO.java
+++ b/main/odk/examples/DevelopersGuide/Forms/UNO.java
@@ -34,37 +34,37 @@ public class UNO
{
public static XPropertySet queryPropertySet( Object aObject )
{
- return (XPropertySet)UnoRuntime.queryInterface( XPropertySet.class, aObject );
+ return UnoRuntime.queryInterface( XPropertySet.class, aObject );
}
public static XControlModel queryControlModel( Object aObject )
{
- return (XControlModel)UnoRuntime.queryInterface( XControlModel.class, aObject );
+ return UnoRuntime.queryInterface( XControlModel.class, aObject );
}
public static XIndexContainer queryIndexContainer( Object aObject )
{
- return (XIndexContainer)UnoRuntime.queryInterface( XIndexContainer.class, aObject );
+ return UnoRuntime.queryInterface( XIndexContainer.class, aObject );
}
public static XReset queryReset( Object aObject )
{
- return (XReset)UnoRuntime.queryInterface( XReset.class, aObject );
+ return UnoRuntime.queryInterface( XReset.class, aObject );
}
public static XServiceInfo queryServiceInfo( Object aObject )
{
- return (XServiceInfo)UnoRuntime.queryInterface( XServiceInfo.class, aObject );
+ return UnoRuntime.queryInterface( XServiceInfo.class, aObject );
... 54681 lines suppressed ...
(openoffice) 04/19: Lokalized Dutch
Posted by ji...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jimjag pushed a commit to branch AOO50X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit b316652052c2ffd9082db61184e30877f74565c8
Author: DiGro <di...@yahoo.co.uk>
AuthorDate: Wed Sep 30 14:47:32 2026 +0200
Lokalized Dutch
(cherry picked from commit 543a5886082b0c5c35069fb8c08ce0aed9f842f8)
---
.../res/helpimg/nl/names_as_addressing.png | Bin 2959 -> 7072 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/main/default_images/res/helpimg/nl/names_as_addressing.png b/main/default_images/res/helpimg/nl/names_as_addressing.png
index e6e897dbf8..8f969f8448 100644
Binary files a/main/default_images/res/helpimg/nl/names_as_addressing.png and b/main/default_images/res/helpimg/nl/names_as_addressing.png differ
(openoffice) 16/19: Remove unnecessary casts from calls to AnyConverter.toObject().
Posted by ji...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jimjag pushed a commit to branch AOO50X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit db94a49c9a015be85bb1fd91bf9c614732ed822b
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Sun Oct 11 18:38:07 2026 +0200
Remove unnecessary casts from calls to AnyConverter.toObject().
Patch by: me
(cherry picked from commit d71274f6c6476746b317e879878adcc8296dd01e)
---
.../org/openoffice/accessibility/AccessBridge.java | 4 +-
.../accessibility/WindowsAccessBridgeAdapter.java | 2 +-
.../java/accessibility/AccessibleTextImpl.java | 12 +++---
main/chart2/qa/complex/chart2/TestCaseOldAPI.java | 22 +++++------
.../sun/star/comp/xsltfilter/XSLTransformer.java | 30 +++++++--------
main/filter/source/xsltvalidate/XSLTValidate.java | 4 +-
main/forms/qa/integration/forms/DateValidator.java | 2 +-
main/forms/qa/integration/forms/TimeValidator.java | 2 +-
.../AcceleratorsConfigurationTest.java | 2 +-
.../CheckContextMenuInterceptor.java | 2 +-
.../qa/complex/framework/autosave/AutoSave.java | 4 +-
.../complex/framework/recovery/RecoveryTest.java | 12 +++---
.../com/sun/star/lib/uno/helper/Factory_Test.java | 12 +++---
.../java/com/sun/star/comp/loader/JavaLoader.java | 12 +++---
.../Accessibility/EventHandler.java | 8 ++--
.../Components/Addons/JobsAddon/AsyncJob.java | 4 +-
.../DevelopersGuide/Forms/DateValidator.java | 2 +-
.../DevelopersGuide/Forms/TimeValidator.java | 2 +-
.../DesktopEnvironment/FunctionHelper.java | 2 +-
.../AsciiFilter/FilterOptions.java | 4 +-
.../FlatXmlFilter_java/FlatXml.java | 10 ++---
.../java/Inspector/SourceCodeGenerator.java | 2 +-
.../src/main/java/ifc/drawing/_FillProperties.java | 8 ++--
.../java/ifc/drawing/_XDrawPageDuplicator.java | 4 +-
.../src/main/java/ifc/drawing/_XDrawView.java | 4 +-
.../src/main/java/ifc/frame/_XDesktop.java | 4 +-
.../main/java/ifc/frame/_XDocumentTemplates.java | 4 +-
.../src/main/java/ifc/frame/_XFramesSupplier.java | 12 +++---
.../src/main/java/ifc/lang/_ServiceManager.java | 2 +-
.../OOoRunner/src/main/java/ifc/sdb/_RowSet.java | 4 +-
.../main/java/ifc/sheet/_FunctionDescription.java | 2 +-
.../main/java/ifc/style/_CharacterProperties.java | 8 ++--
.../src/main/java/ifc/style/_PageProperties.java | 8 ++--
.../main/java/ifc/style/_ParagraphProperties.java | 12 +++---
.../src/main/java/ifc/table/_CellProperties.java | 8 ++--
.../src/main/java/ifc/text/_CellProperties.java | 3 +-
.../src/main/java/ifc/text/_TextSection.java | 12 +++---
.../main/java/ifc/text/_XTextFieldsSupplier.java | 4 +-
.../ifc/ucb/_XSortedDynamicResultSetFactory.java | 4 +-
.../ifc/xml/_UserDefinedAttributeSupplier.java | 8 ++--
.../mod/_cached/CachedContentResultSetFactory.java | 4 +-
.../_cached/CachedContentResultSetStubFactory.java | 4 +-
.../mod/_cached/CachedDynamicResultSetFactory.java | 4 +-
.../_cached/CachedDynamicResultSetStubFactory.java | 4 +-
.../mod/_dbaccess/OSingleSelectQueryComposer.java | 4 +-
.../src/main/java/mod/_forms/GenericModelTest.java | 2 +-
.../src/main/java/mod/_forms/ODatabaseForm.java | 6 +--
.../src/main/java/mod/_forms/OHiddenModel.java | 4 +-
.../src/main/java/mod/_fwk/DispatchRecorder.java | 4 +-
.../src/main/java/mod/_fwk/JobExecutor.java | 8 ++--
.../_rdbtdp/RegistryTypeDescriptionProvider.java | 4 +-
.../RegistryTypeDescriptionProvider.java | 4 +-
.../AccessibleEditableTextPara_PreviewCell.java | 4 +-
.../src/main/java/mod/_sc/ScAccessibleCell.java | 4 +-
.../mod/_sc/ScAccessibleDocumentPagePreview.java | 12 +++---
.../main/java/mod/_sc/ScAccessiblePageHeader.java | 16 ++++----
.../java/mod/_sc/ScAccessiblePageHeaderArea.java | 4 +-
.../main/java/mod/_sc/ScAccessiblePreviewCell.java | 4 +-
.../mod/_sc/ScAccessiblePreviewHeaderCell.java | 4 +-
.../java/mod/_sc/ScAccessiblePreviewTable.java | 4 +-
.../main/java/mod/_sc/ScAccessibleSpreadsheet.java | 4 +-
.../src/main/java/mod/_sc/ScAnnotationObj.java | 4 +-
.../main/java/mod/_sc/ScAnnotationShapeObj.java | 4 +-
.../src/main/java/mod/_sc/ScAnnotationsObj.java | 4 +-
.../src/main/java/mod/_sc/ScAreaLinkObj.java | 8 ++--
.../src/main/java/mod/_sc/ScAreaLinksObj.java | 4 +-
.../main/java/mod/_sc/ScAutoFormatFieldObj.java | 8 ++--
.../src/main/java/mod/_sc/ScAutoFormatObj.java | 4 +-
.../src/main/java/mod/_sc/ScAutoFormatsObj.java | 4 +-
.../src/main/java/mod/_sc/ScCellCursorObj.java | 4 +-
.../src/main/java/mod/_sc/ScCellFieldObj.java | 4 +-
.../src/main/java/mod/_sc/ScCellFieldsObj.java | 4 +-
.../java/mod/_sc/ScCellFormatsEnumeration.java | 4 +-
.../src/main/java/mod/_sc/ScCellFormatsObj.java | 4 +-
.../OOoRunner/src/main/java/mod/_sc/ScCellObj.java | 4 +-
.../src/main/java/mod/_sc/ScCellRangeObj.java | 4 +-
.../src/main/java/mod/_sc/ScCellRangesObj.java | 4 +-
.../src/main/java/mod/_sc/ScCellSearchObj.java | 4 +-
.../src/main/java/mod/_sc/ScCellTextCursor.java | 4 +-
.../src/main/java/mod/_sc/ScCellsEnumeration.java | 4 +-
.../src/main/java/mod/_sc/ScCellsObj.java | 4 +-
.../src/main/java/mod/_sc/ScChartObj.java | 12 +++---
.../src/main/java/mod/_sc/ScChartsObj.java | 4 +-
.../src/main/java/mod/_sc/ScDDELinkObj.java | 12 +++---
.../src/main/java/mod/_sc/ScDDELinksObj.java | 8 ++--
.../java/mod/_sc/ScDataPilotFieldGroupItemObj.java | 16 ++++----
.../java/mod/_sc/ScDataPilotFieldGroupObj.java | 16 ++++----
.../java/mod/_sc/ScDataPilotFieldGroupsObj.java | 16 ++++----
.../src/main/java/mod/_sc/ScDataPilotFieldObj.java | 12 +++---
.../main/java/mod/_sc/ScDataPilotFieldsObj.java | 4 +-
.../src/main/java/mod/_sc/ScDataPilotItemObj.java | 12 +++---
.../src/main/java/mod/_sc/ScDataPilotItemsObj.java | 12 +++---
.../src/main/java/mod/_sc/ScDataPilotTableObj.java | 8 ++--
.../main/java/mod/_sc/ScDataPilotTablesObj.java | 4 +-
.../src/main/java/mod/_sc/ScDatabaseRangeObj.java | 8 ++--
.../src/main/java/mod/_sc/ScDatabaseRangesObj.java | 4 +-
.../src/main/java/mod/_sc/ScDrawPageObj.java | 4 +-
.../main/java/mod/_sc/ScFilterDescriptorBase.java | 4 +-
.../src/main/java/mod/_sc/ScHeaderFieldObj.java | 12 +++---
.../src/main/java/mod/_sc/ScHeaderFieldsObj.java | 12 +++---
.../java/mod/_sc/ScHeaderFooterContentObj.java | 12 +++---
.../java/mod/_sc/ScHeaderFooterTextCursor.java | 12 +++---
.../main/java/mod/_sc/ScHeaderFooterTextObj.java | 12 +++---
...ndexEnumeration_CellAnnotationsEnumeration.java | 4 +-
...cIndexEnumeration_CellAreaLinksEnumeration.java | 4 +-
.../ScIndexEnumeration_DDELinksEnumeration.java | 8 ++--
...ndexEnumeration_DataPilotFieldsEnumeration.java | 4 +-
...IndexEnumeration_DataPilotItemsEnumeration.java | 12 +++---
...ndexEnumeration_DataPilotTablesEnumeration.java | 4 +-
...IndexEnumeration_DatabaseRangesEnumeration.java | 4 +-
.../ScIndexEnumeration_ScenariosEnumeration.java | 4 +-
...ndexEnumeration_SheetCellRangesEnumeration.java | 4 +-
.../ScIndexEnumeration_SheetLinksEnumeration.java | 4 +-
...numeration_SpreadsheetViewPanesEnumeration.java | 4 +-
...IndexEnumeration_SubTotalFieldsEnumeration.java | 4 +-
.../ScIndexEnumeration_TableChartsEnumeration.java | 4 +-
...ScIndexEnumeration_TableColumnsEnumeration.java | 4 +-
...umeration_TableConditionalEntryEnumeration.java | 4 +-
.../ScIndexEnumeration_TableRowsEnumeration.java | 4 +-
.../ScIndexEnumeration_TextFieldEnumeration.java | 4 +-
.../src/main/java/mod/_sc/ScLabelRangeObj.java | 4 +-
.../src/main/java/mod/_sc/ScModelObj.java | 4 +-
.../src/main/java/mod/_sc/ScNamedRangeObj.java | 4 +-
.../src/main/java/mod/_sc/ScNamedRangesObj.java | 4 +-
.../src/main/java/mod/_sc/ScScenariosObj.java | 4 +-
.../src/main/java/mod/_sc/ScSheetLinkObj.java | 8 ++--
.../src/main/java/mod/_sc/ScSheetLinksObj.java | 4 +-
.../src/main/java/mod/_sc/ScStyleFamilyObj.java | 4 +-
.../src/main/java/mod/_sc/ScStyleObj.java | 12 +++---
.../java/mod/_sc/ScSubTotalDescriptorBase.java | 4 +-
.../src/main/java/mod/_sc/ScSubTotalFieldObj.java | 8 ++--
.../src/main/java/mod/_sc/ScTabViewObj.java | 10 ++---
.../src/main/java/mod/_sc/ScTableColumnObj.java | 8 ++--
.../src/main/java/mod/_sc/ScTableColumnsObj.java | 4 +-
.../main/java/mod/_sc/ScTableConditionalEntry.java | 8 ++--
.../java/mod/_sc/ScTableConditionalFormat.java | 8 ++--
.../src/main/java/mod/_sc/ScTableRowObj.java | 8 ++--
.../src/main/java/mod/_sc/ScTableRowsObj.java | 4 +-
.../src/main/java/mod/_sc/ScTableSheetObj.java | 4 +-
.../main/java/mod/_sc/ScTableValidationObj.java | 8 ++--
.../src/main/java/mod/_sc/ScViewPaneObj.java | 10 ++---
.../src/main/java/mod/_sc/XMLContentExporter.java | 4 +-
.../src/main/java/mod/_sc/XMLExporter.java | 4 +-
.../src/main/java/mod/_sc/XMLStylesExporter.java | 4 +-
.../src/main/java/mod/_sch/ChXDiagram.java | 10 ++---
.../src/main/java/mod/_sch/ChartLine.java | 4 +-
.../java/mod/_sd/AccessibleDrawDocumentView.java | 4 +-
.../main/java/mod/_sd/DrawController_DrawView.java | 4 +-
.../java/mod/_sd/DrawController_HandoutView.java | 4 +-
.../java/mod/_sd/DrawController_NotesView.java | 4 +-
.../java/mod/_sd/DrawController_OutlineView.java | 4 +-
.../mod/_sd/DrawController_PresentationView.java | 4 +-
.../src/main/java/mod/_sd/SdDrawPage.java | 4 +-
.../src/main/java/mod/_sd/SdGenericDrawPage.java | 4 +-
.../OOoRunner/src/main/java/mod/_sd/SdLayer.java | 4 +-
.../src/main/java/mod/_sd/SdLayerManager.java | 4 +-
.../src/main/java/mod/_sd/SdMasterPage.java | 4 +-
.../src/main/java/mod/_sd/SdUnoDrawView.java | 4 +-
.../src/main/java/mod/_sd/SdUnoPresView.java | 8 ++--
.../main/java/mod/_sd/SdXCustomPresentation.java | 8 ++--
.../OOoRunner/src/main/java/mod/_sd/SdXShape.java | 12 +++---
.../java/mod/_servicemgr.uno/OServiceManager.java | 4 +-
.../src/main/java/mod/_smgr/OServiceManager.java | 4 +-
.../src/main/java/mod/_svx/SvxDrawPage.java | 2 +-
.../src/main/java/mod/_svx/SvxGraphicObject.java | 16 ++++----
.../OOoRunner/src/main/java/mod/_svx/SvxShape.java | 8 ++--
.../src/main/java/mod/_svx/SvxShapeCircle.java | 8 ++--
.../src/main/java/mod/_svx/SvxShapeConnector.java | 8 ++--
.../src/main/java/mod/_svx/SvxShapeControl.java | 8 ++--
.../main/java/mod/_svx/SvxShapeDimensioning.java | 8 ++--
.../src/main/java/mod/_svx/SvxShapeGroup.java | 12 +++---
.../main/java/mod/_svx/SvxShapePolyPolygon.java | 8 ++--
.../java/mod/_svx/SvxShapePolyPolygonBezier.java | 8 ++--
.../src/main/java/mod/_svx/SvxUnoTextContent.java | 4 +-
.../src/main/java/mod/_svx/SvxUnoTextRange.java | 8 ++--
.../java/mod/_svx/SvxUnoTextRangeEnumeration.java | 4 +-
.../main/java/mod/_sw/SwAccessibleFooterView.java | 8 ++--
.../main/java/mod/_sw/SwAccessibleHeaderView.java | 8 ++--
.../main/java/mod/_sw/SwAccessiblePageView.java | 8 ++--
.../src/main/java/mod/_sw/SwXAutoTextEntry.java | 6 +--
.../src/main/java/mod/_sw/SwXAutoTextGroup.java | 2 +-
.../src/main/java/mod/_sw/SwXHeadFootText.java | 8 ++--
.../src/main/java/mod/_sw/SwXNumberingRules.java | 12 +++---
.../src/main/java/mod/_sw/SwXParagraph.java | 12 +++---
.../OOoRunner/src/main/java/mod/_sw/SwXStyle.java | 8 ++--
.../src/main/java/mod/_sw/SwXStyleFamily.java | 4 +-
.../src/main/java/mod/_sw/SwXTextColumns.java | 12 +++---
.../main/java/mod/_sw/SwXTextEmbeddedObject.java | 4 +-
.../src/main/java/mod/_sw/SwXTextPortion.java | 8 ++--
.../java/mod/_sw/SwXTextPortionEnumeration.java | 4 +-
.../src/main/java/mod/_sw/SwXTextSection.java | 8 ++--
.../src/main/java/mod/_sw/SwXTextTableRow.java | 4 +-
.../src/main/java/mod/_sw/SwXTextView.java | 2 +-
.../src/main/java/mod/_toolkit/TabController.java | 2 +-
.../src/main/java/mod/_toolkit/UnoTreeControl.java | 2 +-
.../OOoRunner/src/main/java/util/CalcTools.java | 4 +-
.../OOoRunner/src/main/java/util/DrawTools.java | 4 +-
.../OOoRunner/src/main/java/util/FormTools.java | 6 +--
.../java/OOoRunner/src/main/java/util/utils.java | 8 ++--
main/sc/qa/complex/calcPreview/ViewForwarder.java | 44 +++++++++++-----------
.../complex/cellRanges/CheckXCellRangesQuery.java | 4 +-
main/sc/qa/complex/dataPilot/CheckDataPilot.java | 16 ++++----
.../examples/java/Highlight/HighlightText.java | 4 +-
.../examples/java/MemoryUsage/MemoryUsage.java | 4 +-
.../examples/java/selector/ScriptSelector.java | 4 +-
.../script/framework/provider/ScriptProvider.java | 4 +-
.../com/sun/star/comp/ucb/GlobalTransfer_Test.java | 2 +-
.../com/sun/star/wizards/db/DBMetaData.java | 2 +-
.../com/sun/star/wizards/db/RecordParser.java | 6 +--
.../com/sun/star/wizards/document/FormHandler.java | 4 +-
.../sun/star/wizards/text/TextStyleHandler.java | 4 +-
.../XMergeBridge/src/main/java/XMergeBridge.java | 12 +++---
212 files changed, 676 insertions(+), 681 deletions(-)
diff --git a/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/accessibility/AccessBridge.java b/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/accessibility/AccessBridge.java
index 70f66a11c9..c9f9d99f7e 100644
--- a/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/accessibility/AccessBridge.java
+++ b/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/accessibility/AccessBridge.java
@@ -154,8 +154,8 @@ public class AccessBridge {
try {
// FIXME: Currently there is no way to determine if key event forwarding is needed or not,
// so we have to do it always ..
- XExtendedToolkit unoToolkit = (XExtendedToolkit) AnyConverter.toObject(new Type(
- XExtendedToolkit.class), arguments[0]);
+ XExtendedToolkit unoToolkit = AnyConverter.toObject(
+ XExtendedToolkit.class, arguments[0]);
if (unoToolkit != null) {
// FIXME this should be done in VCL
diff --git a/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/accessibility/WindowsAccessBridgeAdapter.java b/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/accessibility/WindowsAccessBridgeAdapter.java
index 3731301179..2fe4ec7290 100644
--- a/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/accessibility/WindowsAccessBridgeAdapter.java
+++ b/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/accessibility/WindowsAccessBridgeAdapter.java
@@ -69,7 +69,7 @@ public class WindowsAccessBridgeAdapter {
if (AnyConverter.isObject(any)) {
XJavaVM xJavaVM = UnoRuntime.queryInterface(XJavaVM.class,
- AnyConverter.toObject(new Type(XJavaVM.class), any));
+ AnyConverter.toObject(XJavaVM.class, any));
if (xJavaVM != null) {
any = xJavaVM.getJavaVM(getProcessID());
diff --git a/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/AccessibleTextImpl.java b/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/AccessibleTextImpl.java
index 2235d3f4e6..37763eb7fe 100644
--- a/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/AccessibleTextImpl.java
+++ b/main/accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/AccessibleTextImpl.java
@@ -260,8 +260,8 @@ public class AccessibleTextImpl implements javax.accessibility.AccessibleText {
if (property.Value instanceof ParagraphAdjust) {
adjust = (ParagraphAdjust) property.Value;
} else if (property.Value instanceof Any) {
- adjust = (ParagraphAdjust) AnyConverter.toObject(new Type(
- ParagraphAdjust.class), property.Value);
+ adjust = AnyConverter.toObject(
+ ParagraphAdjust.class, property.Value);
} else {
adjust = ParagraphAdjust.fromInt(AnyConverter.toInt(
property.Value));
@@ -329,8 +329,8 @@ public class AccessibleTextImpl implements javax.accessibility.AccessibleText {
if (property.Value instanceof FontSlant) {
fs = (FontSlant) property.Value;
} else if (property.Value instanceof Any) {
- fs = (FontSlant) AnyConverter.toObject(new Type(
- FontSlant.class), property.Value);
+ fs = AnyConverter.toObject(
+ FontSlant.class, property.Value);
}
if (fs != null) {
@@ -354,8 +354,8 @@ public class AccessibleTextImpl implements javax.accessibility.AccessibleText {
if (property.Value instanceof LineSpacing) {
ls = (LineSpacing) property.Value;
} else if (property.Value instanceof Any) {
- ls = (LineSpacing) AnyConverter.toObject(new Type(
- LineSpacing.class), property.Value);
+ ls = AnyConverter.toObject(
+ LineSpacing.class, property.Value);
}
if (ls != null) {
diff --git a/main/chart2/qa/complex/chart2/TestCaseOldAPI.java b/main/chart2/qa/complex/chart2/TestCaseOldAPI.java
index 2175963431..939f4a782d 100644
--- a/main/chart2/qa/complex/chart2/TestCaseOldAPI.java
+++ b/main/chart2/qa/complex/chart2/TestCaseOldAPI.java
@@ -443,7 +443,7 @@ public class TestCaseOldAPI {
xLegendProp.setPropertyValue( "Alignment", eNewPos );
assertTrue( "Property Alignment",
AnyConverter.toObject(
- new Type( ChartLegendPosition.class ),
+ ChartLegendPosition.class,
xLegendProp.getPropertyValue( "Alignment" )) == eNewPos );
float fNewCharHeight = (float)(11.0);
@@ -491,8 +491,8 @@ public class TestCaseOldAPI {
// String aTestAttributeName = "test:foo";
// String aTestAttributeValue = "content";
-// XNameContainer xUserDefAttributes = (XNameContainer) AnyConverter.toObject(
-// new Type( XNameContainer.class ), xArea.getPropertyValue( "ChartUserDefinedAttributes" ));
+// XNameContainer xUserDefAttributes = AnyConverter.toObject(
+// XNameContainer.class, xArea.getPropertyValue( "ChartUserDefinedAttributes" ));
// xUserDefAttributes.insertByName( aTestAttributeName, aTestAttributeValue );
// String aContent = AnyConverter.toString( xUserDefAttributes.getByName( aTestAttributeName ));
@@ -635,8 +635,8 @@ public class TestCaseOldAPI {
xProp.setPropertyValue( "FillGradientName", aGradientName );
String aNewGradientName = AnyConverter.toString( xProp.getPropertyValue( "FillGradientName" ));
assertTrue( "GradientName", aNewGradientName.equals( aGradientName ));
- Gradient aNewGradient = (Gradient) AnyConverter.toObject(
- new Type( Gradient.class ),
+ Gradient aNewGradient = AnyConverter.toObject(
+ Gradient.class,
xGradientTable.getByName( aNewGradientName ));
assertTrue( "Gradient Style", aNewGradient.Style == aGradient.Style );
assertTrue( "Gradient StartColor", aNewGradient.StartColor == aGradient.StartColor );
@@ -672,8 +672,8 @@ public class TestCaseOldAPI {
xProp.setPropertyValue( "FillBackground", new Boolean( true ));
String aNewHatchName = AnyConverter.toString( xProp.getPropertyValue( "FillHatchName" ));
assertTrue( "HatchName", aNewHatchName.equals( aHatchName ));
- Hatch aNewHatch = (Hatch) AnyConverter.toObject(
- new Type( Hatch.class ),
+ Hatch aNewHatch = AnyConverter.toObject(
+ Hatch.class,
xHatchTable.getByName( aNewHatchName ));
assertTrue( "Hatch Style", aNewHatch.Style == aHatch.Style );
assertTrue( "Hatch Color", aNewHatch.Color == aHatch.Color );
@@ -723,7 +723,7 @@ public class TestCaseOldAPI {
xDiaProp.setPropertyValue( "DataRowSource", eNewSource );
assertTrue( "Couldn't set \"DataRowSource\" property at Diagram",
AnyConverter.toObject(
- new Type( ChartDataRowSource.class ),
+ ChartDataRowSource.class,
xDiaProp.getPropertyValue( "DataRowSource" )) == eNewSource );
double aData[][] =
@@ -860,7 +860,7 @@ public class TestCaseOldAPI {
xDiaProp.setPropertyValue( "DataRowSource", eNewSource );
assertTrue( "Couldn't set \"DataRowSource\" property at Diagram",
AnyConverter.toObject(
- new Type( ChartDataRowSource.class ),
+ ChartDataRowSource.class,
xDiaProp.getPropertyValue( "DataRowSource" )) == eNewSource );
XChartData xData = mxOldDoc.getData();
@@ -973,9 +973,9 @@ public class TestCaseOldAPI {
if( xProp != null )
try
{
- xResult = (XComponentContext)
+ xResult =
AnyConverter.toObject(
- new Type( XComponentContext.class ),
+ XComponentContext.class,
xProp.getPropertyValue( "DefaultContext" ) );
}
catch( Exception ex )
diff --git a/main/filter/source/xsltfilter/com/sun/star/comp/xsltfilter/XSLTransformer.java b/main/filter/source/xsltfilter/com/sun/star/comp/xsltfilter/XSLTransformer.java
index ac88ffc35a..b68cbca538 100644
--- a/main/filter/source/xsltfilter/com/sun/star/comp/xsltfilter/XSLTransformer.java
+++ b/main/filter/source/xsltfilter/com/sun/star/comp/xsltfilter/XSLTransformer.java
@@ -145,33 +145,33 @@ public class XSLTransformer
debug("The transformation's parameters as 'name = value' pairs:\n");
for (int i = 0; i < values.length; i++) {
- nv = (NamedValue) AnyConverter.toObject(new Type(NamedValue.class), values[i]);
+ nv = AnyConverter.toObject(NamedValue.class, values[i]);
if (nv.Name != null && !nv.Name.equals("")) {
debug(nv.Name + " = " + nv.Value);
}
if (nv.Name.equals("StylesheetURL")) {
- stylesheeturl = (String) AnyConverter.toObject(
- new Type(String.class), nv.Value);
+ stylesheeturl = AnyConverter.toObject(
+ String.class, nv.Value);
} else if (nv.Name.equals("SourceURL")) {
- sourceurl = (String) AnyConverter.toObject(
- new Type(String.class), nv.Value);
+ sourceurl = AnyConverter.toObject(
+ String.class, nv.Value);
} else if (nv.Name.equals("TargetURL")) {
- targeturl = (String) AnyConverter.toObject(
- new Type(String.class), nv.Value);
+ targeturl = AnyConverter.toObject(
+ String.class, nv.Value);
} else if (nv.Name.equals("SourceBaseURL")) {
- sourcebaseurl = (String) AnyConverter.toObject(
- new Type(String.class), nv.Value);
+ sourcebaseurl = AnyConverter.toObject(
+ String.class, nv.Value);
} else if (nv.Name.equals("TargetBaseURL")) {
- targetbaseurl = (String) AnyConverter.toObject(
- new Type(String.class), nv.Value);
+ targetbaseurl = AnyConverter.toObject(
+ String.class, nv.Value);
} else if (nv.Name.equals("SystemType")) {
- systype = (String) AnyConverter.toObject(
- new Type(String.class), nv.Value);
+ systype = AnyConverter.toObject(
+ String.class, nv.Value);
} else if (nv.Name.equals("PublicType")) {
- pubtype = (String) AnyConverter.toObject(
- new Type(String.class), nv.Value);
+ pubtype = AnyConverter.toObject(
+ String.class, nv.Value);
}
}
}
diff --git a/main/filter/source/xsltvalidate/XSLTValidate.java b/main/filter/source/xsltvalidate/XSLTValidate.java
index 8305f52eca..891640c3c9 100644
--- a/main/filter/source/xsltvalidate/XSLTValidate.java
+++ b/main/filter/source/xsltvalidate/XSLTValidate.java
@@ -108,10 +108,10 @@ public class XSLTValidate {
try{
//System.out.println("\n"+pValue[i].Name+" "+pValue[i].Value);
if (pValue[i].Name.compareTo("InputStream")==0){
- xis=(com.sun.star.io.XInputStream)AnyConverter.toObject(new Type(com.sun.star.io.XInputStream.class), pValue[i].Value);
+ xis=AnyConverter.toObject(com.sun.star.io.XInputStream.class, pValue[i].Value);
}
else if (pValue[i].Name.compareTo("ErrorHandler")==0){
- xErrorHandler=(com.sun.star.xml.sax.XErrorHandler)AnyConverter.toObject(new Type(com.sun.star.xml.sax.XErrorHandler.class), pValue[i].Value);
+ xErrorHandler=AnyConverter.toObject(com.sun.star.xml.sax.XErrorHandler.class, pValue[i].Value);
}
}
catch(com.sun.star.lang.IllegalArgumentException AnyExec){
diff --git a/main/forms/qa/integration/forms/DateValidator.java b/main/forms/qa/integration/forms/DateValidator.java
index 867989a2f1..e92c7fffcb 100644
--- a/main/forms/qa/integration/forms/DateValidator.java
+++ b/main/forms/qa/integration/forms/DateValidator.java
@@ -64,7 +64,7 @@ public class DateValidator extends integration.forms.ControlValidator
if ( isVoid( Value ) )
return false;
- com.sun.star.util.Date dateValue = (com.sun.star.util.Date)
+ com.sun.star.util.Date dateValue =
com.sun.star.uno.AnyConverter.toObject(
com.sun.star.util.Date.class, Value);
if ( isDedicatedInvalidDate( dateValue ) )
diff --git a/main/forms/qa/integration/forms/TimeValidator.java b/main/forms/qa/integration/forms/TimeValidator.java
index df45ee77ea..282c372765 100644
--- a/main/forms/qa/integration/forms/TimeValidator.java
+++ b/main/forms/qa/integration/forms/TimeValidator.java
@@ -63,7 +63,7 @@ public class TimeValidator extends integration.forms.ControlValidator
if ( isVoid( Value ) )
return false;
- com.sun.star.util.Time timeValue = (com.sun.star.util.Time)
+ com.sun.star.util.Time timeValue =
com.sun.star.uno.AnyConverter.toObject(
com.sun.star.util.Time.class, Value);
if ( isInvalidTime( timeValue ) )
diff --git a/main/framework/qa/complex/accelerators/AcceleratorsConfigurationTest.java b/main/framework/qa/complex/accelerators/AcceleratorsConfigurationTest.java
index c5ccd3e37d..d5acb8366e 100644
--- a/main/framework/qa/complex/accelerators/AcceleratorsConfigurationTest.java
+++ b/main/framework/qa/complex/accelerators/AcceleratorsConfigurationTest.java
@@ -540,7 +540,7 @@ public class AcceleratorsConfigurationTest
{
System.out.println("get preferred key for command " + sCommandList[i] + ":");
- KeyEvent aKeyEvent = (KeyEvent) AnyConverter.toObject(KeyEvent.class, oKeyEvents[i]);
+ KeyEvent aKeyEvent = AnyConverter.toObject(KeyEvent.class, oKeyEvents[i]);
String sKeyEvent = convertAWTKey2Shortcut(aKeyEvent);
System.out.println(sKeyEvent);
diff --git a/main/framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java b/main/framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java
index fb3fb8434e..105e687f80 100644
--- a/main/framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java
+++ b/main/framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java
@@ -162,7 +162,7 @@ public class CheckContextMenuInterceptor
// String sFile = util.utils.getFullTestURL("space-metal.jpg");
oShapeProps.setPropertyValue("GraphicURL", sFile);
Object oProp = oShapeProps.getPropertyValue("GraphicObjectFillBitmap");
- xBitmap = (XBitmap) AnyConverter.toObject(new Type(XBitmap.class), oProp);
+ xBitmap = AnyConverter.toObject(XBitmap.class, oProp);
}
catch (com.sun.star.lang.WrappedTargetException e)
{
diff --git a/main/framework/qa/complex/framework/autosave/AutoSave.java b/main/framework/qa/complex/framework/autosave/AutoSave.java
index 8b3da1a541..b31401aef2 100644
--- a/main/framework/qa/complex/framework/autosave/AutoSave.java
+++ b/main/framework/qa/complex/framework/autosave/AutoSave.java
@@ -254,8 +254,8 @@ public class AutoSave
XSpreadsheetDocument xSheetDoc = m_aSOF.createCalcDoc("_default");
m_aLog.log("Retrieve first sheet from calc document.");
XSpreadsheets xSheets = xSheetDoc.getSheets();
- XSpreadsheet xSheet = (XSpreadsheet)AnyConverter.toObject(
- new Type(XSpreadsheet.class),
+ XSpreadsheet xSheet = AnyConverter.toObject(
+ XSpreadsheet.class,
xSheets.getByName(
xSheets.getElementNames()[0]));
m_aLog.log("Fill two cells with value and formula.");
diff --git a/main/framework/qa/complex/framework/recovery/RecoveryTest.java b/main/framework/qa/complex/framework/recovery/RecoveryTest.java
index e39f203e27..11af4f9bf2 100644
--- a/main/framework/qa/complex/framework/recovery/RecoveryTest.java
+++ b/main/framework/qa/complex/framework/recovery/RecoveryTest.java
@@ -813,8 +813,8 @@ public class RecoveryTest {
UnoRuntime.queryInterface(XIndexAccess.class, oDPn);
XDrawPage oDP = null;
try {
- oDP = (XDrawPage) AnyConverter.toObject(
- new Type(XDrawPage.class),oDPi.getByIndex(0));
+ oDP = AnyConverter.toObject(
+ XDrawPage.class,oDPi.getByIndex(0));
} catch (com.sun.star.lang.WrappedTargetException e) {
System.out.println("Could not get Draw pages while filling Draw document with content.");
fail("Couldn't create test environment");
@@ -847,8 +847,8 @@ public class RecoveryTest {
UnoRuntime.queryInterface(XPropertySet.class, oObj);
XStyle aStyle = null;
try {
- aStyle = (XStyle) AnyConverter.toObject(
- new Type(XStyle.class),oShapeProps.getPropertyValue("Style"));
+ aStyle = AnyConverter.toObject(
+ XStyle.class,oShapeProps.getPropertyValue("Style"));
oShapeProps.setPropertyValue("ZOrder", new Integer(1));
} catch (com.sun.star.lang.WrappedTargetException e) {
System.out.println("Exception occurred while setting or getting property value while filling Draw document with content.");
@@ -931,8 +931,8 @@ public class RecoveryTest {
try{
XSpreadsheets oSpreadsheets = xSpreadsheetDoc.getSheets();
- XSpreadsheet oSheet = (XSpreadsheet) AnyConverter.toObject(
- new Type(XSpreadsheet.class),
+ XSpreadsheet oSheet = AnyConverter.toObject(
+ XSpreadsheet.class,
oSpreadsheets.getByName(
oSpreadsheets.getElementNames()[0]));
diff --git a/main/javaunohelper/test/com/sun/star/lib/uno/helper/Factory_Test.java b/main/javaunohelper/test/com/sun/star/lib/uno/helper/Factory_Test.java
index 0c8b7f9ad9..43f87f97c9 100644
--- a/main/javaunohelper/test/com/sun/star/lib/uno/helper/Factory_Test.java
+++ b/main/javaunohelper/test/com/sun/star/lib/uno/helper/Factory_Test.java
@@ -154,15 +154,15 @@ public class Factory_Test
XMultiServiceFactory xMgr = RegistryServiceFactory.create( rdb );
XPropertySet xProps = UnoRuntime.queryInterface(
XPropertySet.class, xMgr );
- XComponentContext xContext = (XComponentContext)AnyConverter.toObject(
- new Type( XComponentContext.class ), xProps.getPropertyValue( "DefaultContext" ) );
+ XComponentContext xContext = AnyConverter.toObject(
+ XComponentContext.class, xProps.getPropertyValue( "DefaultContext" ) );
// insert java loader
- XSet xSet = (XSet)AnyConverter.toObject(
- new Type( XSet.class ), xContext.getServiceManager() );
+ XSet xSet = AnyConverter.toObject(
+ XSet.class, xContext.getServiceManager() );
xSet.insert( new com.sun.star.comp.loader.JavaLoaderFactory( xMgr ) );
// get rdb of smgr
- XSimpleRegistry xRDB = (XSimpleRegistry)AnyConverter.toObject(
- new Type( XSimpleRegistry.class ), xProps.getPropertyValue( "Registry" ) );
+ XSimpleRegistry xRDB = AnyConverter.toObject(
+ XSimpleRegistry.class, xProps.getPropertyValue( "Registry" ) );
// register impl
XImplementationRegistration xImpReg =
UnoRuntime.queryInterface(
diff --git a/main/jurt/java/jurt/src/main/java/com/sun/star/comp/loader/JavaLoader.java b/main/jurt/java/jurt/src/main/java/com/sun/star/comp/loader/JavaLoader.java
index ef79cc06a8..a84605e6fb 100644
--- a/main/jurt/java/jurt/src/main/java/com/sun/star/comp/loader/JavaLoader.java
+++ b/main/jurt/java/jurt/src/main/java/com/sun/star/comp/loader/JavaLoader.java
@@ -104,12 +104,12 @@ public class JavaLoader implements XImplementationLoader,
"service manager does not support XPropertySet!",
this );
}
- XComponentContext xContext = (XComponentContext)
+ XComponentContext xContext =
AnyConverter.toObject(
- new Type( XComponentContext.class ),
+ XComponentContext.class,
xProps.getPropertyValue( "DefaultContext" ) );
- m_xMacroExpander = (XMacroExpander)AnyConverter.toObject(
- new Type( XMacroExpander.class ),
+ m_xMacroExpander = AnyConverter.toObject(
+ XMacroExpander.class,
xContext.getValueByName(
"/singletons/com.sun.star.util.theMacroExpander" )
);
@@ -184,8 +184,8 @@ public class JavaLoader implements XImplementationLoader,
if (args.length == 0) throw new com.sun.star.lang.IllegalArgumentException("No arguments specified");
try {
- multiServiceFactory = (XMultiServiceFactory) AnyConverter.toObject(
- new Type(XMultiServiceFactory.class), args[0]);
+ multiServiceFactory = AnyConverter.toObject(
+ XMultiServiceFactory.class, args[0]);
}
catch (ClassCastException castEx) {
throw new com.sun.star.lang.IllegalArgumentException(
diff --git a/main/odk/examples/DevelopersGuide/Accessibility/EventHandler.java b/main/odk/examples/DevelopersGuide/Accessibility/EventHandler.java
index 3fb5035f7a..3c840e4fba 100644
--- a/main/odk/examples/DevelopersGuide/Accessibility/EventHandler.java
+++ b/main/odk/examples/DevelopersGuide/Accessibility/EventHandler.java
@@ -387,8 +387,8 @@ public class EventHandler
XAccessible xAccessible = null;
try
{
- xAccessible = (XAccessible)AnyConverter.toObject(
- new Type(XAccessible.class), aObject);
+ xAccessible = AnyConverter.toObject(
+ XAccessible.class, aObject);
}
catch (com.sun.star.lang.IllegalArgumentException e)
{}
@@ -397,8 +397,8 @@ public class EventHandler
else
try
{
- xContext = (XAccessibleContext)AnyConverter.toObject(
- new Type(XAccessibleContext.class), aObject);
+ xContext = AnyConverter.toObject(
+ XAccessibleContext.class, aObject);
}
catch (com.sun.star.lang.IllegalArgumentException e)
{}
diff --git a/main/odk/examples/DevelopersGuide/Components/Addons/JobsAddon/AsyncJob.java b/main/odk/examples/DevelopersGuide/Components/Addons/JobsAddon/AsyncJob.java
index 18b1120d7e..d36d413be7 100644
--- a/main/odk/examples/DevelopersGuide/Components/Addons/JobsAddon/AsyncJob.java
+++ b/main/odk/examples/DevelopersGuide/Components/Addons/JobsAddon/AsyncJob.java
@@ -135,8 +135,8 @@ public class AsyncJob extends WeakBase implements XServiceInfo, XAsyncJob
sEventName = com.sun.star.uno.AnyConverter.toString(lEnvironment[i].Value);
else
if (lEnvironment[i].Name.equals("Frame"))
- xFrame = (com.sun.star.frame.XFrame)com.sun.star.uno.AnyConverter.toObject(
- new com.sun.star.uno.Type(com.sun.star.frame.XFrame.class),
+ xFrame = com.sun.star.uno.AnyConverter.toObject(
+ com.sun.star.frame.XFrame.class,
lEnvironment[i].Value);
}
diff --git a/main/odk/examples/DevelopersGuide/Forms/DateValidator.java b/main/odk/examples/DevelopersGuide/Forms/DateValidator.java
index 8433dd61eb..5476575b11 100644
--- a/main/odk/examples/DevelopersGuide/Forms/DateValidator.java
+++ b/main/odk/examples/DevelopersGuide/Forms/DateValidator.java
@@ -63,7 +63,7 @@ public class DateValidator extends ControlValidator
if ( isVoid( Value ) )
return false;
- com.sun.star.util.Date dateValue = (com.sun.star.util.Date)
+ com.sun.star.util.Date dateValue =
com.sun.star.uno.AnyConverter.toObject(
com.sun.star.util.Date.class, Value);
if ( isDedicatedInvalidDate( dateValue ) )
diff --git a/main/odk/examples/DevelopersGuide/Forms/TimeValidator.java b/main/odk/examples/DevelopersGuide/Forms/TimeValidator.java
index 58b3ed65a2..0401924b75 100644
--- a/main/odk/examples/DevelopersGuide/Forms/TimeValidator.java
+++ b/main/odk/examples/DevelopersGuide/Forms/TimeValidator.java
@@ -62,7 +62,7 @@ public class TimeValidator extends ControlValidator
if ( isVoid( Value ) )
return false;
- com.sun.star.util.Time timeValue = (com.sun.star.util.Time)
+ com.sun.star.util.Time timeValue =
com.sun.star.uno.AnyConverter.toObject(
com.sun.star.util.Time.class, Value);
if ( isInvalidTime( timeValue ) )
diff --git a/main/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java b/main/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java
index 5eac6acfe1..7deaf43622 100644
--- a/main/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java
+++ b/main/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java
@@ -952,7 +952,7 @@ public class FunctionHelper
int nCount = xContainer.getCount();
for (int i=0; i<nCount; ++i )
{
- com.sun.star.frame.XFrame xFrame = (com.sun.star.frame.XFrame)AnyConverter.toObject(new com.sun.star.uno.Type(com.sun.star.frame.XFrame.class), xContainer.getByIndex(i));
+ com.sun.star.frame.XFrame xFrame = AnyConverter.toObject(com.sun.star.frame.XFrame.class, xContainer.getByIndex(i));
sName = new String(BASEFRAMENAME+mnViewCount);
while(sName.compareTo(xFrame.getName())==0)
{
diff --git a/main/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/FilterOptions.java b/main/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/FilterOptions.java
index 1223e02815..86b1420658 100644
--- a/main/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/FilterOptions.java
+++ b/main/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/FilterOptions.java
@@ -131,10 +131,10 @@ public class FilterOptions
m_sURL = AnyConverter.toString(lDescriptor[i].Value);
else
if (lDescriptor[i].Name.equals("InputStream"))
- m_xInput = (com.sun.star.io.XInputStream)AnyConverter.toObject(new com.sun.star.uno.Type(com.sun.star.io.XInputStream.class), lDescriptor[i].Value);
+ m_xInput = AnyConverter.toObject(com.sun.star.io.XInputStream.class, lDescriptor[i].Value);
else
if (lDescriptor[i].Name.equals("OutputStream"))
- m_xOutput = (com.sun.star.io.XOutputStream)AnyConverter.toObject(new com.sun.star.uno.Type(com.sun.star.io.XOutputStream.class), lDescriptor[i].Value);
+ m_xOutput = AnyConverter.toObject(com.sun.star.io.XOutputStream.class, lDescriptor[i].Value);
else
if (lDescriptor[i].Name.equals("FilterData"))
{
diff --git a/main/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_java/FlatXml.java b/main/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_java/FlatXml.java
index 458e4b7efb..1bd70f25cd 100644
--- a/main/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_java/FlatXml.java
+++ b/main/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_java/FlatXml.java
@@ -114,11 +114,11 @@ public class FlatXml implements XImportFilter, XExportFilter, XServiceName,
{
sName = aSourceData[i].Name;
if (sName.equals("InputStream"))
- xin = (XInputStream)AnyConverter.toObject(XInputStream.class, aSourceData[i].Value);
+ xin = AnyConverter.toObject(XInputStream.class, aSourceData[i].Value);
if (sName.equals("URL"))
- sURL=(String)AnyConverter.toObject(String.class, aSourceData[i].Value);
+ sURL=AnyConverter.toObject(String.class, aSourceData[i].Value);
if (sName.equals("FileName"))
- sFileName=(String)AnyConverter.toObject(String.class, aSourceData[i].Value);
+ sFileName=AnyConverter.toObject(String.class, aSourceData[i].Value);
}
Object tmpObj=m_xServiceFactory.createInstance("com.sun.star.xml.sax.Parser");
@@ -154,9 +154,9 @@ public class FlatXml implements XImportFilter, XExportFilter, XServiceName,
{
sName = aSourceData[i].Name;
if (sName.equals("OutputStream"))
- xos = (XOutputStream)AnyConverter.toObject(XOutputStream.class, aSourceData[i].Value);
+ xos = AnyConverter.toObject(XOutputStream.class, aSourceData[i].Value);
if (sName.equals("URL"))
- sURL=(String)AnyConverter.toObject(String.class, aSourceData[i].Value);
+ sURL=AnyConverter.toObject(String.class, aSourceData[i].Value);
}
// prepare the XML writer
diff --git a/main/odk/examples/java/Inspector/SourceCodeGenerator.java b/main/odk/examples/java/Inspector/SourceCodeGenerator.java
index 3161c8e007..64744ba6f8 100644
--- a/main/odk/examples/java/Inspector/SourceCodeGenerator.java
+++ b/main/odk/examples/java/Inspector/SourceCodeGenerator.java
@@ -968,7 +968,7 @@ class UnoObjectDefinition{
sReturn = "Object oUnoObject = " + _sObjectDescription + ";\n\t";
bIsPropertyUnoObjectDefined = true;
}
- sReturn += _sReturnVariableName + " = (" + sShortTypeName + ") AnyConverter.toObject(" + sShortTypeName + ".class, oUnoObject);";
+ sReturn += _sReturnVariableName + " = AnyConverter.toObject(" + sShortTypeName + ".class, oUnoObject);";
// this.bAddTypeImport = true;
break;
}
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/ifc/drawing/_FillProperties.java b/main/qadevOOo/java/OOoRunner/src/main/java/ifc/drawing/_FillProperties.java
index f128a64f67..1ddf262952 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/ifc/drawing/_FillProperties.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/ifc/drawing/_FillProperties.java
@@ -180,13 +180,13 @@ public class _FillProperties extends MultiPropertyTest {
oObj.setPropertyValue("FillBitmapURL", util.utils.getFullTestURL("crazy-blue.jpg"));
- the_bitmap = (XBitmap) AnyConverter.toObject(
- new Type(XBitmap.class), oObj.getPropertyValue("FillBitmap"));
+ the_bitmap = AnyConverter.toObject(
+ XBitmap.class, oObj.getPropertyValue("FillBitmap"));
oObj.setPropertyValue("FillBitmapURL", util.utils.getFullTestURL("space-metal.jpg"));
- the_secondBitmap = (XBitmap) AnyConverter.toObject(
- new Type(XBitmap.class), oObj.getPropertyValue("FillBitmap"));
+ the_secondBitmap = AnyConverter.toObject(
+ XBitmap.class, oObj.getPropertyValue("FillBitmap"));
testProperty("FillBitmap", BitmapTester);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/ifc/drawing/_XDrawPageDuplicator.java b/main/qadevOOo/java/OOoRunner/src/main/java/ifc/drawing/_XDrawPageDuplicator.java
index 6a1bc68f73..2397a5a47e 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/ifc/drawing/_XDrawPageDuplicator.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/ifc/drawing/_XDrawPageDuplicator.java
@@ -66,8 +66,8 @@ public class _XDrawPageDuplicator extends MultiMethodTest {
XDrawPages DPs = PS.getDrawPages();
XDrawPage DP = null;
try {
- DP = (XDrawPage) AnyConverter.toObject(
- new Type(XDrawPage.class),DPs.getByIndex(0));
+ DP = AnyConverter.toObject(
+ XDrawPage.class,DPs.getByIndex(0));
} catch (com.sun.star.lang.WrappedTargetException e) {
log.println("Exception occurred while testing: " + e);
} catch (com.sun.star.lang.IndexOutOfBoundsException e) {
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/ifc/drawing/_XDrawView.java b/main/qadevOOo/java/OOoRunner/src/main/java/ifc/drawing/_XDrawView.java
index d3f0b49890..08d6c44357 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/ifc/drawing/_XDrawView.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/ifc/drawing/_XDrawView.java
@@ -78,8 +78,8 @@ public class _XDrawView extends MultiMethodTest {
try {
XDrawPages the_pages = (XDrawPages) tEnv.getObjRelation("Pages");
the_pages.insertNewByIndex(0);
- XDrawPage newPage = (XDrawPage) AnyConverter.toObject(
- new Type(XDrawPage.class),the_pages.getByIndex(1));
+ XDrawPage newPage = AnyConverter.toObject(
+ XDrawPage.class,the_pages.getByIndex(1));
oObj.setCurrentPage(newPage);
XDrawPage getting = oObj.getCurrentPage();
boolean eq = newPage.equals(getting);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/ifc/frame/_XDesktop.java b/main/qadevOOo/java/OOoRunner/src/main/java/ifc/frame/_XDesktop.java
index 3d5f0121fc..37f6952ce2 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/ifc/frame/_XDesktop.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/ifc/frame/_XDesktop.java
@@ -64,8 +64,8 @@ public class _XDesktop extends MultiMethodTest {
for (; xEnum.hasMoreElements();) {
XInterface xInt = null;
try {
- xInt = (XInterface) AnyConverter.toObject(
- new Type(XInterface.class), xEnum.nextElement());
+ xInt = AnyConverter.toObject(
+ XInterface.class, xEnum.nextElement());
} catch (com.sun.star.lang.IllegalArgumentException iae) {
log.println("Can't convert any");
}
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/ifc/frame/_XDocumentTemplates.java b/main/qadevOOo/java/OOoRunner/src/main/java/ifc/frame/_XDocumentTemplates.java
index 72a12b8658..2136fa34e0 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/ifc/frame/_XDocumentTemplates.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/ifc/frame/_XDocumentTemplates.java
@@ -237,8 +237,8 @@ public class _XDocumentTemplates extends MultiMethodTest {
XDynamicResultSet DynResSet = null;
try {
- DynResSet = (XDynamicResultSet) AnyConverter.toObject(
- new Type(XDynamicResultSet.class),comProc.execute(command, 0, null));
+ DynResSet = AnyConverter.toObject(
+ XDynamicResultSet.class,comProc.execute(command, 0, null));
} catch(com.sun.star.ucb.CommandAbortedException e) {
log.println("Couldn't execute command:" + e);
} catch(com.sun.star.uno.Exception e) {
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/ifc/frame/_XFramesSupplier.java b/main/qadevOOo/java/OOoRunner/src/main/java/ifc/frame/_XFramesSupplier.java
index 8c59df35b6..1c9a522155 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/ifc/frame/_XFramesSupplier.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/ifc/frame/_XFramesSupplier.java
@@ -78,8 +78,8 @@ public class _XFramesSupplier extends MultiMethodTest {
try {
fr = null;
try {
- fr = (XFrame) AnyConverter.toObject(
- new Type(XFrame.class),frames.getByIndex(i));
+ fr = AnyConverter.toObject(
+ XFrame.class,frames.getByIndex(i));
} catch (com.sun.star.lang.IllegalArgumentException iae) {
log.println("Can't convert any");
}
@@ -164,15 +164,15 @@ public class _XFramesSupplier extends MultiMethodTest {
try {
if (activeIdx != 0)
try {
- sFrame = (XFrame) AnyConverter.toObject(
- new Type(XFrame.class),frames.getByIndex(0));
+ sFrame = AnyConverter.toObject(
+ XFrame.class,frames.getByIndex(0));
} catch (com.sun.star.lang.IllegalArgumentException iae) {
log.println("Can't convert any");
}
else
try {
- sFrame = (XFrame) AnyConverter.toObject(
- new Type(XFrame.class),frames.getByIndex(1));
+ sFrame = AnyConverter.toObject(
+ XFrame.class,frames.getByIndex(1));
} catch (com.sun.star.lang.IllegalArgumentException iae) {
log.println("Can't convert any");
}
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/ifc/lang/_ServiceManager.java b/main/qadevOOo/java/OOoRunner/src/main/java/ifc/lang/_ServiceManager.java
index 023c0326a7..2c9ab55d94 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/ifc/lang/_ServiceManager.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/ifc/lang/_ServiceManager.java
@@ -35,7 +35,7 @@ public class _ServiceManager extends MultiPropertyTest {
XComponentContext get = null;
boolean res = false;
try {
- get = (XComponentContext)AnyConverter.toObject(new Type(XComponentContext.class), oObj.getPropertyValue("DefaultContext"));
+ get = AnyConverter.toObject(XComponentContext.class, oObj.getPropertyValue("DefaultContext"));
res = get != null;
} catch (com.sun.star.lang.IllegalArgumentException iae) {
log.println("Illegal Argument Exception");
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/ifc/sdb/_RowSet.java b/main/qadevOOo/java/OOoRunner/src/main/java/ifc/sdb/_RowSet.java
index d1cf6a244c..1bc1492ef9 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/ifc/sdb/_RowSet.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/ifc/sdb/_RowSet.java
@@ -117,8 +117,8 @@ public class _RowSet extends MultiPropertyTest {
XConnection the_connection = null;
try {
- the_connection = (XConnection) AnyConverter.toObject(
- new Type(XConnection.class),
+ the_connection = AnyConverter.toObject(
+ XConnection.class,
oObj.getPropertyValue("ActiveConnection"));
} catch (com.sun.star.lang.IllegalArgumentException iae) {
throw new StatusException("couldn't convert Any",iae);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/ifc/sheet/_FunctionDescription.java b/main/qadevOOo/java/OOoRunner/src/main/java/ifc/sheet/_FunctionDescription.java
index d055b5b45f..f29d024f72 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/ifc/sheet/_FunctionDescription.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/ifc/sheet/_FunctionDescription.java
@@ -69,7 +69,7 @@ public class _FunctionDescription extends MultiMethodTest {
XInterface FA = (XInterface)oDocMSF.
createInstance("com.sun.star.sheet.FunctionArgument");
- FunctionArgument arg = (FunctionArgument)AnyConverter.toObject
+ FunctionArgument arg = AnyConverter.toObject
(FunctionArgument.class, FA);
arg.Description = "FunctionDescription argument description" ;
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/ifc/style/_CharacterProperties.java b/main/qadevOOo/java/OOoRunner/src/main/java/ifc/style/_CharacterProperties.java
index 0186407d3e..5e33cb5ac9 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/ifc/style/_CharacterProperties.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/ifc/style/_CharacterProperties.java
@@ -437,8 +437,8 @@ public class _CharacterProperties extends MultiPropertyTest {
try {
try{
- uda = (XNameContainer) AnyConverter.toObject(
- new Type(XNameContainer.class),
+ uda = AnyConverter.toObject(
+ XNameContainer.class,
oObj.getPropertyValue("TextUserDefinedAttributes"));
} catch (com.sun.star.lang.IllegalArgumentException e){
log.println("TextUserDefinedAttributes is empty.");
@@ -452,8 +452,8 @@ public class _CharacterProperties extends MultiPropertyTest {
String[] els = uda.getElementNames();
oObj.setPropertyValue("TextUserDefinedAttributes", uda);
- uda = (XNameContainer) AnyConverter.toObject(
- new Type(XNameContainer.class),
+ uda = AnyConverter.toObject(
+ XNameContainer.class,
oObj.getPropertyValue("TextUserDefinedAttributes"));
els = uda.getElementNames();
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/ifc/style/_PageProperties.java b/main/qadevOOo/java/OOoRunner/src/main/java/ifc/style/_PageProperties.java
index 39a5e4f53b..99dddb82ce 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/ifc/style/_PageProperties.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/ifc/style/_PageProperties.java
@@ -86,8 +86,8 @@ public class _PageProperties extends MultiPropertyTest {
XNameContainer uda = null;
boolean res = false;
try {
- uda = (XNameContainer) AnyConverter.toObject(
- new Type(XNameContainer.class),
+ uda = AnyConverter.toObject(
+ XNameContainer.class,
oObj.getPropertyValue("UserDefinedAttributes"));
AttributeData attr = new AttributeData();
attr.Namespace = "http://www.sun.com/staroffice/apitest/Cellprop";
@@ -96,8 +96,8 @@ public class _PageProperties extends MultiPropertyTest {
uda.insertByName("Cellprop:has-first-alien-attribute",attr);
String[] els = uda.getElementNames();
oObj.setPropertyValue("UserDefinedAttributes",uda);
- uda = (XNameContainer) AnyConverter.toObject(
- new Type(XNameContainer.class),
+ uda = AnyConverter.toObject(
+ XNameContainer.class,
oObj.getPropertyValue("UserDefinedAttributes"));
els = uda.getElementNames();
Object obj = uda.getByName("Cellprop:has-first-alien-attribute");
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/ifc/style/_ParagraphProperties.java b/main/qadevOOo/java/OOoRunner/src/main/java/ifc/style/_ParagraphProperties.java
index 9eaea9cd98..c3bf356640 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/ifc/style/_ParagraphProperties.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/ifc/style/_ParagraphProperties.java
@@ -366,8 +366,8 @@ public class _ParagraphProperties extends MultiPropertyTest {
XIndexReplace NumberingRules = null;
PropertyValue[] propertyValues = null;
try {
- NumberingRules = (XIndexReplace) AnyConverter.toObject(
- new Type(XIndexReplace.class), oObj.getPropertyValue("NumberingRules"));
+ NumberingRules = AnyConverter.toObject(
+ XIndexReplace.class, oObj.getPropertyValue("NumberingRules"));
} catch (com.sun.star.lang.IllegalArgumentException ex) {
Status.failed( "could not get NumberingRuels: "+ ex.toString() );
return;
@@ -402,8 +402,8 @@ public class _ParagraphProperties extends MultiPropertyTest {
try {
try{
- uda = (XNameContainer) AnyConverter.toObject(
- new Type(XNameContainer.class),
+ uda = AnyConverter.toObject(
+ XNameContainer.class,
oObj.getPropertyValue("ParaUserDefinedAttributes"));
} catch (com.sun.star.lang.IllegalArgumentException e){
log.println("ParaUserDefinedAttributes is empty.");
@@ -417,8 +417,8 @@ public class _ParagraphProperties extends MultiPropertyTest {
String[] els = uda.getElementNames();
oObj.setPropertyValue("ParaUserDefinedAttributes", uda);
- uda = (XNameContainer) AnyConverter.toObject(
- new Type(XNameContainer.class),
+ uda = AnyConverter.toObject(
+ XNameContainer.class,
oObj.getPropertyValue("ParaUserDefinedAttributes"));
els = uda.getElementNames();
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/ifc/table/_CellProperties.java b/main/qadevOOo/java/OOoRunner/src/main/java/ifc/table/_CellProperties.java
index 327388fba1..aa7ed2c359 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/ifc/table/_CellProperties.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/ifc/table/_CellProperties.java
@@ -70,8 +70,8 @@ public class _CellProperties extends MultiPropertyTest {
XNameContainer uda = null;
boolean res = false;
try {
- uda = (XNameContainer) AnyConverter.toObject(
- new Type(XNameContainer.class),
+ uda = AnyConverter.toObject(
+ XNameContainer.class,
oObj.getPropertyValue("UserDefinedAttributes"));
AttributeData attr = new AttributeData();
attr.Namespace = "http://www.sun.com/staroffice/apitest/Cellprop";
@@ -80,8 +80,8 @@ public class _CellProperties extends MultiPropertyTest {
uda.insertByName("Cellprop:has-first-alien-attribute",attr);
String[] els = uda.getElementNames();
oObj.setPropertyValue("UserDefinedAttributes",uda);
- uda = (XNameContainer) AnyConverter.toObject(
- new Type(XNameContainer.class),
+ uda = AnyConverter.toObject(
+ XNameContainer.class,
oObj.getPropertyValue("UserDefinedAttributes"));
els = uda.getElementNames();
Object obj = uda.getByName("Cellprop:has-first-alien-attribute");
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/ifc/text/_CellProperties.java b/main/qadevOOo/java/OOoRunner/src/main/java/ifc/text/_CellProperties.java
index 410eb0e8de..459029bbc7 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/ifc/text/_CellProperties.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/ifc/text/_CellProperties.java
@@ -128,8 +128,7 @@ public class _CellProperties extends MultiPropertyTest {
protected Object getNewValue(String propName, Object oldValue) {
XNameContainer NC = null;
try {
- NC = (XNameContainer)
- AnyConverter.toObject(new Type(XNameContainer.class),oldValue);
+ NC = AnyConverter.toObject(XNameContainer.class,oldValue);
NC.insertByName("MyAttribute",
new AttributeData("","CDATA","Value"));
} catch ( com.sun.star.lang.IllegalArgumentException e ) {
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/ifc/text/_TextSection.java b/main/qadevOOo/java/OOoRunner/src/main/java/ifc/text/_TextSection.java
index cb0e6d616d..d7683baf32 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/ifc/text/_TextSection.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/ifc/text/_TextSection.java
@@ -103,8 +103,8 @@ public class _TextSection extends MultiPropertyTest {
TC = (XTextColumns) tEnv.getObjRelation("TC");
try {
- val2set += ((XTextColumns) AnyConverter.toObject(
- new Type(XTextColumns.class),oldValue)).getColumnCount();
+ val2set += AnyConverter.toObject(
+ XTextColumns.class,oldValue).getColumnCount();
} catch (com.sun.star.lang.IllegalArgumentException iae) {
log.println("Couldn't change Column count");
}
@@ -117,10 +117,10 @@ public class _TextSection extends MultiPropertyTest {
short val1 = 0;
short val2 = 1;
try {
- val1 = ((XTextColumns) AnyConverter.toObject(
- new Type(XTextColumns.class),obj1)).getColumnCount();
- val2 = ((XTextColumns) AnyConverter.toObject(
- new Type(XTextColumns.class),obj2)).getColumnCount();
+ val1 = AnyConverter.toObject(
+ XTextColumns.class,obj1).getColumnCount();
+ val2 = AnyConverter.toObject(
+ XTextColumns.class,obj2).getColumnCount();
} catch (com.sun.star.lang.IllegalArgumentException iae) {
log.println("comparing values failed");
}
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/ifc/text/_XTextFieldsSupplier.java b/main/qadevOOo/java/OOoRunner/src/main/java/ifc/text/_XTextFieldsSupplier.java
index 831a3f172a..2d2e5dbedc 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/ifc/text/_XTextFieldsSupplier.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/ifc/text/_XTextFieldsSupplier.java
@@ -88,8 +88,8 @@ public class _XTextFieldsSupplier extends MultiMethodTest {
XSpreadsheets oSheets = xSheetDoc.getSheets() ;
XIndexAccess oIndexSheets =
UnoRuntime.queryInterface(XIndexAccess.class, oSheets);
- XSpreadsheet oSheet = (XSpreadsheet) AnyConverter.toObject(
- new Type(XSpreadsheet.class),oIndexSheets.getByIndex(0));
+ XSpreadsheet oSheet = AnyConverter.toObject(
+ XSpreadsheet.class,oIndexSheets.getByIndex(0));
String[] services = _oMSF.getAvailableServiceNames();
for (int i=0; i<services.length; i++) {
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/ifc/ucb/_XSortedDynamicResultSetFactory.java b/main/qadevOOo/java/OOoRunner/src/main/java/ifc/ucb/_XSortedDynamicResultSetFactory.java
index 8ee578810d..eb78a72de7 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/ifc/ucb/_XSortedDynamicResultSetFactory.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/ifc/ucb/_XSortedDynamicResultSetFactory.java
@@ -117,8 +117,8 @@ public class _XSortedDynamicResultSetFactory extends MultiMethodTest {
(OpenMode.ALL, 10000, null, new Property[] {prop},
new NumberedSortingInfo[0])) ;
- dynResSet = (XDynamicResultSet) AnyConverter.toObject(
- new Type(XDynamicResultSet.class),cmdProc.execute(cmd, 0, null));
+ dynResSet = AnyConverter.toObject(
+ XDynamicResultSet.class,cmdProc.execute(cmd, 0, null));
} catch (com.sun.star.uno.Exception e) {
e.printStackTrace(log);
}
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/ifc/xml/_UserDefinedAttributeSupplier.java b/main/qadevOOo/java/OOoRunner/src/main/java/ifc/xml/_UserDefinedAttributeSupplier.java
index 2be4158904..768578362b 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/ifc/xml/_UserDefinedAttributeSupplier.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/ifc/xml/_UserDefinedAttributeSupplier.java
@@ -33,8 +33,8 @@ public class _UserDefinedAttributeSupplier extends lib.MultiPropertyTest {
XNameContainer uda = null;
boolean res = false;
try {
- uda = (XNameContainer) AnyConverter.toObject(
- new Type(XNameContainer.class),
+ uda = AnyConverter.toObject(
+ XNameContainer.class,
oObj.getPropertyValue("UserDefinedAttributes"));
AttributeData attr = new AttributeData();
attr.Namespace = "http://www.sun.com/staroffice/apitest/Chartprop";
@@ -43,8 +43,8 @@ public class _UserDefinedAttributeSupplier extends lib.MultiPropertyTest {
uda.insertByName("Chartprop:has-first-alien-attribute",attr);
String[] els = uda.getElementNames();
oObj.setPropertyValue("UserDefinedAttributes",uda);
- uda = (XNameContainer) AnyConverter.toObject(
- new Type(XNameContainer.class),
+ uda = AnyConverter.toObject(
+ XNameContainer.class,
oObj.getPropertyValue("UserDefinedAttributes"));
els = uda.getElementNames();
Object obj = uda.getByName("Chartprop:has-first-alien-attribute");
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_cached/CachedContentResultSetFactory.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_cached/CachedContentResultSetFactory.java
index e8f35aeb84..0a45d074c2 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_cached/CachedContentResultSetFactory.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_cached/CachedContentResultSetFactory.java
@@ -149,8 +149,8 @@ public class CachedContentResultSetFactory extends TestCase {
XDynamicResultSet dynResSet = null;
try {
- dynResSet = (XDynamicResultSet)
- AnyConverter.toObject(new Type(XDynamicResultSet.class),
+ dynResSet =
+ AnyConverter.toObject(XDynamicResultSet.class,
cmdProc.execute(cmd, 0, null));
} catch (com.sun.star.lang.IllegalArgumentException iae) {
throw new StatusException("Couldn't convert Any ",iae);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_cached/CachedContentResultSetStubFactory.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_cached/CachedContentResultSetStubFactory.java
index b1868104a4..5980c73650 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_cached/CachedContentResultSetStubFactory.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_cached/CachedContentResultSetStubFactory.java
@@ -148,8 +148,8 @@ public class CachedContentResultSetStubFactory extends TestCase {
XDynamicResultSet dynResSet = null;
try {
- dynResSet = (XDynamicResultSet)
- AnyConverter.toObject(new Type(XDynamicResultSet.class),
+ dynResSet =
+ AnyConverter.toObject(XDynamicResultSet.class,
cmdProc.execute(cmd, 0, null));
} catch (com.sun.star.lang.IllegalArgumentException iae) {
throw new StatusException("Couldn't convert Any ",iae);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_cached/CachedDynamicResultSetFactory.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_cached/CachedDynamicResultSetFactory.java
index 3290e5ff66..f659a7482a 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_cached/CachedDynamicResultSetFactory.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_cached/CachedDynamicResultSetFactory.java
@@ -147,8 +147,8 @@ public class CachedDynamicResultSetFactory extends TestCase {
XDynamicResultSet dynResSet = null;
try {
- dynResSet = (XDynamicResultSet)
- AnyConverter.toObject(new Type(XDynamicResultSet.class),
+ dynResSet =
+ AnyConverter.toObject(XDynamicResultSet.class,
cmdProc.execute(cmd, 0, null));
} catch (com.sun.star.lang.IllegalArgumentException iae) {
throw new StatusException("Couldn't convert Any ",iae);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_cached/CachedDynamicResultSetStubFactory.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_cached/CachedDynamicResultSetStubFactory.java
index 650bed2398..8828cd8566 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_cached/CachedDynamicResultSetStubFactory.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_cached/CachedDynamicResultSetStubFactory.java
@@ -144,8 +144,8 @@ public class CachedDynamicResultSetStubFactory extends TestCase {
dynResSet = null;
try {
- dynResSet = (XDynamicResultSet)
- AnyConverter.toObject(new Type(XDynamicResultSet.class),
+ dynResSet =
+ AnyConverter.toObject(XDynamicResultSet.class,
cmdProc.execute(cmd, 0, null));
} catch (com.sun.star.lang.IllegalArgumentException iae) {
throw new StatusException("Couldn't convert Any ",iae);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_dbaccess/OSingleSelectQueryComposer.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_dbaccess/OSingleSelectQueryComposer.java
index 21c466a450..12ac05a41a 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_dbaccess/OSingleSelectQueryComposer.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_dbaccess/OSingleSelectQueryComposer.java
@@ -231,8 +231,8 @@ public class OSingleSelectQueryComposer extends TestCase {
XNameAccess xCols = xColSup.getColumns();
- XPropertySet xCol = (XPropertySet) AnyConverter.toObject(
- new Type(XPropertySet.class),
+ XPropertySet xCol = AnyConverter.toObject(
+ XPropertySet.class,
xCols.getByName(xCols.getElementNames()[0]));
XSingleSelectQueryAnalyzer xQueryAna =
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_forms/GenericModelTest.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_forms/GenericModelTest.java
index e07575ecbd..29e72417c0 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_forms/GenericModelTest.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_forms/GenericModelTest.java
@@ -251,7 +251,7 @@ public class GenericModelTest extends TestCase {
try {
XIndexAccess forms = UnoRuntime.queryInterface( XIndexAccess.class,
FormTools.getForms( WriterTools.getDrawPage( m_xTextDoc ) ) );
- XForm myForm = (XForm) AnyConverter.toObject(new Type(XForm.class),
+ XForm myForm = AnyConverter.toObject(XForm.class,
forms.getByIndex(0));
if (debug){
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_forms/ODatabaseForm.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_forms/ODatabaseForm.java
index 816ee4ca09..6732256595 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_forms/ODatabaseForm.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_forms/ODatabaseForm.java
@@ -463,7 +463,7 @@ public class ODatabaseForm extends TestCase {
formLoader.load();
try {
- oObj = (XForm) AnyConverter.toObject(new Type(XForm.class),
+ oObj = AnyConverter.toObject(XForm.class,
(FormTools.getForms(
WriterTools.getDrawPage(
xTextDoc)))
@@ -471,8 +471,8 @@ public class ODatabaseForm extends TestCase {
XPropertySet xSetProp = UnoRuntime.queryInterface(
XPropertySet.class, oObj);
- connection = (XConnection) AnyConverter.toObject(
- new Type(XConnection.class),
+ connection = AnyConverter.toObject(
+ XConnection.class,
xSetProp.getPropertyValue("ActiveConnection"));
} catch (com.sun.star.uno.Exception e) {
log.println("Couldn't get Form");
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_forms/OHiddenModel.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_forms/OHiddenModel.java
index be717d9892..ccfe67017a 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_forms/OHiddenModel.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_forms/OHiddenModel.java
@@ -162,8 +162,8 @@ public class OHiddenModel extends TestCase {
XNameContainer.class, frm);
frmNC.insertByName("OHiddenModel", ctrl);
- oObj = (XInterface) AnyConverter.toObject(
- new Type(XInterface.class),
+ oObj = AnyConverter.toObject(
+ XInterface.class,
frmNC.getByName("OHiddenModel"));
} catch (com.sun.star.lang.WrappedTargetException e) {
e.printStackTrace(log);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_fwk/DispatchRecorder.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_fwk/DispatchRecorder.java
index af504f1db9..f0dde872e2 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_fwk/DispatchRecorder.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_fwk/DispatchRecorder.java
@@ -93,8 +93,8 @@ public class DispatchRecorder extends TestCase {
XPropertySet xFramePS = UnoRuntime.queryInterface
(XPropertySet.class, xFrame);
XDispatchRecorderSupplier xDRS = null;
- xDRS = (XDispatchRecorderSupplier) AnyConverter.toObject(
- new Type(XDispatchRecorderSupplier.class),
+ xDRS = AnyConverter.toObject(
+ XDispatchRecorderSupplier.class,
xFramePS.getPropertyValue("DispatchRecorderSupplier"));
if (xDRS == null) {
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_fwk/JobExecutor.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_fwk/JobExecutor.java
index 10ad43f395..302c6584ed 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_fwk/JobExecutor.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_fwk/JobExecutor.java
@@ -175,11 +175,11 @@ public class JobExecutor extends TestCase {
XNameAccess xNewEventNA =
UnoRuntime.queryInterface(XNameAccess.class, oNewEvent);
Object oJobList = xNewEventNA.getByName("JobList");
- XSingleServiceFactory jobListFac = (XSingleServiceFactory)
- AnyConverter.toObject(new Type(XSingleServiceFactory.class),
+ XSingleServiceFactory jobListFac =
+ AnyConverter.toObject(XSingleServiceFactory.class,
oJobList);
- XNameContainer jobListNC = (XNameContainer)
- AnyConverter.toObject(new Type(XNameContainer.class),
+ XNameContainer jobListNC =
+ AnyConverter.toObject(XNameContainer.class,
oJobList);
log.println("\tAdding TimeStamps to Events ...");
Object oNewJobTimeStamps = jobListFac.createInstance();
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_rdbtdp/RegistryTypeDescriptionProvider.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_rdbtdp/RegistryTypeDescriptionProvider.java
index edd6b2834f..6fb631f6d4 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_rdbtdp/RegistryTypeDescriptionProvider.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_rdbtdp/RegistryTypeDescriptionProvider.java
@@ -104,8 +104,8 @@ public class RegistryTypeDescriptionProvider extends TestCase {
"No TypeDescriptionProvider given"));
// take the first registry type description provider
oInterface = xProviderEnum.nextElement();
- oObj = (XInterface) AnyConverter.toObject(
- new Type(XInterface.class),oInterface);
+ oObj = AnyConverter.toObject(
+ XInterface.class,oInterface);
}
catch( com.sun.star.uno.Exception e ) {
log.println("Service not available" );
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_regtypeprov.uno/RegistryTypeDescriptionProvider.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_regtypeprov.uno/RegistryTypeDescriptionProvider.java
index b4f46bb041..51b71b1564 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_regtypeprov.uno/RegistryTypeDescriptionProvider.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_regtypeprov.uno/RegistryTypeDescriptionProvider.java
@@ -99,8 +99,8 @@ public class RegistryTypeDescriptionProvider extends TestCase {
"No TypeDescriptionProvider given"));
// take the first registry type description provider
oInterface = xProviderEnum.nextElement();
- oObj = (XInterface) AnyConverter.toObject(
- new Type(XInterface.class),oInterface);
+ oObj = AnyConverter.toObject(
+ XInterface.class,oInterface);
}
catch( com.sun.star.uno.Exception e ) {
log.println("Service not available" );
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/AccessibleEditableTextPara_PreviewCell.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/AccessibleEditableTextPara_PreviewCell.java
index 075ff19bd1..ed0176e5e0 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/AccessibleEditableTextPara_PreviewCell.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/AccessibleEditableTextPara_PreviewCell.java
@@ -99,8 +99,8 @@ public class AccessibleEditableTextPara_PreviewCell extends TestCase {
XSpreadsheets oSheets = xSheetDoc.getSheets() ;
XIndexAccess oIndexSheets =
UnoRuntime.queryInterface(XIndexAccess.class, oSheets);
- XSpreadsheet oSheet = (XSpreadsheet) AnyConverter.toObject(
- new Type(XSpreadsheet.class),oIndexSheets.getByIndex(0));
+ XSpreadsheet oSheet = AnyConverter.toObject(
+ XSpreadsheet.class,oIndexSheets.getByIndex(0));
log.println("Getting a cell from sheet") ;
xCell = oSheet.getCellByPosition(0, 0);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScAccessibleCell.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScAccessibleCell.java
index 6de074e7e9..f12011f859 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScAccessibleCell.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScAccessibleCell.java
@@ -129,8 +129,8 @@ public class ScAccessibleCell extends TestCase {
UnoRuntime.queryInterface(XIndexAccess.class, oSheets);
XSpreadsheet oSheet = null;
try {
- oSheet = (XSpreadsheet) AnyConverter.toObject(
- new Type(XSpreadsheet.class),oIndexSheets.getByIndex(0));
+ oSheet = AnyConverter.toObject(
+ XSpreadsheet.class,oIndexSheets.getByIndex(0));
} catch (com.sun.star.lang.IllegalArgumentException iae) {
throw new StatusException("couldn't get sheet",iae);
}
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScAccessibleDocumentPagePreview.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScAccessibleDocumentPagePreview.java
index 8789eedb45..a507838a09 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScAccessibleDocumentPagePreview.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScAccessibleDocumentPagePreview.java
@@ -101,16 +101,16 @@ public class ScAccessibleDocumentPagePreview extends TestCase {
UnoRuntime.queryInterface(XIndexAccess.class, oSheets);
XSpreadsheet oSheet = null;
try {
- oSheet = (XSpreadsheet) AnyConverter.toObject(
- new Type(XSpreadsheet.class),oIndexSheets.getByIndex(1));
+ oSheet = AnyConverter.toObject(
+ XSpreadsheet.class,oIndexSheets.getByIndex(1));
} catch (com.sun.star.lang.IllegalArgumentException iae) {
throw new StatusException("couldn't get sheet",iae);
}
xCell = oSheet.getCellByPosition(0, 0) ;
xCell.setFormula("ScAccessibleDocumentPagePreview - Page 2");
try {
- oSheet = (XSpreadsheet) AnyConverter.toObject(
- new Type(XSpreadsheet.class),oIndexSheets.getByIndex(2));
+ oSheet = AnyConverter.toObject(
+ XSpreadsheet.class,oIndexSheets.getByIndex(2));
} catch (com.sun.star.lang.IllegalArgumentException iae) {
throw new StatusException("couldn't get sheet",iae);
}
@@ -118,8 +118,8 @@ public class ScAccessibleDocumentPagePreview extends TestCase {
xCell.setFormula("ScAccessibleDocumentPagePreview - Page 3");
try {
- oSheet = (XSpreadsheet) AnyConverter.toObject(
- new Type(XSpreadsheet.class),oIndexSheets.getByIndex(0));
+ oSheet = AnyConverter.toObject(
+ XSpreadsheet.class,oIndexSheets.getByIndex(0));
} catch (com.sun.star.lang.IllegalArgumentException iae) {
throw new StatusException("couldn't get sheet",iae);
}
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScAccessiblePageHeader.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScAccessiblePageHeader.java
index 025bdc8e78..9ee05ef58c 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScAccessiblePageHeader.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScAccessiblePageHeader.java
@@ -105,8 +105,8 @@ public class ScAccessiblePageHeader extends TestCase {
UnoRuntime.queryInterface(XIndexAccess.class, oSheets);
XSpreadsheet oSheet = null;
try {
- oSheet = (XSpreadsheet) AnyConverter.toObject(
- new Type(XSpreadsheet.class),oIndexSheets.getByIndex(0));
+ oSheet = AnyConverter.toObject(
+ XSpreadsheet.class,oIndexSheets.getByIndex(0));
} catch (com.sun.star.lang.IllegalArgumentException iae) {
throw new StatusException("couldn't get sheet",iae);
}
@@ -171,11 +171,11 @@ public class ScAccessiblePageHeader extends TestCase {
XStyle StdStyle = null;
try{
- XNameAccess PageStyles = (XNameAccess) AnyConverter.toObject(
- new Type(XNameAccess.class),
+ XNameAccess PageStyles = AnyConverter.toObject(
+ XNameAccess.class,
StyleFamNames.getByName("PageStyles"));
- StdStyle = (XStyle) AnyConverter.toObject(
- new Type(XStyle.class), PageStyles.getByName("Default"));
+ StdStyle = AnyConverter.toObject(
+ XStyle.class, PageStyles.getByName("Default"));
} catch(com.sun.star.lang.WrappedTargetException e){
e.printStackTrace(log);
throw new StatusException("Couldn't get by name", e);
@@ -195,8 +195,8 @@ public class ScAccessiblePageHeader extends TestCase {
// first we write what we are intend to do to log file
log.println( "creating a test environment" );
try {
- RPHC = (XHeaderFooterContent) AnyConverter.toObject(
- new Type(XHeaderFooterContent.class),
+ RPHC = AnyConverter.toObject(
+ XHeaderFooterContent.class,
PropSet.getPropertyValue("RightPageHeaderContent"));
} catch(com.sun.star.lang.WrappedTargetException e){
e.printStackTrace(log);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScAccessiblePageHeaderArea.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScAccessiblePageHeaderArea.java
index cd20f33f3e..2e8e7b0773 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScAccessiblePageHeaderArea.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScAccessiblePageHeaderArea.java
@@ -100,8 +100,8 @@ public class ScAccessiblePageHeaderArea extends TestCase {
XSpreadsheets oSheets = xSpreadsheetDoc.getSheets() ;
XIndexAccess oIndexSheets =
UnoRuntime.queryInterface(XIndexAccess.class, oSheets);
- XSpreadsheet oSheet = (XSpreadsheet) AnyConverter.toObject(
- new Type(XSpreadsheet.class),oIndexSheets.getByIndex(0));
+ XSpreadsheet oSheet = AnyConverter.toObject(
+ XSpreadsheet.class,oIndexSheets.getByIndex(0));
xCell = oSheet.getCellByPosition(0, 0) ;
xCell.setFormula("ScAccessiblePageHeaderArea");
} catch(com.sun.star.lang.WrappedTargetException e) {
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScAccessiblePreviewCell.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScAccessiblePreviewCell.java
index 4a79269e24..ee8a358512 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScAccessiblePreviewCell.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScAccessiblePreviewCell.java
@@ -123,8 +123,8 @@ public class ScAccessiblePreviewCell extends TestCase {
XSpreadsheets oSheets = xSheetDoc.getSheets() ;
XIndexAccess oIndexSheets =
UnoRuntime.queryInterface(XIndexAccess.class, oSheets);
- XSpreadsheet oSheet = (XSpreadsheet) AnyConverter.toObject(
- new Type(XSpreadsheet.class),oIndexSheets.getByIndex(0));
+ XSpreadsheet oSheet = AnyConverter.toObject(
+ XSpreadsheet.class,oIndexSheets.getByIndex(0));
log.println("Getting a cell from sheet") ;
xCell = oSheet.getCellByPosition(0, 0);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScAccessiblePreviewHeaderCell.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScAccessiblePreviewHeaderCell.java
index 735dfb9a22..0db5531c3b 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScAccessiblePreviewHeaderCell.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScAccessiblePreviewHeaderCell.java
@@ -156,8 +156,8 @@ public class ScAccessiblePreviewHeaderCell extends TestCase {
XSpreadsheets oSheets = xSheetDoc.getSheets();
XIndexAccess oIndexSheets = UnoRuntime.queryInterface(
XIndexAccess.class, oSheets);
- XSpreadsheet oSheet = (XSpreadsheet) AnyConverter.toObject(
- new Type(XSpreadsheet.class),
+ XSpreadsheet oSheet = AnyConverter.toObject(
+ XSpreadsheet.class,
oIndexSheets.getByIndex(0));
log.println("Getting a cell from sheet");
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScAccessiblePreviewTable.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScAccessiblePreviewTable.java
index 189cf4938c..20c959e7c2 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScAccessiblePreviewTable.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScAccessiblePreviewTable.java
@@ -126,8 +126,8 @@ public class ScAccessiblePreviewTable extends TestCase {
XSpreadsheets oSheets = xSheetDoc.getSheets() ;
XIndexAccess oIndexSheets =
UnoRuntime.queryInterface(XIndexAccess.class, oSheets);
- XSpreadsheet oSheet = (XSpreadsheet) AnyConverter.toObject(
- new Type(XSpreadsheet.class),oIndexSheets.getByIndex(0));
+ XSpreadsheet oSheet = AnyConverter.toObject(
+ XSpreadsheet.class,oIndexSheets.getByIndex(0));
log.println("Getting a cell from sheet") ;
xCell = oSheet.getCellByPosition(0, 0);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScAccessibleSpreadsheet.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScAccessibleSpreadsheet.java
index f8300ca91c..4d791279b1 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScAccessibleSpreadsheet.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScAccessibleSpreadsheet.java
@@ -133,8 +133,8 @@ public class ScAccessibleSpreadsheet extends TestCase {
XSpreadsheets oSheets = xSheetDoc.getSheets() ;
XIndexAccess oIndexSheets =
UnoRuntime.queryInterface(XIndexAccess.class, oSheets);
- XSpreadsheet oSheet = (XSpreadsheet) AnyConverter.toObject(
- new Type(XSpreadsheet.class),oIndexSheets.getByIndex(0));
+ XSpreadsheet oSheet = AnyConverter.toObject(
+ XSpreadsheet.class,oIndexSheets.getByIndex(0));
xCell = oSheet.getCellByPosition(5, 5) ;
xCell.setFormula(text);
} catch(com.sun.star.lang.WrappedTargetException e) {
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScAnnotationObj.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScAnnotationObj.java
index 35af0234af..eb7723d787 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScAnnotationObj.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScAnnotationObj.java
@@ -135,8 +135,8 @@ public class ScAnnotationObj extends TestCase {
UnoRuntime.queryInterface(XIndexAccess.class, oSheets);
XCell oCell = null;
try {
- XSpreadsheet oSheet = (XSpreadsheet) AnyConverter.toObject(
- new Type(XSpreadsheet.class),XAccess.getByIndex(cellPos.Sheet));
+ XSpreadsheet oSheet = AnyConverter.toObject(
+ XSpreadsheet.class,XAccess.getByIndex(cellPos.Sheet));
XCellRange oCRange =
UnoRuntime.queryInterface(XCellRange.class, oSheet);
oCell = oCRange.getCellByPosition(cellPos.Column, cellPos.Row);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScAnnotationShapeObj.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScAnnotationShapeObj.java
index 8de18c0fec..91c5ace912 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScAnnotationShapeObj.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScAnnotationShapeObj.java
@@ -149,8 +149,8 @@ public class ScAnnotationShapeObj extends TestCase {
try {
XSpreadsheet oSheet =
- (XSpreadsheet) AnyConverter.toObject(new Type(
- XSpreadsheet.class),
+ AnyConverter.toObject(
+ XSpreadsheet.class,
XAccess.getByIndex(cellPos.Sheet));
XCellRange oCRange =
UnoRuntime.queryInterface(XCellRange.class,
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScAnnotationsObj.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScAnnotationsObj.java
index 62faf22f8b..19c874f996 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScAnnotationsObj.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScAnnotationsObj.java
@@ -124,8 +124,8 @@ public class ScAnnotationsObj extends TestCase {
XCell oCell = null;
XSpreadsheet oSheet = null;
try {
- oSheet = (XSpreadsheet) AnyConverter.toObject(
- new Type(XSpreadsheet.class),
+ oSheet = AnyConverter.toObject(
+ XSpreadsheet.class,
oNames.getByName(oNames.getElementNames()[0]));
// adding an annotation...
XCellRange oCRange =
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScAreaLinkObj.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScAreaLinkObj.java
index 57a01e84dc..5c584d73fa 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScAreaLinkObj.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScAreaLinkObj.java
@@ -115,14 +115,14 @@ public class ScAreaLinkObj extends TestCase {
// creation of testobject here
XPropertySet props = UnoRuntime.queryInterface
(XPropertySet.class, xSheetDoc);
- XAreaLinks links = (XAreaLinks) AnyConverter.toObject(
- new Type(XAreaLinks.class),props.getPropertyValue("AreaLinks")) ;
+ XAreaLinks links = AnyConverter.toObject(
+ XAreaLinks.class,props.getPropertyValue("AreaLinks")) ;
CellAddress addr = new CellAddress ((short) 1,2,3) ;
String aSourceArea = util.utils.getFullTestURL("calcshapes.sxc");
links.insertAtPosition (addr, aSourceArea, "a2:b5", "", "") ;
- oObj = (XInterface) AnyConverter.toObject(
- new Type(XInterface.class), links.getByIndex(0)) ;
+ oObj = AnyConverter.toObject(
+ XInterface.class, links.getByIndex(0)) ;
} catch (com.sun.star.beans.UnknownPropertyException e) {
log.println ("Exception occurred while creating test Object.") ;
e.printStackTrace(log) ;
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScAreaLinksObj.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScAreaLinksObj.java
index 0e3220d707..fcc19ec1a8 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScAreaLinksObj.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScAreaLinksObj.java
@@ -112,8 +112,8 @@ public class ScAreaLinksObj extends TestCase {
// creation of testobject here
XPropertySet props = UnoRuntime.queryInterface
(XPropertySet.class, xSheetDoc);
- oObj = (XInterface) AnyConverter.toObject(
- new Type(XInterface.class),props.getPropertyValue("AreaLinks")) ;
+ oObj = AnyConverter.toObject(
+ XInterface.class,props.getPropertyValue("AreaLinks")) ;
XAreaLinks links = null ;
// adding one link into collection (for best testing)
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScAutoFormatFieldObj.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScAutoFormatFieldObj.java
index ee7536b859..eb06e4c315 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScAutoFormatFieldObj.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScAutoFormatFieldObj.java
@@ -81,12 +81,12 @@ public class ScAutoFormatFieldObj extends TestCase {
("com.sun.star.sheet.TableAutoFormats");
XIndexAccess formatsIndex = UnoRuntime.queryInterface
(XIndexAccess.class, formats);
- XInterface format = (XInterface) AnyConverter.toObject(
- new Type(XInterface.class),formatsIndex.getByIndex(0));
+ XInterface format = AnyConverter.toObject(
+ XInterface.class,formatsIndex.getByIndex(0));
XIndexAccess formatIndex = UnoRuntime.queryInterface
(XIndexAccess.class, format);
- oObj = (XInterface) AnyConverter.toObject(
- new Type(XInterface.class),formatIndex.getByIndex(0));
+ oObj = AnyConverter.toObject(
+ XInterface.class,formatIndex.getByIndex(0));
} catch (com.sun.star.uno.Exception e) {
log.println ("Exception occurred while creating test Object.") ;
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScAutoFormatObj.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScAutoFormatObj.java
index 53a698f3b6..e57a379324 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScAutoFormatObj.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScAutoFormatObj.java
@@ -85,8 +85,8 @@ public class ScAutoFormatObj extends TestCase {
("com.sun.star.sheet.TableAutoFormats");
XIndexAccess formatsIndex =
UnoRuntime.queryInterface(XIndexAccess.class, formats);
- oObj = (XInterface) AnyConverter.toObject(
- new Type(XInterface.class),formatsIndex.getByIndex
+ oObj = AnyConverter.toObject(
+ XInterface.class,formatsIndex.getByIndex
(formatsIndex.getCount() - 1));
XNamed objNamed =
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScAutoFormatsObj.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScAutoFormatsObj.java
index 72134161a3..ad21f07473 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScAutoFormatsObj.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScAutoFormatsObj.java
@@ -118,8 +118,8 @@ public class ScAutoFormatsObj extends TestCase{
// get AutoFormats
XComponent xComp = UnoRuntime.queryInterface
(XComponent.class, xSheetDoc);
- oObj = (XInterface) AnyConverter.toObject(
- new Type(XInterface.class),((XMultiServiceFactory)Param.getMSF()).createInstance
+ oObj = AnyConverter.toObject(
+ XInterface.class,((XMultiServiceFactory)Param.getMSF()).createInstance
("com.sun.star.sheet.TableAutoFormats"));
Object secondInstance = SOF.createInstance
(xComp, "com.sun.star.sheet.TableAutoFormat");
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScCellCursorObj.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScCellCursorObj.java
index 68677589b0..b7a7a38158 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScCellCursorObj.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScCellCursorObj.java
@@ -166,8 +166,8 @@ public class ScCellCursorObj extends TestCase {
xSheetDoc)).getSheets();
try {
- oSheet = (XSpreadsheet) AnyConverter.toObject(
- new Type(XSpreadsheet.class),
+ oSheet = AnyConverter.toObject(
+ XSpreadsheet.class,
oSpreadsheets.getByName(
oSpreadsheets.getElementNames()[0]));
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScCellFieldObj.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScCellFieldObj.java
index d3b300e865..7a9627297b 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScCellFieldObj.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScCellFieldObj.java
@@ -145,8 +145,8 @@ public class ScCellFieldObj extends TestCase {
XSpreadsheets oSheets = xSheetDoc.getSheets() ;
XIndexAccess oIndexSheets =
UnoRuntime.queryInterface(XIndexAccess.class, oSheets);
- XSpreadsheet oSheet = (XSpreadsheet) AnyConverter.toObject(
- new Type(XSpreadsheet.class),oIndexSheets.getByIndex(0));
+ XSpreadsheet oSheet = AnyConverter.toObject(
+ XSpreadsheet.class,oIndexSheets.getByIndex(0));
XCell oCell = oSheet.getCellByPosition(2,3);
oText = UnoRuntime.queryInterface(XText.class, oCell);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScCellFieldsObj.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScCellFieldsObj.java
index 7aa3f9c062..fcf888c6b5 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScCellFieldsObj.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScCellFieldsObj.java
@@ -123,8 +123,8 @@ public class ScCellFieldsObj extends TestCase {
XSpreadsheets oSheets = xSheetDoc.getSheets() ;
XIndexAccess oIndexSheets =
UnoRuntime.queryInterface(XIndexAccess.class, oSheets);
- XSpreadsheet oSheet = (XSpreadsheet) AnyConverter.toObject(
- new Type(XSpreadsheet.class),oIndexSheets.getByIndex(0));
+ XSpreadsheet oSheet = AnyConverter.toObject(
+ XSpreadsheet.class,oIndexSheets.getByIndex(0));
XCell oCell = oSheet.getCellByPosition(2,3);
oText = UnoRuntime.queryInterface(XText.class, oCell);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScCellFormatsEnumeration.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScCellFormatsEnumeration.java
index 126a78f5df..8e870acb77 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScCellFormatsEnumeration.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScCellFormatsEnumeration.java
@@ -117,8 +117,8 @@ public class ScCellFormatsEnumeration extends TestCase {
UnoRuntime.queryInterface(XIndexAccess.class, xSpreadsheets);
try {
- oSheet = (XSpreadsheet) AnyConverter.toObject(
- new Type(XSpreadsheet.class),oIndexAccess.getByIndex(0));
+ oSheet = AnyConverter.toObject(
+ XSpreadsheet.class,oIndexAccess.getByIndex(0));
} catch (com.sun.star.lang.WrappedTargetException e) {
e.printStackTrace(log);
throw new StatusException( "Couldn't get a spreadsheet", e);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScCellFormatsObj.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScCellFormatsObj.java
index 5bb3198cb4..7d453dbfe3 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScCellFormatsObj.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScCellFormatsObj.java
@@ -108,8 +108,8 @@ public class ScCellFormatsObj extends TestCase {
XIndexAccess oIndexAccess =
UnoRuntime.queryInterface(XIndexAccess.class, xSpreadsheets);
try {
- oSheet = (XSpreadsheet) AnyConverter.toObject(
- new Type(XSpreadsheet.class),oIndexAccess.getByIndex(0));
+ oSheet = AnyConverter.toObject(
+ XSpreadsheet.class,oIndexAccess.getByIndex(0));
} catch (com.sun.star.lang.WrappedTargetException e) {
e.printStackTrace(log);
throw new StatusException( "Couldn't get a spreadsheet", e);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScCellObj.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScCellObj.java
index 0b3da80c62..d3fda6f485 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScCellObj.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScCellObj.java
@@ -141,8 +141,8 @@ public class ScCellObj extends TestCase {
XSpreadsheets oSheets = xSheetDoc.getSheets() ;
XIndexAccess oIndexSheets =
UnoRuntime.queryInterface(XIndexAccess.class, oSheets);
- oSheet = (XSpreadsheet) AnyConverter.toObject(
- new Type(XSpreadsheet.class),oIndexSheets.getByIndex(0));
+ oSheet = AnyConverter.toObject(
+ XSpreadsheet.class,oIndexSheets.getByIndex(0));
log.println("Getting a cell from sheet") ;
oObj = oSheet.getCellByPosition(2, 3) ;
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScCellRangeObj.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScCellRangeObj.java
index 828ee7c992..b1fb49251e 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScCellRangeObj.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScCellRangeObj.java
@@ -153,8 +153,8 @@ public class ScCellRangeObj extends TestCase {
XSpreadsheet oSheet = null;
try {
- oSheet = (XSpreadsheet) AnyConverter.toObject(
- new Type(XSpreadsheet.class),
+ oSheet = AnyConverter.toObject(
+ XSpreadsheet.class,
oNames.getByName(oNames.getElementNames()[0]));
oObj = oSheet.getCellRangeByPosition(0, 0, 3, 4);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScCellRangesObj.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScCellRangesObj.java
index 6cb7c118f7..fabd8267e9 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScCellRangesObj.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScCellRangesObj.java
@@ -161,8 +161,8 @@ public class ScCellRangesObj extends TestCase {
UnoRuntime.queryInterface (XIndexAccess.class, oSheets);
XSpreadsheet oSheet = null;
try {
- oSheet = (XSpreadsheet) AnyConverter.toObject(
- new Type(XSpreadsheet.class), oIndSheets.getByIndex(0));
+ oSheet = AnyConverter.toObject(
+ XSpreadsheet.class, oIndSheets.getByIndex(0));
XNameContainer oRanges =
UnoRuntime.queryInterface(XNameContainer.class, oObj);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScCellSearchObj.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScCellSearchObj.java
index 009c7fa91d..1b665f8c95 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScCellSearchObj.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScCellSearchObj.java
@@ -120,8 +120,8 @@ public class ScCellSearchObj extends TestCase {
UnoRuntime.queryInterface(XIndexAccess.class, xSpreadsheets);
try {
- oSheet = (XSpreadsheet) AnyConverter.toObject(
- new Type(XSpreadsheet.class),oIndexAccess.getByIndex(0));
+ oSheet = AnyConverter.toObject(
+ XSpreadsheet.class,oIndexAccess.getByIndex(0));
} catch (com.sun.star.lang.WrappedTargetException e) {
e.printStackTrace(log);
throw new StatusException( "Couldn't get a spreadsheet", e);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScCellTextCursor.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScCellTextCursor.java
index 4729e15f6b..7a6d8a3deb 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScCellTextCursor.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScCellTextCursor.java
@@ -154,8 +154,8 @@ public class ScCellTextCursor extends TestCase {
XSpreadsheets oSheets = xSheetDoc.getSheets() ;
XIndexAccess oIndexSheets =
UnoRuntime.queryInterface(XIndexAccess.class, oSheets);
- XSpreadsheet oSheet = (XSpreadsheet) AnyConverter.toObject(
- new Type(XSpreadsheet.class),oIndexSheets.getByIndex(0));
+ XSpreadsheet oSheet = AnyConverter.toObject(
+ XSpreadsheet.class,oIndexSheets.getByIndex(0));
log.println("Getting a cell from sheet") ;
aCell = oSheet.getCellByPosition(1,1) ;
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScCellsEnumeration.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScCellsEnumeration.java
index f9c8155d35..11eba3eef2 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScCellsEnumeration.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScCellsEnumeration.java
@@ -118,8 +118,8 @@ public class ScCellsEnumeration extends TestCase {
UnoRuntime.queryInterface(XIndexAccess.class, oSheets);
XCellRange oSheet = null;
try {
- oSheet = (XCellRange) AnyConverter.toObject(
- new Type(XCellRange.class),oIndexAccess.getByIndex(0));
+ oSheet = AnyConverter.toObject(
+ XCellRange.class,oIndexAccess.getByIndex(0));
XCell oCell_1 = (XCell)oSheet.getCellByPosition(0, 0);
XTextRange oTextRange =
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScCellsObj.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScCellsObj.java
index fb259bd5aa..4a5f80de30 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScCellsObj.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScCellsObj.java
@@ -112,8 +112,8 @@ public class ScCellsObj extends TestCase {
UnoRuntime.queryInterface(XIndexAccess.class, oSheets);
XCellRange oSheet = null;
try {
- oSheet = (XCellRange) AnyConverter.toObject(
- new Type(XCellRange.class),oIndexAccess.getByIndex(0));
+ oSheet = AnyConverter.toObject(
+ XCellRange.class,oIndexAccess.getByIndex(0));
XCell oCell_1 = (XCell)oSheet.getCellByPosition(0, 0);
XTextRange oTextRange =
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScChartObj.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScChartObj.java
index 8422121701..cc922caeb2 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScChartObj.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScChartObj.java
@@ -121,8 +121,8 @@ public class ScChartObj extends TestCase {
XSpreadsheets oSheets = xSheetDoc.getSheets() ;
XIndexAccess oIndexSheets =
UnoRuntime.queryInterface(XIndexAccess.class, oSheets);
- oSheet = (XSpreadsheet) AnyConverter.toObject(
- new Type(XSpreadsheet.class),oIndexSheets.getByIndex(0));
+ oSheet = AnyConverter.toObject(
+ XSpreadsheet.class,oIndexSheets.getByIndex(0));
} catch (com.sun.star.lang.WrappedTargetException e) {
log.println("Couldn't get Sheet ");
e.printStackTrace(log);
@@ -224,12 +224,12 @@ public class ScChartObj extends TestCase {
// get the TableChart
XTableChart oChart = null;
try {
- XNameAccess names = (XNameAccess) AnyConverter.toObject(
- new Type(XNameAccess.class),UnoRuntime.queryInterface(
+ XNameAccess names = AnyConverter.toObject(
+ XNameAccess.class,UnoRuntime.queryInterface(
XNameAccess.class, oCharts));
- oChart = (XTableChart) AnyConverter.toObject(
- new Type(XTableChart.class),names.getByName("ScChartObj"));
+ oChart = AnyConverter.toObject(
+ XTableChart.class,names.getByName("ScChartObj"));
} catch (com.sun.star.lang.WrappedTargetException e) {
log.println("Couldn't get TableChart");
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScChartsObj.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScChartsObj.java
index 01a91f6905..e9e093f0ca 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScChartsObj.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScChartsObj.java
@@ -129,8 +129,8 @@ public class ScChartsObj extends TestCase {
XSpreadsheets oSheets = xSheetDoc.getSheets() ;
XIndexAccess oIndexSheets =
UnoRuntime.queryInterface(XIndexAccess.class, oSheets);
- oSheet = (XSpreadsheet) AnyConverter.toObject(
- new Type(XSpreadsheet.class),oIndexSheets.getByIndex(0));
+ oSheet = AnyConverter.toObject(
+ XSpreadsheet.class,oIndexSheets.getByIndex(0));
} catch (com.sun.star.lang.WrappedTargetException e) {
log.println("Couldn't get Sheet ");
e.printStackTrace(log);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScDDELinkObj.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScDDELinkObj.java
index cc25193ada..192072e08d 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScDDELinkObj.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScDDELinkObj.java
@@ -163,8 +163,8 @@ public class ScDDELinkObj extends TestCase {
XIndexAccess oIndexAccess =
UnoRuntime.queryInterface(XIndexAccess.class, xSpreadsheets);
try {
- oSheet = (XSpreadsheet) AnyConverter.toObject(
- new Type(XSpreadsheet.class),oIndexAccess.getByIndex(0));
+ oSheet = AnyConverter.toObject(
+ XSpreadsheet.class,oIndexAccess.getByIndex(0));
} catch (com.sun.star.lang.WrappedTargetException e) {
e.printStackTrace(log);
throw new StatusException("Couldn't get a spreadsheet", e);
@@ -197,14 +197,14 @@ public class ScDDELinkObj extends TestCase {
// Getting named ranges.
XPropertySet docProps =
UnoRuntime.queryInterface(XPropertySet.class, xSheetDoc);
- XNameAccess links = (XNameAccess) AnyConverter.toObject(
- new Type(XNameAccess.class), UnoRuntime.queryInterface(
+ XNameAccess links = AnyConverter.toObject(
+ XNameAccess.class, UnoRuntime.queryInterface(
XNameAccess.class, docProps.getPropertyValue("DDELinks")));
String[] linkNames = links.getElementNames();
- oObj = (XInterface) AnyConverter.toObject(
- new Type(XInterface.class),links.getByName(linkNames[0]));
+ oObj = AnyConverter.toObject(
+ XInterface.class,links.getByName(linkNames[0]));
log.println("Creating object - " +
((oObj == null) ? "FAILED" : "OK"));
} catch (com.sun.star.lang.WrappedTargetException e) {
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScDDELinksObj.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScDDELinksObj.java
index 7a552afd9f..e8d9cd0f98 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScDDELinksObj.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScDDELinksObj.java
@@ -142,8 +142,8 @@ public class ScDDELinksObj extends TestCase {
XIndexAccess oIndexAccess =
UnoRuntime.queryInterface(XIndexAccess.class, xSpreadsheets);
try {
- oSheet = (XSpreadsheet) AnyConverter.toObject(
- new Type(XSpreadsheet.class),oIndexAccess.getByIndex(0));
+ oSheet = AnyConverter.toObject(
+ XSpreadsheet.class,oIndexAccess.getByIndex(0));
} catch (com.sun.star.lang.WrappedTargetException e) {
e.printStackTrace(log);
throw new StatusException("Couldn't get a spreadsheet", e);
@@ -176,8 +176,8 @@ public class ScDDELinksObj extends TestCase {
// Getting named ranges.
XPropertySet docProps =
UnoRuntime.queryInterface(XPropertySet.class, xSheetDoc);
- oObj = (XInterface)AnyConverter.toObject(
- new Type(XInterface.class),docProps.getPropertyValue("DDELinks"));
+ oObj = AnyConverter.toObject(
+ XInterface.class,docProps.getPropertyValue("DDELinks"));
log.println("Creating object - " +
((oObj == null) ? "FAILED" : "OK"));
} catch (com.sun.star.lang.WrappedTargetException e) {
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScDataPilotFieldGroupItemObj.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScDataPilotFieldGroupItemObj.java
index 5ef294db5b..1b7316857c 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScDataPilotFieldGroupItemObj.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScDataPilotFieldGroupItemObj.java
@@ -132,11 +132,11 @@ public class ScDataPilotFieldGroupItemObj extends TestCase
try
{
- oSheet = (XSpreadsheet) AnyConverter.toObject (
- new Type (XSpreadsheet.class),
+ oSheet = AnyConverter.toObject (
+ XSpreadsheet.class,
oIndexAccess.getByIndex (0));
- oSheet2 = (XSpreadsheet) AnyConverter.toObject (
- new Type (XSpreadsheet.class),
+ oSheet2 = AnyConverter.toObject (
+ XSpreadsheet.class,
oIndexAccess.getByIndex (1));
}
catch (com.sun.star.lang.WrappedTargetException e)
@@ -289,8 +289,8 @@ public class ScDataPilotFieldGroupItemObj extends TestCase
IA = xDPT.getRowFields ();
//getSRange(IA);
System.out.println ("COUNT: "+IA.getCount ());
- datapilotfield = (XInterface) AnyConverter.toObject (
- new Type (XInterface.class), IA.getByIndex (0));
+ datapilotfield = AnyConverter.toObject (
+ XInterface.class, IA.getByIndex (0));
}
catch (com.sun.star.lang.WrappedTargetException e)
{
@@ -332,8 +332,8 @@ public class ScDataPilotFieldGroupItemObj extends TestCase
}
for (int i=0;i<IA.getCount ();i++)
{
- datapilotfield = (XInterface) AnyConverter.toObject (
- new Type (XInterface.class), IA.getByIndex (i));
+ datapilotfield = AnyConverter.toObject (
+ XInterface.class, IA.getByIndex (i));
XPropertySet xPropertySet = UnoRuntime.queryInterface (XPropertySet.class, IA.getByIndex (i));
if (((Boolean)xPropertySet.getPropertyValue ("IsGroupField")).booleanValue ())
{
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScDataPilotFieldGroupObj.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScDataPilotFieldGroupObj.java
index 85a68bc2b1..d7c232b015 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScDataPilotFieldGroupObj.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScDataPilotFieldGroupObj.java
@@ -131,11 +131,11 @@ public class ScDataPilotFieldGroupObj extends TestCase
try
{
- oSheet = (XSpreadsheet) AnyConverter.toObject (
- new Type (XSpreadsheet.class),
+ oSheet = AnyConverter.toObject (
+ XSpreadsheet.class,
oIndexAccess.getByIndex (0));
- oSheet2 = (XSpreadsheet) AnyConverter.toObject (
- new Type (XSpreadsheet.class),
+ oSheet2 = AnyConverter.toObject (
+ XSpreadsheet.class,
oIndexAccess.getByIndex (1));
}
catch (com.sun.star.lang.WrappedTargetException e)
@@ -288,8 +288,8 @@ public class ScDataPilotFieldGroupObj extends TestCase
IA = xDPT.getRowFields ();
//getSRange(IA);
System.out.println ("COUNT: "+IA.getCount ());
- datapilotfield = (XInterface) AnyConverter.toObject (
- new Type (XInterface.class), IA.getByIndex (0));
+ datapilotfield = AnyConverter.toObject (
+ XInterface.class, IA.getByIndex (0));
}
catch (com.sun.star.lang.WrappedTargetException e)
{
@@ -331,8 +331,8 @@ public class ScDataPilotFieldGroupObj extends TestCase
}
for (int i=0;i<IA.getCount ();i++)
{
- datapilotfield = (XInterface) AnyConverter.toObject (
- new Type (XInterface.class), IA.getByIndex (i));
+ datapilotfield = AnyConverter.toObject (
+ XInterface.class, IA.getByIndex (i));
XPropertySet xPropertySet = UnoRuntime.queryInterface (XPropertySet.class, IA.getByIndex (i));
if (((Boolean)xPropertySet.getPropertyValue ("IsGroupField")).booleanValue ())
{
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScDataPilotFieldGroupsObj.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScDataPilotFieldGroupsObj.java
index e7f18f402c..d3bd60f078 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScDataPilotFieldGroupsObj.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScDataPilotFieldGroupsObj.java
@@ -131,11 +131,11 @@ public class ScDataPilotFieldGroupsObj extends TestCase
try
{
- oSheet = (XSpreadsheet) AnyConverter.toObject (
- new Type (XSpreadsheet.class),
+ oSheet = AnyConverter.toObject (
+ XSpreadsheet.class,
oIndexAccess.getByIndex (0));
- oSheet2 = (XSpreadsheet) AnyConverter.toObject (
- new Type (XSpreadsheet.class),
+ oSheet2 = AnyConverter.toObject (
+ XSpreadsheet.class,
oIndexAccess.getByIndex (1));
}
catch (com.sun.star.lang.WrappedTargetException e)
@@ -288,8 +288,8 @@ public class ScDataPilotFieldGroupsObj extends TestCase
IA = xDPT.getRowFields ();
//getSRange(IA);
System.out.println ("COUNT: "+IA.getCount ());
- datapilotfield = (XInterface) AnyConverter.toObject (
- new Type (XInterface.class), IA.getByIndex (0));
+ datapilotfield = AnyConverter.toObject (
+ XInterface.class, IA.getByIndex (0));
}
catch (com.sun.star.lang.WrappedTargetException e)
{
@@ -331,8 +331,8 @@ public class ScDataPilotFieldGroupsObj extends TestCase
}
for (int i=0;i<IA.getCount ();i++)
{
- datapilotfield = (XInterface) AnyConverter.toObject (
- new Type (XInterface.class), IA.getByIndex (i));
+ datapilotfield = AnyConverter.toObject (
+ XInterface.class, IA.getByIndex (i));
XPropertySet xPropertySet = UnoRuntime.queryInterface (XPropertySet.class, IA.getByIndex (i));
if (((Boolean)xPropertySet.getPropertyValue ("IsGroupField")).booleanValue ())
{
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScDataPilotFieldObj.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScDataPilotFieldObj.java
index 7aa16619be..a8f5a7abdb 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScDataPilotFieldObj.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScDataPilotFieldObj.java
@@ -152,11 +152,11 @@ public class ScDataPilotFieldObj extends TestCase {
XIndexAccess.class, xSpreadsheets);
try {
- oSheet = (XSpreadsheet) AnyConverter.toObject(
- new Type(XSpreadsheet.class),
+ oSheet = AnyConverter.toObject(
+ XSpreadsheet.class,
oIndexAccess.getByIndex(0));
- oSheet2 = (XSpreadsheet) AnyConverter.toObject(
- new Type(XSpreadsheet.class),
+ oSheet2 = AnyConverter.toObject(
+ XSpreadsheet.class,
oIndexAccess.getByIndex(1));
} catch (com.sun.star.lang.WrappedTargetException e) {
e.printStackTrace();
@@ -267,8 +267,8 @@ public class ScDataPilotFieldObj extends TestCase {
DPT.insertNewByName("DataPilotTable", sCellAdress, DPDsc);
try {
- oObj = (XInterface) AnyConverter.toObject(
- new Type(XInterface.class), IA.getByIndex(0));
+ oObj = AnyConverter.toObject(
+ XInterface.class, IA.getByIndex(0));
} catch (com.sun.star.lang.WrappedTargetException e) {
e.printStackTrace();
throw new StatusException("Couldn't get data pilot field", e);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScDataPilotFieldsObj.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScDataPilotFieldsObj.java
index 3e9cbd088f..11d86171bd 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScDataPilotFieldsObj.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScDataPilotFieldsObj.java
@@ -123,8 +123,8 @@ public class ScDataPilotFieldsObj extends TestCase {
XIndexAccess oIndexAccess =
UnoRuntime.queryInterface(XIndexAccess.class, xSpreadsheets);
try {
- oSheet = (XSpreadsheet) AnyConverter.toObject(
- new Type(XSpreadsheet.class),oIndexAccess.getByIndex(0));
+ oSheet = AnyConverter.toObject(
+ XSpreadsheet.class,oIndexAccess.getByIndex(0));
} catch (com.sun.star.lang.WrappedTargetException e) {
e.printStackTrace(log);
throw new StatusException( "Couldn't get a spreadsheet", e);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScDataPilotItemObj.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScDataPilotItemObj.java
index eddb29f279..f777981b7e 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScDataPilotItemObj.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScDataPilotItemObj.java
@@ -153,11 +153,11 @@ public class ScDataPilotItemObj extends TestCase {
XIndexAccess.class, xSpreadsheets);
try {
- oSheet = (XSpreadsheet) AnyConverter.toObject(
- new Type(XSpreadsheet.class),
+ oSheet = AnyConverter.toObject(
+ XSpreadsheet.class,
oIndexAccess.getByIndex(0));
- oSheet2 = (XSpreadsheet) AnyConverter.toObject(
- new Type(XSpreadsheet.class),
+ oSheet2 = AnyConverter.toObject(
+ XSpreadsheet.class,
oIndexAccess.getByIndex(1));
} catch (com.sun.star.lang.WrappedTargetException e) {
e.printStackTrace();
@@ -268,8 +268,8 @@ public class ScDataPilotItemObj extends TestCase {
DPT.insertNewByName("DataPilotTable", sCellAdress, DPDsc);
try {
- oObj = (XInterface) AnyConverter.toObject(
- new Type(XInterface.class), IA.getByIndex(0));
+ oObj = AnyConverter.toObject(
+ XInterface.class, IA.getByIndex(0));
} catch (com.sun.star.lang.WrappedTargetException e) {
e.printStackTrace();
throw new StatusException("Couldn't get data pilot field", e);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScDataPilotItemsObj.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScDataPilotItemsObj.java
index cdcf02acab..75971bd516 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScDataPilotItemsObj.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScDataPilotItemsObj.java
@@ -153,11 +153,11 @@ public class ScDataPilotItemsObj extends TestCase {
XIndexAccess.class, xSpreadsheets);
try {
- oSheet = (XSpreadsheet) AnyConverter.toObject(
- new Type(XSpreadsheet.class),
+ oSheet = AnyConverter.toObject(
+ XSpreadsheet.class,
oIndexAccess.getByIndex(0));
- oSheet2 = (XSpreadsheet) AnyConverter.toObject(
- new Type(XSpreadsheet.class),
+ oSheet2 = AnyConverter.toObject(
+ XSpreadsheet.class,
oIndexAccess.getByIndex(1));
} catch (com.sun.star.lang.WrappedTargetException e) {
e.printStackTrace();
@@ -268,8 +268,8 @@ public class ScDataPilotItemsObj extends TestCase {
DPT.insertNewByName("DataPilotTable", sCellAdress, DPDsc);
try {
- oObj = (XInterface) AnyConverter.toObject(
- new Type(XInterface.class), IA.getByIndex(0));
+ oObj = AnyConverter.toObject(
+ XInterface.class, IA.getByIndex(0));
} catch (com.sun.star.lang.WrappedTargetException e) {
e.printStackTrace();
throw new StatusException("Couldn't get data pilot field", e);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScDataPilotTableObj.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScDataPilotTableObj.java
index dd01065212..67ca41ab60 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScDataPilotTableObj.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScDataPilotTableObj.java
@@ -148,8 +148,8 @@ public class ScDataPilotTableObj extends TestCase {
Object oChangeCell = null;
Object oCheckCell = null;
try {
- oSheet = (XSpreadsheet) AnyConverter.toObject(
- new Type(XSpreadsheet.class),oIndexAccess.getByIndex(0));
+ oSheet = AnyConverter.toObject(
+ XSpreadsheet.class,oIndexAccess.getByIndex(0));
oChangeCell = oSheet.getCellByPosition(1, 5);
oCheckCell = oSheet.getCellByPosition(
sCellAddress.Column, sCellAddress.Row + 3);
@@ -248,8 +248,8 @@ public class ScDataPilotTableObj extends TestCase {
}
DPT.insertNewByName("DataPilotTable", sCellAddress, DPDsc);
try {
- oObj = (XInterface) AnyConverter.toObject(
- new Type(XInterface.class),DPT.getByName(DPT.getElementNames()[0]));
+ oObj = AnyConverter.toObject(
+ XInterface.class,DPT.getByName(DPT.getElementNames()[0]));
} catch (com.sun.star.lang.WrappedTargetException e) {
e.printStackTrace(log);
throw new StatusException("Couldn't create a test environment", e);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScDataPilotTablesObj.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScDataPilotTablesObj.java
index d6e0136daf..cb83d5fca7 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScDataPilotTablesObj.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScDataPilotTablesObj.java
@@ -130,8 +130,8 @@ public class ScDataPilotTablesObj extends TestCase {
XIndexAccess oIndexAccess =
UnoRuntime.queryInterface(XIndexAccess.class, xSpreadsheets);
try {
- oSheet = (XSpreadsheet) AnyConverter.toObject(
- new Type(XSpreadsheet.class),oIndexAccess.getByIndex(0));
+ oSheet = AnyConverter.toObject(
+ XSpreadsheet.class,oIndexAccess.getByIndex(0));
} catch (com.sun.star.lang.WrappedTargetException e) {
e.printStackTrace(log);
throw new StatusException( "Couldn't get a spreadsheet", e);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScDatabaseRangeObj.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScDatabaseRangeObj.java
index f3e4fb77ee..ff355b4402 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScDatabaseRangeObj.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScDatabaseRangeObj.java
@@ -147,8 +147,8 @@ public class ScDatabaseRangeObj extends TestCase {
Object sheet = sheets.getByName(names[0]);
xImp = UnoRuntime.queryInterface(XImportable.class,
sheet);
- dbRanges = (XDatabaseRanges) AnyConverter.toObject(
- new Type(XDatabaseRanges.class),
+ dbRanges = AnyConverter.toObject(
+ XDatabaseRanges.class,
docProps.getPropertyValue("DatabaseRanges"));
_doImport(xImp);
} catch (com.sun.star.lang.WrappedTargetException e) {
@@ -192,8 +192,8 @@ public class ScDatabaseRangeObj extends TestCase {
XCellRangeAddressable.class,
aReferrer.getReferredCells());
aRange = aRangeA.getRangeAddress();
- oObj = (XInterface) AnyConverter.toObject(
- new Type(XInterface.class),
+ oObj = AnyConverter.toObject(
+ XInterface.class,
dbrNA.getByName("dbRange"));
} catch (com.sun.star.lang.WrappedTargetException e) {
e.printStackTrace(log);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScDatabaseRangesObj.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScDatabaseRangesObj.java
index 7c73a77703..ea164b4099 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScDatabaseRangesObj.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScDatabaseRangesObj.java
@@ -115,8 +115,8 @@ public class ScDatabaseRangesObj extends TestCase {
XDatabaseRanges dbRanges = null;
try {
- dbRanges = (XDatabaseRanges) AnyConverter.toObject(
- new Type(XDatabaseRanges.class),
+ dbRanges = AnyConverter.toObject(
+ XDatabaseRanges.class,
docProps.getPropertyValue("DatabaseRanges"));
} catch (com.sun.star.lang.WrappedTargetException e) {
e.printStackTrace(log) ;
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScDrawPageObj.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScDrawPageObj.java
index e1cd38bd9c..66b89f6ce1 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScDrawPageObj.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScDrawPageObj.java
@@ -115,8 +115,8 @@ public class ScDrawPageObj extends TestCase {
oDP = (XDrawPages) oDPS.getDrawPages();
oDP.insertNewByIndex(1);
oDP.insertNewByIndex(2);
- oObj = (XDrawPage) AnyConverter.toObject(
- new Type(XDrawPage.class),oDP.getByIndex(0));
+ oObj = AnyConverter.toObject(
+ XDrawPage.class,oDP.getByIndex(0));
SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF());
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScFilterDescriptorBase.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScFilterDescriptorBase.java
index 88b9819025..08ea185e71 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScFilterDescriptorBase.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScFilterDescriptorBase.java
@@ -115,8 +115,8 @@ public class ScFilterDescriptorBase extends TestCase {
UnoRuntime.queryInterface(XIndexAccess.class, xSpreadsheets);
try {
- oSheet = (XSpreadsheet) AnyConverter.toObject(
- new Type(XSpreadsheet.class),oIndexAccess.getByIndex(0));
+ oSheet = AnyConverter.toObject(
+ XSpreadsheet.class,oIndexAccess.getByIndex(0));
} catch (com.sun.star.lang.WrappedTargetException e) {
e.printStackTrace(log);
throw new StatusException("Couldn't get a spreadsheet", e);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScHeaderFieldObj.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScHeaderFieldObj.java
index 0112bf9a52..995eb6b5cd 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScHeaderFieldObj.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScHeaderFieldObj.java
@@ -142,10 +142,10 @@ public class ScHeaderFieldObj extends TestCase {
XNameAccess StyleFamNames = StyleFam.getStyleFamilies();
try{
- PageStyles = (XNameAccess) AnyConverter.toObject(
- new Type(XNameAccess.class),StyleFamNames.getByName("PageStyles"));
- StdStyle = (XStyle) AnyConverter.toObject(
- new Type(XStyle.class),PageStyles.getByName("Default"));
+ PageStyles = AnyConverter.toObject(
+ XNameAccess.class,StyleFamNames.getByName("PageStyles"));
+ StdStyle = AnyConverter.toObject(
+ XStyle.class,PageStyles.getByName("Default"));
} catch(com.sun.star.lang.WrappedTargetException e){
e.printStackTrace(log);
throw new StatusException("Couldn't get by name", e);
@@ -166,8 +166,8 @@ public class ScHeaderFieldObj extends TestCase {
// first we write what we are intend to do to log file
log.println( "creating a test environment" );
try {
- RPHC = (XHeaderFooterContent) AnyConverter.toObject(
- new Type(XHeaderFooterContent.class),
+ RPHC = AnyConverter.toObject(
+ XHeaderFooterContent.class,
PropSet.getPropertyValue("RightPageHeaderContent"));
} catch (com.sun.star.lang.WrappedTargetException e) {
e.printStackTrace(log);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScHeaderFieldsObj.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScHeaderFieldsObj.java
index 2ef5f707ca..bffba8bca5 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScHeaderFieldsObj.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScHeaderFieldsObj.java
@@ -127,10 +127,10 @@ public class ScHeaderFieldsObj extends TestCase {
XNameAccess StyleFamNames = StyleFam.getStyleFamilies();
try{
- PageStyles = (XNameAccess) AnyConverter.toObject(
- new Type(XNameAccess.class),StyleFamNames.getByName("PageStyles"));
- StdStyle = (XStyle) AnyConverter.toObject(
- new Type(XStyle.class),PageStyles.getByName("Default"));
+ PageStyles = AnyConverter.toObject(
+ XNameAccess.class,StyleFamNames.getByName("PageStyles"));
+ StdStyle = AnyConverter.toObject(
+ XStyle.class,PageStyles.getByName("Default"));
} catch(com.sun.star.lang.WrappedTargetException e){
e.printStackTrace(log);
throw new StatusException("Couldn't get by name", e);
@@ -151,8 +151,8 @@ public class ScHeaderFieldsObj extends TestCase {
// first we write what we are intend to do to log file
log.println( "creating a test environment" );
try {
- RPHC = (XHeaderFooterContent) AnyConverter.toObject(
- new Type(XHeaderFooterContent.class),
+ RPHC = AnyConverter.toObject(
+ XHeaderFooterContent.class,
PropSet.getPropertyValue("RightPageHeaderContent"));
} catch (com.sun.star.lang.WrappedTargetException e) {
e.printStackTrace(log);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScHeaderFooterContentObj.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScHeaderFooterContentObj.java
index b7f1fe26e7..9ca89637e3 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScHeaderFooterContentObj.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScHeaderFooterContentObj.java
@@ -113,10 +113,10 @@ public class ScHeaderFooterContentObj extends TestCase {
xSpreadsheetDoc );
XNameAccess StyleFamNames = StyleFam.getStyleFamilies();
try{
- PageStyles = (XNameAccess) AnyConverter.toObject(
- new Type(XNameAccess.class),StyleFamNames.getByName("PageStyles"));
- StdStyle = (XStyle) AnyConverter.toObject(
- new Type(XStyle.class),PageStyles.getByName("Default"));
+ PageStyles = AnyConverter.toObject(
+ XNameAccess.class,StyleFamNames.getByName("PageStyles"));
+ StdStyle = AnyConverter.toObject(
+ XStyle.class,PageStyles.getByName("Default"));
} catch(com.sun.star.lang.WrappedTargetException e){
e.printStackTrace(log);
throw new StatusException("Couldn't get by name", e);
@@ -137,8 +137,8 @@ public class ScHeaderFooterContentObj extends TestCase {
// first we write what we are intend to do to log file
log.println( "creating a test environment" );
try {
- RPHC = (XHeaderFooterContent) AnyConverter.toObject(
- new Type(XHeaderFooterContent.class),
+ RPHC = AnyConverter.toObject(
+ XHeaderFooterContent.class,
PropSet.getPropertyValue("RightPageHeaderContent"));
} catch(com.sun.star.lang.WrappedTargetException e){
e.printStackTrace(log);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScHeaderFooterTextCursor.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScHeaderFooterTextCursor.java
index 7e4674ce5d..17d08b738c 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScHeaderFooterTextCursor.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScHeaderFooterTextCursor.java
@@ -152,10 +152,10 @@ public class ScHeaderFooterTextCursor extends TestCase {
XNameAccess StyleFamNames = StyleFam.getStyleFamilies();
try{
- PageStyles = (XNameAccess) AnyConverter.toObject(
- new Type(XNameAccess.class),StyleFamNames.getByName("PageStyles"));
- StdStyle = (XStyle) AnyConverter.toObject(
- new Type(XStyle.class),PageStyles.getByName("Default"));
+ PageStyles = AnyConverter.toObject(
+ XNameAccess.class,StyleFamNames.getByName("PageStyles"));
+ StdStyle = AnyConverter.toObject(
+ XStyle.class,PageStyles.getByName("Default"));
} catch(com.sun.star.lang.WrappedTargetException e){
e.printStackTrace(log);
throw new StatusException("Couldn't get by name", e);
@@ -176,8 +176,8 @@ public class ScHeaderFooterTextCursor extends TestCase {
// first we write what we are intend to do to log file
log.println( "creating a test environment" );
try {
- RPHC = (XHeaderFooterContent) AnyConverter.toObject(
- new Type(XHeaderFooterContent.class),
+ RPHC = AnyConverter.toObject(
+ XHeaderFooterContent.class,
PropSet.getPropertyValue("RightPageHeaderContent"));
} catch(com.sun.star.lang.WrappedTargetException e){
e.printStackTrace(log);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScHeaderFooterTextObj.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScHeaderFooterTextObj.java
index 8de0dbdb15..1ac6efaabe 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScHeaderFooterTextObj.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScHeaderFooterTextObj.java
@@ -156,10 +156,10 @@ public class ScHeaderFooterTextObj extends TestCase {
xSpreadsheetDoc );
XNameAccess StyleFamNames = StyleFam.getStyleFamilies();
try{
- PageStyles = (XNameAccess) AnyConverter.toObject(
- new Type(XNameAccess.class),StyleFamNames.getByName("PageStyles"));
- StdStyle = (XStyle) AnyConverter.toObject(
- new Type(XStyle.class),PageStyles.getByName("Default"));
+ PageStyles = AnyConverter.toObject(
+ XNameAccess.class,StyleFamNames.getByName("PageStyles"));
+ StdStyle = AnyConverter.toObject(
+ XStyle.class,PageStyles.getByName("Default"));
} catch(com.sun.star.lang.WrappedTargetException e){
e.printStackTrace(log);
throw new StatusException("Couldn't get by name", e);
@@ -180,8 +180,8 @@ public class ScHeaderFooterTextObj extends TestCase {
// first we write what we are intend to do to log file
log.println( "creating a test environment" );
try {
- RPHC = (XHeaderFooterContent) AnyConverter.toObject(
- new Type(XHeaderFooterContent.class),
+ RPHC = AnyConverter.toObject(
+ XHeaderFooterContent.class,
PropSet.getPropertyValue("RightPageHeaderContent"));
} catch(com.sun.star.lang.WrappedTargetException e){
e.printStackTrace(log);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScIndexEnumeration_CellAnnotationsEnumeration.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScIndexEnumeration_CellAnnotationsEnumeration.java
index a669fad66d..7efc8efb59 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScIndexEnumeration_CellAnnotationsEnumeration.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScIndexEnumeration_CellAnnotationsEnumeration.java
@@ -88,8 +88,8 @@ public class ScIndexEnumeration_CellAnnotationsEnumeration extends TestCase {
XIndexAccess oIndexAccess =
UnoRuntime.queryInterface(XIndexAccess.class, xSpreadsheets);
try {
- oSheet = (XSpreadsheet) AnyConverter.toObject(
- new Type(XSpreadsheet.class),oIndexAccess.getByIndex(0));
+ oSheet = AnyConverter.toObject(
+ XSpreadsheet.class,oIndexAccess.getByIndex(0));
} catch (com.sun.star.lang.WrappedTargetException e) {
e.printStackTrace(log);
throw new StatusException( "Couldn't get a spreadsheet", e);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScIndexEnumeration_CellAreaLinksEnumeration.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScIndexEnumeration_CellAreaLinksEnumeration.java
index be9dd9e98e..6f631f1117 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScIndexEnumeration_CellAreaLinksEnumeration.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScIndexEnumeration_CellAreaLinksEnumeration.java
@@ -85,8 +85,8 @@ public class ScIndexEnumeration_CellAreaLinksEnumeration extends TestCase {
// creation of testobject here
XPropertySet props = UnoRuntime.queryInterface
(XPropertySet.class, xSheetDoc);
- oObj = (XInterface) AnyConverter.toObject(
- new Type(XInterface.class),props.getPropertyValue("AreaLinks")) ;
+ oObj = AnyConverter.toObject(
+ XInterface.class,props.getPropertyValue("AreaLinks")) ;
XAreaLinks links = null ;
// adding one link into collection (for best testing)
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScIndexEnumeration_DDELinksEnumeration.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScIndexEnumeration_DDELinksEnumeration.java
index 400ea5c698..d4d58861c7 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScIndexEnumeration_DDELinksEnumeration.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScIndexEnumeration_DDELinksEnumeration.java
@@ -112,8 +112,8 @@ public class ScIndexEnumeration_DDELinksEnumeration extends TestCase {
XIndexAccess oIndexAccess =
UnoRuntime.queryInterface(XIndexAccess.class, xSpreadsheets);
try {
- oSheet = (XSpreadsheet) AnyConverter.toObject(
- new Type(XSpreadsheet.class),oIndexAccess.getByIndex(0));
+ oSheet = AnyConverter.toObject(
+ XSpreadsheet.class,oIndexAccess.getByIndex(0));
} catch (com.sun.star.lang.WrappedTargetException e) {
e.printStackTrace(log);
throw new StatusException( "Couldn't get a spreadsheet", e);
@@ -146,8 +146,8 @@ public class ScIndexEnumeration_DDELinksEnumeration extends TestCase {
// Getting named ranges.
XPropertySet docProps =
UnoRuntime.queryInterface(XPropertySet.class, xSheetDoc);
- oObj = (XInterface)AnyConverter.toObject(
- new Type(XInterface.class),docProps.getPropertyValue("DDELinks"));
+ oObj = AnyConverter.toObject(
+ XInterface.class,docProps.getPropertyValue("DDELinks"));
log.println("Creating object - " +
((oObj == null) ? "FAILED" : "OK"));
} catch (com.sun.star.lang.WrappedTargetException e) {
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScIndexEnumeration_DataPilotFieldsEnumeration.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScIndexEnumeration_DataPilotFieldsEnumeration.java
index 7b5f62c3ed..baf5375ad8 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScIndexEnumeration_DataPilotFieldsEnumeration.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScIndexEnumeration_DataPilotFieldsEnumeration.java
@@ -96,8 +96,8 @@ public class ScIndexEnumeration_DataPilotFieldsEnumeration extends TestCase {
XIndexAccess oIndexAccess =
UnoRuntime.queryInterface(XIndexAccess.class, xSpreadsheets);
try {
- oSheet = (XSpreadsheet) AnyConverter.toObject(
- new Type(XSpreadsheet.class),oIndexAccess.getByIndex(0));
+ oSheet = AnyConverter.toObject(
+ XSpreadsheet.class,oIndexAccess.getByIndex(0));
} catch (com.sun.star.lang.WrappedTargetException e) {
e.printStackTrace(log);
throw new StatusException( "Couldn't get a spreadsheet", e);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScIndexEnumeration_DataPilotItemsEnumeration.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScIndexEnumeration_DataPilotItemsEnumeration.java
index 958695e501..74250a75f2 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScIndexEnumeration_DataPilotItemsEnumeration.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScIndexEnumeration_DataPilotItemsEnumeration.java
@@ -155,11 +155,11 @@ public class ScIndexEnumeration_DataPilotItemsEnumeration
XIndexAccess.class, xSpreadsheets);
try {
- oSheet = (XSpreadsheet) AnyConverter.toObject(
- new Type(XSpreadsheet.class),
+ oSheet = AnyConverter.toObject(
+ XSpreadsheet.class,
oIndexAccess.getByIndex(0));
- oSheet2 = (XSpreadsheet) AnyConverter.toObject(
- new Type(XSpreadsheet.class),
+ oSheet2 = AnyConverter.toObject(
+ XSpreadsheet.class,
oIndexAccess.getByIndex(1));
} catch (com.sun.star.lang.WrappedTargetException e) {
e.printStackTrace();
@@ -270,8 +270,8 @@ public class ScIndexEnumeration_DataPilotItemsEnumeration
DPT.insertNewByName("DataPilotTable", sCellAdress, DPDsc);
try {
- oObj = (XInterface) AnyConverter.toObject(
- new Type(XInterface.class), IA.getByIndex(0));
+ oObj = AnyConverter.toObject(
+ XInterface.class, IA.getByIndex(0));
} catch (com.sun.star.lang.WrappedTargetException e) {
e.printStackTrace();
throw new StatusException("Couldn't get data pilot field", e);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScIndexEnumeration_DataPilotTablesEnumeration.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScIndexEnumeration_DataPilotTablesEnumeration.java
index 2ac9711c09..dd77e322db 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScIndexEnumeration_DataPilotTablesEnumeration.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScIndexEnumeration_DataPilotTablesEnumeration.java
@@ -96,8 +96,8 @@ public class ScIndexEnumeration_DataPilotTablesEnumeration extends TestCase {
XIndexAccess oIndexAccess =
UnoRuntime.queryInterface(XIndexAccess.class, xSpreadsheets);
try {
- oSheet = (XSpreadsheet) AnyConverter.toObject(
- new Type(XSpreadsheet.class),oIndexAccess.getByIndex(0));
+ oSheet = AnyConverter.toObject(
+ XSpreadsheet.class,oIndexAccess.getByIndex(0));
} catch (com.sun.star.lang.WrappedTargetException e) {
e.printStackTrace(log);
throw new StatusException( "Couldn't get a spreadsheet", e);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScIndexEnumeration_DatabaseRangesEnumeration.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScIndexEnumeration_DatabaseRangesEnumeration.java
index fb38205b8a..2d050e755c 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScIndexEnumeration_DatabaseRangesEnumeration.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScIndexEnumeration_DatabaseRangesEnumeration.java
@@ -88,8 +88,8 @@ public class ScIndexEnumeration_DatabaseRangesEnumeration extends TestCase {
XDatabaseRanges dbRanges = null;
try {
- dbRanges = (XDatabaseRanges) AnyConverter.toObject(
- new Type(XDatabaseRanges.class),
+ dbRanges = AnyConverter.toObject(
+ XDatabaseRanges.class,
docProps.getPropertyValue("DatabaseRanges"));
} catch (com.sun.star.lang.WrappedTargetException e) {
e.printStackTrace(log) ;
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScIndexEnumeration_ScenariosEnumeration.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScIndexEnumeration_ScenariosEnumeration.java
index 403af3b851..6b1af5b5fb 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScIndexEnumeration_ScenariosEnumeration.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScIndexEnumeration_ScenariosEnumeration.java
@@ -85,8 +85,8 @@ public class ScIndexEnumeration_ScenariosEnumeration extends TestCase {
XIndexAccess oIndexAccess =
UnoRuntime.queryInterface(XIndexAccess.class, xSpreadsheets);
try {
- oSheet = (XSpreadsheet) AnyConverter.toObject(
- new Type(XSpreadsheet.class),oIndexAccess.getByIndex(0));
+ oSheet = AnyConverter.toObject(
+ XSpreadsheet.class,oIndexAccess.getByIndex(0));
} catch (com.sun.star.lang.WrappedTargetException e) {
e.printStackTrace(log);
throw new StatusException( "Couldn't get a spreadsheet", e);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScIndexEnumeration_SheetCellRangesEnumeration.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScIndexEnumeration_SheetCellRangesEnumeration.java
index b7176a3efb..38d2787536 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScIndexEnumeration_SheetCellRangesEnumeration.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScIndexEnumeration_SheetCellRangesEnumeration.java
@@ -100,8 +100,8 @@ public class ScIndexEnumeration_SheetCellRangesEnumeration extends TestCase {
UnoRuntime.queryInterface (XIndexAccess.class, oSheets);
XSpreadsheet oSheet = null;
try {
- oSheet = (XSpreadsheet) AnyConverter.toObject(
- new Type(XSpreadsheet.class),oIndSheets.getByIndex(0));
+ oSheet = AnyConverter.toObject(
+ XSpreadsheet.class,oIndSheets.getByIndex(0));
XNameContainer oRanges =
UnoRuntime.queryInterface(XNameContainer.class, oObj);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScIndexEnumeration_SheetLinksEnumeration.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScIndexEnumeration_SheetLinksEnumeration.java
index 0f7a6f2a40..d3baf9ae36 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScIndexEnumeration_SheetLinksEnumeration.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScIndexEnumeration_SheetLinksEnumeration.java
@@ -88,8 +88,8 @@ public class ScIndexEnumeration_SheetLinksEnumeration extends TestCase {
XIndexAccess oIndexAccess =
UnoRuntime.queryInterface(XIndexAccess.class, oSheets);
try {
- oSheet = (XSpreadsheet) AnyConverter.toObject(
- new Type(XSpreadsheet.class),oIndexAccess.getByIndex(0));
+ oSheet = AnyConverter.toObject(
+ XSpreadsheet.class,oIndexAccess.getByIndex(0));
} catch (com.sun.star.lang.WrappedTargetException e) {
e.printStackTrace(log);
throw new StatusException( "Couldn't get a spreadsheet", e);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScIndexEnumeration_SpreadsheetViewPanesEnumeration.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScIndexEnumeration_SpreadsheetViewPanesEnumeration.java
index b0f24a739e..8f2c96be07 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScIndexEnumeration_SpreadsheetViewPanesEnumeration.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScIndexEnumeration_SpreadsheetViewPanesEnumeration.java
@@ -82,8 +82,8 @@ public class ScIndexEnumeration_SpreadsheetViewPanesEnumeration extends TestCase
XIndexAccess xIA =
UnoRuntime.queryInterface(XIndexAccess.class, xc);
try {
- oObj = (XInterface) AnyConverter.toObject(
- new Type(XInterface.class),xIA.getByIndex(0));
+ oObj = AnyConverter.toObject(
+ XInterface.class,xIA.getByIndex(0));
} catch (com.sun.star.lang.WrappedTargetException e) {
e.printStackTrace(log);
throw new StatusException("Couldn't get by index", e);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScIndexEnumeration_SubTotalFieldsEnumeration.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScIndexEnumeration_SubTotalFieldsEnumeration.java
index 8f6e0767db..9217cda620 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScIndexEnumeration_SubTotalFieldsEnumeration.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScIndexEnumeration_SubTotalFieldsEnumeration.java
@@ -90,8 +90,8 @@ public class ScIndexEnumeration_SubTotalFieldsEnumeration extends TestCase {
XIndexAccess oIndexAccess =
UnoRuntime.queryInterface(XIndexAccess.class, xSpreadsheets);
try {
- oSheet = (XSpreadsheet) AnyConverter.toObject(
- new Type(XSpreadsheet.class),oIndexAccess.getByIndex(0));
+ oSheet = AnyConverter.toObject(
+ XSpreadsheet.class,oIndexAccess.getByIndex(0));
} catch (com.sun.star.lang.WrappedTargetException e) {
e.printStackTrace(log);
throw new StatusException( "Couldn't get a spreadsheet", e);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScIndexEnumeration_TableChartsEnumeration.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScIndexEnumeration_TableChartsEnumeration.java
index 7fce10946f..6ce234cf19 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScIndexEnumeration_TableChartsEnumeration.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScIndexEnumeration_TableChartsEnumeration.java
@@ -89,8 +89,8 @@ public class ScIndexEnumeration_TableChartsEnumeration extends TestCase {
XSpreadsheets oSheets = xSheetDoc.getSheets() ;
XIndexAccess oIndexSheets =
UnoRuntime.queryInterface(XIndexAccess.class, oSheets);
- oSheet = (XSpreadsheet) AnyConverter.toObject(
- new Type(XSpreadsheet.class),oIndexSheets.getByIndex(0));
+ oSheet = AnyConverter.toObject(
+ XSpreadsheet.class,oIndexSheets.getByIndex(0));
} catch (com.sun.star.lang.WrappedTargetException e) {
log.println("Couldn't get Sheet ");
e.printStackTrace(log);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScIndexEnumeration_TableColumnsEnumeration.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScIndexEnumeration_TableColumnsEnumeration.java
index c368c76ef3..be9fb384cf 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScIndexEnumeration_TableColumnsEnumeration.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScIndexEnumeration_TableColumnsEnumeration.java
@@ -89,8 +89,8 @@ public class ScIndexEnumeration_TableColumnsEnumeration extends TestCase {
UnoRuntime.queryInterface( XNameAccess.class, xSpreadsheets );
XSpreadsheet xSpreadsheet = null;
try {
- xSpreadsheet = (XSpreadsheet) AnyConverter.toObject(
- new Type(XSpreadsheet.class),
+ xSpreadsheet = AnyConverter.toObject(
+ XSpreadsheet.class,
oNames.getByName(oNames.getElementNames()[0]));
} catch (com.sun.star.lang.WrappedTargetException e) {
e.printStackTrace(log);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScIndexEnumeration_TableConditionalEntryEnumeration.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScIndexEnumeration_TableConditionalEntryEnumeration.java
index 24152bdc70..b88264388f 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScIndexEnumeration_TableConditionalEntryEnumeration.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScIndexEnumeration_TableConditionalEntryEnumeration.java
@@ -91,8 +91,8 @@ public class ScIndexEnumeration_TableConditionalEntryEnumeration extends TestCas
UnoRuntime.queryInterface(XIndexAccess.class, xSpreadsheets);
try {
- oSheet = (XSpreadsheet) AnyConverter.toObject(
- new Type(XSpreadsheet.class),oIndexAccess.getByIndex(0));
+ oSheet = AnyConverter.toObject(
+ XSpreadsheet.class,oIndexAccess.getByIndex(0));
} catch (com.sun.star.lang.WrappedTargetException e) {
e.printStackTrace(log);
throw new StatusException( "Couldn't get a spreadsheet", e);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScIndexEnumeration_TableRowsEnumeration.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScIndexEnumeration_TableRowsEnumeration.java
index c1bf4535a9..98b4528aae 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScIndexEnumeration_TableRowsEnumeration.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScIndexEnumeration_TableRowsEnumeration.java
@@ -85,8 +85,8 @@ public class ScIndexEnumeration_TableRowsEnumeration extends TestCase {
XNameAccess oNames =
UnoRuntime.queryInterface( XNameAccess.class, xSpreadsheets );
try {
- xSpreadsheet = (XSpreadsheet) AnyConverter.toObject(
- new Type(XSpreadsheet.class),
+ xSpreadsheet = AnyConverter.toObject(
+ XSpreadsheet.class,
oNames.getByName(oNames.getElementNames()[0]));
} catch(com.sun.star.lang.WrappedTargetException e) {
e.printStackTrace(log);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScIndexEnumeration_TextFieldEnumeration.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScIndexEnumeration_TextFieldEnumeration.java
index 9c8a213b29..63de237db7 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScIndexEnumeration_TextFieldEnumeration.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScIndexEnumeration_TextFieldEnumeration.java
@@ -120,8 +120,8 @@ public class ScIndexEnumeration_TextFieldEnumeration extends TestCase {
XSpreadsheets oSheets = xSheetDoc.getSheets() ;
XIndexAccess oIndexSheets =
UnoRuntime.queryInterface(XIndexAccess.class, oSheets);
- XSpreadsheet oSheet = (XSpreadsheet) AnyConverter.toObject(
- new Type(XSpreadsheet.class),oIndexSheets.getByIndex(0));
+ XSpreadsheet oSheet = AnyConverter.toObject(
+ XSpreadsheet.class,oIndexSheets.getByIndex(0));
XCell oCell = oSheet.getCellByPosition(2,3);
oText = UnoRuntime.queryInterface(XText.class, oCell);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScLabelRangeObj.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScLabelRangeObj.java
index fe590bae62..1c5095f8a3 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScLabelRangeObj.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScLabelRangeObj.java
@@ -117,8 +117,8 @@ public class ScLabelRangeObj extends TestCase {
CellRangeAddress aRange1 = new CellRangeAddress((short)0, 0, 0, 0, 1);
lRanges.addNew(aRange1, aRange2);
- oObj = (XLabelRange) AnyConverter.toObject(
- new Type(XLabelRange.class),lRanges.getByIndex(0));
+ oObj = AnyConverter.toObject(
+ XLabelRange.class,lRanges.getByIndex(0));
} catch (com.sun.star.lang.WrappedTargetException e) {
e.printStackTrace(log) ;
throw new StatusException(
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScModelObj.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScModelObj.java
index 5275e747ff..cadda5330c 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScModelObj.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScModelObj.java
@@ -174,8 +174,8 @@ public class ScModelObj extends TestCase {
XSpreadsheets oSheets = xSpreadsheetDoc.getSheets();
XIndexAccess oIndexSheets = UnoRuntime.queryInterface(
XIndexAccess.class, oSheets);
- XSpreadsheet oSheet = (XSpreadsheet) AnyConverter.toObject(
- new Type(XSpreadsheet.class),
+ XSpreadsheet oSheet = AnyConverter.toObject(
+ XSpreadsheet.class,
oIndexSheets.getByIndex(0));
log.println("Getting a cell from sheet");
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScNamedRangeObj.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScNamedRangeObj.java
index 0e36d13b48..715e6ed2ab 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScNamedRangeObj.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScNamedRangeObj.java
@@ -147,8 +147,8 @@ public class ScNamedRangeObj extends TestCase {
xNamedRanges.outputList(listOutputPosition);
try {
- oObj = (XInterface) AnyConverter.toObject(
- new Type(XInterface.class),xNamedRanges.getByName("ANamedRange"));
+ oObj = AnyConverter.toObject(
+ XInterface.class,xNamedRanges.getByName("ANamedRange"));
} catch(com.sun.star.lang.WrappedTargetException e){
e.printStackTrace(log);
throw new StatusException("Couldn't get by name", e);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScNamedRangesObj.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScNamedRangesObj.java
index aa911cb3f8..c2b029515c 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScNamedRangesObj.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScNamedRangesObj.java
@@ -121,8 +121,8 @@ public class ScNamedRangesObj extends TestCase {
XIndexAccess oIndexSheets =
UnoRuntime.queryInterface(XIndexAccess.class, oSheets);
try {
- oSheet = (XSpreadsheet) AnyConverter.toObject(
- new Type(XSpreadsheet.class),oIndexSheets.getByIndex(0));
+ oSheet = AnyConverter.toObject(
+ XSpreadsheet.class,oIndexSheets.getByIndex(0));
} catch (com.sun.star.lang.WrappedTargetException e) {
e.printStackTrace(log);
throw new StatusException( "Couldn't get a spreadsheet", e);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScScenariosObj.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScScenariosObj.java
index 02d91f39b3..5db7ea21d3 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScScenariosObj.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScScenariosObj.java
@@ -118,8 +118,8 @@ public class ScScenariosObj extends TestCase {
XIndexAccess oIndexAccess =
UnoRuntime.queryInterface(XIndexAccess.class, xSpreadsheets);
try {
- oSheet = (XSpreadsheet)AnyConverter.toObject(
- new Type(XSpreadsheet.class),oIndexAccess.getByIndex(0));
+ oSheet = AnyConverter.toObject(
+ XSpreadsheet.class,oIndexAccess.getByIndex(0));
} catch (com.sun.star.lang.WrappedTargetException e) {
e.printStackTrace(log);
throw new StatusException( "Couldn't get a spreadsheet", e);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScSheetLinkObj.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScSheetLinkObj.java
index 7d85994dc9..ed2ee3846d 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScSheetLinkObj.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScSheetLinkObj.java
@@ -124,8 +124,8 @@ public class ScSheetLinkObj extends TestCase {
XIndexAccess oIndexSheets =
UnoRuntime.queryInterface(XIndexAccess.class, oSheets);
try {
- oSheet = (XSpreadsheet) AnyConverter.toObject(
- new Type(XSpreadsheet.class),oIndexSheets.getByIndex(0));
+ oSheet = AnyConverter.toObject(
+ XSpreadsheet.class,oIndexSheets.getByIndex(0));
} catch (com.sun.star.lang.WrappedTargetException e) {
e.printStackTrace(log);
throw new StatusException("Couldn't get a spreadsheet", e);
@@ -165,8 +165,8 @@ public class ScSheetLinkObj extends TestCase {
String[] names = links.getElementNames();
try {
- oObj = (XInterface)AnyConverter.toObject(
- new Type(XInterface.class),links.getByName(names[0]));
+ oObj = AnyConverter.toObject(
+ XInterface.class,links.getByName(names[0]));
} catch(com.sun.star.lang.WrappedTargetException e){
e.printStackTrace(log);
throw new StatusException("Couldn't get by name", e);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScSheetLinksObj.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScSheetLinksObj.java
index 1ff6162a00..a373847db4 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScSheetLinksObj.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScSheetLinksObj.java
@@ -112,8 +112,8 @@ public class ScSheetLinksObj extends TestCase {
XIndexAccess oIndexSheets =
UnoRuntime.queryInterface(XIndexAccess.class, oSheets);
try {
- oSheet = (XSpreadsheet) AnyConverter.toObject(
- new Type(XSpreadsheet.class),oIndexSheets.getByIndex(0));
+ oSheet = AnyConverter.toObject(
+ XSpreadsheet.class,oIndexSheets.getByIndex(0));
} catch (com.sun.star.lang.WrappedTargetException e) {
e.printStackTrace(log);
throw new StatusException("Couldn't get a spreadsheet", e);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScStyleFamilyObj.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScStyleFamilyObj.java
index 514a49586c..7ca32cd76a 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScStyleFamilyObj.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScStyleFamilyObj.java
@@ -135,8 +135,8 @@ public class ScStyleFamilyObj extends TestCase {
XIndexAccess oStyleFamiliesIndexAccess =
UnoRuntime.queryInterface(XIndexAccess.class, oStyleFamilies);
try {
- oStyleFamilyNameAccess = (XNameAccess) AnyConverter.toObject(
- new Type(XNameAccess.class),
+ oStyleFamilyNameAccess = AnyConverter.toObject(
+ XNameAccess.class,
oStyleFamiliesIndexAccess.getByIndex(0));
} catch (com.sun.star.lang.WrappedTargetException e) {
e.printStackTrace(log);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScStyleObj.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScStyleObj.java
index c95fabb6c2..1a62d2ae2c 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScStyleObj.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScStyleObj.java
@@ -137,15 +137,15 @@ public class ScStyleObj extends TestCase {
XNameAccess oStyleFamilyNameAccess = null;
XStyle oStyle = null;
try {
- oStyleFamilyNameAccess = (XNameAccess) AnyConverter.toObject(
- new Type(XNameAccess.class),
+ oStyleFamilyNameAccess = AnyConverter.toObject(
+ XNameAccess.class,
oStyleFamiliesIndexAccess.getByIndex(0));
XIndexAccess oStyleFamilyIndexAccess =
UnoRuntime.queryInterface(XIndexAccess.class,
oStyleFamilyNameAccess);
- oStyle = (XStyle) AnyConverter.toObject(
- new Type(XStyle.class),oStyleFamilyIndexAccess.getByIndex(0));
+ oStyle = AnyConverter.toObject(
+ XStyle.class,oStyleFamilyIndexAccess.getByIndex(0));
} catch(com.sun.star.lang.WrappedTargetException e) {
e.printStackTrace(log);
throw new StatusException("Couldn't get by index", e);
@@ -204,8 +204,8 @@ public class ScStyleObj extends TestCase {
XCell aCell = null;
try {
- XSpreadsheet oSheet = (XSpreadsheet) AnyConverter.toObject(
- new Type(XSpreadsheet.class),oIndexSheets.getByIndex(0));
+ XSpreadsheet oSheet = AnyConverter.toObject(
+ XSpreadsheet.class,oIndexSheets.getByIndex(0));
log.println("Getting a cell from sheet") ;
aCell = oSheet.getCellByPosition(2,3) ;
} catch(com.sun.star.lang.WrappedTargetException e) {
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScSubTotalDescriptorBase.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScSubTotalDescriptorBase.java
index 92351d2bca..1eae6a0321 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScSubTotalDescriptorBase.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScSubTotalDescriptorBase.java
@@ -115,8 +115,8 @@ public class ScSubTotalDescriptorBase extends TestCase {
XIndexAccess oIndexAccess =
UnoRuntime.queryInterface(XIndexAccess.class, xSpreadsheets);
try {
- oSheet = (XSpreadsheet) AnyConverter.toObject(
- new Type(XSpreadsheet.class),oIndexAccess.getByIndex(0));
+ oSheet = AnyConverter.toObject(
+ XSpreadsheet.class,oIndexAccess.getByIndex(0));
} catch (com.sun.star.lang.WrappedTargetException e) {
e.printStackTrace(log);
throw new StatusException( "Couldn't get a spreadsheet", e);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScSubTotalFieldObj.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScSubTotalFieldObj.java
index 11fd4addc0..340847606b 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScSubTotalFieldObj.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScSubTotalFieldObj.java
@@ -112,8 +112,8 @@ public class ScSubTotalFieldObj extends TestCase {
XIndexAccess oIndexAccess =
UnoRuntime.queryInterface(XIndexAccess.class, xSpreadsheets);
try {
- oSheet = (XSpreadsheet) AnyConverter.toObject(
- new Type (XSpreadsheet.class),oIndexAccess.getByIndex(0));
+ oSheet = AnyConverter.toObject(
+ XSpreadsheet.class,oIndexAccess.getByIndex(0));
} catch (com.sun.star.lang.WrappedTargetException e) {
e.printStackTrace(log);
throw new StatusException( "Couldn't get a spreadsheet", e);
@@ -143,8 +143,8 @@ public class ScSubTotalFieldObj extends TestCase {
XInterface oObj = null;
try {
- oObj = ( XSubTotalField ) AnyConverter.toObject(
- new Type(XSubTotalField.class),oDescIndex.getByIndex(0));
+ oObj = AnyConverter.toObject(
+ XSubTotalField.class,oDescIndex.getByIndex(0));
} catch (com.sun.star.lang.WrappedTargetException e) {
e.printStackTrace(log);
throw new StatusException("Couldn't get XSubTotalField", e);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScTabViewObj.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScTabViewObj.java
index c0df0da0dd..eaf499fa92 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScTabViewObj.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScTabViewObj.java
@@ -160,8 +160,8 @@ public class ScTabViewObj extends TestCase {
XIndexAccess oIndexAccess =
UnoRuntime.queryInterface(XIndexAccess.class, xSpreadsheets);
try {
- oSheet = (XSpreadsheet) AnyConverter.toObject(
- new Type(XSpreadsheet.class), oIndexAccess.getByIndex(1));
+ oSheet = AnyConverter.toObject(
+ XSpreadsheet.class, oIndexAccess.getByIndex(1));
} catch (com.sun.star.lang.WrappedTargetException e) {
e.printStackTrace(log);
throw new StatusException( "Couldn't get a spreadsheet", e);
@@ -246,8 +246,8 @@ public class ScTabViewObj extends TestCase {
XDrawPages oDP = (XDrawPages) oDPS.getDrawPages();
oDP.insertNewByIndex(1);
oDP.insertNewByIndex(2);
- oDrawPage = (XDrawPage) AnyConverter.toObject(
- new Type(XDrawPage.class),oDP.getByIndex(0));
+ oDrawPage = AnyConverter.toObject(
+ XDrawPage.class,oDP.getByIndex(0));
if (oDrawPage == null)
log.println("ERROR: could not get DrawPage: null");
@@ -255,7 +255,7 @@ public class ScTabViewObj extends TestCase {
log.println("getting XForm");
XNameContainer xForm = FormTools.getForms(oDrawPage);
try {
- myForm = (XForm) AnyConverter.toObject(new Type(XForm.class),xForm.getByName("Standard"));
+ myForm = AnyConverter.toObject(XForm.class,xForm.getByName("Standard"));
} catch (WrappedTargetException ex) {
log.println("ERROR: could not XFormm 'Standard': " + ex.toString());
} catch (com.sun.star.lang.IllegalArgumentException ex) {
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScTableColumnObj.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScTableColumnObj.java
index a21fef040c..0e727536e1 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScTableColumnObj.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScTableColumnObj.java
@@ -124,8 +124,8 @@ public class ScTableColumnObj extends TestCase {
XNameAccess oNames =
UnoRuntime.queryInterface( XNameAccess.class, xSpreadsheets );
try {
- xSpreadsheet = (XSpreadsheet) AnyConverter.toObject(
- new Type(XSpreadsheet.class),
+ xSpreadsheet = AnyConverter.toObject(
+ XSpreadsheet.class,
oNames.getByName(oNames.getElementNames()[0]));
} catch (com.sun.star.lang.WrappedTargetException e) {
e.printStackTrace(log);
@@ -144,8 +144,8 @@ public class ScTableColumnObj extends TestCase {
XIndexAccess oIndexAccess =
UnoRuntime.queryInterface(XIndexAccess.class, oColumns);
try {
- oObj = (XInterface) AnyConverter.toObject(
- new Type(XInterface.class),oIndexAccess.getByIndex(10));
+ oObj = AnyConverter.toObject(
+ XInterface.class,oIndexAccess.getByIndex(10));
} catch (com.sun.star.lang.WrappedTargetException e) {
e.printStackTrace(log);
throw new StatusException("Couldn't get by index", e);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScTableColumnsObj.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScTableColumnsObj.java
index cb6223c68a..316bc6ed94 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScTableColumnsObj.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScTableColumnsObj.java
@@ -118,8 +118,8 @@ public class ScTableColumnsObj extends TestCase {
UnoRuntime.queryInterface( XNameAccess.class, xSpreadsheets );
XSpreadsheet xSpreadsheet = null;
try {
- xSpreadsheet = (XSpreadsheet) AnyConverter.toObject(
- new Type(XSpreadsheet.class),
+ xSpreadsheet = AnyConverter.toObject(
+ XSpreadsheet.class,
oNames.getByName(oNames.getElementNames()[0]));
} catch (com.sun.star.lang.WrappedTargetException e) {
e.printStackTrace(log);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScTableConditionalEntry.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScTableConditionalEntry.java
index 1252efa61f..b2fca72bba 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScTableConditionalEntry.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScTableConditionalEntry.java
@@ -118,8 +118,8 @@ public class ScTableConditionalEntry extends TestCase {
UnoRuntime.queryInterface(XIndexAccess.class, xSpreadsheets);
try {
- oSheet = (XSpreadsheet) AnyConverter.toObject(
- new Type(XSpreadsheet.class),oIndexAccess.getByIndex(0));
+ oSheet = AnyConverter.toObject(
+ XSpreadsheet.class,oIndexAccess.getByIndex(0));
} catch (com.sun.star.lang.WrappedTargetException e) {
e.printStackTrace(log);
throw new StatusException( "Couldn't get a spreadsheet", e);
@@ -164,8 +164,8 @@ public class ScTableConditionalEntry extends TestCase {
UnoRuntime.queryInterface(XSheetConditionalEntries.class, CFormat);
xSCE.addNew(Conditions());
Props.setPropertyValue("ConditionalFormat", xSCE);
- oObj = (XSheetConditionalEntry) AnyConverter.toObject(
- new Type(XSheetConditionalEntry.class),xSCE.getByIndex(0));
+ oObj = AnyConverter.toObject(
+ XSheetConditionalEntry.class,xSCE.getByIndex(0));
} catch (com.sun.star.lang.WrappedTargetException e) {
e.printStackTrace(log);
throw new StatusException(
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScTableConditionalFormat.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScTableConditionalFormat.java
index 7cb5a3996d..7c25414116 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScTableConditionalFormat.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScTableConditionalFormat.java
@@ -121,8 +121,8 @@ public class ScTableConditionalFormat extends TestCase {
XIndexAccess oIndexAccess =
UnoRuntime.queryInterface(XIndexAccess.class, xSpreadsheets);
try {
- oSheet = (XSpreadsheet) AnyConverter.toObject(
- new Type(XSpreadsheet.class),oIndexAccess.getByIndex(0));
+ oSheet = AnyConverter.toObject(
+ XSpreadsheet.class,oIndexAccess.getByIndex(0));
} catch (com.sun.star.lang.WrappedTargetException e) {
e.printStackTrace(log);
throw new StatusException( "Couldn't get a spreadsheet", e);
@@ -147,8 +147,8 @@ public class ScTableConditionalFormat extends TestCase {
XPropertySet Props =
UnoRuntime.queryInterface(XPropertySet.class, oSheet);
try {
- oObj = (XInterface) AnyConverter.toObject(
- new Type(XInterface.class),
+ oObj = AnyConverter.toObject(
+ XInterface.class,
Props.getPropertyValue("ConditionalFormat"));
} catch(com.sun.star.lang.WrappedTargetException e) {
e.printStackTrace(log);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScTableRowObj.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScTableRowObj.java
index 22a56003c0..0e742a9484 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScTableRowObj.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScTableRowObj.java
@@ -119,8 +119,8 @@ public class ScTableRowObj extends TestCase {
XNameAccess oNames =
UnoRuntime.queryInterface( XNameAccess.class, xSpreadsheets );
try {
- xSpreadsheet = (XSpreadsheet) AnyConverter.toObject(
- new Type(XSpreadsheet.class),
+ xSpreadsheet = AnyConverter.toObject(
+ XSpreadsheet.class,
oNames.getByName(oNames.getElementNames()[0]));
XColumnRowRange oColumnRowRange =
@@ -128,8 +128,8 @@ public class ScTableRowObj extends TestCase {
XTableRows oRows = (XTableRows) oColumnRowRange.getRows();
XIndexAccess oIndexAccess =
UnoRuntime.queryInterface(XIndexAccess.class, oRows);
- oObj = (XInterface) AnyConverter.toObject(
- new Type(XInterface.class),oIndexAccess.getByIndex(6));
+ oObj = AnyConverter.toObject(
+ XInterface.class,oIndexAccess.getByIndex(6));
} catch(com.sun.star.lang.WrappedTargetException e) {
e.printStackTrace(log);
throw new StatusException(
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScTableRowsObj.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScTableRowsObj.java
index 31d6b6324c..aa84e2b61f 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScTableRowsObj.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScTableRowsObj.java
@@ -111,8 +111,8 @@ public class ScTableRowsObj extends TestCase {
XNameAccess oNames =
UnoRuntime.queryInterface( XNameAccess.class, xSpreadsheets );
try {
- xSpreadsheet = (XSpreadsheet) AnyConverter.toObject(
- new Type(XSpreadsheet.class),
+ xSpreadsheet = AnyConverter.toObject(
+ XSpreadsheet.class,
oNames.getByName(oNames.getElementNames()[0]));
} catch(com.sun.star.lang.WrappedTargetException e) {
e.printStackTrace(log);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScTableSheetObj.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScTableSheetObj.java
index c4117acb83..b5a0dd3bce 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScTableSheetObj.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScTableSheetObj.java
@@ -201,8 +201,8 @@ public class ScTableSheetObj extends TestCase {
XIndexAccess.class, xSpreadsheets);
try {
- oSheet = (XSpreadsheet) AnyConverter.toObject(
- new Type(XSpreadsheet.class),
+ oSheet = AnyConverter.toObject(
+ XSpreadsheet.class,
oIndexAccess.getByIndex(0));
} catch (com.sun.star.lang.WrappedTargetException e) {
e.printStackTrace(log);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScTableValidationObj.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScTableValidationObj.java
index 0c4c24f156..fbff3920c0 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScTableValidationObj.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScTableValidationObj.java
@@ -109,8 +109,8 @@ public class ScTableValidationObj extends TestCase {
XIndexAccess oIndexAccess =
UnoRuntime.queryInterface(XIndexAccess.class, xSpreadsheets);
try {
- oSheet = (XSpreadsheet) AnyConverter.toObject(
- new Type(XSpreadsheet.class),oIndexAccess.getByIndex(0));
+ oSheet = AnyConverter.toObject(
+ XSpreadsheet.class,oIndexAccess.getByIndex(0));
} catch (com.sun.star.lang.WrappedTargetException e) {
e.printStackTrace(log);
throw new StatusException( "Couldn't get a spreadsheet", e);
@@ -138,8 +138,8 @@ public class ScTableValidationObj extends TestCase {
try {
Props =
UnoRuntime.queryInterface(XPropertySet.class, oSheet);
- oObj = (XInterface) AnyConverter.toObject(
- new Type(XInterface.class),Props.getPropertyValue("Validation"));
+ oObj = AnyConverter.toObject(
+ XInterface.class,Props.getPropertyValue("Validation"));
} catch (com.sun.star.lang.WrappedTargetException e){
e.printStackTrace(log);
throw new StatusException("Couldn't get property 'Validation'", e);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScViewPaneObj.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScViewPaneObj.java
index da6ec8cec8..6264edbaaf 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScViewPaneObj.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScViewPaneObj.java
@@ -122,8 +122,8 @@ public class ScViewPaneObj extends TestCase {
XIndexAccess xIA =
UnoRuntime.queryInterface(XIndexAccess.class, xc);
try {
- oObj = (XInterface) AnyConverter.toObject(
- new Type(XInterface.class),xIA.getByIndex(0));
+ oObj = AnyConverter.toObject(
+ XInterface.class,xIA.getByIndex(0));
} catch (com.sun.star.lang.WrappedTargetException e) {
e.printStackTrace(log);
throw new StatusException("Couldn't get by index", e);
@@ -171,8 +171,8 @@ public class ScViewPaneObj extends TestCase {
XDrawPages oDP = (XDrawPages) oDPS.getDrawPages();
oDP.insertNewByIndex(1);
oDP.insertNewByIndex(2);
- oDrawPage = (XDrawPage) AnyConverter.toObject(
- new Type(XDrawPage.class),oDP.getByIndex(0));
+ oDrawPage = AnyConverter.toObject(
+ XDrawPage.class,oDP.getByIndex(0));
if (oDrawPage == null)
log.println("ERROR: could not get DrawPage: null");
@@ -180,7 +180,7 @@ public class ScViewPaneObj extends TestCase {
log.println("getting XForm");
XNameContainer xForm = FormTools.getForms(oDrawPage);
try {
- myForm = (XForm) AnyConverter.toObject(new Type(XForm.class),xForm.getByName("Standard"));
+ myForm = AnyConverter.toObject(XForm.class,xForm.getByName("Standard"));
} catch (WrappedTargetException ex) {
log.println("ERROR: could not XFormm 'Standard': " + ex.toString());
} catch (com.sun.star.lang.IllegalArgumentException ex) {
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/XMLContentExporter.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/XMLContentExporter.java
index 47523f3302..389539803a 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/XMLContentExporter.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/XMLContentExporter.java
@@ -139,8 +139,8 @@ public class XMLContentExporter extends TestCase {
XSpreadsheets xSpreadsheets = xSpreadsheetDoc.getSheets();
XIndexAccess xSheetsIndexArray =
UnoRuntime.queryInterface(XIndexAccess.class, xSpreadsheets);
- XSpreadsheet xSheet = (XSpreadsheet) AnyConverter.toObject(
- new Type(XSpreadsheet.class),xSheetsIndexArray.getByIndex(0));
+ XSpreadsheet xSheet = AnyConverter.toObject(
+ XSpreadsheet.class,xSheetsIndexArray.getByIndex(0));
XCell xCell = xSheet.getCellByPosition(0, 0);
xCell.setFormula(CELL_TEXT);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/XMLExporter.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/XMLExporter.java
index 2990c00670..4dbe858c4a 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/XMLExporter.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/XMLExporter.java
@@ -136,8 +136,8 @@ public class XMLExporter extends TestCase {
XSpreadsheets xSpreadsheets = xSpreadsheetDoc.getSheets();
XIndexAccess xSheetsIndexArray =
UnoRuntime.queryInterface(XIndexAccess.class, xSpreadsheets);
- XSpreadsheet xSheet = (XSpreadsheet) AnyConverter.toObject(
- new Type(XSpreadsheet.class),xSheetsIndexArray.getByIndex(0));
+ XSpreadsheet xSheet = AnyConverter.toObject(
+ XSpreadsheet.class,xSheetsIndexArray.getByIndex(0));
XNamed xSheetNamed =
UnoRuntime.queryInterface(XNamed.class, xSheet);
xSheetNamed.setName(SHEET_NAME);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/XMLStylesExporter.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/XMLStylesExporter.java
index 70d28d57d2..184d0487e3 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/XMLStylesExporter.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/XMLStylesExporter.java
@@ -143,8 +143,8 @@ public class XMLStylesExporter extends TestCase {
XStyleFamiliesSupplier.class, xSheetDoc);
XNameAccess StyleFamilies = styleSup.getStyleFamilies();
String[] styleFamiliesNames = StyleFamilies.getElementNames();
- XNameContainer StyleFamilyName = (XNameContainer)
- AnyConverter.toObject(new Type(XNameContainer.class),
+ XNameContainer StyleFamilyName =
+ AnyConverter.toObject(XNameContainer.class,
StyleFamilies.getByName(styleFamiliesNames[0]));
Object SC = SOF.createInstance(
xSheetDoc, "com.sun.star.style.CellStyle");
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sch/ChXDiagram.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sch/ChXDiagram.java
index 6345eab32c..36ae96976a 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sch/ChXDiagram.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sch/ChXDiagram.java
@@ -225,8 +225,8 @@ public class ChXDiagram extends TestCase {
XIndexAccess oIndexSheets =
UnoRuntime.queryInterface(XIndexAccess.class, oSheets);
try {
- oSheet = (XSpreadsheet) AnyConverter.toObject(
- new Type(XSpreadsheet.class),oIndexSheets.getByIndex(0));
+ oSheet = AnyConverter.toObject(
+ XSpreadsheet.class,oIndexSheets.getByIndex(0));
} catch(com.sun.star.lang.WrappedTargetException e) {
e.printStackTrace(log);
throw new StatusException("Couldn't get sheet", e);
@@ -327,10 +327,10 @@ public class ChXDiagram extends TestCase {
// get the TableChart
XTableChart oChart = null;
try {
- oChart = (XTableChart) AnyConverter.toObject(
- new Type(XTableChart.class),(
+ oChart = AnyConverter.toObject(
+ XTableChart.class,
UnoRuntime.queryInterface(
- XNameAccess.class, oCharts)).getByName("ChXDiagram"));
+ XNameAccess.class, oCharts).getByName("ChXDiagram"));
} catch (com.sun.star.lang.WrappedTargetException e) {
e.printStackTrace(log);
throw new StatusException("Couldn't get TableChart", e);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sch/ChartLine.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sch/ChartLine.java
index 215290f1ca..206fa2b7e8 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sch/ChartLine.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sch/ChartLine.java
@@ -108,8 +108,8 @@ public class ChartLine extends TestCase {
log.println( "getting Line" );
XPropertySet RowProps = oDiagram.getDataRowProperties(1);
RowProps.setPropertyValue("MeanValue", new Boolean( true ));
- oObj = (XPropertySet) AnyConverter.toObject(
- new Type(XPropertySet.class),
+ oObj = AnyConverter.toObject(
+ XPropertySet.class,
RowProps.getPropertyValue("DataMeanValueProperties"));
} catch (com.sun.star.lang.IndexOutOfBoundsException e) {
// Some exception occurred. FAILED
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sd/AccessibleDrawDocumentView.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sd/AccessibleDrawDocumentView.java
index a470a903ce..333c1c3474 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sd/AccessibleDrawDocumentView.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sd/AccessibleDrawDocumentView.java
@@ -85,8 +85,8 @@ public class AccessibleDrawDocumentView extends TestCase {
UnoRuntime.queryInterface(XIndexAccess.class, oDPn);
XDrawPage oDP = null;
try {
- oDP = (XDrawPage) AnyConverter.toObject(
- new Type(XDrawPage.class),oDPi.getByIndex(0));
+ oDP = AnyConverter.toObject(
+ XDrawPage.class,oDPi.getByIndex(0));
} catch (com.sun.star.lang.WrappedTargetException e) {
e.printStackTrace( log );
throw new StatusException("Couldn't get by index", e);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sd/DrawController_DrawView.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sd/DrawController_DrawView.java
index 2db406863e..9493bba5b5 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sd/DrawController_DrawView.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sd/DrawController_DrawView.java
@@ -162,8 +162,8 @@ public class DrawController_DrawView extends TestCase {
XDrawPage oDrawPage = null;
try {
- oDrawPage = (XDrawPage) AnyConverter.toObject(
- new Type(XDrawPage.class),oDPi.getByIndex(0));
+ oDrawPage = AnyConverter.toObject(
+ XDrawPage.class,oDPi.getByIndex(0));
} catch (com.sun.star.lang.WrappedTargetException e) {
e.printStackTrace( log );
throw new StatusException("Couldn't get DrawPage", e);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sd/DrawController_HandoutView.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sd/DrawController_HandoutView.java
index 7ab7e90777..da6dec19d8 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sd/DrawController_HandoutView.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sd/DrawController_HandoutView.java
@@ -181,8 +181,8 @@ public class DrawController_HandoutView extends TestCase {
XDrawPage oDrawPage = null;
try {
- oDrawPage = (XDrawPage) AnyConverter.toObject(
- new Type(XDrawPage.class),oDPi.getByIndex(0));
+ oDrawPage = AnyConverter.toObject(
+ XDrawPage.class,oDPi.getByIndex(0));
} catch (com.sun.star.lang.WrappedTargetException e) {
e.printStackTrace( log );
throw new StatusException("Couldn't get DrawPage", e);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sd/DrawController_NotesView.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sd/DrawController_NotesView.java
index ca10aaa8b8..196f5cbe00 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sd/DrawController_NotesView.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sd/DrawController_NotesView.java
@@ -178,8 +178,8 @@ public class DrawController_NotesView extends TestCase {
XDrawPage oDrawPage = null;
try {
- oDrawPage = (XDrawPage) AnyConverter.toObject(
- new Type(XDrawPage.class),oDPi.getByIndex(0));
+ oDrawPage = AnyConverter.toObject(
+ XDrawPage.class,oDPi.getByIndex(0));
} catch (com.sun.star.lang.WrappedTargetException e) {
e.printStackTrace( log );
throw new StatusException("Couldn't get DrawPage", e);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sd/DrawController_OutlineView.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sd/DrawController_OutlineView.java
index 6b7a629f53..f4e19c185d 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sd/DrawController_OutlineView.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sd/DrawController_OutlineView.java
@@ -178,8 +178,8 @@ public class DrawController_OutlineView extends TestCase {
XDrawPage oDrawPage = null;
try {
- oDrawPage = (XDrawPage) AnyConverter.toObject(
- new Type(XDrawPage.class),oDPi.getByIndex(0));
+ oDrawPage = AnyConverter.toObject(
+ XDrawPage.class,oDPi.getByIndex(0));
} catch (com.sun.star.lang.WrappedTargetException e) {
e.printStackTrace( log );
throw new StatusException("Couldn't get DrawPage", e);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sd/DrawController_PresentationView.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sd/DrawController_PresentationView.java
index 4a28178732..9b987d4feb 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sd/DrawController_PresentationView.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sd/DrawController_PresentationView.java
@@ -178,8 +178,8 @@ public class DrawController_PresentationView extends TestCase {
XDrawPage oDrawPage = null;
try {
- oDrawPage = (XDrawPage) AnyConverter.toObject(
- new Type(XDrawPage.class),oDPi.getByIndex(0));
+ oDrawPage = AnyConverter.toObject(
+ XDrawPage.class,oDPi.getByIndex(0));
} catch (com.sun.star.lang.WrappedTargetException e) {
e.printStackTrace( log );
throw new StatusException("Couldn't get DrawPage", e);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sd/SdDrawPage.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sd/SdDrawPage.java
index 59c2466cb3..ddc944006b 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sd/SdDrawPage.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sd/SdDrawPage.java
@@ -161,8 +161,8 @@ public class SdDrawPage extends TestCase {
XIndexAccess oDPi =
UnoRuntime.queryInterface(XIndexAccess.class,oDPn);
try {
- oObj = (XDrawPage) AnyConverter.toObject(
- new Type(XDrawPage.class),oDPi.getByIndex(0));
+ oObj = AnyConverter.toObject(
+ XDrawPage.class,oDPi.getByIndex(0));
} catch (com.sun.star.lang.WrappedTargetException e) {
e.printStackTrace( log );
throw new StatusException( "Couldn't get DrawPage", e );
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sd/SdGenericDrawPage.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sd/SdGenericDrawPage.java
index 9fbc836d3c..b3970d8abb 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sd/SdGenericDrawPage.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sd/SdGenericDrawPage.java
@@ -150,8 +150,8 @@ public class SdGenericDrawPage extends TestCase {
XIndexAccess oDPi = UnoRuntime.queryInterface
(XIndexAccess.class,oDPn);
try {
- oObj = (XDrawPage) AnyConverter.toObject(
- new Type(XDrawPage.class),oDPi.getByIndex(0));
+ oObj = AnyConverter.toObject(
+ XDrawPage.class,oDPi.getByIndex(0));
} catch(com.sun.star.uno.Exception e) {
e.printStackTrace( log );
throw new StatusException("Couldn't get DrawPage", e);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sd/SdLayer.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sd/SdLayer.java
index 8dd1081cd1..bd308307a1 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sd/SdLayer.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sd/SdLayer.java
@@ -112,8 +112,8 @@ public class SdLayer extends TestCase {
UnoRuntime.queryInterface(XIndexAccess.class,oLM);
log.println( "getting LayerManager" );
try {
- oObj = (XLayer) AnyConverter.toObject(
- new Type(XLayer.class),oIA.getByIndex(0));
+ oObj = AnyConverter.toObject(
+ XLayer.class,oIA.getByIndex(0));
} catch (com.sun.star.lang.WrappedTargetException e) {
e.printStackTrace( log );
throw new StatusException("Couldn't get by index", e);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sd/SdLayerManager.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sd/SdLayerManager.java
index cd6d3aa167..c7e34dac07 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sd/SdLayerManager.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sd/SdLayerManager.java
@@ -141,8 +141,8 @@ public class SdLayerManager extends TestCase {
XDrawPage oDP = null;
try {
- oDP = (XDrawPage) AnyConverter.toObject(
- new Type(XDrawPage.class),oDPi.getByIndex(0));
+ oDP = AnyConverter.toObject(
+ XDrawPage.class,oDPi.getByIndex(0));
} catch (com.sun.star.lang.WrappedTargetException e) {
e.printStackTrace( log );
throw new StatusException("Couldn't get by index", e);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sd/SdMasterPage.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sd/SdMasterPage.java
index c56dc69069..e8a0a85c9e 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sd/SdMasterPage.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sd/SdMasterPage.java
@@ -146,8 +146,8 @@ public class SdMasterPage extends TestCase {
log.println( "getting MasterPage" );
XInterface oObj = null;
try {
- oObj = (XDrawPage) AnyConverter.toObject(
- new Type(XDrawPage.class),oMPi.getByIndex(0));
+ oObj = AnyConverter.toObject(
+ XDrawPage.class,oMPi.getByIndex(0));
} catch (com.sun.star.lang.WrappedTargetException e) {
e.printStackTrace( log );
throw new StatusException("Couldn't get MasterPage by index", e);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sd/SdUnoDrawView.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sd/SdUnoDrawView.java
index 98d7e2b6b3..2e1559ff64 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sd/SdUnoDrawView.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sd/SdUnoDrawView.java
@@ -176,8 +176,8 @@ public class SdUnoDrawView extends TestCase {
XDrawPage oDrawPage = null;
try {
- oDrawPage = (XDrawPage) AnyConverter.toObject(
- new Type(XDrawPage.class),oDPi.getByIndex(0));
+ oDrawPage = AnyConverter.toObject(
+ XDrawPage.class,oDPi.getByIndex(0));
} catch (com.sun.star.lang.WrappedTargetException e) {
e.printStackTrace( log );
throw new StatusException("Couldn't get DrawPage", e);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sd/SdUnoPresView.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sd/SdUnoPresView.java
index 2fcb4dad19..0645f45b99 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sd/SdUnoPresView.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sd/SdUnoPresView.java
@@ -173,14 +173,14 @@ public class SdUnoPresView extends TestCase {
XDrawPage oDrawPage = null;
XDrawPage secondDrawPage = null;
try {
- oDrawPage = (XDrawPage) AnyConverter.toObject(
- new Type(XDrawPage.class),oDPi.getByIndex(0));
+ oDrawPage = AnyConverter.toObject(
+ XDrawPage.class,oDPi.getByIndex(0));
the_pages.insertNewByIndex(0);
the_pages.insertNewByIndex(0);
the_pages.insertNewByIndex(0);
the_pages.insertNewByIndex(0);
- secondDrawPage = (XDrawPage) AnyConverter.toObject(
- new Type(XDrawPage.class),oDPi.getByIndex(3));
+ secondDrawPage = AnyConverter.toObject(
+ XDrawPage.class,oDPi.getByIndex(3));
} catch (com.sun.star.lang.WrappedTargetException e) {
e.printStackTrace( log );
throw new StatusException("Couldn't get DrawPage", e);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sd/SdXCustomPresentation.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sd/SdXCustomPresentation.java
index 7112f69a7c..c62555b0fa 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sd/SdXCustomPresentation.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sd/SdXCustomPresentation.java
@@ -169,8 +169,8 @@ public class SdXCustomPresentation extends TestCase {
XDrawPage oDrawPage = null;
try {
- oDrawPage = (XDrawPage) AnyConverter.toObject(
- new Type(XDrawPage.class),oDPi.getByIndex(0));
+ oDrawPage = AnyConverter.toObject(
+ XDrawPage.class,oDPi.getByIndex(0));
} catch (com.sun.star.lang.WrappedTargetException e) {
e.printStackTrace(log);
throw new StatusException("Couldn't get by index", e);
@@ -217,8 +217,8 @@ public class SdXCustomPresentation extends TestCase {
log.println( "adding INSTANCE" + n
+" as mod relation to environment" );
oDPn.insertNewByIndex(0);
- oDrawPage = (XDrawPage) AnyConverter.toObject(
- new Type(XDrawPage.class),oDPi.getByIndex(0));
+ oDrawPage = AnyConverter.toObject(
+ XDrawPage.class,oDPi.getByIndex(0));
tEnv.addObjRelation("INSTANCE" + n, oDrawPage);
}
} catch (com.sun.star.lang.WrappedTargetException e) {
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sd/SdXShape.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sd/SdXShape.java
index f98f04f139..aad8329d3c 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sd/SdXShape.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sd/SdXShape.java
@@ -136,8 +136,8 @@ public class SdXShape extends TestCase {
UnoRuntime.queryInterface(XIndexAccess.class, oDPn);
XDrawPage oDP = null;
try {
- oDP = (XDrawPage) AnyConverter.toObject(
- new Type(XDrawPage.class),oDPi.getByIndex(0));
+ oDP = AnyConverter.toObject(
+ XDrawPage.class,oDPi.getByIndex(0));
} catch (com.sun.star.lang.WrappedTargetException e) {
e.printStackTrace( log );
throw new StatusException("Couldn't get by index", e);
@@ -173,8 +173,8 @@ public class SdXShape extends TestCase {
UnoRuntime.queryInterface(XPropertySet.class, oObj);
XStyle aStyle = null;
try {
- aStyle = (XStyle) AnyConverter.toObject(
- new Type(XStyle.class),oShapeProps.getPropertyValue("Style"));
+ aStyle = AnyConverter.toObject(
+ XStyle.class,oShapeProps.getPropertyValue("Style"));
oShapeProps.setPropertyValue("ZOrder", new Integer(1));
} catch (com.sun.star.lang.WrappedTargetException e) {
e.printStackTrace(log);
@@ -194,8 +194,8 @@ public class SdXShape extends TestCase {
oShapeProps =
UnoRuntime.queryInterface(XPropertySet.class, oShape);
try {
- aStyle = (XStyle) AnyConverter.toObject(
- new Type(XStyle.class),oShapeProps.getPropertyValue("Style"));
+ aStyle = AnyConverter.toObject(
+ XStyle.class,oShapeProps.getPropertyValue("Style"));
} catch (com.sun.star.lang.WrappedTargetException e) {
e.printStackTrace(log);
throw new StatusException("Couldn't get property value", e);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_servicemgr.uno/OServiceManager.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_servicemgr.uno/OServiceManager.java
index a82394f739..07ea7eb417 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_servicemgr.uno/OServiceManager.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_servicemgr.uno/OServiceManager.java
@@ -134,8 +134,8 @@ public class OServiceManager extends TestCase {
XPropertySet xProp = UnoRuntime.queryInterface(
XPropertySet.class, oInterface);
if (xProp != null) {
- xContext = (XComponentContext) AnyConverter.toObject(
- new Type(XComponentContext.class),
+ xContext = AnyConverter.toObject(
+ XComponentContext.class,
xProp.getPropertyValue("DefaultContext"));
}
} catch (com.sun.star.uno.Exception e) {
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_smgr/OServiceManager.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_smgr/OServiceManager.java
index da889c40fb..51f6de2280 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_smgr/OServiceManager.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_smgr/OServiceManager.java
@@ -136,8 +136,8 @@ public class OServiceManager extends TestCase {
XPropertySet xProp = UnoRuntime.queryInterface(
XPropertySet.class, oInterface);
if (xProp != null) {
- xContext = (XComponentContext) AnyConverter.toObject(
- new Type(XComponentContext.class),
+ xContext = AnyConverter.toObject(
+ XComponentContext.class,
xProp.getPropertyValue("DefaultContext"));
}
} catch (com.sun.star.uno.Exception e) {
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_svx/SvxDrawPage.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_svx/SvxDrawPage.java
index af441b6421..9a321a60f8 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_svx/SvxDrawPage.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_svx/SvxDrawPage.java
@@ -162,7 +162,7 @@ public class SvxDrawPage extends TestCase {
oDP = (XDrawPages) oDPS.getDrawPages();
oDP.insertNewByIndex(1);
oDP.insertNewByIndex(2);
- oObj = (XDrawPage) AnyConverter.toObject(new Type(XDrawPage.class),
+ oObj = AnyConverter.toObject(XDrawPage.class,
oDP.getByIndex(0));
SOfficeFactory SOF = SOfficeFactory.getFactory(
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_svx/SvxGraphicObject.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_svx/SvxGraphicObject.java
index 31766ac181..1c13ef3923 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_svx/SvxGraphicObject.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_svx/SvxGraphicObject.java
@@ -177,8 +177,8 @@ public class SvxGraphicObject extends TestCase {
UnoRuntime.queryInterface(XPropertySet.class,oObj);
XStyle aStyle = null;
try {
- aStyle = (XStyle) AnyConverter.toObject(
- new Type(XStyle.class),oShapeProps.getPropertyValue("Style"));
+ aStyle = AnyConverter.toObject(
+ XStyle.class,oShapeProps.getPropertyValue("Style"));
} catch (com.sun.star.lang.WrappedTargetException e) {
} catch (com.sun.star.beans.UnknownPropertyException e) {
} catch (com.sun.star.lang.IllegalArgumentException e) {
@@ -188,8 +188,8 @@ public class SvxGraphicObject extends TestCase {
oShapeProps =
UnoRuntime.queryInterface(XPropertySet.class,oShape);
try {
- aStyle = (XStyle) AnyConverter.toObject(
- new Type(XStyle.class),oShapeProps.getPropertyValue("Style"));
+ aStyle = AnyConverter.toObject(
+ XStyle.class,oShapeProps.getPropertyValue("Style"));
} catch (com.sun.star.lang.WrappedTargetException e) {
} catch (com.sun.star.beans.UnknownPropertyException e) {
} catch (com.sun.star.lang.IllegalArgumentException e) {
@@ -204,8 +204,8 @@ public class SvxGraphicObject extends TestCase {
try {
oShapeProps.setPropertyValue(
"GraphicURL",util.utils.getFullTestURL("space-metal.jpg"));
- aBitmap = (XBitmap) AnyConverter.toObject(
- new Type(XBitmap.class),oShapeProps.getPropertyValue
+ aBitmap = AnyConverter.toObject(
+ XBitmap.class,oShapeProps.getPropertyValue
("GraphicObjectFillBitmap"));
} catch (com.sun.star.lang.WrappedTargetException e) {
} catch (com.sun.star.lang.IllegalArgumentException e) {
@@ -219,8 +219,8 @@ public class SvxGraphicObject extends TestCase {
try {
oShapeProps.setPropertyValue(
"GraphicURL",util.utils.getFullTestURL("crazy-blue.jpg"));
- aBitmap = (XBitmap) AnyConverter.toObject(
- new Type(XBitmap.class),oShapeProps.getPropertyValue
+ aBitmap = AnyConverter.toObject(
+ XBitmap.class,oShapeProps.getPropertyValue
("GraphicObjectFillBitmap"));
} catch (com.sun.star.lang.WrappedTargetException e) {
} catch (com.sun.star.lang.IllegalArgumentException e) {
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_svx/SvxShape.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_svx/SvxShape.java
index c9c5e3c2dc..fb69d8f117 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_svx/SvxShape.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_svx/SvxShape.java
@@ -192,8 +192,8 @@ public class SvxShape extends TestCase {
UnoRuntime.queryInterface(XPropertySet.class,oObj);
XStyle aStyle = null;
try {
- aStyle = (XStyle) AnyConverter.toObject(
- new Type(XStyle.class),oShapeProps.getPropertyValue("Style"));
+ aStyle = AnyConverter.toObject(
+ XStyle.class,oShapeProps.getPropertyValue("Style"));
} catch (com.sun.star.lang.WrappedTargetException e) {
} catch (com.sun.star.beans.UnknownPropertyException e) {
} catch (com.sun.star.lang.IllegalArgumentException e) {
@@ -203,8 +203,8 @@ public class SvxShape extends TestCase {
oShapeProps = UnoRuntime.queryInterface
(XPropertySet.class,oShape);
try {
- aStyle = (XStyle) AnyConverter.toObject(
- new Type(XStyle.class),oShapeProps.getPropertyValue("Style"));
+ aStyle = AnyConverter.toObject(
+ XStyle.class,oShapeProps.getPropertyValue("Style"));
} catch (com.sun.star.lang.WrappedTargetException e) {
} catch (com.sun.star.beans.UnknownPropertyException e) {
} catch (com.sun.star.lang.IllegalArgumentException e) {
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_svx/SvxShapeCircle.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_svx/SvxShapeCircle.java
index d1e9ac9269..c2ff9370ef 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_svx/SvxShapeCircle.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_svx/SvxShapeCircle.java
@@ -212,8 +212,8 @@ public class SvxShapeCircle extends TestCase {
XStyle aStyle = null;
try {
- aStyle = (XStyle) AnyConverter.toObject(
- new Type(XStyle.class),oShapeProps.getPropertyValue("Style"));
+ aStyle = AnyConverter.toObject(
+ XStyle.class,oShapeProps.getPropertyValue("Style"));
} catch (com.sun.star.lang.WrappedTargetException e) {
} catch (com.sun.star.beans.UnknownPropertyException e) {
} catch (com.sun.star.lang.IllegalArgumentException e) {
@@ -223,8 +223,8 @@ public class SvxShapeCircle extends TestCase {
oShapeProps =
UnoRuntime.queryInterface(XPropertySet.class,oShape);
try {
- aStyle = (XStyle) AnyConverter.toObject(
- new Type(XStyle.class),oShapeProps.getPropertyValue("Style"));
+ aStyle = AnyConverter.toObject(
+ XStyle.class,oShapeProps.getPropertyValue("Style"));
} catch (com.sun.star.lang.WrappedTargetException e) {
} catch (com.sun.star.beans.UnknownPropertyException e) {
} catch (com.sun.star.lang.IllegalArgumentException e) {
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_svx/SvxShapeConnector.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_svx/SvxShapeConnector.java
index e489858bd3..a813a201a7 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_svx/SvxShapeConnector.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_svx/SvxShapeConnector.java
@@ -166,16 +166,16 @@ public class SvxShapeConnector extends TestCase {
UnoRuntime.queryInterface(XPropertySet.class,oObj);
XStyle aStyle = null;
try {
- aStyle = (XStyle) AnyConverter.toObject(
- new Type(XStyle.class),oShapeProps.getPropertyValue("Style"));
+ aStyle = AnyConverter.toObject(
+ XStyle.class,oShapeProps.getPropertyValue("Style"));
} catch (Exception e) {}
tEnv.addObjRelation("Style1",aStyle);
oShapeProps =
UnoRuntime.queryInterface(XPropertySet.class,oShape);
try {
- aStyle = (XStyle) AnyConverter.toObject(
- new Type(XStyle.class),oShapeProps.getPropertyValue("Style"));
+ aStyle = AnyConverter.toObject(
+ XStyle.class,oShapeProps.getPropertyValue("Style"));
} catch (Exception e) {}
tEnv.addObjRelation("Style2",aStyle);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_svx/SvxShapeControl.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_svx/SvxShapeControl.java
index 3457a7dbdf..75e9fcecf5 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_svx/SvxShapeControl.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_svx/SvxShapeControl.java
@@ -132,15 +132,15 @@ public class SvxShapeControl extends TestCase {
UnoRuntime.queryInterface(XPropertySet.class,oObj);
XStyle aStyle = null;
try {
- aStyle = (XStyle) AnyConverter.toObject(
- new Type(XStyle.class),oShapeProps.getPropertyValue("Style"));
+ aStyle = AnyConverter.toObject(
+ XStyle.class,oShapeProps.getPropertyValue("Style"));
} catch (Exception e) {}
tEnv.addObjRelation("Style1",aStyle);
oShapeProps =
UnoRuntime.queryInterface(XPropertySet.class,oShape);
try {
- aStyle = (XStyle) AnyConverter.toObject(
- new Type(XStyle.class),oShapeProps.getPropertyValue("Style"));
+ aStyle = AnyConverter.toObject(
+ XStyle.class,oShapeProps.getPropertyValue("Style"));
} catch (Exception e) {}
tEnv.addObjRelation("Style2",aStyle);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_svx/SvxShapeDimensioning.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_svx/SvxShapeDimensioning.java
index 792ef647c7..3cc6aa4837 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_svx/SvxShapeDimensioning.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_svx/SvxShapeDimensioning.java
@@ -141,15 +141,15 @@ public class SvxShapeDimensioning extends TestCase {
UnoRuntime.queryInterface(XPropertySet.class,oObj);
XStyle aStyle = null;
try {
- aStyle = (XStyle) AnyConverter.toObject(
- new Type(XStyle.class),oShapeProps.getPropertyValue("Style"));
+ aStyle = AnyConverter.toObject(
+ XStyle.class,oShapeProps.getPropertyValue("Style"));
} catch (Exception e) {}
tEnv.addObjRelation("Style1",aStyle);
oShapeProps =
UnoRuntime.queryInterface(XPropertySet.class,oShape);
try {
- aStyle = (XStyle) AnyConverter.toObject(
- new Type(XStyle.class),oShapeProps.getPropertyValue("Style"));
+ aStyle = AnyConverter.toObject(
+ XStyle.class,oShapeProps.getPropertyValue("Style"));
} catch (Exception e) {}
tEnv.addObjRelation("Style2",aStyle);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_svx/SvxShapeGroup.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_svx/SvxShapeGroup.java
index d93edd0bbf..8eeb571e1e 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_svx/SvxShapeGroup.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_svx/SvxShapeGroup.java
@@ -114,8 +114,8 @@ public class SvxShapeGroup extends TestCase {
XDrawPages oDPn = oDPS.getDrawPages();
XIndexAccess oDPi =
UnoRuntime.queryInterface(XIndexAccess.class,oDPn);
- oObj = (XDrawPage) AnyConverter.toObject(
- new Type(XDrawPage.class),oDPi.getByIndex(0));
+ oObj = AnyConverter.toObject(
+ XDrawPage.class,oDPi.getByIndex(0));
} catch ( Exception e ) {
// Some exception occurred. FAILED
e.printStackTrace( log );
@@ -145,15 +145,15 @@ public class SvxShapeGroup extends TestCase {
UnoRuntime.queryInterface(XPropertySet.class,Shape1);
XStyle aStyle1 = null;
try {
- aStyle1 = (XStyle) AnyConverter.toObject(
- new Type(XStyle.class),oShapeProps.getPropertyValue("Style"));
+ aStyle1 = AnyConverter.toObject(
+ XStyle.class,oShapeProps.getPropertyValue("Style"));
} catch (Exception e) {}
oShapeProps =
UnoRuntime.queryInterface(XPropertySet.class,Shape2);
XStyle aStyle2 = null;
try {
- aStyle2 = (XStyle) AnyConverter.toObject(
- new Type(XStyle.class),oShapeProps.getPropertyValue("Style"));
+ aStyle2 = AnyConverter.toObject(
+ XStyle.class,oShapeProps.getPropertyValue("Style"));
} catch (Exception e) {}
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_svx/SvxShapePolyPolygon.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_svx/SvxShapePolyPolygon.java
index 429fe826ec..25bae5c63e 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_svx/SvxShapePolyPolygon.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_svx/SvxShapePolyPolygon.java
@@ -236,15 +236,15 @@ public class SvxShapePolyPolygon extends TestCase {
UnoRuntime.queryInterface(XPropertySet.class,oObj);
XStyle aStyle = null;
try {
- aStyle = (XStyle) AnyConverter.toObject(
- new Type(XStyle.class),oShapeProps.getPropertyValue("Style"));
+ aStyle = AnyConverter.toObject(
+ XStyle.class,oShapeProps.getPropertyValue("Style"));
} catch (Exception e) {}
tEnv.addObjRelation("Style1",aStyle);
oShapeProps =
UnoRuntime.queryInterface(XPropertySet.class,oShape);
try {
- aStyle = (XStyle) AnyConverter.toObject(
- new Type(XStyle.class),oShapeProps.getPropertyValue("Style"));
+ aStyle = AnyConverter.toObject(
+ XStyle.class,oShapeProps.getPropertyValue("Style"));
} catch (Exception e) {}
tEnv.addObjRelation("Style2",aStyle);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_svx/SvxShapePolyPolygonBezier.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_svx/SvxShapePolyPolygonBezier.java
index e91115070e..205f18a5ed 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_svx/SvxShapePolyPolygonBezier.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_svx/SvxShapePolyPolygonBezier.java
@@ -249,15 +249,15 @@ public class SvxShapePolyPolygonBezier extends TestCase {
UnoRuntime.queryInterface(XPropertySet.class,oObj);
XStyle aStyle = null;
try {
- aStyle = (XStyle) AnyConverter.toObject(
- new Type(XStyle.class),oShapeProps.getPropertyValue("Style"));
+ aStyle = AnyConverter.toObject(
+ XStyle.class,oShapeProps.getPropertyValue("Style"));
} catch (Exception e) {}
tEnv.addObjRelation("Style1",aStyle);
oShapeProps =
UnoRuntime.queryInterface(XPropertySet.class,oShape);
try {
- aStyle = (XStyle) AnyConverter.toObject(
- new Type(XStyle.class),oShapeProps.getPropertyValue("Style"));
+ aStyle = AnyConverter.toObject(
+ XStyle.class,oShapeProps.getPropertyValue("Style"));
} catch (Exception e) {}
tEnv.addObjRelation("Style2",aStyle);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_svx/SvxUnoTextContent.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_svx/SvxUnoTextContent.java
index 4e66d3ebe8..d3fa51209e 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_svx/SvxUnoTextContent.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_svx/SvxUnoTextContent.java
@@ -128,8 +128,8 @@ public class SvxUnoTextContent extends TestCase {
xEA = UnoRuntime.queryInterface
(XEnumerationAccess.class, text) ;
- oObj = (XInterface) AnyConverter.toObject(
- new Type(XInterface.class),xEA.createEnumeration().nextElement());
+ oObj = AnyConverter.toObject(
+ XInterface.class,xEA.createEnumeration().nextElement());
} catch (Exception e) {
log.println("Can't create test object") ;
e.printStackTrace(log) ;
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_svx/SvxUnoTextRange.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_svx/SvxUnoTextRange.java
index ef0e5ff590..7029b6c444 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_svx/SvxUnoTextRange.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_svx/SvxUnoTextRange.java
@@ -128,14 +128,14 @@ public class SvxUnoTextRange extends TestCase {
xEA = UnoRuntime.queryInterface
(XEnumerationAccess.class, text) ;
- XInterface oTextContent = (XInterface) AnyConverter.toObject(
- new Type(XInterface.class),xEA.createEnumeration().nextElement());
+ XInterface oTextContent = AnyConverter.toObject(
+ XInterface.class,xEA.createEnumeration().nextElement());
xEA = UnoRuntime.queryInterface
(XEnumerationAccess.class, oTextContent) ;
- oObj = (XInterface) AnyConverter.toObject(
- new Type(XInterface.class),xEA.createEnumeration().nextElement());
+ oObj = AnyConverter.toObject(
+ XInterface.class,xEA.createEnumeration().nextElement());
} catch (Exception e) {
log.println("Can't create test object") ;
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_svx/SvxUnoTextRangeEnumeration.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_svx/SvxUnoTextRangeEnumeration.java
index c8400bbb76..930748556b 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_svx/SvxUnoTextRangeEnumeration.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_svx/SvxUnoTextRangeEnumeration.java
@@ -128,8 +128,8 @@ public class SvxUnoTextRangeEnumeration extends TestCase {
xEA = UnoRuntime.queryInterface
(XEnumerationAccess.class, text) ;
- XInterface oTextContent = (XInterface) AnyConverter.toObject(
- new Type(XInterface.class),xEA.createEnumeration().nextElement());
+ XInterface oTextContent = AnyConverter.toObject(
+ XInterface.class,xEA.createEnumeration().nextElement());
xEA = UnoRuntime.queryInterface
(XEnumerationAccess.class, oTextContent) ;
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sw/SwAccessibleFooterView.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sw/SwAccessibleFooterView.java
index 0d3a084bd7..6876340fb7 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sw/SwAccessibleFooterView.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sw/SwAccessibleFooterView.java
@@ -88,10 +88,10 @@ public class SwAccessibleFooterView extends TestCase {
// obtains style 'Standard' from style family 'PageStyles'
try {
- PageStyles = (XNameAccess) AnyConverter.toObject(
- new Type(XNameAccess.class),StyleFamNames.getByName("PageStyles"));
- StdStyle = (XStyle) AnyConverter.toObject(
- new Type(XStyle.class),PageStyles.getByName("Standard"));
+ PageStyles = AnyConverter.toObject(
+ XNameAccess.class,StyleFamNames.getByName("PageStyles"));
+ StdStyle = AnyConverter.toObject(
+ XStyle.class,PageStyles.getByName("Standard"));
} catch ( com.sun.star.lang.WrappedTargetException e ) {
e.printStackTrace(log);
throw new StatusException("Error getting style by name!", e);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sw/SwAccessibleHeaderView.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sw/SwAccessibleHeaderView.java
index a2aa578954..5089454425 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sw/SwAccessibleHeaderView.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sw/SwAccessibleHeaderView.java
@@ -86,10 +86,10 @@ public class SwAccessibleHeaderView extends TestCase {
// obtains style 'Standatd' from style family 'PageStyles'
try {
- PageStyles = (XNameAccess) AnyConverter.toObject(
- new Type(XNameAccess.class),StyleFamNames.getByName("PageStyles"));
- StdStyle = (XStyle) AnyConverter.toObject(
- new Type(XStyle.class),PageStyles.getByName("Standard"));
+ PageStyles = AnyConverter.toObject(
+ XNameAccess.class,StyleFamNames.getByName("PageStyles"));
+ StdStyle = AnyConverter.toObject(
+ XStyle.class,PageStyles.getByName("Standard"));
} catch ( com.sun.star.lang.WrappedTargetException e ) {
e.printStackTrace(log);
throw new StatusException("Error getting style by name!", e);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sw/SwAccessiblePageView.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sw/SwAccessiblePageView.java
index 9c6d38e1d7..f7444c853b 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sw/SwAccessiblePageView.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sw/SwAccessiblePageView.java
@@ -113,13 +113,13 @@ public class SwAccessiblePageView extends TestCase {
XEnumeration oEnum = oEnumA.createEnumeration();
try {
- para = (XInterface) AnyConverter.toObject(
- new Type(XInterface.class),oEnum.nextElement());
+ para = AnyConverter.toObject(
+ XInterface.class,oEnum.nextElement());
XEnumerationAccess oEnumB =
UnoRuntime.queryInterface( XEnumerationAccess.class, para );
XEnumeration oEnum2 = oEnumB.createEnumeration();
- port = (XInterface) AnyConverter.toObject(
- new Type(XInterface.class),oEnum2.nextElement());
+ port = AnyConverter.toObject(
+ XInterface.class,oEnum2.nextElement());
} catch ( com.sun.star.lang.WrappedTargetException e ) {
e.printStackTrace(log);
log.println("Error: exception occurred...");
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sw/SwXAutoTextEntry.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sw/SwXAutoTextEntry.java
index aa8e16c3cf..a9cf35dd14 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sw/SwXAutoTextEntry.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sw/SwXAutoTextEntry.java
@@ -150,7 +150,7 @@ public class SwXAutoTextEntry extends TestCase {
}
try{
- oObj = (XInterface) AnyConverter.toObject(new Type(XInterface.class),oContNames.getByName("mytexts"));
+ oObj = AnyConverter.toObject(XInterface.class,oContNames.getByName("mytexts"));
} catch (com.sun.star.uno.Exception e) {
e.printStackTrace(log);
throw new StatusException("Couldn't get AutoTextGroup", e);
@@ -173,8 +173,8 @@ public class SwXAutoTextEntry extends TestCase {
}
log.println("Adding new element 'NewEntryName' to group...");
oGroup.insertNewByName("NewEntryName", "NewEntryTitle", oTextRange);
- oEntry = (XAutoTextEntry) AnyConverter.toObject(
- new Type(XAutoTextEntry.class),oGroup.getByName("NewEntryName"));
+ oEntry = AnyConverter.toObject(
+ XAutoTextEntry.class,oGroup.getByName("NewEntryName"));
} catch ( com.sun.star.container.ElementExistException e ) {
e.printStackTrace(log);
} catch ( com.sun.star.container.NoSuchElementException e ) {
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sw/SwXAutoTextGroup.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sw/SwXAutoTextGroup.java
index 972e0fc284..1fa67984a3 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sw/SwXAutoTextGroup.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sw/SwXAutoTextGroup.java
@@ -150,7 +150,7 @@ public class SwXAutoTextGroup extends TestCase {
}
try{
- oObj = (XInterface) AnyConverter.toObject(new Type(XInterface.class),oContNames.getByName(myGroupName));
+ oObj = AnyConverter.toObject(XInterface.class,oContNames.getByName(myGroupName));
} catch (com.sun.star.uno.Exception e) {
e.printStackTrace(log);
throw new StatusException("Couldn't get AutoTextGroup '"+myGroupName + "'", e);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sw/SwXHeadFootText.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sw/SwXHeadFootText.java
index ce81f52acd..09858c8f88 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sw/SwXHeadFootText.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sw/SwXHeadFootText.java
@@ -132,10 +132,10 @@ public class SwXHeadFootText extends TestCase {
// obtains style 'Standatd' from style family 'PageStyles'
try {
- PageStyles = (XNameAccess) AnyConverter.toObject(
- new Type(XNameAccess.class),StyleFamNames.getByName("PageStyles"));
- StdStyle = (XStyle) AnyConverter.toObject(
- new Type(XStyle.class),PageStyles.getByName("Standard"));
+ PageStyles = AnyConverter.toObject(
+ XNameAccess.class,StyleFamNames.getByName("PageStyles"));
+ StdStyle = AnyConverter.toObject(
+ XStyle.class,PageStyles.getByName("Standard"));
} catch ( com.sun.star.lang.WrappedTargetException e ) {
e.printStackTrace(log);
throw new StatusException("Error getting style by name!", e);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sw/SwXNumberingRules.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sw/SwXNumberingRules.java
index c14e9f19e3..b0be005245 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sw/SwXNumberingRules.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sw/SwXNumberingRules.java
@@ -124,8 +124,8 @@ public class SwXNumberingRules extends TestCase {
try {
XNameAccess oStyleFamilies = oStyleFamiliesSupplier.getStyleFamilies();
- XNameContainer NumStyles = (XNameContainer) AnyConverter.toObject(
- new Type(XNameContainer.class),
+ XNameContainer NumStyles = AnyConverter.toObject(
+ XNameContainer.class,
oStyleFamilies.getByName("NumberingStyles"));
NumStyleI =
UnoRuntime.queryInterface(XIndexAccess.class,NumStyles);
@@ -143,12 +143,12 @@ public class SwXNumberingRules extends TestCase {
Object instance1 = null;
try {
- oObj = (XInterface) AnyConverter.toObject(
- new Type(XInterface.class),NumStyleI.getByIndex(0));
+ oObj = AnyConverter.toObject(
+ XInterface.class,NumStyleI.getByIndex(0));
XPropertySet props =
UnoRuntime.queryInterface(XPropertySet.class, oObj);
- oObj = (XInterface) AnyConverter.toObject(
- new Type(XInterface.class),props.getPropertyValue("NumberingRules"));
+ oObj = AnyConverter.toObject(
+ XInterface.class,props.getPropertyValue("NumberingRules"));
XIndexAccess nRules = UnoRuntime.queryInterface(XIndexAccess.class, props.getPropertyValue("NumberingRules"));
instance1 = nRules.getByIndex(0);
} catch ( com.sun.star.lang.WrappedTargetException e ) {
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sw/SwXParagraph.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sw/SwXParagraph.java
index e2ff4ecefe..cd3a0aa0c4 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sw/SwXParagraph.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sw/SwXParagraph.java
@@ -200,13 +200,13 @@ public class SwXParagraph extends TestCase {
XEnumeration oEnum = oEnumA.createEnumeration();
try {
- para = (XInterface) AnyConverter.toObject(
- new Type(XInterface.class),oEnum.nextElement());
+ para = AnyConverter.toObject(
+ XInterface.class,oEnum.nextElement());
XEnumerationAccess oEnumB =
UnoRuntime.queryInterface( XEnumerationAccess.class, para );
XEnumeration oEnum2 = oEnumB.createEnumeration();
- port = (XInterface) AnyConverter.toObject(
- new Type(XInterface.class),oEnum2.nextElement());
+ port = AnyConverter.toObject(
+ XInterface.class,oEnum2.nextElement());
} catch ( com.sun.star.lang.WrappedTargetException e ) {
e.printStackTrace(log);
log.println("Error: exception occurred...");
@@ -245,8 +245,8 @@ public class SwXParagraph extends TestCase {
try {
- oObj = (XInterface) AnyConverter.toObject(
- new Type(XInterface.class),oEnum.nextElement());
+ oObj = AnyConverter.toObject(
+ XInterface.class,oEnum.nextElement());
} catch ( Exception e) {
log.println("Error, exception occurred...");
e.printStackTrace(log);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sw/SwXStyle.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sw/SwXStyle.java
index 5656bec21d..23cc79e84d 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sw/SwXStyle.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sw/SwXStyle.java
@@ -129,12 +129,12 @@ public class SwXStyle extends TestCase {
XNameAccess oSF = oSFS.getStyleFamilies();
XIndexAccess oSFsIA =
UnoRuntime.queryInterface(XIndexAccess.class, oSF);
- oSFNA = (XNameAccess) AnyConverter.toObject(
- new Type(XNameAccess.class),oSFsIA.getByIndex(0));
+ oSFNA = AnyConverter.toObject(
+ XNameAccess.class,oSFsIA.getByIndex(0));
XIndexAccess oSFIA =
UnoRuntime.queryInterface(XIndexAccess.class, oSFNA);
- oStyle = (XStyle) AnyConverter.toObject(
- new Type(XStyle.class),oSFIA.getByIndex(10));
+ oStyle = AnyConverter.toObject(
+ XStyle.class,oSFIA.getByIndex(10));
} catch ( com.sun.star.lang.WrappedTargetException e ) {
log.println("Error: exception occurred.");
e.printStackTrace(log);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sw/SwXStyleFamily.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sw/SwXStyleFamily.java
index 37a43415dc..692cc5d40d 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sw/SwXStyleFamily.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sw/SwXStyleFamily.java
@@ -137,8 +137,8 @@ public class SwXStyleFamily extends TestCase {
UnoRuntime.queryInterface(XIndexAccess.class, oSF);
try {
- oSFNA = (XNameAccess) AnyConverter.toObject(
- new Type(XNameAccess.class),oSFIA.getByIndex(0));
+ oSFNA = AnyConverter.toObject(
+ XNameAccess.class,oSFIA.getByIndex(0));
} catch ( com.sun.star.lang.IndexOutOfBoundsException e ) {
e.printStackTrace(log);
throw new StatusException("Unexpected exception. ", e);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sw/SwXTextColumns.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sw/SwXTextColumns.java
index 1a4afd5941..ff71af7de1 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sw/SwXTextColumns.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sw/SwXTextColumns.java
@@ -111,10 +111,10 @@ public class SwXTextColumns extends TestCase {
UnoRuntime.queryInterface(XIndexAccess.class, oSF);
try {
- XNameAccess oSFNA = (XNameAccess) AnyConverter.toObject(
- new Type(XNameAccess.class),oSFIA.getByIndex(2));
- oStyle = (XStyle) AnyConverter.toObject(
- new Type(XStyle.class),oSFNA.getByName("Standard"));
+ XNameAccess oSFNA = AnyConverter.toObject(
+ XNameAccess.class,oSFIA.getByIndex(2));
+ oStyle = AnyConverter.toObject(
+ XStyle.class,oSFNA.getByName("Standard"));
} catch ( com.sun.star.lang.WrappedTargetException e ) {
log.println("Error, exception occurred while getting style.");
e.printStackTrace(log);
@@ -134,8 +134,8 @@ public class SwXTextColumns extends TestCase {
+ oStyle.getName());
XPropertySet xProps =
UnoRuntime.queryInterface(XPropertySet.class,oStyle);
- oObj = (XTextColumns) AnyConverter.toObject(
- new Type(XTextColumns.class),xProps.getPropertyValue("TextColumns"));
+ oObj = AnyConverter.toObject(
+ XTextColumns.class,xProps.getPropertyValue("TextColumns"));
} catch ( com.sun.star.lang.WrappedTargetException e ) {
log.println("Exception occurred while getting style property");
e.printStackTrace(log);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sw/SwXTextEmbeddedObject.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sw/SwXTextEmbeddedObject.java
index b61afd2668..8933cd22d3 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sw/SwXTextEmbeddedObject.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sw/SwXTextEmbeddedObject.java
@@ -136,8 +136,8 @@ public class SwXTextEmbeddedObject extends TestCase {
XIndexAccess.class, oEmObj);
try {
- oObj = (XInterface) AnyConverter.toObject(
- new Type(XInterface.class), oEmIn.getByIndex(0));
+ oObj = AnyConverter.toObject(
+ XInterface.class, oEmIn.getByIndex(0));
} catch (com.sun.star.uno.Exception e) {
e.printStackTrace(log);
throw new StatusException("Couldn't get Object", e);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sw/SwXTextPortion.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sw/SwXTextPortion.java
index 8fe66e66c7..5a03433890 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sw/SwXTextPortion.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sw/SwXTextPortion.java
@@ -132,8 +132,8 @@ public class SwXTextPortion extends TestCase {
int n = 0;
while ( (oEnum.hasMoreElements()) ) {
try {
- param = (XInterface) AnyConverter.toObject(
- new Type(XInterface.class),oEnum.nextElement());
+ param = AnyConverter.toObject(
+ XInterface.class,oEnum.nextElement());
log.println("Element Nr.: " + n );
} catch ( Exception e) {
log.println("Couldn't get Paragraph");
@@ -147,8 +147,8 @@ public class SwXTextPortion extends TestCase {
UnoRuntime.queryInterface( XEnumerationAccess.class, param );
XEnumeration oEnum2 = oEnumP.createEnumeration();
try {
- oObj = (XInterface)AnyConverter.toObject(
- new Type(XInterface.class),oEnum2.nextElement());
+ oObj = AnyConverter.toObject(
+ XInterface.class,oEnum2.nextElement());
} catch ( Exception e) {
log.println("Couldn't get TextPortion");
e.printStackTrace(log);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sw/SwXTextPortionEnumeration.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sw/SwXTextPortionEnumeration.java
index 0f16536c1f..d4c1b18966 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sw/SwXTextPortionEnumeration.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sw/SwXTextPortionEnumeration.java
@@ -129,8 +129,8 @@ public class SwXTextPortionEnumeration extends TestCase {
int n = 0;
while ( (oEnum.hasMoreElements()) ) {
try {
- param = (XInterface) AnyConverter.toObject(
- new Type(XInterface.class),oEnum.nextElement());
+ param = AnyConverter.toObject(
+ XInterface.class,oEnum.nextElement());
} catch ( Exception e) {
log.println("Couldn't get Paragraph");
e.printStackTrace();
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sw/SwXTextSection.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sw/SwXTextSection.java
index 631a7ac05e..a33e151320 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sw/SwXTextSection.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sw/SwXTextSection.java
@@ -107,8 +107,8 @@ public class SwXTextSection extends TestCase {
//cleanup if necessary
if (oTSSuppName.hasByName("SwXTextSection")) {
- XTextSection old = (XTextSection) AnyConverter.toObject(
- new Type(XTextSection.class),
+ XTextSection old = AnyConverter.toObject(
+ XTextSection.class,
oTSSuppName.getByName("SwXTextSection"));
XComponent oldC =
UnoRuntime.queryInterface(XComponent.class,old);
@@ -138,8 +138,8 @@ public class SwXTextSection extends TestCase {
UnoRuntime.queryInterface(XIndexAccess.class, oTSSuppName);
log.println( "getting a TextSection with the XTextSectionSupplier()" );
- xTS = (XTextSection) AnyConverter.toObject(
- new Type(XTextSection.class),oTSSuppIndex.getByIndex(0));
+ xTS = AnyConverter.toObject(
+ XTextSection.class,oTSSuppIndex.getByIndex(0));
XNamed xTSName =
UnoRuntime.queryInterface( XNamed.class, xTS);
xTSName.setName("SwXTextSection");
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sw/SwXTextTableRow.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sw/SwXTextTableRow.java
index 4133d854ff..11ac409603 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sw/SwXTextTableRow.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sw/SwXTextTableRow.java
@@ -103,8 +103,8 @@ public class SwXTextTableRow extends TestCase {
XTableRows oTRn = oTable.getRows();
XIndexAccess oIA = UnoRuntime.queryInterface
(XIndexAccess.class,oTRn);
- oObj = (XPropertySet) AnyConverter.toObject(
- new Type(XPropertySet.class),oIA.getByIndex(1));
+ oObj = AnyConverter.toObject(
+ XPropertySet.class,oIA.getByIndex(1));
} catch( Exception e ) {
e.printStackTrace(log);
}
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sw/SwXTextView.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sw/SwXTextView.java
index ccd542b36f..5e46ad7985 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sw/SwXTextView.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sw/SwXTextView.java
@@ -265,7 +265,7 @@ public class SwXTextView extends TestCase {
log.println("Element[" + i + "] :" + elements[i]);
}
- myForm = (XForm) AnyConverter.toObject(new Type(XForm.class), xForms.getByName("Standard"));
+ myForm = AnyConverter.toObject(XForm.class, xForms.getByName("Standard"));
if (myForm == null){
log.println("ERROR: could not get 'Standard' from drawpage!");
if (debug){
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_toolkit/TabController.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_toolkit/TabController.java
index 70ba68e237..c21c9fe468 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_toolkit/TabController.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_toolkit/TabController.java
@@ -102,7 +102,7 @@ public class TabController extends TestCase {
XForm form = null;
try {
- form = (XForm) AnyConverter.toObject(new Type(XForm.class),
+ form = AnyConverter.toObject(XForm.class,
(FormTools.getForms(
WriterTools.getDrawPage(
xTextDoc)))
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_toolkit/UnoTreeControl.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_toolkit/UnoTreeControl.java
index d24313b8bd..3bd4774af9 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_toolkit/UnoTreeControl.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_toolkit/UnoTreeControl.java
@@ -199,7 +199,7 @@ public class UnoTreeControl extends TestCase {
XMutableTreeNode.class, o1);
XTreeNode xNode2a = null;
try {
- xNode2a = (XTreeNode) AnyConverter.toObject(new Type(XTreeNode.class), o2);
+ xNode2a = AnyConverter.toObject(XTreeNode.class, o2);
} catch (com.sun.star.lang.IllegalArgumentException ex) {
ex.printStackTrace();
}
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/util/CalcTools.java b/main/qadevOOo/java/OOoRunner/src/main/java/util/CalcTools.java
index 2b903d4fed..ca2a9215df 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/util/CalcTools.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/util/CalcTools.java
@@ -133,8 +133,8 @@ public class CalcTools {
UnoRuntime.queryInterface(XIndexAccess.class, xSpreadsheets);
try{
- xSheet = (XSpreadsheet) AnyConverter.toObject(
- new Type(XSpreadsheet.class),xSheetsIndexArray.getByIndex(sheetNumber));
+ xSheet = AnyConverter.toObject(
+ XSpreadsheet.class,xSheetsIndexArray.getByIndex(sheetNumber));
} catch (IllegalArgumentException e){
throw new Exception(
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/util/DrawTools.java b/main/qadevOOo/java/OOoRunner/src/main/java/util/DrawTools.java
index c169457948..bdb4476768 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/util/DrawTools.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/util/DrawTools.java
@@ -94,8 +94,8 @@ public class DrawTools {
public static XDrawPage getDrawPage ( XComponent aDoc, int nr ) {
XDrawPage oDP = null;
try {
- oDP = (XDrawPage) AnyConverter.toObject(
- new Type(XDrawPage.class),getDrawPages( aDoc ).getByIndex( nr ));
+ oDP = AnyConverter.toObject(
+ XDrawPage.class,getDrawPages( aDoc ).getByIndex( nr ));
} catch ( Exception e ) {
throw new IllegalArgumentException( "Couldn't get drawpage" );
}
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/util/FormTools.java b/main/qadevOOo/java/OOoRunner/src/main/java/util/FormTools.java
index 358d9a574c..fdd5900e46 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/util/FormTools.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/util/FormTools.java
@@ -228,7 +228,7 @@ public class FormTools {
Object aForm = FormTools.getIndexedForms(WriterTools.getDrawPage(aDoc)).getByIndex(0);
XForm the_form = null;
try {
- the_form = (XForm) AnyConverter.toObject(new Type(XForm.class), aForm);
+ the_form = AnyConverter.toObject(XForm.class, aForm);
} catch (com.sun.star.lang.IllegalArgumentException iae) {
System.out.println("### Couldn't convert Any");
}
@@ -259,7 +259,7 @@ public class FormTools {
public static XLoadable bindForm( XTextDocument aDoc, String sourceName, String tableName )
throws com.sun.star.uno.Exception {
- XForm the_form = (XForm) AnyConverter.toObject(new Type(XForm.class),
+ XForm the_form = AnyConverter.toObject(XForm.class,
FormTools.getIndexedForms(WriterTools.getDrawPage(aDoc)).getByIndex(0));
XPropertySet formProps = UnoRuntime.queryInterface(XPropertySet.class, the_form);
formProps.setPropertyValue("DataSourceName",sourceName);
@@ -302,7 +302,7 @@ public class FormTools {
public static XLoadable bindForm( XTextDocument aDoc, String formName, String sourceName,
String tableName) throws com.sun.star.uno.Exception {
- XForm the_form = (XForm) AnyConverter.toObject(new Type(XForm.class),
+ XForm the_form = AnyConverter.toObject(XForm.class,
FormTools.getForms(WriterTools.getDrawPage(aDoc)).getByName(formName));
XPropertySet formProps = UnoRuntime.queryInterface(XPropertySet.class, the_form);
formProps.setPropertyValue("DataSourceName",sourceName);
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/util/utils.java b/main/qadevOOo/java/OOoRunner/src/main/java/util/utils.java
index 264df9daca..b90d0a3731 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/util/utils.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/util/utils.java
@@ -301,8 +301,8 @@ public class utils {
Object settings = msf.createInstance("com.sun.star.comp.framework.PathSettings");
XPropertySet pthSettings = null;
try {
- pthSettings = (XPropertySet) AnyConverter.toObject(
- new Type(XPropertySet.class), settings);
+ pthSettings = AnyConverter.toObject(
+ XPropertySet.class, settings);
} catch (com.sun.star.lang.IllegalArgumentException iae) {
System.out.println("### couldn't get Office Settings");
}
@@ -322,8 +322,8 @@ public class utils {
Object settings = msf.createInstance("com.sun.star.comp.framework.PathSettings");
XPropertySet pthSettings = null;
try {
- pthSettings = (XPropertySet) AnyConverter.toObject(
- new Type(XPropertySet.class), settings);
+ pthSettings = AnyConverter.toObject(
+ XPropertySet.class, settings);
} catch (com.sun.star.lang.IllegalArgumentException iae) {
System.out.println("### couldn't get Office Settings");
}
diff --git a/main/sc/qa/complex/calcPreview/ViewForwarder.java b/main/sc/qa/complex/calcPreview/ViewForwarder.java
index 258a60a21f..9bb7c9b9c1 100644
--- a/main/sc/qa/complex/calcPreview/ViewForwarder.java
+++ b/main/sc/qa/complex/calcPreview/ViewForwarder.java
@@ -127,8 +127,8 @@ public class ViewForwarder {
XIndexAccess oIndexSheets =
UnoRuntime.queryInterface(XIndexAccess.class, oSheets);
Object o = oIndexSheets.getByIndex(0);
- XSpreadsheet oSheet = (XSpreadsheet)AnyConverter.toObject(
- new com.sun.star.uno.Type(XSpreadsheet.class), o);
+ XSpreadsheet oSheet = AnyConverter.toObject(
+ XSpreadsheet.class, o);
xCell = oSheet.getCellByPosition(0, 0) ;
xCell.setFormula("ScAccessiblePageHeader");
@@ -162,12 +162,12 @@ public class ViewForwarder {
try{
Object o = StyleFamNames.getByName("PageStyles");
- XNameAccess PageStyles = (XNameAccess)AnyConverter.toObject(
- new com.sun.star.uno.Type(XNameAccess.class), o);
+ XNameAccess PageStyles = AnyConverter.toObject(
+ XNameAccess.class, o);
o = PageStyles.getByName("Default");
- StdStyle = (XStyle)AnyConverter.toObject(
- new com.sun.star.uno.Type(XStyle.class), o);
+ StdStyle = AnyConverter.toObject(
+ XStyle.class, o);
} catch(com.sun.star.lang.IllegalArgumentException e) {
fail(e.getMessage());
} catch(com.sun.star.lang.WrappedTargetException e){
@@ -187,8 +187,8 @@ public class ViewForwarder {
// get the header
try {
Object o = PropSet.getPropertyValue("RightPageHeaderContent");
- RPHFC = (XHeaderFooterContent)AnyConverter.toObject(
- new com.sun.star.uno.Type(XHeaderFooterContent.class), o);
+ RPHFC = AnyConverter.toObject(
+ XHeaderFooterContent.class, o);
} catch(com.sun.star.lang.IllegalArgumentException e) {
fail(e.getMessage());
@@ -214,8 +214,8 @@ public class ViewForwarder {
RPHFC = null;
try {
Object o = PropSet.getPropertyValue("RightPageHeaderContent");
- RPHFC = (XHeaderFooterContent)AnyConverter.toObject(
- new com.sun.star.uno.Type(XHeaderFooterContent.class), o);
+ RPHFC = AnyConverter.toObject(
+ XHeaderFooterContent.class, o);
} catch(com.sun.star.lang.IllegalArgumentException e) {
fail(e.getMessage());
} catch(com.sun.star.lang.WrappedTargetException e){
@@ -538,8 +538,8 @@ public class ViewForwarder {
XIndexAccess oIndexSheets =
UnoRuntime.queryInterface(XIndexAccess.class, oSheets);
Object o = oIndexSheets.getByIndex(0);
- XSpreadsheet oSheet = (XSpreadsheet)AnyConverter.toObject(
- new com.sun.star.uno.Type(XSpreadsheet.class), o);
+ XSpreadsheet oSheet = AnyConverter.toObject(
+ XSpreadsheet.class, o);
xCell = oSheet.getCellByPosition(0, 0) ;
xCell.setFormula("ScAccessiblePageHeader");
@@ -573,12 +573,12 @@ public class ViewForwarder {
try{
Object o = StyleFamNames.getByName("PageStyles");
- XNameAccess PageStyles = (XNameAccess)AnyConverter.toObject(
- new com.sun.star.uno.Type(XNameAccess.class), o);
+ XNameAccess PageStyles = AnyConverter.toObject(
+ XNameAccess.class, o);
o = PageStyles.getByName("Default");
- StdStyle = (XStyle)AnyConverter.toObject(
- new com.sun.star.uno.Type(XStyle.class), o);
+ StdStyle = AnyConverter.toObject(
+ XStyle.class, o);
} catch(com.sun.star.lang.IllegalArgumentException e) {
fail(e.getMessage());
} catch(com.sun.star.lang.WrappedTargetException e){
@@ -599,8 +599,8 @@ public class ViewForwarder {
System.out.println( "Creating a test environment" );
try {
Object o = PropSet.getPropertyValue("RightPageHeaderContent");
- RPHFC = (XHeaderFooterContent)AnyConverter.toObject(
- new com.sun.star.uno.Type(XHeaderFooterContent.class), o);
+ RPHFC = AnyConverter.toObject(
+ XHeaderFooterContent.class, o);
} catch(com.sun.star.lang.IllegalArgumentException e) {
fail(e.getMessage());
} catch(com.sun.star.lang.WrappedTargetException e){
@@ -625,8 +625,8 @@ public class ViewForwarder {
RPHFC = null;
try {
Object o = PropSet.getPropertyValue("RightPageFooterContent");
- RPHFC = (XHeaderFooterContent)AnyConverter.toObject(
- new com.sun.star.uno.Type(XHeaderFooterContent.class), o);
+ RPHFC = AnyConverter.toObject(
+ XHeaderFooterContent.class, o);
} catch(com.sun.star.lang.IllegalArgumentException e) {
fail(e.getMessage());
} catch(com.sun.star.lang.WrappedTargetException e){
@@ -808,8 +808,8 @@ public class ViewForwarder {
XIndexAccess oIndexSheets =
UnoRuntime.queryInterface(XIndexAccess.class, oSheets);
Object o = oIndexSheets.getByIndex(0);
- XSpreadsheet oSheet = (XSpreadsheet)AnyConverter.toObject(
- new com.sun.star.uno.Type(XSpreadsheet.class), o);
+ XSpreadsheet oSheet = AnyConverter.toObject(
+ XSpreadsheet.class, o);
System.out.println("Getting a cell from sheet") ;
xCell = oSheet.getCellByPosition(0, 0);
diff --git a/main/sc/qa/complex/cellRanges/CheckXCellRangesQuery.java b/main/sc/qa/complex/cellRanges/CheckXCellRangesQuery.java
index bc07b1b7a0..bebee6029f 100644
--- a/main/sc/qa/complex/cellRanges/CheckXCellRangesQuery.java
+++ b/main/sc/qa/complex/cellRanges/CheckXCellRangesQuery.java
@@ -85,8 +85,8 @@ public class CheckXCellRangesQuery {
XSpreadsheets oSheets = m_xSheetDoc.getSheets() ;
XIndexAccess oIndexSheets =
UnoRuntime.queryInterface(XIndexAccess.class, oSheets);
- m_xSpreadSheet = (XSpreadsheet) AnyConverter.toObject(
- new Type(XSpreadsheet.class),oIndexSheets.getByIndex(0));
+ m_xSpreadSheet = AnyConverter.toObject(
+ XSpreadsheet.class,oIndexSheets.getByIndex(0));
// get the cell
System.out.println("Getting a cell from sheet") ;
diff --git a/main/sc/qa/complex/dataPilot/CheckDataPilot.java b/main/sc/qa/complex/dataPilot/CheckDataPilot.java
index 22e8f9f4aa..45b686cb28 100644
--- a/main/sc/qa/complex/dataPilot/CheckDataPilot.java
+++ b/main/sc/qa/complex/dataPilot/CheckDataPilot.java
@@ -197,10 +197,10 @@ public class CheckDataPilot {
UnoRuntime.queryInterface(XIndexAccess.class, xSpreadsheets);
try {
- oSheet = (XSpreadsheet) AnyConverter.toObject(
- new Type(XSpreadsheet.class),oIndexAccess.getByIndex(0));
- oSheet2 = (XSpreadsheet) AnyConverter.toObject(
- new Type(XSpreadsheet.class),oIndexAccess.getByIndex(1));
+ oSheet = AnyConverter.toObject(
+ XSpreadsheet.class,oIndexAccess.getByIndex(0));
+ oSheet2 = AnyConverter.toObject(
+ XSpreadsheet.class,oIndexAccess.getByIndex(1));
} catch (com.sun.star.lang.WrappedTargetException e) {
e.printStackTrace();
throw new StatusException( "Couldn't get a spreadsheet", e);
@@ -299,8 +299,8 @@ public class CheckDataPilot {
}
DPT.insertNewByName("DataPilotTable", sCellAdress, DPDsc);
try {
- mDataPilotTableObject = (XInterface) AnyConverter.toObject(
- new Type(XInterface.class),DPT.getByName(DPT.getElementNames()[0]));
+ mDataPilotTableObject = AnyConverter.toObject(
+ XInterface.class,DPT.getByName(DPT.getElementNames()[0]));
} catch (com.sun.star.lang.WrappedTargetException e) {
e.printStackTrace();
throw new StatusException("Couldn't create a test environment", e);
@@ -314,8 +314,8 @@ public class CheckDataPilot {
XIndexAccess IA = DPDsc.getDataPilotFields();
try {
- mDataPilotFieldObject = (XInterface)AnyConverter.toObject(
- new Type(XInterface.class),IA.getByIndex(0));
+ mDataPilotFieldObject = AnyConverter.toObject(
+ XInterface.class,IA.getByIndex(0));
} catch (com.sun.star.lang.WrappedTargetException e) {
e.printStackTrace();
throw new StatusException("Couldn't get data pilot field", e);
diff --git a/main/scripting/examples/java/Highlight/HighlightText.java b/main/scripting/examples/java/Highlight/HighlightText.java
index 840a68233b..637b14ea3b 100644
--- a/main/scripting/examples/java/Highlight/HighlightText.java
+++ b/main/scripting/examples/java/Highlight/HighlightText.java
@@ -215,8 +215,8 @@ public class HighlightText implements com.sun.star.awt.XActionListener {
Object serviceObj = context.getComponentContext().getValueByName(
"/singletons/com.sun.star.util.theMacroExpander");
- XMacroExpander xme = (XMacroExpander) AnyConverter.toObject(
- new Type(XMacroExpander.class), serviceObj);
+ XMacroExpander xme = AnyConverter.toObject(
+ XMacroExpander.class, serviceObj);
String bootstrapName = "bootstraprc";
if (System.getProperty("os.name").startsWith("Windows")) {
diff --git a/main/scripting/examples/java/MemoryUsage/MemoryUsage.java b/main/scripting/examples/java/MemoryUsage/MemoryUsage.java
index 4dff0b2f68..b549ad9da7 100644
--- a/main/scripting/examples/java/MemoryUsage/MemoryUsage.java
+++ b/main/scripting/examples/java/MemoryUsage/MemoryUsage.java
@@ -78,8 +78,8 @@ public class MemoryUsage
XIndexAccess index =
UnoRuntime.queryInterface(XIndexAccess.class, doc.getSheets());
- XSpreadsheet sheet = (XSpreadsheet) AnyConverter.toObject(
- new Type(com.sun.star.sheet.XSpreadsheet.class), index.getByIndex(0));
+ XSpreadsheet sheet = AnyConverter.toObject(
+ com.sun.star.sheet.XSpreadsheet.class, index.getByIndex(0));
return sheet;
}
diff --git a/main/scripting/examples/java/selector/ScriptSelector.java b/main/scripting/examples/java/selector/ScriptSelector.java
index 187ff6c314..7132e01ad5 100644
--- a/main/scripting/examples/java/selector/ScriptSelector.java
+++ b/main/scripting/examples/java/selector/ScriptSelector.java
@@ -275,8 +275,8 @@ public class ScriptSelector {
if (result != null)
{
- XBrowseNode xbn = (XBrowseNode)
- AnyConverter.toObject(new Type(XBrowseNode.class), result);
+ XBrowseNode xbn =
+ AnyConverter.toObject(XBrowseNode.class, result);
selectorPanel.addNode(node, xbn);
}
}
diff --git a/main/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java b/main/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
index dee466123a..4d226e843f 100644
--- a/main/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
+++ b/main/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
@@ -134,8 +134,8 @@ public abstract class ScriptProvider
Object serviceObj = m_xContext.getValueByName(
"/singletons/com.sun.star.util.theMacroExpander");
- XMacroExpander me = (XMacroExpander) AnyConverter.toObject(
- new Type(XMacroExpander.class), serviceObj);
+ XMacroExpander me = AnyConverter.toObject(
+ XMacroExpander.class, serviceObj);
XMLParserFactory.setOfficeDTDURL(me.expandMacros(
"${$OOO_BASE_DIR/program/bootstraprc::BaseInstallation}/share/dtd/officedocument/1_0/"));
diff --git a/main/ucb/test/com/sun/star/comp/ucb/GlobalTransfer_Test.java b/main/ucb/test/com/sun/star/comp/ucb/GlobalTransfer_Test.java
index 9dd8b1cd05..f164ff06b7 100644
--- a/main/ucb/test/com/sun/star/comp/ucb/GlobalTransfer_Test.java
+++ b/main/ucb/test/com/sun/star/comp/ucb/GlobalTransfer_Test.java
@@ -164,7 +164,7 @@ public final class GlobalTransfer_Test {
System.out.println( "Interaction Handler called." );
try {
- NameClashResolveRequest req = (NameClashResolveRequest)
+ NameClashResolveRequest req =
AnyConverter.toObject(
NameClashResolveRequest.class, Request.getRequest() );
diff --git a/main/wizards/com/sun/star/wizards/db/DBMetaData.java b/main/wizards/com/sun/star/wizards/db/DBMetaData.java
index b982615d10..cc7f3678ab 100644
--- a/main/wizards/com/sun/star/wizards/db/DBMetaData.java
+++ b/main/wizards/com/sun/star/wizards/db/DBMetaData.java
@@ -172,7 +172,7 @@ public class DBMetaData
{
try
{
- XNumberFormatsSupplier xNumberFormatsSupplier = (XNumberFormatsSupplier) AnyConverter.toObject(XNumberFormatsSupplier.class, xDataSourcePropertySet.getPropertyValue("NumberFormatsSupplier"));
+ XNumberFormatsSupplier xNumberFormatsSupplier = AnyConverter.toObject(XNumberFormatsSupplier.class, xDataSourcePropertySet.getPropertyValue("NumberFormatsSupplier"));
//TODO get the locale from the datasource
aLocale = Configuration.getOfficeLocale(xMSF);
oNumberFormatter = new NumberFormatter(xMSF, xNumberFormatsSupplier, aLocale);
diff --git a/main/wizards/com/sun/star/wizards/db/RecordParser.java b/main/wizards/com/sun/star/wizards/db/RecordParser.java
index 7d5dba204c..2a35d73921 100644
--- a/main/wizards/com/sun/star/wizards/db/RecordParser.java
+++ b/main/wizards/com/sun/star/wizards/db/RecordParser.java
@@ -91,12 +91,8 @@ public class RecordParser extends QueryMetaData
{
try
{
- com.sun.star.uno.Type CurType;
- Object oAny;
String sValue = xResultSetRow.getString(ColIndex); //???
- CurType = new com.sun.star.uno.Type(String.class);
- oAny = AnyConverter.toObject(CurType, sValue);
- return oAny;
+ return AnyConverter.toObject(String.class, sValue);
}
catch (Exception exception)
{
diff --git a/main/wizards/com/sun/star/wizards/document/FormHandler.java b/main/wizards/com/sun/star/wizards/document/FormHandler.java
index fe2bfa0266..6fc555b068 100644
--- a/main/wizards/com/sun/star/wizards/document/FormHandler.java
+++ b/main/wizards/com/sun/star/wizards/document/FormHandler.java
@@ -239,7 +239,7 @@ public class FormHandler
XInterface xHiddenControl;
if (xNameAccess.hasByName(ControlName))
{
- xHiddenControl = (XInterface) AnyConverter.toObject(new Type(XInterface.class), xNameAccess.getByName(ControlName));
+ xHiddenControl = AnyConverter.toObject(XInterface.class, xNameAccess.getByName(ControlName));
}
else
{
@@ -373,7 +373,7 @@ public class FormHandler
{
if (xNamedForms.hasByName(_sname))
{
- Object oDBForm = AnyConverter.toObject(new Type(XInterface.class), Helper.getUnoObjectbyName(xNamedForms, _sname));
+ Object oDBForm = AnyConverter.toObject(XInterface.class, Helper.getUnoObjectbyName(xNamedForms, _sname));
xNamedForm = UnoRuntime.queryInterface(XNameContainer.class, oDBForm);
}
}
diff --git a/main/wizards/com/sun/star/wizards/text/TextStyleHandler.java b/main/wizards/com/sun/star/wizards/text/TextStyleHandler.java
index 308eaa5860..f679ff187f 100644
--- a/main/wizards/com/sun/star/wizards/text/TextStyleHandler.java
+++ b/main/wizards/com/sun/star/wizards/text/TextStyleHandler.java
@@ -95,12 +95,12 @@ public class TextStyleHandler
try
{
_xPropPageStyle.setPropertyValue("IsLandscape", Boolean.valueOf(_bIsLandscape));
- Size aPageSize = (Size) AnyConverter.toObject(Size.class, _xPropPageStyle.getPropertyValue("Size"));
+ Size aPageSize = AnyConverter.toObject(Size.class, _xPropPageStyle.getPropertyValue("Size"));
int nPageWidth = aPageSize.Width;
int nPageHeight = aPageSize.Height;
Size aSize = new Size(nPageHeight, nPageWidth);
_xPropPageStyle.setPropertyValue("Size", aSize);
- return (Size) AnyConverter.toObject(Size.class, _xPropPageStyle.getPropertyValue("Size"));
+ return AnyConverter.toObject(Size.class, _xPropPageStyle.getPropertyValue("Size"));
}
catch (Exception e)
{
diff --git a/main/xmerge/java/XMergeBridge/src/main/java/XMergeBridge.java b/main/xmerge/java/XMergeBridge/src/main/java/XMergeBridge.java
index 0bca2ee708..208465c3af 100644
--- a/main/xmerge/java/XMergeBridge/src/main/java/XMergeBridge.java
+++ b/main/xmerge/java/XMergeBridge/src/main/java/XMergeBridge.java
@@ -185,10 +185,10 @@ public class XMergeBridge {
try{
//System.out.println("\n"+pValue[i].Name+" "+pValue[i].Value);
if (pValue[i].Name.compareTo("InputStream")==0){
- xis=(com.sun.star.io.XInputStream)AnyConverter.toObject(new Type(com.sun.star.io.XInputStream.class), pValue[i].Value);
+ xis=AnyConverter.toObject(com.sun.star.io.XInputStream.class, pValue[i].Value);
}
if (pValue[i].Name.compareTo("FileName")==0){
- sFileName=(String)AnyConverter.toObject(new Type(java.lang.String.class), pValue[i].Value);
+ sFileName=AnyConverter.toObject(java.lang.String.class, pValue[i].Value);
}
}
@@ -282,21 +282,21 @@ public class XMergeBridge {
try{
//System.out.println("\n"+pValue[i].Name+" "+pValue[i].Value);
if (pValue[i].Name.compareTo("OutputStream")==0){
- xos=(com.sun.star.io.XOutputStream)AnyConverter.toObject(new Type(com.sun.star.io.XOutputStream.class), pValue[i].Value);
+ xos=AnyConverter.toObject(com.sun.star.io.XOutputStream.class, pValue[i].Value);
// System.out.println(pValue[i].Name+" "+xos);
}
if (pValue[i].Name.compareTo("FileName")==0){
- sFileName=(String)AnyConverter.toObject(new Type(java.lang.String.class), pValue[i].Value);
+ sFileName=AnyConverter.toObject(java.lang.String.class, pValue[i].Value);
//System.out.println(pValue[i].Name+" "+sFileName);
}
if (pValue[i].Name.compareTo("URL")==0){
- sURL=(String)AnyConverter.toObject(new Type(java.lang.String.class), pValue[i].Value);
+ sURL=AnyConverter.toObject(java.lang.String.class, pValue[i].Value);
// System.out.println("\nMediaDescriptor url "+pValue[i].Name+" "+sURL);
}
if (pValue[i].Name.compareTo("Title")==0){
- title=(String)AnyConverter.toObject(new Type(java.lang.String.class), pValue[i].Value);
+ title=AnyConverter.toObject(java.lang.String.class, pValue[i].Value);
//System.out.println(pValue[i].Name+" "+title);
}
}
(openoffice) 07/19: Lokalized Dutch
Posted by ji...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jimjag pushed a commit to branch AOO50X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 9216e35a2c5f1d5744b07c2fca392537d2f5c388
Author: DiGro <di...@yahoo.co.uk>
AuthorDate: Wed Sep 30 15:12:00 2026 +0200
Lokalized Dutch
(cherry picked from commit c61c71e99286ae9536064b93c703ad233962249b)
---
main/default_images/res/helpimg/nl/feldcolo.png | Bin 698 -> 853 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/main/default_images/res/helpimg/nl/feldcolo.png b/main/default_images/res/helpimg/nl/feldcolo.png
index 81479624ca..0120b879fb 100644
Binary files a/main/default_images/res/helpimg/nl/feldcolo.png and b/main/default_images/res/helpimg/nl/feldcolo.png differ
(openoffice) 14/19: Begin converting java.util.Vector to java.util.ArrayList.
Posted by ji...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jimjag pushed a commit to branch AOO50X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 63acec1d10cd9b12f659fc47fa9a9c45450906e1
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Sat Oct 3 17:46:43 2026 +0200
Begin converting java.util.Vector to java.util.ArrayList.
Patch by: me
(cherry picked from commit 5df6678e228f27dc727ad4a62a2120c7d06adaae)
---
.../framework/qa/complex/api_internal/CheckAPI.java | 6 +++---
.../com/sun/star/lib/uno/helper/UnoUrl.java | 8 ++++----
.../com/sun/star/lib/uno/helper/WeakBase.java | 7 +++----
.../OOoRunner/src/main/java/mod/_sc/ScStyleObj.java | 6 +++---
.../src/main/java/org/openoffice/RunnerService.java | 4 ++--
.../OOoRunner/src/main/java/util/DesktopTools.java | 4 ++--
.../examples/java/Newsgroup/PostNewsgroup.java | 10 +++++-----
.../javascript/ScriptEditorForJavaScript.java | 4 ++--
.../qa/complex/sfx2/DocumentMetadataAccess.java | 21 ++++-----------------
.../unoxml/qa/complex/unoxml/RDFRepositoryTest.java | 21 ++++-----------------
.../com/sun/star/wizards/text/TextFieldHandler.java | 8 ++++----
.../com/sun/star/wizards/ui/FieldSelection.java | 6 +++---
.../java/org/openoffice/xmerge/util/OfficeUtil.java | 12 ++++--------
13 files changed, 43 insertions(+), 74 deletions(-)
diff --git a/main/framework/qa/complex/api_internal/CheckAPI.java b/main/framework/qa/complex/api_internal/CheckAPI.java
index 70ac32a232..113cf6096d 100644
--- a/main/framework/qa/complex/api_internal/CheckAPI.java
+++ b/main/framework/qa/complex/api_internal/CheckAPI.java
@@ -33,7 +33,7 @@ import com.sun.star.beans.PropertyValue;
import com.sun.star.uno.UnoRuntime;
import com.sun.star.beans.NamedValue;
-import java.util.Vector;
+import java.util.ArrayList;
import java.util.StringTokenizer;
@@ -104,7 +104,7 @@ public class CheckAPI {
// get the parameters for the internal test
String paramList = (String)param.get("ParamList");
- Vector p = new Vector();
+ ArrayList p = new ArrayList();
StringTokenizer paramTokens = new StringTokenizer(paramList, " ");
while(paramTokens.hasMoreTokens())
{
@@ -133,7 +133,7 @@ public class CheckAPI {
}
else {
int index=1;
- p = new Vector();
+ p = new ArrayList<>();
while ( param.get("job"+index) != null ) {
p.add(param.get("job"+index));
index++;
diff --git a/main/javaunohelper/com/sun/star/lib/uno/helper/UnoUrl.java b/main/javaunohelper/com/sun/star/lib/uno/helper/UnoUrl.java
index a88dae2835..bf14b6e4b0 100644
--- a/main/javaunohelper/com/sun/star/lib/uno/helper/UnoUrl.java
+++ b/main/javaunohelper/com/sun/star/lib/uno/helper/UnoUrl.java
@@ -24,7 +24,7 @@
package com.sun.star.lib.uno.helper;
import java.io.UnsupportedEncodingException;
import java.util.HashMap;
-import java.util.Vector;
+import java.util.ArrayList;
/**
* Object representation and parsing of Uno Urls,
@@ -225,7 +225,7 @@ public class UnoUrl {
private static String decodeUTF8(String s)
throws com.sun.star.lang.IllegalArgumentException {
- Vector v = new Vector();
+ ArrayList<Integer> v = new ArrayList<>();
for (int i = 0; i < s.length(); i++) {
int ch = s.charAt(i);
@@ -236,13 +236,13 @@ public class UnoUrl {
ch = (hb << 4) | lb;
}
- v.addElement(ch);
+ v.add(ch);
}
int size = v.size();
byte[] bytes = new byte[size];
for (int i = 0; i < size; i++) {
- Integer anInt = (Integer) v.elementAt(i);
+ Integer anInt = v.get(i);
bytes[i] = (byte) (anInt.intValue() & 0xFF);
}
diff --git a/main/javaunohelper/com/sun/star/lib/uno/helper/WeakBase.java b/main/javaunohelper/com/sun/star/lib/uno/helper/WeakBase.java
index d180195470..cc470131bc 100644
--- a/main/javaunohelper/com/sun/star/lib/uno/helper/WeakBase.java
+++ b/main/javaunohelper/com/sun/star/lib/uno/helper/WeakBase.java
@@ -26,7 +26,7 @@ import com.sun.star.uno.XWeak;
import com.sun.star.uno.XAdapter;
import com.sun.star.lang.XTypeProvider;
import com.sun.star.uno.Type;
-import java.util.Vector;
+import java.util.ArrayList;
import java.util.Map;
import java.util.Hashtable;
@@ -77,7 +77,7 @@ public class WeakBase implements XWeak, XTypeProvider
Type[] arTypes= (Type[]) _mapTypes.get( getClass());
if (arTypes == null)
{
- Vector vec= new Vector();
+ ArrayList<Type> vec= new ArrayList<>();
Class currentClass= getClass();
do
{
@@ -93,8 +93,7 @@ public class WeakBase implements XWeak, XTypeProvider
} while (currentClass != null);
Type types[]= new Type[vec.size()];
- for( int i= 0; i < types.length; i++)
- types[i]= (Type) vec.elementAt(i);
+ vec.toArray(types);
_mapTypes.put(getClass(), types);
arTypes= types;
}
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScStyleObj.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScStyleObj.java
index e9a6dbc318..c95fabb6c2 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScStyleObj.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScStyleObj.java
@@ -24,7 +24,7 @@
package mod._sc;
import java.io.PrintWriter;
-import java.util.Vector;
+import java.util.ArrayList;
import lib.StatusException;
import lib.TestCase;
@@ -252,7 +252,7 @@ public class ScStyleObj extends TestCase {
public String[] getPropertyNames(XPropertySet props) {
Property[] the_props = props.getPropertySetInfo().getProperties();
- Vector names = new Vector() ;
+ ArrayList<String> names = new ArrayList<>();
for (int i=0;i<the_props.length;i++) {
boolean isWritable =
@@ -261,6 +261,6 @@ public class ScStyleObj extends TestCase {
names.add(the_props[i].Name);
}
}
- return (String[]) names.toArray(new String[names.size()]) ;
+ return names.toArray(new String[names.size()]);
}
} // finish class ScStyleObj
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/org/openoffice/RunnerService.java b/main/qadevOOo/java/OOoRunner/src/main/java/org/openoffice/RunnerService.java
index 7ec01010e7..771d0f3722 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/org/openoffice/RunnerService.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/org/openoffice/RunnerService.java
@@ -43,7 +43,7 @@ import com.sun.star.uno.Type;
import com.sun.star.registry.XRegistryKey;
import com.sun.star.beans.NamedValue;
-import java.util.Vector;
+import java.util.ArrayList;
/**
* The main class, will call ClParser and CfgParser to <br>
@@ -216,7 +216,7 @@ public class RunnerService implements XJob, XServiceInfo,
return pVal;
}
- Vector v = new Vector(600);
+ ArrayList<String> v = new ArrayList<>(600);
try {
// open connection to Jar
java.net.JarURLConnection con =
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/util/DesktopTools.java b/main/qadevOOo/java/OOoRunner/src/main/java/util/DesktopTools.java
index 8892a3fead..8883b9b87c 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/util/DesktopTools.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/util/DesktopTools.java
@@ -46,7 +46,7 @@ import com.sun.star.util.XCloseable;
import com.sun.star.util.XModifiable;
import com.sun.star.view.XViewSettingsSupplier;
import helper.ConfigHelper;
-import java.util.Vector;
+import java.util.ArrayList;
import lib.StatusException;
/**
@@ -142,7 +142,7 @@ public class DesktopTools
*/
public static Object[] getAllOpenDocuments(XMultiServiceFactory xMSF)
{
- Vector components = new Vector();
+ ArrayList<XComponent> components = new ArrayList<>();
XDesktop xDesktop = UnoRuntime.queryInterface(
XDesktop.class, createDesktop(xMSF));
diff --git a/main/scripting/examples/java/Newsgroup/PostNewsgroup.java b/main/scripting/examples/java/Newsgroup/PostNewsgroup.java
index f20582cafd..872f2a55d8 100644
--- a/main/scripting/examples/java/Newsgroup/PostNewsgroup.java
+++ b/main/scripting/examples/java/Newsgroup/PostNewsgroup.java
@@ -23,7 +23,7 @@ import java.awt.*;
import java.awt.event.*;
import javax.swing.*;
import javax.swing.border.*;
-import java.util.Vector;
+import java.util.ArrayList;
import com.sun.star.script.framework.runtime.XScriptContext;
@@ -328,9 +328,9 @@ public class PostNewsgroup extends JFrame
}
else
{
- // Copy all newsgroups into a vector for comparison
+ // Copy all newsgroups into an ArrayList for comparison
// Alter entries (to include host name) if duplication is found
- Vector vector = new Vector( subscribedNewsgroups.length );
+ ArrayList<String> vector = new ArrayList<>( subscribedNewsgroups.length );
for(int i=0; i < subscribedNewsgroups.length; i++ )
{
vector.add( subscribedNewsgroups[i].getNewsgroupName() );
@@ -349,10 +349,10 @@ public class PostNewsgroup extends JFrame
}
}
}
- // Copy converted newsgroups from vector to combo box
+ // Copy converted newsgroups from ArrayList to combo box
for(int i=0; i < subscribedNewsgroups.length; i++ )
{
- newsgroupComboBox.addItem( vector.elementAt(i) );
+ newsgroupComboBox.addItem( vector.get(i) );
}
}// else
diff --git a/main/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java b/main/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java
index a75b2abb1f..4b7050835f 100644
--- a/main/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java
+++ b/main/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java
@@ -304,7 +304,7 @@ public class ScriptEditorForJavaScript implements ScriptEditor
synchronized( BEING_EDITED )
{
java.util.Iterator iter = BEING_EDITED.keySet().iterator();
- java.util.Vector keysToRemove = new java.util.Vector();
+ java.util.ArrayList<URL> keysToRemove = new java.util.ArrayList<>();
while ( iter.hasNext() )
{
@@ -313,7 +313,7 @@ public class ScriptEditorForJavaScript implements ScriptEditor
}
for ( int i=0; i<keysToRemove.size(); i++ )
{
- BEING_EDITED.remove( keysToRemove.elementAt( i ) );
+ BEING_EDITED.remove( keysToRemove.get( i ) );
}
keysToRemove = null;
}
diff --git a/main/sfx2/qa/complex/sfx2/DocumentMetadataAccess.java b/main/sfx2/qa/complex/sfx2/DocumentMetadataAccess.java
index 75edd18883..8a0f311b25 100644
--- a/main/sfx2/qa/complex/sfx2/DocumentMetadataAccess.java
+++ b/main/sfx2/qa/complex/sfx2/DocumentMetadataAccess.java
@@ -977,36 +977,23 @@ public class DocumentMetadataAccess
static Statement[] toSeq(XEnumeration i_Enum) throws Exception
{
- java.util.Collection c = new java.util.Vector();
+ java.util.Collection c = new java.util.ArrayList();
while (i_Enum.hasMoreElements()) {
Statement s = (Statement) i_Enum.nextElement();
//System.out.println("toSeq: " + s.getSubject().getStringValue() + " " + s.getPredicate().getStringValue() + " " + s.getObject().getStringValue() + ".");
c.add(s);
}
-// return (Statement[]) c.toArray();
- // java sucks
- Object[] arr = c.toArray();
- Statement[] ret = new Statement[arr.length];
- for (int i = 0; i < arr.length; ++i) {
- ret[i] = (Statement) arr[i];
- }
- return ret;
+ return c.toArray(new Statement[c.size()]);
}
static XNode[][] toSeqs(XEnumeration i_Enum) throws Exception
{
- java.util.Collection c = new java.util.Vector();
+ java.util.Collection c = new java.util.ArrayList();
while (i_Enum.hasMoreElements()) {
XNode[] s = (XNode[]) i_Enum.nextElement();
c.add(s);
}
-// return (XNode[][]) c.toArray();
- Object[] arr = c.toArray();
- XNode[][] ret = new XNode[arr.length][];
- for (int i = 0; i < arr.length; ++i) {
- ret[i] = (XNode[]) arr[i];
- }
- return ret;
+ return c.toArray(new XNode[c.size()][]);
}
static class BindingComp implements java.util.Comparator
diff --git a/main/unoxml/qa/complex/unoxml/RDFRepositoryTest.java b/main/unoxml/qa/complex/unoxml/RDFRepositoryTest.java
index 2df8c133a6..7e26be06c2 100644
--- a/main/unoxml/qa/complex/unoxml/RDFRepositoryTest.java
+++ b/main/unoxml/qa/complex/unoxml/RDFRepositoryTest.java
@@ -615,36 +615,23 @@ public class RDFRepositoryTest
static Statement[] toSeq(XEnumeration i_Enum) throws Exception
{
- java.util.Collection c = new java.util.Vector();
+ java.util.Collection c = new java.util.ArrayList();
while (i_Enum.hasMoreElements()) {
Statement s = (Statement) i_Enum.nextElement();
//System.out.println("toSeq: " + s.getSubject().getStringValue() + " " + s.getPredicate().getStringValue() + " " + s.getObject().getStringValue() + ".");
c.add(s);
}
-// return (Statement[]) c.toArray();
- // java sucks
- Object[] arr = c.toArray();
- Statement[] ret = new Statement[arr.length];
- for (int i = 0; i < arr.length; ++i) {
- ret[i] = (Statement) arr[i];
- }
- return ret;
+ return c.toArray(new Statement[c.size()]);
}
static XNode[][] toSeqs(XEnumeration i_Enum) throws Exception
{
- java.util.Collection c = new java.util.Vector();
+ java.util.Collection c = new java.util.ArrayList();
while (i_Enum.hasMoreElements()) {
XNode[] s = (XNode[]) i_Enum.nextElement();
c.add(s);
}
-// return (XNode[][]) c.toArray();
- Object[] arr = c.toArray();
- XNode[][] ret = new XNode[arr.length][];
- for (int i = 0; i < arr.length; ++i) {
- ret[i] = (XNode[]) arr[i];
- }
- return ret;
+ return c.toArray(new XNode[c.size()][]);
}
static class BindingComp implements java.util.Comparator
diff --git a/main/wizards/com/sun/star/wizards/text/TextFieldHandler.java b/main/wizards/com/sun/star/wizards/text/TextFieldHandler.java
index abdb5b223b..928499f1e5 100644
--- a/main/wizards/com/sun/star/wizards/text/TextFieldHandler.java
+++ b/main/wizards/com/sun/star/wizards/text/TextFieldHandler.java
@@ -24,7 +24,7 @@ package com.sun.star.wizards.text;
import java.util.Calendar;
import java.util.GregorianCalendar;
-import java.util.Vector;
+import java.util.ArrayList;
import com.sun.star.text.XDependentTextField;
import com.sun.star.text.XTextContent;
@@ -148,7 +148,7 @@ public class TextFieldHandler
try
{
XDependentTextField[] xDependentFields;
- Vector xDependentVector = new Vector();
+ ArrayList<XDependentTextField> xDependentVector = new ArrayList<>();
if (xTextFieldsSupplier.getTextFields().hasElements())
{
XEnumeration xEnum = xTextFieldsSupplier.getTextFields().createEnumeration();
@@ -168,7 +168,7 @@ public class TextFieldHandler
String sValue = AnyConverter.toString(oValue);
if (sValue.equals(_aPropertyValue))
{
- xDependentVector.addElement(xDependent);
+ xDependentVector.add(xDependent);
}
}
}
@@ -180,7 +180,7 @@ public class TextFieldHandler
short ishortValue = AnyConverter.toShort(oValue);
if (ishortValue == iShortParam)
{
- xDependentVector.addElement(xDependent);
+ xDependentVector.add(xDependent);
}
}
}
diff --git a/main/wizards/com/sun/star/wizards/ui/FieldSelection.java b/main/wizards/com/sun/star/wizards/ui/FieldSelection.java
index ab7af1a122..9217cffa6a 100644
--- a/main/wizards/com/sun/star/wizards/ui/FieldSelection.java
+++ b/main/wizards/com/sun/star/wizards/ui/FieldSelection.java
@@ -622,17 +622,17 @@ public class FieldSelection
int MaxOriginalCount = AllFieldNames.length;
// int MaxSelected = OldSelFieldItems.length;
String[] SelList = xFieldsListBox.getItems();
- Vector<String> NewSourceVector = new Vector<String>();
+ ArrayList<String> NewSourceVector = new ArrayList<>();
for (int i = 0; i < MaxOriginalCount; i++)
{
SearchString = AllFieldNames[i];
if (JavaTools.FieldInList(SelList, SearchString) != -1)
{
- NewSourceVector.addElement(SearchString);
+ NewSourceVector.add(SearchString);
}
else if (JavaTools.FieldInList(OldSelFieldItems, SearchString) != -1)
{
- NewSourceVector.addElement(SearchString);
+ NewSourceVector.add(SearchString);
}
}
xFieldsListBox.removeItems((short) 0, xFieldsListBox.getItemCount());
diff --git a/main/xmerge/java/xmerge/src/main/java/org/openoffice/xmerge/util/OfficeUtil.java b/main/xmerge/java/xmerge/src/main/java/org/openoffice/xmerge/util/OfficeUtil.java
index 5536ae79bb..eaa86ff065 100644
--- a/main/xmerge/java/xmerge/src/main/java/org/openoffice/xmerge/util/OfficeUtil.java
+++ b/main/xmerge/java/xmerge/src/main/java/org/openoffice/xmerge/util/OfficeUtil.java
@@ -30,7 +30,7 @@ import org.w3c.dom.Text;
import org.openoffice.xmerge.converter.xml.OfficeConstants;
-import java.util.Vector;
+import java.util.ArrayList;
/**
@@ -51,7 +51,7 @@ public class OfficeUtil implements OfficeConstants {
* representing the text.
*/
public static Node[] parseText(String text, Document parentDoc) {
- Vector nodeVec = new Vector();
+ ArrayList<Node> nodeVec = new ArrayList<>();
/*
* Break up the text from the text run into Open
@@ -85,7 +85,7 @@ public class OfficeUtil implements OfficeConstants {
if (closerIndex > 0) {
String beginningText = text.substring(0, closerIndex);
Text textNode = parentDoc.createTextNode(beginningText);
- nodeVec.addElement(textNode);
+ nodeVec.add(textNode);
}
text = text.substring(closerIndex);
@@ -122,10 +122,6 @@ public class OfficeUtil implements OfficeConstants {
nodeVec.add(textNode);
}
- // Now create and populate an array to return the nodes in.
- Node nodes[] = new Node[nodeVec.size()];
- for (int i = 0; i < nodeVec.size(); i++)
- nodes[i] = (Node)nodeVec.elementAt(i);
- return nodes;
+ return nodeVec.toArray(new Node[nodeVec.size()]);
}
}
(openoffice) 10/19: Use a simpler way to format a date, which doesn't require explicitly creating a java.lang.StringBuffer in the process.
Posted by ji...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jimjag pushed a commit to branch AOO50X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit b926b1a8649ed1843d1a8aee5be515bcd7c23654
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Sat Oct 3 15:03:01 2026 +0200
Use a simpler way to format a date, which doesn't require explicitly
creating a java.lang.StringBuffer in the process.
Patch by: me
(cherry picked from commit 8e5757ffd1295c38c89defc0bfc9dba34a72fa7e)
---
.../java/OOoRunner/src/main/java/convwatch/DateHelper.java | 7 +++----
.../java/OOoRunner/src/main/java/graphical/DateHelper.java | 7 +++----
.../star/wizards/reportbuilder/layout/ReportBuilderLayouter.java | 7 +++----
3 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/convwatch/DateHelper.java b/main/qadevOOo/java/OOoRunner/src/main/java/convwatch/DateHelper.java
index a4d0f538b7..3f548517ea 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/convwatch/DateHelper.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/convwatch/DateHelper.java
@@ -43,12 +43,11 @@ public class DateHelper
public static String getDateString(String _sFormat)
{
GregorianCalendar aCalendar = new GregorianCalendar();
- StringBuffer aBuf = new StringBuffer();
Locale aLocale = new Locale("en","US");
SimpleDateFormat aFormat = new SimpleDateFormat(_sFormat, aLocale);
- aBuf = aFormat.format(aCalendar.getTime(), aBuf, new FieldPosition(0) );
- // DebugHelper.writeInfo("Date: " + aBuf.toString());
- return aBuf.toString();
+ String aBuf = aFormat.format(aCalendar.getTime());
+ // DebugHelper.writeInfo("Date: " + aBuf);
+ return aBuf;
}
}
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/graphical/DateHelper.java b/main/qadevOOo/java/OOoRunner/src/main/java/graphical/DateHelper.java
index 5909fc2091..4e426f45dd 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/graphical/DateHelper.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/graphical/DateHelper.java
@@ -43,12 +43,11 @@ public class DateHelper
public static String getDateString(String _sFormat)
{
GregorianCalendar aCalendar = new GregorianCalendar();
- StringBuffer aBuf = new StringBuffer();
Locale aLocale = new Locale("en","US");
SimpleDateFormat aFormat = new SimpleDateFormat(_sFormat, aLocale);
- aBuf = aFormat.format(aCalendar.getTime(), aBuf, new FieldPosition(0) );
- // DebugHelper.writeInfo("Date: " + aBuf.toString());
- return aBuf.toString();
+ String aBuf = aFormat.format(aCalendar.getTime());
+ // DebugHelper.writeInfo("Date: " + aBuf);
+ return aBuf;
}
}
diff --git a/main/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java b/main/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java
index 55c7a75142..fe497a6203 100644
--- a/main/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java
+++ b/main/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java
@@ -1030,13 +1030,12 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter
// protected static String getDateString(String _sFormat)
// {
// GregorianCalendar aCalendar = new GregorianCalendar();
-// StringBuffer aBuf = new StringBuffer();
//
// Locale aLocale = new Locale("en","US");
// SimpleDateFormat aFormat = new SimpleDateFormat(_sFormat, aLocale);
-// aBuf = aFormat.format(aCalendar.getTime(), aBuf, new FieldPosition(0) );
-// // DebugHelper.writeInfo("Date: " + aBuf.toString());
-// return aBuf.toString();
+// String aBuf = aFormat.format(aCalendar.getTime());
+// // DebugHelper.writeInfo("Date: " + aBuf);
+// return aBuf;
// }
// protected String getCurrentDate()
// {
(openoffice) 09/19: Don't specify the MediaWiki extension Java sourcelevel, isn't not used anywhere else, and we now need at least Java 8 (see 00a90ea2c35aa0d62b41963f97bc10041530f5d1).
Posted by ji...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jimjag pushed a commit to branch AOO50X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 514fb97c38b2900e0ac0787b811f7399dad2a1a4
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Sat Oct 3 15:03:23 2026 +0200
Don't specify the MediaWiki extension Java sourcelevel, isn't not used
anywhere else, and we now need at least Java 8
(see 00a90ea2c35aa0d62b41963f97bc10041530f5d1).
Patch by: me
(cherry picked from commit 8a6d05c5839d3bb0755d29b6ff1d93273263d245)
---
main/swext/mediawiki/build.xml | 1 -
1 file changed, 1 deletion(-)
diff --git a/main/swext/mediawiki/build.xml b/main/swext/mediawiki/build.xml
index eaef706633..bd7e5783d6 100644
--- a/main/swext/mediawiki/build.xml
+++ b/main/swext/mediawiki/build.xml
@@ -47,7 +47,6 @@
<property name="officeclasses" value="${solar.jar}"/>
<!-- build options -->
- <property name="sourcelevel" value="1.4"/>
<property name="verbose" value="false"/>
<property name="debug" value="${antdebug}"/>
(openoffice) 06/19: Lokalized Dutch
Posted by ji...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jimjag pushed a commit to branch AOO50X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit ee4b196a5e014d90c2fe26941ec59abd4cca8ba6
Author: DiGro <di...@yahoo.co.uk>
AuthorDate: Wed Sep 30 15:06:52 2026 +0200
Lokalized Dutch
(cherry picked from commit ed176da5921a87e7d65cdf59c270bb3356b2e30e)
---
main/default_images/res/helpimg/nl/feldalle.png | Bin 346 -> 1543 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/main/default_images/res/helpimg/nl/feldalle.png b/main/default_images/res/helpimg/nl/feldalle.png
index b263addb4d..c922d05d32 100644
Binary files a/main/default_images/res/helpimg/nl/feldalle.png and b/main/default_images/res/helpimg/nl/feldalle.png differ