[Libreoffice-commits] core.git: 14 commits - bean/qa bridges/test connectivity/com connectivity/JunitTest_complex.mk connectivity/org connectivity/qa dbaccess/qa extensions/qa forms/qa framework/JunitTest_framework_complex.mk framework/qa javaunohelper/test jurt/test nlpsolver/Jar_EvolutionarySolver.mk nlpsolver/Jar_nlpsolver.mk nlpsolver/src nlpsolver/ThirdParty qadevOOo/runner qadevOOo/testdocs qadevOOo/tests reportbuilder/Jar_reportbuilder.mk reportbuilder/java reportdesign/qa sc/qa svl/qa swext/mediawiki toolkit/qa toolkit/test unotest/source unotools/qa vcl/qa wizards/com wizards/Jar_commonwizards.mk xmlsecurity/test_docs
Noel Grandin
noel at peralex.com
Mon Jan 5 00:33:42 PST 2015
bean/qa/complex/bean/ScreenComparer.java | 4
bridges/test/java_remote/Bug107753_Test.java | 4
bridges/test/testclient.java | 7
connectivity/JunitTest_complex.mk | 1
connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageAccess.java | 1
connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java | 5
connectivity/org/hsqldb/lib/FileSystemRuntimeException.java | 26
connectivity/qa/complex/connectivity/HsqlDriverTest.java | 4
connectivity/qa/complex/connectivity/hsqldb/DatabaseMetaData.java | 98 --
connectivity/qa/complex/connectivity/hsqldb/TestCacheSize.java | 5
connectivity/qa/connectivity/tools/CsvDatabase.java | 5
connectivity/qa/connectivity/tools/DbaseDatabase.java | 4
connectivity/qa/connectivity/tools/QueryDefinition.java | 16
connectivity/qa/connectivity/tools/sdb/Connection.java | 7
dbaccess/qa/complex/dbaccess/DatabaseApplication.java | 18
extensions/qa/integration/extensions/ObjectInspector.java | 2
forms/qa/integration/forms/FormComponent.java | 58 -
forms/qa/integration/forms/SpreadsheetDocument.java | 70 -
forms/qa/org/openoffice/xforms/XMLDocument.java | 7
framework/JunitTest_framework_complex.mk | 3
framework/qa/complex/dispatches/Interceptor.java | 12
framework/qa/complex/dispatches/checkdispatchapi.java | 6
framework/qa/complex/framework/recovery/TimeoutThread.java | 33
framework/qa/complex/imageManager/CheckImageManager.java | 4
framework/qa/complex/imageManager/_XImageManager.java | 3
framework/qa/complex/imageManager/_XTypeProvider.java | 3
framework/qa/complex/loadAllDocuments/StreamSimulator.java | 433 --------
framework/qa/complex/loadAllDocuments/TestDocument.java | 32
framework/qa/complex/path_substitution/PathSubstitutionTest.java | 3
javaunohelper/test/com/sun/star/lib/uno/helper/AWeakBase.java | 3
javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java | 3
javaunohelper/test/com/sun/star/lib/uno/helper/ProxyProvider.java | 6
jurt/test/com/sun/star/lib/uno/protocols/urp/TestBridge.java | 2
nlpsolver/Jar_EvolutionarySolver.mk | 10
nlpsolver/Jar_nlpsolver.mk | 1
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/encode/EvalStruct.java | 3
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/BasicArray.java | 31
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/BasicBound.java | 14
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/BasicTag.java | 21
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/CompareValue.java | 19
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalCompare.java | 30
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalFile.java | 277 -----
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalString.java | 47
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/OutputMethods.java | 34
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/goodness/PenaltyComparator.java | 41
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/goodness/SRComparator.java | 41
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/knowledge/Library.java | 4
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/problem/ProblemEncoder.java | 4
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/problem/UnconstrainedProblemEncoder.java | 40
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/space/DesignSpace.java | 5
nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/ModalState.java | 38
nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/controls/BaseControl.java | 4
qadevOOo/runner/base/java_fat.java | 13
qadevOOo/runner/base/java_fat_service.java | 2
qadevOOo/runner/helper/OfficeProvider.java | 8
qadevOOo/runner/org/openoffice/RunnerService.java | 51 -
qadevOOo/testdocs/qadevlibs/source/test/Job.java | 81 -
qadevOOo/tests/java/ifc/accessibility/_XAccessibleComponent.java | 4
qadevOOo/tests/java/ifc/i18n/_XCharacterClassification.java | 2
qadevOOo/tests/java/ifc/sdbc/_XParameters.java | 4
qadevOOo/tests/java/ifc/style/_PageStyle.java | 2
qadevOOo/tests/java/mod/_acceptor/uno/Acceptor.java | 2
qadevOOo/tests/java/mod/_forms/OButtonModel.java | 9
qadevOOo/tests/java/mod/_forms/OCheckBoxModel.java | 10
qadevOOo/tests/java/mod/_forms/OComboBoxModel.java | 10
qadevOOo/tests/java/mod/_forms/OCurrencyModel.java | 10
qadevOOo/tests/java/mod/_forms/ODateModel.java | 9
qadevOOo/tests/java/mod/_forms/OEditModel.java | 10
qadevOOo/tests/java/mod/_forms/OFixedTextModel.java | 10
qadevOOo/tests/java/mod/_forms/OFormattedFieldWrapper.java | 9
qadevOOo/tests/java/mod/_forms/OGridControlModel.java | 9
qadevOOo/tests/java/mod/_forms/OGroupBoxModel.java | 10
qadevOOo/tests/java/mod/_forms/OImageButtonModel.java | 10
qadevOOo/tests/java/mod/_forms/OImageControlModel.java | 9
qadevOOo/tests/java/mod/_forms/OListBoxModel.java | 14
qadevOOo/tests/java/mod/_forms/ONavigationBarModel.java | 10
qadevOOo/tests/java/mod/_forms/ONumericModel.java | 9
qadevOOo/tests/java/mod/_forms/OPatternModel.java | 9
qadevOOo/tests/java/mod/_forms/ORadioButtonModel.java | 10
qadevOOo/tests/java/mod/_forms/OTimeModel.java | 12
qadevOOo/tests/java/mod/_sc/ScChartObj.java | 2
qadevOOo/tests/java/mod/_sc/ScChartsObj.java | 2
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableChartsEnumeration.java | 2
qadevOOo/tests/java/mod/_sch/ChXDiagram.java | 8
qadevOOo/tests/java/mod/_xmloff/Impress/XMLSettingsImporter.java | 6
reportbuilder/Jar_reportbuilder.mk | 35
reportbuilder/java/org/libreoffice/report/DataSourceException.java | 29
reportbuilder/java/org/libreoffice/report/ReportExpressionMetaData.java | 36
reportbuilder/java/org/libreoffice/report/SOImageService.java | 13
reportbuilder/java/org/libreoffice/report/StorageRepository.java | 5
reportbuilder/java/org/libreoffice/report/pentaho/PentahoReportAddIn.java | 45
reportbuilder/java/org/libreoffice/report/pentaho/PentahoReportEngine.java | 5
reportbuilder/java/org/libreoffice/report/pentaho/PentahoReportEngineMetaData.java | 75 -
reportbuilder/java/org/libreoffice/report/pentaho/PentahoReportJob.java | 39
reportbuilder/java/org/libreoffice/report/pentaho/StarReportModule.java | 1
reportbuilder/java/org/libreoffice/report/pentaho/expressions/SumExpression.java | 19
reportbuilder/java/org/libreoffice/report/pentaho/expressions/SumExpressionMetaData.java | 69 -
reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/ImageElementContext.java | 14
reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/VariablesCollection.java | 12
reportbuilder/java/org/libreoffice/report/pentaho/loader/InputRepositoryLoader.java | 12
reportbuilder/java/org/libreoffice/report/pentaho/model/DataStyle.java | 4
reportbuilder/java/org/libreoffice/report/pentaho/model/FontFaceElement.java | 4
reportbuilder/java/org/libreoffice/report/pentaho/model/ImageElement.java | 5
reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeGroup.java | 11
reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeReport.java | 10
reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeStyle.java | 10
reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java | 19
reportbuilder/java/org/libreoffice/report/pentaho/parser/AttributeSpecification.java | 48
reportbuilder/java/org/libreoffice/report/pentaho/parser/OfficeDocumentXmlResourceFactory.java | 1
reportbuilder/java/org/libreoffice/report/pentaho/parser/OfficeParserUtil.java | 182 ---
reportbuilder/java/org/libreoffice/report/pentaho/parser/OfficeStylesXmlResourceFactory.java | 1
reportbuilder/java/org/libreoffice/report/pentaho/parser/StarStyleXmlFactoryModule.java | 1
reportbuilder/java/org/libreoffice/report/pentaho/parser/StarXmlFactoryModule.java | 1
reportbuilder/java/org/libreoffice/report/pentaho/parser/StyleMapper.java | 24
reportbuilder/java/org/libreoffice/report/pentaho/parser/office/FontFaceDeclsReadHandler.java | 5
reportbuilder/java/org/libreoffice/report/pentaho/parser/office/MasterStylesReadHandler.java | 5
reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt-schema-v1.0-os.xsd | 405 --------
reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/SubDocumentReadHandler.java | 5
reportbuilder/java/org/libreoffice/report/pentaho/parser/selectors.properties | 104 --
reportbuilder/java/org/libreoffice/report/pentaho/parser/style-mapping.txt | 8
reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/OneOfConstantsMapper.java | 68 -
reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/draw/TextAreaVerticalAlignMapper.java | 36
reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/fo/BackgroundColorMapper.java | 41
reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/fo/BorderRightMapper.java | 34
reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/fo/ColorMapper.java | 39
reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/fo/FontSizeMapper.java | 33
reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/fo/FontStyleMapper.java | 33
reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/fo/FontWeightMapper.java | 33
reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/fo/TextAlignMapper.java | 38
reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/style/FontFamilyGenericMapper.java | 52 -
reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/style/FontFamilyMapper.java | 52 -
reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/style/FontNameMapper.java | 36
reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/style/FontPitchMapper.java | 34
reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/style/FontReliefMapper.java | 33
reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/style/TextEmphasizeMapper.java | 32
reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/style/TextUnderlineColorMapper.java | 41
reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/style/TextUnderlineStyleMapper.java | 40
reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/style/TextUnderlineWidthMapper.java | 68 -
reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/style/TextUnderlineWordMode.java | 34
reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/style/VerticalAlignMapper.java | 38
reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/table/ColumnWidthMapper.java | 39
reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/table/RowHeightMapper.java | 39
reportbuilder/java/org/libreoffice/report/pentaho/parser/text/TextContentReadHandler.java | 5
reportbuilder/java/org/libreoffice/report/pentaho/parser/xlink/XLinkReadHandler.java | 20
reportbuilder/java/org/libreoffice/report/pentaho/styles/StyleMapperKey.java | 20
reportbuilder/java/org/libreoffice/report/pentaho/styles/StyleMapperXmlFactoryModule.java | 1
reportbuilder/java/org/libreoffice/report/pentaho/styles/StyleMapperXmlResourceFactory.java | 1
reportbuilder/java/org/libreoffice/report/util/DefaultParameterMap.java | 57 -
reportbuilder/java/org/libreoffice/report/util/DefaultReportJobDefinition.java | 54 -
reportbuilder/java/org/libreoffice/report/util/ManifestWriter.java | 113 --
reportdesign/qa/complex/reportdesign/ReportDesignerTest.java | 4
sc/qa/complex/dataPilot/CheckDataPilot.java | 4
svl/qa/complex/passwordcontainer/Test01.java | 1
svl/qa/complex/passwordcontainer/Test02.java | 1
svl/qa/complex/passwordcontainer/Test03.java | 1
swext/mediawiki/src/com/sun/star/wiki/Settings.java | 21
swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java | 1
toolkit/qa/complex/toolkit/accessibility/_XAccessibleExtendedComponent.java | 8
toolkit/qa/complex/toolkit/awtgrid/GridDataListener.java | 5
toolkit/test/accessibility/AccTreeNode.java | 39
toolkit/test/accessibility/AccessibilityTree.java | 5
toolkit/test/accessibility/AccessibilityTreeModel.java | 21
toolkit/test/accessibility/AccessibleCellHandler.java | 6
toolkit/test/accessibility/AccessibleContextHandler.java | 2
toolkit/test/accessibility/AccessibleEditableTextHandler.java | 6
toolkit/test/accessibility/AccessibleHyperlinkHandler.java | 8
toolkit/test/accessibility/AccessibleHypertextHandler.java | 8
toolkit/test/accessibility/AccessibleTableHandler.java | 6
toolkit/test/accessibility/AccessibleTreeCellRenderer.java | 108 --
toolkit/test/accessibility/AccessibleTreeNode.java | 12
toolkit/test/accessibility/Canvas.java | 4
toolkit/test/accessibility/CanvasShape.java | 28
toolkit/test/accessibility/EventLogger.java | 47
toolkit/test/accessibility/FrameActionListener.java | 32
toolkit/test/accessibility/HelpWindow.java | 14
toolkit/test/accessibility/InformationWriter.java | 406 --------
toolkit/test/accessibility/MessageArea.java | 11
toolkit/test/accessibility/NodeFactory.java | 2
toolkit/test/accessibility/NodeHandler.java | 10
toolkit/test/accessibility/NodeMap.java | 13
toolkit/test/accessibility/OfficeConnection.java | 8
toolkit/test/accessibility/Options.java | 10
toolkit/test/accessibility/SimpleOffice.java | 251 -----
toolkit/test/accessibility/StringNode.java | 5
toolkit/test/accessibility/TextLogger.java | 59 -
toolkit/test/accessibility/TextUpdateListener.java | 144 --
toolkit/test/accessibility/ov/ObjectView.java | 12
toolkit/test/accessibility/ov/ObjectViewContainer.java | 77 -
toolkit/test/accessibility/ov/SelectionView.java | 244 -----
toolkit/test/accessibility/ov/StateSetView.java | 263 -----
toolkit/test/accessibility/ov/TextView.java | 6
unotest/source/java/org/openoffice/test/UnoApiTest.java | 7
unotest/source/java/org/openoffice/test/tools/DocumentType.java | 18
unotest/source/java/org/openoffice/test/tools/OfficeDocument.java | 116 --
unotest/source/java/org/openoffice/test/tools/OfficeDocumentView.java | 33
unotest/source/java/org/openoffice/test/tools/SpreadsheetView.java | 32
unotools/qa/complex/tempfile/Test01.java | 3
unotools/qa/complex/tempfile/TestHelper.java | 10
vcl/qa/complex/memCheck/CheckMemoryUsage.java | 6
wizards/Jar_commonwizards.mk | 3
wizards/com/sun/star/wizards/common/Properties.java | 22
wizards/com/sun/star/wizards/common/SystemDialog.java | 3
wizards/com/sun/star/wizards/common/TerminateWizardException.java | 32
wizards/com/sun/star/wizards/db/CommandMetaData.java | 38
wizards/com/sun/star/wizards/db/DBMetaData.java | 16
wizards/com/sun/star/wizards/db/FieldColumn.java | 12
wizards/com/sun/star/wizards/document/FormHandler.java | 20
wizards/com/sun/star/wizards/document/OfficeDocument.java | 19
wizards/com/sun/star/wizards/form/FieldLinker.java | 4
wizards/com/sun/star/wizards/form/FormControlArranger.java | 5
wizards/com/sun/star/wizards/form/FormDocument.java | 7
wizards/com/sun/star/wizards/form/FormWizard.java | 2
wizards/com/sun/star/wizards/form/UIControlArranger.java | 1
wizards/com/sun/star/wizards/query/QueryWizard.java | 6
wizards/com/sun/star/wizards/report/ReportFinalizer.java | 14
wizards/com/sun/star/wizards/report/ReportTextDocument.java | 10
wizards/com/sun/star/wizards/report/ReportWizard.java | 13
wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation.java | 1
wizards/com/sun/star/wizards/reportbuilder/layout/DesignTemplate.java | 4
wizards/com/sun/star/wizards/table/Finalizer.java | 5
wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java | 5
wizards/com/sun/star/wizards/table/ScenarioSelector.java | 6
wizards/com/sun/star/wizards/ui/AggregateComponent.java | 7
wizards/com/sun/star/wizards/ui/ButtonList.java | 85 -
wizards/com/sun/star/wizards/ui/CommandFieldSelection.java | 2
wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java | 2
wizards/com/sun/star/wizards/ui/FieldSelection.java | 5
wizards/com/sun/star/wizards/ui/FilterComponent.java | 5
wizards/com/sun/star/wizards/ui/UnoDialog.java | 11
wizards/com/sun/star/wizards/ui/WizardDialog.java | 37
wizards/com/sun/star/wizards/ui/event/DataAware.java | 170 ---
wizards/com/sun/star/wizards/ui/event/DataAwareFields.java | 488 ----------
xmlsecurity/test_docs/tools/httpserv/src/httpserv/Main.java | 6
233 files changed, 174 insertions(+), 7376 deletions(-)
New commits:
commit 822b4fdee77c043038150aed7b3c5eefa4249a91
Author: Noel Grandin <noel at peralex.com>
Date: Thu Dec 18 13:54:43 2014 +0200
java: unnecessary method overrides
these methods did nothing but call their super implementation.
found by CodePro
Change-Id: Iba40d10ca1db0b4a3b4b971cacc2f299c4d5f389
diff --git a/qadevOOo/tests/java/mod/_forms/OButtonModel.java b/qadevOOo/tests/java/mod/_forms/OButtonModel.java
index ece8225..4a53ecc 100644
--- a/qadevOOo/tests/java/mod/_forms/OButtonModel.java
+++ b/qadevOOo/tests/java/mod/_forms/OButtonModel.java
@@ -102,15 +102,6 @@ public class OButtonModel extends GenericModelTest {
super.m_LCShape_Type = "CommandButton";
}
- /**
- * calls <CODE>cleanup()</CODE> from it's super class
- * @param tParam the test parameter
- * @param log the log writer
- */
- @Override
- protected void cleanup(TestParameters tParam, PrintWriter log) {
- super.cleanup(tParam, log);
- }
/**
diff --git a/qadevOOo/tests/java/mod/_forms/OCheckBoxModel.java b/qadevOOo/tests/java/mod/_forms/OCheckBoxModel.java
index c247b86..a902641 100644
--- a/qadevOOo/tests/java/mod/_forms/OCheckBoxModel.java
+++ b/qadevOOo/tests/java/mod/_forms/OCheckBoxModel.java
@@ -117,16 +117,6 @@ public class OCheckBoxModel extends GenericModelTest {
super.m_LCShape_Type = "FixedText";
}
- /**
- * calls <CODE>cleanup()</CODE> from it's super class
- * @param tParam the test parameter
- * @param log the log writer
- */
- @Override
- protected void cleanup(TestParameters tParam, PrintWriter log) {
- super.cleanup(tParam, log);
- }
-
/**
* calls <CODE>createTestEnvironment()</CODE> from it's super class
diff --git a/qadevOOo/tests/java/mod/_forms/OComboBoxModel.java b/qadevOOo/tests/java/mod/_forms/OComboBoxModel.java
index 5b8dbc8..5357928 100644
--- a/qadevOOo/tests/java/mod/_forms/OComboBoxModel.java
+++ b/qadevOOo/tests/java/mod/_forms/OComboBoxModel.java
@@ -132,16 +132,6 @@ public class OComboBoxModel extends GenericModelTest {
super.m_LCShape_Type = "FixedText";
}
- /**
- * calls <CODE>cleanup()</CODE> from it's super class
- * @param tParam the test parameter
- * @param log the log writer
- */
- @Override
- protected void cleanup(TestParameters tParam, PrintWriter log) {
- super.cleanup(tParam, log);
- }
-
/**
* calls <CODE>createTestEnvironment()</CODE> from it's super class
diff --git a/qadevOOo/tests/java/mod/_forms/OCurrencyModel.java b/qadevOOo/tests/java/mod/_forms/OCurrencyModel.java
index 5ecb0aa..971cbf4 100644
--- a/qadevOOo/tests/java/mod/_forms/OCurrencyModel.java
+++ b/qadevOOo/tests/java/mod/_forms/OCurrencyModel.java
@@ -128,16 +128,6 @@ public class OCurrencyModel extends GenericModelTest {
super.m_LCShape_Type = "FixedText";
}
- /**
- * calls <CODE>cleanup()</CODE> from it's super class
- * @param tParam the test parameter
- * @param log the log writer
- */
- @Override
- protected void cleanup(TestParameters tParam, PrintWriter log) {
- super.cleanup(tParam, log);
- }
-
/**
* calls <CODE>createTestEnvironment()</CODE> from it's super class
diff --git a/qadevOOo/tests/java/mod/_forms/ODateModel.java b/qadevOOo/tests/java/mod/_forms/ODateModel.java
index ceb865a..e7df436 100644
--- a/qadevOOo/tests/java/mod/_forms/ODateModel.java
+++ b/qadevOOo/tests/java/mod/_forms/ODateModel.java
@@ -147,15 +147,6 @@ public class ODateModel extends GenericModelTest {
super.m_LCShape_Type = "FixedText";
}
- /**
- * calls <CODE>cleanup()</CODE> from it's super class
- * @param tParam the test parameter
- * @param log the log writer
- */
- @Override
- protected void cleanup(TestParameters tParam, PrintWriter log) {
- super.cleanup(tParam, log);
- }
/**
diff --git a/qadevOOo/tests/java/mod/_forms/OEditModel.java b/qadevOOo/tests/java/mod/_forms/OEditModel.java
index dddbf97..3f32912 100644
--- a/qadevOOo/tests/java/mod/_forms/OEditModel.java
+++ b/qadevOOo/tests/java/mod/_forms/OEditModel.java
@@ -139,16 +139,6 @@ public class OEditModel extends GenericModelTest {
super.m_ChangePropertyName = "Text";
}
- /**
- * calls <CODE>cleanup()</CODE> from it's super class
- * @param tParam the test parameter
- * @param log the log writer
- */
- @Override
- protected void cleanup(TestParameters tParam, PrintWriter log) {
- super.cleanup(tParam, log);
- }
-
/**
* calls <CODE>createTestEnvironment()</CODE> from it's super class
diff --git a/qadevOOo/tests/java/mod/_forms/OFixedTextModel.java b/qadevOOo/tests/java/mod/_forms/OFixedTextModel.java
index 8b65494..64a6c79 100644
--- a/qadevOOo/tests/java/mod/_forms/OFixedTextModel.java
+++ b/qadevOOo/tests/java/mod/_forms/OFixedTextModel.java
@@ -96,16 +96,6 @@ public class OFixedTextModel extends GenericModelTest {
super.m_LCShape_Type = "FixedText";
}
- /**
- * calls <CODE>cleanup()</CODE> from it's super class
- * @param tParam the test parameter
- * @param log the log writer
- */
- @Override
- protected void cleanup(TestParameters tParam, PrintWriter log) {
- super.cleanup(tParam, log);
- }
-
/**
* calls <CODE>createTestEnvironment()</CODE> from it's super class
diff --git a/qadevOOo/tests/java/mod/_forms/OFormattedFieldWrapper.java b/qadevOOo/tests/java/mod/_forms/OFormattedFieldWrapper.java
index 67552dd..e35da54 100644
--- a/qadevOOo/tests/java/mod/_forms/OFormattedFieldWrapper.java
+++ b/qadevOOo/tests/java/mod/_forms/OFormattedFieldWrapper.java
@@ -131,17 +131,8 @@ public class OFormattedFieldWrapper extends GenericModelTest {
super.m_LCShape_Type = "FixedText";
- } /**
- * calls <CODE>cleanup()</CODE> from it's super class
- * @param tParam the test parameter
- * @param log the log writer
- */
- @Override
- protected void cleanup(TestParameters tParam, PrintWriter log) {
- super.cleanup(tParam, log);
}
-
/**
* calls <CODE>createTestEnvironment()</CODE> from it's super class
* @param Param the test parameter
diff --git a/qadevOOo/tests/java/mod/_forms/OGridControlModel.java b/qadevOOo/tests/java/mod/_forms/OGridControlModel.java
index 0212485..b11ca91 100644
--- a/qadevOOo/tests/java/mod/_forms/OGridControlModel.java
+++ b/qadevOOo/tests/java/mod/_forms/OGridControlModel.java
@@ -151,15 +151,6 @@ public class OGridControlModel extends GenericModelTest {
super.m_LCShape_Type = "GridControl";
}
- /**
- * calls <CODE>cleanup()</CODE> from it's super class
- * @param tParam the test parameter
- * @param log the log writer
- */
- @Override
- protected void cleanup(TestParameters tParam, PrintWriter log) {
- super.cleanup(tParam, log);
- }
/**
diff --git a/qadevOOo/tests/java/mod/_forms/OGroupBoxModel.java b/qadevOOo/tests/java/mod/_forms/OGroupBoxModel.java
index 539ee38..45d485c 100644
--- a/qadevOOo/tests/java/mod/_forms/OGroupBoxModel.java
+++ b/qadevOOo/tests/java/mod/_forms/OGroupBoxModel.java
@@ -96,16 +96,6 @@ public class OGroupBoxModel extends GenericModelTest {
super.m_ChangePropertyName = "Text";
}
- /**
- * calls <CODE>cleanup()</CODE> from it's super class
- * @param tParam the test parameter
- * @param log the log writer
- */
- @Override
- protected void cleanup(TestParameters tParam, PrintWriter log) {
- super.cleanup(tParam, log);
- }
-
/**
* calls <CODE>createTestEnvironment()</CODE> from it's super class
diff --git a/qadevOOo/tests/java/mod/_forms/OImageButtonModel.java b/qadevOOo/tests/java/mod/_forms/OImageButtonModel.java
index 8dc72ea..2810cad 100644
--- a/qadevOOo/tests/java/mod/_forms/OImageButtonModel.java
+++ b/qadevOOo/tests/java/mod/_forms/OImageButtonModel.java
@@ -100,16 +100,6 @@ public class OImageButtonModel extends GenericModelTest {
super.m_LCShape_Type = "ImageButton";
}
- /**
- * calls <CODE>cleanup()</CODE> from it's super class
- * @param tParam the test parameter
- * @param log the log writer
- */
- @Override
- protected void cleanup(TestParameters tParam, PrintWriter log) {
- super.cleanup(tParam, log);
- }
-
/**
* calls <CODE>createTestEnvironment()</CODE> from it's super class
diff --git a/qadevOOo/tests/java/mod/_forms/OImageControlModel.java b/qadevOOo/tests/java/mod/_forms/OImageControlModel.java
index 946d58f..3e965f3 100644
--- a/qadevOOo/tests/java/mod/_forms/OImageControlModel.java
+++ b/qadevOOo/tests/java/mod/_forms/OImageControlModel.java
@@ -130,17 +130,8 @@ public class OImageControlModel extends GenericModelTest {
super.m_LCShape_Type = "FixedText";
- } /**
- * calls <CODE>cleanup()</CODE> from it's super class
- * @param tParam the test parameter
- * @param log the log writer
- */
- @Override
- protected void cleanup(TestParameters tParam, PrintWriter log) {
- super.cleanup(tParam, log);
}
-
/**
* calls <CODE>createTestEnvironment()</CODE> from it's super class
* @param Param the test parameter
diff --git a/qadevOOo/tests/java/mod/_forms/OListBoxModel.java b/qadevOOo/tests/java/mod/_forms/OListBoxModel.java
index 8bc8f34..5b0f054 100644
--- a/qadevOOo/tests/java/mod/_forms/OListBoxModel.java
+++ b/qadevOOo/tests/java/mod/_forms/OListBoxModel.java
@@ -153,16 +153,6 @@ public class OListBoxModel extends GenericModelTest {
super.m_LCShape_Type = "FixedText";
}
- /**
- * calls <CODE>cleanup()</CODE> from it's super class
- * @param tParam the test parameter
- * @param log the log writer
- */
- @Override
- protected void cleanup(TestParameters tParam, PrintWriter log) {
- super.cleanup(tParam, log);
- }
-
/**
* calls <CODE>createTestEnvironment()</CODE> from it's super class
diff --git a/qadevOOo/tests/java/mod/_forms/ONavigationBarModel.java b/qadevOOo/tests/java/mod/_forms/ONavigationBarModel.java
index 3a15f25..8119248 100644
--- a/qadevOOo/tests/java/mod/_forms/ONavigationBarModel.java
+++ b/qadevOOo/tests/java/mod/_forms/ONavigationBarModel.java
@@ -48,16 +48,6 @@ public class ONavigationBarModel extends GenericModelTest {
super.m_LCShape_Type = "NavigationToolBar";
}
- /**
- * calls <CODE>cleanup()</CODE> from it's super class
- * @param tParam the test parameter
- * @param log the log writer
- */
- @Override
- protected void cleanup(TestParameters tParam, PrintWriter log) {
- super.cleanup(tParam, log);
- }
-
/**
* calls <CODE>createTestEnvironment()</CODE> from it's super class
diff --git a/qadevOOo/tests/java/mod/_forms/ONumericModel.java b/qadevOOo/tests/java/mod/_forms/ONumericModel.java
index ad65576..b5bff16 100644
--- a/qadevOOo/tests/java/mod/_forms/ONumericModel.java
+++ b/qadevOOo/tests/java/mod/_forms/ONumericModel.java
@@ -129,17 +129,8 @@ public class ONumericModel extends GenericModelTest {
super.m_LCShape_Type = "FixedText";
- } /**
- * calls <CODE>cleanup()</CODE> from it's super class
- * @param tParam the test parameter
- * @param log the log writer
- */
- @Override
- protected void cleanup(TestParameters tParam, PrintWriter log) {
- super.cleanup(tParam, log);
}
-
/**
* calls <CODE>createTestEnvironment()</CODE> from it's super class
* @param Param the test parameter
diff --git a/qadevOOo/tests/java/mod/_forms/OPatternModel.java b/qadevOOo/tests/java/mod/_forms/OPatternModel.java
index 7b3c2fe..7d638ae 100644
--- a/qadevOOo/tests/java/mod/_forms/OPatternModel.java
+++ b/qadevOOo/tests/java/mod/_forms/OPatternModel.java
@@ -134,17 +134,8 @@ public class OPatternModel extends GenericModelTest {
super.m_LCShape_Type = "FixedText";
- } /**
- * calls <CODE>cleanup()</CODE> from it's super class
- * @param tParam the test parameter
- * @param log the log writer
- */
- @Override
- protected void cleanup(TestParameters tParam, PrintWriter log) {
- super.cleanup(tParam, log);
}
-
/**
* calls <CODE>createTestEnvironment()</CODE> from it's super class
* @param Param the test parameter
diff --git a/qadevOOo/tests/java/mod/_forms/ORadioButtonModel.java b/qadevOOo/tests/java/mod/_forms/ORadioButtonModel.java
index 2023f78..3d5298e 100644
--- a/qadevOOo/tests/java/mod/_forms/ORadioButtonModel.java
+++ b/qadevOOo/tests/java/mod/_forms/ORadioButtonModel.java
@@ -132,16 +132,6 @@ public class ORadioButtonModel extends GenericModelTest {
super.m_LCShape_Type = "GroupBox";
}
- /**
- * calls <CODE>cleanup()</CODE> from it's super class
- * @param tParam the test parameter
- * @param log the log writer
- */
- @Override
- protected void cleanup(TestParameters tParam, PrintWriter log) {
- super.cleanup(tParam, log);
- }
-
/**
* calls <CODE>createTestEnvironment()</CODE> from it's super class
diff --git a/qadevOOo/tests/java/mod/_forms/OTimeModel.java b/qadevOOo/tests/java/mod/_forms/OTimeModel.java
index ce2603f..4adf27b 100644
--- a/qadevOOo/tests/java/mod/_forms/OTimeModel.java
+++ b/qadevOOo/tests/java/mod/_forms/OTimeModel.java
@@ -143,14 +143,6 @@ public class OTimeModel extends GenericModelTest {
super.m_LCShape_Type = "FixedText";
- } /**
- * calls <CODE>cleanup()</CODE> from it's super class
- * @param tParam the test parameter
- * @param log the log writer
- */
- @Override
- protected void cleanup(TestParameters tParam, PrintWriter log) {
- super.cleanup(tParam, log);
}
/**
diff --git a/toolkit/test/accessibility/ov/TextView.java b/toolkit/test/accessibility/ov/TextView.java
index 7edb8c0..3e38863 100644
--- a/toolkit/test/accessibility/ov/TextView.java
+++ b/toolkit/test/accessibility/ov/TextView.java
@@ -93,12 +93,6 @@ public class TextView
}
@Override
- synchronized public void Destroy ()
- {
- super.Destroy();
- }
-
- @Override
synchronized public void Update ()
{
if (mxText == null)
commit 93a85df24fc6520fd9d2a8b5209993348b4a35f4
Author: Noel Grandin <noel at peralex.com>
Date: Thu Dec 18 13:51:34 2014 +0200
java: simplify if statement
found by CodePro
Change-Id: I5f7e5b75b0345a1d917638e57a7d8ad60efb1475
diff --git a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLSettingsImporter.java b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLSettingsImporter.java
index 82e5ef9..68de721 100644
--- a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLSettingsImporter.java
+++ b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLSettingsImporter.java
@@ -191,11 +191,7 @@ public class XMLSettingsImporter extends TestCase {
}
logF.println("Property \"IsLayerMode\" after import is "
+ propValue);
- if ( propValue.booleanValue() ) {
- return true;
- } else {
- return false;
- }
+ return propValue.booleanValue();
}
});
commit 566f16a2fdb91b4d3b90f083e88fde6163c2a00c
Author: Noel Grandin <noel at peralex.com>
Date: Thu Dec 18 13:49:46 2014 +0200
java: unnecessary imports
found by CodePro
Change-Id: If1b75e43f81d70984422e437147048a491395b66
diff --git a/bridges/test/testclient.java b/bridges/test/testclient.java
index 3194a5b..06e5efb 100644
--- a/bridges/test/testclient.java
+++ b/bridges/test/testclient.java
@@ -23,10 +23,6 @@ import com.sun.star.connection.XConnector;
import com.sun.star.connection.XConnection;
import com.sun.star.bridge.XInstanceProvider;
-import test.XCallMe;
-import test.XTestFactory;
-
-
class MyInstanceProvider implements XInstanceProvider
{
public Object getInstance( String sName )
diff --git a/extensions/qa/integration/extensions/ObjectInspector.java b/extensions/qa/integration/extensions/ObjectInspector.java
index 5e34e72..2b2fa4e 100644
--- a/extensions/qa/integration/extensions/ObjectInspector.java
+++ b/extensions/qa/integration/extensions/ObjectInspector.java
@@ -26,8 +26,6 @@ import com.sun.star.frame.*;
import com.sun.star.inspection.*;
import com.sun.star.beans.*;
-import integration.extensions.Frame;
-
public class ObjectInspector extends complexlib.ComplexTestCase
{
private XComponentContext m_context;
diff --git a/framework/qa/complex/dispatches/checkdispatchapi.java b/framework/qa/complex/dispatches/checkdispatchapi.java
index c1d0cf7..b234223 100644
--- a/framework/qa/complex/dispatches/checkdispatchapi.java
+++ b/framework/qa/complex/dispatches/checkdispatchapi.java
@@ -28,14 +28,8 @@ import com.sun.star.lang.XComponent;
import com.sun.star.lang.XMultiServiceFactory;
import com.sun.star.uno.UnoRuntime;
import com.sun.star.util.XCloseable;
-import complex.dispatches.Interceptor;
import java.util.HashMap;
-
-
-
-
-// ---------- junit imports -----------------
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
diff --git a/qadevOOo/tests/java/ifc/style/_PageStyle.java b/qadevOOo/tests/java/ifc/style/_PageStyle.java
index ad3521e..49d0de3 100644
--- a/qadevOOo/tests/java/ifc/style/_PageStyle.java
+++ b/qadevOOo/tests/java/ifc/style/_PageStyle.java
@@ -18,8 +18,6 @@
package ifc.style;
-import ifc.style._PageProperties;
-
/**
* Test page style properties.
* These properties are a subset of the PageProperties. So just use the
diff --git a/sc/qa/complex/dataPilot/CheckDataPilot.java b/sc/qa/complex/dataPilot/CheckDataPilot.java
index c3f5263..ea3e4e6 100644
--- a/sc/qa/complex/dataPilot/CheckDataPilot.java
+++ b/sc/qa/complex/dataPilot/CheckDataPilot.java
@@ -36,10 +36,6 @@ import com.sun.star.uno.Type;
import com.sun.star.uno.UnoRuntime;
import com.sun.star.uno.XInterface;
import com.sun.star.util.XCloseable;
-import complex.dataPilot._XPropertySet;
-import complex.dataPilot._XNamed;
-import complex.dataPilot._XDataPilotDescriptor;
-import complex.dataPilot._XDataPilotTable;
import lib.StatusException;
import lib.TestParameters;
import util.SOfficeFactory;
commit 5c7d33ade643891e526a22aa397aeddf76464434
Author: Noel Grandin <noel at peralex.com>
Date: Thu Dec 18 13:48:08 2014 +0200
java: more efficient float parsing
found by CodePro
Change-Id: I01c18ddc842fd89105fa95daaa482fba8fcb7bec
diff --git a/qadevOOo/tests/java/mod/_sc/ScChartObj.java b/qadevOOo/tests/java/mod/_sc/ScChartObj.java
index 001b634..d50f2f9 100644
--- a/qadevOOo/tests/java/mod/_sc/ScChartObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScChartObj.java
@@ -268,7 +268,7 @@ public class ScChartObj extends TestCase {
}
if (flag.equals("V")) {
- oCell.setValue(new Float(theValue).floatValue());
+ oCell.setValue(Float.parseFloat(theValue));
} else {
oCell.setFormula(theValue);
}
diff --git a/qadevOOo/tests/java/mod/_sc/ScChartsObj.java b/qadevOOo/tests/java/mod/_sc/ScChartsObj.java
index 674aa66..c526105 100644
--- a/qadevOOo/tests/java/mod/_sc/ScChartsObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScChartsObj.java
@@ -251,7 +251,7 @@ public class ScChartsObj extends TestCase {
}
if (flag.equals("V")) {
- oCell.setValue(new Float(theValue).floatValue());
+ oCell.setValue(Float.parseFloat(theValue));
} else {
oCell.setFormula(theValue);
}
diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableChartsEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableChartsEnumeration.java
index 579c595..d35c31f 100644
--- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableChartsEnumeration.java
+++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableChartsEnumeration.java
@@ -212,7 +212,7 @@ public class ScIndexEnumeration_TableChartsEnumeration extends TestCase {
}
if (flag.equals("V")) {
- oCell.setValue(new Float(theValue).floatValue());
+ oCell.setValue(Float.parseFloat(theValue));
} else {
oCell.setFormula(theValue);
}
diff --git a/qadevOOo/tests/java/mod/_sch/ChXDiagram.java b/qadevOOo/tests/java/mod/_sch/ChXDiagram.java
index 1fd03be..b74ec99 100644
--- a/qadevOOo/tests/java/mod/_sch/ChXDiagram.java
+++ b/qadevOOo/tests/java/mod/_sch/ChXDiagram.java
@@ -388,8 +388,12 @@ public class ChXDiagram extends TestCase {
} catch (com.sun.star.lang.IndexOutOfBoundsException ex) {
System.out.println("Could not get Cell");
}
- if (flag.equals("V")) {oCell.setValue((new Float(theValue)).floatValue());}
- else {oCell.setFormula(theValue);}
+ if (flag.equals("V")) {
+ oCell.setValue(Float.parseFloat(theValue));
+ }
+ else {
+ oCell.setFormula(theValue);
+ }
} // end of insertIntoCell
commit 8f2935a6d44baa23204bfef22a9f42ec8a86bf51
Author: Noel Grandin <noel at peralex.com>
Date: Thu Dec 18 13:45:57 2014 +0200
java: avoid octal literals
found by CodePro
Change-Id: Idf67521a46d73afe2f7656bb1a9f81e755eabbdb
diff --git a/qadevOOo/tests/java/ifc/sdbc/_XParameters.java b/qadevOOo/tests/java/ifc/sdbc/_XParameters.java
index 36d0bdd..4284931 100644
--- a/qadevOOo/tests/java/ifc/sdbc/_XParameters.java
+++ b/qadevOOo/tests/java/ifc/sdbc/_XParameters.java
@@ -335,7 +335,7 @@ public class _XParameters extends MultiMethodTest {
else {
try {
oObj.setDate(
- idx, new Date ((short)19, (short)01, (short)1979)) ;
+ idx, new Date ((short)19, (short)1, (short)1979)) ;
} catch (SQLException e) {
log.println("Unexpected SQL exception:") ;
log.println(e) ;
@@ -379,7 +379,7 @@ public class _XParameters extends MultiMethodTest {
else {
try {
oObj.setTimestamp(idx, new DateTime((short)1,(short)2,(short)3,
- (short)4, (short)19, (short)01, (short)1979, false)) ;
+ (short)4, (short)19, (short)1, (short)1979, false)) ;
} catch (SQLException e) {
log.println("Unexpected SQL exception:") ;
log.println(e) ;
commit e28151d579a2ca25487ccd3bdc73eeabf931850c
Author: Noel Grandin <noel at peralex.com>
Date: Thu Dec 18 13:44:57 2014 +0200
java: use brackets to make difference between concat and plus
.. more obvious
found by CodePro
Change-Id: I60b05b01819a756a07d2358e3cfe8b0d7d4436a6
diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleComponent.java b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleComponent.java
index be71e7e..f09b1e3 100644
--- a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleComponent.java
+++ b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleComponent.java
@@ -150,7 +150,7 @@ public class _XAccessibleComponent extends MultiMethodTest {
if (oObj.containsPoint(new Point(x, bounds.Height + bounds.Y))) {
log.println(
"Outer upper and lower bounds CONTAIN some component point"
- + " (" + x + ", " + bounds.Height + bounds.Y
+ + " (" + x + ", " + (bounds.Height + bounds.Y)
+ ") - FAILED");
locRes = false;
break;
@@ -177,7 +177,7 @@ public class _XAccessibleComponent extends MultiMethodTest {
if (oObj.containsPoint(new Point(bounds.X + bounds.Width, y))) {
log.println(
"Outer left and right bounds CONTAIN some component point"
- + " (" + bounds.X + bounds.Width + ", " + y + ") - FAILED");
+ + " (" + (bounds.X + bounds.Width) + ", " + y + ") - FAILED");
locRes = false;
break;
}
commit 10039462dfebdf6727529ca38b4105fcd7dd5727
Author: Noel Grandin <noel at peralex.com>
Date: Thu Dec 18 11:43:40 2014 +0200
java: remove more dead code
found by looking for unused parameters (in Eclipse)
Change-Id: I03cf9bc8312e59747b2d0ac153ee2fc8d76be893
diff --git a/bridges/test/java_remote/Bug107753_Test.java b/bridges/test/java_remote/Bug107753_Test.java
index 06e764b..34e5112 100644
--- a/bridges/test/java_remote/Bug107753_Test.java
+++ b/bridges/test/java_remote/Bug107753_Test.java
@@ -48,7 +48,7 @@ public final class Bug107753_Test extends ComplexTestCase {
public void test() throws Exception {
TestBed t = new TestBed();
- assure("test", t.execute(new Provider(t), false, Client.class, 0));
+ assure("test", t.execute(new Provider(), false, Client.class, 0));
}
public static final class Client extends TestBed.Client {
@@ -350,8 +350,6 @@ public final class Bug107753_Test extends ComplexTestCase {
}
private static final class Provider implements XInstanceProvider {
- public Provider(TestBed testBed) {
- }
public Object getInstance(String instanceName) {
return new XTransport() {
diff --git a/bridges/test/testclient.java b/bridges/test/testclient.java
index 933b2eb..3194a5b 100644
--- a/bridges/test/testclient.java
+++ b/bridges/test/testclient.java
@@ -57,9 +57,6 @@ class MyCallMe implements XCallMe
{
return "";
}
- public void setsAttribute( String _sattribute ) throws com.sun.star.uno.RuntimeException
- {
- }
// Methods
public void call( /*IN*/String s, /*IN*/int nToDo ) throws com.sun.star.uno.RuntimeException
diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java b/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java
index 9c18475..3e8a687 100644
--- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java
+++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java
@@ -51,7 +51,7 @@ public class StorageFileAccess implements org.hsqldb.lib.FileAccess{
if ( isStreamElement(key,filename) )
removeElement(key,filename);
} catch (java.io.IOException e) {
- throw new FileSystemRuntimeException( e, FileSystemRuntimeException.fileAccessRemoveElementFailed );
+ throw new FileSystemRuntimeException( e );
}
}
@@ -62,7 +62,7 @@ public class StorageFileAccess implements org.hsqldb.lib.FileAccess{
renameElement(key,oldName, newName);
}
} catch (java.io.IOException e) {
- throw new FileSystemRuntimeException( e, FileSystemRuntimeException.fileAccessRenameElementFailed );
+ throw new FileSystemRuntimeException( e );
}
}
diff --git a/connectivity/org/hsqldb/lib/FileSystemRuntimeException.java b/connectivity/org/hsqldb/lib/FileSystemRuntimeException.java
index 6b3d289..b3598ad3 100644
--- a/connectivity/org/hsqldb/lib/FileSystemRuntimeException.java
+++ b/connectivity/org/hsqldb/lib/FileSystemRuntimeException.java
@@ -31,10 +31,7 @@ package org.hsqldb.lib;
*/
public class FileSystemRuntimeException extends java.lang.RuntimeException {
- public static final int fileAccessRemoveElementFailed = 1;
- public static final int fileAccessRenameElementFailed = 2;
-
- public FileSystemRuntimeException(java.lang.Throwable _cause, int _errorCode) {
+ public FileSystemRuntimeException(java.lang.Throwable _cause) {
super(_cause);
}
diff --git a/connectivity/qa/complex/connectivity/HsqlDriverTest.java b/connectivity/qa/complex/connectivity/HsqlDriverTest.java
index 747b2ac..aba01fa 100644
--- a/connectivity/qa/complex/connectivity/HsqlDriverTest.java
+++ b/connectivity/qa/complex/connectivity/HsqlDriverTest.java
@@ -99,7 +99,7 @@ public class HsqlDriverTest extends ComplexTestCase {
XDriver drv = UnoRuntime.queryInterface(XDriver.class,param.getMSF().createInstance("com.sun.star.sdbcx.comp.hsqldb.Driver"));
- TestCacheSize test = new TestCacheSize((param.getMSF()),info,drv);
+ TestCacheSize test = new TestCacheSize(info,drv);
StopWatch sw = new StopWatch();
@@ -127,7 +127,7 @@ public class HsqlDriverTest extends ComplexTestCase {
,new com.sun.star.beans.PropertyValue("ParameterNameSubstitution",0, false,PropertyState.DIRECT_VALUE)
};
XDriver drv = UnoRuntime.queryInterface(XDriver.class,param.getMSF().createInstance("com.sun.star.comp.sdbc.JDBCDriver"));
- TestCacheSize test = new TestCacheSize((param.getMSF()),info,drv);
+ TestCacheSize test = new TestCacheSize(info,drv);
test.setURL("jdbc:hsqldb:g:\\hsql\\db");
diff --git a/connectivity/qa/complex/connectivity/hsqldb/TestCacheSize.java b/connectivity/qa/complex/connectivity/hsqldb/TestCacheSize.java
index b2b5944..d3c802e 100644
--- a/connectivity/qa/complex/connectivity/hsqldb/TestCacheSize.java
+++ b/connectivity/qa/complex/connectivity/hsqldb/TestCacheSize.java
@@ -39,7 +39,6 @@ package complex.connectivity.hsqldb;
import org.hsqldb.lib.StopWatch;
import java.util.Random;
-import com.sun.star.lang.*;
import com.sun.star.uno.UnoRuntime;
import com.sun.star.sdbc.*;
@@ -111,7 +110,7 @@ public class TestCacheSize {
private XDriver drv;
private com.sun.star.beans.PropertyValue[] info;
- public TestCacheSize(XMultiServiceFactory _xmulti,com.sun.star.beans.PropertyValue[] _info,XDriver _drv){
+ public TestCacheSize(com.sun.star.beans.PropertyValue[] _info,XDriver _drv){
drv = _drv;
info = _info;
}
diff --git a/framework/qa/complex/imageManager/CheckImageManager.java b/framework/qa/complex/imageManager/CheckImageManager.java
index 0efb6ed..21f24b6 100644
--- a/framework/qa/complex/imageManager/CheckImageManager.java
+++ b/framework/qa/complex/imageManager/CheckImageManager.java
@@ -103,7 +103,7 @@ public class CheckImageManager {
assertTrue(testObjectName + "::XInitialization.initialize", _xInit._initialize());
// xImageManager is already there, just write a test ;-)
- _XImageManager _xImage = new _XImageManager(param, xImageManager);
+ _XImageManager _xImage = new _XImageManager(xImageManager);
assertTrue(testObjectName + "::XImageManager.getAllImageNames", _xImage._getAllImageNames());
assertTrue(testObjectName + "::XImageManager.getImages", _xImage._getImages());
assertTrue(testObjectName + "::XImageManager.hasImage", _xImage._hasImage());
@@ -113,7 +113,7 @@ public class CheckImageManager {
assertTrue(testObjectName + "::XImageManager.reset", _xImage._reset());
XTypeProvider xType = UnoRuntime.queryInterface(XTypeProvider.class, xImageManager);
- _XTypeProvider _xType = new _XTypeProvider(param, xType);
+ _XTypeProvider _xType = new _XTypeProvider(xType);
assertTrue(testObjectName + "::XTypeProvider.getImplementationId", _xType._getImplementationId());
assertTrue(testObjectName + "::XTypeProvider.getTypes", _xType._getTypes());
diff --git a/framework/qa/complex/imageManager/_XImageManager.java b/framework/qa/complex/imageManager/_XImageManager.java
index 42d8055..c077bbf 100644
--- a/framework/qa/complex/imageManager/_XImageManager.java
+++ b/framework/qa/complex/imageManager/_XImageManager.java
@@ -20,7 +20,6 @@ package complex.imageManager;
import com.sun.star.graphic.XGraphic;
import com.sun.star.ui.ImageType;
import com.sun.star.ui.XImageManager;
-import lib.TestParameters;
/**
@@ -33,7 +32,7 @@ public class _XImageManager {
private XGraphic[] xGraphicArray = null;
private final XImageManager oObj;
- public _XImageManager( TestParameters tEnv, XImageManager oObj) {
+ public _XImageManager( XImageManager oObj) {
this.oObj = oObj;
}
diff --git a/framework/qa/complex/imageManager/_XTypeProvider.java b/framework/qa/complex/imageManager/_XTypeProvider.java
index 0e5e9e6..318c056 100644
--- a/framework/qa/complex/imageManager/_XTypeProvider.java
+++ b/framework/qa/complex/imageManager/_XTypeProvider.java
@@ -22,7 +22,6 @@ package complex.imageManager;
import com.sun.star.lang.XTypeProvider;
import com.sun.star.uno.Type;
-import lib.TestParameters;
/**
* Testing <code>com.sun.star.lang.XTypeProvider</code>
@@ -40,7 +39,7 @@ public class _XTypeProvider {
private XTypeProvider oObj = null;
- public _XTypeProvider(TestParameters tEnv, XTypeProvider oObj) {
+ public _XTypeProvider(XTypeProvider oObj) {
this.oObj = oObj;
}
diff --git a/javaunohelper/test/com/sun/star/lib/uno/helper/ProxyProvider.java b/javaunohelper/test/com/sun/star/lib/uno/helper/ProxyProvider.java
index c021d52..43decf3 100644
--- a/javaunohelper/test/com/sun/star/lib/uno/helper/ProxyProvider.java
+++ b/javaunohelper/test/com/sun/star/lib/uno/helper/ProxyProvider.java
@@ -50,7 +50,7 @@ public class ProxyProvider
// if retVal == null then probably not registered
if (retVal == null)
{
- Object aProxy = new Proxy(sOid, type);
+ Object aProxy = new Proxy(sOid);
String[] arOid = new String[]
{sOid};
retVal= env.registerInterface(aProxy, arOid, type);
@@ -62,7 +62,7 @@ public class ProxyProvider
class Proxy implements IQueryInterface, XEventListener
{
private String oid;
- Proxy(String oid, Type t) {
+ Proxy(String oid) {
this.oid = oid;
}
diff --git a/qadevOOo/testdocs/qadevlibs/source/test/Job.java b/qadevOOo/testdocs/qadevlibs/source/test/Job.java
index 86e9a42..d180d55 100644
--- a/qadevOOo/testdocs/qadevlibs/source/test/Job.java
+++ b/qadevOOo/testdocs/qadevlibs/source/test/Job.java
@@ -28,34 +28,36 @@ import com.sun.star.lang.XMultiServiceFactory;
import com.sun.star.registry.XRegistryKey;
import com.sun.star.comp.loader.FactoryHelper;
-
public class Job {
static public class _Implementation implements XServiceInfo, XTypeProvider,
XJob, XNamed {
- static private final String __serviceName = "test.Job";
+ static private final String __serviceName = "test.Job";
Object oDoc = null;
String actionType = null;
String actionParm = null;
+ public _Implementation(XMultiServiceFactory xMSF) {
+ }
- public _Implementation(XMultiServiceFactory xMSF) {
- }
-
- // XServiceInfo
- public String getImplementationName() throws com.sun.star.uno.RuntimeException {
- return getClass().getName();
- }
+ // XServiceInfo
+ public String getImplementationName()
+ throws com.sun.star.uno.RuntimeException {
+ return getClass().getName();
+ }
- public boolean supportsService(String serviceName) throws com.sun.star.uno.RuntimeException {
- return __serviceName.equals(serviceName);
- }
+ public boolean supportsService(String serviceName)
+ throws com.sun.star.uno.RuntimeException {
+ return __serviceName.equals(serviceName);
+ }
- public String[] getSupportedServiceNames() throws com.sun.star.uno.RuntimeException {
- return new String[] {__serviceName};
- }
+ public String[] getSupportedServiceNames()
+ throws com.sun.star.uno.RuntimeException {
+ return new String[] { __serviceName };
+ }
private static int executed = 0;
+
public Object execute(NamedValue[] args) {
executed++;
@@ -63,41 +65,40 @@ public class Job {
}
public String getName() {
- return "" + executed;
+ return "" + executed;
}
public void setName(String n) {
}
- public byte[] getImplementationId() {
- return new byte[0];
- }
+ public byte[] getImplementationId() {
+ return new byte[0];
+ }
- public Type[] getTypes() {
- Class<?> interfaces[] = getClass().getInterfaces();
- Type types[] = new Type[interfaces.length];
- for(int i = 0; i < interfaces.length; ++ i)
- types[i] = new Type(interfaces[i]);
- return types;
- }
+ public Type[] getTypes() {
+ Class<?> interfaces[] = getClass().getInterfaces();
+ Type types[] = new Type[interfaces.length];
+ for (int i = 0; i < interfaces.length; ++i)
+ types[i] = new Type(interfaces[i]);
+ return types;
+ }
}
- public static XSingleServiceFactory __getServiceFactory(XMultiServiceFactory multiFactory,
- XRegistryKey regKey) {
- XSingleServiceFactory xSingleServiceFactory = null;
- xSingleServiceFactory = FactoryHelper.getServiceFactory(_Implementation.class,
- _Implementation.__serviceName,
- multiFactory,
- regKey);
- return xSingleServiceFactory;
+ public static XSingleServiceFactory __getServiceFactory(
+ XMultiServiceFactory multiFactory, XRegistryKey regKey) {
+ XSingleServiceFactory xSingleServiceFactory = null;
+ xSingleServiceFactory = FactoryHelper.getServiceFactory(
+ _Implementation.class, _Implementation.__serviceName,
+ multiFactory, regKey);
+ return xSingleServiceFactory;
}
-
public static boolean __writeRegistryServiceInfo(XRegistryKey regKey) {
- boolean result = true;
- result = FactoryHelper.writeRegistryServiceInfo(_Implementation.class.getName(),
- _Implementation.__serviceName, regKey);
- return result;
+ boolean result = true;
+ result = FactoryHelper.writeRegistryServiceInfo(
+ _Implementation.class.getName(), _Implementation.__serviceName,
+ regKey);
+ return result;
}
}
diff --git a/qadevOOo/tests/java/mod/_forms/OListBoxModel.java b/qadevOOo/tests/java/mod/_forms/OListBoxModel.java
index a1b7f1e..8bc8f34 100644
--- a/qadevOOo/tests/java/mod/_forms/OListBoxModel.java
+++ b/qadevOOo/tests/java/mod/_forms/OListBoxModel.java
@@ -179,7 +179,7 @@ public class OListBoxModel extends GenericModelTest {
TestEnvironment tEnv = super.createTestEnvironment(Param, log);
tEnv.addObjRelation("XUpdateBroadcaster.Checker",
- new Checker(m_XFormLoader, m_XPS, m_XCtrl, m_ChangePropertyName, m_ChangePropertyValue));
+ new Checker(m_XFormLoader, m_XPS, m_XCtrl, m_ChangePropertyName));
return tEnv;
}
@@ -190,7 +190,7 @@ public class OListBoxModel extends GenericModelTest {
private XInterface ctrl = null;
private String ChangePropertyName = null;
- public Checker(XLoadable xl, XPropertySet ps, XInterface ctrl, String ChangePropertyName, Object ChangePropertyValue) {
+ public Checker(XLoadable xl, XPropertySet ps, XInterface ctrl, String ChangePropertyName) {
formLoaderF = xl;
this.ps = ps;
this.ctrl = ctrl;
diff --git a/qadevOOo/tests/java/mod/_forms/OTimeModel.java b/qadevOOo/tests/java/mod/_forms/OTimeModel.java
index c56a81b..ce2603f 100644
--- a/qadevOOo/tests/java/mod/_forms/OTimeModel.java
+++ b/qadevOOo/tests/java/mod/_forms/OTimeModel.java
@@ -172,7 +172,7 @@ public class OTimeModel extends GenericModelTest {
exclude.add("FormatKey");
tEnv.addObjRelation("XUpdateBroadcaster.Checker",
- new Checker(m_XFormLoader, m_XPS, m_XCtrl, m_ChangePropertyName, m_ChangePropertyValue));
+ new Checker(m_XFormLoader, m_XPS, m_XCtrl));
return tEnv;
}
@@ -181,7 +181,7 @@ public class OTimeModel extends GenericModelTest {
private XPropertySet ps = null;
private XInterface ctrl = null;
- public Checker(XLoadable xl, XPropertySet ps, XInterface ctrl, String ChangePropertyName, Object ChangePropertyValue) {
+ public Checker(XLoadable xl, XPropertySet ps, XInterface ctrl) {
formLoaderF = xl;
this.ps = ps;
this.ctrl = ctrl;
diff --git a/reportbuilder/Jar_reportbuilder.mk b/reportbuilder/Jar_reportbuilder.mk
index 3dfadcf..bc73037 100644
--- a/reportbuilder/Jar_reportbuilder.mk
+++ b/reportbuilder/Jar_reportbuilder.mk
@@ -144,7 +144,6 @@ $(eval $(call gb_Jar_add_sourcefiles,reportbuilder,\
reportbuilder/java/org/libreoffice/report/pentaho/output/text/TextRawReportProcessor \
reportbuilder/java/org/libreoffice/report/pentaho/output/text/TextRawReportTarget \
reportbuilder/java/org/libreoffice/report/pentaho/output/text/VariablesDeclarations \
- reportbuilder/java/org/libreoffice/report/pentaho/parser/AttributeSpecification \
reportbuilder/java/org/libreoffice/report/pentaho/parser/ElementReadHandler \
reportbuilder/java/org/libreoffice/report/pentaho/parser/OfficeDocumentXmlResourceFactory \
reportbuilder/java/org/libreoffice/report/pentaho/parser/OfficeStylesXmlResourceFactory \
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/VariablesCollection.java b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/VariablesCollection.java
index 308bcd0..4f29d8c 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/VariablesCollection.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/VariablesCollection.java
@@ -42,11 +42,6 @@ public class VariablesCollection
public VariablesCollection(final String namePrefix)
{
- this(namePrefix, null);
- }
-
- private VariablesCollection(final String namePrefix, final VariablesCollection parent)
- {
if (namePrefix == null)
{
throw new NullPointerException("NamePrefix cannot be null");
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java b/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java
index 9caf5ec..8518bc6 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java
@@ -527,7 +527,7 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget
if (ReportTargetUtil.isElementOfType(OfficeNamespaces.OFFICE_NS, "body", attrs))
{
states.push(IntegerCache.getInteger(OfficeDocumentReportTarget.STATE_IN_BODY));
- startBody(attrs);
+ startBody();
}
else
{
@@ -559,7 +559,6 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget
if (ReportTargetUtil.isElementOfType(JFreeReportInfo.REPORT_NAMESPACE, "report-body", attrs))
{
states.push(IntegerCache.getInteger(OfficeDocumentReportTarget.STATE_IN_GROUP_BODY));
- startGroupBody(attrs);
}
else
{
@@ -675,7 +674,6 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget
if (ReportTargetUtil.isElementOfType(JFreeReportInfo.REPORT_NAMESPACE, "group-body", attrs))
{
states.push(IntegerCache.getInteger(OfficeDocumentReportTarget.STATE_IN_GROUP_BODY));
- startGroupBody(attrs);
}
else
{
@@ -773,7 +771,7 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget
}
}
- private void startBody(final AttributeMap attrs)
+ private void startBody()
throws IOException
{
getXmlWriter().writeTag(OfficeNamespaces.OFFICE_NS, "body", XmlWriterSupport.OPEN);
@@ -816,10 +814,6 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget
{
}
- private void startGroupBody(final AttributeMap attrs)
- {
- }
-
protected abstract void startOther(final AttributeMap attrs)
throws IOException, DataSourceException, ReportProcessingException;
@@ -938,7 +932,6 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget
}
case OfficeDocumentReportTarget.STATE_IN_GROUP_INSTANCE:
{
- endGroupInstance(attrs);
break;
}
case OfficeDocumentReportTarget.STATE_IN_GROUP_BODY:
@@ -953,7 +946,7 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget
}
case OfficeDocumentReportTarget.STATE_IN_BODY:
{
- endBody(attrs);
+ endBody();
break;
}
case OfficeDocumentReportTarget.STATE_IN_DOCUMENT:
@@ -987,10 +980,6 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget
{
}
- private void endGroupInstance(final AttributeMap attrs)
- {
- }
-
public int getCurrentRole()
{
return currentRole;
@@ -1017,7 +1006,7 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget
protected abstract void endContent(final AttributeMap attrs)
throws IOException, DataSourceException, ReportProcessingException;
- private void endBody(final AttributeMap attrs)
+ private void endBody()
throws IOException
{
getXmlWriter().writeCloseTag();
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/AttributeSpecification.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/AttributeSpecification.java
deleted file mode 100644
index 7e60f65..0000000
--- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/AttributeSpecification.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-package org.libreoffice.report.pentaho.parser;
-
-public final class AttributeSpecification
-{
-
- public AttributeSpecification(String namespaceUrl, String attributName, String mapperImplementation)
- {
- }
-
-}
diff --git a/reportdesign/qa/complex/reportdesign/ReportDesignerTest.java b/reportdesign/qa/complex/reportdesign/ReportDesignerTest.java
index 523145c..d7ea8fa 100644
--- a/reportdesign/qa/complex/reportdesign/ReportDesignerTest.java
+++ b/reportdesign/qa/complex/reportdesign/ReportDesignerTest.java
@@ -259,7 +259,7 @@ public class ReportDesignerTest
aPropertyList.add(aActiveConnection);
loadAndStoreReports(xNameAccess, aPropertyList, _nType);
- createDBEntry(_nType);
+ createDBEntry();
}
catch(com.sun.star.uno.Exception e)
{
@@ -276,7 +276,7 @@ public class ReportDesignerTest
}
- private void createDBEntry(int _nType)
+ private void createDBEntry()
{
// try to connect the database
String sDBConnection = ""; // (String)param.get( convwatch.PropertyName.DB_CONNECTION_STRING );
diff --git a/swext/mediawiki/src/com/sun/star/wiki/Settings.java b/swext/mediawiki/src/com/sun/star/wiki/Settings.java
index 359f66e..34e11e1 100644
--- a/swext/mediawiki/src/com/sun/star/wiki/Settings.java
+++ b/swext/mediawiki/src/com/sun/star/wiki/Settings.java
@@ -114,10 +114,6 @@ public class Settings
return theDocs.toArray( docs );
}
- public void setLastUsedWikiServer( int l )
- {
- }
-
public String[] getWikiURLs()
{
String [] WikiList = new String [m_WikiConnections.size()];
diff --git a/swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java b/swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java
index 43fba5c..0ff4cfa 100644
--- a/swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java
+++ b/swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java
@@ -254,7 +254,6 @@ public class WikiPropDialog extends WikiDialog{
short [] sel = (short[]) aWikiListProps.getPropertyValue("SelectedItems");
String [] items = (String []) aWikiListProps.getPropertyValue("StringItemList");
m_sWikiEngineURL = items[sel[0]];
- m_aSettings.setLastUsedWikiServer(sel[0]);
m_sWikiTitle = (String) aArticleTextProps.getPropertyValue("Text");
m_sWikiComment = (String) aCommentTextProps.getPropertyValue("Text");
diff --git a/toolkit/test/accessibility/AccTreeNode.java b/toolkit/test/accessibility/AccTreeNode.java
index aae3ed5..1ce4676 100644
--- a/toolkit/test/accessibility/AccTreeNode.java
+++ b/toolkit/test/accessibility/AccTreeNode.java
@@ -56,7 +56,7 @@ class AccTreeNode
private XAccessibleText mxText;
private XAccessibleTable mxTable;
- public AccTreeNode (XAccessible xAccessible, XAccessibleContext xContext, Object aDisplay, AccessibleTreeNode aParent)
+ public AccTreeNode (XAccessibleContext xContext, Object aDisplay, AccessibleTreeNode aParent)
{
super (aDisplay, aParent);
diff --git a/toolkit/test/accessibility/AccessibleTreeNode.java b/toolkit/test/accessibility/AccessibleTreeNode.java
index 951b86e..22fa035 100644
--- a/toolkit/test/accessibility/AccessibleTreeNode.java
+++ b/toolkit/test/accessibility/AccessibleTreeNode.java
@@ -23,7 +23,7 @@ import com.sun.star.lang.IndexOutOfBoundsException;
/**
Base class for all tree nodes.
*/
-class AccessibleTreeNode
+abstract class AccessibleTreeNode
{
/// The parent node. It is null for the root node.
private AccessibleTreeNode maParent;
@@ -70,10 +70,7 @@ class AccessibleTreeNode
throw new IndexOutOfBoundsException();
}
- public int indexOf (AccessibleTreeNode aNode)
- {
- return -1;
- }
+ public abstract int indexOf (AccessibleTreeNode aNode);
/** Create a path to this node by first asking the parent for its path
and then appending this object.
diff --git a/toolkit/test/accessibility/NodeFactory.java b/toolkit/test/accessibility/NodeFactory.java
index 51b126a..7e1d9f5 100644
--- a/toolkit/test/accessibility/NodeFactory.java
+++ b/toolkit/test/accessibility/NodeFactory.java
@@ -115,7 +115,7 @@ class NodeFactory
// create node, and add default handlers
- AccTreeNode aNode = new AccTreeNode (xAccessible, xContext, sDisplay, aParent);
+ AccTreeNode aNode = new AccTreeNode (xContext, sDisplay, aParent);
addDefaultHandlers (aNode, xContext);
return aNode;
diff --git a/toolkit/test/accessibility/StringNode.java b/toolkit/test/accessibility/StringNode.java
index f424c3b..f6660e4 100644
--- a/toolkit/test/accessibility/StringNode.java
+++ b/toolkit/test/accessibility/StringNode.java
@@ -28,4 +28,9 @@ class StringNode
{
super (aDisplayObject, aParent);
}
+
+ @Override
+ public int indexOf(AccessibleTreeNode aNode) {
+ return -1;
+ }
}
diff --git a/unotest/source/java/org/openoffice/test/tools/OfficeDocument.java b/unotest/source/java/org/openoffice/test/tools/OfficeDocument.java
index 655d17a..9f18a6e 100644
--- a/unotest/source/java/org/openoffice/test/tools/OfficeDocument.java
+++ b/unotest/source/java/org/openoffice/test/tools/OfficeDocument.java
@@ -129,9 +129,9 @@ public class OfficeDocument
XController xController = xDocModel.getCurrentController();
if ( classify() == DocumentType.CALC )
- return new SpreadsheetView( m_orb, this, xController );
+ return new SpreadsheetView( m_orb, xController );
- return new OfficeDocumentView( m_orb, this, xController );
+ return new OfficeDocumentView( m_orb, xController );
}
/* ------------------------------------------------------------------ */
diff --git a/unotest/source/java/org/openoffice/test/tools/OfficeDocumentView.java b/unotest/source/java/org/openoffice/test/tools/OfficeDocumentView.java
index 5f89df7..f7f9a5e 100644
--- a/unotest/source/java/org/openoffice/test/tools/OfficeDocumentView.java
+++ b/unotest/source/java/org/openoffice/test/tools/OfficeDocumentView.java
@@ -43,7 +43,7 @@ public class OfficeDocumentView
}
/* ------------------------------------------------------------------ */
- public OfficeDocumentView( XMultiServiceFactory orb, OfficeDocument document, XController controller )
+ public OfficeDocumentView( XMultiServiceFactory orb, XController controller )
{
m_orb = orb;
m_controller = controller;
diff --git a/unotest/source/java/org/openoffice/test/tools/SpreadsheetView.java b/unotest/source/java/org/openoffice/test/tools/SpreadsheetView.java
index b6e32a9..21d3d23 100644
--- a/unotest/source/java/org/openoffice/test/tools/SpreadsheetView.java
+++ b/unotest/source/java/org/openoffice/test/tools/SpreadsheetView.java
@@ -24,9 +24,9 @@ public class SpreadsheetView extends OfficeDocumentView
{
/** Creates a new instance of SpreadsheetView */
- public SpreadsheetView( XMultiServiceFactory orb, OfficeDocument document, XController controller )
+ public SpreadsheetView( XMultiServiceFactory orb, XController controller )
{
- super( orb, document, controller );
+ super( orb, controller );
}
}
diff --git a/wizards/com/sun/star/wizards/form/FieldLinker.java b/wizards/com/sun/star/wizards/form/FieldLinker.java
index f5374c1..e80bb9d 100644
--- a/wizards/com/sun/star/wizards/form/FieldLinker.java
+++ b/wizards/com/sun/star/wizards/form/FieldLinker.java
@@ -43,9 +43,9 @@ public class FieldLinker extends DBLimitedFieldSelection
private String[] sSlaveListHeader;
private String[] sMasterListHeader; //CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 40);
- public FieldLinker(WizardDialog _CurUnoDialog, int iStep, int iCompPosX, int iCompPosY, int _firsthelpid)
+ public FieldLinker(WizardDialog _CurUnoDialog, int iStep, int iCompPosY, int _firsthelpid)
{
- super(_CurUnoDialog, iStep, iCompPosX, iCompPosY, _firsthelpid);
+ super(_CurUnoDialog, iStep, iCompPosY, _firsthelpid);
}
protected void insertControlGroup(int i)
diff --git a/wizards/com/sun/star/wizards/form/FormWizard.java b/wizards/com/sun/star/wizards/form/FormWizard.java
index bf8ba4b..5247f61a 100644
--- a/wizards/com/sun/star/wizards/form/FormWizard.java
+++ b/wizards/com/sun/star/wizards/form/FormWizard.java
@@ -248,7 +248,7 @@ public class FormWizard extends DatabaseObjectWizard
curFormDocument.xProgressBar.setValue(40);
- curFieldLinker = new FieldLinker(this, SOFIELDLINKER_PAGE, 95, 30, 34441);
+ curFieldLinker = new FieldLinker(this, SOFIELDLINKER_PAGE, 30, 34441);
curFormDocument.xProgressBar.setValue(50);
curControlArranger = new UIControlArranger(this, curFormDocument);
diff --git a/wizards/com/sun/star/wizards/form/UIControlArranger.java b/wizards/com/sun/star/wizards/form/UIControlArranger.java
index 0f70029..9e68a6f 100644
--- a/wizards/com/sun/star/wizards/form/UIControlArranger.java
+++ b/wizards/com/sun/star/wizards/form/UIControlArranger.java
@@ -232,7 +232,6 @@ public class UIControlArranger
m_aButtonList.setStep(Short.valueOf((short) FormWizard.SOCONTROL_PAGE));
m_aButtonList.setShowButtons(false); // shows a button line at ''wrong'' position like |<| 1..4/4 |>|
m_aButtonList.setRenderer(new LayoutRenderer());
- m_aButtonList.setSelectionGap(new Size(2, 2));
m_aButtonList.setGap(new Size(3, 3));
// m_aButtonList.scaleImages = Boolean.FALSE;
m_aButtonList.tabIndex = curtabindex++;
diff --git a/wizards/com/sun/star/wizards/report/ReportFinalizer.java b/wizards/com/sun/star/wizards/report/ReportFinalizer.java
index a068c70..350ad9b 100644
--- a/wizards/com/sun/star/wizards/report/ReportFinalizer.java
+++ b/wizards/com/sun/star/wizards/report/ReportFinalizer.java
@@ -20,7 +20,6 @@ import com.sun.star.awt.ItemEvent;
import com.sun.star.awt.TextEvent;
import com.sun.star.awt.VclWindowPeerAttribute;
import com.sun.star.awt.XTextComponent;
-import com.sun.star.lang.XMultiServiceFactory;
import com.sun.star.uno.Exception;
import com.sun.star.wizards.common.Desktop;
import com.sun.star.wizards.common.JavaTools;
@@ -42,7 +41,7 @@ public class ReportFinalizer
public static final int SOCREATEDOCUMENT = 1;
public static final int SOCREATETEMPLATE = 2;
public static final int SOUSETEMPLATE = 3;
- public ReportFinalizer(XMultiServiceFactory _xMSF, IReportDocument _CurReportDocument, WizardDialog _CurUnoDialog)
+ public ReportFinalizer(IReportDocument _CurReportDocument, WizardDialog _CurUnoDialog)
{
this.CurUnoDialog = _CurUnoDialog;
this.CurReportDocument = _CurReportDocument;
diff --git a/wizards/com/sun/star/wizards/report/ReportWizard.java b/wizards/com/sun/star/wizards/report/ReportWizard.java
index c835393..2582ac3 100644
--- a/wizards/com/sun/star/wizards/report/ReportWizard.java
+++ b/wizards/com/sun/star/wizards/report/ReportWizard.java
@@ -324,7 +324,7 @@ public class ReportWizard extends DatabaseObjectWizard implements XTextListener
CurGroupFieldHandler = new GroupFieldHandler(m_reportDocument, this);
CurSortingComponent = new SortingComponent(this, SOSORTPAGE, 95, 30, 210, 34346);
CurReportLayouter = new ReportLayouter(xMSF, m_reportDocument, this, isReportBuilderInstalled());
- CurReportFinalizer = new ReportFinalizer(xMSF, m_reportDocument, this);
+ CurReportFinalizer = new ReportFinalizer(m_reportDocument, this);
bCloseDocument = true;
enableNavigationButtons(false, false, false);
}
diff --git a/wizards/com/sun/star/wizards/ui/ButtonList.java b/wizards/com/sun/star/wizards/ui/ButtonList.java
index 51a7c84..a1cce50 100644
--- a/wizards/com/sun/star/wizards/ui/ButtonList.java
+++ b/wizards/com/sun/star/wizards/ui/ButtonList.java
@@ -484,10 +484,6 @@ public class ButtonList implements XItemEventBroadcaster, XActionListener
Helper.setUnoPropertyValue(getModel(lblImageText), PropertyNames.PROPERTY_LABEL, sText);
}
- public void setSelectionGap(Size size)
- {
- }
-
public void setShowButtons(boolean b)
{
showButtons = b;
diff --git a/wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java b/wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java
index 1754b1c..270e19f 100644
--- a/wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java
+++ b/wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java
@@ -38,7 +38,7 @@ public abstract class DBLimitedFieldSelection
protected int iCurPosY;
protected int FirstHelpIndex;
- public DBLimitedFieldSelection(WizardDialog _CurUnoDialog, int iStep, int _iCompPosX, int iCompPosY, int _FirstHelpIndex)
+ public DBLimitedFieldSelection(WizardDialog _CurUnoDialog, int iStep, int iCompPosY, int _FirstHelpIndex)
{
this.CurUnoDialog = _CurUnoDialog;
FirstHelpIndex = _FirstHelpIndex;
commit 82257e9087dc405fdc45cba7d6867be53b5ec9b3
Author: Noel Grandin <noel at peralex.com>
Date: Thu Dec 18 11:20:47 2014 +0200
java: static fields that should be instance fields
found by FindBugs.
Change-Id: I4f457cd8f6f28f0429fc50529c8d38d80b80c560
diff --git a/qadevOOo/runner/base/java_fat_service.java b/qadevOOo/runner/base/java_fat_service.java
index 27ae90a..485eec7 100644
--- a/qadevOOo/runner/base/java_fat_service.java
+++ b/qadevOOo/runner/base/java_fat_service.java
@@ -40,7 +40,7 @@ import stats.Summarizer;
*/
public class java_fat_service implements TestBase {
- static protected boolean debug = false;
+ protected boolean debug = false;
protected LogWriter log = null;
public boolean executeTest(lib.TestParameters param) {
diff --git a/qadevOOo/runner/helper/OfficeProvider.java b/qadevOOo/runner/helper/OfficeProvider.java
index 4be6c27..4496fec 100644
--- a/qadevOOo/runner/helper/OfficeProvider.java
+++ b/qadevOOo/runner/helper/OfficeProvider.java
@@ -49,7 +49,7 @@ import util.utils;
public class OfficeProvider implements AppProvider
{
- private static boolean debug = false;
+ private boolean debug = false;
/**
* copy the user layer to a safe place, usually to $TMP/user_backup$USER
@@ -312,7 +312,7 @@ public class OfficeProvider implements AppProvider
* @throws com.sun.star.connection.NoConnectException
* @throws Exception
*/
- private static XMultiServiceFactory connect(String connectStr)
+ private XMultiServiceFactory connect(String connectStr)
throws com.sun.star.uno.Exception,
com.sun.star.uno.RuntimeException,
com.sun.star.connection.NoConnectException,
@@ -690,7 +690,7 @@ public class OfficeProvider implements AppProvider
* @param msf the <CODE>MultiServiceFactory</CODE>
* @param param the <CODE>TestParameters</CODE>
*/
- private static void makeAppExecCommand(XMultiServiceFactory msf, TestParameters param)
+ private void makeAppExecCommand(XMultiServiceFactory msf, TestParameters param)
{
debug = param.getBool(PropertyName.DEBUG_IS_ACTIVE);
@@ -733,7 +733,7 @@ public class OfficeProvider implements AppProvider
param.put(util.PropertyName.APP_EXECUTION_COMMAND, command);
}
- private static void dbg(String message)
+ private void dbg(String message)
{
if (debug)
{
diff --git a/qadevOOo/tests/java/mod/_acceptor/uno/Acceptor.java b/qadevOOo/tests/java/mod/_acceptor/uno/Acceptor.java
index a8239a9..1431c2e 100644
--- a/qadevOOo/tests/java/mod/_acceptor/uno/Acceptor.java
+++ b/qadevOOo/tests/java/mod/_acceptor/uno/Acceptor.java
@@ -41,7 +41,7 @@ public class Acceptor extends TestCase {
*/
protected static final int basePort = 10000;
private int curPort ;
- private static String sOfficeHost = null ;
+ private String sOfficeHost = null ;
/**
* Retrieves host name where StarOffice is started from test
commit 08e8bd4eaf19df693fe0b17c91e8fb566b1f82f9
Author: Noel Grandin <noel at peralex.com>
Date: Thu Dec 18 11:14:53 2014 +0200
java: compare Strings using equals()
not ==
Found by FindBugs.
Change-Id: I74805f1187bd623433ad097dec1015a3cf5f45ac
diff --git a/qadevOOo/tests/java/ifc/i18n/_XCharacterClassification.java b/qadevOOo/tests/java/ifc/i18n/_XCharacterClassification.java
index 4510c88..c11b236 100644
--- a/qadevOOo/tests/java/ifc/i18n/_XCharacterClassification.java
+++ b/qadevOOo/tests/java/ifc/i18n/_XCharacterClassification.java
@@ -199,7 +199,7 @@ public class _XCharacterClassification extends MultiMethodTest {
for (int i=0;i<characters.length;i++) {
int get = oObj.getType(toCheck, i);
- res &= (charstyles_office[get] == charstyles_office[i]);
+ res &= charstyles_office[get].equals(charstyles_office[i]);
if (!res) {
log.println("Code :" + Integer.toHexString(charsInt[i]));
log.println("Gained: " + charstyles_office[get]);
commit 3c6d932fa841e102818abd31b7538728085d99e1
Author: Noel Grandin <noel at peralex.com>
Date: Thu Dec 18 11:13:18 2014 +0200
java: was passing the wrong thing to the remove method
on a Map, we need to pass the key, not the value, to be deleted
Found by FindBugs.
Change-Id: If6fd3d8d56a7c7dfabac31d8ee268939e582f4eb
diff --git a/toolkit/test/accessibility/Canvas.java b/toolkit/test/accessibility/Canvas.java
index e2e1fab..c254ed6 100644
--- a/toolkit/test/accessibility/Canvas.java
+++ b/toolkit/test/accessibility/Canvas.java
@@ -116,9 +116,9 @@ class Canvas
int i = maNodes.indexOf (aNode);
if( i != -1 )
{
- Object aObject = maObjects.get(aNode);
+ CanvasShape aObject = maObjects.get(aNode);
maObjectList.remove (aObject);
- maObjects.remove (aObject);
+ maObjects.remove (aNode);
maNodes.remove (aNode);
repaint ();
}
commit 46540d08b16f0e2e663734506cc072fe868ece82
Author: Noel Grandin <noel at peralex.com>
Date: Thu Dec 18 11:03:04 2014 +0200
java: these fields can become local variables
found by PMD
Change-Id: Id852cfec984a181b91aca1c00a41e342b720a4bf
diff --git a/dbaccess/qa/complex/dbaccess/DatabaseApplication.java b/dbaccess/qa/complex/dbaccess/DatabaseApplication.java
index 71d90a6..dad7644 100644
--- a/dbaccess/qa/complex/dbaccess/DatabaseApplication.java
+++ b/dbaccess/qa/complex/dbaccess/DatabaseApplication.java
@@ -34,17 +34,15 @@ public class DatabaseApplication
private final XOfficeDatabaseDocument databaseDocument;
private final XDatabaseDocumentUI documentUI;
- private final DatabaseAccess db;
public DatabaseApplication(final DatabaseAccess _db) throws Exception
{
- db = _db;
- databaseDocument = db.getDatabaseDocument();
+ databaseDocument = _db.getDatabaseDocument();
// load it into a frame
- final Object object = db.getORB().createInstance("com.sun.star.frame.Desktop");
+ final Object object = _db.getORB().createInstance("com.sun.star.frame.Desktop");
final XComponentLoader xComponentLoader = UnoRuntime.queryInterface(XComponentLoader.class, object);
- final XComponent loadedComponent = xComponentLoader.loadComponentFromURL(db.getDocumentURL(), "_blank", FrameSearchFlag.ALL, new PropertyValue[0]);
+ final XComponent loadedComponent = xComponentLoader.loadComponentFromURL(_db.getDocumentURL(), "_blank", FrameSearchFlag.ALL, new PropertyValue[0]);
// get the controller, which provides access to various UI operations
final XModel docModel = UnoRuntime.queryInterface(XModel.class, loadedComponent);
diff --git a/framework/qa/complex/path_substitution/PathSubstitutionTest.java b/framework/qa/complex/path_substitution/PathSubstitutionTest.java
index ff331392..8615de6 100644
--- a/framework/qa/complex/path_substitution/PathSubstitutionTest.java
+++ b/framework/qa/complex/path_substitution/PathSubstitutionTest.java
@@ -38,7 +38,6 @@ import com.sun.star.util.XStringSubstitution;
public class PathSubstitutionTest
{
- private XMultiServiceFactory xMSF;
// all substitution variables
private VariableContainer substVars = null;
@@ -66,7 +65,7 @@ public class PathSubstitutionTest
*/
@Test public void checkXStringSubstitution()
{
- xMSF = getMSF();
+ XMultiServiceFactory xMSF = getMSF();
System.out.println("---- Testing the XStringSubstitution interface ----");
System.out.println("Create intance of test object.\n");
XStringSubstitution oObj = null;
diff --git a/qadevOOo/runner/base/java_fat.java b/qadevOOo/runner/base/java_fat.java
index c9891d4..78bcc38 100644
--- a/qadevOOo/runner/base/java_fat.java
+++ b/qadevOOo/runner/base/java_fat.java
@@ -45,10 +45,7 @@ import com.sun.star.lang.XMultiServiceFactory;
public class java_fat implements TestBase
{
- private boolean m_isDebug = false;
- private boolean keepdocument = false;
private boolean logging = true;
- private boolean newOffice = false;
private DynamicClassLoader m_aDynamicClassLoader = null;
private lib.TestParameters m_aParams;
@@ -65,21 +62,21 @@ public class java_fat implements TestBase
String ExclusionFile = (String) m_aParams.get("ExclusionList");
ArrayList<String> exclusions = null;
boolean retValue = true;
- m_isDebug = m_aParams.getBool("DebugIsActive");
+ boolean isDebug = m_aParams.getBool("DebugIsActive");
logging = m_aParams.getBool("LoggingIsActive");
- keepdocument = m_aParams.getBool("KeepDocument");
- newOffice = m_aParams.getBool(util.PropertyName.NEW_OFFICE_INSTANCE);
+ boolean keepdocument = m_aParams.getBool("KeepDocument");
+ boolean newOffice = m_aParams.getBool(util.PropertyName.NEW_OFFICE_INSTANCE);
if (keepdocument)
{
System.setProperty("KeepDocument", "true");
}
if (ExclusionFile != null)
{
- exclusions = getExclusionList(ExclusionFile, m_isDebug);
+ exclusions = getExclusionList(ExclusionFile, isDebug);
}
String sDescriptionPath = (String) m_aParams.get("DescriptionPath");
- DescEntry[] entries = dg.getDescriptionFor(job, sDescriptionPath, m_isDebug);
+ DescEntry[] entries = dg.getDescriptionFor(job, sDescriptionPath, isDebug);
if (entries == null)
{
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/PentahoReportEngineMetaData.java b/reportbuilder/java/org/libreoffice/report/pentaho/PentahoReportEngineMetaData.java
index f63617a..ef71cb3 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/PentahoReportEngineMetaData.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/PentahoReportEngineMetaData.java
@@ -17,6 +17,10 @@
*/
package org.libreoffice.report.pentaho;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
import org.libreoffice.report.DataSourceFactory;
import org.libreoffice.report.ImageService;
import org.libreoffice.report.InputRepository;
@@ -25,14 +29,6 @@ import org.libreoffice.report.ReportEngineMetaData;
import org.libreoffice.report.ReportEngineParameterNames;
import org.libreoffice.report.ReportJobFactory;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.pentaho.reporting.libraries.base.util.HashNMap;
-
public class PentahoReportEngineMetaData
implements ReportEngineMetaData
@@ -41,31 +37,11 @@ public class PentahoReportEngineMetaData
public static final String OPENDOCUMENT_TEXT = "application/vnd.oasis.opendocument.text";
public static final String OPENDOCUMENT_SPREADSHEET = "application/vnd.oasis.opendocument.spreadsheet";
public static final String OPENDOCUMENT_CHART = "application/vnd.oasis.opendocument.chart";
- private final static String CONTENT_TYPE = "content-type";
public static final String DEBUG = "raw/text+xml";
- private final Set<String> mandatoryParameters;
private final Map<String,Class<?>> parameterTypes;
- private final HashNMap enumerationValues;
public PentahoReportEngineMetaData()
{
- mandatoryParameters = new HashSet<String>();
- mandatoryParameters.add(ReportEngineParameterNames.CONTENT_TYPE);
- mandatoryParameters.add(ReportEngineParameterNames.INPUT_NAME);
- mandatoryParameters.add(ReportEngineParameterNames.INPUT_REPOSITORY);
- mandatoryParameters.add(ReportEngineParameterNames.OUTPUT_NAME);
- mandatoryParameters.add(ReportEngineParameterNames.OUTPUT_REPOSITORY);
- mandatoryParameters.add(ReportEngineParameterNames.INPUT_DATASOURCE_FACTORY);
- mandatoryParameters.add(ReportEngineParameterNames.IMAGE_SERVICE);
- mandatoryParameters.add(ReportEngineParameterNames.INPUT_REPORTJOB_FACTORY);
- mandatoryParameters.add(ReportEngineParameterNames.INPUT_MASTER_COLUMNS);
- mandatoryParameters.add(ReportEngineParameterNames.INPUT_MASTER_VALUES);
- mandatoryParameters.add(ReportEngineParameterNames.INPUT_DETAIL_COLUMNS);
- mandatoryParameters.add(ReportEngineParameterNames.AUTHOR);
- mandatoryParameters.add(ReportEngineParameterNames.TITLE);
- mandatoryParameters.add(ReportEngineParameterNames.MAXROWS);
-
-
parameterTypes = new HashMap<String,Class<?>>();
parameterTypes.put(ReportEngineParameterNames.CONTENT_TYPE, String.class);
parameterTypes.put(ReportEngineParameterNames.INPUT_NAME, String.class);
@@ -81,15 +57,6 @@ public class PentahoReportEngineMetaData
parameterTypes.put(ReportEngineParameterNames.AUTHOR, String.class);
parameterTypes.put(ReportEngineParameterNames.TITLE, String.class);
parameterTypes.put(ReportEngineParameterNames.MAXROWS, Integer.class);
-
- enumerationValues = new HashNMap();
- enumerationValues.add(CONTENT_TYPE,
- PentahoReportEngineMetaData.OPENDOCUMENT_TEXT);
- enumerationValues.add(CONTENT_TYPE,
- PentahoReportEngineMetaData.OPENDOCUMENT_SPREADSHEET);
- enumerationValues.add(CONTENT_TYPE,
- PentahoReportEngineMetaData.OPENDOCUMENT_CHART);
- enumerationValues.add(CONTENT_TYPE, PentahoReportEngineMetaData.DEBUG);
}
public Class getParameterType(final String parameter)
diff --git a/vcl/qa/complex/memCheck/CheckMemoryUsage.java b/vcl/qa/complex/memCheck/CheckMemoryUsage.java
index c37a017..50f475a 100644
--- a/vcl/qa/complex/memCheck/CheckMemoryUsage.java
+++ b/vcl/qa/complex/memCheck/CheckMemoryUsage.java
@@ -100,10 +100,6 @@ public class CheckMemoryUsage
private String[][] sDocuments;
private static final int iAllowMemoryIncrease = 10;
private int iExportDocCount = 25;
- /**
- * The test parameters
- */
- private TestParameters param = null;
/**
* Collect all documents to load and all filters used for export.
@@ -115,7 +111,7 @@ public class CheckMemoryUsage
final XMultiServiceFactory xMsf = getMSF();
// some Tests need the qadevOOo TestParameters, it is like a Hashmap for Properties.
- param = new TestParameters();
+ TestParameters param = new TestParameters();
param.put("ServiceFactory", xMsf); // some qadevOOo functions need the ServiceFactory
// test does definitely not run on Windows.
diff --git a/wizards/com/sun/star/wizards/db/DBMetaData.java b/wizards/com/sun/star/wizards/db/DBMetaData.java
index 2187d17..0d5ec2b 100644
--- a/wizards/com/sun/star/wizards/db/DBMetaData.java
+++ b/wizards/com/sun/star/wizards/db/DBMetaData.java
@@ -127,7 +127,6 @@ public class DBMetaData
};
private int iMaxColumnsInSelect;
- private int iMaxColumnsInGroupBy;
private int iMaxColumnNameLength = -1;
private int iMaxTableNameLength = -1;
private boolean bPasswordIsRequired;
@@ -419,15 +418,6 @@ public class DBMetaData
}
}
- private void setMaxColumnsInGroupBy() throws SQLException
- {
- iMaxColumnsInGroupBy = xDBMetaData.getMaxColumnsInGroupBy();
- if (iMaxColumnsInGroupBy == 0)
- {
- iMaxColumnsInGroupBy = DBMetaData.NOLIMIT;
- }
- }
-
public int getMaxColumnsInTable() throws SQLException
{
int iMaxColumnsInTable = xDBMetaData.getMaxColumnsInTable();
@@ -444,7 +434,6 @@ public class DBMetaData
{
xDBMetaData = DBConnection.getMetaData();
getDataSourceInterfaces();
- setMaxColumnsInGroupBy();
setMaxColumnsInSelect();
}
catch (SQLException e)
diff --git a/wizards/com/sun/star/wizards/db/FieldColumn.java b/wizards/com/sun/star/wizards/db/FieldColumn.java
index 1978a4d0..8ff86fd 100644
--- a/wizards/com/sun/star/wizards/db/FieldColumn.java
+++ b/wizards/com/sun/star/wizards/db/FieldColumn.java
@@ -40,7 +40,6 @@ public class FieldColumn
// field meta data
private int FieldWidth;
- private int StandardFormatKey;
private boolean bIsNumberFormat;
private static boolean bFormatKeysInitialized = false;
@@ -223,6 +222,7 @@ public class FieldColumn
private void getTyperelatedFieldData()
{
+ int StandardFormatKey = 0;
try
{
switch ( getFieldType() )
diff --git a/wizards/com/sun/star/wizards/report/ReportTextDocument.java b/wizards/com/sun/star/wizards/report/ReportTextDocument.java
index 9fb9ef6..ec61209 100644
--- a/wizards/com/sun/star/wizards/report/ReportTextDocument.java
+++ b/wizards/com/sun/star/wizards/report/ReportTextDocument.java
@@ -63,7 +63,6 @@ class ReportTextDocument extends com.sun.star.wizards.text.TextDocument implemen
private TextStyleHandler oTextStyleHandler;
public TextFieldHandler oTextFieldHandler;
public ViewHandler oViewHandler;
- private NumberFormatter oNumberFormatter;
public static final String TBLRECORDSECTION = "Tbl_RecordSection";
public static final String TBLGROUPSECTION = "Tbl_GroupField";
public static final String RECORDSECTION = "RecordSection";
@@ -96,7 +95,7 @@ class ReportTextDocument extends com.sun.star.wizards.text.TextDocument implemen
oViewHandler = new ViewHandler(xTextDocument);
oTextFieldHandler = new TextFieldHandler(xMSFDoc, xTextDocument);
DBColumnsVector = new java.util.ArrayList<DBColumn>();
- oNumberFormatter = oTextTableHandler.getNumberFormatter();
+ NumberFormatter oNumberFormatter = oTextTableHandler.getNumberFormatter();
CurDBMetaData = _aRecordParser;
long lDateCorrection = oNumberFormatter.getNullDateCorrection();
oNumberFormatter.setBooleanReportDisplayNumberFormat();
diff --git a/wizards/com/sun/star/wizards/ui/FilterComponent.java b/wizards/com/sun/star/wizards/ui/FilterComponent.java
index 854d144..186dcc4 100644
--- a/wizards/com/sun/star/wizards/ui/FilterComponent.java
+++ b/wizards/com/sun/star/wizards/ui/FilterComponent.java
@@ -101,7 +101,6 @@ public class FilterComponent
private static final int SO_FOURTHBOOLFIELDNAME = 256 + 4;
private int SOI_MATCHALL = 0;
private int SOI_MATCHANY = 1;
- private int curHelpID;
class ItemListenerImpl implements com.sun.star.awt.XItemListener
{
@@ -364,7 +363,7 @@ public class FilterComponent
*/
public FilterComponent(WizardDialog CurUnoDialog, int iStep, int iPosX, int iPosY, int FilterCount, QueryMetaData _oQueryMetaData, int _firstHelpID)
{
- this.curHelpID = _firstHelpID;
+ int curHelpID = _firstHelpID;
this.IStep = Integer.valueOf(iStep);
curtabindex = UnoDialog.setInitialTabindex(iStep);
@@ -440,7 +439,7 @@ public class FilterComponent
for (int i = 0; i < FilterCount; i++)
{
bEnabled = (i == 0);
- oControlRows[i] = new ControlRow(iPosX, iPosY + 20, i, bEnabled, (this.curHelpID + (i * 3)));
+ oControlRows[i] = new ControlRow(iPosX, iPosY + 20, i, bEnabled, (curHelpID + (i * 3)));
iPosY += 43;
}
}
commit a49b2ba1a6a9467aa75d320b45671ae1e87314d3
Author: Noel Grandin <noel at peralex.com>
Date: Thu Dec 18 10:43:29 2014 +0200
java: remove dead stylemapper code in reportbuilder
as far as I can tell, this has been dead since the original import
of this code
Change-Id: I4bd47e55eb0abc991ea1d58c16fba6fa6c7878d9
diff --git a/reportbuilder/Jar_reportbuilder.mk b/reportbuilder/Jar_reportbuilder.mk
index 36deed8..3dfadcf 100644
--- a/reportbuilder/Jar_reportbuilder.mk
+++ b/reportbuilder/Jar_reportbuilder.mk
@@ -147,11 +147,9 @@ $(eval $(call gb_Jar_add_sourcefiles,reportbuilder,\
reportbuilder/java/org/libreoffice/report/pentaho/parser/AttributeSpecification \
reportbuilder/java/org/libreoffice/report/pentaho/parser/ElementReadHandler \
reportbuilder/java/org/libreoffice/report/pentaho/parser/OfficeDocumentXmlResourceFactory \
- reportbuilder/java/org/libreoffice/report/pentaho/parser/OfficeParserUtil \
reportbuilder/java/org/libreoffice/report/pentaho/parser/OfficeStylesXmlResourceFactory \
reportbuilder/java/org/libreoffice/report/pentaho/parser/StarStyleXmlFactoryModule \
reportbuilder/java/org/libreoffice/report/pentaho/parser/StarXmlFactoryModule \
- reportbuilder/java/org/libreoffice/report/pentaho/parser/StyleMapper \
reportbuilder/java/org/libreoffice/report/pentaho/parser/chart/ChartReadHandler \
reportbuilder/java/org/libreoffice/report/pentaho/parser/data/DataStyleReadHandler \
reportbuilder/java/org/libreoffice/report/pentaho/parser/draw/ObjectOleReadHandler \
@@ -180,28 +178,6 @@ $(eval $(call gb_Jar_add_sourcefiles,reportbuilder,\
reportbuilder/java/org/libreoffice/report/pentaho/parser/style/OfficeStylesReadHandler \
reportbuilder/java/org/libreoffice/report/pentaho/parser/style/PageLayoutReadHandler \
reportbuilder/java/org/libreoffice/report/pentaho/parser/style/StyleDefinitionReadHandler \
- reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/OneOfConstantsMapper \
- reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/draw/TextAreaVerticalAlignMapper \
- reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/fo/BackgroundColorMapper \
- reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/fo/BorderRightMapper \
- reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/fo/ColorMapper \
- reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/fo/FontSizeMapper \
- reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/fo/FontStyleMapper \
- reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/fo/FontWeightMapper \
- reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/fo/TextAlignMapper \
- reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/style/FontFamilyGenericMapper \
- reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/style/FontFamilyMapper \
- reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/style/FontNameMapper \
- reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/style/FontPitchMapper \
- reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/style/FontReliefMapper \
- reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/style/TextEmphasizeMapper \
- reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/style/TextUnderlineColorMapper \
- reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/style/TextUnderlineStyleMapper \
- reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/style/TextUnderlineWidthMapper \
- reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/style/TextUnderlineWordMode \
- reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/style/VerticalAlignMapper \
- reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/table/ColumnWidthMapper \
- reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/table/RowHeightMapper \
reportbuilder/java/org/libreoffice/report/pentaho/parser/table/CoveredCellReadHandler \
reportbuilder/java/org/libreoffice/report/pentaho/parser/table/TableCellReadHandler \
reportbuilder/java/org/libreoffice/report/pentaho/parser/table/TableColumnReadHandler \
@@ -257,12 +233,6 @@ $(eval $(call gb_Jar_add_packagefiles,reportbuilder,org/libreoffice/report/penta
$(SRCDIR)/reportbuilder/java/org/libreoffice/report/pentaho/xsl-fo.css \
))
-$(eval $(call gb_Jar_add_packagefiles,reportbuilder,org/libreoffice/report/pentaho/parser,\
- $(SRCDIR)/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt-schema-v1.0-os.xsd \
- $(SRCDIR)/reportbuilder/java/org/libreoffice/report/pentaho/parser/selectors.properties \
- $(SRCDIR)/reportbuilder/java/org/libreoffice/report/pentaho/parser/style-mapping.txt \
-))
-
$(eval $(call gb_Jar_add_packagefiles,reportbuilder,org/libreoffice/report/pentaho/styles,\
$(SRCDIR)/reportbuilder/java/org/libreoffice/report/pentaho/styles/stylemapper.xml \
$(SRCDIR)/reportbuilder/java/org/libreoffice/report/pentaho/styles/stylemapper.xsd \
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/OfficeParserUtil.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/OfficeParserUtil.java
deleted file mode 100644
index 9cc91f2..0000000
--- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/OfficeParserUtil.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-package org.libreoffice.report.pentaho.parser;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Properties;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.jfree.layouting.namespace.NamespaceDefinition;
-import org.jfree.layouting.namespace.Namespaces;
-import org.jfree.report.JFreeReportBoot;
-
-import org.pentaho.reporting.libraries.base.config.DefaultConfiguration;
-import org.pentaho.reporting.libraries.resourceloader.Resource;
-import org.pentaho.reporting.libraries.resourceloader.ResourceException;
-import org.pentaho.reporting.libraries.resourceloader.ResourceManager;
-
-
-public class OfficeParserUtil
-{
-
- private static final Log LOGGER = LogFactory.getLog(OfficeParserUtil.class);
- private static OfficeParserUtil instance;
- private static final String NAMESPACES_PREFIX = "namespaces.";
-
- public static synchronized OfficeParserUtil getInstance()
- {
- if (instance == null)
- {
- instance = new OfficeParserUtil();
- }
- return instance;
- }
- private final DefaultConfiguration props;
- private final NamespaceDefinition[] namespaces;
-
- private OfficeParserUtil()
- {
- props = new DefaultConfiguration();
-
- final ResourceManager resourceManager = new ResourceManager();
- resourceManager.registerDefaults();
- try
- {
- final Resource res = resourceManager.createDirectly("res://org/libreoffice/report/pentaho/parser/selectors.properties", Properties.class);
- final Properties resProps = (Properties) res.getResource();
- props.putAll(resProps);
- }
- catch (ResourceException e)
- {
- LOGGER.warn("Unable to load mapping rules. Parsing services may not be available.", e);
- }
-
- namespaces = Namespaces.createFromConfig(JFreeReportBoot.getInstance().getGlobalConfig(),
- "org.jfree.report.namespaces.", resourceManager);
- }
-
- public NamespaceDefinition getNamespaceDeclaration(final String uri)
- {
- if (uri == null)
- {
- throw new NullPointerException("URI must not be null");
- }
-
- for (int i = 0; i < namespaces.length; i++)
- {
- final NamespaceDefinition definition = namespaces[i];
- if (uri.equals(definition.getURI()))
- {
- return definition;
- }
- }
- return null;
- }
-
- public String getGenericFont(final String officeFont)
- {
- return props.getProperty("font-family." + officeFont.toLowerCase(), officeFont);
- }
-
- public String getNamespaceURI(final String namespacePrefix)
- {
- return props.getProperty(NAMESPACES_PREFIX + namespacePrefix);
- }
-
- public String getNamespaceForStyleFamily(final String styleFamily)
- {
- return props.getProperty("style-family." + styleFamily);
- }
-
- public Map<String,String> getNamespaces()
- {
- final Map<String,String> map = new HashMap<String,String>();
- final Iterator keys = props.findPropertyKeys(NAMESPACES_PREFIX);
- while (keys.hasNext())
- {
- final String key = (String) keys.next();
- final String value = props.getConfigProperty(key);
- map.put(key.substring(NAMESPACES_PREFIX.length()), value);
- }
- return map;
- }
-
- public String getNamespacePrefix(final String namespaceURI)
- {
- final Iterator keys = props.findPropertyKeys(NAMESPACES_PREFIX);
- while (keys.hasNext())
- {
- final String key = (String) keys.next();
- final String value = props.getConfigProperty(key);
- if (namespaceURI.equals(value))
- {
- return key.substring(NAMESPACES_PREFIX.length());
- }
- }
- return null;
- }
-
- public AttributeSpecification parseStyleAttrDefinition(final String key, final String prefix, final String tagname)
- {
- final String configPrefix = "attr." + prefix + "." + tagname + ".";
- final String configSuffix = key.substring(configPrefix.length());
- final int dotPosition = configSuffix.indexOf('.');
- if (dotPosition == -1)
- {
- return null;
- }
- final String namespaceUri = getNamespaceURI(configSuffix.substring(0, dotPosition));
- final String attrName = configSuffix.substring(dotPosition + 1);
- final String value = props.getProperty(key);
- return new AttributeSpecification(namespaceUri, attrName, value);
- }
-
- public Iterator findStylesForElement(final String prefix,
- final String tagname)
- {
- final String configPrefix = "attr." + prefix + "." + tagname + ".";
- return props.findPropertyKeys(configPrefix);
- }
-
- public boolean isValidStyleElement(final String uri, final String tagName)
- {
- final String prefix = getNamespacePrefix(uri);
- if (prefix == null)
- {
- return false;
- }
-
- final Iterator stylesForElement = findStylesForElement(prefix, tagName);
- return stylesForElement.hasNext();
- }
-
- public String getSelectorPattern()
- {
- return props.getConfigProperty("style-selector.pattern");
- }
-
- public static void main(final String[] args)
- {
- JFreeReportBoot.getInstance().start();
- System.out.print(OfficeParserUtil.getInstance().getNamespaces());
- }
-}
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/StyleMapper.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/StyleMapper.java
deleted file mode 100644
index 539874d..0000000
--- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/StyleMapper.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-package org.libreoffice.report.pentaho.parser;
-
-public interface StyleMapper
-{
-
-
-}
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt-schema-v1.0-os.xsd b/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt-schema-v1.0-os.xsd
deleted file mode 100644
index 4c296ac..0000000
--- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt-schema-v1.0-os.xsd
+++ /dev/null
@@ -1,405 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-<!---->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
- elementFormDefault="qualified"
- targetNamespace="urn:oasis:names:tc:opendocument:xmlns:report:1.0"
- xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0"
- xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0"
- xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
- xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
- xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0"
- xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
- xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
- xmlns:rpt="urn:oasis:names:tc:opendocument:xmlns:report:1.0"
- xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0"
- xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"
- xmlns:smil="urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0"
- xmlns:xforms="http://www.w3.org/2002/xforms"
- xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
- xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
- xmlns:ns1="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
- xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
- xmlns:math="http://www.w3.org/1998/Math/MathML"
- xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
- xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0"
- xmlns:dc="http://purl.org/dc/elements/1.1/">
- <xs:import namespace="http://purl.org/dc/elements/1.1/" schemaLocation="dc.xsd"/>
- <xs:import namespace="http://www.w3.org/1998/Math/MathML" schemaLocation="math.xsd"/>
- <xs:import namespace="http://www.w3.org/1999/xlink" schemaLocation="xlink.xsd"/>
- <xs:import namespace="http://www.w3.org/2002/xforms" schemaLocation="xforms.xsd"/>
- <xs:import namespace="urn:oasis:names:tc:opendocument:xmlns:animation:1.0" schemaLocation="anim.xsd"/>
- <xs:import namespace="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" schemaLocation="chart.xsd"/>
- <xs:import namespace="urn:oasis:names:tc:opendocument:xmlns:config:1.0" schemaLocation="config.xsd"/>
- <xs:import namespace="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" schemaLocation="ns1.xsd"/>
- <xs:import namespace="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" schemaLocation="dr3d.xsd"/>
- <xs:import namespace="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" schemaLocation="draw.xsd"/>
- <xs:import namespace="urn:oasis:names:tc:opendocument:xmlns:form:1.0" schemaLocation="form.xsd"/>
- <xs:import namespace="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" schemaLocation="meta.xsd"/>
- <xs:import namespace="urn:oasis:names:tc:opendocument:xmlns:office:1.0" schemaLocation="office.xsd"/>
- <xs:import namespace="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" schemaLocation="presentation.xsd"/>
- <xs:import namespace="urn:oasis:names:tc:opendocument:xmlns:script:1.0" schemaLocation="script.xsd"/>
- <xs:import namespace="urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0" schemaLocation="smil.xsd"/>
- <xs:import namespace="urn:oasis:names:tc:opendocument:xmlns:style:1.0" schemaLocation="style.xsd"/>
- <xs:import namespace="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" schemaLocation="svg.xsd"/>
- <xs:import namespace="urn:oasis:names:tc:opendocument:xmlns:table:1.0" schemaLocation="table.xsd"/>
- <xs:import namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0" schemaLocation="OpenDocument-schema-v1.0-os.xsd"/>
- <xs:import namespace="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" schemaLocation="fo.xsd"/>
- <xs:attributeGroup name="office-report-attlist">
- <xs:attribute name="command-type" default="command" form="qualified">
- <xs:simpleType>
- <xs:restriction base="xs:token">
- <xs:enumeration value="table"/>
- <xs:enumeration value="query"/>
- <xs:enumeration value="command"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="command" form="qualified" type="text:string"/>
- <xs:attribute name="escape-processing" default="true" form="qualified" type="text:boolean"/>
- <xs:attribute name="filter" form="qualified" type="text:string"/>
- <xs:attribute name="caption" form="qualified" type="text:string"/>
- </xs:attributeGroup>
- <xs:element name="report-component">
- <xs:complexType>
- <xs:attributeGroup ref="text:common-draw-name-attlist"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="group">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" maxOccurs="unbounded" ref="rpt:function"/>
- <xs:element minOccurs="0" ref="rpt:group-header"/>
- <xs:choice>
- <xs:element ref="rpt:group"/>
- <xs:element ref="rpt:detail"/>
- </xs:choice>
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list