[Libreoffice-commits] core.git: 7 commits - bean/com bean/qa bridges/source cli_ure/qa connectivity/com connectivity/qa dbaccess/qa filter/qa forms/qa framework/qa nlpsolver/src nlpsolver/ThirdParty odk/examples qadevOOo/runner reportbuilder/java reportdesign/qa sc/qa scripting/java scripting/workben sfx2/qa svl/qa swext/mediawiki sw/qa toolkit/qa ucb/qa vcl/qa wizards/com xmerge/source
Noel Grandin
noel at peralex.com
Tue Aug 12 23:50:39 PDT 2014
bean/com/sun/star/beans/JavaWindowPeerFake.java | 4
bean/com/sun/star/beans/LocalOfficeWindow.java | 12 -
bean/com/sun/star/comp/beans/JavaWindowPeerFake.java | 4
bean/com/sun/star/comp/beans/LocalOfficeConnection.java | 12 -
bean/com/sun/star/comp/beans/LocalOfficeWindow.java | 2
bean/com/sun/star/comp/beans/OOoBean.java | 14 -
bean/qa/complex/bean/ScreenComparer.java | 12 -
bean/qa/complex/bean/WriterFrame.java | 2
bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_proxy.java | 18 -
cli_ure/qa/climaker/ClimakerTestCase.java | 2
connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeStorageAccess.java | 2
connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java | 6
connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeInputStream.java | 2
connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeOutputStream.java | 6
connectivity/qa/connectivity/tools/AbstractDatabase.java | 4
connectivity/qa/connectivity/tools/FlatFileDatabase.java | 4
connectivity/qa/connectivity/tools/QueryDefinition.java | 2
dbaccess/qa/complex/dbaccess/CopyTableWizard.java | 6
dbaccess/qa/complex/dbaccess/DatabaseDocument.java | 6
dbaccess/qa/complex/dbaccess/RowSet.java | 10 -
dbaccess/qa/complex/dbaccess/RowSetEventListener.java | 4
filter/qa/complex/filter/detection/typeDetection/Helper.java | 20 +-
forms/qa/complex/forms/CheckOGroupBoxModel.java | 6
forms/qa/integration/forms/DocumentHelper.java | 6
forms/qa/integration/forms/DocumentViewHelper.java | 4
forms/qa/integration/forms/FormComponent.java | 2
forms/qa/org/openoffice/xforms/Instance.java | 4
framework/qa/complex/framework/autosave/AutoSave.java | 8
framework/qa/complex/framework/autosave/Protocol.java | 28 +-
framework/qa/complex/framework/recovery/CrashThread.java | 4
framework/qa/complex/framework/recovery/RecoveryTools.java | 2
framework/qa/complex/imageManager/CheckImageManager.java | 2
framework/qa/complex/imageManager/_XComponent.java | 22 +-
framework/qa/complex/imageManager/_XImageManager.java | 10 -
framework/qa/complex/imageManager/_XInitialization.java | 4
framework/qa/complex/imageManager/_XTypeProvider.java | 8
framework/qa/complex/imageManager/_XUIConfiguration.java | 6
framework/qa/complex/imageManager/_XUIConfigurationPersistence.java | 4
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/DEPSAgent.java | 20 +-
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/DEGTBehavior.java | 6
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/PSGTBehavior.java | 6
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/encode/EvalStruct.java | 2
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/BasicTag.java | 44 ++--
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalString.java | 16 -
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/RandomGenerator.java | 2
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/goodness/ACRComparator.java | 2
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/goodness/BCHComparator.java | 2
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/knowledge/Library.java | 2
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/problem/ProblemEncoder.java | 8
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/sco/SCAgent.java | 14 -
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/space/DesignSpace.java | 2
nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/BaseEvolutionarySolver.java | 36 +--
nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/BaseNLPSolver.java | 48 ++---
nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/PropertyInfo.java | 2
nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/BaseDialog.java | 4
nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/ModalState.java | 3
nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/controls/BaseControl.java | 6
nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/controls/LabeledControl.java | 4
nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/controls/TextAlign.java | 44 ----
odk/examples/DevelopersGuide/Charts/Helper.java | 2
odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java | 8
odk/examples/DevelopersGuide/Config/ConfigExamples.java | 12 -
odk/examples/DevelopersGuide/Database/RowSet.java | 8
odk/examples/DevelopersGuide/Database/Sales.java | 4
odk/examples/DevelopersGuide/Forms/ControlLock.java | 2
odk/examples/DevelopersGuide/Forms/DocumentBasedExample.java | 4
odk/examples/DevelopersGuide/Forms/DocumentHelper.java | 8
odk/examples/DevelopersGuide/Forms/DocumentViewHelper.java | 6
odk/examples/DevelopersGuide/Forms/FLTools.java | 4
odk/examples/DevelopersGuide/Forms/HsqlDatabase.java | 14 -
odk/examples/DevelopersGuide/Forms/KeyGenerator.java | 8
odk/examples/DevelopersGuide/Forms/SalesFilter.java | 22 +-
odk/examples/DevelopersGuide/GUI/RoadmapItemStateChangeListener.java | 2
odk/examples/DevelopersGuide/GUI/UnoDialogSample.java | 50 ++---
odk/examples/DevelopersGuide/GUI/UnoMenu.java | 4
odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/CustomizeView.java | 10 -
odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/DocumentView.java | 4
odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Interceptor.java | 4
odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/JavaWindowPeerFake.java | 2
odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/OnewayExecutor.java | 10 -
odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusListener.java | 2
odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/ViewContainer.java | 2
odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/AsciiReplaceFilter.java | 2
odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/FilterOptions.java | 4
odk/examples/DevelopersGuide/OfficeDev/Linguistic/LinguisticExamples.java | 2
odk/examples/DevelopersGuide/OfficeDev/Linguistic/OneInstanceFactory.java | 8
odk/examples/DevelopersGuide/OfficeDev/Linguistic/PropChgHelper.java | 10 -
odk/examples/DevelopersGuide/OfficeDev/Linguistic/XHyphenatedWord_impl.java | 12 -
odk/examples/DevelopersGuide/OfficeDev/Linguistic/XMeaning_impl.java | 4
odk/examples/DevelopersGuide/OfficeDev/Linguistic/XPossibleHyphens_impl.java | 8
odk/examples/DevelopersGuide/OfficeDev/Linguistic/XSpellAlternatives_impl.java | 8
odk/examples/DevelopersGuide/ScriptingFramework/ScriptSelector/ScriptSelector/ScriptSelector.java | 2
odk/examples/DevelopersGuide/Spreadsheet/ExampleAddIn.java | 2
odk/examples/DevelopersGuide/Spreadsheet/ExampleDataPilotSource.java | 2
odk/examples/DevelopersGuide/UCB/DataStreamRetriever.java | 6
odk/examples/DevelopersGuide/UCB/Helper.java | 2
odk/examples/DevelopersGuide/UCB/MyActiveDataSink.java | 2
odk/examples/java/EmbedDocument/EmbeddedObject/EditorFrame.java | 8
odk/examples/java/EmbedDocument/EmbeddedObject/OwnEmbeddedObject.java | 50 ++---
odk/examples/java/Inspector/HideableMutableTreeNode.java | 2
odk/examples/java/Inspector/HideableTreeModel.java | 20 +-
odk/examples/java/Inspector/Inspector.java | 10 -
odk/examples/java/Inspector/InspectorAddon.java | 12 -
odk/examples/java/Inspector/InspectorPane.java | 4
odk/examples/java/Inspector/Introspector.java | 12 -
odk/examples/java/Inspector/MethodParametersDialog.java | 2
odk/examples/java/Inspector/ProtocolHandlerAddon.java | 6
odk/examples/java/Inspector/SourceCodeGenerator.java | 58 +++---
odk/examples/java/Inspector/SwingDialogProvider.java | 8
odk/examples/java/Inspector/SwingTreePathProvider.java | 2
odk/examples/java/Inspector/SwingUnoFacetteNode.java | 2
odk/examples/java/Inspector/TDocSupplier.java | 4
odk/examples/java/Inspector/UnoMethodNode.java | 10 -
odk/examples/java/Inspector/UnoNode.java | 6
odk/examples/java/Inspector/UnoPropertyNode.java | 12 -
odk/examples/java/Inspector/XTreeControlProvider.java | 2
odk/examples/java/Inspector/XUnoPropertyNode.java | 2
odk/examples/java/MinimalComponent/MinimalComponent.java | 4
odk/examples/java/Spreadsheet/CalcAddins.java | 2
odk/examples/java/ToDo/ToDo.java | 26 +-
qadevOOo/runner/complexlib/Assurance.java | 6
qadevOOo/runner/complexlib/ComplexTestCase.java | 7
qadevOOo/runner/convwatch/BorderRemover.java | 16 -
qadevOOo/runner/convwatch/ConvWatch.java | 9
qadevOOo/runner/convwatch/DB.java | 2
qadevOOo/runner/convwatch/DBHelper.java | 6
qadevOOo/runner/convwatch/DirectoryHelper.java | 8
qadevOOo/runner/convwatch/EnhancedComplexTestCase.java | 4
qadevOOo/runner/convwatch/FileHelper.java | 4
qadevOOo/runner/convwatch/FilenameHelper.java | 20 +-
qadevOOo/runner/convwatch/GraphicalTestArguments.java | 56 ++---
qadevOOo/runner/convwatch/HTMLOutputter.java | 16 -
qadevOOo/runner/convwatch/INIOutputter.java | 11 -
qadevOOo/runner/convwatch/ImageHelper.java | 13 -
qadevOOo/runner/convwatch/IniFile.java | 26 +-
qadevOOo/runner/convwatch/LISTOutputter.java | 6
qadevOOo/runner/convwatch/MSOfficePrint.java | 22 +-
qadevOOo/runner/convwatch/OfficePrint.java | 24 +-
qadevOOo/runner/convwatch/PRNCompare.java | 42 ++--
qadevOOo/runner/convwatch/PerformanceContainer.java | 4
qadevOOo/runner/convwatch/PixelCounter.java | 8
qadevOOo/runner/convwatch/ReferenceBuilder.java | 4
qadevOOo/runner/convwatch/StatusHelper.java | 2
qadevOOo/runner/convwatch/TriState.java | 6
qadevOOo/runner/graphical/DateHelper.java | 2
qadevOOo/runner/graphical/DirectoryHelper.java | 8
qadevOOo/runner/graphical/FileHelper.java | 6
qadevOOo/runner/graphical/ImageHelper.java | 11 -
qadevOOo/runner/graphical/IniFile.java | 4
qadevOOo/runner/graphical/JPEGCreator.java | 6
qadevOOo/runner/graphical/MSOfficePostscriptCreator.java | 18 -
qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java | 10 -
qadevOOo/runner/graphical/ParameterHelper.java | 8
qadevOOo/runner/graphical/PerformanceContainer.java | 4
qadevOOo/runner/graphical/PixelCounter.java | 6
qadevOOo/runner/graphical/PropertyName.java | 10 -
qadevOOo/runner/helper/APIDescGetter.java | 22 +-
qadevOOo/runner/helper/CfgParser.java | 8
qadevOOo/runner/helper/ClParser.java | 4
qadevOOo/runner/helper/ConfigHelper.java | 6
qadevOOo/runner/helper/ConfigurationRead.java | 4
qadevOOo/runner/helper/LoggingThread.java | 8
qadevOOo/runner/helper/OfficeProvider.java | 10 -
qadevOOo/runner/helper/OfficeWatcher.java | 4
qadevOOo/runner/helper/ProcessHandler.java | 18 -
qadevOOo/runner/helper/StreamSimulator.java | 39 ----
qadevOOo/runner/helper/StringHelper.java | 4
qadevOOo/runner/helper/URLHelper.java | 2
qadevOOo/runner/helper/WindowListener.java | 20 --
qadevOOo/runner/lib/Parameters.java | 10 -
qadevOOo/runner/lib/SimpleStatus.java | 9
qadevOOo/runner/lib/StatusException.java | 2
qadevOOo/runner/org/openoffice/Runner.java | 4
qadevOOo/runner/stats/DataBaseOutProducer.java | 12 -
qadevOOo/runner/stats/InternalLogWriter.java | 4
qadevOOo/runner/stats/OutProducerFactory.java | 4
qadevOOo/runner/stats/SQLExecution.java | 16 -
qadevOOo/runner/stats/SimpleLogWriter.java | 6
qadevOOo/runner/util/AccessibilityTools.java | 6
qadevOOo/runner/util/BookmarkDsc.java | 4
qadevOOo/runner/util/CalcTools.java | 2
qadevOOo/runner/util/DBTools.java | 26 +-
qadevOOo/runner/util/DefaultDsc.java | 4
qadevOOo/runner/util/DesktopTools.java | 4
qadevOOo/runner/util/DrawTools.java | 2
qadevOOo/runner/util/DynamicClassLoader.java | 2
qadevOOo/runner/util/FootnoteDsc.java | 4
qadevOOo/runner/util/FormTools.java | 2
qadevOOo/runner/util/FrameDsc.java | 4
qadevOOo/runner/util/InstCreator.java | 10 -
qadevOOo/runner/util/ParagraphDsc.java | 4
qadevOOo/runner/util/PropertyName.java | 5
qadevOOo/runner/util/ReferenceMarkDsc.java | 4
qadevOOo/runner/util/RegistryTools.java | 6
qadevOOo/runner/util/SOfficeFactory.java | 4
qadevOOo/runner/util/ShapeDsc.java | 6
qadevOOo/runner/util/SysUtils.java | 2
qadevOOo/runner/util/TableDsc.java | 4
qadevOOo/runner/util/TextSectionDsc.java | 4
qadevOOo/runner/util/UITools.java | 2
qadevOOo/runner/util/ValueComparer.java | 16 -
qadevOOo/runner/util/WaitUnreachable.java | 2
qadevOOo/runner/util/WriterTools.java | 2
qadevOOo/runner/util/XLayerHandlerImpl.java | 4
qadevOOo/runner/util/XLayerImpl.java | 2
qadevOOo/runner/util/XMLTools.java | 56 ++---
qadevOOo/runner/util/XSchemaHandlerImpl.java | 4
qadevOOo/runner/util/compare/GraphicalComparator.java | 6
qadevOOo/runner/util/dbg.java | 10 -
qadevOOo/runner/util/utils.java | 6
reportbuilder/java/org/libreoffice/report/OfficeToken.java | 2
reportbuilder/java/org/libreoffice/report/ReportEngineParameterNames.java | 2
reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java | 6
reportbuilder/java/org/libreoffice/report/StorageRepository.java | 4
reportbuilder/java/org/libreoffice/report/pentaho/DefaultNameGenerator.java | 2
reportbuilder/java/org/libreoffice/report/pentaho/OfficeNamespaces.java | 5
reportbuilder/java/org/libreoffice/report/pentaho/PentahoReportJob.java | 2
reportbuilder/java/org/libreoffice/report/pentaho/SOFormulaOpCodeMapper.java | 2
reportbuilder/java/org/libreoffice/report/pentaho/SOReportJobFactory.java | 4
reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/VariablesCollection.java | 2
reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeGroupInstanceSection.java | 2
reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeStyles.java | 4
reportbuilder/java/org/libreoffice/report/pentaho/output/ImageProducer.java | 2
reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java | 20 +-
reportbuilder/java/org/libreoffice/report/pentaho/output/StylesWriter.java | 4
reportbuilder/java/org/libreoffice/report/pentaho/output/chart/ChartRawReportTarget.java | 2
reportbuilder/java/org/libreoffice/report/pentaho/output/spreadsheet/SpreadsheetRawReportProcessor.java | 2
reportbuilder/java/org/libreoffice/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget.java | 2
reportbuilder/java/org/libreoffice/report/pentaho/output/text/PageContext.java | 2
reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/MasterDetailReadHandler.java | 2
reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/SubDocumentReadHandler.java | 2
reportbuilder/java/org/libreoffice/report/util/DefaultReportJobDefinition.java | 2
reportdesign/qa/complex/reportdesign/FileURL.java | 2
sc/qa/complex/dataPilot/_XDataPilotDescriptor.java | 15 -
sc/qa/complex/dataPilot/_XDataPilotTable.java | 10 -
sc/qa/complex/dataPilot/_XNamed.java | 2
sc/qa/complex/dataPilot/_XPropertySet.java | 18 -
scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java | 8
scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java | 20 --
scripting/java/com/sun/star/script/framework/browse/PkgProviderBrowseNode.java | 4
scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java | 21 --
scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java | 15 -
scripting/java/com/sun/star/script/framework/container/DeployedUnoPackagesDB.java | 2
scripting/java/com/sun/star/script/framework/container/Parcel.java | 6
scripting/java/com/sun/star/script/framework/container/ParcelContainer.java | 4
scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java | 10 -
scripting/java/com/sun/star/script/framework/container/ParsedScriptUri.java | 2
scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java | 4
scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java | 2
scripting/java/com/sun/star/script/framework/io/XInputStreamImpl.java | 2
scripting/java/com/sun/star/script/framework/io/XOutputStreamWrapper.java | 2
scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory.java | 2
scripting/java/com/sun/star/script/framework/provider/PathUtils.java | 3
scripting/java/com/sun/star/script/framework/provider/ScriptContext.java | 16 -
scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java | 6
scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java | 2
scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java | 2
scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java | 2
scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java | 6
scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java | 2
scripting/java/org/openoffice/idesupport/SVersionRCFile.java | 8
scripting/java/org/openoffice/idesupport/xml/Manifest.java | 2
scripting/java/org/openoffice/idesupport/zip/ParcelZipper.java | 4
scripting/workben/ifc/scripting/ScriptingUtils.java | 4
scripting/workben/installer/IdeVersion.java | 2
scripting/workben/installer/InstUtil.java | 10 -
scripting/workben/installer/NavPanel.java | 2
scripting/workben/installer/Version.java | 2
sfx2/qa/complex/sfx2/DocumentMetadataAccess.java | 6
sfx2/qa/complex/sfx2/DocumentProperties.java | 4
sfx2/qa/complex/sfx2/GlobalEventBroadcaster.java | 2
sfx2/qa/complex/sfx2/tools/DialogThread.java | 6
sfx2/qa/complex/sfx2/tools/WriterHelper.java | 4
svl/qa/complex/passwordcontainer/MasterPasswdHandler.java | 2
sw/qa/complex/writer/CheckBookmarks.java | 2
sw/qa/complex/writer/TextPortionEnumerationTest.java | 24 +-
swext/mediawiki/src/com/sun/star/wiki/Helper.java | 22 +-
swext/mediawiki/src/com/sun/star/wiki/Settings.java | 4
swext/mediawiki/src/com/sun/star/wiki/WikiArticle.java | 2
swext/mediawiki/src/com/sun/star/wiki/WikiDialog.java | 4
swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java | 4
swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java | 9
swext/mediawiki/src/com/sun/star/wiki/WikiOptionsEventHandlerImpl.java | 4
swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java | 6
swext/mediawiki/src/com/sun/star/wiki/WikiProtocolSocketFactory.java | 2
toolkit/qa/complex/toolkit/Assert.java | 2
toolkit/qa/complex/toolkit/accessibility/_XAccessibleComponent.java | 2
toolkit/qa/complex/toolkit/accessibility/_XAccessibleContext.java | 2
toolkit/qa/complex/toolkit/accessibility/_XAccessibleEventBroadcaster.java | 16 -
toolkit/qa/complex/toolkit/accessibility/_XAccessibleExtendedComponent.java | 2
toolkit/qa/complex/toolkit/accessibility/_XAccessibleText.java | 10 -
ucb/qa/complex/tdoc/_XChild.java | 4
ucb/qa/complex/tdoc/_XCommandInfoChangeNotifier.java | 2
ucb/qa/complex/tdoc/_XCommandProcessor.java | 4
ucb/qa/complex/tdoc/_XComponent.java | 16 -
ucb/qa/complex/tdoc/_XContent.java | 2
ucb/qa/complex/tdoc/_XPropertiesChangeNotifier.java | 6
ucb/qa/complex/tdoc/_XPropertyContainer.java | 2
ucb/qa/complex/tdoc/_XPropertySetInfoChangeNotifier.java | 6
ucb/qa/complex/tdoc/_XServiceInfo.java | 4
ucb/qa/complex/tdoc/_XTypeProvider.java | 4
vcl/qa/complex/persistent_window_states/DocumentHandle.java | 14 -
wizards/com/sun/star/wizards/common/Configuration.java | 6
wizards/com/sun/star/wizards/common/Desktop.java | 18 -
wizards/com/sun/star/wizards/common/FileAccess.java | 16 -
wizards/com/sun/star/wizards/common/Helper.java | 8
wizards/com/sun/star/wizards/common/JavaTools.java | 6
wizards/com/sun/star/wizards/common/NumberFormatter.java | 24 +-
wizards/com/sun/star/wizards/common/NumericalHelper.java | 32 +--
wizards/com/sun/star/wizards/common/ParaStyled.java | 4
wizards/com/sun/star/wizards/common/PlaceholderTextElement.java | 10 -
wizards/com/sun/star/wizards/common/Properties.java | 4
wizards/com/sun/star/wizards/common/PropertyNames.java | 2
wizards/com/sun/star/wizards/common/PropertySetHelper.java | 6
wizards/com/sun/star/wizards/common/Resource.java | 8
wizards/com/sun/star/wizards/common/SystemDialog.java | 32 +--
wizards/com/sun/star/wizards/common/UCB.java | 2
wizards/com/sun/star/wizards/db/ColumnPropertySet.java | 2
wizards/com/sun/star/wizards/db/CommandMetaData.java | 12 -
wizards/com/sun/star/wizards/db/CommandName.java | 27 +-
wizards/com/sun/star/wizards/db/DBMetaData.java | 21 +-
wizards/com/sun/star/wizards/db/FieldColumn.java | 2
wizards/com/sun/star/wizards/db/QueryMetaData.java | 4
wizards/com/sun/star/wizards/db/RecordParser.java | 20 +-
wizards/com/sun/star/wizards/db/SQLQueryComposer.java | 28 +-
wizards/com/sun/star/wizards/db/TableDescriptor.java | 24 +-
wizards/com/sun/star/wizards/db/TypeInspector.java | 11 -
wizards/com/sun/star/wizards/document/Control.java | 28 +-
wizards/com/sun/star/wizards/document/DatabaseControl.java | 4
wizards/com/sun/star/wizards/document/FormHandler.java | 42 ++--
wizards/com/sun/star/wizards/document/GridControl.java | 6
wizards/com/sun/star/wizards/document/OfficeDocument.java | 2
wizards/com/sun/star/wizards/document/Shape.java | 4
wizards/com/sun/star/wizards/document/TimeStampControl.java | 20 +-
wizards/com/sun/star/wizards/form/CallFormWizard.java | 2
wizards/com/sun/star/wizards/form/FieldLinker.java | 2
wizards/com/sun/star/wizards/form/Finalizer.java | 12 -
wizards/com/sun/star/wizards/form/FormConfiguration.java | 36 +--
wizards/com/sun/star/wizards/form/FormDocument.java | 22 +-
wizards/com/sun/star/wizards/form/FormWizard.java | 8
wizards/com/sun/star/wizards/form/StyleApplier.java | 2
wizards/com/sun/star/wizards/query/CallQueryWizard.java | 8
wizards/com/sun/star/wizards/query/QuerySummary.java | 16 -
wizards/com/sun/star/wizards/query/QueryWizard.java | 12 -
wizards/com/sun/star/wizards/report/CallReportWizard.java | 4
wizards/com/sun/star/wizards/report/DBColumn.java | 36 +--
wizards/com/sun/star/wizards/report/Dataimport.java | 19 --
wizards/com/sun/star/wizards/report/GroupFieldHandler.java | 4
wizards/com/sun/star/wizards/report/RecordTable.java | 8
wizards/com/sun/star/wizards/report/ReportFinalizer.java | 23 +-
wizards/com/sun/star/wizards/report/ReportLayouter.java | 32 +--
wizards/com/sun/star/wizards/report/ReportTextDocument.java | 23 +-
wizards/com/sun/star/wizards/report/ReportTextImplementation.java | 20 --
wizards/com/sun/star/wizards/report/ReportWizard.java | 14 -
wizards/com/sun/star/wizards/reportbuilder/layout/DesignTemplate.java | 6
wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java | 80 ++++----
wizards/com/sun/star/wizards/reportbuilder/layout/SectionLabel.java | 2
wizards/com/sun/star/wizards/reportbuilder/layout/SectionObject.java | 2
wizards/com/sun/star/wizards/reportbuilder/layout/SectionTextField.java | 2
wizards/com/sun/star/wizards/table/CGCategory.java | 10 -
wizards/com/sun/star/wizards/table/CGTable.java | 8
wizards/com/sun/star/wizards/table/CallTableWizard.java | 10 -
wizards/com/sun/star/wizards/table/FieldFormatter.java | 38 ++--
wizards/com/sun/star/wizards/table/Finalizer.java | 26 +-
wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java | 2
wizards/com/sun/star/wizards/table/ScenarioSelector.java | 6
wizards/com/sun/star/wizards/table/TableWizard.java | 36 +--
wizards/com/sun/star/wizards/text/TextDocument.java | 32 +--
wizards/com/sun/star/wizards/text/TextFieldHandler.java | 6
wizards/com/sun/star/wizards/text/TextSectionHandler.java | 6
wizards/com/sun/star/wizards/text/TextTableHandler.java | 10 -
wizards/com/sun/star/wizards/ui/AggregateComponent.java | 74 +++----
wizards/com/sun/star/wizards/ui/ButtonList.java | 10 -
wizards/com/sun/star/wizards/ui/CommandFieldSelection.java | 8
wizards/com/sun/star/wizards/ui/ControlScroller.java | 54 ++---
wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java | 18 -
wizards/com/sun/star/wizards/ui/FieldSelection.java | 16 -
wizards/com/sun/star/wizards/ui/FilterComponent.java | 94 ++++------
wizards/com/sun/star/wizards/ui/ImageList.java | 10 -
wizards/com/sun/star/wizards/ui/PathSelection.java | 4
wizards/com/sun/star/wizards/ui/PeerConfig.java | 36 +--
wizards/com/sun/star/wizards/ui/SortingComponent.java | 39 ++--
wizards/com/sun/star/wizards/ui/TitlesComponent.java | 24 +-
wizards/com/sun/star/wizards/ui/UnoDialog.java | 26 +-
wizards/com/sun/star/wizards/ui/UnoDialog2.java | 22 +-
wizards/com/sun/star/wizards/ui/WizardDialog.java | 27 +-
wizards/com/sun/star/wizards/ui/event/AbstractListener.java | 2
wizards/com/sun/star/wizards/ui/event/DataAware.java | 18 -
wizards/com/sun/star/wizards/ui/event/EventNames.java | 2
wizards/com/sun/star/wizards/ui/event/ListModelBinder.java | 2
wizards/com/sun/star/wizards/ui/event/MethodInvocation.java | 8
wizards/com/sun/star/wizards/ui/event/Task.java | 12 -
wizards/com/sun/star/wizards/ui/event/UnoDataAware.java | 16 -
xmerge/source/bridge/java/XMergeBridge.java | 8
xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java | 2
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java | 4
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDB.java | 5
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbHeader.java | 12 -
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedBinaryObject.java | 2
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedXMLObject.java | 6
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeConstants.java | 33 +--
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocumentException.java | 2
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java | 29 +--
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java | 19 --
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/BookSettings.java | 4
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/CellStyle.java | 2
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnRowInfo.java | 2
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnStyle.java | 2
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/Format.java | 8
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/NameDefinition.java | 2
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/RowStyle.java | 2
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SheetSettings.java | 6
xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/NodeIterator.java | 2
xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/DocumentMerge.java | 6
xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java | 3
xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java | 8
416 files changed, 1961 insertions(+), 2183 deletions(-)
New commits:
commit cc6bd1254296b8dccbf4af2e1138e640d11df2c4
Author: Noel Grandin <noel at peralex.com>
Date: Fri Aug 8 13:27:58 2014 +0200
java: remove unused enum values
found by UCDetector
Change-Id: Ic07be7e34204b5d838a722e1ce6038506a771144
diff --git a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/ModalState.java b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/ModalState.java
index 9407ab2..3f2fd19 100644
--- a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/ModalState.java
+++ b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/ModalState.java
@@ -34,6 +34,5 @@ package com.sun.star.comp.Calc.NLPSolver.dialogs;
* user pressed the OK button.
*/
public enum ModalState {
- Exit,
- OK
+ Exit
}
diff --git a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/controls/LabeledControl.java b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/controls/LabeledControl.java
index 2852f27..ba39aa8 100644
--- a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/controls/LabeledControl.java
+++ b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/controls/LabeledControl.java
@@ -39,10 +39,6 @@ public abstract class LabeledControl extends BaseControl {
setProperty("Label", label);
}
- public void setAlign(TextAlign align) {
- setProperty("Align", new Short(align.getUnoValue()));
- }
-
public void setMultiLine(boolean multiLine) {
setProperty("MultiLine", new Boolean(multiLine));
}
diff --git a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/controls/TextAlign.java b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/controls/TextAlign.java
deleted file mode 100644
index 54ec52f..0000000
--- a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/controls/TextAlign.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2009 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-package com.sun.star.comp.Calc.NLPSolver.dialogs.controls;
-
-public enum TextAlign {
- Left(0),
- Center(1),
- Right(2);
-
- private short unoValue;
-
- private TextAlign(int unoValue) {
- this.unoValue = (short)unoValue;
- }
-
- public short getUnoValue() {
- return unoValue;
- }
-}
commit 8583da1e934a49791ef8d86668f3d5c3c5dae1d7
Author: Noel Grandin <noel at peralex.com>
Date: Tue Aug 12 16:27:18 2014 +0200
java: remove unused fields
found by UCDetector
Change-Id: I4a7c56a9918054c23469de5680658e7b501f0165
diff --git a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
index 2717a35..acfe2d3 100644
--- a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
+++ b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
@@ -46,7 +46,7 @@ public class LocalOfficeConnection
implements OfficeConnection
{
private static final String OFFICE_APP_NAME = "soffice";
- public static final String OFFICE_LIB_NAME = "officebean";
+
private static final String OFFICE_ID_SUFFIX = "_Office";
private Process mProcess;
diff --git a/framework/qa/complex/framework/autosave/Protocol.java b/framework/qa/complex/framework/autosave/Protocol.java
index 528a4a2..c22372d 100644
--- a/framework/qa/complex/framework/autosave/Protocol.java
+++ b/framework/qa/complex/framework/autosave/Protocol.java
@@ -72,16 +72,16 @@ public class Protocol extends JComponent
private static final int TYPE_LINK = 1024;
public static final int FILTER_NONE = 0;
- public static final int FILTER_OK = TYPE_OK;
- public static final int FILTER_ERROR = TYPE_ERROR;
- public static final int FILTER_WARNING = TYPE_WARNING;
- public static final int FILTER_INFO = TYPE_INFO;
- public static final int FILTER_SCOPES = TYPE_SCOPE_OPEN | TYPE_SCOPE_CLOSE;
- public static final int FILTER_TESTMARK = TYPE_TESTMARK;
- public static final int FILTER_ERROR_INFO = TYPE_ERROR_INFO;
- public static final int FILTER_WARNING_INFO = TYPE_WARNING_INFO;
- public static final int FILTER_STATISTIC = TYPE_STATISTIC;
- public static final int FILTER_LINK = TYPE_LINK;
+
+
+
+
+
+
+
+
+
+
/**
diff --git a/framework/qa/complex/imageManager/_XImageManager.java b/framework/qa/complex/imageManager/_XImageManager.java
index 12a3da8..96ea2a3 100644
--- a/framework/qa/complex/imageManager/_XImageManager.java
+++ b/framework/qa/complex/imageManager/_XImageManager.java
@@ -28,14 +28,12 @@ import lib.TestParameters;
*/
public class _XImageManager {
- private TestParameters tEnv = null;
+
private String[]imageNames = null;
private XGraphic[] xGraphicArray = null;
private XImageManager oObj;
public _XImageManager( TestParameters tEnv, XImageManager oObj) {
-
- this.tEnv = tEnv;
this.oObj = oObj;
}
diff --git a/framework/qa/complex/imageManager/_XTypeProvider.java b/framework/qa/complex/imageManager/_XTypeProvider.java
index 1f45f9a..4af3a74 100644
--- a/framework/qa/complex/imageManager/_XTypeProvider.java
+++ b/framework/qa/complex/imageManager/_XTypeProvider.java
@@ -37,13 +37,11 @@ import lib.TestParameters;
public class _XTypeProvider {
- private TestParameters tEnv = null;
+
private static XTypeProvider oObj = null;
private static Type[] types = null;
public _XTypeProvider(TestParameters tEnv, XTypeProvider oObj) {
-
- this.tEnv = tEnv;
_XTypeProvider.oObj = oObj;
}
diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/BasicTag.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/BasicTag.java
index 8c21d8d..e1ba878 100644
--- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/BasicTag.java
+++ b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/BasicTag.java
@@ -12,29 +12,29 @@ package net.adaptivebox.global;
public class BasicTag {
- public static final String COMMAND_TAG = "%";
- public static final String TAB_TAG = "\t";
- public static final String LEFT_SMALL_BRACKET_TAG = "(";
- public static final String RIGHT_SMALL_BRACKET_TAG = ")";
- public static final String LEFT_LARGE_BRACKET_TAG = "{";
- public static final String RIGHT_LARGE_BRACKET_TAG = "}";
- public static final String LEFT_BRACKET_TAG = "[";
- public static final String RIGHT_BRACKET_TAG = "]";
- public static final String EQUAL_TAG = "=";
- public static final String SPACE_TAG = " ";
- public static final String SEMICOLON_TAG = ";";
- public static final String COLON_TAG = ":";
- public static final String COMMA_TAG = ",";
+
+
+
+
+
+
+
+
+
+
+
+
+
public static final String DOT_TAG = ".";
- public static final String NULL_SEPARATE_TAG = " \t";
- public static final String SEPARATE_TAG = "|";
- public static final String UNDERLINE_TAG = "_";
- public static final String INC_TAG = "+";
- public static final String DEC_TAG = "-";
- public static final String ZERO_TAG = "0";
- public static final String EXP_TAG = "E";
- public static final String S_EXP_TAG = "e";
+
+
+
+
+
+
+
+
public static final String FILE_SEP_TAG = System.getProperty("file.separator");
- public static final String RETURN_TAG = System.getProperty("line.separator");
+
}
diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalString.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalString.java
index b00ece9..78f08e5 100644
--- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalString.java
+++ b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalString.java
@@ -28,7 +28,7 @@ import java.util.*;
public class GlobalString {
private static final String NEGLECT_TAG = "#$@";
- public static final String EQUAL_TAG = "=";
+
/**
* Tokenize a String with given key.
diff --git a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/controls/BaseControl.java b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/controls/BaseControl.java
index a1de9d2..23ba098 100644
--- a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/controls/BaseControl.java
+++ b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/controls/BaseControl.java
@@ -47,7 +47,7 @@ public abstract class BaseControl {
private Object unoModel;
protected Object unoControl;
private XPropertySet properties;
- private BaseControl parentControl;
+
public abstract String getName();
@@ -79,7 +79,6 @@ public abstract class BaseControl {
XControlContainer controlContainer = UnoRuntime.queryInterface(XControlContainer.class, parentControl.unoControl);
unoControl = controlContainer.getControl(name);
- this.parentControl = parentControl;
} catch (IllegalArgumentException ex) {
Logger.getLogger(BaseControl.class.getName()).log(Level.SEVERE, null, ex);
} catch (ElementExistException ex) {
@@ -93,7 +92,6 @@ public abstract class BaseControl {
this.context = context;
unoModel = null;
unoControl = null;
- parentControl = null;
}
protected void setProperty(String name, Object value) {
diff --git a/odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java b/odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java
index 65c6b53..6c4bdf2 100644
--- a/odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java
+++ b/odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java
@@ -70,7 +70,7 @@ public class DialogComponent {
private static final String __serviceName= "com.sun.star.test.TestDialogHandler";
- static byte[] _implementationId;
+
private XComponentContext m_xCmpCtx;
private XFrame m_xFrame;
diff --git a/odk/examples/DevelopersGuide/GUI/UnoDialogSample.java b/odk/examples/DevelopersGuide/GUI/UnoDialogSample.java
index 345c70b..27df951 100644
--- a/odk/examples/DevelopersGuide/GUI/UnoDialogSample.java
+++ b/odk/examples/DevelopersGuide/GUI/UnoDialogSample.java
@@ -113,9 +113,9 @@ public class UnoDialogSample implements XTextListener, XSpinListener, XActionLis
// protected XNameAccess m_xDlgModelNameAccess;
protected XControl m_xDialogControl;
protected XDialog xDialog;
- private XReschedule mxReschedule;
+
protected XWindowPeer m_xWindowPeer = null;
- private XTopWindow m_xTopWindow = null;
+
protected XFrame m_xFrame = null;
protected XComponent m_xComponent = null;
@@ -254,7 +254,7 @@ public class UnoDialogSample implements XTextListener, XSpinListener, XActionLis
// The scope of the control container is public...
m_xDlgContainer = UnoRuntime.queryInterface(XControlContainer.class, oUnoDialog);
- m_xTopWindow = UnoRuntime.queryInterface(XTopWindow.class, m_xDlgContainer);
+ UnoRuntime.queryInterface(XTopWindow.class, m_xDlgContainer);
// link the dialog and its model...
XControlModel xControlModel = UnoRuntime.queryInterface(XControlModel.class, oDialogModel);
@@ -317,7 +317,7 @@ public class UnoDialogSample implements XTextListener, XSpinListener, XActionLis
xWindow.setVisible(false);
Object tk = m_xMCF.createInstanceWithContext("com.sun.star.awt.Toolkit", m_xContext);
XToolkit xToolkit = UnoRuntime.queryInterface(XToolkit.class, tk);
- mxReschedule = UnoRuntime.queryInterface(XReschedule.class, xToolkit);
+ UnoRuntime.queryInterface(XReschedule.class, xToolkit);
m_xDialogControl.createPeer(xToolkit, _xWindowParentPeer);
m_xWindowPeer = m_xDialogControl.getPeer();
return m_xWindowPeer;
diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/OnewayExecutor.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/OnewayExecutor.java
index af70c10..cc3b79c 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/OnewayExecutor.java
+++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/OnewayExecutor.java
@@ -58,13 +58,13 @@ class OnewayExecutor extends Thread
*/
public static final int REQUEST_FRAMEACTION = 1 ;
- public static final int REQUEST_STATUSCHANGED = 2 ;
- public static final int REQUEST_ADDSTATUSLISTENER = 3 ;
- public static final int REQUEST_REMOVESTATUSLISTENER = 4 ;
+
+
+
public static final int REQUEST_DISPATCH = 5 ;
- public static final boolean ENCODE_PARAMS = true ;
- public static final boolean DECODE_PARAMS = false ;
+
+
diff --git a/odk/examples/java/Inspector/SourceCodeGenerator.java b/odk/examples/java/Inspector/SourceCodeGenerator.java
index 165d917..edd7c7e 100644
--- a/odk/examples/java/Inspector/SourceCodeGenerator.java
+++ b/odk/examples/java/Inspector/SourceCodeGenerator.java
@@ -545,7 +545,7 @@ public class SourceCodeGenerator {
private class UnoObjectDefinition{
private Object m_oUnoObject = null;
- Type aType = null;
+
private String sVariableStemName = "";
private String m_sCentralVariableStemName = "";
private String sVariableName = "";
@@ -839,7 +839,7 @@ private class UnoObjectDefinition{
private class JavaCodeGenerator implements XLanguageSourceCodeGenerator{
- String sStatementsCode = "";
+
private boolean bAddAnyConverter = false;
private boolean bIsPropertyUnoObjectDefined = false;
@@ -1186,7 +1186,7 @@ private class UnoObjectDefinition{
private class BasicCodeGenerator implements XLanguageSourceCodeGenerator{
- String sStatementsCode = "";
+
public BasicCodeGenerator(){
}
@@ -1390,7 +1390,7 @@ private class UnoObjectDefinition{
}
private class CPlusPlusCodeGenerator implements XLanguageSourceCodeGenerator{
- String sStatementsCode = "";
+
private boolean bIncludeStringHeader = false;
private boolean bIncludeAny = false;
private boolean bIncludeSequenceHeader = false;
diff --git a/odk/examples/java/Inspector/UnoNode.java b/odk/examples/java/Inspector/UnoNode.java
index fa48a25..0439554 100644
--- a/odk/examples/java/Inspector/UnoNode.java
+++ b/odk/examples/java/Inspector/UnoNode.java
@@ -50,7 +50,7 @@ import com.sun.star.util.XURLTransformer;
public class UnoNode{
- String sPath = null;
+
Object m_oUnoObject;
private XMultiComponentFactory m_xMultiComponentFactory;
private XComponentContext m_xComponentContext;
diff --git a/odk/examples/java/Inspector/XTreeControlProvider.java b/odk/examples/java/Inspector/XTreeControlProvider.java
index ca40d70..ca67ac3 100644
--- a/odk/examples/java/Inspector/XTreeControlProvider.java
+++ b/odk/examples/java/Inspector/XTreeControlProvider.java
@@ -39,7 +39,7 @@ import com.sun.star.uno.Type;
public interface XTreeControlProvider {
- public static String sTitle = "User defined";
+
public String enableFilterElements(XUnoNode _oUnoNode);
diff --git a/odk/examples/java/Inspector/XUnoPropertyNode.java b/odk/examples/java/Inspector/XUnoPropertyNode.java
index e4aa4ca..96d1f2c 100644
--- a/odk/examples/java/Inspector/XUnoPropertyNode.java
+++ b/odk/examples/java/Inspector/XUnoPropertyNode.java
@@ -38,7 +38,7 @@ public interface XUnoPropertyNode extends XUnoNode {
public static int nDEFAULT = 0;
public static int nPROPERTYSETINFOTYPE = 1;
- public static int nPROPERTYVALUETYPE = 2;
+
public Object getUnoReturnObject();
diff --git a/qadevOOo/runner/complexlib/ComplexTestCase.java b/qadevOOo/runner/complexlib/ComplexTestCase.java
index 3df834d..7eacef2 100644
--- a/qadevOOo/runner/complexlib/ComplexTestCase.java
+++ b/qadevOOo/runner/complexlib/ComplexTestCase.java
@@ -44,8 +44,7 @@ public abstract class ComplexTestCase extends Assurance implements ComplexTest
**/
private int m_nThreadTimeOut = 0;
- /** End a test if it did fail **/
- public static final boolean BREAK = true;
+
private boolean m_bBeforeCalled;
diff --git a/qadevOOo/runner/convwatch/ConvWatch.java b/qadevOOo/runner/convwatch/ConvWatch.java
index d64de05..7187ec5 100644
--- a/qadevOOo/runner/convwatch/ConvWatch.java
+++ b/qadevOOo/runner/convwatch/ConvWatch.java
@@ -166,7 +166,6 @@ public class ConvWatch
String sInputPath = FileHelper.getPath(_sAbsoluteInputFile);
String sReferencePath = FileHelper.getPath(_sAbsoluteReferenceFile);
- a.setInputPath( sInputPath );
a.setReferencePath( sReferencePath );
a.setOutputPath( _sOutputPath );
a.setReferenceFile( sReferenceFile );
diff --git a/qadevOOo/runner/convwatch/GraphicalTestArguments.java b/qadevOOo/runner/convwatch/GraphicalTestArguments.java
index 8208367..b9b195a 100644
--- a/qadevOOo/runner/convwatch/GraphicalTestArguments.java
+++ b/qadevOOo/runner/convwatch/GraphicalTestArguments.java
@@ -91,9 +91,9 @@ public class GraphicalTestArguments
private boolean m_bStoreFile = true;
private boolean m_bResuseOffice = false;
- boolean m_bDebugMode = false;
- private String m_sLeaveOutNames = null;
+
+
private String m_sDistinct = null;
@@ -241,10 +241,6 @@ public class GraphicalTestArguments
}
String sLeaveOutNames = (String)param.get(PropertyName.DOC_COMPARATOR_LEAVE_OUT_FILES);
- if (sLeaveOutNames != null)
- {
- m_sLeaveOutNames = sLeaveOutNames;
- }
String sDBInfoString = (String)param.get(PropertyName.DOC_COMPARATOR_DB_INFO_STRING);
if (sDBInfoString != null)
diff --git a/qadevOOo/runner/convwatch/INIOutputter.java b/qadevOOo/runner/convwatch/INIOutputter.java
index dccef73..673b878 100644
--- a/qadevOOo/runner/convwatch/INIOutputter.java
+++ b/qadevOOo/runner/convwatch/INIOutputter.java
@@ -25,7 +25,7 @@ public class INIOutputter
{
private FileWriter m_aOut;
private String m_sFilename;
- private String m_sNamePrefix; // the HTML files used a suffix to build it's right name
+
/**
* ls is the current line separator (carridge return)
@@ -52,7 +52,6 @@ public class INIOutputter
return null;
}
a.m_sFilename = sFilename;
- a.m_sNamePrefix = _sNamePrefix;
return a;
}
diff --git a/qadevOOo/runner/convwatch/ImageHelper.java b/qadevOOo/runner/convwatch/ImageHelper.java
index c5b2f11..1a29770 100644
--- a/qadevOOo/runner/convwatch/ImageHelper.java
+++ b/qadevOOo/runner/convwatch/ImageHelper.java
@@ -30,7 +30,7 @@ class ImageHelper
private int[] m_aPixels;
private int m_w = 0;
private int m_h = 0;
- private boolean m_bGrabbed = false;
+
private ImageHelper(Image _aImage)
{
@@ -53,7 +53,6 @@ class ImageHelper
System.err.println("image fetch aborted or errored");
return;
}
- m_bGrabbed = true;
}
public int getWidth() {return m_aImage.getWidth(null);}
public int getHeight() {return m_aImage.getHeight(null);}
diff --git a/qadevOOo/runner/convwatch/PRNCompare.java b/qadevOOo/runner/convwatch/PRNCompare.java
index 4b39748..e7aea95 100644
--- a/qadevOOo/runner/convwatch/PRNCompare.java
+++ b/qadevOOo/runner/convwatch/PRNCompare.java
@@ -91,10 +91,10 @@ public class PRNCompare
return nMaxNumber;
}
- private String m_sInputPath;
+
private String m_sReferencePath;
private String m_sOutputPath;
- private String m_sDocFile;
+
private String m_sReferenceFile;
private String m_sPostScriptFile;
private int m_nMaxPages = 0;
@@ -102,14 +102,10 @@ public class PRNCompare
private TriState m_tUseBorderMove;
private String m_sDocumentType;
- public void setInputPath(String _sInputPath) { m_sInputPath = _sInputPath; }
-
public void setReferencePath(String _sReferencePath) { m_sReferencePath = _sReferencePath; }
public void setOutputPath(String _sOutPath) { m_sOutputPath = _sOutPath; }
- public void setDocFile(String _sDocFile) { m_sDocFile = _sDocFile;}
-
public void setReferenceFile(String _sPRNFile){ m_sReferenceFile = _sPRNFile;}
public void setPostScriptFile(String _sPSFile){ m_sPostScriptFile = _sPSFile;}
diff --git a/qadevOOo/runner/convwatch/StatusHelper.java b/qadevOOo/runner/convwatch/StatusHelper.java
index bb49450..939a64a 100644
--- a/qadevOOo/runner/convwatch/StatusHelper.java
+++ b/qadevOOo/runner/convwatch/StatusHelper.java
@@ -26,7 +26,7 @@ public class StatusHelper
final static public int DIFF_AFTER_MOVE_DONE_NO_PROBLEMS = 4;
final static public int DIFF_AFTER_MOVE_DONE_DIFFERENCES_FOUND = 5;
- public String m_sMainName;
+
public String m_sOldGfx;
public String m_sNewGfx;
diff --git a/qadevOOo/runner/graphical/ImageHelper.java b/qadevOOo/runner/graphical/ImageHelper.java
index ec2a5ce..b1ec0ca 100644
--- a/qadevOOo/runner/graphical/ImageHelper.java
+++ b/qadevOOo/runner/graphical/ImageHelper.java
@@ -30,7 +30,7 @@ class ImageHelper
private int[] m_aPixels;
private int m_w = 0;
private int m_h = 0;
- private boolean m_bGrabbed = false;
+
private ImageHelper(Image _aImage)
{
@@ -57,7 +57,6 @@ class ImageHelper
System.err.println("image fetch aborted or errored");
return;
}
- m_bGrabbed = true;
}
public int getWidth() {return m_aImage.getWidth(null);}
public int getHeight() {return m_aImage.getHeight(null);}
diff --git a/qadevOOo/runner/graphical/PropertyName.java b/qadevOOo/runner/graphical/PropertyName.java
index b95567f..66f4d46 100644
--- a/qadevOOo/runner/graphical/PropertyName.java
+++ b/qadevOOo/runner/graphical/PropertyName.java
@@ -27,18 +27,18 @@ public interface PropertyName
final public static String DOC_COMPARATOR_INCLUDE_SUBDIRS = "DOC_COMPARATOR_INCLUDE_SUBDIRS";
final public static String DOC_COMPARATOR_PRINT_MAX_PAGE = "DOC_COMPARATOR_PRINT_MAX_PAGE";
final public static String DOC_COMPARATOR_PRINT_ONLY_PAGE = "DOC_COMPARATOR_PRINT_ONLY_PAGE";
- final public static String DOC_COMPARATOR_GFX_OUTPUT_DPI_RESOLUTION = "DOC_COMPARATOR_GFX_OUTPUT_DPI_RESOLUTION";
+
final public static String DOC_COMPARATOR_OVERWRITE_REFERENCE = "DOC_COMPARATOR_OVERWRITE_REFERENCE";
final public static String DOC_COMPARATOR_HTML_OUTPUT_PREFIX = "DOC_COMPARATOR_HTML_OUTPUT_PREFIX";
- final public static String DOC_CONVERTER_IMPORT_FILTER_NAME = "DOC_CONVERTER_IMPORT_FILTER_NAME";
+
final public static String DOC_CONVERTER_EXPORT_FILTER_NAME = "DOC_CONVERTER_EXPORT_FILTER_NAME";
- final public static String DOC_CONVERTER_OFFICE_PROGRAM = "DOC_CONVERTER_OFFICE_PROGRAM";
- final public static String DOC_COMPARATOR_LEAVE_OUT_FILES = "DOC_COMPARATOR_LEAVE_OUT_FILES";
- final public static String DOC_COMPARATOR_DB_INFO_STRING = "DOC_COMPARATOR_DB_INFO_STRING";
+
+
+
final public static String OFFICE_VIEWABLE = "OFFICE_VIEWABLE";
diff --git a/qadevOOo/runner/helper/StreamSimulator.java b/qadevOOo/runner/helper/StreamSimulator.java
index 205925d..b5b0259 100644
--- a/qadevOOo/runner/helper/StreamSimulator.java
+++ b/qadevOOo/runner/helper/StreamSimulator.java
@@ -51,8 +51,8 @@ public class StreamSimulator implements com.sun.star.io.XInputStream ,
private com.sun.star.io.XOutputStream m_xOutStream ;
private com.sun.star.io.XSeekable m_xSeek ;
- private boolean m_bInWasUsed ;
- private boolean m_bOutWasUsed ;
+
+
/**
@@ -81,8 +81,6 @@ public class StreamSimulator implements com.sun.star.io.XInputStream ,
{
////m_aProtocol = new ComplexTestEnvironment();
m_sFileName = sFileName ;
- m_bInWasUsed = false ;
- m_bOutWasUsed = false ;
try
{
@@ -128,8 +126,6 @@ public class StreamSimulator implements com.sun.star.io.XInputStream ,
com.sun.star.io.BufferSizeExceededException,
com.sun.star.io.IOException
{
- m_bInWasUsed = true;
-
if (m_xInStream == null)
{
throw new com.sun.star.io.NotConnectedException("stream not open");
@@ -160,7 +156,6 @@ public class StreamSimulator implements com.sun.star.io.XInputStream ,
com.sun.star.io.IOException
{
//m_aProtocol.log("readSomeBytes(lData["+lData.length+"]["+lData[0]+"],"+nMaxBytesToRead+")\n{\n");
- m_bInWasUsed = true;
if (m_xInStream == null)
{
@@ -197,7 +192,6 @@ public class StreamSimulator implements com.sun.star.io.XInputStream ,
com.sun.star.io.IOException
{
//m_aProtocol.log("skipBytes("+nBytesToSkip+")\n{\n");
- m_bInWasUsed = true;
if (m_xInStream == null)
{
@@ -227,7 +221,6 @@ public class StreamSimulator implements com.sun.star.io.XInputStream ,
com.sun.star.io.IOException
{
//m_aProtocol.log("available()\n{\n");
- m_bInWasUsed = true;
if (m_xInStream == null)
{
@@ -257,7 +250,6 @@ public class StreamSimulator implements com.sun.star.io.XInputStream ,
com.sun.star.io.IOException
{
//m_aProtocol.log("closeInput()\n{\n");
- m_bInWasUsed = true;
if (m_xInStream == null)
{
@@ -291,7 +283,6 @@ public class StreamSimulator implements com.sun.star.io.XInputStream ,
com.sun.star.io.IOException
{
//m_aProtocol.log("writeBytes(lData["+lData.length+"])\n{\n");
- m_bOutWasUsed = true;
if (m_xOutStream == null)
{
@@ -322,7 +313,6 @@ public class StreamSimulator implements com.sun.star.io.XInputStream ,
com.sun.star.io.IOException
{
//m_aProtocol.log("flush()\n{\n");
- m_bOutWasUsed = true;
if (m_xOutStream == null)
{
@@ -352,7 +342,6 @@ public class StreamSimulator implements com.sun.star.io.XInputStream ,
com.sun.star.io.IOException
{
//m_aProtocol.log("closeOutput()\n{\n");
- m_bOutWasUsed = true;
if (m_xOutStream == null)
{
@@ -388,14 +377,6 @@ public class StreamSimulator implements com.sun.star.io.XInputStream ,
{
//m_aProtocol.log("seek("+nLocation+")\n{\n");
- if (m_xInStream != null)
- m_bInWasUsed = true;
- else
- if (m_xOutStream != null)
- m_bOutWasUsed = true;
- else
- //m_aProtocol.log("\tno stream open!\n");
-
if (m_xSeek == null)
{
//m_aProtocol.log("\tstream not seekable. throw IOException\n\tfailed\n}\n");
@@ -422,14 +403,6 @@ public class StreamSimulator implements com.sun.star.io.XInputStream ,
{
//m_aProtocol.log("getPosition()\n{\n");
- if (m_xInStream != null)
- m_bInWasUsed = true;
- else
- if (m_xOutStream != null)
- m_bOutWasUsed = true;
- else
- //m_aProtocol.log("\tno stream open!\n");
-
if (m_xSeek == null)
{
//m_aProtocol.log("\tstream not seekable. throw IOException\n\tfailed\n}\n");
@@ -456,14 +429,6 @@ public class StreamSimulator implements com.sun.star.io.XInputStream ,
{
//m_aProtocol.log("getLength()\n{\n");
- if (m_xInStream != null)
- m_bInWasUsed = true;
- else
- if (m_xOutStream != null)
- m_bOutWasUsed = true;
- else
- //m_aProtocol.log("\tno stream open!\n");
-
if (m_xSeek == null)
{
//m_aProtocol.log("\tstream not seekable. throw IOException\n\tfailed\n}\n");
diff --git a/qadevOOo/runner/helper/WindowListener.java b/qadevOOo/runner/helper/WindowListener.java
index e162232..00395c6 100644
--- a/qadevOOo/runner/helper/WindowListener.java
+++ b/qadevOOo/runner/helper/WindowListener.java
@@ -30,16 +30,12 @@ package helper;
*/
public class WindowListener implements com.sun.star.awt.XWindowListener {
- // hidden called
- private boolean hiddenTrigger;
- // move called
- private boolean movedTrigger;
+
+
// resize called
public boolean resizedTrigger;
- // show called
- private boolean shownTrigger;
- // dispose called
- private boolean disposeTrigger;
+
+
/**
* Creates a new WindowListener
@@ -52,14 +48,12 @@ public class WindowListener implements com.sun.star.awt.XWindowListener {
* The window hidden event
*/
public void windowHidden(com.sun.star.lang.EventObject eventObject) {
- hiddenTrigger = true;
}
/**
* The window move event
*/
public void windowMoved(com.sun.star.awt.WindowEvent windowEvent) {
- movedTrigger = true;
}
/**
@@ -73,24 +67,18 @@ public class WindowListener implements com.sun.star.awt.XWindowListener {
* The window show event
*/
public void windowShown(com.sun.star.lang.EventObject eventObject) {
- shownTrigger = true;
}
/**
* The dispose event
*/
public void disposing(com.sun.star.lang.EventObject eventObject) {
- disposeTrigger = true;
}
/**
* Reset all triggers to "not fired".
*/
public void resetTrigger() {
- hiddenTrigger = false;
- movedTrigger = false;
resizedTrigger = false;
- shownTrigger = false;
- disposeTrigger = false;
}
}
diff --git a/qadevOOo/runner/lib/SimpleStatus.java b/qadevOOo/runner/lib/SimpleStatus.java
index 2639fae..631ecc5 100644
--- a/qadevOOo/runner/lib/SimpleStatus.java
+++ b/qadevOOo/runner/lib/SimpleStatus.java
@@ -58,10 +58,7 @@ class SimpleStatus {
*/
public final static boolean FAILED = false;
- /**
- * The constant represents OK state.
- */
- public final static boolean OK = true;
+
/**
* The field is holding state of the status.
diff --git a/qadevOOo/runner/util/PropertyName.java b/qadevOOo/runner/util/PropertyName.java
index 21d78ec..baeb78b 100644
--- a/qadevOOo/runner/util/PropertyName.java
+++ b/qadevOOo/runner/util/PropertyName.java
@@ -98,10 +98,7 @@ public interface PropertyName {
* parameter name: "NewOfficeInstance"
*/
final public static String NEW_OFFICE_INSTANCE = "NewOfficeInstance";
- /**
- * parameter name: "KeepDocument"
- */
- final public static String KEEP_DOCUMENT = "KeepDocument";
+
/**
* parameter name: "SRC_ROOT"<p>
* path to the source root of OpenOffice.org
diff --git a/reportbuilder/java/org/libreoffice/report/OfficeToken.java b/reportbuilder/java/org/libreoffice/report/OfficeToken.java
index 76bc897..9c2b59d 100644
--- a/reportbuilder/java/org/libreoffice/report/OfficeToken.java
+++ b/reportbuilder/java/org/libreoffice/report/OfficeToken.java
@@ -44,7 +44,7 @@ public class OfficeToken
public static final String IMAGE_DATA = "image-data";
public static final String PRESERVE_IRI = "preserve-IRI";
public static final String SCALE = "scale";
- public static final String NAME = "name";
+
public static final String SHAPES = "shapes";
public static final String ISOTROPIC = "isotropic";
public static final String ANISOTROPIC = "anisotropic";
diff --git a/reportbuilder/java/org/libreoffice/report/ReportEngineParameterNames.java b/reportbuilder/java/org/libreoffice/report/ReportEngineParameterNames.java
index 8e6593e..8d76cd1 100644
--- a/reportbuilder/java/org/libreoffice/report/ReportEngineParameterNames.java
+++ b/reportbuilder/java/org/libreoffice/report/ReportEngineParameterNames.java
@@ -35,7 +35,7 @@ public class ReportEngineParameterNames
public static final String INPUT_MASTER_COLUMNS = "input.master-columns";
public static final String INPUT_MASTER_VALUES = "input.master-values";
public static final String INPUT_DETAIL_COLUMNS = "input.detail-columns";
- public static final String MIMETYPE = "output.mimetype";
+
public static final String AUTHOR = "Author";
public static final String TITLE = "Title";
public static final String MAXROWS = "MaxRows";
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/OfficeNamespaces.java b/reportbuilder/java/org/libreoffice/report/pentaho/OfficeNamespaces.java
index 1a45f1f..2774359 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/OfficeNamespaces.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/OfficeNamespaces.java
@@ -51,10 +51,7 @@ public class OfficeNamespaces
public static final String OOREPORT_NS = "http://openoffice.org/2005/report";
public static final String GRDDL_NS = "http://www.w3.org/2003/g/data-view#";
public static final String CONFIG = "urn:oasis:names:tc:opendocument:xmlns:config:1.0";
- /**
- * @deprecated
- */
- public static final String NUMBER_NS = DATASTYLE_NS;
+
private OfficeNamespaces()
{
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/output/text/PageContext.java b/reportbuilder/java/org/libreoffice/report/pentaho/output/text/PageContext.java
index 157dec4..1baa240 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/output/text/PageContext.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/output/text/PageContext.java
@@ -29,7 +29,7 @@ import org.jfree.layouting.input.style.values.CSSNumericValue;
public class PageContext
{
- public static final int KEEP_TOGETHER_OFF = 0;
+
public static final int KEEP_TOGETHER_GROUP = 1;
public static final int KEEP_TOGETHER_FIRST_DETAIL = 2;
private PageContext parent;
diff --git a/reportbuilder/java/org/libreoffice/report/util/DefaultReportJobDefinition.java b/reportbuilder/java/org/libreoffice/report/util/DefaultReportJobDefinition.java
index 4f24dd99..54dce8e 100644
--- a/reportbuilder/java/org/libreoffice/report/util/DefaultReportJobDefinition.java
+++ b/reportbuilder/java/org/libreoffice/report/util/DefaultReportJobDefinition.java
@@ -30,7 +30,7 @@ import org.libreoffice.report.ReportJobDefinition;
public class DefaultReportJobDefinition implements ReportJobDefinition
{
- public static final String OUTPUT_TYPE = "output-type";
+
private final DefaultParameterMap parameters;
private final DefaultJobProperties properties;
diff --git a/sc/qa/complex/dataPilot/_XDataPilotDescriptor.java b/sc/qa/complex/dataPilot/_XDataPilotDescriptor.java
index 9971c74..abb0a4e 100644
--- a/sc/qa/complex/dataPilot/_XDataPilotDescriptor.java
+++ b/sc/qa/complex/dataPilot/_XDataPilotDescriptor.java
@@ -54,7 +54,7 @@ public class _XDataPilotDescriptor {
private XDataPilotDescriptor oObj = null;
private CellRangeAddress CRA = new CellRangeAddress((short)1, 0, 0, 5, 5);
- private CellRangeAddress oldCRA = null ;
+
private String sTag = new String ("XDataPilotDescriptor_Tag");
private String fieldsNames[];
private int fieldsAmount = 0;
@@ -132,7 +132,6 @@ public class _XDataPilotDescriptor {
executeMethod("getHiddenFields()") ;
executeMethod("getPageFields()") ; */
- oldCRA = oObj.getSourceRange() ;
oObj.setSourceRange(CRA);
return true;
diff --git a/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java b/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java
index 75e4771..437b326 100644
--- a/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java
+++ b/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java
@@ -57,10 +57,10 @@ public class ParcelBrowseNode extends PropertySet
private Collection<XBrowseNode> browsenodes;
private ParcelContainer container;
private Parcel parcel;
- private boolean deletable = true;
- private boolean editable = false;
- private boolean creatable = false;
- private boolean renamable = true;
+
+
+
+
public ParcelBrowseNode( ScriptProvider provider, ParcelContainer container, String parcelName ) {
this.provider = provider;
@@ -86,10 +86,6 @@ public class ParcelBrowseNode extends PropertySet
(short)0, "creatable");
registerProperty("Renamable", new Type(boolean.class),
(short)0, "renamable");
- if (provider.hasScriptEditor() == true)
- {
- this.creatable = true;
- }
String parcelDirUrl = parcel.getPathToParcel();
XComponentContext xCtx = provider.getScriptingContext().getComponentContext();
@@ -100,14 +96,6 @@ public class ParcelBrowseNode extends PropertySet
xFac.createInstanceWithContext(
"com.sun.star.ucb.SimpleFileAccess",
xCtx ) );
- if ( xSFA != null && ( xSFA.isReadOnly( parcelDirUrl ) ||
- container.isUnoPkg() ) )
- {
- deletable = false;
- editable = false;
- creatable = false;
- renamable = false;
- }
}
catch ( com.sun.star.uno.Exception e )
{
diff --git a/scripting/java/com/sun/star/script/framework/browse/PkgProviderBrowseNode.java b/scripting/java/com/sun/star/script/framework/browse/PkgProviderBrowseNode.java
index 2ef5746..900a4b3 100644
--- a/scripting/java/com/sun/star/script/framework/browse/PkgProviderBrowseNode.java
+++ b/scripting/java/com/sun/star/script/framework/browse/PkgProviderBrowseNode.java
@@ -33,10 +33,6 @@ public class PkgProviderBrowseNode extends ProviderBrowseNode
LogUtils.DEBUG("*** PkgProviderBrowseNode ctor container name = " + container.getName());
LogUtils.DEBUG("*** PkgProviderBrowseNode ctor container path = " + container.getParcelContainerDir());
LogUtils.DEBUG("*** PkgProviderBrowseNode ctor, container has num parcels = " + container.getElementNames().length);
- deletable = false;
- editable = false;
- creatable = false;
-
}
@Override
diff --git a/scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java b/scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java
index 3f0f7c2..5bb65b8 100644
--- a/scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java
+++ b/scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java
@@ -50,12 +50,12 @@ public class ProviderBrowseNode extends PropertySet
private Collection<XBrowseNode> browsenodes;
private String name;
protected ParcelContainer container;
- protected Parcel parcel;
+
private XComponentContext m_xCtx;
- public boolean deletable = true;
- public boolean creatable = true;
- public boolean editable = false;
+
+
+
public ProviderBrowseNode( ScriptProvider provider, ParcelContainer container, XComponentContext xCtx ) {
LogUtils.DEBUG("*** ProviderBrowseNode ctor");
@@ -78,11 +78,6 @@ public class ProviderBrowseNode extends PropertySet
xFac.createInstanceWithContext(
"com.sun.star.ucb.SimpleFileAccess",
xCtx ) );
- if ( container.isUnoPkg() || xSFA.isReadOnly( container.getParcelContainerDir() ) )
- {
- deletable = false;
- creatable = false;
- }
}
// TODO propage errors
catch( com.sun.star.uno.Exception e )
diff --git a/scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java b/scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java
index 8855701..1e5df71 100644
--- a/scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java
+++ b/scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java
@@ -52,8 +52,8 @@ public class ScriptBrowseNode extends PropertySet
private Parcel parent;
private String name;
- private String uri;
- private String description;
+
+
private boolean editable = false;
private boolean deletable = false;
private boolean renamable = false;
@@ -83,9 +83,6 @@ public class ScriptBrowseNode extends PropertySet
LogUtils.DEBUG("** caught exception getting script data for " + name + " ->" + e.toString() );
}
- uri = data.getShortFormScriptURL();
- description = data.getDescription();
-
if (provider.hasScriptEditor() == true)
{
@@ -155,7 +152,6 @@ public class ScriptBrowseNode extends PropertySet
{
LogUtils.DEBUG("** caught exception getting script data for " + name + " ->" + e.toString() );
}
- uri = data.getShortFormScriptURL();
}
// implementation of XInvocation interface
public XIntrospectionAccess getIntrospection() {
@@ -271,7 +267,6 @@ public class ScriptBrowseNode extends PropertySet
LogUtils.DEBUG("Now remove old script");
parent.removeByName( name );
- uri = data.getShortFormScriptURL();
name = languageName;
result = new Any(new Type(XBrowseNode.class), this);
}
diff --git a/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java b/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java
index bb6c6fd..cf860de 100644
--- a/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java
+++ b/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java
@@ -683,8 +683,6 @@ public ParsedScriptUri parseScriptUri( String scriptURI ) throws com.sun.star.l
}
ParsedScriptUri parsedUri = new ParsedScriptUri();
- // parse language
- parsedUri.language = sfUri.getParameter("language");
parsedUri.function= sfUri.getName();
parsedUri.parcel = "";
diff --git a/scripting/java/com/sun/star/script/framework/container/ParsedScriptUri.java b/scripting/java/com/sun/star/script/framework/container/ParsedScriptUri.java
index 8ca004b..477604c 100644
--- a/scripting/java/com/sun/star/script/framework/container/ParsedScriptUri.java
+++ b/scripting/java/com/sun/star/script/framework/container/ParsedScriptUri.java
@@ -19,7 +19,7 @@ package com.sun.star.script.framework.container;
public class ParsedScriptUri
{
- public String language;
+
public String location;
public String function;
public String parcel;
diff --git a/scripting/java/com/sun/star/script/framework/provider/PathUtils.java b/scripting/java/com/sun/star/script/framework/provider/PathUtils.java
index 63e8296..307d346 100644
--- a/scripting/java/com/sun/star/script/framework/provider/PathUtils.java
+++ b/scripting/java/com/sun/star/script/framework/provider/PathUtils.java
@@ -27,7 +27,7 @@ import com.sun.star.uno.IQueryInterface;
public class PathUtils {
- private static String FILE_URL_PREFIX;
+
public static String BOOTSTRAP_NAME;
private static boolean m_windows = false;
@@ -36,7 +36,6 @@ public class PathUtils {
if (System.getProperty("os.name").startsWith("Windows"))
m_windows = true;
- FILE_URL_PREFIX = m_windows ? "file:///" : "file://";
BOOTSTRAP_NAME = m_windows ? "bootstrap.ini" : "bootstraprc";
}
public static String getOidForModel( XModel xModel )
diff --git a/scripting/java/com/sun/star/script/framework/provider/ScriptContext.java b/scripting/java/com/sun/star/script/framework/provider/ScriptContext.java
index 0f21981..8e7d0ec 100644
--- a/scripting/java/com/sun/star/script/framework/provider/ScriptContext.java
+++ b/scripting/java/com/sun/star/script/framework/provider/ScriptContext.java
@@ -42,9 +42,9 @@ public class ScriptContext extends PropertySet implements XScriptContext
private XModel m_xModel = null;
private XScriptInvocationContext m_xInvocationContext = null;
- public String m_sDocURI = null;
+
private XDesktop m_xDeskTop = null;
- public Integer m_iStorageID = null;
+
private XComponentContext m_xComponentContext = null;
private ScriptContext( XComponentContext xmComponentContext,
diff --git a/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java b/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
index ad0c7b0..5b0209a 100644
--- a/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
+++ b/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
@@ -87,7 +87,7 @@ public abstract class ScriptProvider
"com.sun.star.script.provider.LanguageScriptProvider"
};
- public final static String CLASSPATH = "classpath";
+
protected String language;
diff --git a/scripting/java/org/openoffice/idesupport/SVersionRCFile.java b/scripting/java/org/openoffice/idesupport/SVersionRCFile.java
index e4854d2..30ad0bb 100644
--- a/scripting/java/org/openoffice/idesupport/SVersionRCFile.java
+++ b/scripting/java/org/openoffice/idesupport/SVersionRCFile.java
@@ -41,9 +41,7 @@ public class SVersionRCFile {
System.getProperty("os.name").startsWith("Windows") == true ?
"file:///" : "file://";
- public static final String PKGCHK =
- System.getProperty("os.name").startsWith("Windows") == true ?
- "pkgchk.exe" : "pkgchk";
+
private static final String VERSIONS_LINE = "[Versions]";
diff --git a/swext/mediawiki/src/com/sun/star/wiki/Helper.java b/swext/mediawiki/src/com/sun/star/wiki/Helper.java
index af5934e..ed78dae 100644
--- a/swext/mediawiki/src/com/sun/star/wiki/Helper.java
+++ b/swext/mediawiki/src/com/sun/star/wiki/Helper.java
@@ -80,9 +80,9 @@ public class Helper
public final static int DLG_SENDTITLE = 6;
public final static int DLG_WIKIARTICLE = 7;
- public final static int DLG_NO = 8;
+
public final static int DLG_OK = 9;
- public final static int DLG_YES = 10;
+
// 11 is reserved
public final static int DLG_ADDBUTTON = 12;
public final static int DLG_EDITBUTTON = 13;
@@ -92,7 +92,7 @@ public class Helper
public final static int DLG_EDITSETTING_URLLABEL = 16;
public final static int DLG_EDITSETTING_USERNAMELABEL = 17;
public final static int DLG_EDITSETTING_PASSWORDLABEL = 18;
- public final static int DLG_NEWWIKIPAGE_LABEL1 = 19;
+
public final static int DLG_SENDTOMEDIAWIKI_LABEL1 = 20;
public final static int DLG_SENDTOMEDIAWIKI_LABEL2 = 21;
public final static int DLG_SENDTOMEDIAWIKI_LABEL3 = 22;
diff --git a/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java b/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java
index 969af16..f251fc4 100644
--- a/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java
+++ b/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java
@@ -53,9 +53,8 @@ public final class WikiEditorImpl extends WeakBase
private static final String m_implementationName = WikiEditorImpl.class.getName();
private static final String[] m_serviceNames = {"com.sun.star.wiki.WikiEditor" };
- // information needed for component registration
- public static final String[] supportedServiceNames = {"com.sun.star.frame.ProtocolHandler"};
- public static final Class implementationClass = WikiEditorImpl.class;
+
+
// protocol name that this protocol handler handles
private static final String protocolName = "vnd.com.sun.star.wiki:";
diff --git a/ucb/qa/complex/tdoc/_XCommandInfoChangeNotifier.java b/ucb/qa/complex/tdoc/_XCommandInfoChangeNotifier.java
index b690664..d5b30f1 100644
--- a/ucb/qa/complex/tdoc/_XCommandInfoChangeNotifier.java
+++ b/ucb/qa/complex/tdoc/_XCommandInfoChangeNotifier.java
@@ -26,7 +26,7 @@ import share.LogWriter;
*/
public class _XCommandInfoChangeNotifier {
public XCommandInfoChangeNotifier oObj = null;
- public LogWriter log = null;
+
private CommandInfoChangeListener listener = new CommandInfoChangeListener();
public boolean _addCommandInfoChangeListener() {
diff --git a/ucb/qa/complex/tdoc/_XPropertiesChangeNotifier.java b/ucb/qa/complex/tdoc/_XPropertiesChangeNotifier.java
index 4f945d0..8cee835 100644
--- a/ucb/qa/complex/tdoc/_XPropertiesChangeNotifier.java
+++ b/ucb/qa/complex/tdoc/_XPropertiesChangeNotifier.java
@@ -26,7 +26,7 @@ import share.LogWriter;
*/
public class _XPropertiesChangeNotifier {
public XPropertiesChangeNotifier oObj = null;
- public LogWriter log = null;
+
private PropertiesChangeListener listener = new PropertiesChangeListener();
private String[] args = null;
diff --git a/ucb/qa/complex/tdoc/_XPropertySetInfoChangeNotifier.java b/ucb/qa/complex/tdoc/_XPropertySetInfoChangeNotifier.java
index 0505c67..f514dd8 100644
--- a/ucb/qa/complex/tdoc/_XPropertySetInfoChangeNotifier.java
+++ b/ucb/qa/complex/tdoc/_XPropertySetInfoChangeNotifier.java
@@ -26,10 +26,10 @@ import share.LogWriter;
*/
public class _XPropertySetInfoChangeNotifier {
public XPropertySetInfoChangeNotifier oObj = null;
- public LogWriter log = null;
+
private PropertySetInfoChangeListener listener = new PropertySetInfoChangeListener();
- String[] args = null;
+
public boolean _addPropertiesChangeListener() {
diff --git a/vcl/qa/complex/persistent_window_states/DocumentHandle.java b/vcl/qa/complex/persistent_window_states/DocumentHandle.java
index 0471acb..c6ce5f3 100644
--- a/vcl/qa/complex/persistent_window_states/DocumentHandle.java
+++ b/vcl/qa/complex/persistent_window_states/DocumentHandle.java
@@ -37,8 +37,7 @@ import helper.WindowListener;
public class DocumentHandle {
// the component loader to load a document
private XComponentLoader xCompLoader = null;
- // the document
- private XComponent xComp = null;
+
// the current window
private XWindow xWin = null;
// a own window listener
@@ -85,8 +84,7 @@ public class DocumentHandle {
// load document in this frame
XComponentLoader xFrameLoader = UnoRuntime.queryInterface(XComponentLoader.class, xFrame);
- xComp = xFrameLoader.loadComponentFromURL(
- docName, "_self", 0, szArgs);
+ xFrameLoader.loadComponentFromURL(docName, "_self", 0, szArgs);
// wait for the document to load.
try {
Thread.sleep(10000);
diff --git a/wizards/com/sun/star/wizards/common/NumericalHelper.java b/wizards/com/sun/star/wizards/common/NumericalHelper.java
index 95c24a0..f8dfbc1 100644
--- a/wizards/com/sun/star/wizards/common/NumericalHelper.java
+++ b/wizards/com/sun/star/wizards/common/NumericalHelper.java
@@ -44,9 +44,9 @@ public class NumericalHelper
private static final int STRING_TYPE = -1;
private static final int BOOLEAN_TYPE = -2;
private static final int SEQUENCE_TYPE = -3;
- public static final int ASCII_VALUE_0 = 48;
- public static final int ASCII_VALUE_A = 65;
- public static final int COUNT_CHARS_IN_ALPHABET = 26;
+
+
+
private static final int HEX_BASE = 16;
private static final int DEC_BASE = 10;
private static final int ASCII_LETTER_A_OFFSET = 55;
diff --git a/wizards/com/sun/star/wizards/common/PlaceholderTextElement.java b/wizards/com/sun/star/wizards/common/PlaceholderTextElement.java
index e9aa2f4..1169179 100644
--- a/wizards/com/sun/star/wizards/common/PlaceholderTextElement.java
+++ b/wizards/com/sun/star/wizards/common/PlaceholderTextElement.java
@@ -32,7 +32,7 @@ public class PlaceholderTextElement extends TextElement
private String hint;
private String placeHolderText;
private XMultiServiceFactory xmsf;
- TextDocument templateDocument;
+
public PlaceholderTextElement(XTextRange textRange, String placeHolderText_, String hint_, XMultiServiceFactory xmsf_)
{
diff --git a/wizards/com/sun/star/wizards/common/PropertyNames.java b/wizards/com/sun/star/wizards/common/PropertyNames.java
index c851b743..af23a11 100644
--- a/wizards/com/sun/star/wizards/common/PropertyNames.java
+++ b/wizards/com/sun/star/wizards/common/PropertyNames.java
@@ -36,7 +36,7 @@ public class PropertyNames
public static String PROPERTY_TITLE = "Title";
public static String PROPERTY_BORDER = "Border";
public static String PROPERTY_MOVEABLE = "Moveable";
- public static String PROPERTY_CLOSEABLE = "Closeable";
+
public static String PROPERTY_ALIGN = "Align";
public static String COMMAND = "Command";
public static String COMMAND_TYPE = "CommandType";
diff --git a/wizards/com/sun/star/wizards/common/SystemDialog.java b/wizards/com/sun/star/wizards/common/SystemDialog.java
index cf744fe..49674b2 100644
--- a/wizards/com/sun/star/wizards/common/SystemDialog.java
+++ b/wizards/com/sun/star/wizards/common/SystemDialog.java
@@ -40,7 +40,7 @@ public class SystemDialog
private XFilterManager xFilterManager;
private XInitialization xInitialize;
private XExecutableDialog xExecutable;
- private XComponent xComponent;
+
private XFilePickerControlAccess xFilePickerControlAccess;
private XMultiServiceFactory xMSF;
private XStringSubstitution xStringSubstitution;
@@ -61,7 +61,7 @@ public class SystemDialog
xFilterManager = UnoRuntime.queryInterface(XFilterManager.class, systemDialog);
xInitialize = UnoRuntime.queryInterface(XInitialization.class, systemDialog);
xExecutable = UnoRuntime.queryInterface(XExecutableDialog.class, systemDialog);
- xComponent = UnoRuntime.queryInterface(XComponent.class, systemDialog);
+ UnoRuntime.queryInterface(XComponent.class, systemDialog);
xFilePickerControlAccess = UnoRuntime.queryInterface(XFilePickerControlAccess.class, systemDialog);
xStringSubstitution = createStringSubstitution(xMSF);
Short[] listAny = new Short[]
diff --git a/wizards/com/sun/star/wizards/db/CommandName.java b/wizards/com/sun/star/wizards/db/CommandName.java
index 161af04..285e3e4 100644
--- a/wizards/com/sun/star/wizards/db/CommandName.java
+++ b/wizards/com/sun/star/wizards/db/CommandName.java
@@ -34,7 +34,7 @@ public class CommandName
private String AliasName = PropertyNames.EMPTY_STRING;
private boolean bCatalogAtStart;
private String sCatalogSep;
- private String sIdentifierQuote;
+
private boolean baddQuotation = true;
public CommandName(CommandMetaData _CommandMetaData, String _DisplayName)
@@ -176,7 +176,6 @@ public class CommandName
{
bCatalogAtStart = oCommandMetaData.xDBMetaData.isCatalogAtStart();
sCatalogSep = oCommandMetaData.xDBMetaData.getCatalogSeparator();
- sIdentifierQuote = oCommandMetaData.xDBMetaData.getIdentifierQuoteString();
return true;
}
catch (SQLException e)
diff --git a/wizards/com/sun/star/wizards/db/DBMetaData.java b/wizards/com/sun/star/wizards/db/DBMetaData.java
index 980221d..d05d0ae 100644
--- a/wizards/com/sun/star/wizards/db/DBMetaData.java
+++ b/wizards/com/sun/star/wizards/db/DBMetaData.java
@@ -85,8 +85,8 @@ public class DBMetaData
private XPropertySet m_dataSourceSettings;
private XOfficeDatabaseDocument xModel;
private XPropertySet xDataSourcePropertySet;
- private String[] DataSourceNames;
- public String[] CommandNames;
+
+
private java.util.ArrayList<CommandObject> CommandObjects = new ArrayList<CommandObject>(1);
private Locale aLocale;
private int[] CommandTypes;
@@ -201,7 +201,6 @@ public class DBMetaData
this.xMSF = xMSF;
xDatabaseContext = (XInterface) xMSF.createInstance("com.sun.star.sdb.DatabaseContext");
xNameAccess = UnoRuntime.queryInterface( XNameAccess.class, xDatabaseContext );
- DataSourceNames = xNameAccess.getElementNames();
}
catch (Exception e)
{
diff --git a/wizards/com/sun/star/wizards/db/QueryMetaData.java b/wizards/com/sun/star/wizards/db/QueryMetaData.java
index 31a443d..8987d25 100644
--- a/wizards/com/sun/star/wizards/db/QueryMetaData.java
+++ b/wizards/com/sun/star/wizards/db/QueryMetaData.java
@@ -28,7 +28,7 @@ public class QueryMetaData extends CommandMetaData
{
private SQLQueryComposer oSQLQueryComposer = null;
- FieldColumn CurFieldColumn;
+
public String Command;
// Vector CommandNamesV;
private PropertyValue[][] m_aFilterConditions; /* = new PropertyValue[][] {}; */
diff --git a/wizards/com/sun/star/wizards/db/RecordParser.java b/wizards/com/sun/star/wizards/db/RecordParser.java
index 4f8cb89..1eba9a5 100644
--- a/wizards/com/sun/star/wizards/db/RecordParser.java
+++ b/wizards/com/sun/star/wizards/db/RecordParser.java
@@ -41,12 +41,12 @@ public class RecordParser extends QueryMetaData
{
private XNameAccess xColumns;
- com.sun.star.sdbc.XRow xRow;
+
private com.sun.star.sdbc.XRow xResultSetRow;
public XResultSet ResultSet;
private XInterface xRowSet;
private XCompletedExecution xExecute;
- private XColumnsSupplier xRowSetColumnsSupplier;
+
private XComponent xRowSetComponent;
private XInteractionHandler xInteraction;
public FieldColumn[] GroupFieldColumns;
@@ -70,7 +70,7 @@ public class RecordParser extends QueryMetaData
try
{
xRowSet = (XInterface) xMSF.createInstance("com.sun.star.sdb.RowSet");
- xRowSetColumnsSupplier = UnoRuntime.queryInterface(XColumnsSupplier.class, xRowSet);
+ UnoRuntime.queryInterface(XColumnsSupplier.class, xRowSet);
xRowSetComponent = UnoRuntime.queryInterface(XComponent.class, xRowSet);
xExecute = UnoRuntime.queryInterface(XCompletedExecution.class, xRowSet);
XInterface oInteraction = (XInterface) xMSF.createInstance("com.sun.star.task.InteractionHandler");
diff --git a/wizards/com/sun/star/wizards/db/SQLQueryComposer.java b/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
index 7cdc867..2423cc1 100644
--- a/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
+++ b/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
@@ -40,7 +40,7 @@ import java.util.ArrayList;
public class SQLQueryComposer
{
- public XColumnsSupplier xColSuppl;
+
private QueryMetaData CurDBMetaData;
public XSingleSelectQueryAnalyzer m_xQueryAnalyzer;
private ArrayList<CommandName> composedCommandNames = new ArrayList<CommandName>(1);
diff --git a/wizards/com/sun/star/wizards/db/TableDescriptor.java b/wizards/com/sun/star/wizards/db/TableDescriptor.java
index db77203..77c4653 100644
--- a/wizards/com/sun/star/wizards/db/TableDescriptor.java
+++ b/wizards/com/sun/star/wizards/db/TableDescriptor.java
@@ -65,7 +65,7 @@ public class TableDescriptor extends CommandMetaData implements XContainerListen
private String[] sTableFilters = null;
private ArrayList<ColumnDescriptor> columncontainer;
private ArrayList<XPropertySet> keycolumncontainer;
- public XHierarchicalNameAccess xTableHierarchicalNameAccess;
+
private CommandName ComposedTableName;
private XAppend xKeyColAppend;
private XColumnsSupplier xKeyColumnSupplier;
diff --git a/wizards/com/sun/star/wizards/db/TypeInspector.java b/wizards/com/sun/star/wizards/db/TypeInspector.java
index b0dbda2..75f4f82 100644
--- a/wizards/com/sun/star/wizards/db/TypeInspector.java
+++ b/wizards/com/sun/star/wizards/db/TypeInspector.java
@@ -51,15 +51,10 @@ public class TypeInspector
public class TypeInfo
{
-
- private int nDataType;
- private String sDataTypeName;
public boolean bisAutoIncrementable;
private TypeInfo(int _nDataType, String _sDataTypeName, boolean _bisAutoIncrementable)
{
- nDataType = _nDataType;
- sDataTypeName = _sDataTypeName;
bisAutoIncrementable = _bisAutoIncrementable;
}
}
diff --git a/wizards/com/sun/star/wizards/document/Control.java b/wizards/com/sun/star/wizards/document/Control.java
index 1da3b21..e3320d8 100644
--- a/wizards/com/sun/star/wizards/document/Control.java
+++ b/wizards/com/sun/star/wizards/document/Control.java
@@ -43,12 +43,12 @@ public class Control extends Shape
XControlModel xControlModel;
private XControl xControl;
public XPropertySet xPropertySet;
- private XPropertySet xControlPropertySet;
+
XWindowPeer xWindowPeer;
- Object oDefaultValue;
- GridControl oGridControl;
+
+
private String sServiceName;
- XNamed xNamed;
+
private final int SOMAXTEXTSIZE = 50;
private int icontroltype;
private XNameContainer xFormName;
@@ -108,7 +108,7 @@ public class Control extends Shape
_xGroupShapes.add(xShape);
}
xControl = oFormHandler.xControlAccess.getControl(xControlModel);
- xControlPropertySet = UnoRuntime.queryInterface( XPropertySet.class, xControl );
+ UnoRuntime.queryInterface( XPropertySet.class, xControl );
xWindowPeer = xControl.getPeer();
}
catch (Exception e)
diff --git a/wizards/com/sun/star/wizards/document/FormHandler.java b/wizards/com/sun/star/wizards/document/FormHandler.java
index 74d2f54..7c675a2 100644
--- a/wizards/com/sun/star/wizards/document/FormHandler.java
+++ b/wizards/com/sun/star/wizards/document/FormHandler.java
@@ -97,9 +97,9 @@ public class FormHandler
int DataType;
private int ControlType;
- private String ControlService;
+
String GridColumnName;
- private boolean bIsText;
+
}
/** Creates a new instance of FormHandler */
@@ -197,9 +197,7 @@ public class FormHandler
ControlData curControlData = new ControlData();
curControlData.DataType = _datatype;
curControlData.ControlType = _controltype;
- curControlData.ControlService = _scontrolservicename;
curControlData.GridColumnName = _gridcolumnname;
- curControlData.bIsText = _bIsTextControl;
return curControlData;
}
diff --git a/wizards/com/sun/star/wizards/document/GridControl.java b/wizards/com/sun/star/wizards/document/GridControl.java
index 13436ee..f7bab37 100644
--- a/wizards/com/sun/star/wizards/document/GridControl.java
+++ b/wizards/com/sun/star/wizards/document/GridControl.java
@@ -40,7 +40,7 @@ public class GridControl extends Shape
public XGridColumnFactory xGridColumnFactory;
public XPropertySet xPropertySet;
XNameAccess xNameAccess;
- final String SODEFAULTNAME = "Grid1";
+
private XControlModel xControlModel;
public XComponent xComponent;
diff --git a/wizards/com/sun/star/wizards/document/TimeStampControl.java b/wizards/com/sun/star/wizards/document/TimeStampControl.java
index b627c7e..3004591 100644
--- a/wizards/com/sun/star/wizards/document/TimeStampControl.java
+++ b/wizards/com/sun/star/wizards/document/TimeStampControl.java
@@ -41,7 +41,7 @@ public class TimeStampControl extends DatabaseControl
private Resource oResource;
private String sDateAppendix; // = GetResText(RID_FORM + 4)
private String sTimeAppendix; // = GetResText(RID_FORM + 5)
- XShapes xGroupShapes = null;
+
private double nreldatewidth;
private double nreltimewidth;
private int nTimeWidth;
diff --git a/wizards/com/sun/star/wizards/form/Finalizer.java b/wizards/com/sun/star/wizards/form/Finalizer.java
index 81f3d87..19a8044 100644
--- a/wizards/com/sun/star/wizards/form/Finalizer.java
+++ b/wizards/com/sun/star/wizards/form/Finalizer.java
@@ -34,7 +34,7 @@ public class Finalizer
private WizardDialog CurUnoDialog;
private short curtabindex;
private XRadioButton optModifyForm;
- XRadioButton optWorkWithForm;
+
private XTextComponent txtFormName;
private FormDocument oFormDocument;
diff --git a/wizards/com/sun/star/wizards/form/FormConfiguration.java b/wizards/com/sun/star/wizards/form/FormConfiguration.java
index 170a32b..c478745 100644
--- a/wizards/com/sun/star/wizards/form/FormConfiguration.java
+++ b/wizards/com/sun/star/wizards/form/FormConfiguration.java
@@ -41,7 +41,7 @@ public class FormConfiguration
private XRadioButton optOnExistingRelation;
private XCheckBox chkcreateSubForm;
private XRadioButton optSelectManually;
- private XFixedText lblSubFormDescription;
+
private XFixedText lblRelations;
private XListBox lstRelations;
private String[] sreferencedTables;
@@ -109,7 +109,7 @@ public class FormConfiguration
{
Boolean.FALSE, 37, "HID:WIZARDS_HID_DLGFORM_lstRELATIONS", 201, 55, ISubFormStep, new Short(curtabindex++), 103
});
- lblSubFormDescription = CurUnoDialog.insertLabel("lblSubFormDescription",
+ CurUnoDialog.insertLabel("lblSubFormDescription",
new String[]
{
PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_MULTILINE, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH
diff --git a/wizards/com/sun/star/wizards/query/CallQueryWizard.java b/wizards/com/sun/star/wizards/query/CallQueryWizard.java
index 60fc8f6..1fd4dbd 100644
--- a/wizards/com/sun/star/wizards/query/CallQueryWizard.java
+++ b/wizards/com/sun/star/wizards/query/CallQueryWizard.java
@@ -56,8 +56,8 @@ public class CallQueryWizard
private static class QueryWizardImplementation extends com.sun.star.lib.uno.helper.PropertySet implements com.sun.star.lang.XInitialization, com.sun.star.lang.XServiceInfo, com.sun.star.task.XJobExecutor
{
private PropertyValue[] m_wizardContext;
- private String Command;
- public final Integer CommandType = com.sun.star.sdb.CommandType.QUERY;
+
+
/** The constructor of the inner class has a XMultiServiceFactory parameter.
* @param i_serviceFactory A special service factory could be introduced while initializing.
@@ -77,7 +77,7 @@ public class CallQueryWizard
if (sEvent.equals(PropertyNames.START))
{
QueryWizard CurQueryWizard = new QueryWizard( m_serviceFactory, m_wizardContext );
- Command = CurQueryWizard.start();
+ CurQueryWizard.start();
}
}
catch (Exception exception)
diff --git a/wizards/com/sun/star/wizards/query/QuerySummary.java b/wizards/com/sun/star/wizards/query/QuerySummary.java
index 7abe24f..e6999b6 100644
--- a/wizards/com/sun/star/wizards/query/QuerySummary.java
+++ b/wizards/com/sun/star/wizards/query/QuerySummary.java
@@ -30,7 +30,7 @@ public class QuerySummary extends QueryMetaData
{
final private int RID_QUERY = 2300;
- final protected int RID_REPORT = 2400;
+
private String sSummary;
private Resource oResource;
private String sSeparator;
diff --git a/wizards/com/sun/star/wizards/query/QueryWizard.java b/wizards/com/sun/star/wizards/query/QueryWizard.java
index 008c051..a931f0b 100644
--- a/wizards/com/sun/star/wizards/query/QueryWizard.java
+++ b/wizards/com/sun/star/wizards/query/QueryWizard.java
@@ -43,7 +43,7 @@ import com.sun.star.wizards.ui.TitlesComponent;
public class QueryWizard extends DatabaseObjectWizard
{
- public static final String SFILLUPFIELDSLISTBOX = "fillUpFieldsListbox";
+
private static final int SOFIELDSELECTION_PAGE = 1;
private static final int SOSORTING_PAGE = 2;
private static final int SOFILTER_PAGE = 3;
diff --git a/wizards/com/sun/star/wizards/report/DBColumn.java b/wizards/com/sun/star/wizards/report/DBColumn.java
index 09c5f95..169f66b 100644
--- a/wizards/com/sun/star/wizards/report/DBColumn.java
+++ b/wizards/com/sun/star/wizards/report/DBColumn.java
@@ -47,13 +47,13 @@ public class DBColumn
private XCell xValCell;
private XTextRange xValTextCell;
private XTextCursor xValCellCursor;
- public XNumberFormats xValCellNumberFormats;
+
public XCell xNameCell;
private XTextRange xNameTextCell;
private boolean bAlignLeft;
- public Object DefaultValue;
+
private String CharFontName;
- public int FormatKey;
+
private PropertyState PropertyState;
public int ValColumn = 1;
private int ValRow = 0;
@@ -63,7 +63,7 @@ public class DBColumn
private XCellRange xCellRange;
public XNamed xTableName;
private boolean bIsGroupColumn;
- TextDocument oTextDocument;
+
private RecordParser CurDBMetaData;
private RecordTable CurRecordTable;
private TextTableHandler oTextTableHandler;
diff --git a/wizards/com/sun/star/wizards/report/Dataimport.java b/wizards/com/sun/star/wizards/report/Dataimport.java
index 10e0aa3..fc6dd01 100644
--- a/wizards/com/sun/star/wizards/report/Dataimport.java
+++ b/wizards/com/sun/star/wizards/report/Dataimport.java
@@ -34,11 +34,11 @@ public class Dataimport extends UnoDialog2 implements com.sun.star.awt.XActionLi
// ReportTextDocument CurReportDocument;
IReportDocument CurReportDocument;
- static boolean bStopProcess;
+
private static String sProgressDBConnection;
private static String sProgressDataImport;
- private static String sProgressBaseCurRecord;
- static String sProgressCurRecord;
+
+
private static String sProgressTitle;
private static String sStop;
@@ -49,7 +49,6 @@ public class Dataimport extends UnoDialog2 implements com.sun.star.awt.XActionLi
sProgressDBConnection = m_oResource.getResText(UIConsts.RID_DB_COMMON + 34);
sProgressDataImport = m_oResource.getResText(UIConsts.RID_REPORT + 67);
sProgressTitle = m_oResource.getResText(UIConsts.RID_REPORT + 62);
- sProgressBaseCurRecord = m_oResource.getResText(UIConsts.RID_REPORT + 63);
sStop = m_oResource.getResText(UIConsts.RID_DB_COMMON + 21);
}
diff --git a/wizards/com/sun/star/wizards/report/RecordTable.java b/wizards/com/sun/star/wizards/report/RecordTable.java
index 14c9c6b..cd40a35 100644
--- a/wizards/com/sun/star/wizards/report/RecordTable.java
+++ b/wizards/com/sun/star/wizards/report/RecordTable.java
@@ -33,14 +33,14 @@ import com.sun.star.wizards.text.ViewHandler;
public class RecordTable
{
- String CurFieldName;
- String LabelDescription;
+
+
public XNamed xTableName;
public XCellRange xCellRange;
public XTextTable xTextTable;
private TextTableHandler oTextTableHandler;
public XTableColumns xTableColumns;
- private XTableRows xTableRows;
+
public RecordTable(TextTableHandler _oTextTableHandler)
{
@@ -72,7 +72,7 @@ public class RecordTable
xTableName = UnoRuntime.queryInterface(XNamed.class, xTextTable);
xTableName.setName(ReportTextDocument.TBLRECORDSECTION);
}
- xTableRows = xTextTable.getRows();
+ xTextTable.getRows();
xTableColumns = xTextTable.getColumns();
xCellRange = UnoRuntime.queryInterface(XCellRange.class, xTextTable);
}
diff --git a/wizards/com/sun/star/wizards/report/ReportFinalizer.java b/wizards/com/sun/star/wizards/report/ReportFinalizer.java
index 9f75069..68356b3 100644
--- a/wizards/com/sun/star/wizards/report/ReportFinalizer.java
+++ b/wizards/com/sun/star/wizards/report/ReportFinalizer.java
@@ -32,13 +32,12 @@ public class ReportFinalizer
private WizardDialog CurUnoDialog;
private XTextComponent xTitleTextBox;
- XTextComponent[] xSaveTextBox = new XTextComponent[2];
- Object chkTemplate;
+
+
private String CHANGEREPORTTITLE_FUNCNAME = "changeReportTitle";
private String TOGGLESUBTEMPLATECONTROLS_FUNCNAME = "toggleSubTemplateControls";
- String TemplatePath;
private String StoreName;
- boolean bfinalaskbeforeOverwrite;
+
private String DefaultName;
private String OldDefaultName;
private IReportDocument CurReportDocument;
diff --git a/wizards/com/sun/star/wizards/report/ReportLayouter.java b/wizards/com/sun/star/wizards/report/ReportLayouter.java
index 599d376..475e2d5 100644
--- a/wizards/com/sun/star/wizards/report/ReportLayouter.java
+++ b/wizards/com/sun/star/wizards/report/ReportLayouter.java
@@ -37,7 +37,7 @@ public class ReportLayouter
{
private UnoDialog CurUnoDialog;
- final int SOTXTTITLE = 28;
+
private final int SOCONTENTLST = 29;
final static public int SOOPTLANDSCAPE = 30;
final static public int SOOPTPORTRAIT = 31;
diff --git a/wizards/com/sun/star/wizards/report/ReportTextDocument.java b/wizards/com/sun/star/wizards/report/ReportTextDocument.java
index 0cd7b9a..73b249d 100644
--- a/wizards/com/sun/star/wizards/report/ReportTextDocument.java
+++ b/wizards/com/sun/star/wizards/report/ReportTextDocument.java
@@ -247,7 +247,6 @@ class ReportTextDocument extends com.sun.star.wizards.text.TextDocument implemen
Helper.setUnoPropertyValue(FirstPageStyle, SIZE, oNewSize);
int iLeftMargin = AnyConverter.toInt(Helper.getUnoPropertyValue(ReportPageStyle, "LeftMargin"));
int iRightMargin = AnyConverter.toInt(Helper.getUnoPropertyValue(ReportPageStyle, "RightMargin"));
- PageWidth = oNewSize.Width - iLeftMargin - iRightMargin;
if (CurRecordTable != null)
{
CurRecordTable.adjustOptimalTableWidths(xMSF, oViewHandler);
diff --git a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
index 1bb3cc9..74dcbeb 100644
--- a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
+++ b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
@@ -127,19 +127,17 @@ public class ReportTextImplementation extends ReportImplementationHelper impleme
}
private static String sMsgQueryCreationImpossible;
private static String sReportFormNotExisting;
- private static String sMsgHiddenControlMissing;
+
private static String sMsgEndAutopilot;
- static String sMsgConnectionImpossible;
- private static String sMsgNoConnection;
- static String[] ReportMessages = new String[4];
+
+
+
private void initialResources()
{
sReportFormNotExisting = m_resource.getResText(UIConsts.RID_REPORT + 64);
sMsgQueryCreationImpossible = m_resource.getResText(UIConsts.RID_REPORT + 65);
- sMsgHiddenControlMissing = m_resource.getResText(UIConsts.RID_REPORT + 66);
sMsgEndAutopilot = m_resource.getResText(UIConsts.RID_DB_COMMON + 33);
- sMsgNoConnection = m_resource.getResText(UIConsts.RID_DB_COMMON + 14);
}
private void addTextSectionCopies()
diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/DesignTemplate.java b/wizards/com/sun/star/wizards/reportbuilder/layout/DesignTemplate.java
index cbf4ee9..82c8b53 100644
--- a/wizards/com/sun/star/wizards/reportbuilder/layout/DesignTemplate.java
+++ b/wizards/com/sun/star/wizards/reportbuilder/layout/DesignTemplate.java
@@ -33,8 +33,8 @@ public class DesignTemplate
{
private XReportDefinition m_xReportDefinition;
- private XMultiServiceFactory m_xGlobalMSF;
- private String m_sFilename;
+
+
private DesignTemplate()
{
@@ -291,8 +291,6 @@ public class DesignTemplate
private void load(XMultiServiceFactory _xMSF, String _sPath) throws com.sun.star.uno.Exception
{
- m_xGlobalMSF = _xMSF;
- m_sFilename = _sPath;
final Object aObj = _xMSF.createInstance("com.sun.star.report.ReportDefinition");
m_xReportDefinition = UnoRuntime.queryInterface(XReportDefinition.class, aObj);
diff --git a/wizards/com/sun/star/wizards/table/CGCategory.java b/wizards/com/sun/star/wizards/table/CGCategory.java
index bbc244a..eff29ca 100644
--- a/wizards/com/sun/star/wizards/table/CGCategory.java
+++ b/wizards/com/sun/star/wizards/table/CGCategory.java
@@ -30,8 +30,8 @@ import com.sun.star.wizards.common.Configuration;
public class CGCategory
{
- public String Name;
- public int Index;
+
+
private final String CGROOTPATH = "/org.openoffice.Office.TableWizard/TableWizard/";
private XMultiServiceFactory xMSF;
XNameAccess xNameAccessTablesNode;
diff --git a/wizards/com/sun/star/wizards/table/CGTable.java b/wizards/com/sun/star/wizards/table/CGTable.java
index c86718c..cf3fb17 100644
--- a/wizards/com/sun/star/wizards/table/CGTable.java
+++ b/wizards/com/sun/star/wizards/table/CGTable.java
@@ -29,8 +29,8 @@ public class CGTable
private XMultiServiceFactory xMSF;
XNameAccess xNameAccessFieldsNode;
private XNameAccess xNameAccessTableNode;
- public String Index;
- public String Name;
+
+
public CGTable(XMultiServiceFactory _xMSF)
{
diff --git a/wizards/com/sun/star/wizards/table/CallTableWizard.java b/wizards/com/sun/star/wizards/table/CallTableWizard.java
index b7693a1..c0214cf 100644
--- a/wizards/com/sun/star/wizards/table/CallTableWizard.java
+++ b/wizards/com/sun/star/wizards/table/CallTableWizard.java
@@ -56,10 +56,8 @@ public class CallTableWizard
{
private PropertyValue[] m_wizardContext;
- // <properties>
- private String Command;
- public final Integer CommandType = com.sun.star.sdb.CommandType.TABLE;
- // </properties>
+
+
/** The constructor of the inner class has a XMultiServiceFactory parameter.
*/
@@ -78,7 +76,7 @@ public class CallTableWizard
if ( sEvent.equals(PropertyNames.START) )
{
TableWizard CurTableWizard = new TableWizard( m_serviceFactory, m_wizardContext );
- Command = CurTableWizard.startTableWizard();
+ CurTableWizard.startTableWizard();
}
}
catch (Exception exception)
diff --git a/wizards/com/sun/star/wizards/table/FieldFormatter.java b/wizards/com/sun/star/wizards/table/FieldFormatter.java
index 6bbc1d0..da89154 100644
--- a/wizards/com/sun/star/wizards/table/FieldFormatter.java
+++ b/wizards/com/sun/star/wizards/table/FieldFormatter.java
@@ -47,11 +47,11 @@ public class FieldFormatter implements XItemListener
private XButton btnShiftUp;
private XButton btnShiftDown;
private short curtabindex;
- String TOGGLEBUTTONS = "toggleButtons";
- String ADDFIELDNAME = "addFieldName";
- String REMOVEFIELDNAME = "removeFieldName";
+
+
+
private String MODIFYFIELDNAME = "modifyFieldName";
- String[] fieldnames;
+
private String suntitled;
private Integer IFieldFormatStep;
diff --git a/wizards/com/sun/star/wizards/table/Finalizer.java b/wizards/com/sun/star/wizards/table/Finalizer.java
index 162edb2..6944182 100644
--- a/wizards/com/sun/star/wizards/table/Finalizer.java
+++ b/wizards/com/sun/star/wizards/table/Finalizer.java
@@ -34,7 +34,7 @@ public class Finalizer
private short curtabindex;
private XRadioButton optModifyTable;
private XRadioButton optWorkWithTable;
- private XRadioButton optStartFormWizard;
+
private XTextComponent txtTableName;
private XListBox xCatalogListBox;
private XListBox xSchemaListBox;
@@ -239,7 +239,7 @@ public class Finalizer
{
UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGTABLE_OPT_MODIFYTABLE", sModifyTable, 101, new Integer(109 + ndiffPosY), IFINALSTEP, new Short(curtabindex++), 177
});
- optStartFormWizard = CurUnoDialog.insertRadioButton("optStartFormWizard", null,
+ CurUnoDialog.insertRadioButton("optStartFormWizard", null,
new String[]
{
PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_HELPURL, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH
diff --git a/wizards/com/sun/star/wizards/table/TableWizard.java b/wizards/com/sun/star/wizards/table/TableWizard.java
index 9431b82..ea61d67 100644
--- a/wizards/com/sun/star/wizards/table/TableWizard.java
+++ b/wizards/com/sun/star/wizards/table/TableWizard.java
@@ -44,7 +44,7 @@ public class TableWizard extends DatabaseObjectWizard implements XTextListener
private ScenarioSelector curScenarioSelector;
private FieldFormatter curFieldFormatter;
private PrimaryKeyHandler curPrimaryKeyHandler;
- private String sMsgWizardName = PropertyNames.EMPTY_STRING;
+
public HashMap<String, FieldDescription> fielditems;
private int wizardmode;
private String tablename;
@@ -52,13 +52,12 @@ public class TableWizard extends DatabaseObjectWizard implements XTextListener
private String serrTableNameexists;
private String scomposedtablename;
private TableDescriptor curTableDescriptor;
- public static final int SONULLPAGE = 0;
+
public static final int SOMAINPAGE = 1;
public static final int SOFIELDSFORMATPAGE = 2;
public static final int SOPRIMARYKEYPAGE = 3;
public static final int SOFINALPAGE = 4;
private String sMsgColumnAlreadyExists = PropertyNames.EMPTY_STRING;
- String WizardHeaderText[] = new String[8];
private String m_tableName;
@@ -389,7 +388,6 @@ public class TableWizard extends DatabaseObjectWizard implements XTextListener
public boolean getTableResources()
{
- sMsgWizardName = super.m_oResource.getResText(UIConsts.RID_TABLE + 1);
slblFields = m_oResource.getResText(UIConsts.RID_TABLE + 19);
slblSelFields = m_oResource.getResText(UIConsts.RID_TABLE + 25);
serrToManyFields = m_oResource.getResText(UIConsts.RID_TABLE + 47);
diff --git a/wizards/com/sun/star/wizards/text/TextDocument.java b/wizards/com/sun/star/wizards/text/TextDocument.java
index 33739c5..7db7ea5 100644
--- a/wizards/com/sun/star/wizards/text/TextDocument.java
+++ b/wizards/com/sun/star/wizards/text/TextDocument.java
@@ -73,21 +73,21 @@ public class TextDocument
public XComponent xComponent;
public com.sun.star.text.XTextDocument xTextDocument;
- public com.sun.star.util.XNumberFormats NumberFormats;
+
public com.sun.star.document.XDocumentProperties m_xDocProps;
public com.sun.star.task.XStatusIndicator xProgressBar;
public com.sun.star.frame.XFrame xFrame;
public XText xText;
public XMultiServiceFactory xMSFDoc;
public XMultiServiceFactory xMSF;
- private com.sun.star.util.XNumberFormatsSupplier xNumberFormatsSupplier;
+
public com.sun.star.awt.XWindowPeer xWindowPeer;
- public int PageWidth;
- public int ScaleWidth;
- private Size DocSize;
- public com.sun.star.awt.Rectangle PosSize;
- private com.sun.star.lang.Locale CharLocale;
- private XStorable xStorable;
+
+
+
+
+
+
// creates an instance of TextDocument and creates a named frame. No document is actually loaded into this frame.
public TextDocument(XMultiServiceFactory xMSF, XTerminateListener listener, String FrameName)
@@ -207,11 +207,10 @@ public class TextDocument
}
xWindowPeer = UnoRuntime.queryInterface(XWindowPeer.class, xFrame.getComponentWindow());
xMSFDoc = UnoRuntime.queryInterface(XMultiServiceFactory.class, xTextDocument);
- xNumberFormatsSupplier = UnoRuntime.queryInterface(XNumberFormatsSupplier.class, xTextDocument);
+ UnoRuntime.queryInterface(XNumberFormatsSupplier.class, xTextDocument);
XDocumentPropertiesSupplier xDocPropsSuppl = UnoRuntime.queryInterface(XDocumentPropertiesSupplier.class, xTextDocument);
m_xDocProps = xDocPropsSuppl.getDocumentProperties();
- CharLocale = (Locale) Helper.getUnoStructValue(xComponent, "CharLocale");
xText = xTextDocument.getText();
}
@@ -219,11 +218,10 @@ public class TextDocument
{
xWindowPeer = UnoRuntime.queryInterface(XWindowPeer.class, xFrame.getComponentWindow());
xMSFDoc = UnoRuntime.queryInterface(XMultiServiceFactory.class, xTextDocument);
- xNumberFormatsSupplier = UnoRuntime.queryInterface(XNumberFormatsSupplier.class, xTextDocument);
+ UnoRuntime.queryInterface(XNumberFormatsSupplier.class, xTextDocument);
XDocumentPropertiesSupplier xDocPropsSuppl = UnoRuntime.queryInterface(XDocumentPropertiesSupplier.class, xTextDocument);
m_xDocProps = xDocPropsSuppl.getDocumentProperties();
- CharLocale = (Locale) Helper.getUnoStructValue(xComponent, "CharLocale");
- xStorable = UnoRuntime.queryInterface(XStorable.class, xTextDocument);
+ UnoRuntime.queryInterface(XStorable.class, xTextDocument);
xText = xTextDocument.getText();
}
@@ -264,7 +262,6 @@ public class TextDocument
}
Object oDoc = OfficeDocument.load(xFrame, sDefaultTemplate, "_self", loadValues);
xTextDocument = (com.sun.star.text.XTextDocument) oDoc;
- DocSize = getPageSize();
xMSFDoc = UnoRuntime.queryInterface(XMultiServiceFactory.class, xTextDocument);
ViewHandler myViewHandler = new ViewHandler(xTextDocument);
@@ -318,11 +315,10 @@ public class TextDocument
xWindowPeer = UnoRuntime.queryInterface(XWindowPeer.class, xWindow);
xMSFDoc = UnoRuntime.queryInterface(XMultiServiceFactory.class, xTextDocument);
- xNumberFormatsSupplier = UnoRuntime.queryInterface(XNumberFormatsSupplier.class, xTextDocument);
+ UnoRuntime.queryInterface(XNumberFormatsSupplier.class, xTextDocument);
XDocumentPropertiesSupplier xDocPropsSuppl = UnoRuntime.queryInterface(XDocumentPropertiesSupplier.class, xTextDocument);
m_xDocProps = xDocPropsSuppl.getDocumentProperties();
- CharLocale = (Locale) Helper.getUnoStructValue(xComponent, "CharLocale");
}
public static XTextCursor createTextCursor(Object oCursorContainer)
diff --git a/wizards/com/sun/star/wizards/text/TextTableHandler.java b/wizards/com/sun/star/wizards/text/TextTableHandler.java
index ad6c268..c04d3b5 100644
--- a/wizards/com/sun/star/wizards/text/TextTableHandler.java
+++ b/wizards/com/sun/star/wizards/text/TextTableHandler.java
@@ -46,7 +46,7 @@ public class TextTableHandler
public XTextTablesSupplier xTextTablesSupplier;
private XMultiServiceFactory xMSFDoc;
private XTextDocument xTextDocument;
- private XSimpleText xSimpleText;
+
private NumberFormatter oNumberFormatter;
private Locale aCharLocale;
@@ -58,7 +58,7 @@ public class TextTableHandler
this.xMSFDoc = xMSF;
this.xTextDocument = xTextDocument;
xTextTablesSupplier = UnoRuntime.queryInterface(XTextTablesSupplier.class, xTextDocument);
- xSimpleText = UnoRuntime.queryInterface(XSimpleText.class, xTextDocument.getText());
+ UnoRuntime.queryInterface(XSimpleText.class, xTextDocument.getText());
XNumberFormatsSupplier xNumberFormatsSupplier = UnoRuntime.queryInterface(XNumberFormatsSupplier.class, xTextDocument);
aCharLocale = (Locale) Helper.getUnoStructValue(xTextDocument, "CharLocale");
oNumberFormatter = new NumberFormatter(xNumberFormatsSupplier, aCharLocale);
diff --git a/wizards/com/sun/star/wizards/ui/AggregateComponent.java b/wizards/com/sun/star/wizards/ui/AggregateComponent.java
index f6607f4..34e52a3 100644
--- a/wizards/com/sun/star/wizards/ui/AggregateComponent.java
+++ b/wizards/com/sun/star/wizards/ui/AggregateComponent.java
@@ -44,28 +44,28 @@ public class AggregateComponent extends ControlScroller
"SUM", "AVG", "MIN", "MAX"
};
private QueryMetaData CurDBMetaData;
- private XButton optDetailQuery;
- private XButton optSummaryQuery;
+
+
private String soptDetailQuery;
private String soptSummaryQuery;
private String slblAggregate;
private String slblFieldNames;
private String sDuplicateAggregateFunction;
private int Count;
- int iQueryType;
+
private final int SOADDROW = 1;
private final int SOREMOVEROW = 2;
- final int CONTROLROWDIST = 18;
+
private ArrayList<ControlRow> ControlRowVector;
- String OPTIONBUTTONDETAILQUERY_ITEM_CHANGED = "toggleComponent";
- String OPTIONBUTTONSUMMARYQUERY_ITEM_CHANGED = "toggleComponent";
- String LISTBOXFUNCTIONS_ACTION_PERFORMED;
- String LISTBOXFUNCTIONS_ITEM_CHANGED;
- String LISTBOXFIELDNAMES_ACTION_PERFORMED;
- String LISTBOXFIELDNAMES_ITEM_CHANGED;
- String COMMANDBUTTONPLUS_ACTION_PERFORMED = "addRow";
- String COMMANDBUTTONMINUS_ACTION_PERFORMED = "removeRow";
- ArrayList<String> ControlRows;
+
+
+
+
+
+
+
+
+
private int curHelpID;
private int lastHelpIndex;
@@ -78,7 +78,7 @@ public class AggregateComponent extends ControlScroller
curHelpID = _firstHelpID;
this.CurDBMetaData = _CurDBMetaData;
Count = 1;
- optDetailQuery = CurUnoDialog.insertRadioButton("optDetailQuery", 0, new ActionListenerImpl(),
+ CurUnoDialog.insertRadioButton("optDetailQuery", 0, new ActionListenerImpl(),
new String[]
{
PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_HELPURL, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STATE, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH
@@ -88,7 +88,7 @@ public class AggregateComponent extends ControlScroller
8, HelpIds.getHelpIdString(curHelpID), soptDetailQuery, new Integer(_iPosX), new Integer(iCompPosY - 42), new Short((short) 1), IStep, new Short(curtabindex++), new Integer(iCompWidth)
});
- optSummaryQuery = CurUnoDialog.insertRadioButton("optSummaryQuery", 0, new ActionListenerImpl(),
+ CurUnoDialog.insertRadioButton("optSummaryQuery", 0, new ActionListenerImpl(),
new String[]
{
PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_HELPURL, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_MULTILINE, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH
diff --git a/wizards/com/sun/star/wizards/ui/ButtonList.java b/wizards/com/sun/star/wizards/ui/ButtonList.java
index f15f7d2..d9e0050 100644
--- a/wizards/com/sun/star/wizards/ui/ButtonList.java
+++ b/wizards/com/sun/star/wizards/ui/ButtonList.java
@@ -58,7 +58,7 @@ public class ButtonList implements XItemEventBroadcaster, XActionListener
private int imageTextLines = 1;
private boolean rowSelect = false;
public int tabIndex;
- public Boolean scaleImages = Boolean.TRUE;
+
private String m_aControlName = "il";
private int m_nCurrentSelection = -1;
private int pageStart = 0;
diff --git a/wizards/com/sun/star/wizards/ui/ControlScroller.java b/wizards/com/sun/star/wizards/ui/ControlScroller.java
index 171b642..b738b4a 100644
--- a/wizards/com/sun/star/wizards/ui/ControlScroller.java
+++ b/wizards/com/sun/star/wizards/ui/ControlScroller.java
@@ -28,7 +28,7 @@ public abstract class ControlScroller
{
protected WizardDialog CurUnoDialog;
- private XMultiServiceFactory xMSF;
+
protected int ncurfieldcount;
private int nblockincrement;
private int nlineincrement;
@@ -36,13 +36,13 @@ public abstract class ControlScroller
private int ntotfieldcount;
private XScrollBar xScrollBar;
private ArrayList<PropertyValue[]> scrollfields;
- private Integer ICompPosX;
+
protected int iCompPosX;
- private Integer ICompPosY;
+
protected int iCompPosY;
- private Integer ICompWidth;
+
protected int iCompWidth;
- protected Integer ICompHeight;
+
protected int iCompHeight;
private int iStartPosY;
protected short curtabindex;
@@ -54,7 +54,7 @@ public abstract class ControlScroller
protected int curHelpIndex;
private String sIncSuffix;
protected ArrayList<Object> ControlGroupVector = new ArrayList<Object>();
- protected PeerConfig oTitlePeerConfig;
+
private class AdjustmentListenerImpl implements com.sun.star.awt.XAdjustmentListener
{
@@ -82,7 +82,6 @@ public abstract class ControlScroller
// TODO add parameters for tabindices and helpindex
protected ControlScroller(WizardDialog _CurUnoDialog, XMultiServiceFactory _xMSF, int _iStep, int _iCompPosX, int _iCompPosY, int _iCompWidth, int _nblockincrement, int _nlinedistance, int _firsthelpindex)
{
- this.xMSF = _xMSF;
this.nblockincrement = _nblockincrement;
this.CurUnoDialog = _CurUnoDialog;
this.iStep = _iStep;
@@ -92,10 +91,7 @@ public abstract class ControlScroller
IStep = new Integer(iStep);
this.iCompPosX = _iCompPosX;
this.iCompPosY = _iCompPosY;
- this.ICompPosX = new Integer(iCompPosX);
- this.ICompPosY = new Integer(iCompPosY);
this.iCompWidth = _iCompWidth;
- this.ICompWidth = new Integer(iCompWidth);
this.iCompHeight = 2 * SORELFIRSTPOSY + nblockincrement * linedistance;
iStartPosY = iCompPosY + SORELFIRSTPOSY;
int ScrollHeight = iCompHeight - 2;
diff --git a/wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java b/wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java
index 2aad4c6..8111968 100644
--- a/wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java
+++ b/wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java
@@ -30,13 +30,13 @@ import com.sun.star.wizards.common.PropertyNames;
public abstract class DBLimitedFieldSelection
{
- private XMultiServiceFactory xMSF;
+
protected WizardDialog CurUnoDialog;
private String sNoField;
protected Integer IStep;
- private Integer ICompPosX;
- private Integer ICompPosY;
- private Integer ICompWidth;
+
+
+
protected final int rowcount = 4;
private final int MAXSELINDEX = rowcount - 1;
protected short curtabindex;
@@ -47,15 +47,11 @@ public abstract class DBLimitedFieldSelection
public DBLimitedFieldSelection(WizardDialog _CurUnoDialog, int iStep, int _iCompPosX, int iCompPosY, int iCompWidth, int _FirstHelpIndex)
{
this.CurUnoDialog = _CurUnoDialog;
- xMSF = CurUnoDialog.xMSF;
FirstHelpIndex = _FirstHelpIndex;
curtabindex = (short) (iStep * 100);
sNoField = CurUnoDialog.m_oResource.getResText(UIConsts.RID_REPORT + 8);
IStep = new Integer(iStep);
iCompPosX = _iCompPosX;
- ICompPosX = new Integer(iCompPosX);
- ICompPosY = new Integer(iCompPosY);
- ICompWidth = new Integer(iCompWidth);
iCurPosY = iCompPosY;
for (int i = 0; i < rowcount; i++)
{
diff --git a/wizards/com/sun/star/wizards/ui/FieldSelection.java b/wizards/com/sun/star/wizards/ui/FieldSelection.java
index cb35764..7a7047c 100644
--- a/wizards/com/sun/star/wizards/ui/FieldSelection.java
+++ b/wizards/com/sun/star/wizards/ui/FieldSelection.java
@@ -35,10 +35,10 @@ public class FieldSelection
protected boolean AppendMode = false;
protected Integer IStep;
- private int CompPosX;
+
private int CompPosY;
private int CompHeight;
- private int CompWidth;
+
private XFieldSelectionListener xFieldSelection;
private int maxfieldcount = 10000000;
@@ -174,10 +174,8 @@ public class FieldSelection
int ShiftButtonCount = 2;
int a = 0;
this.CurUnoDialog = CurUnoDialog;
- this.CompPosX = CompPosX;
this.CompPosY = CompPosY;
this.CompHeight = CompHeight;
- this.CompWidth = CompWidth;
Object btnmoveall = null;
Object btnremoveall = null;
diff --git a/wizards/com/sun/star/wizards/ui/FilterComponent.java b/wizards/com/sun/star/wizards/ui/FilterComponent.java
index 2feef47..7bfcc76 100644
--- a/wizards/com/sun/star/wizards/ui/FilterComponent.java
+++ b/wizards/com/sun/star/wizards/ui/FilterComponent.java
@@ -72,7 +72,7 @@ public class FilterComponent
private int iTimeFormat;
private PropertyValue[][] filterconditions;
private short curtabindex;
- private XMultiServiceFactory xMSF;
+
private final int SO_FIRSTFIELDNAME = 1;
private final int SO_SECONDFIELDNAME = 2;
private final int SO_THIRDFIELDNAME = 3;
@@ -101,13 +101,8 @@ public class FilterComponent
private final int SO_SECONDBOOLFIELDNAME = 256 + 2;
private final int SO_THIRDBOOLFIELDNAME = 256 + 3;
private final int SO_FOURTHBOOLFIELDNAME = 256 + 4;
- int SO_BOOLEANLIST[] =
- {
- SO_FIRSTBOOLFIELDNAME, SO_SECONDBOOLFIELDNAME, SO_THIRDBOOLFIELDNAME, SO_FOURTHBOOLFIELDNAME
- };
- final int SO_OPTQUERYMODE = 5;
private int SOI_MATCHALL = 0;
private int SOI_MATCHANY = 1;
private int curHelpID;
@@ -373,7 +368,6 @@ public class FilterComponent
public FilterComponent(WizardDialog CurUnoDialog, XMultiServiceFactory _xMSF, int iStep, int iPosX, int iPosY, int iWidth, int FilterCount, QueryMetaData _oQueryMetaData, int _firstHelpID)
{
this.curHelpID = _firstHelpID;
- this.xMSF = _xMSF;
this.IStep = Integer.valueOf(iStep);
curtabindex = UnoDialog.setInitialTabindex(iStep);
diff --git a/wizards/com/sun/star/wizards/ui/SortingComponent.java b/wizards/com/sun/star/wizards/ui/SortingComponent.java
index ffec486..67db727 100644
--- a/wizards/com/sun/star/wizards/ui/SortingComponent.java
+++ b/wizards/com/sun/star/wizards/ui/SortingComponent.java
@@ -26,16 +26,16 @@ import java.util.ArrayList;
public class SortingComponent
{
- private com.sun.star.lang.XMultiServiceFactory xMSF;
+
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list