summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apache-commons/java/codec/makefile.mk6
-rw-r--r--apache-commons/java/httpclient/makefile.mk6
-rw-r--r--apache-commons/java/lang/makefile.mk6
-rw-r--r--apache-commons/java/logging/makefile.mk6
-rw-r--r--jfreereport/java/flute/makefile.mk6
-rw-r--r--jfreereport/java/jfreereport/makefile.mk6
-rw-r--r--jfreereport/java/libbase/makefile.mk6
-rw-r--r--jfreereport/java/libfonts/makefile.mk6
-rw-r--r--jfreereport/java/libformula/makefile.mk6
-rw-r--r--jfreereport/java/liblayout/makefile.mk6
-rw-r--r--jfreereport/java/libloader/makefile.mk6
-rw-r--r--jfreereport/java/librepository/makefile.mk6
-rw-r--r--jfreereport/java/libserializer/makefile.mk6
-rw-r--r--jfreereport/java/libxml/makefile.mk6
-rw-r--r--jfreereport/java/sac/makefile.mk6
-rw-r--r--migrationanalysis/prj/build.lst14
-rw-r--r--migrationanalysis/prj/d.lst6
-rw-r--r--migrationanalysis/src/driver_docs/CreateDriverDocs.wsf5
-rw-r--r--migrationanalysis/src/driver_docs/DocAnalysisRunMacro.vbs49
-rw-r--r--migrationanalysis/src/driver_docs/makefile.mk258
-rw-r--r--migrationanalysis/src/driver_docs/sources/AnalysisDriver.bas48
-rw-r--r--migrationanalysis/src/driver_docs/sources/CollectedFiles.cls48
-rw-r--r--migrationanalysis/src/driver_docs/sources/CommonMigrationAnalyser.bas48
-rw-r--r--migrationanalysis/src/driver_docs/sources/CommonPreparation.bas48
-rw-r--r--migrationanalysis/src/driver_docs/sources/DocumentAnalysis.cls48
-rw-r--r--migrationanalysis/src/driver_docs/sources/FileTypeAssociation.cls48
-rw-r--r--migrationanalysis/src/driver_docs/sources/IssueInfo.cls48
-rw-r--r--migrationanalysis/src/driver_docs/sources/PrepareInfo.cls48
-rw-r--r--migrationanalysis/src/driver_docs/sources/StringDataManager.cls48
-rw-r--r--migrationanalysis/src/driver_docs/sources/common_res.bas48
-rw-r--r--migrationanalysis/src/driver_docs/sources/excel/ApplicationSpecific.bas48
-rw-r--r--migrationanalysis/src/driver_docs/sources/excel/MigrationAnalyser.cls48
-rw-r--r--migrationanalysis/src/driver_docs/sources/excel/Preparation.bas48
-rw-r--r--migrationanalysis/src/driver_docs/sources/excel/SetTextBoxFont.bas48
-rw-r--r--migrationanalysis/src/driver_docs/sources/excel/ThisWorkbook.cls48
-rw-r--r--migrationanalysis/src/driver_docs/sources/excel/excel_res.bas48
-rw-r--r--migrationanalysis/src/driver_docs/sources/powerpoint/ApplicationSpecific.bas48
-rw-r--r--migrationanalysis/src/driver_docs/sources/powerpoint/Loader.bas48
-rw-r--r--migrationanalysis/src/driver_docs/sources/powerpoint/MigrationAnalyser.cls48
-rw-r--r--migrationanalysis/src/driver_docs/sources/powerpoint/Preparation.bas48
-rw-r--r--migrationanalysis/src/driver_docs/sources/powerpoint/Slide1.cls48
-rw-r--r--migrationanalysis/src/driver_docs/sources/powerpoint/powerpoint_res.bas48
-rw-r--r--migrationanalysis/src/driver_docs/sources/word/ApplicationSpecific.bas48
-rw-r--r--migrationanalysis/src/driver_docs/sources/word/MigrationAnalyser.cls48
-rw-r--r--migrationanalysis/src/driver_docs/sources/word/Preparation.bas48
-rw-r--r--migrationanalysis/src/driver_docs/sources/word/ThisDocument.cls48
-rw-r--r--migrationanalysis/src/driver_docs/sources/word/word_res.bas48
-rw-r--r--migrationanalysis/src/driver_docs/ulf2dat.pl309
-rw-r--r--migrationanalysis/src/msokill/StdAfx.cpp72
-rw-r--r--migrationanalysis/src/msokill/StdAfx.h110
-rw-r--r--migrationanalysis/src/msokill/makefile.mk168
-rw-r--r--migrationanalysis/src/msokill/msokill.cpp518
-rw-r--r--migrationanalysis/src/resources/makefile.mk120
-rw-r--r--migrationanalysis/src/wizard/Analyse.bas49
-rw-r--r--migrationanalysis/src/wizard/CollectedFiles.cls49
-rw-r--r--migrationanalysis/src/wizard/Get Directory Dialog.bas5
-rw-r--r--migrationanalysis/src/wizard/IniSupport.bas49
-rw-r--r--migrationanalysis/src/wizard/LaunchDrivers.vbp2
-rw-r--r--migrationanalysis/src/wizard/Office10Issues.bas49
-rw-r--r--migrationanalysis/src/wizard/ProAnalysisWizard.vbp2
-rw-r--r--migrationanalysis/src/wizard/RunServer.bas49
-rw-r--r--migrationanalysis/src/wizard/Utilities.bas49
-rw-r--r--migrationanalysis/src/wizard/Wizard.bas49
-rw-r--r--migrationanalysis/src/wizard/Wizard.frm7
-rw-r--r--migrationanalysis/src/wizard/makefile.mk234
-rw-r--r--migrationanalysis/util/delzip2
-rw-r--r--migrationanalysis/util/makefile.mk137
-rw-r--r--mysqlc/images/sun_extension.pngbin0 -> 1965 bytes
-rw-r--r--mysqlc/images/sun_extension_hc.pngbin0 -> 1160 bytes
-rw-r--r--mysqlc/prj/build.lst3
-rw-r--r--mysqlc/prj/d.lst4
-rw-r--r--mysqlc/source/DataAccess.xcu19
-rw-r--r--mysqlc/source/README65
-rw-r--r--mysqlc/source/delzip0
-rw-r--r--mysqlc/source/description.xml29
-rw-r--r--mysqlc/source/description/description_de.txt1
-rw-r--r--mysqlc/source/description/description_en-US.txt1
-rw-r--r--mysqlc/source/description/description_es.txt1
-rw-r--r--mysqlc/source/description/description_fr.txt1
-rw-r--r--mysqlc/source/description/description_hu.txt1
-rw-r--r--mysqlc/source/description/description_it.txt1
-rw-r--r--mysqlc/source/description/description_ja.txt1
-rw-r--r--mysqlc/source/description/description_ko.txt1
-rw-r--r--mysqlc/source/description/description_nl.txt1
-rw-r--r--mysqlc/source/description/description_pl.txt1
-rw-r--r--mysqlc/source/description/description_pt-BR.txt1
-rw-r--r--mysqlc/source/description/description_pt.txt1
-rw-r--r--mysqlc/source/description/description_ru.txt1
-rw-r--r--mysqlc/source/description/description_sv.txt1
-rw-r--r--mysqlc/source/description/description_zh-CN.txt1
-rw-r--r--mysqlc/source/description/description_zh-TW.txt1
-rw-r--r--mysqlc/source/exports.dxp3
-rw-r--r--mysqlc/source/makefile.mk332
-rw-r--r--mysqlc/source/manifest.xml8
-rw-r--r--mysqlc/source/mysqlc.map8
-rw-r--r--mysqlc/source/mysqlc.xml81
-rw-r--r--mysqlc/source/mysqlc_connection.cxx791
-rw-r--r--mysqlc/source/mysqlc_connection.hxx250
-rw-r--r--mysqlc/source/mysqlc_databasemetadata.cxx2215
-rw-r--r--mysqlc/source/mysqlc_databasemetadata.hxx243
-rw-r--r--mysqlc/source/mysqlc_driver.cxx368
-rw-r--r--mysqlc/source/mysqlc_driver.hxx118
-rw-r--r--mysqlc/source/mysqlc_general.cxx176
-rw-r--r--mysqlc/source/mysqlc_general.hxx66
-rw-r--r--mysqlc/source/mysqlc_preparedstatement.cxx944
-rw-r--r--mysqlc/source/mysqlc_preparedstatement.hxx194
-rw-r--r--mysqlc/source/mysqlc_propertyids.cxx210
-rw-r--r--mysqlc/source/mysqlc_propertyids.hxx136
-rw-r--r--mysqlc/source/mysqlc_resultset.cxx1509
-rw-r--r--mysqlc/source/mysqlc_resultset.hxx337
-rw-r--r--mysqlc/source/mysqlc_resultsetmetadata.cxx468
-rw-r--r--mysqlc/source/mysqlc_resultsetmetadata.hxx121
-rw-r--r--mysqlc/source/mysqlc_services.cxx183
-rw-r--r--mysqlc/source/mysqlc_statement.cxx531
-rw-r--r--mysqlc/source/mysqlc_statement.hxx187
-rw-r--r--mysqlc/source/mysqlc_subcomponent.hxx255
-rw-r--r--mysqlc/source/mysqlc_types.cxx792
-rw-r--r--mysqlc/source/mysqlc_types.hxx56
-rw-r--r--mysqlc/source/registry/data/org/openoffice/Office/DataAccess/Drivers.xcu103
-rw-r--r--mysqlc/version.mk38
-rw-r--r--reportbuilder/java/com/sun/star/report/DataRow.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/DataSource.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/DataSourceException.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/DataSourceFactory.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/ImageService.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/InputRepository.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/JobDefinitionException.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/JobProgressIndicator.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/JobProperties.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/OfficeToken.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/OutputRepository.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/ParameterMap.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/ReportAddIn.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/ReportEngine.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/ReportEngineMetaData.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/ReportEngineParameterNames.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/ReportExecutionException.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/ReportExpression.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/ReportExpressionMetaData.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/ReportFunction.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/ReportJob.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/ReportJobDefinition.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/ReportJobFactory.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/SDBCReportData.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/SDBCReportDataFactory.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/SOImageService.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/StorageRepository.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/function/metadata/Author-Function.properties8
-rw-r--r--reportbuilder/java/com/sun/star/report/function/metadata/Author-Function_en_US.properties8
-rw-r--r--reportbuilder/java/com/sun/star/report/function/metadata/AuthorFunction.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/function/metadata/AuthorFunctionDescription.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/function/metadata/MetaDataFunctionCategory.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/function/metadata/Title-Function.properties8
-rw-r--r--reportbuilder/java/com/sun/star/report/function/metadata/Title-Function_en_US.properties8
-rw-r--r--reportbuilder/java/com/sun/star/report/function/metadata/TitleFunction.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/function/metadata/TitleFunctionDescription.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/function/metadata/category.properties6
-rw-r--r--reportbuilder/java/com/sun/star/report/function/metadata/category_en_US.properties8
-rw-r--r--reportbuilder/java/com/sun/star/report/function/metadata/makefile.mk6
-rw-r--r--reportbuilder/java/com/sun/star/report/makefile.mk6
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/DefaultNameGenerator.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/OfficeNamespaces.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/PentahoFormulaContext.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/PentahoReportAddIn.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/PentahoReportEngine.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/PentahoReportEngineMetaData.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/PentahoReportJob.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/SOFormulaOpCodeMapper.java6
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/SOFormulaParser.java6
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/SOFunctionManager.java6
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/SOReportJobFactory.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/StarFunctionCategory.java6
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/StarFunctionDescription.java6
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/StarReportData.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/StarReportDataFactory.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/StarReportModule.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/configuration.properties6
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/expressions/SumExpression.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/expressions/SumExpressionMetaData.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/AbstractReportElementLayoutController.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FixedTextLayoutController.java5
-rwxr-xr-xreportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormatValueUtility.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormattedTextLayoutController.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/ImageElementContext.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/ImageElementLayoutController.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/ObjectOleLayoutController.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeDetailLayoutController.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeGroupLayoutController.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeGroupSectionLayoutController.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeRepeatingStructureLayoutController.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeReportLayoutController.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeTableLayoutController.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeTableTemplateLayoutController.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/TableCellLayoutController.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/VariablesCollection.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/VariablesDeclarationLayoutController.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/loader/InputRepositoryLoader.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/loader/InputRepositoryResourceData.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/loader/InputResourceKey.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/makefile.mk6
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/model/DataStyle.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/model/FixedTextElement.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/model/FontFaceDeclsSection.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/model/FontFaceElement.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/model/FormatCondition.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/model/FormattedTextElement.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/model/ImageElement.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/model/ObjectOleElement.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/model/OfficeDetailSection.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/model/OfficeDocument.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/model/OfficeGroup.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/model/OfficeGroupSection.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/model/OfficeMasterPage.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/model/OfficeMasterStyles.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/model/OfficeReport.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/model/OfficeStyle.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/model/OfficeStyles.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/model/OfficeStylesCollection.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/model/OfficeTableSection.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/model/PageLayout.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/model/PageSection.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/model/RawText.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/model/ReportElement.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/model/TableCellElement.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/model/VariablesDeclarationSection.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/module.properties6
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/output/ImageProducer.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/output/OfficeDocumentReportTarget.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/output/OleProducer.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/output/StyleUtilities.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/output/StylesWriter.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/output/chart/ChartRawReportProcessor.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/output/chart/ChartRawReportTarget.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/output/spreadsheet/SpreadsheetRawReportProcessor.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/output/text/MasterPageFactory.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/output/text/PageBreakDefinition.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/output/text/PageContext.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/output/text/TextRawReportProcessor.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/output/text/TextRawReportTarget.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/output/text/VariablesDeclarations.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/AttributeSpecification.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/ElementReadHandler.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/OfficeDocumentXmlResourceFactory.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/OfficeParserUtil.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/OfficeStylesXmlResourceFactory.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/StarStyleXmlFactoryModule.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/StarXmlFactoryModule.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/StyleMapper.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/chart/ChartReadHandler.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/data/DataStyleReadHandler.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/draw/ObjectOleReadHandler.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/office/BodyReadHandler.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/office/DocumentContentReadHandler.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/office/DocumentStylesReadHandler.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/office/FontFaceDeclsReadHandler.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/office/MasterStylesReadHandler.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/rpt-schema-v1.0-os.xsd8
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/ConditionalPrintExpressionReadHandler.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/DetailRootTableReadHandler.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/FixedContentReadHandler.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/FormatConditionReadHandler.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/FormattedTextReadHandler.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/FunctionReadHandler.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/GroupReadHandler.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/GroupSectionReadHandler.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/ImageReadHandler.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/MasterDetailReadHandler.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/ReportElementReadHandler.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/ReportReadHandler.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/RootTableReadHandler.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/SubDocumentReadHandler.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/selectors.properties6
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/style/FontFaceReadHandler.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/style/MasterPageReadHandler.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/style/OfficeStyleReadHandler.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/style/OfficeStylesReadHandler.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/style/PageLayoutReadHandler.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/style/StyleDefinitionReadHandler.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/OneOfConstantsMapper.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/draw/TextAreaVerticalAlignMapper.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/BackgroundColorMapper.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/BorderRightMapper.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/ColorMapper.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/FontSizeMapper.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/FontStyleMapper.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/FontWeightMapper.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/TextAlignMapper.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontFamilyGenericMapper.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontFamilyMapper.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontNameMapper.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontPitchMapper.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontReliefMapper.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextEmphasizeMapper.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextUnderlineColorMapper.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextUnderlineStyleMapper.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextUnderlineWidthMapper.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextUnderlineWordMode.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/VerticalAlignMapper.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/table/ColumnWidthMapper.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/table/RowHeightMapper.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/table/CoveredCellReadHandler.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableCellReadHandler.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableColumnReadHandler.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableColumnsReadHandler.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableReadHandler.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableRowReadHandler.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableRowsReadHandler.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/text/TextContentReadHandler.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/xlink/XLinkReadHandler.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/styles/LengthCalculator.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapper.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapperKey.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapperXmlFactoryModule.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapperXmlResourceFactory.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMappingDocumentReadHandler.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMappingReadHandler.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMappingRule.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/styles/stylemapper.xml6
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/styles/stylemapper.xsd8
-rw-r--r--reportbuilder/java/com/sun/star/report/util/DefaultJobProperties.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/util/DefaultParameterMap.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/util/DefaultReportJobDefinition.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/util/ManifestWriter.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/util/ReportUtil.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/util/makefile.mk6
-rw-r--r--reportbuilder/java/jfreereport.properties6
-rw-r--r--reportbuilder/java/libformula.properties10
-rw-r--r--reportbuilder/java/loader.properties6
-rw-r--r--reportbuilder/java/makefile.mk6
-rw-r--r--reportbuilder/registry/data/org/openoffice/Office/Accelerators.xcu5
-rw-r--r--reportbuilder/registry/data/org/openoffice/Office/DataAccess.xcu5
-rw-r--r--reportbuilder/registry/data/org/openoffice/Office/Embedding.xcu5
-rw-r--r--reportbuilder/registry/data/org/openoffice/Office/ExtendedColorScheme.xcu393
-rw-r--r--reportbuilder/registry/data/org/openoffice/Office/Paths.xcu6
-rw-r--r--reportbuilder/registry/data/org/openoffice/Office/ReportDesign.xcu5
-rw-r--r--reportbuilder/registry/data/org/openoffice/Office/UI/Controller.xcu5
-rw-r--r--reportbuilder/registry/data/org/openoffice/Office/UI/DbReportWindowState.xcu309
-rw-r--r--reportbuilder/registry/data/org/openoffice/Office/UI/ReportCommands.xcu809
-rw-r--r--reportbuilder/registry/data/org/openoffice/Office/UI/makefile.mk6
-rw-r--r--reportbuilder/registry/data/org/openoffice/Office/makefile.mk6
-rw-r--r--reportbuilder/registry/data/org/openoffice/Setup.xcu5
-rw-r--r--reportbuilder/registry/data/org/openoffice/TypeDetection/Filter.xcu5
-rw-r--r--reportbuilder/registry/data/org/openoffice/TypeDetection/Types.xcu5
-rw-r--r--reportbuilder/registry/data/org/openoffice/TypeDetection/makefile.mk6
-rw-r--r--reportbuilder/registry/data/org/openoffice/makefile.mk6
-rw-r--r--reportbuilder/registry/schema/org/openoffice/Office/ReportDesign.xcs5
-rw-r--r--reportbuilder/registry/schema/org/openoffice/Office/UI/DbReportWindowState.xcs5
-rw-r--r--reportbuilder/registry/schema/org/openoffice/Office/UI/ReportCommands.xcs5
-rw-r--r--reportbuilder/registry/schema/org/openoffice/Office/UI/makefile.mk6
-rw-r--r--reportbuilder/registry/schema/org/openoffice/Office/makefile.mk6
-rw-r--r--reportbuilder/template/en-US/wizard/report/makefile.mk6
-rw-r--r--reportbuilder/template/makefile.mk6
-rw-r--r--reportbuilder/template/registry/data/org/openoffice/Office/Paths.xcu6
-rw-r--r--reportbuilder/template/registry/data/org/openoffice/Office/makefile.mk6
-rw-r--r--reportbuilder/template/wizard/report/makefile.mk6
-rw-r--r--reportbuilder/util/hidother.src5
-rw-r--r--reportbuilder/util/makefile.mk6
-rw-r--r--reportbuilder/util/makefile.pmk6
-rw-r--r--reportbuilder/util/target.pmk6
-rw-r--r--sdext/inc/makefile.mk6
-rw-r--r--sdext/inc/pch/precompiled_sdext.cxx5
-rw-r--r--sdext/inc/pch/precompiled_sdext.hxx5
-rw-r--r--sdext/source/minimizer/aboutdialog.cxx6
-rw-r--r--sdext/source/minimizer/aboutdialog.hxx5
-rw-r--r--sdext/source/minimizer/configurationaccess.cxx6
-rw-r--r--sdext/source/minimizer/configurationaccess.hxx5
-rw-r--r--sdext/source/minimizer/fileopendialog.cxx6
-rw-r--r--sdext/source/minimizer/fileopendialog.hxx5
-rw-r--r--sdext/source/minimizer/graphiccollector.cxx6
-rw-r--r--sdext/source/minimizer/graphiccollector.hxx5
-rw-r--r--sdext/source/minimizer/impoptimizer.cxx6
-rw-r--r--sdext/source/minimizer/impoptimizer.hxx5
-rw-r--r--sdext/source/minimizer/informationdialog.cxx6
-rw-r--r--sdext/source/minimizer/informationdialog.hxx5
-rw-r--r--sdext/source/minimizer/makefile.mk8
-rw-r--r--sdext/source/minimizer/minimizer.pmk8
-rw-r--r--sdext/source/minimizer/optimizationstats.cxx6
-rw-r--r--sdext/source/minimizer/optimizationstats.hxx5
-rw-r--r--sdext/source/minimizer/optimizerdialog.cxx6
-rw-r--r--sdext/source/minimizer/optimizerdialog.hrc5
-rw-r--r--sdext/source/minimizer/optimizerdialog.hxx5
-rw-r--r--sdext/source/minimizer/optimizerdialogcontrols.cxx6
-rw-r--r--sdext/source/minimizer/pagecollector.cxx6
-rw-r--r--sdext/source/minimizer/pagecollector.hxx5
-rw-r--r--sdext/source/minimizer/pppoptimizer.cxx6
-rw-r--r--sdext/source/minimizer/pppoptimizer.hxx5
-rw-r--r--sdext/source/minimizer/pppoptimizerdialog.cxx6
-rw-r--r--sdext/source/minimizer/pppoptimizerdialog.hxx5
-rw-r--r--sdext/source/minimizer/pppoptimizertoken.cxx6
-rw-r--r--sdext/source/minimizer/pppoptimizertoken.hxx5
-rw-r--r--sdext/source/minimizer/pppoptimizeruno.cxx6
-rw-r--r--sdext/source/minimizer/registry/data/org/openoffice/Office/UI/makefile.mk6
-rw-r--r--sdext/source/minimizer/registry/data/org/openoffice/Office/extension/makefile.mk6
-rw-r--r--sdext/source/minimizer/registry/data/org/openoffice/Office/makefile.mk6
-rw-r--r--sdext/source/minimizer/unodialog.cxx6
-rw-r--r--sdext/source/minimizer/unodialog.hxx5
-rw-r--r--sdext/source/pdfimport/filterdet.cxx6
-rw-r--r--sdext/source/pdfimport/filterdet.hxx6
-rwxr-xr-xsdext/source/pdfimport/inc/contentsink.hxx6
-rw-r--r--sdext/source/pdfimport/inc/odfemitter.hxx6
-rwxr-xr-xsdext/source/pdfimport/inc/pdfihelper.hxx6
-rw-r--r--sdext/source/pdfimport/inc/pdfparse.hxx6
-rw-r--r--sdext/source/pdfimport/inc/saxemitter.hxx6
-rw-r--r--sdext/source/pdfimport/inc/treevisitorfactory.hxx6
-rwxr-xr-xsdext/source/pdfimport/inc/wrapper.hxx6
-rw-r--r--sdext/source/pdfimport/inc/xmlemitter.hxx6
-rw-r--r--sdext/source/pdfimport/makefile.mk8
-rw-r--r--sdext/source/pdfimport/misc/makefile.mk6
-rw-r--r--sdext/source/pdfimport/misc/pdfihelper.cxx6
-rw-r--r--sdext/source/pdfimport/misc/pwdinteract.cxx6
-rw-r--r--sdext/source/pdfimport/odf/makefile.mk6
-rw-r--r--sdext/source/pdfimport/odf/odfemitter.cxx6
-rw-r--r--sdext/source/pdfimport/pdfiadaptor.cxx6
-rw-r--r--sdext/source/pdfimport/pdfiadaptor.hxx6
-rw-r--r--sdext/source/pdfimport/pdfisettings.pmk6
-rw-r--r--sdext/source/pdfimport/pdfparse/makefile.mk6
-rw-r--r--sdext/source/pdfimport/pdfparse/pdfentries.cxx6
-rw-r--r--sdext/source/pdfimport/pdfparse/pdfparse.cxx6
-rw-r--r--sdext/source/pdfimport/sax/emitcontext.cxx6
-rw-r--r--sdext/source/pdfimport/sax/emitcontext.hxx6
-rw-r--r--sdext/source/pdfimport/sax/makefile.mk6
-rw-r--r--sdext/source/pdfimport/sax/saxattrlist.cxx6
-rw-r--r--sdext/source/pdfimport/sax/saxattrlist.hxx6
-rw-r--r--sdext/source/pdfimport/services.cxx6
-rwxr-xr-xsdext/source/pdfimport/test/export.map6
-rwxr-xr-xsdext/source/pdfimport/test/makefile.mk8
-rw-r--r--sdext/source/pdfimport/test/outputwrap.hxx6
-rw-r--r--sdext/source/pdfimport/test/pdf2xml.cxx6
-rw-r--r--sdext/source/pdfimport/test/pdfunzip.cxx6
-rw-r--r--sdext/source/pdfimport/test/testdocs/makefile.mk6
-rwxr-xr-xsdext/source/pdfimport/test/tests.cxx6
-rw-r--r--sdext/source/pdfimport/tree/drawtreevisiting.cxx6
-rw-r--r--sdext/source/pdfimport/tree/drawtreevisiting.hxx6
-rw-r--r--sdext/source/pdfimport/tree/genericelements.cxx6
-rw-r--r--sdext/source/pdfimport/tree/genericelements.hxx6
-rw-r--r--sdext/source/pdfimport/tree/imagecontainer.cxx6
-rw-r--r--sdext/source/pdfimport/tree/imagecontainer.hxx6
-rw-r--r--sdext/source/pdfimport/tree/makefile.mk6
-rw-r--r--sdext/source/pdfimport/tree/pdfiprocessor.cxx6
-rw-r--r--sdext/source/pdfimport/tree/pdfiprocessor.hxx6
-rw-r--r--sdext/source/pdfimport/tree/style.cxx6
-rw-r--r--sdext/source/pdfimport/tree/style.hxx6
-rw-r--r--sdext/source/pdfimport/tree/treevisiting.hxx6
-rw-r--r--sdext/source/pdfimport/tree/treevisitorfactory.cxx6
-rw-r--r--sdext/source/pdfimport/tree/writertreevisiting.cxx6
-rw-r--r--sdext/source/pdfimport/tree/writertreevisiting.hxx6
-rwxr-xr-xsdext/source/pdfimport/wrapper/makefile.mk6
-rwxr-xr-xsdext/source/pdfimport/wrapper/wrapper.cxx6
-rw-r--r--sdext/source/pdfimport/xpdftest/makefile.mk6
-rw-r--r--sdext/source/pdfimport/xpdfwrapper/makefile.mk6
-rw-r--r--sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx6
-rw-r--r--sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx6
-rw-r--r--sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx6
-rwxr-xr-xsdext/source/presenter/PresenterAccessibility.cxx6
-rwxr-xr-xsdext/source/presenter/PresenterAccessibility.hxx6
-rw-r--r--sdext/source/presenter/PresenterAnimation.cxx6
-rw-r--r--sdext/source/presenter/PresenterAnimation.hxx6
-rw-r--r--sdext/source/presenter/PresenterAnimator.cxx6
-rw-r--r--sdext/source/presenter/PresenterAnimator.hxx6
-rw-r--r--sdext/source/presenter/PresenterBitmapContainer.cxx6
-rw-r--r--sdext/source/presenter/PresenterBitmapContainer.hxx6
-rw-r--r--sdext/source/presenter/PresenterButton.cxx6
-rw-r--r--sdext/source/presenter/PresenterButton.hxx6
-rw-r--r--sdext/source/presenter/PresenterCanvasHelper.cxx6
-rw-r--r--sdext/source/presenter/PresenterCanvasHelper.hxx6
-rw-r--r--sdext/source/presenter/PresenterClock.cxx6
-rw-r--r--sdext/source/presenter/PresenterClock.hxx6
-rw-r--r--sdext/source/presenter/PresenterComponent.cxx6
-rw-r--r--sdext/source/presenter/PresenterComponent.hxx6
-rw-r--r--sdext/source/presenter/PresenterConfigurationAccess.cxx6
-rw-r--r--sdext/source/presenter/PresenterConfigurationAccess.hxx6
-rw-r--r--sdext/source/presenter/PresenterController.cxx6
-rw-r--r--sdext/source/presenter/PresenterController.hxx6
-rw-r--r--sdext/source/presenter/PresenterCurrentSlideObserver.cxx6
-rw-r--r--sdext/source/presenter/PresenterCurrentSlideObserver.hxx6
-rw-r--r--sdext/source/presenter/PresenterExtensionIdentifier.txx6
-rw-r--r--sdext/source/presenter/PresenterFrameworkObserver.cxx6
-rw-r--r--sdext/source/presenter/PresenterFrameworkObserver.hxx6
-rw-r--r--sdext/source/presenter/PresenterGeometryHelper.cxx6
-rw-r--r--sdext/source/presenter/PresenterGeometryHelper.hxx6
-rw-r--r--sdext/source/presenter/PresenterHelpView.cxx6
-rw-r--r--sdext/source/presenter/PresenterHelpView.hxx6
-rw-r--r--sdext/source/presenter/PresenterHelper.cxx6
-rw-r--r--sdext/source/presenter/PresenterHelper.hxx6
-rw-r--r--sdext/source/presenter/PresenterNotesView.cxx6
-rw-r--r--sdext/source/presenter/PresenterNotesView.hxx6
-rw-r--r--sdext/source/presenter/PresenterPaintManager.cxx6
-rw-r--r--sdext/source/presenter/PresenterPaintManager.hxx6
-rw-r--r--sdext/source/presenter/PresenterPane.cxx6
-rw-r--r--sdext/source/presenter/PresenterPane.hxx6
-rw-r--r--sdext/source/presenter/PresenterPaneAnimator.cxx6
-rw-r--r--sdext/source/presenter/PresenterPaneAnimator.hxx6
-rw-r--r--sdext/source/presenter/PresenterPaneBase.cxx6
-rw-r--r--sdext/source/presenter/PresenterPaneBase.hxx6
-rw-r--r--sdext/source/presenter/PresenterPaneBorderManager.cxx6
-rw-r--r--sdext/source/presenter/PresenterPaneBorderManager.hxx6
-rw-r--r--sdext/source/presenter/PresenterPaneBorderPainter.cxx6
-rw-r--r--sdext/source/presenter/PresenterPaneBorderPainter.hxx6
-rw-r--r--sdext/source/presenter/PresenterPaneContainer.cxx6
-rw-r--r--sdext/source/presenter/PresenterPaneContainer.hxx6
-rw-r--r--sdext/source/presenter/PresenterPaneFactory.cxx6
-rw-r--r--sdext/source/presenter/PresenterPaneFactory.hxx6
-rw-r--r--sdext/source/presenter/PresenterProtocolHandler.cxx6
-rw-r--r--sdext/source/presenter/PresenterProtocolHandler.hxx6
-rw-r--r--sdext/source/presenter/PresenterScreen.cxx6
-rw-r--r--sdext/source/presenter/PresenterScreen.hxx6
-rw-r--r--sdext/source/presenter/PresenterScrollBar.cxx6
-rw-r--r--sdext/source/presenter/PresenterScrollBar.hxx6
-rw-r--r--sdext/source/presenter/PresenterSlidePreview.cxx6
-rw-r--r--sdext/source/presenter/PresenterSlidePreview.hxx6
-rw-r--r--sdext/source/presenter/PresenterSlideShowView.cxx6
-rw-r--r--sdext/source/presenter/PresenterSlideShowView.hxx6
-rw-r--r--sdext/source/presenter/PresenterSlideSorter.cxx6
-rw-r--r--sdext/source/presenter/PresenterSlideSorter.hxx6
-rw-r--r--sdext/source/presenter/PresenterSprite.cxx6
-rw-r--r--sdext/source/presenter/PresenterSprite.hxx6
-rw-r--r--sdext/source/presenter/PresenterSpritePane.cxx6
-rw-r--r--sdext/source/presenter/PresenterSpritePane.hxx6
-rwxr-xr-xsdext/source/presenter/PresenterTextView.cxx6
-rwxr-xr-xsdext/source/presenter/PresenterTextView.hxx6
-rw-r--r--sdext/source/presenter/PresenterTheme.cxx6
-rw-r--r--sdext/source/presenter/PresenterTheme.hxx6
-rw-r--r--sdext/source/presenter/PresenterTimer.cxx6
-rw-r--r--sdext/source/presenter/PresenterTimer.hxx6
-rw-r--r--sdext/source/presenter/PresenterToolBar.cxx6
-rw-r--r--sdext/source/presenter/PresenterToolBar.hxx6
-rw-r--r--sdext/source/presenter/PresenterUIPainter.cxx6
-rw-r--r--sdext/source/presenter/PresenterUIPainter.hxx6
-rw-r--r--sdext/source/presenter/PresenterViewFactory.cxx6
-rw-r--r--sdext/source/presenter/PresenterViewFactory.hxx6
-rw-r--r--sdext/source/presenter/PresenterWindowManager.cxx6
-rw-r--r--sdext/source/presenter/PresenterWindowManager.hxx6
-rw-r--r--sdext/source/presenter/help/en-US/com.sun.PresenterScreen/makefile.mk8
-rw-r--r--sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp5
-rw-r--r--sdext/source/presenter/makefile.mk8
-rw-r--r--sdext/source/presenter/registry/data/org/openoffice/Office/extension/PresenterScreen.xcu6
-rw-r--r--sdext/source/presenter/registry/data/org/openoffice/Office/extension/makefile.mk6
-rw-r--r--sdext/source/presenter/registry/data/org/openoffice/Office/makefile.mk6
-rw-r--r--sdext/source/presenter/registry/schema/org/openoffice/Office/extension/PresenterScreen.xcs6
-rw-r--r--sdext/util/makefile.pmk6
-rw-r--r--swext/makefile.pmk6
-rw-r--r--swext/mediawiki/build.xml6
-rw-r--r--swext/mediawiki/dialogs/EditSetting.xdl6
-rw-r--r--swext/mediawiki/dialogs/Module1.xba52
-rw-r--r--swext/mediawiki/dialogs/SendToMediaWiki.xdl6
-rw-r--r--swext/mediawiki/dialogs/Settings.xdl6
-rw-r--r--swext/mediawiki/dialogs/dialog.xlb6
-rw-r--r--swext/mediawiki/dialogs/script.xlb6
-rw-r--r--swext/mediawiki/help/makefile.mk6
-rw-r--r--swext/mediawiki/help/wiki.xhp5
-rw-r--r--swext/mediawiki/help/wikiaccount.xhp5
-rw-r--r--swext/mediawiki/help/wikiformats.xhp5
-rw-r--r--swext/mediawiki/help/wikisend.xhp5
-rw-r--r--swext/mediawiki/help/wikisettings.xhp5
-rw-r--r--swext/mediawiki/makefile.mk6
-rw-r--r--swext/mediawiki/src/com/sun/star/wiki/EditPageParser.java6
-rw-r--r--swext/mediawiki/src/com/sun/star/wiki/Helper.java6
-rw-r--r--swext/mediawiki/src/com/sun/star/wiki/MainThreadDialogExecutor.java6
-rw-r--r--swext/mediawiki/src/com/sun/star/wiki/Settings.java6
-rw-r--r--swext/mediawiki/src/com/sun/star/wiki/WikiArticle.java6
-rw-r--r--swext/mediawiki/src/com/sun/star/wiki/WikiCancelException.java6
-rw-r--r--swext/mediawiki/src/com/sun/star/wiki/WikiDialog.java6
-rw-r--r--swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java6
-rw-r--r--swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java6
-rw-r--r--swext/mediawiki/src/com/sun/star/wiki/WikiOptionsEventHandlerImpl.java6
-rw-r--r--swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java6
-rw-r--r--swext/mediawiki/src/com/sun/star/wiki/WikiProtocolSocketFactory.java6
-rw-r--r--swext/mediawiki/src/makefile.mk8
-rw-r--r--swext/mediawiki/src/registry/data/org/openoffice/Office/Addons.xcu6
-rw-r--r--swext/mediawiki/src/registry/data/org/openoffice/Office/Custom/WikiExtension.xcu6
-rw-r--r--swext/mediawiki/src/registry/data/org/openoffice/Office/Custom/makefile.mk6
-rw-r--r--swext/mediawiki/src/registry/data/org/openoffice/Office/OptionsDialog.xcu6
-rw-r--r--swext/mediawiki/src/registry/data/org/openoffice/Office/Paths.xcu72
-rw-r--r--swext/mediawiki/src/registry/data/org/openoffice/Office/ProtocolHandler.xcu6
-rw-r--r--swext/mediawiki/src/registry/data/org/openoffice/Office/makefile.mk6
-rw-r--r--swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/Filter.xcu112
-rw-r--r--swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/Types.xcu88
-rw-r--r--swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/makefile.mk6
-rw-r--r--swext/mediawiki/src/registry/schema/org/openoffice/Office/Custom/WikiExtension.xcs6
-rw-r--r--swext/mediawiki/src/registry/schema/org/openoffice/Office/Custom/makefile.mk6
-rw-r--r--swext/mediawiki/src/uno-extension-manifest.xml6
-rwxr-xr-xtomcat/makefile.mk6
-rw-r--r--xpdf/makefile.mk6
584 files changed, 14014 insertions, 4982 deletions
diff --git a/apache-commons/java/codec/makefile.mk b/apache-commons/java/codec/makefile.mk
index ebc499210591..6976731477de 100644
--- a/apache-commons/java/codec/makefile.mk
+++ b/apache-commons/java/codec/makefile.mk
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.3 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/apache-commons/java/httpclient/makefile.mk b/apache-commons/java/httpclient/makefile.mk
index f1607a6e5d17..6e05150c7c20 100644
--- a/apache-commons/java/httpclient/makefile.mk
+++ b/apache-commons/java/httpclient/makefile.mk
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.3 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/apache-commons/java/lang/makefile.mk b/apache-commons/java/lang/makefile.mk
index f040d7f5e535..0bf15d0020ce 100644
--- a/apache-commons/java/lang/makefile.mk
+++ b/apache-commons/java/lang/makefile.mk
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.3 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/apache-commons/java/logging/makefile.mk b/apache-commons/java/logging/makefile.mk
index b004ef192b5b..5df8c34dde3a 100644
--- a/apache-commons/java/logging/makefile.mk
+++ b/apache-commons/java/logging/makefile.mk
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.4 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/jfreereport/java/flute/makefile.mk b/jfreereport/java/flute/makefile.mk
index 41e9c82ca8f4..9444d75fb692 100644
--- a/jfreereport/java/flute/makefile.mk
+++ b/jfreereport/java/flute/makefile.mk
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.7 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/jfreereport/java/jfreereport/makefile.mk b/jfreereport/java/jfreereport/makefile.mk
index c5c4a9144f87..b527d28973e9 100644
--- a/jfreereport/java/jfreereport/makefile.mk
+++ b/jfreereport/java/jfreereport/makefile.mk
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.6 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/jfreereport/java/libbase/makefile.mk b/jfreereport/java/libbase/makefile.mk
index 4f56b8451469..1cbfc11de0da 100644
--- a/jfreereport/java/libbase/makefile.mk
+++ b/jfreereport/java/libbase/makefile.mk
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.4 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/jfreereport/java/libfonts/makefile.mk b/jfreereport/java/libfonts/makefile.mk
index 398c46619dcd..f59b3cc0963f 100644
--- a/jfreereport/java/libfonts/makefile.mk
+++ b/jfreereport/java/libfonts/makefile.mk
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.6 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/jfreereport/java/libformula/makefile.mk b/jfreereport/java/libformula/makefile.mk
index 55172c522061..4372ce2b764d 100644
--- a/jfreereport/java/libformula/makefile.mk
+++ b/jfreereport/java/libformula/makefile.mk
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.6 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/jfreereport/java/liblayout/makefile.mk b/jfreereport/java/liblayout/makefile.mk
index 622361c1d77d..0340e43ccbd7 100644
--- a/jfreereport/java/liblayout/makefile.mk
+++ b/jfreereport/java/liblayout/makefile.mk
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.6 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/jfreereport/java/libloader/makefile.mk b/jfreereport/java/libloader/makefile.mk
index bdfe308dc4cf..ce97b402d1dd 100644
--- a/jfreereport/java/libloader/makefile.mk
+++ b/jfreereport/java/libloader/makefile.mk
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.6 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/jfreereport/java/librepository/makefile.mk b/jfreereport/java/librepository/makefile.mk
index 6230fe5f6631..e11639c7ae62 100644
--- a/jfreereport/java/librepository/makefile.mk
+++ b/jfreereport/java/librepository/makefile.mk
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.6 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/jfreereport/java/libserializer/makefile.mk b/jfreereport/java/libserializer/makefile.mk
index 6a59ef5625d0..12a301edc9e6 100644
--- a/jfreereport/java/libserializer/makefile.mk
+++ b/jfreereport/java/libserializer/makefile.mk
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.6 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/jfreereport/java/libxml/makefile.mk b/jfreereport/java/libxml/makefile.mk
index 34fa025be48e..d0c8bb427103 100644
--- a/jfreereport/java/libxml/makefile.mk
+++ b/jfreereport/java/libxml/makefile.mk
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.6 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/jfreereport/java/sac/makefile.mk b/jfreereport/java/sac/makefile.mk
index 34eee3e3c129..44cb28435142 100644
--- a/jfreereport/java/sac/makefile.mk
+++ b/jfreereport/java/sac/makefile.mk
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.4 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/migrationanalysis/prj/build.lst b/migrationanalysis/prj/build.lst
index 37f2413afcc1..54f0af004187 100644
--- a/migrationanalysis/prj/build.lst
+++ b/migrationanalysis/prj/build.lst
@@ -1,7 +1,7 @@
-at migrationanalysis : soltools shell NULL
-at migrationanalysis\src\msokill nmake - w at_src NULL
-at migrationanalysis\src\driver_docs nmake - w at_src_driver NULL
-at migrationanalysis\src\resources nmake - w at_src_resources NULL
-at migrationanalysis\src\wizard nmake - w at_src_wizard NULL
-at migrationanalysis\util nmake - w at_util at_src.w at_src_driver.w at_src_resources.w at_src_wizard.w NULL
-
+at migrationanalysis : soltools shell NULL
+at migrationanalysis\src\msokill nmake - w at_src NULL
+at migrationanalysis\src\driver_docs nmake - w at_src_driver NULL
+at migrationanalysis\src\resources nmake - w at_src_resources NULL
+at migrationanalysis\src\wizard nmake - w at_src_wizard NULL
+at migrationanalysis\util nmake - w at_util at_src.w at_src_driver.w at_src_resources.w at_src_wizard.w NULL
+
diff --git a/migrationanalysis/prj/d.lst b/migrationanalysis/prj/d.lst
index 9d07d2e618fa..226e3980d1a9 100644
--- a/migrationanalysis/prj/d.lst
+++ b/migrationanalysis/prj/d.lst
@@ -1,3 +1,3 @@
-..\%__SRC%\bin\ProAnalysisWizard\ProAnalysisWizard.exe %_DEST%\bin%_EXT%\ProAnalysisWizard.exe
-..\%__SRC%\bin\ProAnalysisWizard.zip %_DEST%\bin%_EXT%\ProAnalysisWizard.zip
-
+..\%__SRC%\bin\ProAnalysisWizard\ProAnalysisWizard.exe %_DEST%\bin%_EXT%\ProAnalysisWizard.exe
+..\%__SRC%\bin\ProAnalysisWizard.zip %_DEST%\bin%_EXT%\ProAnalysisWizard.zip
+
diff --git a/migrationanalysis/src/driver_docs/CreateDriverDocs.wsf b/migrationanalysis/src/driver_docs/CreateDriverDocs.wsf
index 8fc82d96d53a..a9442ff58cdb 100644
--- a/migrationanalysis/src/driver_docs/CreateDriverDocs.wsf
+++ b/migrationanalysis/src/driver_docs/CreateDriverDocs.wsf
@@ -2,13 +2,10 @@
' *
' * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
' *
-' * Copyright 2008 by Sun Microsystems, Inc.
+' * Copyright 2000, 2010 Oracle and/or its affiliates.
' *
' * OpenOffice.org - a multi-platform office productivity suite
' *
-' * $RCSfile: CreateDriverDocs.wsf,v $
-' * $Revision: 1.2.140.3 $
-' *
' * This file is part of OpenOffice.org.
' *
' * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/migrationanalysis/src/driver_docs/DocAnalysisRunMacro.vbs b/migrationanalysis/src/driver_docs/DocAnalysisRunMacro.vbs
index 7ec5083107cd..4fa6b203ae4a 100644
--- a/migrationanalysis/src/driver_docs/DocAnalysisRunMacro.vbs
+++ b/migrationanalysis/src/driver_docs/DocAnalysisRunMacro.vbs
@@ -1,31 +1,28 @@
'/*************************************************************************
' *
-' * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-' *
-' * Copyright 2008 by Sun Microsystems, Inc.
-' *
-' * OpenOffice.org - a multi-platform office productivity suite
-' *
-' * $RCSfile: DocAnalysisRunMacro.vbs,v $
-' * $Revision: 1.2.140.1 $
-' *
-' * This file is part of OpenOffice.org.
-' *
-' * OpenOffice.org is free software: you can redistribute it and/or modify
-' * it under the terms of the GNU Lesser General Public License version 3
-' * only, as published by the Free Software Foundation.
-' *
-' * OpenOffice.org is distributed in the hope that it will be useful,
-' * but WITHOUT ANY WARRANTY; without even the implied warranty of
-' * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-' * GNU Lesser General Public License version 3 for more details
-' * (a copy is included in the LICENSE file that accompanied this code).
-' *
-' * You should have received a copy of the GNU Lesser General Public License
-' * version 3 along with OpenOffice.org. If not, see
-' * <http://www.openoffice.org/license.html>
-' * for a copy of the LGPLv3 License.
-' *
+' DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+'
+' Copyright 2000, 2010 Oracle and/or its affiliates.
+'
+' OpenOffice.org - a multi-platform office productivity suite
+'
+' This file is part of OpenOffice.org.
+'
+' OpenOffice.org is free software: you can redistribute it and/or modify
+' it under the terms of the GNU Lesser General Public License version 3
+' only, as published by the Free Software Foundation.
+'
+' OpenOffice.org is distributed in the hope that it will be useful,
+' but WITHOUT ANY WARRANTY; without even the implied warranty of
+' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+' GNU Lesser General Public License version 3 for more details
+' (a copy is included in the LICENSE file that accompanied this code).
+'
+' You should have received a copy of the GNU Lesser General Public License
+' version 3 along with OpenOffice.org. If not, see
+' <http://www.openoffice.org/license.html>
+' for a copy of the LGPLv3 License.
+'
' ************************************************************************/
'### Support Module for running macros in Word. Excel and Powerpoint
'### using automation
diff --git a/migrationanalysis/src/driver_docs/makefile.mk b/migrationanalysis/src/driver_docs/makefile.mk
index bc337be70099..23b8d5f7b330 100644
--- a/migrationanalysis/src/driver_docs/makefile.mk
+++ b/migrationanalysis/src/driver_docs/makefile.mk
@@ -1,131 +1,127 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.8.34.3 $
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=migrationanalysis
-TARGET=driverdocs
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-PAW_DOCDEST:=$(BIN)$/ProAnalysisWizard$/Resources
-PAW_DATDEST:=$(BIN)$/ProAnalysisWizard$/Resources$/lang
-
-PAW_DRIVER_DOCS:= \
- $(PAW_DOCDEST)$/_OOoDocAnalysisExcelDriver.xls \
- $(PAW_DOCDEST)$/_OOoDocAnalysisWordDriver.doc \
- $(PAW_DOCDEST)$/_OOoDocAnalysisPPTDriver.ppt
-
-PAW_DRIVER_DOCS_SRC:= \
- .$/PAW$/_OOoDocAnalysisExcelDriver.xls \
- .$/PAW$/_OOoDocAnalysisWordDriver.doc \
- .$/PAW$/_OOoDocAnalysisPPTDriver.ppt
-
-PAW_DAT_FILES= \
- $(foreach,i,$(alllangiso) $(PAW_DATDEST)$/$i.dat)
-
-DAT_DATA_FILE=allstrings.ulf
-DAT_DON_FILE_PAW=$(MISC)$/$(DAT_DATA_FILE).paw
-
-ULFFILES=$(DAT_DATA_FILE)
-.IF "$(WITH_LANG)"!=""
-ULFDIR:=$(COMMONMISC)$/$(TARGET)
-.ELSE # "$(WITH_LANG)"!=""
-ULFDIR:=.
-.ENDIF # "$(WITH_LANG)"!=""
-
-COMMON_SRC:= \
- .$/sources$/AnalysisDriver.bas \
- .$/sources$/CollectedFiles.cls \
- .$/sources$/CommonMigrationAnalyser.bas \
- .$/sources$/CommonPreparation.bas \
- .$/sources$/DocumentAnalysis.cls \
- .$/sources$/FileTypeAssociation.cls \
- .$/sources$/IssueInfo.cls \
- .$/sources$/LocalizeResults.bas \
- .$/sources$/PrepareInfo.cls \
- .$/sources$/StringDataManager.cls \
- .$/sources$/Stripped_OOoDocAnalysisExcelDriver.xls \
- .$/sources$/Stripped_OOoDocAnalysisPPTDriver.ppt \
- .$/sources$/Stripped_OOoDocAnalysisWordDriver.doc \
- .$/sources$/common_res.bas \
- .$/sources$/results_res.bas
-
-EXCEL_SRC:= \
- .$/sources$/excel$/ApplicationSpecific.bas \
- .$/sources$/excel$/MigrationAnalyser.cls \
- .$/sources$/excel$/Preparation.bas \
- .$/sources$/excel$/excel_res.bas
-
-PP_SRC:= \
- .$/sources$/powerpoint$/ApplicationSpecific.bas \
- .$/sources$/powerpoint$/MigrationAnalyser.cls \
- .$/sources$/powerpoint$/Preparation.bas \
- .$/sources$/powerpoint$/powerpoint_res.bas
-
-WORD_SRC:= \
- .$/sources$/word$/ApplicationSpecific.bas \
- .$/sources$/word$/MigrationAnalyser.cls \
- .$/sources$/word$/Preparation.bas \
- .$/sources$/word$/word_res.bas
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-ALLTAR : $(PAW_DRIVER_DOCS) $(DAT_DON_FILE_PAW)
-
-$(PAW_DRIVER_DOCS) : .$/PAW$/$$(@:f)
- -$(MKDIRHIER) $(@:d)
- $(COPY) .$/PAW$/$(@:f) $@
-
-$(PAW_DAT_FILES) : $(ULFDIR)$/$(DAT_DATA_FILE)
- -$(MKDIRHIER) $(@:d)
- $(TOUCH) $@
-
-$(DAT_DON_FILE_PAW) : $(PAW_DAT_FILES)
- @echo --------------------------------
- @echo building $@
- -$(MKDIRHIER) $(@:d)
- @echo making $(PAW_DAT_FILES)
- $(PERL) ulf2dat.pl -i $(ULFDIR)$/$(DAT_DATA_FILE) $(PAW_DAT_FILES) && $(TOUCH) $@
-
-.IF "$(VB6_LOCATION)" != ""
-$(PAW_DRIVER_DOCS_SRC) : $(COMMON_SRC) $(EXCEL_SRC) $(PP_SRC) $(WORD_SRC)
- @echo --------------------------------
- @echo create driver docs
- cscript CreateDriverDocs.wsf
-.ENDIF
-
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..
+
+PRJNAME=migrationanalysis
+TARGET=driverdocs
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE : settings.mk
+
+# --- Files --------------------------------------------------------
+
+PAW_DOCDEST:=$(BIN)$/ProAnalysisWizard$/Resources
+PAW_DATDEST:=$(BIN)$/ProAnalysisWizard$/Resources$/lang
+
+PAW_DRIVER_DOCS:= \
+ $(PAW_DOCDEST)$/_OOoDocAnalysisExcelDriver.xls \
+ $(PAW_DOCDEST)$/_OOoDocAnalysisWordDriver.doc \
+ $(PAW_DOCDEST)$/_OOoDocAnalysisPPTDriver.ppt
+
+PAW_DRIVER_DOCS_SRC:= \
+ .$/PAW$/_OOoDocAnalysisExcelDriver.xls \
+ .$/PAW$/_OOoDocAnalysisWordDriver.doc \
+ .$/PAW$/_OOoDocAnalysisPPTDriver.ppt
+
+PAW_DAT_FILES= \
+ $(foreach,i,$(alllangiso) $(PAW_DATDEST)$/$i.dat)
+
+DAT_DATA_FILE=allstrings.ulf
+DAT_DON_FILE_PAW=$(MISC)$/$(DAT_DATA_FILE).paw
+
+ULFFILES=$(DAT_DATA_FILE)
+.IF "$(WITH_LANG)"!=""
+ULFDIR:=$(COMMONMISC)$/$(TARGET)
+.ELSE # "$(WITH_LANG)"!=""
+ULFDIR:=.
+.ENDIF # "$(WITH_LANG)"!=""
+
+COMMON_SRC:= \
+ .$/sources$/AnalysisDriver.bas \
+ .$/sources$/CollectedFiles.cls \
+ .$/sources$/CommonMigrationAnalyser.bas \
+ .$/sources$/CommonPreparation.bas \
+ .$/sources$/DocumentAnalysis.cls \
+ .$/sources$/FileTypeAssociation.cls \
+ .$/sources$/IssueInfo.cls \
+ .$/sources$/LocalizeResults.bas \
+ .$/sources$/PrepareInfo.cls \
+ .$/sources$/StringDataManager.cls \
+ .$/sources$/Stripped_OOoDocAnalysisExcelDriver.xls \
+ .$/sources$/Stripped_OOoDocAnalysisPPTDriver.ppt \
+ .$/sources$/Stripped_OOoDocAnalysisWordDriver.doc \
+ .$/sources$/common_res.bas \
+ .$/sources$/results_res.bas
+
+EXCEL_SRC:= \
+ .$/sources$/excel$/ApplicationSpecific.bas \
+ .$/sources$/excel$/MigrationAnalyser.cls \
+ .$/sources$/excel$/Preparation.bas \
+ .$/sources$/excel$/excel_res.bas
+
+PP_SRC:= \
+ .$/sources$/powerpoint$/ApplicationSpecific.bas \
+ .$/sources$/powerpoint$/MigrationAnalyser.cls \
+ .$/sources$/powerpoint$/Preparation.bas \
+ .$/sources$/powerpoint$/powerpoint_res.bas
+
+WORD_SRC:= \
+ .$/sources$/word$/ApplicationSpecific.bas \
+ .$/sources$/word$/MigrationAnalyser.cls \
+ .$/sources$/word$/Preparation.bas \
+ .$/sources$/word$/word_res.bas
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE : target.mk
+
+ALLTAR : $(PAW_DRIVER_DOCS) $(DAT_DON_FILE_PAW)
+
+$(PAW_DRIVER_DOCS) : .$/PAW$/$$(@:f)
+ -$(MKDIRHIER) $(@:d)
+ $(COPY) .$/PAW$/$(@:f) $@
+
+$(PAW_DAT_FILES) : $(ULFDIR)$/$(DAT_DATA_FILE)
+ -$(MKDIRHIER) $(@:d)
+ $(TOUCH) $@
+
+$(DAT_DON_FILE_PAW) : $(PAW_DAT_FILES)
+ @echo --------------------------------
+ @echo building $@
+ -$(MKDIRHIER) $(@:d)
+ @echo making $(PAW_DAT_FILES)
+ $(PERL) ulf2dat.pl -i $(ULFDIR)$/$(DAT_DATA_FILE) $(PAW_DAT_FILES) && $(TOUCH) $@
+
+.IF "$(VB6_LOCATION)" != ""
+$(PAW_DRIVER_DOCS_SRC) : $(COMMON_SRC) $(EXCEL_SRC) $(PP_SRC) $(WORD_SRC)
+ @echo --------------------------------
+ @echo create driver docs
+ cscript CreateDriverDocs.wsf
+.ENDIF
+
diff --git a/migrationanalysis/src/driver_docs/sources/AnalysisDriver.bas b/migrationanalysis/src/driver_docs/sources/AnalysisDriver.bas
index 5cb0fa6c5401..cb9f85b376c1 100644
--- a/migrationanalysis/src/driver_docs/sources/AnalysisDriver.bas
+++ b/migrationanalysis/src/driver_docs/sources/AnalysisDriver.bas
@@ -1,31 +1,29 @@
Attribute VB_Name = "AnalysisDriver"
'/*************************************************************************
' *
-' * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-' *
-' * Copyright 2008 by Sun Microsystems, Inc.
-' *
-' * OpenOffice.org - a multi-platform office productivity suite
-' *
-' * $RCSfile: AnalysisDriver.bas,v $
-' *
-' * This file is part of OpenOffice.org.
-' *
-' * OpenOffice.org is free software: you can redistribute it and/or modify
-' * it under the terms of the GNU Lesser General Public License version 3
-' * only, as published by the Free Software Foundation.
-' *
-' * OpenOffice.org is distributed in the hope that it will be useful,
-' * but WITHOUT ANY WARRANTY; without even the implied warranty of
-' * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-' * GNU Lesser General Public License version 3 for more details
-' * (a copy is included in the LICENSE file that accompanied this code).
-' *
-' * You should have received a copy of the GNU Lesser General Public License
-' * version 3 along with OpenOffice.org. If not, see
-' * <http://www.openoffice.org/license.html>
-' * for a copy of the LGPLv3 License.
-' *
+' DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+'
+' Copyright 2000, 2010 Oracle and/or its affiliates.
+'
+' OpenOffice.org - a multi-platform office productivity suite
+'
+' This file is part of OpenOffice.org.
+'
+' OpenOffice.org is free software: you can redistribute it and/or modify
+' it under the terms of the GNU Lesser General Public License version 3
+' only, as published by the Free Software Foundation.
+'
+' OpenOffice.org is distributed in the hope that it will be useful,
+' but WITHOUT ANY WARRANTY; without even the implied warranty of
+' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+' GNU Lesser General Public License version 3 for more details
+' (a copy is included in the LICENSE file that accompanied this code).
+'
+' You should have received a copy of the GNU Lesser General Public License
+' version 3 along with OpenOffice.org. If not, see
+' <http://www.openoffice.org/license.html>
+' for a copy of the LGPLv3 License.
+'
' ************************************************************************/
Option Explicit
diff --git a/migrationanalysis/src/driver_docs/sources/CollectedFiles.cls b/migrationanalysis/src/driver_docs/sources/CollectedFiles.cls
index 6871b34c1471..de81fc9261f0 100644
--- a/migrationanalysis/src/driver_docs/sources/CollectedFiles.cls
+++ b/migrationanalysis/src/driver_docs/sources/CollectedFiles.cls
@@ -9,31 +9,29 @@ Attribute VB_PredeclaredId = False
Attribute VB_Exposed = False
'/*************************************************************************
' *
-' * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-' *
-' * Copyright 2008 by Sun Microsystems, Inc.
-' *
-' * OpenOffice.org - a multi-platform office productivity suite
-' *
-' * $RCSfile: CollectedFiles.cls,v $
-' *
-' * This file is part of OpenOffice.org.
-' *
-' * OpenOffice.org is free software: you can redistribute it and/or modify
-' * it under the terms of the GNU Lesser General Public License version 3
-' * only, as published by the Free Software Foundation.
-' *
-' * OpenOffice.org is distributed in the hope that it will be useful,
-' * but WITHOUT ANY WARRANTY; without even the implied warranty of
-' * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-' * GNU Lesser General Public License version 3 for more details
-' * (a copy is included in the LICENSE file that accompanied this code).
-' *
-' * You should have received a copy of the GNU Lesser General Public License
-' * version 3 along with OpenOffice.org. If not, see
-' * <http://www.openoffice.org/license.html>
-' * for a copy of the LGPLv3 License.
-' *
+' DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+'
+' Copyright 2000, 2010 Oracle and/or its affiliates.
+'
+' OpenOffice.org - a multi-platform office productivity suite
+'
+' This file is part of OpenOffice.org.
+'
+' OpenOffice.org is free software: you can redistribute it and/or modify
+' it under the terms of the GNU Lesser General Public License version 3
+' only, as published by the Free Software Foundation.
+'
+' OpenOffice.org is distributed in the hope that it will be useful,
+' but WITHOUT ANY WARRANTY; without even the implied warranty of
+' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+' GNU Lesser General Public License version 3 for more details
+' (a copy is included in the LICENSE file that accompanied this code).
+'
+' You should have received a copy of the GNU Lesser General Public License
+' version 3 along with OpenOffice.org. If not, see
+' <http://www.openoffice.org/license.html>
+' for a copy of the LGPLv3 License.
+'
' ************************************************************************/
Option Explicit
diff --git a/migrationanalysis/src/driver_docs/sources/CommonMigrationAnalyser.bas b/migrationanalysis/src/driver_docs/sources/CommonMigrationAnalyser.bas
index d165054fa7b0..5fae03a4d399 100644
--- a/migrationanalysis/src/driver_docs/sources/CommonMigrationAnalyser.bas
+++ b/migrationanalysis/src/driver_docs/sources/CommonMigrationAnalyser.bas
@@ -1,31 +1,29 @@
Attribute VB_Name = "CommonMigrationAnalyser"
'/*************************************************************************
' *
-' * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-' *
-' * Copyright 2008 by Sun Microsystems, Inc.
-' *
-' * OpenOffice.org - a multi-platform office productivity suite
-' *
-' * $RCSfile: CommonMigrationAnalyser.bas,v $
-' *
-' * This file is part of OpenOffice.org.
-' *
-' * OpenOffice.org is free software: you can redistribute it and/or modify
-' * it under the terms of the GNU Lesser General Public License version 3
-' * only, as published by the Free Software Foundation.
-' *
-' * OpenOffice.org is distributed in the hope that it will be useful,
-' * but WITHOUT ANY WARRANTY; without even the implied warranty of
-' * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-' * GNU Lesser General Public License version 3 for more details
-' * (a copy is included in the LICENSE file that accompanied this code).
-' *
-' * You should have received a copy of the GNU Lesser General Public License
-' * version 3 along with OpenOffice.org. If not, see
-' * <http://www.openoffice.org/license.html>
-' * for a copy of the LGPLv3 License.
-' *
+' DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+'
+' Copyright 2000, 2010 Oracle and/or its affiliates.
+'
+' OpenOffice.org - a multi-platform office productivity suite
+'
+' This file is part of OpenOffice.org.
+'
+' OpenOffice.org is free software: you can redistribute it and/or modify
+' it under the terms of the GNU Lesser General Public License version 3
+' only, as published by the Free Software Foundation.
+'
+' OpenOffice.org is distributed in the hope that it will be useful,
+' but WITHOUT ANY WARRANTY; without even the implied warranty of
+' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+' GNU Lesser General Public License version 3 for more details
+' (a copy is included in the LICENSE file that accompanied this code).
+'
+' You should have received a copy of the GNU Lesser General Public License
+' version 3 along with OpenOffice.org. If not, see
+' <http://www.openoffice.org/license.html>
+' for a copy of the LGPLv3 License.
+'
' ************************************************************************/
Option Explicit
diff --git a/migrationanalysis/src/driver_docs/sources/CommonPreparation.bas b/migrationanalysis/src/driver_docs/sources/CommonPreparation.bas
index 2d0e04f80e4a..76fb80150d77 100644
--- a/migrationanalysis/src/driver_docs/sources/CommonPreparation.bas
+++ b/migrationanalysis/src/driver_docs/sources/CommonPreparation.bas
@@ -1,31 +1,29 @@
Attribute VB_Name = "CommonPreparation"
'/*************************************************************************
' *
-' * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-' *
-' * Copyright 2008 by Sun Microsystems, Inc.
-' *
-' * OpenOffice.org - a multi-platform office productivity suite
-' *
-' * $RCSfile: CommonPreparation.bas,v $
-' *
-' * This file is part of OpenOffice.org.
-' *
-' * OpenOffice.org is free software: you can redistribute it and/or modify
-' * it under the terms of the GNU Lesser General Public License version 3
-' * only, as published by the Free Software Foundation.
-' *
-' * OpenOffice.org is distributed in the hope that it will be useful,
-' * but WITHOUT ANY WARRANTY; without even the implied warranty of
-' * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-' * GNU Lesser General Public License version 3 for more details
-' * (a copy is included in the LICENSE file that accompanied this code).
-' *
-' * You should have received a copy of the GNU Lesser General Public License
-' * version 3 along with OpenOffice.org. If not, see
-' * <http://www.openoffice.org/license.html>
-' * for a copy of the LGPLv3 License.
-' *
+' DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+'
+' Copyright 2000, 2010 Oracle and/or its affiliates.
+'
+' OpenOffice.org - a multi-platform office productivity suite
+'
+' This file is part of OpenOffice.org.
+'
+' OpenOffice.org is free software: you can redistribute it and/or modify
+' it under the terms of the GNU Lesser General Public License version 3
+' only, as published by the Free Software Foundation.
+'
+' OpenOffice.org is distributed in the hope that it will be useful,
+' but WITHOUT ANY WARRANTY; without even the implied warranty of
+' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+' GNU Lesser General Public License version 3 for more details
+' (a copy is included in the LICENSE file that accompanied this code).
+'
+' You should have received a copy of the GNU Lesser General Public License
+' version 3 along with OpenOffice.org. If not, see
+' <http://www.openoffice.org/license.html>
+' for a copy of the LGPLv3 License.
+'
' ************************************************************************/
Option Explicit
diff --git a/migrationanalysis/src/driver_docs/sources/DocumentAnalysis.cls b/migrationanalysis/src/driver_docs/sources/DocumentAnalysis.cls
index cc974e3a2c79..b4681eeb0163 100644
--- a/migrationanalysis/src/driver_docs/sources/DocumentAnalysis.cls
+++ b/migrationanalysis/src/driver_docs/sources/DocumentAnalysis.cls
@@ -9,31 +9,29 @@ Attribute VB_PredeclaredId = False
Attribute VB_Exposed = False
'/*************************************************************************
' *
-' * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-' *
-' * Copyright 2008 by Sun Microsystems, Inc.
-' *
-' * OpenOffice.org - a multi-platform office productivity suite
-' *
-' * $RCSfile: DocumentAnalysis.cls,v $
-' *
-' * This file is part of OpenOffice.org.
-' *
-' * OpenOffice.org is free software: you can redistribute it and/or modify
-' * it under the terms of the GNU Lesser General Public License version 3
-' * only, as published by the Free Software Foundation.
-' *
-' * OpenOffice.org is distributed in the hope that it will be useful,
-' * but WITHOUT ANY WARRANTY; without even the implied warranty of
-' * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-' * GNU Lesser General Public License version 3 for more details
-' * (a copy is included in the LICENSE file that accompanied this code).
-' *
-' * You should have received a copy of the GNU Lesser General Public License
-' * version 3 along with OpenOffice.org. If not, see
-' * <http://www.openoffice.org/license.html>
-' * for a copy of the LGPLv3 License.
-' *
+' DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+'
+' Copyright 2000, 2010 Oracle and/or its affiliates.
+'
+' OpenOffice.org - a multi-platform office productivity suite
+'
+' This file is part of OpenOffice.org.
+'
+' OpenOffice.org is free software: you can redistribute it and/or modify
+' it under the terms of the GNU Lesser General Public License version 3
+' only, as published by the Free Software Foundation.
+'
+' OpenOffice.org is distributed in the hope that it will be useful,
+' but WITHOUT ANY WARRANTY; without even the implied warranty of
+' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+' GNU Lesser General Public License version 3 for more details
+' (a copy is included in the LICENSE file that accompanied this code).
+'
+' You should have received a copy of the GNU Lesser General Public License
+' version 3 along with OpenOffice.org. If not, see
+' <http://www.openoffice.org/license.html>
+' for a copy of the LGPLv3 License.
+'
' ************************************************************************/
Option Explicit
diff --git a/migrationanalysis/src/driver_docs/sources/FileTypeAssociation.cls b/migrationanalysis/src/driver_docs/sources/FileTypeAssociation.cls
index 6a578f43c01b..99828299f009 100644
--- a/migrationanalysis/src/driver_docs/sources/FileTypeAssociation.cls
+++ b/migrationanalysis/src/driver_docs/sources/FileTypeAssociation.cls
@@ -9,31 +9,29 @@ Attribute VB_PredeclaredId = False
Attribute VB_Exposed = False
'/*************************************************************************
' *
-' * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-' *
-' * Copyright 2008 by Sun Microsystems, Inc.
-' *
-' * OpenOffice.org - a multi-platform office productivity suite
-' *
-' * $RCSfile: FileTypeAssociation.cls,v $
-' *
-' * This file is part of OpenOffice.org.
-' *
-' * OpenOffice.org is free software: you can redistribute it and/or modify
-' * it under the terms of the GNU Lesser General Public License version 3
-' * only, as published by the Free Software Foundation.
-' *
-' * OpenOffice.org is distributed in the hope that it will be useful,
-' * but WITHOUT ANY WARRANTY; without even the implied warranty of
-' * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-' * GNU Lesser General Public License version 3 for more details
-' * (a copy is included in the LICENSE file that accompanied this code).
-' *
-' * You should have received a copy of the GNU Lesser General Public License
-' * version 3 along with OpenOffice.org. If not, see
-' * <http://www.openoffice.org/license.html>
-' * for a copy of the LGPLv3 License.
-' *
+' DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+'
+' Copyright 2000, 2010 Oracle and/or its affiliates.
+'
+' OpenOffice.org - a multi-platform office productivity suite
+'
+' This file is part of OpenOffice.org.
+'
+' OpenOffice.org is free software: you can redistribute it and/or modify
+' it under the terms of the GNU Lesser General Public License version 3
+' only, as published by the Free Software Foundation.
+'
+' OpenOffice.org is distributed in the hope that it will be useful,
+' but WITHOUT ANY WARRANTY; without even the implied warranty of
+' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+' GNU Lesser General Public License version 3 for more details
+' (a copy is included in the LICENSE file that accompanied this code).
+'
+' You should have received a copy of the GNU Lesser General Public License
+' version 3 along with OpenOffice.org. If not, see
+' <http://www.openoffice.org/license.html>
+' for a copy of the LGPLv3 License.
+'
' ************************************************************************/
Option Explicit
diff --git a/migrationanalysis/src/driver_docs/sources/IssueInfo.cls b/migrationanalysis/src/driver_docs/sources/IssueInfo.cls
index 23c95c8fa7d0..0979460cc335 100644
--- a/migrationanalysis/src/driver_docs/sources/IssueInfo.cls
+++ b/migrationanalysis/src/driver_docs/sources/IssueInfo.cls
@@ -9,31 +9,29 @@ Attribute VB_PredeclaredId = False
Attribute VB_Exposed = False
'/*************************************************************************
' *
-' * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-' *
-' * Copyright 2008 by Sun Microsystems, Inc.
-' *
-' * OpenOffice.org - a multi-platform office productivity suite
-' *
-' * $RCSfile: IssueInfo.cls,v $
-' *
-' * This file is part of OpenOffice.org.
-' *
-' * OpenOffice.org is free software: you can redistribute it and/or modify
-' * it under the terms of the GNU Lesser General Public License version 3
-' * only, as published by the Free Software Foundation.
-' *
-' * OpenOffice.org is distributed in the hope that it will be useful,
-' * but WITHOUT ANY WARRANTY; without even the implied warranty of
-' * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-' * GNU Lesser General Public License version 3 for more details
-' * (a copy is included in the LICENSE file that accompanied this code).
-' *
-' * You should have received a copy of the GNU Lesser General Public License
-' * version 3 along with OpenOffice.org. If not, see
-' * <http://www.openoffice.org/license.html>
-' * for a copy of the LGPLv3 License.
-' *
+' DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+'
+' Copyright 2000, 2010 Oracle and/or its affiliates.
+'
+' OpenOffice.org - a multi-platform office productivity suite
+'
+' This file is part of OpenOffice.org.
+'
+' OpenOffice.org is free software: you can redistribute it and/or modify
+' it under the terms of the GNU Lesser General Public License version 3
+' only, as published by the Free Software Foundation.
+'
+' OpenOffice.org is distributed in the hope that it will be useful,
+' but WITHOUT ANY WARRANTY; without even the implied warranty of
+' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+' GNU Lesser General Public License version 3 for more details
+' (a copy is included in the LICENSE file that accompanied this code).
+'
+' You should have received a copy of the GNU Lesser General Public License
+' version 3 along with OpenOffice.org. If not, see
+' <http://www.openoffice.org/license.html>
+' for a copy of the LGPLv3 License.
+'
' ************************************************************************/
Option Explicit
diff --git a/migrationanalysis/src/driver_docs/sources/PrepareInfo.cls b/migrationanalysis/src/driver_docs/sources/PrepareInfo.cls
index 71eacb640562..e1a7253bd3ee 100644
--- a/migrationanalysis/src/driver_docs/sources/PrepareInfo.cls
+++ b/migrationanalysis/src/driver_docs/sources/PrepareInfo.cls
@@ -9,31 +9,29 @@ Attribute VB_PredeclaredId = False
Attribute VB_Exposed = True
'/*************************************************************************
' *
-' * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-' *
-' * Copyright 2008 by Sun Microsystems, Inc.
-' *
-' * OpenOffice.org - a multi-platform office productivity suite
-' *
-' * $RCSfile: PrepareInfo.cls,v $
-' *
-' * This file is part of OpenOffice.org.
-' *
-' * OpenOffice.org is free software: you can redistribute it and/or modify
-' * it under the terms of the GNU Lesser General Public License version 3
-' * only, as published by the Free Software Foundation.
-' *
-' * OpenOffice.org is distributed in the hope that it will be useful,
-' * but WITHOUT ANY WARRANTY; without even the implied warranty of
-' * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-' * GNU Lesser General Public License version 3 for more details
-' * (a copy is included in the LICENSE file that accompanied this code).
-' *
-' * You should have received a copy of the GNU Lesser General Public License
-' * version 3 along with OpenOffice.org. If not, see
-' * <http://www.openoffice.org/license.html>
-' * for a copy of the LGPLv3 License.
-' *
+' DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+'
+' Copyright 2000, 2010 Oracle and/or its affiliates.
+'
+' OpenOffice.org - a multi-platform office productivity suite
+'
+' This file is part of OpenOffice.org.
+'
+' OpenOffice.org is free software: you can redistribute it and/or modify
+' it under the terms of the GNU Lesser General Public License version 3
+' only, as published by the Free Software Foundation.
+'
+' OpenOffice.org is distributed in the hope that it will be useful,
+' but WITHOUT ANY WARRANTY; without even the implied warranty of
+' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+' GNU Lesser General Public License version 3 for more details
+' (a copy is included in the LICENSE file that accompanied this code).
+'
+' You should have received a copy of the GNU Lesser General Public License
+' version 3 along with OpenOffice.org. If not, see
+' <http://www.openoffice.org/license.html>
+' for a copy of the LGPLv3 License.
+'
' ************************************************************************/
'H&F Info
diff --git a/migrationanalysis/src/driver_docs/sources/StringDataManager.cls b/migrationanalysis/src/driver_docs/sources/StringDataManager.cls
index 6bea8530bf95..a6081121c1af 100644
--- a/migrationanalysis/src/driver_docs/sources/StringDataManager.cls
+++ b/migrationanalysis/src/driver_docs/sources/StringDataManager.cls
@@ -9,31 +9,29 @@ Attribute VB_PredeclaredId = False
Attribute VB_Exposed = True
'/*************************************************************************
' *
-' * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-' *
-' * Copyright 2008 by Sun Microsystems, Inc.
-' *
-' * OpenOffice.org - a multi-platform office productivity suite
-' *
-' * $RCSfile: StringDataManager.cls,v $
-' *
-' * This file is part of OpenOffice.org.
-' *
-' * OpenOffice.org is free software: you can redistribute it and/or modify
-' * it under the terms of the GNU Lesser General Public License version 3
-' * only, as published by the Free Software Foundation.
-' *
-' * OpenOffice.org is distributed in the hope that it will be useful,
-' * but WITHOUT ANY WARRANTY; without even the implied warranty of
-' * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-' * GNU Lesser General Public License version 3 for more details
-' * (a copy is included in the LICENSE file that accompanied this code).
-' *
-' * You should have received a copy of the GNU Lesser General Public License
-' * version 3 along with OpenOffice.org. If not, see
-' * <http://www.openoffice.org/license.html>
-' * for a copy of the LGPLv3 License.
-' *
+' DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+'
+' Copyright 2000, 2010 Oracle and/or its affiliates.
+'
+' OpenOffice.org - a multi-platform office productivity suite
+'
+' This file is part of OpenOffice.org.
+'
+' OpenOffice.org is free software: you can redistribute it and/or modify
+' it under the terms of the GNU Lesser General Public License version 3
+' only, as published by the Free Software Foundation.
+'
+' OpenOffice.org is distributed in the hope that it will be useful,
+' but WITHOUT ANY WARRANTY; without even the implied warranty of
+' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+' GNU Lesser General Public License version 3 for more details
+' (a copy is included in the LICENSE file that accompanied this code).
+'
+' You should have received a copy of the GNU Lesser General Public License
+' version 3 along with OpenOffice.org. If not, see
+' <http://www.openoffice.org/license.html>
+' for a copy of the LGPLv3 License.
+'
' ************************************************************************/
Option Explicit
diff --git a/migrationanalysis/src/driver_docs/sources/common_res.bas b/migrationanalysis/src/driver_docs/sources/common_res.bas
index 5a3a048261d0..113f8da16b58 100644
--- a/migrationanalysis/src/driver_docs/sources/common_res.bas
+++ b/migrationanalysis/src/driver_docs/sources/common_res.bas
@@ -1,31 +1,29 @@
Attribute VB_Name = "common_res"
'/*************************************************************************
' *
-' * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-' *
-' * Copyright 2008 by Sun Microsystems, Inc.
-' *
-' * OpenOffice.org - a multi-platform office productivity suite
-' *
-' * $RCSfile: common_res.bas,v $
-' *
-' * This file is part of OpenOffice.org.
-' *
-' * OpenOffice.org is free software: you can redistribute it and/or modify
-' * it under the terms of the GNU Lesser General Public License version 3
-' * only, as published by the Free Software Foundation.
-' *
-' * OpenOffice.org is distributed in the hope that it will be useful,
-' * but WITHOUT ANY WARRANTY; without even the implied warranty of
-' * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-' * GNU Lesser General Public License version 3 for more details
-' * (a copy is included in the LICENSE file that accompanied this code).
-' *
-' * You should have received a copy of the GNU Lesser General Public License
-' * version 3 along with OpenOffice.org. If not, see
-' * <http://www.openoffice.org/license.html>
-' * for a copy of the LGPLv3 License.
-' *
+' DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+'
+' Copyright 2000, 2010 Oracle and/or its affiliates.
+'
+' OpenOffice.org - a multi-platform office productivity suite
+'
+' This file is part of OpenOffice.org.
+'
+' OpenOffice.org is free software: you can redistribute it and/or modify
+' it under the terms of the GNU Lesser General Public License version 3
+' only, as published by the Free Software Foundation.
+'
+' OpenOffice.org is distributed in the hope that it will be useful,
+' but WITHOUT ANY WARRANTY; without even the implied warranty of
+' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+' GNU Lesser General Public License version 3 for more details
+' (a copy is included in the LICENSE file that accompanied this code).
+'
+' You should have received a copy of the GNU Lesser General Public License
+' version 3 along with OpenOffice.org. If not, see
+' <http://www.openoffice.org/license.html>
+' for a copy of the LGPLv3 License.
+'
' ************************************************************************/
Public RID_STR_COMMON_RESULTS_SHEET_NAME_OVERVIEW As String
diff --git a/migrationanalysis/src/driver_docs/sources/excel/ApplicationSpecific.bas b/migrationanalysis/src/driver_docs/sources/excel/ApplicationSpecific.bas
index d74f29baa0b2..88351b178115 100644
--- a/migrationanalysis/src/driver_docs/sources/excel/ApplicationSpecific.bas
+++ b/migrationanalysis/src/driver_docs/sources/excel/ApplicationSpecific.bas
@@ -1,31 +1,29 @@
Attribute VB_Name = "ApplicationSpecific"
'/*************************************************************************
' *
-' * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-' *
-' * Copyright 2008 by Sun Microsystems, Inc.
-' *
-' * OpenOffice.org - a multi-platform office productivity suite
-' *
-' * $RCSfile: ApplicationSpecific.bas,v $
-' *
-' * This file is part of OpenOffice.org.
-' *
-' * OpenOffice.org is free software: you can redistribute it and/or modify
-' * it under the terms of the GNU Lesser General Public License version 3
-' * only, as published by the Free Software Foundation.
-' *
-' * OpenOffice.org is distributed in the hope that it will be useful,
-' * but WITHOUT ANY WARRANTY; without even the implied warranty of
-' * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-' * GNU Lesser General Public License version 3 for more details
-' * (a copy is included in the LICENSE file that accompanied this code).
-' *
-' * You should have received a copy of the GNU Lesser General Public License
-' * version 3 along with OpenOffice.org. If not, see
-' * <http://www.openoffice.org/license.html>
-' * for a copy of the LGPLv3 License.
-' *
+' DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+'
+' Copyright 2000, 2010 Oracle and/or its affiliates.
+'
+' OpenOffice.org - a multi-platform office productivity suite
+'
+' This file is part of OpenOffice.org.
+'
+' OpenOffice.org is free software: you can redistribute it and/or modify
+' it under the terms of the GNU Lesser General Public License version 3
+' only, as published by the Free Software Foundation.
+'
+' OpenOffice.org is distributed in the hope that it will be useful,
+' but WITHOUT ANY WARRANTY; without even the implied warranty of
+' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+' GNU Lesser General Public License version 3 for more details
+' (a copy is included in the LICENSE file that accompanied this code).
+'
+' You should have received a copy of the GNU Lesser General Public License
+' version 3 along with OpenOffice.org. If not, see
+' <http://www.openoffice.org/license.html>
+' for a copy of the LGPLv3 License.
+'
' ************************************************************************/
Option Explicit
diff --git a/migrationanalysis/src/driver_docs/sources/excel/MigrationAnalyser.cls b/migrationanalysis/src/driver_docs/sources/excel/MigrationAnalyser.cls
index 66f48ed7faaa..1378417344cc 100644
--- a/migrationanalysis/src/driver_docs/sources/excel/MigrationAnalyser.cls
+++ b/migrationanalysis/src/driver_docs/sources/excel/MigrationAnalyser.cls
@@ -9,31 +9,29 @@ Attribute VB_PredeclaredId = False
Attribute VB_Exposed = False
'/*************************************************************************
' *
-' * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-' *
-' * Copyright 2008 by Sun Microsystems, Inc.
-' *
-' * OpenOffice.org - a multi-platform office productivity suite
-' *
-' * $RCSfile: MigrationAnalyser.cls,v $
-' *
-' * This file is part of OpenOffice.org.
-' *
-' * OpenOffice.org is free software: you can redistribute it and/or modify
-' * it under the terms of the GNU Lesser General Public License version 3
-' * only, as published by the Free Software Foundation.
-' *
-' * OpenOffice.org is distributed in the hope that it will be useful,
-' * but WITHOUT ANY WARRANTY; without even the implied warranty of
-' * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-' * GNU Lesser General Public License version 3 for more details
-' * (a copy is included in the LICENSE file that accompanied this code).
-' *
-' * You should have received a copy of the GNU Lesser General Public License
-' * version 3 along with OpenOffice.org. If not, see
-' * <http://www.openoffice.org/license.html>
-' * for a copy of the LGPLv3 License.
-' *
+' DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+'
+' Copyright 2000, 2010 Oracle and/or its affiliates.
+'
+' OpenOffice.org - a multi-platform office productivity suite
+'
+' This file is part of OpenOffice.org.
+'
+' OpenOffice.org is free software: you can redistribute it and/or modify
+' it under the terms of the GNU Lesser General Public License version 3
+' only, as published by the Free Software Foundation.
+'
+' OpenOffice.org is distributed in the hope that it will be useful,
+' but WITHOUT ANY WARRANTY; without even the implied warranty of
+' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+' GNU Lesser General Public License version 3 for more details
+' (a copy is included in the LICENSE file that accompanied this code).
+'
+' You should have received a copy of the GNU Lesser General Public License
+' version 3 along with OpenOffice.org. If not, see
+' <http://www.openoffice.org/license.html>
+' for a copy of the LGPLv3 License.
+'
' ************************************************************************/
Option Explicit
diff --git a/migrationanalysis/src/driver_docs/sources/excel/Preparation.bas b/migrationanalysis/src/driver_docs/sources/excel/Preparation.bas
index d2d4ed82ee68..aba750604c3e 100644
--- a/migrationanalysis/src/driver_docs/sources/excel/Preparation.bas
+++ b/migrationanalysis/src/driver_docs/sources/excel/Preparation.bas
@@ -1,31 +1,29 @@
Attribute VB_Name = "Preparation"
'/*************************************************************************
' *
-' * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-' *
-' * Copyright 2008 by Sun Microsystems, Inc.
-' *
-' * OpenOffice.org - a multi-platform office productivity suite
-' *
-' * $RCSfile: Preparation.bas,v $
-' *
-' * This file is part of OpenOffice.org.
-' *
-' * OpenOffice.org is free software: you can redistribute it and/or modify
-' * it under the terms of the GNU Lesser General Public License version 3
-' * only, as published by the Free Software Foundation.
-' *
-' * OpenOffice.org is distributed in the hope that it will be useful,
-' * but WITHOUT ANY WARRANTY; without even the implied warranty of
-' * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-' * GNU Lesser General Public License version 3 for more details
-' * (a copy is included in the LICENSE file that accompanied this code).
-' *
-' * You should have received a copy of the GNU Lesser General Public License
-' * version 3 along with OpenOffice.org. If not, see
-' * <http://www.openoffice.org/license.html>
-' * for a copy of the LGPLv3 License.
-' *
+' DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+'
+' Copyright 2000, 2010 Oracle and/or its affiliates.
+'
+' OpenOffice.org - a multi-platform office productivity suite
+'
+' This file is part of OpenOffice.org.
+'
+' OpenOffice.org is free software: you can redistribute it and/or modify
+' it under the terms of the GNU Lesser General Public License version 3
+' only, as published by the Free Software Foundation.
+'
+' OpenOffice.org is distributed in the hope that it will be useful,
+' but WITHOUT ANY WARRANTY; without even the implied warranty of
+' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+' GNU Lesser General Public License version 3 for more details
+' (a copy is included in the LICENSE file that accompanied this code).
+'
+' You should have received a copy of the GNU Lesser General Public License
+' version 3 along with OpenOffice.org. If not, see
+' <http://www.openoffice.org/license.html>
+' for a copy of the LGPLv3 License.
+'
' ************************************************************************/
Option Explicit
diff --git a/migrationanalysis/src/driver_docs/sources/excel/SetTextBoxFont.bas b/migrationanalysis/src/driver_docs/sources/excel/SetTextBoxFont.bas
index 16c4194e1ccb..7338eefd92d1 100644
--- a/migrationanalysis/src/driver_docs/sources/excel/SetTextBoxFont.bas
+++ b/migrationanalysis/src/driver_docs/sources/excel/SetTextBoxFont.bas
@@ -1,31 +1,29 @@
Attribute VB_Name = "SetTextBoxFont"
'/*************************************************************************
' *
-' * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-' *
-' * Copyright 2008 by Sun Microsystems, Inc.
-' *
-' * OpenOffice.org - a multi-platform office productivity suite
-' *
-' * $RCSfile: SetTextBoxFont.bas,v $
-' *
-' * This file is part of OpenOffice.org.
-' *
-' * OpenOffice.org is free software: you can redistribute it and/or modify
-' * it under the terms of the GNU Lesser General Public License version 3
-' * only, as published by the Free Software Foundation.
-' *
-' * OpenOffice.org is distributed in the hope that it will be useful,
-' * but WITHOUT ANY WARRANTY; without even the implied warranty of
-' * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-' * GNU Lesser General Public License version 3 for more details
-' * (a copy is included in the LICENSE file that accompanied this code).
-' *
-' * You should have received a copy of the GNU Lesser General Public License
-' * version 3 along with OpenOffice.org. If not, see
-' * <http://www.openoffice.org/license.html>
-' * for a copy of the LGPLv3 License.
-' *
+' DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+'
+' Copyright 2000, 2010 Oracle and/or its affiliates.
+'
+' OpenOffice.org - a multi-platform office productivity suite
+'
+' This file is part of OpenOffice.org.
+'
+' OpenOffice.org is free software: you can redistribute it and/or modify
+' it under the terms of the GNU Lesser General Public License version 3
+' only, as published by the Free Software Foundation.
+'
+' OpenOffice.org is distributed in the hope that it will be useful,
+' but WITHOUT ANY WARRANTY; without even the implied warranty of
+' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+' GNU Lesser General Public License version 3 for more details
+' (a copy is included in the LICENSE file that accompanied this code).
+'
+' You should have received a copy of the GNU Lesser General Public License
+' version 3 along with OpenOffice.org. If not, see
+' <http://www.openoffice.org/license.html>
+' for a copy of the LGPLv3 License.
+'
' ************************************************************************/
Option Explicit
diff --git a/migrationanalysis/src/driver_docs/sources/excel/ThisWorkbook.cls b/migrationanalysis/src/driver_docs/sources/excel/ThisWorkbook.cls
index bff0f7bcd4f9..57689ef1e457 100644
--- a/migrationanalysis/src/driver_docs/sources/excel/ThisWorkbook.cls
+++ b/migrationanalysis/src/driver_docs/sources/excel/ThisWorkbook.cls
@@ -1,30 +1,28 @@
'/*************************************************************************
' *
-' * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-' *
-' * Copyright 2008 by Sun Microsystems, Inc.
-' *
-' * OpenOffice.org - a multi-platform office productivity suite
-' *
-' * $RCSfile: ThisWorkbook.cls,v $
-' *
-' * This file is part of OpenOffice.org.
-' *
-' * OpenOffice.org is free software: you can redistribute it and/or modify
-' * it under the terms of the GNU Lesser General Public License version 3
-' * only, as published by the Free Software Foundation.
-' *
-' * OpenOffice.org is distributed in the hope that it will be useful,
-' * but WITHOUT ANY WARRANTY; without even the implied warranty of
-' * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-' * GNU Lesser General Public License version 3 for more details
-' * (a copy is included in the LICENSE file that accompanied this code).
-' *
-' * You should have received a copy of the GNU Lesser General Public License
-' * version 3 along with OpenOffice.org. If not, see
-' * <http://www.openoffice.org/license.html>
-' * for a copy of the LGPLv3 License.
-' *
+' DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+'
+' Copyright 2000, 2010 Oracle and/or its affiliates.
+'
+' OpenOffice.org - a multi-platform office productivity suite
+'
+' This file is part of OpenOffice.org.
+'
+' OpenOffice.org is free software: you can redistribute it and/or modify
+' it under the terms of the GNU Lesser General Public License version 3
+' only, as published by the Free Software Foundation.
+'
+' OpenOffice.org is distributed in the hope that it will be useful,
+' but WITHOUT ANY WARRANTY; without even the implied warranty of
+' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+' GNU Lesser General Public License version 3 for more details
+' (a copy is included in the LICENSE file that accompanied this code).
+'
+' You should have received a copy of the GNU Lesser General Public License
+' version 3 along with OpenOffice.org. If not, see
+' <http://www.openoffice.org/license.html>
+' for a copy of the LGPLv3 License.
+'
' ************************************************************************/
Public xlStrings As StringDataManager
diff --git a/migrationanalysis/src/driver_docs/sources/excel/excel_res.bas b/migrationanalysis/src/driver_docs/sources/excel/excel_res.bas
index 55b7dc01b3a1..daa8327bd875 100644
--- a/migrationanalysis/src/driver_docs/sources/excel/excel_res.bas
+++ b/migrationanalysis/src/driver_docs/sources/excel/excel_res.bas
@@ -1,31 +1,29 @@
Attribute VB_Name = "excel_res"
'/*************************************************************************
' *
-' * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-' *
-' * Copyright 2008 by Sun Microsystems, Inc.
-' *
-' * OpenOffice.org - a multi-platform office productivity suite
-' *
-' * $RCSfile: excel_res.bas,v $
-' *
-' * This file is part of OpenOffice.org.
-' *
-' * OpenOffice.org is free software: you can redistribute it and/or modify
-' * it under the terms of the GNU Lesser General Public License version 3
-' * only, as published by the Free Software Foundation.
-' *
-' * OpenOffice.org is distributed in the hope that it will be useful,
-' * but WITHOUT ANY WARRANTY; without even the implied warranty of
-' * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-' * GNU Lesser General Public License version 3 for more details
-' * (a copy is included in the LICENSE file that accompanied this code).
-' *
-' * You should have received a copy of the GNU Lesser General Public License
-' * version 3 along with OpenOffice.org. If not, see
-' * <http://www.openoffice.org/license.html>
-' * for a copy of the LGPLv3 License.
-' *
+' DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+'
+' Copyright 2000, 2010 Oracle and/or its affiliates.
+'
+' OpenOffice.org - a multi-platform office productivity suite
+'
+' This file is part of OpenOffice.org.
+'
+' OpenOffice.org is free software: you can redistribute it and/or modify
+' it under the terms of the GNU Lesser General Public License version 3
+' only, as published by the Free Software Foundation.
+'
+' OpenOffice.org is distributed in the hope that it will be useful,
+' but WITHOUT ANY WARRANTY; without even the implied warranty of
+' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+' GNU Lesser General Public License version 3 for more details
+' (a copy is included in the LICENSE file that accompanied this code).
+'
+' You should have received a copy of the GNU Lesser General Public License
+' version 3 along with OpenOffice.org. If not, see
+' <http://www.openoffice.org/license.html>
+' for a copy of the LGPLv3 License.
+'
' ************************************************************************/
Public RID_RESXLT_COST_CHART_BarOfPie_Comment As String
diff --git a/migrationanalysis/src/driver_docs/sources/powerpoint/ApplicationSpecific.bas b/migrationanalysis/src/driver_docs/sources/powerpoint/ApplicationSpecific.bas
index 0d18d13cbae5..c91444949a03 100644
--- a/migrationanalysis/src/driver_docs/sources/powerpoint/ApplicationSpecific.bas
+++ b/migrationanalysis/src/driver_docs/sources/powerpoint/ApplicationSpecific.bas
@@ -1,31 +1,29 @@
Attribute VB_Name = "ApplicationSpecific"
'/*************************************************************************
' *
-' * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-' *
-' * Copyright 2008 by Sun Microsystems, Inc.
-' *
-' * OpenOffice.org - a multi-platform office productivity suite
-' *
-' * $RCSfile: ApplicationSpecific.bas,v $
-' *
-' * This file is part of OpenOffice.org.
-' *
-' * OpenOffice.org is free software: you can redistribute it and/or modify
-' * it under the terms of the GNU Lesser General Public License version 3
-' * only, as published by the Free Software Foundation.
-' *
-' * OpenOffice.org is distributed in the hope that it will be useful,
-' * but WITHOUT ANY WARRANTY; without even the implied warranty of
-' * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-' * GNU Lesser General Public License version 3 for more details
-' * (a copy is included in the LICENSE file that accompanied this code).
-' *
-' * You should have received a copy of the GNU Lesser General Public License
-' * version 3 along with OpenOffice.org. If not, see
-' * <http://www.openoffice.org/license.html>
-' * for a copy of the LGPLv3 License.
-' *
+' DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+'
+' Copyright 2000, 2010 Oracle and/or its affiliates.
+'
+' OpenOffice.org - a multi-platform office productivity suite
+'
+' This file is part of OpenOffice.org.
+'
+' OpenOffice.org is free software: you can redistribute it and/or modify
+' it under the terms of the GNU Lesser General Public License version 3
+' only, as published by the Free Software Foundation.
+'
+' OpenOffice.org is distributed in the hope that it will be useful,
+' but WITHOUT ANY WARRANTY; without even the implied warranty of
+' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+' GNU Lesser General Public License version 3 for more details
+' (a copy is included in the LICENSE file that accompanied this code).
+'
+' You should have received a copy of the GNU Lesser General Public License
+' version 3 along with OpenOffice.org. If not, see
+' <http://www.openoffice.org/license.html>
+' for a copy of the LGPLv3 License.
+'
' ************************************************************************/
Option Explicit
diff --git a/migrationanalysis/src/driver_docs/sources/powerpoint/Loader.bas b/migrationanalysis/src/driver_docs/sources/powerpoint/Loader.bas
index 2714aa181b4d..9ffc880ce9ae 100644
--- a/migrationanalysis/src/driver_docs/sources/powerpoint/Loader.bas
+++ b/migrationanalysis/src/driver_docs/sources/powerpoint/Loader.bas
@@ -1,31 +1,29 @@
Attribute VB_Name = "Loader"
'/*************************************************************************
' *
-' * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-' *
-' * Copyright 2008 by Sun Microsystems, Inc.
-' *
-' * OpenOffice.org - a multi-platform office productivity suite
-' *
-' * $RCSfile: Loader.bas,v $
-' *
-' * This file is part of OpenOffice.org.
-' *
-' * OpenOffice.org is free software: you can redistribute it and/or modify
-' * it under the terms of the GNU Lesser General Public License version 3
-' * only, as published by the Free Software Foundation.
-' *
-' * OpenOffice.org is distributed in the hope that it will be useful,
-' * but WITHOUT ANY WARRANTY; without even the implied warranty of
-' * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-' * GNU Lesser General Public License version 3 for more details
-' * (a copy is included in the LICENSE file that accompanied this code).
-' *
-' * You should have received a copy of the GNU Lesser General Public License
-' * version 3 along with OpenOffice.org. If not, see
-' * <http://www.openoffice.org/license.html>
-' * for a copy of the LGPLv3 License.
-' *
+' DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+'
+' Copyright 2000, 2010 Oracle and/or its affiliates.
+'
+' OpenOffice.org - a multi-platform office productivity suite
+'
+' This file is part of OpenOffice.org.
+'
+' OpenOffice.org is free software: you can redistribute it and/or modify
+' it under the terms of the GNU Lesser General Public License version 3
+' only, as published by the Free Software Foundation.
+'
+' OpenOffice.org is distributed in the hope that it will be useful,
+' but WITHOUT ANY WARRANTY; without even the implied warranty of
+' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+' GNU Lesser General Public License version 3 for more details
+' (a copy is included in the LICENSE file that accompanied this code).
+'
+' You should have received a copy of the GNU Lesser General Public License
+' version 3 along with OpenOffice.org. If not, see
+' <http://www.openoffice.org/license.html>
+' for a copy of the LGPLv3 License.
+'
' ************************************************************************/
Option Explicit
diff --git a/migrationanalysis/src/driver_docs/sources/powerpoint/MigrationAnalyser.cls b/migrationanalysis/src/driver_docs/sources/powerpoint/MigrationAnalyser.cls
index babc26ddf8ed..195f87d439a9 100644
--- a/migrationanalysis/src/driver_docs/sources/powerpoint/MigrationAnalyser.cls
+++ b/migrationanalysis/src/driver_docs/sources/powerpoint/MigrationAnalyser.cls
@@ -9,31 +9,29 @@ Attribute VB_PredeclaredId = False
Attribute VB_Exposed = False
'/*************************************************************************
' *
-' * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-' *
-' * Copyright 2008 by Sun Microsystems, Inc.
-' *
-' * OpenOffice.org - a multi-platform office productivity suite
-' *
-' * $RCSfile: MigrationAnalyser.cls,v $
-' *
-' * This file is part of OpenOffice.org.
-' *
-' * OpenOffice.org is free software: you can redistribute it and/or modify
-' * it under the terms of the GNU Lesser General Public License version 3
-' * only, as published by the Free Software Foundation.
-' *
-' * OpenOffice.org is distributed in the hope that it will be useful,
-' * but WITHOUT ANY WARRANTY; without even the implied warranty of
-' * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-' * GNU Lesser General Public License version 3 for more details
-' * (a copy is included in the LICENSE file that accompanied this code).
-' *
-' * You should have received a copy of the GNU Lesser General Public License
-' * version 3 along with OpenOffice.org. If not, see
-' * <http://www.openoffice.org/license.html>
-' * for a copy of the LGPLv3 License.
-' *
+' DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+'
+' Copyright 2000, 2010 Oracle and/or its affiliates.
+'
+' OpenOffice.org - a multi-platform office productivity suite
+'
+' This file is part of OpenOffice.org.
+'
+' OpenOffice.org is free software: you can redistribute it and/or modify
+' it under the terms of the GNU Lesser General Public License version 3
+' only, as published by the Free Software Foundation.
+'
+' OpenOffice.org is distributed in the hope that it will be useful,
+' but WITHOUT ANY WARRANTY; without even the implied warranty of
+' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+' GNU Lesser General Public License version 3 for more details
+' (a copy is included in the LICENSE file that accompanied this code).
+'
+' You should have received a copy of the GNU Lesser General Public License
+' version 3 along with OpenOffice.org. If not, see
+' <http://www.openoffice.org/license.html>
+' for a copy of the LGPLv3 License.
+'
' ************************************************************************/
Option Explicit
diff --git a/migrationanalysis/src/driver_docs/sources/powerpoint/Preparation.bas b/migrationanalysis/src/driver_docs/sources/powerpoint/Preparation.bas
index d5fa4a10b260..40454eb0bdd7 100644
--- a/migrationanalysis/src/driver_docs/sources/powerpoint/Preparation.bas
+++ b/migrationanalysis/src/driver_docs/sources/powerpoint/Preparation.bas
@@ -1,31 +1,29 @@
Attribute VB_Name = "Preparation"
'/*************************************************************************
' *
-' * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-' *
-' * Copyright 2008 by Sun Microsystems, Inc.
-' *
-' * OpenOffice.org - a multi-platform office productivity suite
-' *
-' * $RCSfile: Preparation.bas,v $
-' *
-' * This file is part of OpenOffice.org.
-' *
-' * OpenOffice.org is free software: you can redistribute it and/or modify
-' * it under the terms of the GNU Lesser General Public License version 3
-' * only, as published by the Free Software Foundation.
-' *
-' * OpenOffice.org is distributed in the hope that it will be useful,
-' * but WITHOUT ANY WARRANTY; without even the implied warranty of
-' * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-' * GNU Lesser General Public License version 3 for more details
-' * (a copy is included in the LICENSE file that accompanied this code).
-' *
-' * You should have received a copy of the GNU Lesser General Public License
-' * version 3 along with OpenOffice.org. If not, see
-' * <http://www.openoffice.org/license.html>
-' * for a copy of the LGPLv3 License.
-' *
+' DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+'
+' Copyright 2000, 2010 Oracle and/or its affiliates.
+'
+' OpenOffice.org - a multi-platform office productivity suite
+'
+' This file is part of OpenOffice.org.
+'
+' OpenOffice.org is free software: you can redistribute it and/or modify
+' it under the terms of the GNU Lesser General Public License version 3
+' only, as published by the Free Software Foundation.
+'
+' OpenOffice.org is distributed in the hope that it will be useful,
+' but WITHOUT ANY WARRANTY; without even the implied warranty of
+' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+' GNU Lesser General Public License version 3 for more details
+' (a copy is included in the LICENSE file that accompanied this code).
+'
+' You should have received a copy of the GNU Lesser General Public License
+' version 3 along with OpenOffice.org. If not, see
+' <http://www.openoffice.org/license.html>
+' for a copy of the LGPLv3 License.
+'
' ************************************************************************/
Option Explicit
diff --git a/migrationanalysis/src/driver_docs/sources/powerpoint/Slide1.cls b/migrationanalysis/src/driver_docs/sources/powerpoint/Slide1.cls
index 4cafcf4afab2..9f6d4bd13752 100644
--- a/migrationanalysis/src/driver_docs/sources/powerpoint/Slide1.cls
+++ b/migrationanalysis/src/driver_docs/sources/powerpoint/Slide1.cls
@@ -1,30 +1,28 @@
'/*************************************************************************
' *
-' * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-' *
-' * Copyright 2008 by Sun Microsystems, Inc.
-' *
-' * OpenOffice.org - a multi-platform office productivity suite
-' *
-' * $RCSfile: Slide1.cls,v $
-' *
-' * This file is part of OpenOffice.org.
-' *
-' * OpenOffice.org is free software: you can redistribute it and/or modify
-' * it under the terms of the GNU Lesser General Public License version 3
-' * only, as published by the Free Software Foundation.
-' *
-' * OpenOffice.org is distributed in the hope that it will be useful,
-' * but WITHOUT ANY WARRANTY; without even the implied warranty of
-' * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-' * GNU Lesser General Public License version 3 for more details
-' * (a copy is included in the LICENSE file that accompanied this code).
-' *
-' * You should have received a copy of the GNU Lesser General Public License
-' * version 3 along with OpenOffice.org. If not, see
-' * <http://www.openoffice.org/license.html>
-' * for a copy of the LGPLv3 License.
-' *
+' DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+'
+' Copyright 2000, 2010 Oracle and/or its affiliates.
+'
+' OpenOffice.org - a multi-platform office productivity suite
+'
+' This file is part of OpenOffice.org.
+'
+' OpenOffice.org is free software: you can redistribute it and/or modify
+' it under the terms of the GNU Lesser General Public License version 3
+' only, as published by the Free Software Foundation.
+'
+' OpenOffice.org is distributed in the hope that it will be useful,
+' but WITHOUT ANY WARRANTY; without even the implied warranty of
+' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+' GNU Lesser General Public License version 3 for more details
+' (a copy is included in the LICENSE file that accompanied this code).
+'
+' You should have received a copy of the GNU Lesser General Public License
+' version 3 along with OpenOffice.org. If not, see
+' <http://www.openoffice.org/license.html>
+' for a copy of the LGPLv3 License.
+'
' ************************************************************************/
Option Explicit
diff --git a/migrationanalysis/src/driver_docs/sources/powerpoint/powerpoint_res.bas b/migrationanalysis/src/driver_docs/sources/powerpoint/powerpoint_res.bas
index 0aba1c6cf755..cddc6e508e22 100644
--- a/migrationanalysis/src/driver_docs/sources/powerpoint/powerpoint_res.bas
+++ b/migrationanalysis/src/driver_docs/sources/powerpoint/powerpoint_res.bas
@@ -1,31 +1,29 @@
Attribute VB_Name = "powerpoint_res"
'/*************************************************************************
' *
-' * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-' *
-' * Copyright 2008 by Sun Microsystems, Inc.
-' *
-' * OpenOffice.org - a multi-platform office productivity suite
-' *
-' * $RCSfile: powerpoint_res.bas,v $
-' *
-' * This file is part of OpenOffice.org.
-' *
-' * OpenOffice.org is free software: you can redistribute it and/or modify
-' * it under the terms of the GNU Lesser General Public License version 3
-' * only, as published by the Free Software Foundation.
-' *
-' * OpenOffice.org is distributed in the hope that it will be useful,
-' * but WITHOUT ANY WARRANTY; without even the implied warranty of
-' * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-' * GNU Lesser General Public License version 3 for more details
-' * (a copy is included in the LICENSE file that accompanied this code).
-' *
-' * You should have received a copy of the GNU Lesser General Public License
-' * version 3 along with OpenOffice.org. If not, see
-' * <http://www.openoffice.org/license.html>
-' * for a copy of the LGPLv3 License.
-' *
+' DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+'
+' Copyright 2000, 2010 Oracle and/or its affiliates.
+'
+' OpenOffice.org - a multi-platform office productivity suite
+'
+' This file is part of OpenOffice.org.
+'
+' OpenOffice.org is free software: you can redistribute it and/or modify
+' it under the terms of the GNU Lesser General Public License version 3
+' only, as published by the Free Software Foundation.
+'
+' OpenOffice.org is distributed in the hope that it will be useful,
+' but WITHOUT ANY WARRANTY; without even the implied warranty of
+' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+' GNU Lesser General Public License version 3 for more details
+' (a copy is included in the LICENSE file that accompanied this code).
+'
+' You should have received a copy of the GNU Lesser General Public License
+' version 3 along with OpenOffice.org. If not, see
+' <http://www.openoffice.org/license.html>
+' for a copy of the LGPLv3 License.
+'
' ************************************************************************/
Public RID_STR_PP_TRUE As String
diff --git a/migrationanalysis/src/driver_docs/sources/word/ApplicationSpecific.bas b/migrationanalysis/src/driver_docs/sources/word/ApplicationSpecific.bas
index 8ab02518c0f8..884c874230f6 100644
--- a/migrationanalysis/src/driver_docs/sources/word/ApplicationSpecific.bas
+++ b/migrationanalysis/src/driver_docs/sources/word/ApplicationSpecific.bas
@@ -1,31 +1,29 @@
Attribute VB_Name = "ApplicationSpecific"
'/*************************************************************************
' *
-' * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-' *
-' * Copyright 2008 by Sun Microsystems, Inc.
-' *
-' * OpenOffice.org - a multi-platform office productivity suite
-' *
-' * $RCSfile: ApplicationSpecific.bas,v $
-' *
-' * This file is part of OpenOffice.org.
-' *
-' * OpenOffice.org is free software: you can redistribute it and/or modify
-' * it under the terms of the GNU Lesser General Public License version 3
-' * only, as published by the Free Software Foundation.
-' *
-' * OpenOffice.org is distributed in the hope that it will be useful,
-' * but WITHOUT ANY WARRANTY; without even the implied warranty of
-' * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-' * GNU Lesser General Public License version 3 for more details
-' * (a copy is included in the LICENSE file that accompanied this code).
-' *
-' * You should have received a copy of the GNU Lesser General Public License
-' * version 3 along with OpenOffice.org. If not, see
-' * <http://www.openoffice.org/license.html>
-' * for a copy of the LGPLv3 License.
-' *
+' DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+'
+' Copyright 2000, 2010 Oracle and/or its affiliates.
+'
+' OpenOffice.org - a multi-platform office productivity suite
+'
+' This file is part of OpenOffice.org.
+'
+' OpenOffice.org is free software: you can redistribute it and/or modify
+' it under the terms of the GNU Lesser General Public License version 3
+' only, as published by the Free Software Foundation.
+'
+' OpenOffice.org is distributed in the hope that it will be useful,
+' but WITHOUT ANY WARRANTY; without even the implied warranty of
+' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+' GNU Lesser General Public License version 3 for more details
+' (a copy is included in the LICENSE file that accompanied this code).
+'
+' You should have received a copy of the GNU Lesser General Public License
+' version 3 along with OpenOffice.org. If not, see
+' <http://www.openoffice.org/license.html>
+' for a copy of the LGPLv3 License.
+'
' ************************************************************************/
Option Explicit
diff --git a/migrationanalysis/src/driver_docs/sources/word/MigrationAnalyser.cls b/migrationanalysis/src/driver_docs/sources/word/MigrationAnalyser.cls
index d4093ffeec85..da95587ef5af 100644
--- a/migrationanalysis/src/driver_docs/sources/word/MigrationAnalyser.cls
+++ b/migrationanalysis/src/driver_docs/sources/word/MigrationAnalyser.cls
@@ -9,31 +9,29 @@ Attribute VB_PredeclaredId = False
Attribute VB_Exposed = False
'/*************************************************************************
' *
-' * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-' *
-' * Copyright 2008 by Sun Microsystems, Inc.
-' *
-' * OpenOffice.org - a multi-platform office productivity suite
-' *
-' * $RCSfile: MigrationAnalyser.cls,v $
-' *
-' * This file is part of OpenOffice.org.
-' *
-' * OpenOffice.org is free software: you can redistribute it and/or modify
-' * it under the terms of the GNU Lesser General Public License version 3
-' * only, as published by the Free Software Foundation.
-' *
-' * OpenOffice.org is distributed in the hope that it will be useful,
-' * but WITHOUT ANY WARRANTY; without even the implied warranty of
-' * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-' * GNU Lesser General Public License version 3 for more details
-' * (a copy is included in the LICENSE file that accompanied this code).
-' *
-' * You should have received a copy of the GNU Lesser General Public License
-' * version 3 along with OpenOffice.org. If not, see
-' * <http://www.openoffice.org/license.html>
-' * for a copy of the LGPLv3 License.
-' *
+' DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+'
+' Copyright 2000, 2010 Oracle and/or its affiliates.
+'
+' OpenOffice.org - a multi-platform office productivity suite
+'
+' This file is part of OpenOffice.org.
+'
+' OpenOffice.org is free software: you can redistribute it and/or modify
+' it under the terms of the GNU Lesser General Public License version 3
+' only, as published by the Free Software Foundation.
+'
+' OpenOffice.org is distributed in the hope that it will be useful,
+' but WITHOUT ANY WARRANTY; without even the implied warranty of
+' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+' GNU Lesser General Public License version 3 for more details
+' (a copy is included in the LICENSE file that accompanied this code).
+'
+' You should have received a copy of the GNU Lesser General Public License
+' version 3 along with OpenOffice.org. If not, see
+' <http://www.openoffice.org/license.html>
+' for a copy of the LGPLv3 License.
+'
' ************************************************************************/
Option Explicit
diff --git a/migrationanalysis/src/driver_docs/sources/word/Preparation.bas b/migrationanalysis/src/driver_docs/sources/word/Preparation.bas
index e1d6bc944896..11ec18ed7b94 100644
--- a/migrationanalysis/src/driver_docs/sources/word/Preparation.bas
+++ b/migrationanalysis/src/driver_docs/sources/word/Preparation.bas
@@ -1,31 +1,29 @@
Attribute VB_Name = "Preparation"
'/*************************************************************************
' *
-' * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-' *
-' * Copyright 2008 by Sun Microsystems, Inc.
-' *
-' * OpenOffice.org - a multi-platform office productivity suite
-' *
-' * $RCSfile: Preparation.bas,v $
-' *
-' * This file is part of OpenOffice.org.
-' *
-' * OpenOffice.org is free software: you can redistribute it and/or modify
-' * it under the terms of the GNU Lesser General Public License version 3
-' * only, as published by the Free Software Foundation.
-' *
-' * OpenOffice.org is distributed in the hope that it will be useful,
-' * but WITHOUT ANY WARRANTY; without even the implied warranty of
-' * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-' * GNU Lesser General Public License version 3 for more details
-' * (a copy is included in the LICENSE file that accompanied this code).
-' *
-' * You should have received a copy of the GNU Lesser General Public License
-' * version 3 along with OpenOffice.org. If not, see
-' * <http://www.openoffice.org/license.html>
-' * for a copy of the LGPLv3 License.
-' *
+' DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+'
+' Copyright 2000, 2010 Oracle and/or its affiliates.
+'
+' OpenOffice.org - a multi-platform office productivity suite
+'
+' This file is part of OpenOffice.org.
+'
+' OpenOffice.org is free software: you can redistribute it and/or modify
+' it under the terms of the GNU Lesser General Public License version 3
+' only, as published by the Free Software Foundation.
+'
+' OpenOffice.org is distributed in the hope that it will be useful,
+' but WITHOUT ANY WARRANTY; without even the implied warranty of
+' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+' GNU Lesser General Public License version 3 for more details
+' (a copy is included in the LICENSE file that accompanied this code).
+'
+' You should have received a copy of the GNU Lesser General Public License
+' version 3 along with OpenOffice.org. If not, see
+' <http://www.openoffice.org/license.html>
+' for a copy of the LGPLv3 License.
+'
' ************************************************************************/
Option Explicit
diff --git a/migrationanalysis/src/driver_docs/sources/word/ThisDocument.cls b/migrationanalysis/src/driver_docs/sources/word/ThisDocument.cls
index e1ede6901870..a8547bd850ad 100644
--- a/migrationanalysis/src/driver_docs/sources/word/ThisDocument.cls
+++ b/migrationanalysis/src/driver_docs/sources/word/ThisDocument.cls
@@ -1,30 +1,28 @@
'/*************************************************************************
' *
-' * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-' *
-' * Copyright 2008 by Sun Microsystems, Inc.
-' *
-' * OpenOffice.org - a multi-platform office productivity suite
-' *
-' * $RCSfile: ThisDocument.cls,v $
-' *
-' * This file is part of OpenOffice.org.
-' *
-' * OpenOffice.org is free software: you can redistribute it and/or modify
-' * it under the terms of the GNU Lesser General Public License version 3
-' * only, as published by the Free Software Foundation.
-' *
-' * OpenOffice.org is distributed in the hope that it will be useful,
-' * but WITHOUT ANY WARRANTY; without even the implied warranty of
-' * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-' * GNU Lesser General Public License version 3 for more details
-' * (a copy is included in the LICENSE file that accompanied this code).
-' *
-' * You should have received a copy of the GNU Lesser General Public License
-' * version 3 along with OpenOffice.org. If not, see
-' * <http://www.openoffice.org/license.html>
-' * for a copy of the LGPLv3 License.
-' *
+' DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+'
+' Copyright 2000, 2010 Oracle and/or its affiliates.
+'
+' OpenOffice.org - a multi-platform office productivity suite
+'
+' This file is part of OpenOffice.org.
+'
+' OpenOffice.org is free software: you can redistribute it and/or modify
+' it under the terms of the GNU Lesser General Public License version 3
+' only, as published by the Free Software Foundation.
+'
+' OpenOffice.org is distributed in the hope that it will be useful,
+' but WITHOUT ANY WARRANTY; without even the implied warranty of
+' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+' GNU Lesser General Public License version 3 for more details
+' (a copy is included in the LICENSE file that accompanied this code).
+'
+' You should have received a copy of the GNU Lesser General Public License
+' version 3 along with OpenOffice.org. If not, see
+' <http://www.openoffice.org/license.html>
+' for a copy of the LGPLv3 License.
+'
' ************************************************************************/
Public wrdStrings As StringDataManager
diff --git a/migrationanalysis/src/driver_docs/sources/word/word_res.bas b/migrationanalysis/src/driver_docs/sources/word/word_res.bas
index 95176e9e4612..7356353e3fe2 100644
--- a/migrationanalysis/src/driver_docs/sources/word/word_res.bas
+++ b/migrationanalysis/src/driver_docs/sources/word/word_res.bas
@@ -1,31 +1,29 @@
Attribute VB_Name = "word_res"
'/*************************************************************************
' *
-' * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-' *
-' * Copyright 2008 by Sun Microsystems, Inc.
-' *
-' * OpenOffice.org - a multi-platform office productivity suite
-' *
-' * $RCSfile: word_res.bas,v $
-' *
-' * This file is part of OpenOffice.org.
-' *
-' * OpenOffice.org is free software: you can redistribute it and/or modify
-' * it under the terms of the GNU Lesser General Public License version 3
-' * only, as published by the Free Software Foundation.
-' *
-' * OpenOffice.org is distributed in the hope that it will be useful,
-' * but WITHOUT ANY WARRANTY; without even the implied warranty of
-' * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-' * GNU Lesser General Public License version 3 for more details
-' * (a copy is included in the LICENSE file that accompanied this code).
-' *
-' * You should have received a copy of the GNU Lesser General Public License
-' * version 3 along with OpenOffice.org. If not, see
-' * <http://www.openoffice.org/license.html>
-' * for a copy of the LGPLv3 License.
-' *
+' DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+'
+' Copyright 2000, 2010 Oracle and/or its affiliates.
+'
+' OpenOffice.org - a multi-platform office productivity suite
+'
+' This file is part of OpenOffice.org.
+'
+' OpenOffice.org is free software: you can redistribute it and/or modify
+' it under the terms of the GNU Lesser General Public License version 3
+' only, as published by the Free Software Foundation.
+'
+' OpenOffice.org is distributed in the hope that it will be useful,
+' but WITHOUT ANY WARRANTY; without even the implied warranty of
+' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+' GNU Lesser General Public License version 3 for more details
+' (a copy is included in the LICENSE file that accompanied this code).
+'
+' You should have received a copy of the GNU Lesser General Public License
+' version 3 along with OpenOffice.org. If not, see
+' <http://www.openoffice.org/license.html>
+' for a copy of the LGPLv3 License.
+'
' ************************************************************************/
'Word Strings
diff --git a/migrationanalysis/src/driver_docs/ulf2dat.pl b/migrationanalysis/src/driver_docs/ulf2dat.pl
index 129bcc9fb319..25b1fe2f7ebc 100644
--- a/migrationanalysis/src/driver_docs/ulf2dat.pl
+++ b/migrationanalysis/src/driver_docs/ulf2dat.pl
@@ -1,156 +1,153 @@
-:
-eval 'exec perl -wS $0 ${1+"$@"}'
- if 0;
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: ulf2dat.pl,v $
-# $Revision: 1.4.108.1 $
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#***********************************************************************/
-
-
-#### script id #####
-
-( $script_name = $0 ) =~ s/^.*\b(\w+)\.pl$/$1/;
-
-$id_str = ' $Revision: 1.4.108.1 $ ';
-$id_str =~ /Revision:\s+(\S+)\s+\$/
- ? ($script_rev = $1) : ($script_rev = "-");
-
-#########################
-# #
-# Globale Variablen #
-# #
-#########################
-
-use Encode;
-use Encode::Alias;
-
-
-my ($in_name, $ID, $new_ID);
-my ($help);
-
-print STDERR "$script_name -- Version: $script_rev\n" ;
-
-&get_options;
-
-if ( $help ) {
- &usage();
- exit 0;
-};
-
-
-open IN, "<$in_name" or die "Could not open $in_name for reading $! $^E";
-
-foreach $lang ( keys %files )
-{
- open "F_$lang",">$files{$lang}" or die "Could not open $files{$lang} for writing $! $^E";
- binmode "F_$lang";
- $files{$lang} = "F_$lang";
-}
-
-%transunit = ();
-
-while ( <IN> )
-{
- chomp;
- $line = $_;
- $line =~ s/\r$//;
- # [RID_RESXLS_COST_Print_Area]
- if ( $line =~ /^\[(.*)\]$/ )
- {
- $new_ID = $1;
-
- write_transunit();
- $ID = $new_ID;
- %transunit = ();
- }
- # de = "Druckbereich"
- elsif ( $line =~ /^(\S*)\s*=\s*\"(.*)\"$/ )
- {
- $lang = $1;
- $string = $2;
- $transunit{ $lang } = $string;
- }
- elsif ( $line !~ /^\s*$/ )
- {
- die "unknown lineformat in $in_name: $line\n";
- }
-}
-write_transunit();
-
-
-sub write_transunit
-{
- if ( ! $ID )
- {
- return;
- }
- foreach $lang ( keys %files )
- {
- my $string;
- if ( defined $transunit{ $lang } )
- {
- $string = $transunit{ $lang };
- }
- else
- {
- $string = $transunit{ "en-US" };
- }
-
- my $dat_line = "$ID=$string";
- Encode::from_to( $dat_line, "utf8", "UTF-16LE");
- print { $files{$lang} } "$dat_line\015\000\012\000";
- }
-}
-
-
-sub get_options {
- my ($arg,$lang);
-
- while ($arg = shift @ARGV) {
- $arg =~ /^-i$/ and $in_name = shift @ARGV and next;
- $arg =~ /^-help$/ and $help = 1 and next; #show help
-
- $arg =~ /.*[\/\\]([^\/\\]*)\.dat$/;
-# $arg =~ /.*[/\]([^/\]*)\.dat$/;
- $lang = $1;
- print "got $lang = $arg\n";
- $files{ $lang } = $arg;
- }
-}
-
-
-
-sub usage {
- print STDERR "\n\n";
- print STDERR "Syntax: $script_name [-help|-i <ulf-filename>] <dat-filename> ... \n";
- print STDERR "Example: $script_name -i strings.ulf en-US.dat de.dat\n";
- print STDERR "Options:\n\n";
- print STDERR " -i input ulf file\n";
- print STDERR " -help print this help info\n\n";
-};
-
+:
+eval 'exec perl -wS $0 ${1+"$@"}'
+ if 0;
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#***********************************************************************/
+
+
+#### script id #####
+
+( $script_name = $0 ) =~ s/^.*\b(\w+)\.pl$/$1/;
+
+$id_str = ' $Revision: 1.4.108.1 $ ';
+$id_str =~ /Revision:\s+(\S+)\s+\$/
+ ? ($script_rev = $1) : ($script_rev = "-");
+
+#########################
+# #
+# Globale Variablen #
+# #
+#########################
+
+use Encode;
+use Encode::Alias;
+
+
+my ($in_name, $ID, $new_ID);
+my ($help);
+
+print STDERR "$script_name -- Version: $script_rev\n" ;
+
+&get_options;
+
+if ( $help ) {
+ &usage();
+ exit 0;
+};
+
+
+open IN, "<$in_name" or die "Could not open $in_name for reading $! $^E";
+
+foreach $lang ( keys %files )
+{
+ open "F_$lang",">$files{$lang}" or die "Could not open $files{$lang} for writing $! $^E";
+ binmode "F_$lang";
+ $files{$lang} = "F_$lang";
+}
+
+%transunit = ();
+
+while ( <IN> )
+{
+ chomp;
+ $line = $_;
+ $line =~ s/\r$//;
+ # [RID_RESXLS_COST_Print_Area]
+ if ( $line =~ /^\[(.*)\]$/ )
+ {
+ $new_ID = $1;
+
+ write_transunit();
+ $ID = $new_ID;
+ %transunit = ();
+ }
+ # de = "Druckbereich"
+ elsif ( $line =~ /^(\S*)\s*=\s*\"(.*)\"$/ )
+ {
+ $lang = $1;
+ $string = $2;
+ $transunit{ $lang } = $string;
+ }
+ elsif ( $line !~ /^\s*$/ )
+ {
+ die "unknown lineformat in $in_name: $line\n";
+ }
+}
+write_transunit();
+
+
+sub write_transunit
+{
+ if ( ! $ID )
+ {
+ return;
+ }
+ foreach $lang ( keys %files )
+ {
+ my $string;
+ if ( defined $transunit{ $lang } )
+ {
+ $string = $transunit{ $lang };
+ }
+ else
+ {
+ $string = $transunit{ "en-US" };
+ }
+
+ my $dat_line = "$ID=$string";
+ Encode::from_to( $dat_line, "utf8", "UTF-16LE");
+ print { $files{$lang} } "$dat_line\015\000\012\000";
+ }
+}
+
+
+sub get_options {
+ my ($arg,$lang);
+
+ while ($arg = shift @ARGV) {
+ $arg =~ /^-i$/ and $in_name = shift @ARGV and next;
+ $arg =~ /^-help$/ and $help = 1 and next; #show help
+
+ $arg =~ /.*[\/\\]([^\/\\]*)\.dat$/;
+# $arg =~ /.*[/\]([^/\]*)\.dat$/;
+ $lang = $1;
+ print "got $lang = $arg\n";
+ $files{ $lang } = $arg;
+ }
+}
+
+
+
+sub usage {
+ print STDERR "\n\n";
+ print STDERR "Syntax: $script_name [-help|-i <ulf-filename>] <dat-filename> ... \n";
+ print STDERR "Example: $script_name -i strings.ulf en-US.dat de.dat\n";
+ print STDERR "Options:\n\n";
+ print STDERR " -i input ulf file\n";
+ print STDERR " -help print this help info\n\n";
+};
+
diff --git a/migrationanalysis/src/msokill/StdAfx.cpp b/migrationanalysis/src/msokill/StdAfx.cpp
index 437fd8d04299..a0ae86acbb47 100644
--- a/migrationanalysis/src/msokill/StdAfx.cpp
+++ b/migrationanalysis/src/msokill/StdAfx.cpp
@@ -1,37 +1,35 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: StdAfx.cpp,v $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// stdafx.cpp : source file that includes just the standard includes
-// msokill.pch will be the pre-compiled header
-// stdafx.obj will contain the pre-compiled type information
-
-#include "stdafx.h"
-
-// TODO: reference any additional headers you need in STDAFX.H
-// and not in this file
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// stdafx.cpp : source file that includes just the standard includes
+// msokill.pch will be the pre-compiled header
+// stdafx.obj will contain the pre-compiled type information
+
+#include "stdafx.h"
+
+// TODO: reference any additional headers you need in STDAFX.H
+// and not in this file
diff --git a/migrationanalysis/src/msokill/StdAfx.h b/migrationanalysis/src/msokill/StdAfx.h
index 7bbae51de8f5..a1826f7ce4a7 100644
--- a/migrationanalysis/src/msokill/StdAfx.h
+++ b/migrationanalysis/src/msokill/StdAfx.h
@@ -1,56 +1,54 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: StdAfx.h,v $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-/*
- *
- * Description: Put MSO in a state where it can be closed using
- * automation or kill it completely
- *
- */
-
-#if !defined(AFX_STDAFX_H__12149A50_72AF_409A_9B43_8ACCD98F50CE__INCLUDED_)
-#define AFX_STDAFX_H__12149A50_72AF_409A_9B43_8ACCD98F50CE__INCLUDED_
-
-#if _MSC_VER > 1000
-#pragma once
-#endif // _MSC_VER > 1000
-
-#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
-
-#include <stdio.h>
-#pragma warning(push, 1)
-#include <windows.h>
-#pragma warning(pop)
-
-// TODO: reference additional headers your program requires here
-
-//{{AFX_INSERT_LOCATION}}
-// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_STDAFX_H__12149A50_72AF_409A_9B43_8ACCD98F50CE__INCLUDED_)
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+/*
+ *
+ * Description: Put MSO in a state where it can be closed using
+ * automation or kill it completely
+ *
+ */
+
+#if !defined(AFX_STDAFX_H__12149A50_72AF_409A_9B43_8ACCD98F50CE__INCLUDED_)
+#define AFX_STDAFX_H__12149A50_72AF_409A_9B43_8ACCD98F50CE__INCLUDED_
+
+#if _MSC_VER > 1000
+#pragma once
+#endif // _MSC_VER > 1000
+
+#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
+
+#include <stdio.h>
+#pragma warning(push, 1)
+#include <windows.h>
+#pragma warning(pop)
+
+// TODO: reference additional headers your program requires here
+
+//{{AFX_INSERT_LOCATION}}
+// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
+
+#endif // !defined(AFX_STDAFX_H__12149A50_72AF_409A_9B43_8ACCD98F50CE__INCLUDED_)
diff --git a/migrationanalysis/src/msokill/makefile.mk b/migrationanalysis/src/msokill/makefile.mk
index 349a1a59c395..918c7c4c7184 100644
--- a/migrationanalysis/src/msokill/makefile.mk
+++ b/migrationanalysis/src/msokill/makefile.mk
@@ -1,85 +1,83 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME = migrationanalysis
-TARGET = msokill
-LIBTARGET = NO
-TARGETTYPE = CUI
-
-ENABLE_EXCEPTIONS = TRUE
-
-# --- Settings ------------------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Allgemein -----------------------------------------------------------
-
-OBJFILES= $(OBJ)$/msokill.obj \
- $(OBJ)$/StdAfx.obj
-
-# --- Targets ------------------------------------------------------
-
-UWINAPILIB=
-LIBSALCPPRT=
-
-APP1NOSAL= TRUE
-APP1TARGET= msokill
-
-#APP1STDLIB
-STDLIB1=msi.lib\
- shell32.lib\
- oleaut32.lib\
- gdi32.lib\
- comdlg32.lib\
- advapi32.lib\
- comctl32.lib\
- shlwapi.lib\
- oledlg.lib\
- ole32.lib\
- uuid.lib\
- oleacc.lib\
- winspool.lib\
-
-APP1OBJS= $(OBJFILES)
-
-PAW_RES_DIR:=$(BIN)$/ProAnalysisWizard$/Resources
-PAW_RES_EXE:=$(PAW_RES_DIR)$/$(APP1TARGET).exe
-
-# --- setup --------------------------------------------------------------
-
-.INCLUDE : target.mk
-
-ALLTAR : $(PAW_RES_EXE)
-
-$(PAW_RES_EXE) : $(BIN)$/$$(@:f)
- -$(MKDIRHIER) $(@:d)
- $(COPY) $(BIN)$/$(@:f) $@
-
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..
+
+PRJNAME = migrationanalysis
+TARGET = msokill
+LIBTARGET = NO
+TARGETTYPE = CUI
+
+ENABLE_EXCEPTIONS = TRUE
+
+# --- Settings ------------------------------------------------------------
+
+.INCLUDE : settings.mk
+
+# --- Allgemein -----------------------------------------------------------
+
+OBJFILES= $(OBJ)$/msokill.obj \
+ $(OBJ)$/StdAfx.obj
+
+# --- Targets ------------------------------------------------------
+
+UWINAPILIB=
+LIBSALCPPRT=
+
+APP1NOSAL= TRUE
+APP1TARGET= msokill
+
+#APP1STDLIB
+STDLIB1=msi.lib\
+ shell32.lib\
+ oleaut32.lib\
+ gdi32.lib\
+ comdlg32.lib\
+ advapi32.lib\
+ comctl32.lib\
+ shlwapi.lib\
+ oledlg.lib\
+ ole32.lib\
+ uuid.lib\
+ oleacc.lib\
+ winspool.lib\
+
+APP1OBJS= $(OBJFILES)
+
+PAW_RES_DIR:=$(BIN)$/ProAnalysisWizard$/Resources
+PAW_RES_EXE:=$(PAW_RES_DIR)$/$(APP1TARGET).exe
+
+# --- setup --------------------------------------------------------------
+
+.INCLUDE : target.mk
+
+ALLTAR : $(PAW_RES_EXE)
+
+$(PAW_RES_EXE) : $(BIN)$/$$(@:f)
+ -$(MKDIRHIER) $(@:d)
+ $(COPY) $(BIN)$/$(@:f) $@
+
diff --git a/migrationanalysis/src/msokill/msokill.cpp b/migrationanalysis/src/msokill/msokill.cpp
index 0b2e93768076..e848715d935e 100644
--- a/migrationanalysis/src/msokill/msokill.cpp
+++ b/migrationanalysis/src/msokill/msokill.cpp
@@ -1,261 +1,259 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: msokill.cpp,v $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-/*
- * Description: Put MSO in a state where it can be closed using
- * automation or kill it completely
- */
-
-#include "stdafx.h"
-#include <stdio.h>
-
-
-void KillOffice();
-BOOL KillAppFromWindow(HWND hWnd, char *appName);
-BOOL CloseActiveDialogs();
-void printUsage();
-
-//Callbacks used in closing
-BOOL CALLBACK CloseOfficeDlgProc(HWND hwndChild, LPARAM lParam);
-BOOL CALLBACK CountOfficeDlgProc(HWND hwndChild, LPARAM lParam);
-
-//Global counters for number of windows found
-int gWDDlgCount = 0;
-int gXLDlgCount = 0;
-int gPPDlgCount = 0;
-
-//Dialog window class names for excel, powerpoint and word
-//These are "Best guess" dialog names
-const char *pWordDlg2k = "bosa_sdm_Microsoft Word 9.0";
-const char *pWordDlg2k3 = "bosa_sdm_Microsoft Office Word";
-const char *pXLDlg2k = "bosa_sdm_XL9";
-const char *pPPDlg2k = "#32770";
-const char *pXLDlg2k3 = "bosa_sdm_XL9";
-const char *pPPDlg2k3 = "#32770";
-const char *pGenMSODlg = "bosa_sdm_Mso96";
-//consider adding - bosa_sdm_Mso96
-
-//Command Line Argument constants
-const char *ARG_HELP = "--help";
-const char *ARG_KILL = "--kill";
-const char *ARG_CLOSE = "--close";
-
-//Window class names for MSO apps - if we need to look at other office instances
-//then this list would need to be expanded
-#define NUM_WINDOWCLASSNAMES 4
-char *wndClassName[NUM_WINDOWCLASSNAMES] = {"OpusApp", "XLMAIN", "PP9FrameClass", "PP10FrameClass"};
-
-int main(int argc, char* argv[])
-{
- if (argc < 2) {
- printUsage();
- return 0;
- }
-
- if (strcmpi(argv[1], ARG_HELP) == 0) {
- printUsage();
- return 0;
- }
-
- if (strcmpi(argv[1], ARG_KILL) == 0) {
- KillOffice();
- return 0;
- }
-
- if (strcmpi(argv[1], ARG_CLOSE) == 0) {
- CloseActiveDialogs();
- return 0;
- }
-
- return 0;
-}
-
-/*--------------------------------------------------------------
- Find the MSO window if it is available and explictly kill it
- MSO apps in this case are Excel, Word and PP
- Use FindWindow Win32 API to detect if they are available
-
- -------------------------------------------------------------*/
-void KillOffice() {
- HWND hWnd;
-
- for (int i=0;i<NUM_WINDOWCLASSNAMES;i++) {
- int j = 0;
- while (((hWnd = FindWindow(wndClassName[i], NULL )) != NULL) && (j < 10)) {
- KillAppFromWindow(hWnd, wndClassName[i]);
- j++;
- }
- }
-}
-
-/*--------------------------------------------------------------
- Using window handle, get process handle and try to kill the
- app. This may not be successful if you do not have enough
- privileges to kill the app.
-
- --------------------------------------------------------------*/
-BOOL KillAppFromWindow(
- HWND hWnd,
- char *
-#ifdef _DEBUG
- appName
-#endif
-)
-{
- BOOL bRet = TRUE;
-
- if(hWnd == NULL) {
- //The app doesn't appear to be running
-#ifdef _DEBUG
- printf("App %s: window not found.\n,", appName);
-#endif
- bRet = FALSE;
- } else {
- DWORD pid; // Variable to hold the process ID.
- DWORD dThread; // Variable to hold (unused) thread ID.
- dThread = GetWindowThreadProcessId(hWnd, &pid);
- HANDLE hProcess; // Handle to existing process
-
- hProcess = OpenProcess(SYNCHRONIZE | PROCESS_ALL_ACCESS, TRUE, pid);
- if (hProcess == NULL) {
-#ifdef _DEBUG
- printf("App %s : Failed to get process handle",appName);
-#endif
- bRet = FALSE;
- } else {
- if (!TerminateProcess(hProcess, 0)) {
- LPTSTR lpMsgBuf;
- FormatMessage(
- FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
- NULL, GetLastError(), MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
- (LPTSTR) &lpMsgBuf, 0, NULL );
- printf("%s\n", lpMsgBuf);
- LocalFree( lpMsgBuf );
- bRet = FALSE;
- }
-#ifdef _DEBUG
- else {
- printf("Kill %s appears to be successful.\n", appName);
- }
-#endif
- }
- }
- return bRet;
-}
-
-/*--------------------------------------------------------------
- Close the dialogs if possible based on their window class
- Use the EnumChildWindows win32 api for this
- --------------------------------------------------------------*/
-BOOL CloseActiveDialogs() {
- char buff[1024];
-
- gWDDlgCount = 0;
- gXLDlgCount = 0;
- gPPDlgCount = 0;
-
- EnumChildWindows(GetDesktopWindow(), CloseOfficeDlgProc, (LPARAM) 0);
- sprintf(buff, "Word: %d\tExcel: %d\tPP: %d", gWDDlgCount, gXLDlgCount, gPPDlgCount);
- return TRUE;
-}
-
-/*--------------------------------------------------------------
- Callback for EnumChildWindows that sends close message to
- any dialogs that match window class of MSO dialogs
-
- --------------------------------------------------------------*/
-BOOL CALLBACK CloseOfficeDlgProc(HWND hwndChild, LPARAM)
-{
- //bosa_sdm_Microsoft Word 9.0
- //bosa_sdm_XL9
- //#32770 (Dialog)
-
- char szBuff[4096];
- if (GetClassName(hwndChild, szBuff, 4096) == 0) {
-
- } else {
- if ((strcmpi(szBuff, pWordDlg2k) == 0) || (strcmpi(szBuff, pWordDlg2k3) == 0)) {
- gWDDlgCount++;
- SendMessage(hwndChild, WM_CLOSE, 0, 0);
- }
- if (strcmpi(szBuff, pXLDlg2k) == 0) {
- gXLDlgCount++;
- SendMessage(hwndChild, WM_CLOSE, 0, 0);
- }
- if (strcmpi(szBuff, pPPDlg2k) == 0) {
- gPPDlgCount++;
- SendMessage(hwndChild, WM_CLOSE, 0, 0);
- }
- if (strcmpi(szBuff, pGenMSODlg) == 0) {
- SendMessage(hwndChild, WM_CLOSE, 0, 0);
- }
- }
-
- return TRUE;
-}
-
-
-/*--------------------------------------------------------------
- Callback for EnumChildWindows that counts numnnber of
- dialogs that match window class of MSO dialogs
-
- --------------------------------------------------------------*/
-BOOL CALLBACK CountOfficeDlgProc(HWND hwndChild, LPARAM)
-{
- char szBuff[4096];
- if (GetClassName(hwndChild, szBuff, 4096) == 0) {
-
- } else {
- if ((strcmpi(szBuff, pWordDlg2k) == 0) || (strcmpi(szBuff, pWordDlg2k3) == 0)) {
- gWDDlgCount++;
- }
- if (strcmpi(szBuff, pXLDlg2k) == 0) {
- gXLDlgCount++;
- }
- if (strcmpi(szBuff, pPPDlg2k) == 0) {
- gPPDlgCount++;
- }
- }
-
- return TRUE;
-}
-
-/*--------------------------------------------------------------
- Simple usage message...
-
- -------------------------------------------------------------*/
-void printUsage() {
- printf("Recovery Assistant Utility - try and put MSO apps in a recoverable state\n");
- printf("Copyright Sun Microsystems 2008\n");
- printf("Options:\n");
- printf(" --help : This message\n");
- printf(" --close: Attempt to close any open dialogs owned by \n");
- printf(" MSO apps so Application.Quit() can succeed\n");
- printf(" --kill : Kill any open MSO apps. Use with caution and only as a last resort\n\n");
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+/*
+ * Description: Put MSO in a state where it can be closed using
+ * automation or kill it completely
+ */
+
+#include "stdafx.h"
+#include <stdio.h>
+
+
+void KillOffice();
+BOOL KillAppFromWindow(HWND hWnd, char *appName);
+BOOL CloseActiveDialogs();
+void printUsage();
+
+//Callbacks used in closing
+BOOL CALLBACK CloseOfficeDlgProc(HWND hwndChild, LPARAM lParam);
+BOOL CALLBACK CountOfficeDlgProc(HWND hwndChild, LPARAM lParam);
+
+//Global counters for number of windows found
+int gWDDlgCount = 0;
+int gXLDlgCount = 0;
+int gPPDlgCount = 0;
+
+//Dialog window class names for excel, powerpoint and word
+//These are "Best guess" dialog names
+const char *pWordDlg2k = "bosa_sdm_Microsoft Word 9.0";
+const char *pWordDlg2k3 = "bosa_sdm_Microsoft Office Word";
+const char *pXLDlg2k = "bosa_sdm_XL9";
+const char *pPPDlg2k = "#32770";
+const char *pXLDlg2k3 = "bosa_sdm_XL9";
+const char *pPPDlg2k3 = "#32770";
+const char *pGenMSODlg = "bosa_sdm_Mso96";
+//consider adding - bosa_sdm_Mso96
+
+//Command Line Argument constants
+const char *ARG_HELP = "--help";
+const char *ARG_KILL = "--kill";
+const char *ARG_CLOSE = "--close";
+
+//Window class names for MSO apps - if we need to look at other office instances
+//then this list would need to be expanded
+#define NUM_WINDOWCLASSNAMES 4
+char *wndClassName[NUM_WINDOWCLASSNAMES] = {"OpusApp", "XLMAIN", "PP9FrameClass", "PP10FrameClass"};
+
+int main(int argc, char* argv[])
+{
+ if (argc < 2) {
+ printUsage();
+ return 0;
+ }
+
+ if (strcmpi(argv[1], ARG_HELP) == 0) {
+ printUsage();
+ return 0;
+ }
+
+ if (strcmpi(argv[1], ARG_KILL) == 0) {
+ KillOffice();
+ return 0;
+ }
+
+ if (strcmpi(argv[1], ARG_CLOSE) == 0) {
+ CloseActiveDialogs();
+ return 0;
+ }
+
+ return 0;
+}
+
+/*--------------------------------------------------------------
+ Find the MSO window if it is available and explictly kill it
+ MSO apps in this case are Excel, Word and PP
+ Use FindWindow Win32 API to detect if they are available
+
+ -------------------------------------------------------------*/
+void KillOffice() {
+ HWND hWnd;
+
+ for (int i=0;i<NUM_WINDOWCLASSNAMES;i++) {
+ int j = 0;
+ while (((hWnd = FindWindow(wndClassName[i], NULL )) != NULL) && (j < 10)) {
+ KillAppFromWindow(hWnd, wndClassName[i]);
+ j++;
+ }
+ }
+}
+
+/*--------------------------------------------------------------
+ Using window handle, get process handle and try to kill the
+ app. This may not be successful if you do not have enough
+ privileges to kill the app.
+
+ --------------------------------------------------------------*/
+BOOL KillAppFromWindow(
+ HWND hWnd,
+ char *
+#ifdef _DEBUG
+ appName
+#endif
+)
+{
+ BOOL bRet = TRUE;
+
+ if(hWnd == NULL) {
+ //The app doesn't appear to be running
+#ifdef _DEBUG
+ printf("App %s: window not found.\n,", appName);
+#endif
+ bRet = FALSE;
+ } else {
+ DWORD pid; // Variable to hold the process ID.
+ DWORD dThread; // Variable to hold (unused) thread ID.
+ dThread = GetWindowThreadProcessId(hWnd, &pid);
+ HANDLE hProcess; // Handle to existing process
+
+ hProcess = OpenProcess(SYNCHRONIZE | PROCESS_ALL_ACCESS, TRUE, pid);
+ if (hProcess == NULL) {
+#ifdef _DEBUG
+ printf("App %s : Failed to get process handle",appName);
+#endif
+ bRet = FALSE;
+ } else {
+ if (!TerminateProcess(hProcess, 0)) {
+ LPTSTR lpMsgBuf;
+ FormatMessage(
+ FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
+ NULL, GetLastError(), MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+ (LPTSTR) &lpMsgBuf, 0, NULL );
+ printf("%s\n", lpMsgBuf);
+ LocalFree( lpMsgBuf );
+ bRet = FALSE;
+ }
+#ifdef _DEBUG
+ else {
+ printf("Kill %s appears to be successful.\n", appName);
+ }
+#endif
+ }
+ }
+ return bRet;
+}
+
+/*--------------------------------------------------------------
+ Close the dialogs if possible based on their window class
+ Use the EnumChildWindows win32 api for this
+ --------------------------------------------------------------*/
+BOOL CloseActiveDialogs() {
+ char buff[1024];
+
+ gWDDlgCount = 0;
+ gXLDlgCount = 0;
+ gPPDlgCount = 0;
+
+ EnumChildWindows(GetDesktopWindow(), CloseOfficeDlgProc, (LPARAM) 0);
+ sprintf(buff, "Word: %d\tExcel: %d\tPP: %d", gWDDlgCount, gXLDlgCount, gPPDlgCount);
+ return TRUE;
+}
+
+/*--------------------------------------------------------------
+ Callback for EnumChildWindows that sends close message to
+ any dialogs that match window class of MSO dialogs
+
+ --------------------------------------------------------------*/
+BOOL CALLBACK CloseOfficeDlgProc(HWND hwndChild, LPARAM)
+{
+ //bosa_sdm_Microsoft Word 9.0
+ //bosa_sdm_XL9
+ //#32770 (Dialog)
+
+ char szBuff[4096];
+ if (GetClassName(hwndChild, szBuff, 4096) == 0) {
+
+ } else {
+ if ((strcmpi(szBuff, pWordDlg2k) == 0) || (strcmpi(szBuff, pWordDlg2k3) == 0)) {
+ gWDDlgCount++;
+ SendMessage(hwndChild, WM_CLOSE, 0, 0);
+ }
+ if (strcmpi(szBuff, pXLDlg2k) == 0) {
+ gXLDlgCount++;
+ SendMessage(hwndChild, WM_CLOSE, 0, 0);
+ }
+ if (strcmpi(szBuff, pPPDlg2k) == 0) {
+ gPPDlgCount++;
+ SendMessage(hwndChild, WM_CLOSE, 0, 0);
+ }
+ if (strcmpi(szBuff, pGenMSODlg) == 0) {
+ SendMessage(hwndChild, WM_CLOSE, 0, 0);
+ }
+ }
+
+ return TRUE;
+}
+
+
+/*--------------------------------------------------------------
+ Callback for EnumChildWindows that counts numnnber of
+ dialogs that match window class of MSO dialogs
+
+ --------------------------------------------------------------*/
+BOOL CALLBACK CountOfficeDlgProc(HWND hwndChild, LPARAM)
+{
+ char szBuff[4096];
+ if (GetClassName(hwndChild, szBuff, 4096) == 0) {
+
+ } else {
+ if ((strcmpi(szBuff, pWordDlg2k) == 0) || (strcmpi(szBuff, pWordDlg2k3) == 0)) {
+ gWDDlgCount++;
+ }
+ if (strcmpi(szBuff, pXLDlg2k) == 0) {
+ gXLDlgCount++;
+ }
+ if (strcmpi(szBuff, pPPDlg2k) == 0) {
+ gPPDlgCount++;
+ }
+ }
+
+ return TRUE;
+}
+
+/*--------------------------------------------------------------
+ Simple usage message...
+
+ -------------------------------------------------------------*/
+void printUsage() {
+ printf("Recovery Assistant Utility - try and put MSO apps in a recoverable state\n");
+ printf("Copyright Sun Microsystems 2008\n");
+ printf("Options:\n");
+ printf(" --help : This message\n");
+ printf(" --close: Attempt to close any open dialogs owned by \n");
+ printf(" MSO apps so Application.Quit() can succeed\n");
+ printf(" --kill : Kill any open MSO apps. Use with caution and only as a last resort\n\n");
} \ No newline at end of file
diff --git a/migrationanalysis/src/resources/makefile.mk b/migrationanalysis/src/resources/makefile.mk
index f94a9c2cf4d9..574f5b966844 100644
--- a/migrationanalysis/src/resources/makefile.mk
+++ b/migrationanalysis/src/resources/makefile.mk
@@ -1,61 +1,59 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=migrationanalysis
-TARGET=resources
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-PAW_DEST:=$(BIN)$/ProAnalysisWizard$/Resources
-PAW_RESULT:= $(PAW_DEST)$/results.xlt
-PAW_RESULTSRC:= results_paw.xlt
-
-ANALYSIS_DTD:=analysis.dtd
-PAW_ANALYSIS_DTD:=$(PAW_DEST)$/analysis.dtd
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-ALLTAR : $(PAW_RESULT) $(PAW_ANALYSIS_DTD)
-
-$(PAW_RESULT) : $(PAW_RESULTSRC)
- -$(MKDIRHIER) $(@:d)
- $(COPY) $(PAW_RESULTSRC) $@
-
-$(PAW_ANALYSIS_DTD) : $(ANALYSIS_DTD)
- -$(MKDIRHIER) $(@:d)
- $(COPY) $(ANALYSIS_DTD) $@
-
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..
+
+PRJNAME=migrationanalysis
+TARGET=resources
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE : settings.mk
+
+# --- Files --------------------------------------------------------
+
+PAW_DEST:=$(BIN)$/ProAnalysisWizard$/Resources
+PAW_RESULT:= $(PAW_DEST)$/results.xlt
+PAW_RESULTSRC:= results_paw.xlt
+
+ANALYSIS_DTD:=analysis.dtd
+PAW_ANALYSIS_DTD:=$(PAW_DEST)$/analysis.dtd
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE : target.mk
+
+ALLTAR : $(PAW_RESULT) $(PAW_ANALYSIS_DTD)
+
+$(PAW_RESULT) : $(PAW_RESULTSRC)
+ -$(MKDIRHIER) $(@:d)
+ $(COPY) $(PAW_RESULTSRC) $@
+
+$(PAW_ANALYSIS_DTD) : $(ANALYSIS_DTD)
+ -$(MKDIRHIER) $(@:d)
+ $(COPY) $(ANALYSIS_DTD) $@
+
diff --git a/migrationanalysis/src/wizard/Analyse.bas b/migrationanalysis/src/wizard/Analyse.bas
index b74838057e60..48c30ea9fcab 100644
--- a/migrationanalysis/src/wizard/Analyse.bas
+++ b/migrationanalysis/src/wizard/Analyse.bas
@@ -1,32 +1,29 @@
Attribute VB_Name = "Analyse"
'/*************************************************************************
' *
-' * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-' *
-' * Copyright 2008 by Sun Microsystems, Inc.
-' *
-' * OpenOffice.org - a multi-platform office productivity suite
-' *
-' * $RCSfile: Analyse.bas,v $
-' * $Revision: 1.2.66.1 $
-' *
-' * This file is part of OpenOffice.org.
-' *
-' * OpenOffice.org is free software: you can redistribute it and/or modify
-' * it under the terms of the GNU Lesser General Public License version 3
-' * only, as published by the Free Software Foundation.
-' *
-' * OpenOffice.org is distributed in the hope that it will be useful,
-' * but WITHOUT ANY WARRANTY; without even the implied warranty of
-' * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-' * GNU Lesser General Public License version 3 for more details
-' * (a copy is included in the LICENSE file that accompanied this code).
-' *
-' * You should have received a copy of the GNU Lesser General Public License
-' * version 3 along with OpenOffice.org. If not, see
-' * <http://www.openoffice.org/license.html>
-' * for a copy of the LGPLv3 License.
-' *
+' DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+'
+' Copyright 2000, 2010 Oracle and/or its affiliates.
+'
+' OpenOffice.org - a multi-platform office productivity suite
+'
+' This file is part of OpenOffice.org.
+'
+' OpenOffice.org is free software: you can redistribute it and/or modify
+' it under the terms of the GNU Lesser General Public License version 3
+' only, as published by the Free Software Foundation.
+'
+' OpenOffice.org is distributed in the hope that it will be useful,
+' but WITHOUT ANY WARRANTY; without even the implied warranty of
+' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+' GNU Lesser General Public License version 3 for more details
+' (a copy is included in the LICENSE file that accompanied this code).
+'
+' You should have received a copy of the GNU Lesser General Public License
+' version 3 along with OpenOffice.org. If not, see
+' <http://www.openoffice.org/license.html>
+' for a copy of the LGPLv3 License.
+'
' ************************************************************************/
Option Explicit
diff --git a/migrationanalysis/src/wizard/CollectedFiles.cls b/migrationanalysis/src/wizard/CollectedFiles.cls
index bc7fbb2b279c..2dcc1a13e95c 100644
--- a/migrationanalysis/src/wizard/CollectedFiles.cls
+++ b/migrationanalysis/src/wizard/CollectedFiles.cls
@@ -13,32 +13,29 @@ Attribute VB_PredeclaredId = False
Attribute VB_Exposed = False
'/*************************************************************************
' *
-' * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-' *
-' * Copyright 2008 by Sun Microsystems, Inc.
-' *
-' * OpenOffice.org - a multi-platform office productivity suite
-' *
-' * $RCSfile: CollectedFiles.cls,v $
-' * $Revision: 1.9.66.1 $
-' *
-' * This file is part of OpenOffice.org.
-' *
-' * OpenOffice.org is free software: you can redistribute it and/or modify
-' * it under the terms of the GNU Lesser General Public License version 3
-' * only, as published by the Free Software Foundation.
-' *
-' * OpenOffice.org is distributed in the hope that it will be useful,
-' * but WITHOUT ANY WARRANTY; without even the implied warranty of
-' * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-' * GNU Lesser General Public License version 3 for more details
-' * (a copy is included in the LICENSE file that accompanied this code).
-' *
-' * You should have received a copy of the GNU Lesser General Public License
-' * version 3 along with OpenOffice.org. If not, see
-' * <http://www.openoffice.org/license.html>
-' * for a copy of the LGPLv3 License.
-' *
+' DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+'
+' Copyright 2000, 2010 Oracle and/or its affiliates.
+'
+' OpenOffice.org - a multi-platform office productivity suite
+'
+' This file is part of OpenOffice.org.
+'
+' OpenOffice.org is free software: you can redistribute it and/or modify
+' it under the terms of the GNU Lesser General Public License version 3
+' only, as published by the Free Software Foundation.
+'
+' OpenOffice.org is distributed in the hope that it will be useful,
+' but WITHOUT ANY WARRANTY; without even the implied warranty of
+' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+' GNU Lesser General Public License version 3 for more details
+' (a copy is included in the LICENSE file that accompanied this code).
+'
+' You should have received a copy of the GNU Lesser General Public License
+' version 3 along with OpenOffice.org. If not, see
+' <http://www.openoffice.org/license.html>
+' for a copy of the LGPLv3 License.
+'
' ************************************************************************/
Option Explicit
diff --git a/migrationanalysis/src/wizard/Get Directory Dialog.bas b/migrationanalysis/src/wizard/Get Directory Dialog.bas
index 553283e7b90c..a4520bda67a0 100644
--- a/migrationanalysis/src/wizard/Get Directory Dialog.bas
+++ b/migrationanalysis/src/wizard/Get Directory Dialog.bas
@@ -3,13 +3,10 @@ Attribute VB_Name = "BrowseDirectorysOnly"
' *
' * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
' *
-' * Copyright 2008 by Sun Microsystems, Inc.
+' * Copyright 2000, 2010 Oracle and/or its affiliates.
' *
' * OpenOffice.org - a multi-platform office productivity suite
' *
-' * $RCSfile: Get\040Directory\040Dialog.bas,v $
-' * $Revision: 1.5.148.1 $
-' *
' * This file is part of OpenOffice.org.
' *
' * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/migrationanalysis/src/wizard/IniSupport.bas b/migrationanalysis/src/wizard/IniSupport.bas
index f14a7ad1ef5d..81347eccab56 100644
--- a/migrationanalysis/src/wizard/IniSupport.bas
+++ b/migrationanalysis/src/wizard/IniSupport.bas
@@ -1,32 +1,29 @@
Attribute VB_Name = "IniSupport"
'/*************************************************************************
' *
-' * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-' *
-' * Copyright 2008 by Sun Microsystems, Inc.
-' *
-' * OpenOffice.org - a multi-platform office productivity suite
-' *
-' * $RCSfile: IniSupport.bas,v $
-' * $Revision: 1.6.148.1 $
-' *
-' * This file is part of OpenOffice.org.
-' *
-' * OpenOffice.org is free software: you can redistribute it and/or modify
-' * it under the terms of the GNU Lesser General Public License version 3
-' * only, as published by the Free Software Foundation.
-' *
-' * OpenOffice.org is distributed in the hope that it will be useful,
-' * but WITHOUT ANY WARRANTY; without even the implied warranty of
-' * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-' * GNU Lesser General Public License version 3 for more details
-' * (a copy is included in the LICENSE file that accompanied this code).
-' *
-' * You should have received a copy of the GNU Lesser General Public License
-' * version 3 along with OpenOffice.org. If not, see
-' * <http://www.openoffice.org/license.html>
-' * for a copy of the LGPLv3 License.
-' *
+' DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+'
+' Copyright 2000, 2010 Oracle and/or its affiliates.
+'
+' OpenOffice.org - a multi-platform office productivity suite
+'
+' This file is part of OpenOffice.org.
+'
+' OpenOffice.org is free software: you can redistribute it and/or modify
+' it under the terms of the GNU Lesser General Public License version 3
+' only, as published by the Free Software Foundation.
+'
+' OpenOffice.org is distributed in the hope that it will be useful,
+' but WITHOUT ANY WARRANTY; without even the implied warranty of
+' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+' GNU Lesser General Public License version 3 for more details
+' (a copy is included in the LICENSE file that accompanied this code).
+'
+' You should have received a copy of the GNU Lesser General Public License
+' version 3 along with OpenOffice.org. If not, see
+' <http://www.openoffice.org/license.html>
+' for a copy of the LGPLv3 License.
+'
' ************************************************************************/
Option Explicit
diff --git a/migrationanalysis/src/wizard/LaunchDrivers.vbp b/migrationanalysis/src/wizard/LaunchDrivers.vbp
index 868a1d14ee00..ac94808700dd 100644
--- a/migrationanalysis/src/wizard/LaunchDrivers.vbp
+++ b/migrationanalysis/src/wizard/LaunchDrivers.vbp
@@ -21,7 +21,7 @@ RevisionVer=000
AutoIncrementVer=0
ServerSupportFiles=0
VersionCompanyName="OpenOffice.org"
-VersionLegalCopyright="Copyright 2006-2008 Sun Microsystems, Inc."
+VersionLegalCopyright="Copyright 2000, 2010 Oracle and/or its affiliates."
CompilationType=0
OptimizationType=0
FavorPentiumPro(tm)=0
diff --git a/migrationanalysis/src/wizard/Office10Issues.bas b/migrationanalysis/src/wizard/Office10Issues.bas
index bd65b7b9288c..11196a153290 100644
--- a/migrationanalysis/src/wizard/Office10Issues.bas
+++ b/migrationanalysis/src/wizard/Office10Issues.bas
@@ -1,32 +1,29 @@
Attribute VB_Name = "Office10Issues"
'/*************************************************************************
' *
-' * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-' *
-' * Copyright 2008 by Sun Microsystems, Inc.
-' *
-' * OpenOffice.org - a multi-platform office productivity suite
-' *
-' * $RCSfile: Office10Issues.bas,v $
-' * $Revision: 1.8.148.1 $
-' *
-' * This file is part of OpenOffice.org.
-' *
-' * OpenOffice.org is free software: you can redistribute it and/or modify
-' * it under the terms of the GNU Lesser General Public License version 3
-' * only, as published by the Free Software Foundation.
-' *
-' * OpenOffice.org is distributed in the hope that it will be useful,
-' * but WITHOUT ANY WARRANTY; without even the implied warranty of
-' * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-' * GNU Lesser General Public License version 3 for more details
-' * (a copy is included in the LICENSE file that accompanied this code).
-' *
-' * You should have received a copy of the GNU Lesser General Public License
-' * version 3 along with OpenOffice.org. If not, see
-' * <http://www.openoffice.org/license.html>
-' * for a copy of the LGPLv3 License.
-' *
+' DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+'
+' Copyright 2000, 2010 Oracle and/or its affiliates.
+'
+' OpenOffice.org - a multi-platform office productivity suite
+'
+' This file is part of OpenOffice.org.
+'
+' OpenOffice.org is free software: you can redistribute it and/or modify
+' it under the terms of the GNU Lesser General Public License version 3
+' only, as published by the Free Software Foundation.
+'
+' OpenOffice.org is distributed in the hope that it will be useful,
+' but WITHOUT ANY WARRANTY; without even the implied warranty of
+' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+' GNU Lesser General Public License version 3 for more details
+' (a copy is included in the LICENSE file that accompanied this code).
+'
+' You should have received a copy of the GNU Lesser General Public License
+' version 3 along with OpenOffice.org. If not, see
+' <http://www.openoffice.org/license.html>
+' for a copy of the LGPLv3 License.
+'
' ************************************************************************/
'Disable Option Explicit so this will compile on earlier Office versions
diff --git a/migrationanalysis/src/wizard/ProAnalysisWizard.vbp b/migrationanalysis/src/wizard/ProAnalysisWizard.vbp
index 99b320e839b6..982f96631d5a 100644
--- a/migrationanalysis/src/wizard/ProAnalysisWizard.vbp
+++ b/migrationanalysis/src/wizard/ProAnalysisWizard.vbp
@@ -41,7 +41,7 @@ ServerSupportFiles=0
VersionComments="A tool for analyzing issues and working around some of them when migrating documents from Microsoft Office"
VersionCompanyName="OpenOffice.org"
VersionFileDescription="ProAnalysisWizard.exe"
-VersionLegalCopyright="Copyright 2005-2008 Sun Microsystems, Inc."
+VersionLegalCopyright="Copyright 2000, 2010 Oracle and/or its affiliates."
VersionProductName="ProAnalysisWizard"
CondComp="VB5 = 1 : PREPARATION = 1"
CompilationType=-1
diff --git a/migrationanalysis/src/wizard/RunServer.bas b/migrationanalysis/src/wizard/RunServer.bas
index 310098345c73..9c8f4ab88184 100644
--- a/migrationanalysis/src/wizard/RunServer.bas
+++ b/migrationanalysis/src/wizard/RunServer.bas
@@ -1,32 +1,29 @@
Attribute VB_Name = "RunServer"
'/*************************************************************************
' *
-' * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-' *
-' * Copyright 2008 by Sun Microsystems, Inc.
-' *
-' * OpenOffice.org - a multi-platform office productivity suite
-' *
-' * $RCSfile: RunServer.bas,v $
-' * $Revision: 1.2.66.2 $
-' *
-' * This file is part of OpenOffice.org.
-' *
-' * OpenOffice.org is free software: you can redistribute it and/or modify
-' * it under the terms of the GNU Lesser General Public License version 3
-' * only, as published by the Free Software Foundation.
-' *
-' * OpenOffice.org is distributed in the hope that it will be useful,
-' * but WITHOUT ANY WARRANTY; without even the implied warranty of
-' * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-' * GNU Lesser General Public License version 3 for more details
-' * (a copy is included in the LICENSE file that accompanied this code).
-' *
-' * You should have received a copy of the GNU Lesser General Public License
-' * version 3 along with OpenOffice.org. If not, see
-' * <http://www.openoffice.org/license.html>
-' * for a copy of the LGPLv3 License.
-' *
+' DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+'
+' Copyright 2000, 2010 Oracle and/or its affiliates.
+'
+' OpenOffice.org - a multi-platform office productivity suite
+'
+' This file is part of OpenOffice.org.
+'
+' OpenOffice.org is free software: you can redistribute it and/or modify
+' it under the terms of the GNU Lesser General Public License version 3
+' only, as published by the Free Software Foundation.
+'
+' OpenOffice.org is distributed in the hope that it will be useful,
+' but WITHOUT ANY WARRANTY; without even the implied warranty of
+' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+' GNU Lesser General Public License version 3 for more details
+' (a copy is included in the LICENSE file that accompanied this code).
+'
+' You should have received a copy of the GNU Lesser General Public License
+' version 3 along with OpenOffice.org. If not, see
+' <http://www.openoffice.org/license.html>
+' for a copy of the LGPLv3 License.
+'
' ************************************************************************/
Option Explicit
diff --git a/migrationanalysis/src/wizard/Utilities.bas b/migrationanalysis/src/wizard/Utilities.bas
index 8db22755a55b..163435563c33 100644
--- a/migrationanalysis/src/wizard/Utilities.bas
+++ b/migrationanalysis/src/wizard/Utilities.bas
@@ -1,32 +1,29 @@
Attribute VB_Name = "Utilities"
'/*************************************************************************
' *
-' * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-' *
-' * Copyright 2008 by Sun Microsystems, Inc.
-' *
-' * OpenOffice.org - a multi-platform office productivity suite
-' *
-' * $RCSfile: Utilities.bas,v $
-' * $Revision: 1.11.66.1 $
-' *
-' * This file is part of OpenOffice.org.
-' *
-' * OpenOffice.org is free software: you can redistribute it and/or modify
-' * it under the terms of the GNU Lesser General Public License version 3
-' * only, as published by the Free Software Foundation.
-' *
-' * OpenOffice.org is distributed in the hope that it will be useful,
-' * but WITHOUT ANY WARRANTY; without even the implied warranty of
-' * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-' * GNU Lesser General Public License version 3 for more details
-' * (a copy is included in the LICENSE file that accompanied this code).
-' *
-' * You should have received a copy of the GNU Lesser General Public License
-' * version 3 along with OpenOffice.org. If not, see
-' * <http://www.openoffice.org/license.html>
-' * for a copy of the LGPLv3 License.
-' *
+' DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+'
+' Copyright 2000, 2010 Oracle and/or its affiliates.
+'
+' OpenOffice.org - a multi-platform office productivity suite
+'
+' This file is part of OpenOffice.org.
+'
+' OpenOffice.org is free software: you can redistribute it and/or modify
+' it under the terms of the GNU Lesser General Public License version 3
+' only, as published by the Free Software Foundation.
+'
+' OpenOffice.org is distributed in the hope that it will be useful,
+' but WITHOUT ANY WARRANTY; without even the implied warranty of
+' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+' GNU Lesser General Public License version 3 for more details
+' (a copy is included in the LICENSE file that accompanied this code).
+'
+' You should have received a copy of the GNU Lesser General Public License
+' version 3 along with OpenOffice.org. If not, see
+' <http://www.openoffice.org/license.html>
+' for a copy of the LGPLv3 License.
+'
' ************************************************************************/
Option Explicit
diff --git a/migrationanalysis/src/wizard/Wizard.bas b/migrationanalysis/src/wizard/Wizard.bas
index 5f6b764c968d..93bd7a849178 100644
--- a/migrationanalysis/src/wizard/Wizard.bas
+++ b/migrationanalysis/src/wizard/Wizard.bas
@@ -1,32 +1,29 @@
Attribute VB_Name = "modWizard"
'/*************************************************************************
' *
-' * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-' *
-' * Copyright 2008 by Sun Microsystems, Inc.
-' *
-' * OpenOffice.org - a multi-platform office productivity suite
-' *
-' * $RCSfile: Wizard.bas,v $
-' * $Revision: 1.28.66.2 $
-' *
-' * This file is part of OpenOffice.org.
-' *
-' * OpenOffice.org is free software: you can redistribute it and/or modify
-' * it under the terms of the GNU Lesser General Public License version 3
-' * only, as published by the Free Software Foundation.
-' *
-' * OpenOffice.org is distributed in the hope that it will be useful,
-' * but WITHOUT ANY WARRANTY; without even the implied warranty of
-' * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-' * GNU Lesser General Public License version 3 for more details
-' * (a copy is included in the LICENSE file that accompanied this code).
-' *
-' * You should have received a copy of the GNU Lesser General Public License
-' * version 3 along with OpenOffice.org. If not, see
-' * <http://www.openoffice.org/license.html>
-' * for a copy of the LGPLv3 License.
-' *
+' DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+'
+' Copyright 2000, 2010 Oracle and/or its affiliates.
+'
+' OpenOffice.org - a multi-platform office productivity suite
+'
+' This file is part of OpenOffice.org.
+'
+' OpenOffice.org is free software: you can redistribute it and/or modify
+' it under the terms of the GNU Lesser General Public License version 3
+' only, as published by the Free Software Foundation.
+'
+' OpenOffice.org is distributed in the hope that it will be useful,
+' but WITHOUT ANY WARRANTY; without even the implied warranty of
+' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+' GNU Lesser General Public License version 3 for more details
+' (a copy is included in the LICENSE file that accompanied this code).
+'
+' You should have received a copy of the GNU Lesser General Public License
+' version 3 along with OpenOffice.org. If not, see
+' <http://www.openoffice.org/license.html>
+' for a copy of the LGPLv3 License.
+'
' ************************************************************************/
Option Explicit
diff --git a/migrationanalysis/src/wizard/Wizard.frm b/migrationanalysis/src/wizard/Wizard.frm
index bdf08b91d04c..ebb955386c68 100644
--- a/migrationanalysis/src/wizard/Wizard.frm
+++ b/migrationanalysis/src/wizard/Wizard.frm
@@ -1339,13 +1339,8 @@ Attribute VB_Creatable = False
Attribute VB_PredeclaredId = True
Attribute VB_Exposed = False
' *******************************************************************************
-' * $RCSfile: Wizard.frm,v $
' *
-' * Description:
-' *
-' * Last change: $Date: 2008/10/07 11:35:55 $ $Revision: 1.42.66.2 $
-' *
-' * Copyright 2005 Sun Microsystems, Inc. All rights reserved. Use of this
+' * Copyright 2000, 2010 Oracle and/or its affiliates. All rights reserved. Use of this
' * product is subject to license terms.
' *
' *******************************************************************************
diff --git a/migrationanalysis/src/wizard/makefile.mk b/migrationanalysis/src/wizard/makefile.mk
index eee2461ccf5b..f421379a6aa3 100644
--- a/migrationanalysis/src/wizard/makefile.mk
+++ b/migrationanalysis/src/wizard/makefile.mk
@@ -1,118 +1,116 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=migrationanalysis
-TARGET=wizard
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-PAW_APPSDEST:=$(BIN)$/ProAnalysisWizard
-ALTERNATE_SRC:=..$/exe
-
-PAW_DATDEST:=$(PAW_APPSDEST)$/Resources
-
-PROJECTDEST:=$(BIN)$/ProAnalysisWizard
-RCFILES:=$(RES)$/$(TARGET).rc
-RESFILE:=$(RES)$/$(TARGET).res
-ULFFILES:=$(TARGET).ulf
-.IF "$(WITH_LANG)"!=""
-ULFDIR:=$(COMMONMISC)$/$(TARGET)
-.ELSE # "$(WITH_LANG)"!=""
-ULFDIR:=.
-.ENDIF # "$(WITH_LANG)"!=""
-MANIFEST:=$(RES)$/DocAnalysisWizard.exe.manifest
-
-LAUNCHER_APP:= $(BIN)$/LaunchDrivers.exe
-
-BASIC_APPS:= \
- $(LAUNCHER_APP) \
- $(PAW_APPSDEST)$/ProAnalysisWizard.exe
-
-BASIC_VBP:= \
- $(BIN)$/LaunchDrivers.vbp \
- $(PAW_APPSDEST)$/ProAnalysisWizard.vbp
-
-PAW_RES_DLLS:=$(PAW_DATDEST)$/Resources.dll
-PAW_LAUNCHER:=$(PAW_DATDEST)$/LaunchDrivers.exe
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-ALLTAR : $(BASIC_APPS) $(PAW_RES_DLLS) $(PAW_LAUNCHER)
-
-$(MANIFEST) : $$(@:f)
- -$(MKDIRHIER) $(@:d)
- $(COPY) $< $@
-
-.IF "$(VB6_LOCATION)" != ""
-
-$(BASIC_VBP) : $$(@:b).vbp
- -$(MKDIRHIER) $(@:d)
- $(COPY) $(@:f) $@
-
-$(BASIC_APPS) : $(BASIC_VBP)
- -$(MKDIRHIER) $(@:d)
- cd $(@:d) && "$(VB6_LOCATION)$/vb6.exe" /m $(@:b).vbp
-
-$(PAW_LAUNCHER) : $(LAUNCHER_APP)
- -$(MKDIRHIER) $(@:d)
- $(COPY) $(LAUNCHER_APP) $@
-
-.ELSE # "$(VB6_LOCATION)" != ""
-
-$(BASIC_APPS) : $(ALTERNATE_SRC)$/$$(@:f)
- @echo "------------------------------------"
- @echo "No VB6 found: using prebuild wizards"
- @echo "------------------------------------"
- -$(MKDIRHIER) $(@:d)
- $(COPY) $(ALTERNATE_SRC)$/$(@:f) $@
-
-$(PAW_LAUNCHER) : $(ALTERNATE_SRC)$/$$(@:f)
- -$(MKDIRHIER) $(@:d)
- $(COPY) $(ALTERNATE_SRC)$/$(@:f) $@
-
-.ENDIF # "$(VB6_LOCATION)" != ""
-
-# Generate the native Windows resource file
-# using lngconvex.exe
-
-$(RCFILES) : $(MANIFEST) $(ULFDIR)$/$(TARGET).ulf makefile.mk rcfooter.txt rcheader.txt rctmpl.txt
- $(LNGCONVEX) -ulf $(ULFDIR)$/$(TARGET).ulf -rc $(RES)$/$(TARGET).rc -rct rctmpl.txt -rch rcheader.txt -rcf rcfooter.txt
-
-$(PAW_RES_DLLS) : $(RCFILES)
- -$(MKDIRHIER) $(@:d)
- link /NOENTRY /DLL /MACHINE:X86 /OUT:$@ $(RESFILE)
-
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..
+
+PRJNAME=migrationanalysis
+TARGET=wizard
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE : settings.mk
+
+# --- Files --------------------------------------------------------
+
+PAW_APPSDEST:=$(BIN)$/ProAnalysisWizard
+ALTERNATE_SRC:=..$/exe
+
+PAW_DATDEST:=$(PAW_APPSDEST)$/Resources
+
+PROJECTDEST:=$(BIN)$/ProAnalysisWizard
+RCFILES:=$(RES)$/$(TARGET).rc
+RESFILE:=$(RES)$/$(TARGET).res
+ULFFILES:=$(TARGET).ulf
+.IF "$(WITH_LANG)"!=""
+ULFDIR:=$(COMMONMISC)$/$(TARGET)
+.ELSE # "$(WITH_LANG)"!=""
+ULFDIR:=.
+.ENDIF # "$(WITH_LANG)"!=""
+MANIFEST:=$(RES)$/DocAnalysisWizard.exe.manifest
+
+LAUNCHER_APP:= $(BIN)$/LaunchDrivers.exe
+
+BASIC_APPS:= \
+ $(LAUNCHER_APP) \
+ $(PAW_APPSDEST)$/ProAnalysisWizard.exe
+
+BASIC_VBP:= \
+ $(BIN)$/LaunchDrivers.vbp \
+ $(PAW_APPSDEST)$/ProAnalysisWizard.vbp
+
+PAW_RES_DLLS:=$(PAW_DATDEST)$/Resources.dll
+PAW_LAUNCHER:=$(PAW_DATDEST)$/LaunchDrivers.exe
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE : target.mk
+
+ALLTAR : $(BASIC_APPS) $(PAW_RES_DLLS) $(PAW_LAUNCHER)
+
+$(MANIFEST) : $$(@:f)
+ -$(MKDIRHIER) $(@:d)
+ $(COPY) $< $@
+
+.IF "$(VB6_LOCATION)" != ""
+
+$(BASIC_VBP) : $$(@:b).vbp
+ -$(MKDIRHIER) $(@:d)
+ $(COPY) $(@:f) $@
+
+$(BASIC_APPS) : $(BASIC_VBP)
+ -$(MKDIRHIER) $(@:d)
+ cd $(@:d) && "$(VB6_LOCATION)$/vb6.exe" /m $(@:b).vbp
+
+$(PAW_LAUNCHER) : $(LAUNCHER_APP)
+ -$(MKDIRHIER) $(@:d)
+ $(COPY) $(LAUNCHER_APP) $@
+
+.ELSE # "$(VB6_LOCATION)" != ""
+
+$(BASIC_APPS) : $(ALTERNATE_SRC)$/$$(@:f)
+ @echo "------------------------------------"
+ @echo "No VB6 found: using prebuild wizards"
+ @echo "------------------------------------"
+ -$(MKDIRHIER) $(@:d)
+ $(COPY) $(ALTERNATE_SRC)$/$(@:f) $@
+
+$(PAW_LAUNCHER) : $(ALTERNATE_SRC)$/$$(@:f)
+ -$(MKDIRHIER) $(@:d)
+ $(COPY) $(ALTERNATE_SRC)$/$(@:f) $@
+
+.ENDIF # "$(VB6_LOCATION)" != ""
+
+# Generate the native Windows resource file
+# using lngconvex.exe
+
+$(RCFILES) : $(MANIFEST) $(ULFDIR)$/$(TARGET).ulf makefile.mk rcfooter.txt rcheader.txt rctmpl.txt
+ $(LNGCONVEX) -ulf $(ULFDIR)$/$(TARGET).ulf -rc $(RES)$/$(TARGET).rc -rct rctmpl.txt -rch rcheader.txt -rcf rcfooter.txt
+
+$(PAW_RES_DLLS) : $(RCFILES)
+ -$(MKDIRHIER) $(@:d)
+ link /NOENTRY /DLL /MACHINE:X86 /OUT:$@ $(RESFILE)
+
diff --git a/migrationanalysis/util/delzip b/migrationanalysis/util/delzip
index e2b3a64d3ade..594f345bdece 100644
--- a/migrationanalysis/util/delzip
+++ b/migrationanalysis/util/delzip
@@ -1 +1 @@
-ECHO is off
+ECHO is off
diff --git a/migrationanalysis/util/makefile.mk b/migrationanalysis/util/makefile.mk
index e00e4db30acc..550af0ab40f9 100644
--- a/migrationanalysis/util/makefile.mk
+++ b/migrationanalysis/util/makefile.mk
@@ -1,84 +1,53 @@
-#*************************************************************************
-#
-# $RCSfile: makefile.mk,v $
-#
-# The Contents of this file are made available subject to the terms of
-# either of the following licenses
-#
-# - GNU Lesser General Public License Version 2.1
-# - Sun Industry Standards Source License Version 1.1
-#
-# Sun Microsystems Inc., October, 2000
-#
-# GNU Lesser General Public License Version 2.1
-# =============================================
-# Copyright 2000 by Sun Microsystems, Inc.
-# 901 San Antonio Road, Palo Alto, CA 94303, USA
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License version 2.1, as published by the Free Software Foundation.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-# MA 02111-1307 USA
-#
-#
-# Sun Industry Standards Source License Version 1.1
-# =================================================
-# The contents of this file are subject to the Sun Industry Standards
-# Source License Version 1.1 (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.openoffice.org/license.html.
-#
-# Software provided under this License is provided on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-# WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-# MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-# See the License for the specific provisions governing your rights and
-# obligations concerning the Software.
-#
-# The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-#
-# Copyright: 2000 by Sun Microsystems, Inc.
-#
-# All Rights Reserved.
-#
-# Contributor(s): _______________________________________
-#
-#
-#
-#*************************************************************************
-
-PRJ=..
-
-PRJNAME=migrationanalysis
-TARGET=paw
-
-no_common_build_zip=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-ZIPFLAGS =
-ZIP1DIR = $(BIN)$/ProAnalysisWizard
-ZIP1TARGET = MigrationAnalysis
-ZIP1LIST = ProAnalysisWizard.exe Resources$/* Resources$/lang$/*
-
-ZIP2DIR = $(BIN)$/ProAnalysisWizard
-ZIP2TARGET = ProAnalysisWizard
-ZIP2LIST = Resources$/* Resources$/lang$/*
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..
+
+PRJNAME=migrationanalysis
+TARGET=paw
+
+no_common_build_zip=TRUE
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE : settings.mk
+
+# --- Files --------------------------------------------------------
+
+ZIPFLAGS =
+ZIP1DIR = $(BIN)$/ProAnalysisWizard
+ZIP1TARGET = MigrationAnalysis
+ZIP1LIST = ProAnalysisWizard.exe Resources$/* Resources$/lang$/*
+
+ZIP2DIR = $(BIN)$/ProAnalysisWizard
+ZIP2TARGET = ProAnalysisWizard
+ZIP2LIST = Resources$/* Resources$/lang$/*
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE : target.mk
+
diff --git a/mysqlc/images/sun_extension.png b/mysqlc/images/sun_extension.png
new file mode 100644
index 000000000000..31f48ea8fb69
--- /dev/null
+++ b/mysqlc/images/sun_extension.png
Binary files differ
diff --git a/mysqlc/images/sun_extension_hc.png b/mysqlc/images/sun_extension_hc.png
new file mode 100644
index 000000000000..3870cc4709d4
--- /dev/null
+++ b/mysqlc/images/sun_extension_hc.png
Binary files differ
diff --git a/mysqlc/prj/build.lst b/mysqlc/prj/build.lst
new file mode 100644
index 000000000000..636c4876826c
--- /dev/null
+++ b/mysqlc/prj/build.lst
@@ -0,0 +1,3 @@
+mc mysqlc : solenv MYSQLCPPCONN:mysqlcppconn offuh cppu soltools cppuhelper readlicense_oo NULL
+ch mysqlc usr1 - all mc_mkout NULL
+mc mysqlc\source nmake - all mc_source NULL
diff --git a/mysqlc/prj/d.lst b/mysqlc/prj/d.lst
new file mode 100644
index 000000000000..dc6ba44ab37d
--- /dev/null
+++ b/mysqlc/prj/d.lst
@@ -0,0 +1,4 @@
+# Extensions
+
+..\%__SRC%\bin\*.oxt %_DEST%\bin%_EXT%\*.oxt
+
diff --git a/mysqlc/source/DataAccess.xcu b/mysqlc/source/DataAccess.xcu
new file mode 100644
index 000000000000..1c70d36f1680
--- /dev/null
+++ b/mysqlc/source/DataAccess.xcu
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<oor:node xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:name="DataAccess" oor:package="org.openoffice.Office">
+ <node oor:name="UserDefinedDriverSettings">
+ <node oor:name="org.openoffice.comp.connectivity.mysql_native.Driver" oor:op="replace">
+ <prop oor:name="DriverName">
+ <value>org.openoffice.comp.connectivity.mysql_native.Driver</value>
+ </prop>
+ <prop oor:name="DriverPageDisplayName">
+ <value>MySQL native driver</value>
+ </prop>
+ <prop oor:name="DriverTypeDisplayName">
+ <value>MySQL native driver</value>
+ </prop>
+ <prop oor:name="DriverDsnPrefix">
+ <value>sdbc:mysqlc:</value>
+ </prop>
+ </node>
+ </node>
+</oor:node>
diff --git a/mysqlc/source/README b/mysqlc/source/README
new file mode 100644
index 000000000000..1166dde27971
--- /dev/null
+++ b/mysqlc/source/README
@@ -0,0 +1,65 @@
+---------- Status -------------------------------------------------------------
+
+The code is on a PREVIEW level. PREVIEW means pre-alpha.
+
+---------- Requirements -------------------------------------------------------
+
+The MySQL driver for OpenOffice.org (MySQL Connector/OpenOffice.org - C/OOo)
+requires two external libraries to be build:
+
+ 1) The MySQL Client Library (libmysql)
+ 2) The MySQL Connector/C++ Library (libmysqlcppcon)
+
+At the time of writing neither of the two libraries are part of the CWS!
+Before you can build the MySQL driver for OpenOffice.org you must install
+the two required libraries on your system before you can compile the driver.
+
+You need the two libraries because the MySQL driver for OpenOffice.org
+does not feature an implementation of the MySQL Client Server
+communication protocol. The protocol implementation is part of the MySQL
+Client Library. And the SDBC(X) style OpenOffice.org driver is implemented as a
+wrapper of the MySQL Connector/C++ Library which implements a JDBC interface and
+in turn uses the C based MySQL Client Library.
+
+1) MySQL Client Library (libmysql)
+
+The MySQL Client Library (libmysql) is part of the MySQL Server. You need to
+download and install the MySQL Server. Use a binary distribution of
+MySQL 5.0.x or MySQL 5.1.x. Check the MySQL manual for instructions, e.g.
+for Unix:
+
+ http://dev.mysql.com/doc/refman/5.1/en/installing-binary.html
+
+The typical installation path of the libmysql.so on Unix is
+/usr/local/mysql/lib/mysql/ .
+
+2) MySQL Connector/C++ (libmysqlcppcon)
+
+Download and install the latest version of the MySQL Connector/C++, see
+http://forge.mysql.com/wiki/Connector_C++ . Check out the source
+from the bzr repository.
+
+3) Tweaking library paths
+
+At the time of writing you might have to *manually* tweak library paths and
+library names by patching makefile.mk. This is a temporary hack. The makefile
+will be improved later.
+
+However, for the moment check the makefile.mk if the compilation fails due to
+"missing" libraries (= libraries not found). For example, check the following
+settings:
+
+ MYSQL_INCDIR=/usr/local/include
+ MYSQL_LIBDIR=/usr/local/lib
+ [...]
+ MYSQL_INCDIR=/usr/local/include
+ MYSQL_LIBDIR=/usr/local/lib
+ [...]
+ MYSQL_INC=-I$(MYSQL_INCDIR)
+ MYSQL_LIB=-L$(MYSQL_LIBDIR) -lmysqlclient -rdynamic -lz -lcrypt -lnsl -lm
+ MYSQL_LIBFILE=$(MYSQL_LIBDIR)$/libmysqlclient.so.16
+ MYSQL_CPPCONN_LIBFILE=$(MYSQL_LIBDIR)$/libmysqlcppconn.so
+ [...]
+
+A common issue is libmysqlclient.so.15 vs. libmysqlclient.so.16 .
+
diff --git a/mysqlc/source/delzip b/mysqlc/source/delzip
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/mysqlc/source/delzip
diff --git a/mysqlc/source/description.xml b/mysqlc/source/description.xml
new file mode 100644
index 000000000000..e5a17a11851a
--- /dev/null
+++ b/mysqlc/source/description.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<description xmlns="http://openoffice.org/extensions/description/2006" xmlns:d="http://openoffice.org/extensions/description/2006"
+ xmlns:xlink="http://www.w3.org/1999/xlink">
+
+ <identifier value="UPDATED_IDENTIFIER"/>
+ <version value="#VERSION#" />
+ <platform value="UPDATED_SUPPORTED_PLATFORM" />
+ <registration>
+ <simple-license accept-by="admin" default-license-id="lic-en-US" >
+ <license-text xlink:href="licensefile" lang="isocode" license-id="lic-isocode"/>
+ </simple-license>
+ </registration>
+ <display-name>
+ <name lang="en-US">#TITLE#</name>
+ </display-name>
+ <dependencies>
+ <OpenOffice.org-minimal-version value="3.1" d:name="OpenOffice.org 3.1"/>
+ </dependencies>
+ <publisher>
+ <name xlink:href="http://www.sun.com/software/star/staroffice/extensions.jsp?cid=925095" lang="en">Sun Microsystems</name>
+ </publisher>
+ <icon>
+ <default xlink:href="images/sun_extension.png" />
+ <high-contrast xlink:href="images/sun_extension_hc.png" />
+ </icon>
+ <extension-description>
+ <src lang="#LANG#" xlink:href="description/description_#LANG#.txt"/>
+ </extension-description>
+</description>
diff --git a/mysqlc/source/description/description_de.txt b/mysqlc/source/description/description_de.txt
new file mode 100644
index 000000000000..acdaea342571
--- /dev/null
+++ b/mysqlc/source/description/description_de.txt
@@ -0,0 +1 @@
+Verbindet OpenOffice.org direkt mit MySQL-Servern \ No newline at end of file
diff --git a/mysqlc/source/description/description_en-US.txt b/mysqlc/source/description/description_en-US.txt
new file mode 100644
index 000000000000..e149658af7de
--- /dev/null
+++ b/mysqlc/source/description/description_en-US.txt
@@ -0,0 +1 @@
+Connects OpenOffice.org directly with MySQL Servers
diff --git a/mysqlc/source/description/description_es.txt b/mysqlc/source/description/description_es.txt
new file mode 100644
index 000000000000..9e04c85fbd84
--- /dev/null
+++ b/mysqlc/source/description/description_es.txt
@@ -0,0 +1 @@
+Conecta OpenOffice.org directamente con los servidores de MySQL \ No newline at end of file
diff --git a/mysqlc/source/description/description_fr.txt b/mysqlc/source/description/description_fr.txt
new file mode 100644
index 000000000000..ca3073273834
--- /dev/null
+++ b/mysqlc/source/description/description_fr.txt
@@ -0,0 +1 @@
+Connexion directe d'OpenOffice.org avec les serveurs MySQL. \ No newline at end of file
diff --git a/mysqlc/source/description/description_hu.txt b/mysqlc/source/description/description_hu.txt
new file mode 100644
index 000000000000..0b60de706018
--- /dev/null
+++ b/mysqlc/source/description/description_hu.txt
@@ -0,0 +1 @@
+Közvetlen kapcsolatot teremt az OpenOffice.org és a MySQL-kiszolgálók között. \ No newline at end of file
diff --git a/mysqlc/source/description/description_it.txt b/mysqlc/source/description/description_it.txt
new file mode 100644
index 000000000000..36326e214bf6
--- /dev/null
+++ b/mysqlc/source/description/description_it.txt
@@ -0,0 +1 @@
+Consente la connessione diretta tra OpenOffice.org e i server MySQL \ No newline at end of file
diff --git a/mysqlc/source/description/description_ja.txt b/mysqlc/source/description/description_ja.txt
new file mode 100644
index 000000000000..3d6a70eb9489
--- /dev/null
+++ b/mysqlc/source/description/description_ja.txt
@@ -0,0 +1 @@
+OpenOffice.org を MySQL サーバーと直接に接続させる \ No newline at end of file
diff --git a/mysqlc/source/description/description_ko.txt b/mysqlc/source/description/description_ko.txt
new file mode 100644
index 000000000000..6b4ca29be8ce
--- /dev/null
+++ b/mysqlc/source/description/description_ko.txt
@@ -0,0 +1 @@
+MySQL 서버를 통해 OpenOffice.org에 직접 연결합니다. \ No newline at end of file
diff --git a/mysqlc/source/description/description_nl.txt b/mysqlc/source/description/description_nl.txt
new file mode 100644
index 000000000000..1405fd0b2ff1
--- /dev/null
+++ b/mysqlc/source/description/description_nl.txt
@@ -0,0 +1 @@
+Verbindt OpenOffice.org direct met MySQL Servers \ No newline at end of file
diff --git a/mysqlc/source/description/description_pl.txt b/mysqlc/source/description/description_pl.txt
new file mode 100644
index 000000000000..03e0f23bbc99
--- /dev/null
+++ b/mysqlc/source/description/description_pl.txt
@@ -0,0 +1 @@
+Laczy witryne OpenOffice.org bezposrednio z systemem MySQL Servers \ No newline at end of file
diff --git a/mysqlc/source/description/description_pt-BR.txt b/mysqlc/source/description/description_pt-BR.txt
new file mode 100644
index 000000000000..21d3ba28a5da
--- /dev/null
+++ b/mysqlc/source/description/description_pt-BR.txt
@@ -0,0 +1 @@
+Conecta o OpenOffice.org diretamente aos servidores MySQL \ No newline at end of file
diff --git a/mysqlc/source/description/description_pt.txt b/mysqlc/source/description/description_pt.txt
new file mode 100644
index 000000000000..1f05c487e03e
--- /dev/null
+++ b/mysqlc/source/description/description_pt.txt
@@ -0,0 +1 @@
+Liga o OpenOffice.org directamente aos servidores MySQL \ No newline at end of file
diff --git a/mysqlc/source/description/description_ru.txt b/mysqlc/source/description/description_ru.txt
new file mode 100644
index 000000000000..633b2c9514df
--- /dev/null
+++ b/mysqlc/source/description/description_ru.txt
@@ -0,0 +1 @@
+Подключает OpenOffice.org напрямую к серверам MySQL
diff --git a/mysqlc/source/description/description_sv.txt b/mysqlc/source/description/description_sv.txt
new file mode 100644
index 000000000000..d7fc80975763
--- /dev/null
+++ b/mysqlc/source/description/description_sv.txt
@@ -0,0 +1 @@
+Ansluter OpenOffice.org direkt till MySQL-servrarna \ No newline at end of file
diff --git a/mysqlc/source/description/description_zh-CN.txt b/mysqlc/source/description/description_zh-CN.txt
new file mode 100644
index 000000000000..c38bc47a41a8
--- /dev/null
+++ b/mysqlc/source/description/description_zh-CN.txt
@@ -0,0 +1 @@
+将 OpenOffice.org 与 MySQL 服务器直接相连 \ No newline at end of file
diff --git a/mysqlc/source/description/description_zh-TW.txt b/mysqlc/source/description/description_zh-TW.txt
new file mode 100644
index 000000000000..de628909d369
--- /dev/null
+++ b/mysqlc/source/description/description_zh-TW.txt
@@ -0,0 +1 @@
+將 OpenOffice.org 直接連線至 MySQL 伺服器 \ No newline at end of file
diff --git a/mysqlc/source/exports.dxp b/mysqlc/source/exports.dxp
new file mode 100644
index 000000000000..9630d7e06768
--- /dev/null
+++ b/mysqlc/source/exports.dxp
@@ -0,0 +1,3 @@
+component_getImplementationEnvironment
+component_writeInfo
+component_getFactory
diff --git a/mysqlc/source/makefile.mk b/mysqlc/source/makefile.mk
new file mode 100644
index 000000000000..ff1c8c83f7c4
--- /dev/null
+++ b/mysqlc/source/makefile.mk
@@ -0,0 +1,332 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2008 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..
+PRJNAME=mysqlc
+
+.INCLUDE : $(PRJ)$/version.mk
+
+TARGET=mysqlc
+ENABLE_EXCEPTIONS=TRUE
+LIBTARGET=NO
+EXTENSIONNAME:=mysql-connector-ooo
+
+.IF "$(SYSTEM_MYSQL)" == "YES"
+EXTERNAL_WARNINGS_NOT_ERRORS = TRUE
+.ENDIF
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE : settings.mk
+
+#-------------------------------------------------------------------
+
+#---- extension version
+EXTENSION_VERSION_BASE=$(MYSQLC_VERSION_MAJOR).$(MYSQLC_VERSION_MINOR).$(MYSQLC_VERSION_MICRO)
+.IF ( "$(CWS_WORK_STAMP)" == "" ) || ( "$(UPDATER)" == "YES" )
+ EXTENSION_VERSION=$(EXTENSION_VERSION_BASE)
+.ELSE
+ EXTENSION_VERSION=$(EXTENSION_VERSION_BASE).cws.$(CWS_WORK_STAMP)
+.ENDIF
+
+#---- extension title package name
+.IF "$(MYSQLC_STATUS)" == "final"
+ EXTENSION_TITLE:=$(MYSQLC_TITLE)
+ EXTENSION_ZIPNAME:=$(EXTENSIONNAME)-$(EXTENSION_VERSION_BASE)-$(RTL_OS:l)-$(RTL_ARCH:l)
+.ELSE
+ EXTENSION_TITLE:=$(MYSQLC_TITLE) ($(MYSQLC_STATUS))
+ EXTENSION_ZIPNAME:=$(EXTENSIONNAME)-$(EXTENSION_VERSION_BASE)-$(MYSQLC_STATUS:s/ /-/:l)-$(RTL_OS:l)-$(RTL_ARCH:l)
+.ENDIF
+
+#-------------------------------------------------------------------
+
+# set default symbol visibility / scope to hidden
+.IF "$(COMNAME)" == "gcc3"
+.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+ CFLAGS += -fvisibility=hidden
+.ENDIF # HAVE_GCC_VISIBILITY_FEATURE
+.ENDIF # gcc3
+
+.IF "$(COMNAME)" == "sunpro5"
+.IF "$(CCNUMVER)" >= "00050005"
+ CFLAGS += -xldscope=hidden
+.ENDIF # 5.5
+.ENDIF # sunpro5
+
+#-------------------------------------------------------------------
+
+# The headers delivered from C/C++ have a habit of putting a ";" after the closing bracked of a namespace, which
+# yields a warning with Solaris' compiler. Until this is fixed in C/C++, silence this warning
+.IF "$(OS)" == "SOLARIS"
+ CFLAGSWARNCXX+=,wemptydecl
+ CFLAGSWARNCXX:=$(CFLAGSWARNCXX:s/ ,/,/)
+.ENDIF
+
+#-------------------------------------------------------------------
+.IF "$(ENABLE_MYSQLC)" != "YES"
+@all:
+ @echo "Mysql native driver extension build disabled."
+.ENDIF
+
+# use the static version
+.IF "$(GUI)"=="WNT"
+ MYSQL_LIBDIR=$(LIBMYSQL_PATH)$/lib
+ MYSQL_INCDIR=$(LIBMYSQL_PATH)$/include
+.ELSE
+ .IF "$(SYSTEM_MYSQL)" != "YES"
+ MYSQL_LIBDIR=$(LIBMYSQL_PATH)$/lib
+ MYSQL_INCDIR=$(LIBMYSQL_PATH)$/include
+ .ENDIF
+.ENDIF
+
+.IF "$(SYSTEM_MYSQL)" == "YES"
+CFLAGS+=-DSYSTEM_MYSQL
+.ENDIF
+
+.IF "$(SYSTEM_MYSQL_CPPCONN)" == "YES"
+CFLAGS+=-DSYSTEM_MYSQL_CPPCONN
+.ENDIF
+
+CDEFS+=-DCPPDBC_EXPORTS -DCPPCONN_LIB_BUILD
+.IF "$(SYSTEM_MYSQL_CPPCONN)" != "YES"
+CDEFS += -DCPPCONN_LIB=\"$(DLLPRE)mysqlcppconn$(DLLPOST)\"
+.ELSE
+CDEFS += -DCPPCONN_LIB=\"$(shell readlink /usr/lib/libmysqlcppconn.so)\"
+.ENDIF
+
+# --------------- MySQL settings ------------------
+.IF "$(GUI)"=="WNT"
+ MYSQL_INC=-I$(SOLARINCDIR)$/mysqlcppconn -I$(SOLARINCDIR)$/mysqlcppconn/cppconn -I$(MYSQL_INCDIR)
+ MYSQL_LIB=$(MYSQL_LIBDIR)$/libmysql.lib
+ MYSQL_LIBFILE=$(MYSQL_LIBDIR)$/libmysql.dll
+ MYSQL_CPPCONNFILE=$(SOLARBINDIR)$/$(DLLPRE)mysqlcppconn$(DLLPOST)
+.ELSE
+ .IF "$(SYSTEM_MYSQL)" != "YES"
+ MYSQL_INC+=-I$(MYSQL_INCDIR)
+ .IF "$(OS)"=="MACOSX"
+ MYSQL_LIBFILE=$(MYSQL_LIBDIR)$/$(DLLPRE)mysql.16$(DLLPOST)
+ .ELSE
+ MYSQL_LIBFILE=$(MYSQL_LIBDIR)$/$(DLLPRE)mysql$(DLLPOST).16
+ .ENDIF
+
+ # checkdll will complain if we do not point it to the libmysql lib
+ EXTRALIBPATHS=-L$(MYSQL_LIBDIR)
+ .ENDIF
+
+ .IF "$(SYSTEM_MYSQL_CPPCONN)" != "YES"
+ .IF "$(OS)"=="MACOSX" || "$(OS)" == "SOLARIS"
+ MYSQL_LIB+=-lz -lm
+ .ELSE
+ MYSQL_LIB+=-rdynamic -lz -lcrypt -lnsl -lm
+ .ENDIF
+ MYSQL_CPPCONNFILE=$(SOLARLIBDIR)$/$(DLLPRE)mysqlcppconn$(DLLPOST)
+ .ELSE
+ MYSQL_CPPCONN_LIB+=-lmysqlcppconn
+ .ENDIF
+.ENDIF
+
+.IF "$(SYSTEM_MYSQL_CPPCONN)" != "YES"
+ MYSQL_INC+=-I$(SOLARINCDIR)$/mysqlcppconn -I$(SOLARINCDIR)$/mysqlcppconn/cppconn
+.ENDIF
+
+CFLAGS+=-I..$/..$/inc $(MYSQL_INC) \
+ -DMYSQLC_VERSION_MAJOR=$(MYSQLC_VERSION_MAJOR) \
+ -DMYSQLC_VERSION_MINOR=$(MYSQLC_VERSION_MINOR) \
+ -DMYSQLC_VERSION_MICRO=$(MYSQLC_VERSION_MICRO) \
+ $(MYSQL_DEFINES)
+
+# provide the name of the MySQL client lib to the C++ code
+.IF "$(SYSTEM_MYSQL)" != "YES"
+CDEFS += -DMYSQL_LIB=\"$(MYSQL_LIBFILE:f)\"
+.ENDIF
+
+#--------------------------------------------------
+
+SHL1DLLPRE=
+SHL1TARGET=$(TARGET).uno
+LIB1TARGET=$(SLB)$/$(SHL1TARGET).lib
+LIB1OBJFILES= \
+ $(SLO)$/mysqlc_driver.obj \
+ $(SLO)$/mysqlc_services.obj \
+ $(SLO)$/mysqlc_connection.obj \
+ $(SLO)$/mysqlc_resultset.obj \
+ $(SLO)$/mysqlc_resultsetmetadata.obj \
+ $(SLO)$/mysqlc_statement.obj \
+ $(SLO)$/mysqlc_preparedstatement.obj \
+ $(SLO)$/mysqlc_databasemetadata.obj \
+ $(SLO)$/mysqlc_types.obj \
+ $(SLO)$/mysqlc_general.obj \
+ $(SLO)$/mysqlc_propertyids.obj
+
+SHL1STDLIBS= \
+ $(MYSQL_LIB) \
+ $(MYSQL_CPPCONN_LIB) \
+ $(CPPULIB) \
+ $(SALLIB) \
+ $(SALHELPERLIB) \
+ $(CPPUHELPERLIB)
+
+SHL1VERSIONMAP=$(TARGET).map
+SHL1LIBS= $(LIB1TARGET)
+SHL1DEF= $(MISC)$/$(SHL1TARGET).def
+SHL1RPATH=OXT
+DEF1NAME= $(SHL1TARGET)
+
+# create Extension -----------------------------
+
+# DESCRIPTION_SRC is the source file which is copied into the extension
+# It is defaulted to "description.xml", but we want to pre-process it, so we use an intermediate
+# file
+DESCRIPTION_SRC = $(MISC)$/description.xml
+
+COMPONENT_XCU=\
+ registry$/data$/org$/openoffice$/Office$/DataAccess$/Drivers.xcu
+
+COMPONENT_MERGED_XCU= \
+ $(foreach,i,$(COMPONENT_XCU) $(EXTENSIONDIR)$/$i)
+
+COMPONENT_LIBRARY = \
+ $(EXTENSIONDIR)$/$(SHL1TARGET)$(DLLPOST)
+
+COMPONENT_MYSQL_LIBFILE = \
+ $(EXTENSIONDIR)$/$(MYSQL_LIBFILE:f)
+
+COMPONENT_MYSQL_CPPCONN_FILE=\
+ $(EXTENSIONDIR)$/$(MYSQL_CPPCONNFILE:f)
+
+COMPONENT_LIBRARIES=\
+ $(COMPONENT_LIBRARY)
+
+COMPONENT_IMAGES= \
+ $(EXTENSIONDIR)$/images$/sun_extension.png \
+ $(EXTENSIONDIR)$/images$/sun_extension_hc.png
+
+
+# ........ component description ........
+# one file for each WITH_LANG token
+DESC_LANGS=$(WITH_LANG)
+.IF "$(DESC_LANGS)" == ""
+ DESC_LANGS=en-US
+.ENDIF
+COMPONENT_DESCRIPTIONS=$/$(foreach,lang,$(DESC_LANGS) description$/description_$(lang).txt)
+COMPONENT_DESCRIPTIONS_PACKDEP= \
+ $(foreach,i,$(COMPONENT_DESCRIPTIONS) $(EXTENSIONDIR)$/$i)
+
+# WITH_LANG might contain languages which we actually do not have a description for (yet)
+# Find those, and treat the specially
+
+# first, find those locales which we actually have a description file for
+EXISTING_DESCRIPTIONS=$(foreach,i,$(shell $(FIND) .$/description -name "description_*.txt") $(i:f))
+EXISTING_LANGS=$(foreach,i,$(EXISTING_DESCRIPTIONS) $(i:s,description_,,:s,.txt,,))
+
+# then, create a version of WITH_LANG where we stripped all those locales
+EXISTING_LANGS_NORMALIZED=$(strip $(EXISTING_LANGS))
+EXISTING_LANGS_NORMALIZED:=+$(EXISTING_LANGS_NORMALIZED:s/ /+/)+
+MISSING_LANGS=$(foreach,lang,$(WITH_LANG) $(eq,$(EXISTING_LANGS_NORMALIZED:s/+$(lang)+//),$(EXISTING_LANGS_NORMALIZED) $(lang) ))
+
+# ........ dependencies for packaging the extension ........
+EXTENSION_PACKDEPS=makefile.mk $(COMPONENT_IMAGES) $(COMPONENT_DESCRIPTIONS_PACKDEP) $(COMPONENT_MERGED_XCU)
+
+.IF "$(SYSTEM_MYSQL)" != "YES"
+EXTENSION_PACKDEPS+=$(COMPONENT_MYSQL_LIBFILE)
+.ENDIF
+
+.IF "$(SYSTEM_MYSQL_CPPCONN)" != "YES"
+EXTENSION_PACKDEPS+=$(COMPONENT_MYSQL_CPPCONN_FILE)
+.ENDIF
+
+# --- Targets ------------------------------------------------------
+.INCLUDE : extension_pre.mk
+.INCLUDE : target.mk
+.INCLUDE : extension_post.mk
+
+$(EXTENSIONDIR)$/images$/%.png : $(PRJ)$/images$/%.png
+ @@-$(MKDIRHIER) $(@:d)
+ @$(COPY) $< $@ > $(NULLDEV)
+
+# existing descriptions: just copy
+$(EXTENSIONDIR)$/description$/%.txt: .$/description$/%.txt
+ @@-$(MKDIRHIER) $(@:d)
+ @$(COPY) $< $@ > $(NULLDEV)
+
+# xcu files: copy
+# the following is a hack for now - need to find out the generic mechanism later
+
+$(EXTENSIONDIR)$/registry$/data$/org$/openoffice$/Office$/DataAccess$/Drivers.xcu : .$/registry$/data$/org$/openoffice$/Office$/DataAccess$/Drivers.xcu
+ @@-$(MKDIRHIER) $(EXTENSIONDIR)$/registry$/data$/org$/openoffice$/Office$/DataAccess
+ @$(COPY) $< $(EXTENSIONDIR)$/registry$/data$/org$/openoffice$/Office$/DataAccess$/Drivers.xcu > $(NULLDEV)
+
+# The below doesn't work - it's completely beyond me .... $@ is some strange path when echoed, so the whole construct
+# doesn't work .... :(
+
+#$(foreach,i,$(COMPONENT_XCU) $(EXTENSIONDIR)$/$i : $i)
+# @echo -----------------
+# @echo $@
+# @echo $<
+# @echo -----------------
+# -$(MKDIRHIER) $(@:d)
+# (COPY) $< $@
+# @echo -----------------
+
+# non-existing descriptions: copy from the English version
+.IF "$(strip $(MISSING_LANGS))" != ""
+$(foreach,i,$(MISSING_LANGS) $(EXTENSIONDIR)$/description$/description_$i.txt): .$/description$/description_en-US.txt
+ @echo ------ WARNING: .$/description$/$(@:f) not found, falling back to English description
+ @@-$(MKDIRHIER) $(@:d)
+ @$(COPY) $< $@ > $(NULLDEV)
+.ENDIF
+
+$(DESCRIPTION_SRC): description.xml
+ +-$(RM) $@
+ $(TYPE) description.xml | $(SED) "s/#VERSION#/$(EXTENSION_VERSION)/" | $(SED) "s,#TITLE#,$(EXTENSION_TITLE)," > $@
+
+.IF "$(SYSTEM_MYSQL)" != "YES"
+# --- the MySQL client lib needs to be copied
+$(COMPONENT_MYSQL_LIBFILE): $(MYSQL_LIBFILE)
+ @@-$(MKDIRHIER) $(@:d)
+ @$(COPY) $< $@ > $(NULLDEV)
+ .IF "$(OS)" == "MACOSX"
+ install_name_tool -id @__________________________________________________OOO/$(MYSQL_LIBFILE:f) $@
+ .ENDIF
+.ENDIF
+
+.IF "$(SYSTEM_MYSQL_CPPCONN)" != "YES"
+# --- the MySQL cppconn lib needs to be copied
+$(COMPONENT_MYSQL_CPPCONN_FILE): $(MYSQL_CPPCONNFILE)
+ @@-$(MKDIRHIER) $(@:d)
+ @$(COPY) $< $@ > $(NULLDEV)
+ .IF "$(OS)" == "MACOSX"
+ install_name_tool -change $(MYSQL_LIBFILE:f) @loader_path/$(MYSQL_LIBFILE:f) $@
+ .ENDIF
+.ENDIF
+
+.IF "$(OS)" == "MACOSX"
+$(EXTENSION_TARGET): adjust_libmysql_path
+
+adjust_libmysql_path: $(EXTENSIONDIR)$/$(SHL1TARGET)$(DLLPOST)
+ install_name_tool -change $(MYSQL_LIBFILE:f) @loader_path/$(MYSQL_LIBFILE:f) $(EXTENSIONDIR)$/$(SHL1TARGET)$(DLLPOST)
+.ENDIF
diff --git a/mysqlc/source/manifest.xml b/mysqlc/source/manifest.xml
new file mode 100644
index 000000000000..107f6a878638
--- /dev/null
+++ b/mysqlc/source/manifest.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE manifest:manifest PUBLIC "-//OpenOffice.org//DTD Manifest 1.0//EN" "Manifest.dtd">
+<manifest:manifest xmlns:manifest="http://openoffice.org/2001/manifest">
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.uno-component;type=native"
+ manifest:full-path="mysqlc.unoSHARED_EXTENSION"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
+ manifest:full-path="registry/data/org/openoffice/Office/DataAccess/Drivers.xcu"/>
+</manifest:manifest>
diff --git a/mysqlc/source/mysqlc.map b/mysqlc/source/mysqlc.map
new file mode 100644
index 000000000000..f4ed78b9e970
--- /dev/null
+++ b/mysqlc/source/mysqlc.map
@@ -0,0 +1,8 @@
+UDK_3_0_0 {
+ global:
+ component_getImplementationEnvironment;
+ component_writeInfo;
+ component_getFactory;
+ local:
+ *;
+};
diff --git a/mysqlc/source/mysqlc.xml b/mysqlc/source/mysqlc.xml
new file mode 100644
index 000000000000..d11c6d041ff6
--- /dev/null
+++ b/mysqlc/source/mysqlc.xml
@@ -0,0 +1,81 @@
+<?xml version='1.0' encoding="UTF-8"?>
+<!DOCTYPE COMPONENTDESCRIPTION PUBLIC "-//W3C//DTD HTML 3.2//EN" "module-description.dtd">
+<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
+ <module-name>mysqlc</module-name>
+ <component-description>
+ <Author>Georg Richter</Author>
+ <Name>com.sun.star.comp.sdbc.mysqlc</Name>
+ <Description>
+ This is the implementation of the MySQL Connector/OO.org.
+ </Description>
+ <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
+ <language>c++</language>
+ <status value="final"/>
+ <supported-service> com.sun.star.sdbc.Driver </supported-service>
+ <service-dependency> ... </service-dependency>
+ </component-description>
+ <project-build-dependency> cppuhelper </project-build-dependency>
+ <project-build-dependency> cppu </project-build-dependency>
+ <project-build-dependency> sal </project-build-dependency>
+ <project-build-dependency> vos </project-build-dependency>
+
+ <runtime-module-dependency> cppuhelper </runtime-module-dependency>
+ <runtime-module-dependency> cppu1 </runtime-module-dependency>
+ <runtime-module-dependency> sal1 </runtime-module-dependency>
+ <runtime-module-dependency> vos </runtime-module-dependency>
+
+ <type> com.sun.star.registry.XRegistryKey </type>
+ <type> com.sun.star.util.XCancellable </type>
+ <type> com.sun.star.util.XNumberFormatter </type>
+ <type> com.sun.star.uno.TypeClass </type>
+ <type> com.sun.star.uno.XWeak </type>
+ <type> com.sun.star.uno.XAggregation </type>
+ <type> com.sun.star.uno.XComponentContext </type>
+ <type> com.sun.star.beans.PropertyAttribute </type>
+ <type> com.sun.star.beans.XPropertyState </type>
+ <type> com.sun.star.beans.XPropertySet </type>
+ <type> com.sun.star.beans.PropertyValue </type>
+ <type> com.sun.star.beans.XMultiPropertySet </type>
+ <type> com.sun.star.beans.XFastPropertySet </type>
+ <type> com.sun.star.lang.XSingleServiceFactory </type>
+ <type> com.sun.star.lang.XTypeProvider </type>
+ <type> com.sun.star.lang.XSingleComponentFactory </type>
+ <type> com.sun.star.lang.EventObject </type>
+ <type> com.sun.star.lang.XComponent </type>
+ <type> com.sun.star.lang.IllegalArgumentException </type>
+ <type> com.sun.star.lang.DisposedException </type>
+ <type> com.sun.star.lang.XMultiServiceFactory </type>
+ <type> com.sun.star.lang.XServiceInfo </type>
+ <type> com.sun.star.lang.XUnoTunnel </type>
+ <type> com.sun.star.java.XJavaThreadRegister_11 </type>
+ <type> com.sun.star.java.XJavaVM </type>
+ <type> com.sun.star.sdbc.FetchDirection </type>
+ <type> com.sun.star.sdbc.XConnection </type>
+ <type> com.sun.star.sdbc.XStatement </type>
+ <type> com.sun.star.sdbc.XResultSet </type>
+ <type> com.sun.star.sdbc.XResultSetMetaDataSupplier</type>
+ <type> com.sun.star.sdbc.XColumnLocate </type>
+ <type> com.sun.star.sdbc.XResultSetUpdate </type>
+ <type> com.sun.star.sdbc.XWarningsSupplier </type>
+ <type> com.sun.star.sdbc.XRowUpdate </type>
+ <type> com.sun.star.sdbc.XMultipleResults </type>
+ <type> com.sun.star.sdbc.XBatchExecution </type>
+ <type> com.sun.star.sdbc.XPreparedBatchExecution </type>
+ <type> com.sun.star.sdbc.XParameters </type>
+ <type> com.sun.star.sdbc.XOutParameters </type>
+ <type> com.sun.star.sdbc.DriverPropertyInfo </type>
+ <type> com.sun.star.sdbc.SQLWarning </type>
+ <type> com.sun.star.sdbc.XRow </type>
+ <type> com.sun.star.sdbc.ColumnSearch </type>
+ <type> com.sun.star.sdbc.ColumnValue </type>
+ <type> com.sun.star.sdbc.DataType </type>
+ <type> com.sun.star.sdbc.XDriver </type>
+ <type> com.sun.star.sdbc.TransactionIsolation </type>
+ <type> com.sun.star.sdbc.ResultSetType </type>
+ <type> com.sun.star.sdbc.ResultSetConcurrency </type>
+ <type> com.sun.star.sdbcx.XRowLocate </type>
+ <type> com.sun.star.sdbcx.XDeleteRows </type>
+ <type> com.sun.star.sdbcx.CompareBookmark </type>
+ <type> com.sun.star.sdb.XColumnUpdate </type>
+ <type> com.sun.star.sdb.XColumn </type>
+</module-description>
diff --git a/mysqlc/source/mysqlc_connection.cxx b/mysqlc/source/mysqlc_connection.cxx
new file mode 100644
index 000000000000..c839e235f369
--- /dev/null
+++ b/mysqlc/source/mysqlc_connection.cxx
@@ -0,0 +1,791 @@
+/*************************************************************************
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2008 by Sun Microsystems, Inc.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* $RCSfile: mysqlc_connection.cxx,v $
+*
+* $Revision: 1.1.2.6 $*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org. If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+************************************************************************/
+
+#include <cppconn/driver.h>
+#include <cppconn/connection.h>
+#include <cppconn/statement.h>
+#include <cppconn/metadata.h>
+#include <cppconn/exception.h>
+
+#include "mysqlc_connection.hxx"
+#include "mysqlc_databasemetadata.hxx"
+
+
+#include "mysqlc_driver.hxx"
+#include "mysqlc_statement.hxx"
+#include "mysqlc_preparedstatement.hxx"
+#include "mysqlc_general.hxx"
+
+#include <com/sun/star/sdbc/ColumnValue.hpp>
+#include <com/sun/star/sdbc/XRow.hpp>
+#include <com/sun/star/sdbc/TransactionIsolation.hpp>
+#include <com/sun/star/lang/DisposedException.hpp>
+#include <com/sun/star/beans/NamedValue.hpp>
+
+#include <osl/module.hxx>
+#include <osl/thread.h>
+#include <osl/file.h>
+#include <rtl/uri.hxx>
+#include <rtl/ustrbuf.hxx>
+
+using namespace connectivity::mysqlc;
+
+#include <stdio.h>
+
+//------------------------------------------------------------------------------
+using namespace com::sun::star::uno;
+using namespace com::sun::star::container;
+using namespace com::sun::star::lang;
+using namespace com::sun::star::beans;
+using namespace com::sun::star::sdbc;
+using ::osl::MutexGuard;
+using ::rtl::OUString;
+
+
+#define MYSQLC_URI_PREFIX "sdbc:mysqlc:"
+
+
+/* {{{ OConnection::OConnection() -I- */
+OConnection::OConnection(MysqlCDriver& _rDriver, sql::Driver * _cppDriver)
+ :OMetaConnection_BASE(m_aMutex)
+ ,OSubComponent<OConnection, OConnection_BASE>((::cppu::OWeakObject*)&_rDriver, this)
+ ,m_xMetaData(NULL)
+ ,m_rDriver(_rDriver)
+ ,cppDriver(_cppDriver)
+ ,m_bClosed(sal_False)
+ ,m_bUseCatalog(sal_False)
+ ,m_bUseOldDateFormat(sal_False)
+{
+ OSL_TRACE("OConnection::OConnection");
+ m_rDriver.acquire();
+}
+/* }}} */
+
+
+/* {{{ OConnection::OConnection() -I- */
+OConnection::~OConnection()
+{
+ OSL_TRACE("OConnection::~OConnection");
+ if (!isClosed()) {
+ close();
+ }
+ m_rDriver.release();
+}
+/* }}} */
+
+
+/* {{{ OConnection::release() -I- */
+void SAL_CALL OConnection::release()
+ throw()
+{
+ OSL_TRACE("OConnection::release");
+ relase_ChildImpl();
+}
+/* }}} */
+
+#ifndef SYSTEM_MYSQL
+ extern "C" { void SAL_CALL thisModule() {} }
+#endif
+
+/* {{{ OConnection::construct() -I- */
+void OConnection::construct(const OUString& url, const Sequence< PropertyValue >& info)
+ throw(SQLException)
+{
+ OSL_TRACE("OConnection::construct");
+ MutexGuard aGuard(m_aMutex);
+
+ sal_Int32 nIndex;
+ sal_Bool bEmbedded = sal_False;
+ OUString token;
+ OUString aHostName(RTL_CONSTASCII_USTRINGPARAM("localhost"));
+ sal_Int32 nPort = 3306;
+ OUString aDbName;
+
+ m_settings.encoding = m_rDriver.getDefaultEncoding();
+ m_settings.quoteIdentifier = OUString();
+
+ // parse url. Url has the following format:
+ // external server: sdbc:mysqlc:[hostname]:[port]/[dbname]
+
+ if (!url.compareTo(OUString::createFromAscii(MYSQLC_URI_PREFIX), sizeof(MYSQLC_URI_PREFIX)-1)) {
+ nIndex = 12;
+ } else {
+ bEmbedded = sal_True;
+ nIndex = 20;
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("OConnection::construct (embedded MySQL)", *this);
+ }
+
+ token = url.getToken(0, '/', nIndex);
+ if (token.getLength()) {
+ sal_Int32 nIndex1 = 0;
+ OUString hostandport = token.getToken(0,':', nIndex1);
+ if (hostandport.getLength()) {
+ aHostName = hostandport;
+ hostandport = token.getToken(0, ':', nIndex1);
+ if (hostandport.getLength() && nIndex1) {
+ nPort = hostandport.toInt32();
+ }
+ token = url.getToken(0, '/', nIndex);
+ if (token.getLength() && nIndex) {
+ aDbName = token;
+ }
+ }
+ }
+
+ // get user and password for mysql connection
+ const PropertyValue *pIter = info.getConstArray();
+ const PropertyValue *pEnd = pIter + info.getLength();
+ OUString aUser, aPass, sUnixSocket, sNamedPipe;
+ bool unixSocketPassed = false;
+ bool namedPipePassed = false;
+
+ m_settings.connectionURL = url;
+ for (;pIter != pEnd;++pIter) {
+ if (!pIter->Name.compareToAscii("user")) {
+ OSL_VERIFY( pIter->Value >>= aUser );
+ } else if (!pIter->Name.compareToAscii("password")) {
+ OSL_VERIFY( pIter->Value >>= aPass );
+ } else if (!pIter->Name.compareToAscii("LocalSocket")) {
+ OSL_VERIFY( pIter->Value >>= sUnixSocket );
+ unixSocketPassed = true;
+ } else if (!pIter->Name.compareToAscii("NamedPipe")) {
+ OSL_VERIFY( pIter->Value >>= sNamedPipe );
+ namedPipePassed = true;
+ } else if ( !pIter->Name.compareToAscii("PublicConnectionURL")) {
+ OSL_VERIFY( pIter->Value >>= m_settings.connectionURL );
+ } else if ( !pIter->Name.compareToAscii("NewURL")) { // legacy name for "PublicConnectionURL"
+ OSL_VERIFY( pIter->Value >>= m_settings.connectionURL );
+ }
+ }
+
+ if (bEmbedded == sal_False) {
+ try {
+ sql::ConnectOptionsMap connProps;
+ std::string host_str = OUStringToOString(aHostName, m_settings.encoding).getStr();
+ std::string user_str = OUStringToOString(aUser, m_settings.encoding).getStr();
+ std::string pass_str = OUStringToOString(aPass, m_settings.encoding).getStr();
+ std::string schema_str = OUStringToOString(aDbName, m_settings.encoding).getStr();
+ connProps["hostName"] = sql::ConnectPropertyVal(host_str);
+ connProps["userName"] = sql::ConnectPropertyVal(user_str);
+ connProps["password"] = sql::ConnectPropertyVal(pass_str);
+ connProps["schema"] = sql::ConnectPropertyVal(schema_str);
+ connProps["port"] = sql::ConnectPropertyVal((int)(nPort));
+ if (unixSocketPassed) {
+ sql::SQLString socket_str = OUStringToOString(sUnixSocket, m_settings.encoding).getStr();
+ connProps["socket"] = socket_str;
+ } else if (namedPipePassed) {
+ sql::SQLString pipe_str = OUStringToOString(sNamedPipe, m_settings.encoding).getStr();
+ connProps["socket"] = pipe_str;
+ }
+
+#ifndef SYSTEM_MYSQL
+ ::rtl::OUString sMySQLClientLib( RTL_CONSTASCII_USTRINGPARAM( MYSQL_LIB ) );
+
+ ::rtl::OUString moduleBase;
+ OSL_VERIFY( ::osl::Module::getUrlFromAddress( &thisModule, moduleBase ) );
+ ::rtl::OUString sMySQLClientLibURL;
+ try
+ {
+ sMySQLClientLibURL = ::rtl::Uri::convertRelToAbs( moduleBase, sMySQLClientLib.pData );
+ }
+ catch ( const ::rtl::MalformedUriException& e )
+ {
+ (void)e; // silence compiler
+ #if OSL_DEBUG_LEVEL > 0
+ ::rtl::OString sMessage( "OConnection::construct: malformed URI: " );
+ sMessage += ::rtl::OUStringToOString( e.getMessage(), osl_getThreadTextEncoding() );
+ OSL_ENSURE( false, sMessage.getStr() );
+ #endif
+ }
+
+ ::rtl::OUString sMySQLClientLibPath;
+ osl_getSystemPathFromFileURL( sMySQLClientLibURL.pData, &sMySQLClientLibPath.pData );
+
+ sql::SQLString mysqlLib = ::rtl::OUStringToOString( sMySQLClientLibPath, osl_getThreadTextEncoding() ).getStr();
+ connProps["clientlib"] = mysqlLib;
+
+ OSL_TRACE("clientlib=%s", mysqlLib.c_str());
+#endif
+
+ OSL_TRACE("hostName=%s", host_str.c_str());
+ OSL_TRACE("port=%i", int(nPort));
+ OSL_TRACE("userName=%s", user_str.c_str());
+ OSL_TRACE("password=%s", pass_str.c_str());
+ OSL_TRACE("schema=%s", schema_str.c_str());
+
+ m_settings.cppConnection.reset(cppDriver->connect(connProps));
+ } catch (sql::SQLException &e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, getConnectionEncoding());
+ }
+ } else {
+ // TODO: support for embedded server
+ }
+
+ m_settings.schema = aDbName;
+ OSL_TRACE(OUStringToOString(m_settings.schema, getConnectionEncoding()).getStr());
+
+ // Check if the server is 4.1 or above
+ if (this->getMysqlVersion() < 40100) {
+ throw SQLException(
+ ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MySQL Connector/OO.org requires MySQL Server 4.1 or above" ) ),
+ *this,
+ ::rtl::OUString(),
+ 0,
+ Any());
+ }
+ std::auto_ptr<sql::Statement> stmt(m_settings.cppConnection->createStatement());
+ stmt->executeUpdate("SET session sql_mode='ANSI_QUOTES'");
+ stmt->executeUpdate("SET NAMES utf8");
+}
+/* }}} */
+
+
+// XServiceInfo
+IMPLEMENT_SERVICE_INFO(OConnection, "com.sun.star.sdbc.drivers.mysqlc.OConnection", "com.sun.star.sdbc.Connection")
+
+
+/* {{{ OConnection::createStatement() -I- */
+Reference< XStatement > SAL_CALL OConnection::createStatement()
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OConnection::createStatement");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OConnection_BASE::rBHelper.bDisposed);
+
+ // create a statement
+ Reference< XStatement > xReturn;
+ // the statement can only be executed once
+ try {
+ xReturn = new OStatement(this, m_settings.cppConnection->createStatement());
+ m_aStatements.push_back(WeakReferenceHelper(xReturn));
+ return xReturn;
+ } catch (sql::SQLException & e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, getConnectionEncoding());
+ }
+ return xReturn;
+}
+/* }}} */
+
+
+/* {{{ OConnection::createStatement() -I- */
+Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement(const OUString& _sSql)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OConnection::prepareStatement");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OConnection_BASE::rBHelper.bDisposed);
+ const ::rtl::OUString sSqlStatement = transFormPreparedStatement( _sSql );
+
+ Reference< XPreparedStatement > xStatement;
+ try {
+ // create a statement
+ // the statement can only be executed more than once
+ xStatement = new OPreparedStatement(this,
+ m_settings.cppConnection->prepareStatement(OUStringToOString(sSqlStatement, getConnectionEncoding()).getStr()));
+ m_aStatements.push_back( WeakReferenceHelper( xStatement ) );
+ } catch (sql::SQLException & e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, getConnectionEncoding());
+ }
+ return xStatement;
+}
+/* }}} */
+
+
+/* {{{ OConnection::prepareCall() -U- */
+Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall(const OUString& /*_sSql*/ )
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OConnection::prepareCall");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OConnection_BASE::rBHelper.bDisposed);
+
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("OConnection::prepareCall", *this);
+ return Reference< XPreparedStatement >();
+}
+/* }}} */
+
+
+/* {{{ OConnection::nativeSQL() -I- */
+OUString SAL_CALL OConnection::nativeSQL(const OUString& _sSql)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OConnection::nativeSQL");
+ MutexGuard aGuard(m_aMutex);
+
+ const ::rtl::OUString sSqlStatement = transFormPreparedStatement( _sSql );
+ ::rtl::OUString sNativeSQL;
+ try {
+ sNativeSQL = mysqlc_sdbc_driver::convert(m_settings.cppConnection->nativeSQL(mysqlc_sdbc_driver::convert(sSqlStatement, getConnectionEncoding())),
+ getConnectionEncoding());
+ } catch (sql::SQLException & e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, getConnectionEncoding());
+ }
+ return sNativeSQL;
+}
+/* }}} */
+
+
+/* {{{ OConnection::setAutoCommit() -I- */
+void SAL_CALL OConnection::setAutoCommit(sal_Bool autoCommit)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OConnection::setAutoCommit");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OConnection_BASE::rBHelper.bDisposed);
+ try {
+ m_settings.cppConnection->setAutoCommit(autoCommit == sal_True? true:false);
+ } catch (sql::SQLException & e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, getConnectionEncoding());
+ }
+}
+/* }}} */
+
+
+/* {{{ OConnection::getAutoCommit() -I- */
+sal_Bool SAL_CALL OConnection::getAutoCommit()
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OConnection::getAutoCommit");
+ // you have to distinguish which if you are in autocommit mode or not
+ // at normal case true should be fine here
+
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OConnection_BASE::rBHelper.bDisposed);
+
+ sal_Bool autoCommit = sal_False;
+ try {
+ autoCommit = m_settings.cppConnection->getAutoCommit() == true ? sal_True : sal_False;
+ } catch (sql::SQLException & e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, getConnectionEncoding());
+ }
+ return autoCommit;
+}
+/* }}} */
+
+
+/* {{{ OConnection::commit() -I- */
+void SAL_CALL OConnection::commit()
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OConnection::commit");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OConnection_BASE::rBHelper.bDisposed);
+ try {
+ m_settings.cppConnection->commit();
+ } catch (sql::SQLException & e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, getConnectionEncoding());
+ }
+}
+/* }}} */
+
+
+/* {{{ OConnection::rollback() -I- */
+void SAL_CALL OConnection::rollback()
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OConnection::rollback");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OConnection_BASE::rBHelper.bDisposed);
+ try {
+ m_settings.cppConnection->rollback();
+ } catch (sql::SQLException & e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, getConnectionEncoding());
+ }
+}
+/* }}} */
+
+
+/* {{{ OConnection::isClosed() -I- */
+sal_Bool SAL_CALL OConnection::isClosed()
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OConnection::isClosed");
+ MutexGuard aGuard(m_aMutex);
+
+ // just simple -> we are close when we are disposed taht means someone called dispose(); (XComponent)
+ return (OConnection_BASE::rBHelper.bDisposed);
+}
+/* }}} */
+
+
+/* {{{ OConnection::createStatement() -I- */
+Reference< XDatabaseMetaData > SAL_CALL OConnection::getMetaData()
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OConnection::getMetaData");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OConnection_BASE::rBHelper.bDisposed);
+
+ Reference< XDatabaseMetaData > xMetaData = m_xMetaData;
+ if (!xMetaData.is()) {
+ try {
+ xMetaData = new ODatabaseMetaData(*this); // need the connection because it can return it
+ } catch (sql::SQLException & e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, getConnectionEncoding());
+ }
+ m_xMetaData = xMetaData;
+ }
+
+ return xMetaData;
+}
+/* }}} */
+
+
+/* {{{ OConnection::createStatement() -I- */
+void SAL_CALL OConnection::setReadOnly(sal_Bool readOnly)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OConnection::setReadOnly");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OConnection_BASE::rBHelper.bDisposed);
+
+ m_settings.readOnly = readOnly;
+}
+/* }}} */
+
+
+/* {{{ OConnection::createStatement() -I- */
+sal_Bool SAL_CALL OConnection::isReadOnly()
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OConnection::isReadOnly");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OConnection_BASE::rBHelper.bDisposed);
+
+ // return if your connection to readonly
+ return (m_settings.readOnly);
+}
+/* }}} */
+
+
+/* {{{ OConnection::createStatement() -I- */
+void SAL_CALL OConnection::setCatalog(const OUString& catalog)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OConnection::setCatalog");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OConnection_BASE::rBHelper.bDisposed);
+
+ try {
+// m_settings.cppConnection->setCatalog(OUStringToOString(catalog, m_settings.encoding).getStr());
+ m_settings.cppConnection->setSchema(OUStringToOString(catalog, getConnectionEncoding()).getStr());
+ } catch (sql::SQLException & e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, getConnectionEncoding());
+ }
+}
+/* }}} */
+
+
+/* {{{ OConnection::createStatement() -I- */
+OUString SAL_CALL OConnection::getCatalog()
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OConnection::getCatalog");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OConnection_BASE::rBHelper.bDisposed);
+
+ OUString catalog;
+ try {
+ catalog = mysqlc_sdbc_driver::convert(m_settings.cppConnection->getSchema(), getConnectionEncoding());
+ } catch (sql::SQLException & e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, getConnectionEncoding());
+ }
+ return catalog;
+}
+/* }}} */
+
+
+/* {{{ OConnection::createStatement() -I- */
+void SAL_CALL OConnection::setTransactionIsolation(sal_Int32 level)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OConnection::setTransactionIsolation");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OConnection_BASE::rBHelper.bDisposed);
+
+ sql::enum_transaction_isolation cpplevel = sql::TRANSACTION_SERIALIZABLE;
+
+ switch (level) {
+ case TransactionIsolation::READ_UNCOMMITTED:
+ cpplevel = sql::TRANSACTION_READ_UNCOMMITTED;
+ break;
+ case TransactionIsolation::READ_COMMITTED:
+ cpplevel = sql::TRANSACTION_READ_COMMITTED;
+ break;
+ case TransactionIsolation::REPEATABLE_READ:
+ cpplevel = sql::TRANSACTION_REPEATABLE_READ;
+ break;
+ case TransactionIsolation::SERIALIZABLE:
+ cpplevel = sql::TRANSACTION_SERIALIZABLE;
+ break;
+ case TransactionIsolation::NONE:
+ cpplevel = sql::TRANSACTION_SERIALIZABLE;
+ break;
+ default:;
+ /* XXX: Exception ?? */
+ }
+ try {
+ m_settings.cppConnection->setTransactionIsolation(cpplevel);
+ } catch (sql::SQLException & e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, getConnectionEncoding());
+ }
+}
+/* }}} */
+
+
+/* {{{ OConnection::createStatement() -I- */
+sal_Int32 SAL_CALL OConnection::getTransactionIsolation()
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OConnection::getTransactionIsolation");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OConnection_BASE::rBHelper.bDisposed);
+
+ try {
+ switch (m_settings.cppConnection->getTransactionIsolation()) {
+ case sql::TRANSACTION_SERIALIZABLE: return TransactionIsolation::SERIALIZABLE;
+ case sql::TRANSACTION_REPEATABLE_READ: return TransactionIsolation::REPEATABLE_READ;
+ case sql::TRANSACTION_READ_COMMITTED: return TransactionIsolation::READ_COMMITTED;
+ case sql::TRANSACTION_READ_UNCOMMITTED: return TransactionIsolation::READ_UNCOMMITTED;
+ default:
+ ;
+ }
+ } catch (sql::SQLException & e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, getConnectionEncoding());
+ }
+ return TransactionIsolation::NONE;
+}
+/* }}} */
+
+
+/* {{{ OConnection::getTypeMap() -I- */
+Reference<XNameAccess> SAL_CALL OConnection::getTypeMap()
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OConnection::getTypeMap");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OConnection_BASE::rBHelper.bDisposed);
+
+ Reference<XNameAccess > t;
+ {
+ t = m_typeMap;
+ }
+ return (t);
+}
+/* }}} */
+
+
+/* {{{ OConnection::setTypeMap() -I- */
+void SAL_CALL OConnection::setTypeMap(const Reference<XNameAccess >& typeMap)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OConnection::setTypeMap");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OConnection_BASE::rBHelper.bDisposed);
+
+ m_typeMap = typeMap;
+}
+/* }}} */
+
+
+// XCloseable
+/* {{{ OConnection::close() -I- */
+void SAL_CALL OConnection::close()
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OConnection::close");
+ /*
+ we need block, because the mutex is a local variable,
+ which will guard the block
+ */
+ {
+ // we just dispose us
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OConnection_BASE::rBHelper.bDisposed);
+ }
+ dispose();
+}
+/* }}} */
+
+
+// XWarningsSupplier
+/* {{{ OConnection::getWarnings() -I- */
+Any SAL_CALL OConnection::getWarnings()
+ throw(SQLException, RuntimeException)
+{
+ Any x = Any();
+ OSL_TRACE("OConnection::getWarnings");
+ // when you collected some warnings -> return it
+ return x;
+}
+/* }}} */
+
+
+/* {{{ OConnection::clearWarnings() -I- */
+void SAL_CALL OConnection::clearWarnings()
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OConnection::clearWarnings");
+ // you should clear your collected warnings here#
+}
+/* }}} */
+
+
+/* {{{ OConnection::buildTypeInfo() -I- */
+void OConnection::buildTypeInfo()
+ throw(SQLException)
+{
+ OSL_TRACE("OConnection::buildTypeInfo");
+}
+/* }}} */
+
+
+/* {{{ OConnection::disposing() -I- */
+void OConnection::disposing()
+{
+ OSL_TRACE("OConnection::disposing");
+ // we noticed that we should be destroied in near future so we have to dispose our statements
+ MutexGuard aGuard(m_aMutex);
+
+ for (OWeakRefArray::iterator i = m_aStatements.begin(); i != m_aStatements.end() ; ++i) {
+ Reference< XComponent > xComp(i->get(), UNO_QUERY);
+ if (xComp.is()) {
+ xComp->dispose();
+ }
+ }
+ m_aStatements.clear();
+
+ m_bClosed = sal_True;
+ m_xMetaData = WeakReference< XDatabaseMetaData >();
+
+ dispose_ChildImpl();
+ OConnection_BASE::disposing();
+}
+/* }}} */
+
+
+/* ToDo - upcast the connection to MySQL_Connection and use ::getSessionVariable() */
+
+/* {{{ OConnection::getMysqlVariable() -I- */
+OUString OConnection::getMysqlVariable(const char *varname)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OConnection::getMysqlVariable");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OConnection_BASE::rBHelper.bDisposed);
+
+ OUString ret;
+ ::rtl::OUStringBuffer aStatement;
+ aStatement.appendAscii( "SHOW SESSION VARIABLES LIKE '" );
+ aStatement.appendAscii( varname );
+ aStatement.append( sal_Unicode( '\'' ) );
+
+ try {
+ XStatement * stmt = new OStatement(this, m_settings.cppConnection->createStatement());
+ Reference< XResultSet > rs = stmt->executeQuery( aStatement.makeStringAndClear() );
+ if (rs.is() && rs->next()) {
+ Reference< XRow > xRow(rs, UNO_QUERY);
+ ret = xRow->getString(2);
+ }
+ } catch (sql::SQLException & e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, getConnectionEncoding());
+ }
+
+ return ret;
+}
+/* }}} */
+
+
+/* {{{ OConnection::getMysqlVersion() -I- */
+sal_Int32 OConnection::getMysqlVersion()
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OConnection::getMysqlVersion");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OConnection_BASE::rBHelper.bDisposed);
+
+ sal_Int32 version(0);
+ try {
+ version = 10000 * m_settings.cppConnection->getMetaData()->getDatabaseMajorVersion();
+ version += 100 * m_settings.cppConnection->getMetaData()->getDatabaseMinorVersion();
+ version += m_settings.cppConnection->getMetaData()->getDatabasePatchVersion();
+ } catch (sql::SQLException & e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, getConnectionEncoding());
+ }
+ return version;
+}
+/* }}} */
+
+
+/* {{{ OConnection::sdbcColumnType() -I- */
+// TODO: Not used
+//sal_Int32 OConnection::sdbcColumnType(OUString typeName)
+//{
+// OSL_TRACE("OConnection::sdbcColumnType");
+// int i = 0;
+// while (mysqlc_types[i].typeName) {
+// if (OUString::createFromAscii(mysqlc_types[i].typeName).equals(
+// typeName.toAsciiUpperCase()))
+// {
+// return mysqlc_types[i].dataType;
+// }
+// i++;
+// }
+// return 0;
+//}
+// -----------------------------------------------------------------------------
+::rtl::OUString OConnection::transFormPreparedStatement(const ::rtl::OUString& _sSQL)
+{
+ ::rtl::OUString sSqlStatement = _sSQL;
+ if ( !m_xParameterSubstitution.is() ) {
+ try {
+ Sequence< Any > aArgs(1);
+ Reference< XConnection> xCon = this;
+ aArgs[0] <<= NamedValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ActiveConnection")), makeAny(xCon));
+
+ m_xParameterSubstitution.set(m_rDriver.getFactory()->createInstanceWithArguments(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.ParameterSubstitution")),aArgs),UNO_QUERY);
+ } catch(const Exception&) {}
+ }
+ if ( m_xParameterSubstitution.is() ) {
+ try {
+ sSqlStatement = m_xParameterSubstitution->substituteVariables(sSqlStatement,sal_True);
+ } catch(const Exception&) { }
+ }
+ return sSqlStatement;
+}
+
+/* }}} */
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noet sw=4 ts=4 fdm=marker
+ * vim<600: noet sw=4 ts=4
+ */
diff --git a/mysqlc/source/mysqlc_connection.hxx b/mysqlc/source/mysqlc_connection.hxx
new file mode 100644
index 000000000000..0b17a0a362e2
--- /dev/null
+++ b/mysqlc/source/mysqlc_connection.hxx
@@ -0,0 +1,250 @@
+/*************************************************************************
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2008 by Sun Microsystems, Inc.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* $RCSfile: mysqlc_connection.hxx,v $
+*
+* $Revision: 1.1.2.4 $
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org. If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+************************************************************************/
+
+#ifndef MYSQLC_CONNECTION_HXX
+#define MYSQLC_CONNECTION_HXX
+
+#include "mysqlc_subcomponent.hxx"
+#include "mysqlc_types.hxx"
+
+#include <boost/shared_ptr.hpp>
+#include <com/sun/star/beans/PropertyValue.hpp>
+#include <com/sun/star/lang/DisposedException.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/lang/XUnoTunnel.hpp>
+#include <com/sun/star/sdbc/ColumnSearch.hpp>
+#include <com/sun/star/sdbc/ColumnValue.hpp>
+#include <com/sun/star/sdbc/DataType.hpp>
+#include <com/sun/star/sdbc/SQLWarning.hpp>
+#include <com/sun/star/sdbc/XConnection.hpp>
+#include <com/sun/star/sdbc/XWarningsSupplier.hpp>
+#include <com/sun/star/util/XStringSubstitution.hpp>
+
+#include <cppconn/driver.h>
+#include <cppuhelper/compbase3.hxx>
+#include <cppuhelper/weakref.hxx>
+#include <rtl/string.hxx>
+
+#include <map>
+
+#define UNUSED_PARAM __attribute__((unused))
+
+namespace sql
+{
+ class SQLException;
+}
+
+namespace connectivity
+{
+ class OMetaConnection;
+ class ODatabaseMetaData;
+
+ namespace mysqlc
+ {
+ using ::rtl::OUString;
+ using ::com::sun::star::sdbc::SQLWarning;
+ using ::com::sun::star::sdbc::SQLException;
+ using ::com::sun::star::uno::RuntimeException;
+ typedef ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XStatement > my_XStatementRef;
+ typedef ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > my_XPreparedStatementRef;
+ typedef ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > my_XNameAccessRef;
+ typedef ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > my_XDatabaseMetaDataRef;
+
+ typedef ::cppu::WeakComponentImplHelper3< ::com::sun::star::sdbc::XConnection,
+ ::com::sun::star::sdbc::XWarningsSupplier,
+ ::com::sun::star::lang::XServiceInfo
+ > OMetaConnection_BASE;
+ struct ConnectionSettings
+ {
+ rtl_TextEncoding encoding;
+ std::auto_ptr<sql::Connection> cppConnection;
+ OUString schema;
+ OUString quoteIdentifier;
+ OUString connectionURL;
+ sal_Bool readOnly;
+ };
+
+ class MysqlCDriver;
+
+ typedef OMetaConnection_BASE OConnection_BASE;
+
+ typedef std::vector< ::com::sun::star::uno::WeakReferenceHelper > OWeakRefArray;
+
+ class OConnection : public OBase_Mutex,
+ public OConnection_BASE,
+ public connectivity::mysqlc::OSubComponent<OConnection, OConnection_BASE>
+ {
+ friend class connectivity::mysqlc::OSubComponent<OConnection, OConnection_BASE>;
+
+ private:
+ ConnectionSettings m_settings;
+
+ private:
+ ::com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > m_typeMap;
+ ::com::sun::star::uno::Reference< com::sun::star::util::XStringSubstitution > m_xParameterSubstitution;
+ protected:
+
+ //====================================================================
+ // Data attributes
+ //====================================================================
+ ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData;
+
+ OWeakRefArray m_aStatements; // vector containing a list
+ // of all the Statement objects
+ // for this Connection
+
+ SQLWarning m_aLastWarning; // Last SQLWarning generated by an operation
+ OUString m_aURL; // URL of connection
+ OUString m_sUser; // the user name
+ MysqlCDriver& m_rDriver; // Pointer to the owning driver object
+ sql::Driver* cppDriver;
+
+ sal_Bool m_bClosed;
+ sal_Bool m_bUseCatalog; // should we use the catalog on filebased databases
+ sal_Bool m_bUseOldDateFormat;
+
+
+ void buildTypeInfo() throw(SQLException);
+ public:
+ OUString getMysqlVariable(const char *varname)
+ throw(SQLException, RuntimeException);
+
+ sal_Int32 getMysqlVersion()
+ throw(SQLException, RuntimeException);
+
+ virtual void construct(const OUString& url,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info)
+ throw(SQLException);
+
+ OConnection(MysqlCDriver& _rDriver, sql::Driver * cppDriver);
+ virtual ~OConnection();
+
+ void closeAllStatements () throw(SQLException);
+
+
+ rtl_TextEncoding getConnectionEncoding() { return m_settings.encoding; }
+
+
+ // OComponentHelper
+ virtual void SAL_CALL disposing(void);
+
+ // XInterface
+ virtual void SAL_CALL release() throw();
+
+ // XServiceInfo
+ DECLARE_SERVICE_INFO();
+ // XConnection
+ my_XStatementRef SAL_CALL createStatement()
+ throw(SQLException, RuntimeException);
+
+ my_XPreparedStatementRef SAL_CALL prepareStatement(const OUString& sql)
+ throw(SQLException, RuntimeException);
+
+ my_XPreparedStatementRef SAL_CALL prepareCall(const OUString& sql)
+ throw(SQLException, RuntimeException);
+
+ OUString SAL_CALL nativeSQL(const OUString& sql)
+ throw(SQLException, RuntimeException);
+
+ void SAL_CALL setAutoCommit(sal_Bool autoCommit)
+ throw(SQLException, RuntimeException);
+
+ sal_Bool SAL_CALL getAutoCommit()
+ throw(SQLException, RuntimeException);
+
+ void SAL_CALL commit()
+ throw(SQLException, RuntimeException);
+
+ void SAL_CALL rollback()
+ throw(SQLException, RuntimeException);
+
+ sal_Bool SAL_CALL isClosed()
+ throw(SQLException, RuntimeException);
+
+ my_XDatabaseMetaDataRef SAL_CALL getMetaData()
+ throw(SQLException, RuntimeException);
+
+ void SAL_CALL setReadOnly(sal_Bool readOnly)
+ throw(SQLException, RuntimeException);
+
+ sal_Bool SAL_CALL isReadOnly()
+ throw(SQLException, RuntimeException);
+
+ void SAL_CALL setCatalog(const OUString& catalog)
+ throw(SQLException, RuntimeException);
+
+ OUString SAL_CALL getCatalog()
+ throw(SQLException, RuntimeException);
+
+ void SAL_CALL setTransactionIsolation(sal_Int32 level)
+ throw(SQLException, RuntimeException);
+
+ sal_Int32 SAL_CALL getTransactionIsolation()
+ throw(SQLException, RuntimeException);
+
+ my_XNameAccessRef SAL_CALL getTypeMap()
+ throw(SQLException, RuntimeException);
+
+ void SAL_CALL setTypeMap(const my_XNameAccessRef& typeMap)
+ throw(SQLException, RuntimeException);
+ // XCloseable
+ void SAL_CALL close()
+ throw(SQLException, RuntimeException);
+ // XWarningsSupplier
+ ::com::sun::star::uno::Any SAL_CALL getWarnings()
+ throw(SQLException, RuntimeException);
+ void SAL_CALL clearWarnings()
+ throw(SQLException, RuntimeException);
+
+ // TODO: Not used
+ //sal_Int32 sdbcColumnType(OUString typeName);
+ inline const ConnectionSettings& getConnectionSettings() const { return m_settings; }
+ ::rtl::OUString transFormPreparedStatement(const ::rtl::OUString& _sSQL);
+
+ // should we use the catalog on filebased databases
+ inline sal_Bool isCatalogUsed() const { return m_bUseCatalog; }
+ inline OUString getUserName() const { return m_sUser; }
+ inline const MysqlCDriver& getDriver() const { return m_rDriver;}
+ inline rtl_TextEncoding getTextEncoding() const { return m_settings.encoding; }
+
+ }; /* OConnection */
+ // TODO: Not used.
+ //inline OUString getPattern(OUString p) { return (p.getLength()) ? p : ASC2OU("%"); }
+ } /* mysqlc */
+} /* connectivity */
+#endif // MYSQLC_CONNECTION_HXX
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noet sw=4 ts=4 fdm=marker
+ * vim<600: noet sw=4 ts=4
+ */
+
diff --git a/mysqlc/source/mysqlc_databasemetadata.cxx b/mysqlc/source/mysqlc_databasemetadata.cxx
new file mode 100644
index 000000000000..30911dda97cf
--- /dev/null
+++ b/mysqlc/source/mysqlc_databasemetadata.cxx
@@ -0,0 +1,2215 @@
+/*************************************************************************
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2008 by Sun Microsystems, Inc.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* $RCSfile: mysqlc_databasemetadata.cxx,v $
+*
+* $Revision: 1.1.2.5 $
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org. If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+************************************************************************/
+#include "mysqlc_databasemetadata.hxx"
+#include <com/sun/star/sdbc/DataType.hpp>
+#include <com/sun/star/sdbc/ResultSetType.hpp>
+#include <com/sun/star/sdbc/ResultSetConcurrency.hpp>
+#include <com/sun/star/sdbc/TransactionIsolation.hpp>
+#include <com/sun/star/sdbc/KeyRule.hpp>
+#include <com/sun/star/sdbc/Deferrability.hpp>
+#include <com/sun/star/sdbc/IndexType.hpp>
+#include <com/sun/star/sdbc/BestRowScope.hpp>
+#include <com/sun/star/sdbc/ColumnType.hpp>
+#include <com/sun/star/lang/XInitialization.hpp>
+
+
+#include "mysqlc_general.hxx"
+#include "mysqlc_statement.hxx"
+#include "mysqlc_driver.hxx"
+#include "mysqlc_preparedstatement.hxx"
+
+#include <stdio.h>
+
+using namespace connectivity::mysqlc;
+using namespace com::sun::star::uno;
+using namespace com::sun::star::lang;
+using namespace com::sun::star::beans;
+using namespace com::sun::star::sdbc;
+using ::rtl::OUString;
+using mysqlc_sdbc_driver::getStringFromAny;
+
+#include <cppconn/connection.h>
+#include <cppconn/resultset.h>
+#include <cppconn/metadata.h>
+#include <cppconn/statement.h>
+#include <cppconn/prepared_statement.h>
+
+static std::string wild("%");
+
+using ::rtl::OUStringToOString;
+
+// -----------------------------------------------------------------------------
+void lcl_setRows_throw(const Reference< XResultSet >& _xResultSet,sal_Int32 _nType,const std::vector< std::vector< Any > >& _rRows)
+{
+ Reference< XInitialization> xIni(_xResultSet,UNO_QUERY);
+ Sequence< Any > aArgs(2);
+ aArgs[0] <<= _nType;
+
+ Sequence< Sequence< Any > > aRows(_rRows.size());
+
+ std::vector< std::vector< Any > >::const_iterator aIter = _rRows.begin();
+ Sequence< Any > * pRowsIter = aRows.getArray();
+ Sequence< Any > * pRowsEnd = pRowsIter + aRows.getLength();
+ for (; pRowsIter != pRowsEnd;++pRowsIter,++aIter) {
+ if (!aIter->empty()) {
+ Sequence<Any> aSeq(&(*aIter->begin()),aIter->size());
+ (*pRowsIter) = aSeq;
+ }
+ }
+ aArgs[1] <<= aRows;
+ xIni->initialize(aArgs);
+}
+
+
+/* {{{ ODatabaseMetaData::ODatabaseMetaData() -I- */
+ODatabaseMetaData::ODatabaseMetaData(OConnection& _rCon)
+ :m_rConnection(_rCon)
+ ,m_bUseCatalog(sal_True)
+ ,meta(_rCon.getConnectionSettings().cppConnection->getMetaData())
+ ,identifier_quote_string_set(false)
+{
+ OSL_TRACE("ODatabaseMetaData::ODatabaseMetaData");
+ if (!m_rConnection.isCatalogUsed())
+ {
+ osl_incrementInterlockedCount(&m_refCount);
+ m_bUseCatalog = !(usesLocalFiles() || usesLocalFilePerTable());
+ osl_decrementInterlockedCount(&m_refCount);
+ }
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::~ODatabaseMetaData() -I- */
+ODatabaseMetaData::~ODatabaseMetaData()
+{
+ OSL_TRACE("ODatabaseMetaData::~ODatabaseMetaData");
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::impl_getStringMetaData() -I- */
+OUString ODatabaseMetaData::impl_getStringMetaData(const sal_Char* _methodName, const std::string& (sql::DatabaseMetaData::*_Method)() )
+{
+ OSL_TRACE( "mysqlc::ODatabaseMetaData::%s", _methodName);
+ OUString stringMetaData;
+ try {
+ stringMetaData = mysqlc_sdbc_driver::convert((meta->*_Method)(), m_rConnection.getConnectionEncoding());
+ } catch (sql::MethodNotImplementedException) {
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException(_methodName, *this);
+ } catch (sql::InvalidArgumentException) {
+ mysqlc_sdbc_driver::throwInvalidArgumentException(_methodName, *this);
+ } catch (const sql::SQLException& e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_rConnection.getConnectionEncoding());
+ }
+ return stringMetaData;
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::impl_getStringMetaData() -I- */
+OUString ODatabaseMetaData::impl_getStringMetaData(const sal_Char* _methodName, std::string (sql::DatabaseMetaData::*_Method)() )
+{
+ OSL_TRACE( "mysqlc::ODatabaseMetaData::%s", _methodName);
+ OUString stringMetaData;
+ try {
+ stringMetaData = mysqlc_sdbc_driver::convert((meta->*_Method)(), m_rConnection.getConnectionEncoding());
+ } catch (sql::MethodNotImplementedException) {
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException(_methodName, *this);
+ } catch (sql::InvalidArgumentException) {
+ mysqlc_sdbc_driver::throwInvalidArgumentException(_methodName, *this);
+ } catch (const sql::SQLException& e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_rConnection.getConnectionEncoding());
+ }
+ return stringMetaData;
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::impl_getStringMetaData() -I- */
+OUString ODatabaseMetaData::impl_getStringMetaData(const sal_Char* _methodName, const sql::SQLString& (sql::DatabaseMetaData::*_Method)() )
+{
+ OSL_TRACE( "mysqlc::ODatabaseMetaData::%s", _methodName);
+ OUString stringMetaData;
+ try {
+ stringMetaData = mysqlc_sdbc_driver::convert((meta->*_Method)(), m_rConnection.getConnectionEncoding());
+ } catch (sql::MethodNotImplementedException) {
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException(_methodName, *this);
+ } catch (sql::InvalidArgumentException) {
+ mysqlc_sdbc_driver::throwInvalidArgumentException(_methodName, *this);
+ } catch (const sql::SQLException& e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_rConnection.getConnectionEncoding());
+ }
+ return stringMetaData;
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::impl_getStringMetaData() -I- */
+OUString ODatabaseMetaData::impl_getStringMetaData(const sal_Char* _methodName, sql::SQLString (sql::DatabaseMetaData::*_Method)() )
+{
+ OSL_TRACE( "mysqlc::ODatabaseMetaData::%s", _methodName);
+ OUString stringMetaData;
+ try {
+ stringMetaData = mysqlc_sdbc_driver::convert((meta->*_Method)(), m_rConnection.getConnectionEncoding());
+ } catch (sql::MethodNotImplementedException) {
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException(_methodName, *this);
+ } catch (sql::InvalidArgumentException) {
+ mysqlc_sdbc_driver::throwInvalidArgumentException(_methodName, *this);
+ } catch (const sql::SQLException& e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_rConnection.getConnectionEncoding());
+ }
+ return stringMetaData;
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::impl_getInt32MetaData() -I- */
+sal_Int32 ODatabaseMetaData::impl_getInt32MetaData(const sal_Char* _methodName, unsigned int (sql::DatabaseMetaData::*_Method)() )
+{
+ OSL_TRACE( "mysqlc::ODatabaseMetaData::%s", _methodName);
+ sal_Int32 int32MetaData(0);
+ try {
+ int32MetaData = (meta->*_Method)();
+ } catch (sql::MethodNotImplementedException) {
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException(_methodName, *this);
+ } catch (sql::InvalidArgumentException) {
+ mysqlc_sdbc_driver::throwInvalidArgumentException(_methodName, *this);
+ } catch (const sql::SQLException& e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_rConnection.getConnectionEncoding());
+ }
+ return int32MetaData;
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::impl_getBoolMetaData() -I- */
+sal_Bool ODatabaseMetaData::impl_getBoolMetaData(const sal_Char* _methodName, bool (sql::DatabaseMetaData::*_Method)() )
+{
+ OSL_TRACE( "mysqlc::ODatabaseMetaData::%s", _methodName);
+ sal_Bool boolMetaData(0);
+ try {
+ boolMetaData = (meta->*_Method)() ? sal_True : sal_False;
+ } catch (sql::MethodNotImplementedException) {
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException(_methodName, *this);
+ } catch (sql::InvalidArgumentException) {
+ mysqlc_sdbc_driver::throwInvalidArgumentException(_methodName, *this);
+ } catch (const sql::SQLException& e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_rConnection.getConnectionEncoding());
+ }
+ return boolMetaData;
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::impl_getBoolMetaData() -I- */
+sal_Bool ODatabaseMetaData::impl_getBoolMetaData(const sal_Char* _methodName, bool (sql::DatabaseMetaData::*_Method)(int), sal_Int32 _arg )
+{
+ OSL_TRACE( "mysqlc::ODatabaseMetaData::%s", _methodName);
+ sal_Bool boolMetaData(0);
+ try {
+ boolMetaData = (meta->*_Method)( _arg ) ? sal_True : sal_False;
+ } catch (sql::MethodNotImplementedException) {
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException(_methodName, *this);
+ } catch (sql::InvalidArgumentException) {
+ mysqlc_sdbc_driver::throwInvalidArgumentException(_methodName, *this);
+ } catch (const sql::SQLException& e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_rConnection.getConnectionEncoding());
+ }
+ return boolMetaData;
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::impl_getRSTypeMetaData() -I- */
+sal_Bool ODatabaseMetaData::impl_getRSTypeMetaData(const sal_Char* _methodName, bool (sql::DatabaseMetaData::*_Method)(int), sal_Int32 _resultSetType )
+{
+ int resultSetType(sql::ResultSet::TYPE_FORWARD_ONLY);
+ switch ( _resultSetType ) {
+ case ResultSetType::SCROLL_INSENSITIVE: resultSetType = sql::ResultSet::TYPE_SCROLL_INSENSITIVE; break;
+ case ResultSetType::SCROLL_SENSITIVE: resultSetType = sql::ResultSet::TYPE_SCROLL_SENSITIVE; break;
+ }
+
+ return impl_getBoolMetaData(_methodName, _Method, resultSetType);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::getCatalogSeparator() -I- */
+OUString SAL_CALL ODatabaseMetaData::getCatalogSeparator()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getStringMetaData("getCatalogSeparator", &sql::DatabaseMetaData::getCatalogSeparator);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::getMaxBinaryLiteralLength() -I- */
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxBinaryLiteralLength()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getInt32MetaData("getMaxBinaryLiteralLength", &sql::DatabaseMetaData::getMaxBinaryLiteralLength);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::getMaxRowSize() -I- */
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxRowSize()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getInt32MetaData("getMaxRowSize", &sql::DatabaseMetaData::getMaxRowSize);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::getMaxCatalogNameLength() -I- */
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCatalogNameLength()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getInt32MetaData("getMaxCatalogNameLength", &sql::DatabaseMetaData::getMaxCatalogNameLength);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::getMaxCharLiteralLength() -I- */
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCharLiteralLength()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getInt32MetaData("getMaxCharLiteralLength", &sql::DatabaseMetaData::getMaxCharLiteralLength);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::getMaxColumnNameLength() -I- */
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnNameLength()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getInt32MetaData("getMaxColumnNameLength", &sql::DatabaseMetaData::getMaxColumnNameLength);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::getMaxColumnsInIndex() -I- */
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInIndex()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getInt32MetaData("getMaxColumnsInIndex", &sql::DatabaseMetaData::getMaxColumnsInIndex);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::getMaxCursorNameLength() -I- */
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCursorNameLength()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getInt32MetaData("getMaxCursorNameLength", &sql::DatabaseMetaData::getMaxCursorNameLength);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::getMaxConnections() -I- */
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxConnections()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getInt32MetaData("getMaxConnections", &sql::DatabaseMetaData::getMaxConnections);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::getMaxColumnsInTable() -I- */
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInTable()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getInt32MetaData("getMaxColumnsInTable", &sql::DatabaseMetaData::getMaxColumnsInTable);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::getMaxStatementLength() -I- */
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxStatementLength()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getInt32MetaData("getMaxStatementLength", &sql::DatabaseMetaData::getMaxStatementLength);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::getMaxTableNameLength() -I- */
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxTableNameLength()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getInt32MetaData("getMaxTableNameLength", &sql::DatabaseMetaData::getMaxTableNameLength);
+}
+/* }}} */
+
+/* {{{ ODatabaseMetaData::getMaxTablesInSelect() -I- */
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxTablesInSelect()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getInt32MetaData("getMaxTablesInSelect", &sql::DatabaseMetaData::getMaxTablesInSelect);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::doesMaxRowSizeIncludeBlobs() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::doesMaxRowSizeIncludeBlobs()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getBoolMetaData("doesMaxRowSizeIncludeBlobs", &sql::DatabaseMetaData::doesMaxRowSizeIncludeBlobs);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::storesLowerCaseQuotedIdentifiers() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseQuotedIdentifiers()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getBoolMetaData("storesLowerCaseQuotedIdentifiers", &sql::DatabaseMetaData::storesLowerCaseQuotedIdentifiers);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::storesLowerCaseIdentifiers() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseIdentifiers()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getBoolMetaData("storesLowerCaseIdentifiers", &sql::DatabaseMetaData::storesLowerCaseIdentifiers);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::storesMixedCaseQuotedIdentifiers() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::storesMixedCaseQuotedIdentifiers()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getBoolMetaData("storesMixedCaseQuotedIdentifiers", &sql::DatabaseMetaData::storesMixedCaseQuotedIdentifiers);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::storesMixedCaseIdentifiers() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::storesMixedCaseIdentifiers()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getBoolMetaData("storesMixedCaseIdentifiers", &sql::DatabaseMetaData::storesMixedCaseIdentifiers);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::storesUpperCaseQuotedIdentifiers() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseQuotedIdentifiers()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getBoolMetaData("storesUpperCaseQuotedIdentifiers", &sql::DatabaseMetaData::storesUpperCaseQuotedIdentifiers);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::storesUpperCaseIdentifiers() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseIdentifiers()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getBoolMetaData("storesUpperCaseIdentifiers", &sql::DatabaseMetaData::storesUpperCaseIdentifiers);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::supportsAlterTableWithAddColumn() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::supportsAlterTableWithAddColumn()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getBoolMetaData("supportsAlterTableWithAddColumn", &sql::DatabaseMetaData::supportsAlterTableWithAddColumn);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::supportsAlterTableWithDropColumn() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::supportsAlterTableWithDropColumn()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getBoolMetaData("supportsAlterTableWithDropColumn", &sql::DatabaseMetaData::supportsAlterTableWithDropColumn);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::getMaxIndexLength() -I- */
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxIndexLength()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getInt32MetaData("getMaxIndexLength", &sql::DatabaseMetaData::getMaxIndexLength);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::supportsNonNullableColumns() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::supportsNonNullableColumns()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getBoolMetaData("supportsNonNullableColumns", &sql::DatabaseMetaData::supportsNonNullableColumns);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::getCatalogTerm() -I- */
+OUString SAL_CALL ODatabaseMetaData::getCatalogTerm()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getStringMetaData("getCatalogTerm", &sql::DatabaseMetaData::getCatalogTerm);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::getIdentifierQuoteString() -I- */
+OUString SAL_CALL ODatabaseMetaData::getIdentifierQuoteString()
+ throw(SQLException, RuntimeException)
+{
+ if (identifier_quote_string_set == false) {
+ identifier_quote_string = impl_getStringMetaData("getIdentifierQuoteString", &sql::DatabaseMetaData::getIdentifierQuoteString);
+ identifier_quote_string_set = true;
+ }
+ return identifier_quote_string;
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::getExtraNameCharacters() -I- */
+OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getStringMetaData("getExtraNameCharacters", &sql::DatabaseMetaData::getExtraNameCharacters);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::supportsDifferentTableCorrelationNames() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::supportsDifferentTableCorrelationNames()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getBoolMetaData("supportsDifferentTableCorrelationNames", &sql::DatabaseMetaData::supportsDifferentTableCorrelationNames);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::isCatalogAtStart() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::isCatalogAtStart()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getBoolMetaData("isCatalogAtStart", &sql::DatabaseMetaData::isCatalogAtStart);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::dataDefinitionIgnoredInTransactions() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionIgnoredInTransactions()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getBoolMetaData("dataDefinitionIgnoredInTransactions", &sql::DatabaseMetaData::dataDefinitionIgnoredInTransactions);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::dataDefinitionCausesTransactionCommit() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionCausesTransactionCommit()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getBoolMetaData("dataDefinitionCausesTransactionCommit", &sql::DatabaseMetaData::dataDefinitionCausesTransactionCommit);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::supportsDataManipulationTransactionsOnly() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::supportsDataManipulationTransactionsOnly()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getBoolMetaData("supportsDataManipulationTransactionsOnly", &sql::DatabaseMetaData::supportsDataManipulationTransactionsOnly);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getBoolMetaData("supportsDataDefinitionAndDataManipulationTransactions", &sql::DatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::supportsPositionedDelete() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedDelete()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getBoolMetaData("supportsPositionedDelete", &sql::DatabaseMetaData::supportsPositionedDelete);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::supportsPositionedUpdate() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedUpdate()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getBoolMetaData("supportsPositionedUpdate", &sql::DatabaseMetaData::supportsPositionedUpdate);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::supportsOpenStatementsAcrossRollback() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossRollback()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getBoolMetaData("supportsOpenStatementsAcrossRollback", &sql::DatabaseMetaData::supportsOpenStatementsAcrossRollback);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::supportsOpenStatementsAcrossCommit() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossCommit()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getBoolMetaData("supportsOpenStatementsAcrossCommit", &sql::DatabaseMetaData::supportsOpenStatementsAcrossCommit);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::supportsOpenCursorsAcrossCommit() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossCommit()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getBoolMetaData("supportsOpenCursorsAcrossCommit", &sql::DatabaseMetaData::supportsOpenCursorsAcrossCommit);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::supportsOpenCursorsAcrossRollback() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossRollback()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getBoolMetaData("supportsOpenCursorsAcrossRollback", &sql::DatabaseMetaData::supportsOpenCursorsAcrossRollback);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::supportsTransactionIsolationLevel() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactionIsolationLevel(sal_Int32 level)
+ throw(SQLException, RuntimeException)
+{
+ return impl_getBoolMetaData("supportsTransactionIsolationLevel", &sql::DatabaseMetaData::supportsTransactionIsolationLevel, level);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::supportsSchemasInDataManipulation() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInDataManipulation()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getBoolMetaData("supportsSchemasInDataManipulation", &sql::DatabaseMetaData::supportsSchemasInDataManipulation);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::supportsANSI92FullSQL() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92FullSQL()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getBoolMetaData("supportsANSI92FullSQL", &sql::DatabaseMetaData::supportsANSI92FullSQL);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::supportsANSI92EntryLevelSQL() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92EntryLevelSQL()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getBoolMetaData("supportsANSI92EntryLevelSQL", &sql::DatabaseMetaData::supportsANSI92EntryLevelSQL);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::supportsIntegrityEnhancementFacility() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::supportsIntegrityEnhancementFacility()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getBoolMetaData("supportsIntegrityEnhancementFacility", &sql::DatabaseMetaData::supportsIntegrityEnhancementFacility);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::supportsSchemasInIndexDefinitions() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInIndexDefinitions()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getBoolMetaData("supportsSchemasInIndexDefinitions", &sql::DatabaseMetaData::supportsSchemasInIndexDefinitions);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::supportsSchemasInTableDefinitions() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInTableDefinitions()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getBoolMetaData("supportsSchemasInTableDefinitions", &sql::DatabaseMetaData::supportsSchemasInTableDefinitions);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::supportsCatalogsInTableDefinitions() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInTableDefinitions()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getBoolMetaData("supportsCatalogsInTableDefinitions", &sql::DatabaseMetaData::supportsCatalogsInTableDefinitions);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::supportsCatalogsInIndexDefinitions() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInIndexDefinitions()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getBoolMetaData("supportsCatalogsInIndexDefinitions", &sql::DatabaseMetaData::supportsCatalogsInIndexDefinitions);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::supportsCatalogsInDataManipulation() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInDataManipulation()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getBoolMetaData("supportsCatalogsInDataManipulation", &sql::DatabaseMetaData::supportsCatalogsInDataManipulation);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::supportsOuterJoins() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::supportsOuterJoins()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getBoolMetaData("supportsOuterJoins", &sql::DatabaseMetaData::supportsOuterJoins);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::getMaxStatements() -I- */
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxStatements()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getInt32MetaData("getMaxStatements", &sql::DatabaseMetaData::getMaxStatements);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::getMaxProcedureNameLength() -I- */
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxProcedureNameLength()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getInt32MetaData("getMaxProcedureNameLength", &sql::DatabaseMetaData::getMaxProcedureNameLength);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::getMaxSchemaNameLength() -I- */
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxSchemaNameLength()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getInt32MetaData("getMaxSchemaNameLength", &sql::DatabaseMetaData::getMaxSchemaNameLength);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::supportsTransactions() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactions()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getBoolMetaData("supportsTransactions", &sql::DatabaseMetaData::supportsTransactions);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::allProceduresAreCallable() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::allProceduresAreCallable()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getBoolMetaData("allProceduresAreCallable", &sql::DatabaseMetaData::allProceduresAreCallable);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::supportsStoredProcedures() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::supportsStoredProcedures()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getBoolMetaData("supportsStoredProcedures", &sql::DatabaseMetaData::supportsStoredProcedures);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::supportsSelectForUpdate() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::supportsSelectForUpdate()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getBoolMetaData("supportsSelectForUpdate", &sql::DatabaseMetaData::supportsSelectForUpdate);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::allTablesAreSelectable() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::allTablesAreSelectable()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getBoolMetaData("allTablesAreSelectable", &sql::DatabaseMetaData::allTablesAreSelectable);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::isReadOnly() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::isReadOnly()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getBoolMetaData("isReadOnly", &sql::DatabaseMetaData::isReadOnly);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::usesLocalFiles() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFiles()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getBoolMetaData("usesLocalFiles", &sql::DatabaseMetaData::usesLocalFiles);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::usesLocalFilePerTable() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFilePerTable()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getBoolMetaData("usesLocalFilePerTable", &sql::DatabaseMetaData::usesLocalFilePerTable);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::supportsTypeConversion() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::supportsTypeConversion()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getBoolMetaData("supportsTypeConversion", &sql::DatabaseMetaData::supportsTypeConversion);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::nullPlusNonNullIsNull() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::nullPlusNonNullIsNull()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getBoolMetaData("nullPlusNonNullIsNull", &sql::DatabaseMetaData::nullPlusNonNullIsNull);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::supportsColumnAliasing() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::supportsColumnAliasing()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getBoolMetaData("supportsColumnAliasing", &sql::DatabaseMetaData::supportsColumnAliasing);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::supportsTableCorrelationNames() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::supportsTableCorrelationNames()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getBoolMetaData("supportsTableCorrelationNames", &sql::DatabaseMetaData::supportsTableCorrelationNames);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::supportsConvert() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::supportsConvert(sal_Int32 /* fromType */, sal_Int32 /* toType */)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("ODatabaseMetaData::supportsConvert");
+ try {
+ /* ToDo -> use supportsConvert( fromType, toType) */
+ return meta->supportsConvert()? sal_True:sal_False;
+ } catch (sql::MethodNotImplementedException) {
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("ODatabaseMetaData::supportsConvert", *this);
+ } catch (sql::InvalidArgumentException) {
+ mysqlc_sdbc_driver::throwInvalidArgumentException("ODatabaseMetaData::supportsConvert", *this);
+ } catch (const sql::SQLException& e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_rConnection.getConnectionEncoding());
+ }
+ return sal_False;
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::supportsExpressionsInOrderBy() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::supportsExpressionsInOrderBy()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getBoolMetaData("supportsExpressionsInOrderBy", &sql::DatabaseMetaData::supportsExpressionsInOrderBy);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::supportsGroupBy() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupBy()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getBoolMetaData("supportsGroupBy", &sql::DatabaseMetaData::supportsGroupBy);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::supportsGroupByBeyondSelect() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByBeyondSelect()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getBoolMetaData("supportsGroupByBeyondSelect", &sql::DatabaseMetaData::supportsGroupByBeyondSelect);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::supportsGroupByUnrelated() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByUnrelated()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getBoolMetaData("supportsGroupByUnrelated", &sql::DatabaseMetaData::supportsGroupByUnrelated);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::supportsMultipleTransactions() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleTransactions()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getBoolMetaData("supportsMultipleTransactions", &sql::DatabaseMetaData::supportsMultipleTransactions);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::supportsMultipleResultSets() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleResultSets()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getBoolMetaData("supportsMultipleResultSets", &sql::DatabaseMetaData::supportsMultipleResultSets);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::supportsLikeEscapeClause() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::supportsLikeEscapeClause()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getBoolMetaData("supportsLikeEscapeClause", &sql::DatabaseMetaData::supportsLikeEscapeClause);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::supportsOrderByUnrelated() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::supportsOrderByUnrelated()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getBoolMetaData("supportsOrderByUnrelated", &sql::DatabaseMetaData::supportsOrderByUnrelated);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::supportsUnion() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::supportsUnion()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getBoolMetaData("supportsUnion", &sql::DatabaseMetaData::supportsUnion);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::supportsUnionAll() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::supportsUnionAll()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getBoolMetaData("supportsUnionAll", &sql::DatabaseMetaData::supportsUnionAll);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::supportsMixedCaseIdentifiers() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::supportsMixedCaseIdentifiers()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getBoolMetaData("supportsMixedCaseIdentifiers", &sql::DatabaseMetaData::supportsMixedCaseIdentifiers);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::supportsMixedCaseQuotedIdentifiers() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::supportsMixedCaseQuotedIdentifiers()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getBoolMetaData("supportsMixedCaseQuotedIdentifiers", &sql::DatabaseMetaData::supportsMixedCaseQuotedIdentifiers);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::nullsAreSortedAtEnd() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtEnd()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getBoolMetaData("nullsAreSortedAtEnd", &sql::DatabaseMetaData::nullsAreSortedAtEnd);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::nullsAreSortedAtStart() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtStart()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getBoolMetaData("nullsAreSortedAtStart", &sql::DatabaseMetaData::nullsAreSortedAtStart);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::nullsAreSortedHigh() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedHigh()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getBoolMetaData("nullsAreSortedHigh", &sql::DatabaseMetaData::nullsAreSortedHigh);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::nullsAreSortedLow() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedLow()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getBoolMetaData("nullsAreSortedLow", &sql::DatabaseMetaData::nullsAreSortedLow);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::supportsSchemasInProcedureCalls() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInProcedureCalls()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getBoolMetaData("supportsSchemasInProcedureCalls", &sql::DatabaseMetaData::supportsSchemasInProcedureCalls);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::supportsSchemasInPrivilegeDefinitions() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInPrivilegeDefinitions()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getBoolMetaData("supportsSchemasInPrivilegeDefinitions", &sql::DatabaseMetaData::supportsSchemasInPrivilegeDefinitions);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::supportsCatalogsInProcedureCalls() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInProcedureCalls()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getBoolMetaData("supportsCatalogsInProcedureCalls", &sql::DatabaseMetaData::supportsCatalogsInProcedureCalls);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::supportsCatalogsInPrivilegeDefinitions() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInPrivilegeDefinitions()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getBoolMetaData("supportsCatalogsInPrivilegeDefinitions", &sql::DatabaseMetaData::supportsCatalogsInPrivilegeDefinitions);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::supportsCorrelatedSubqueries() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::supportsCorrelatedSubqueries()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getBoolMetaData("supportsCorrelatedSubqueries", &sql::DatabaseMetaData::supportsCorrelatedSubqueries);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::supportsSubqueriesInComparisons() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInComparisons()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getBoolMetaData("supportsSubqueriesInComparisons", &sql::DatabaseMetaData::supportsSubqueriesInComparisons);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::supportsSubqueriesInExists() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInExists()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getBoolMetaData("supportsSubqueriesInExists", &sql::DatabaseMetaData::supportsSubqueriesInExists);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::supportsSubqueriesInIns() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInIns()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getBoolMetaData("supportsSubqueriesInIns", &sql::DatabaseMetaData::supportsSubqueriesInIns);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::supportsSubqueriesInQuantifieds() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInQuantifieds()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getBoolMetaData("supportsSubqueriesInQuantifieds", &sql::DatabaseMetaData::supportsSubqueriesInQuantifieds);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::supportsANSI92IntermediateSQL() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92IntermediateSQL()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getBoolMetaData("supportsANSI92IntermediateSQL", &sql::DatabaseMetaData::supportsANSI92IntermediateSQL);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::getURL() -I- */
+OUString SAL_CALL ODatabaseMetaData::getURL()
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("ODatabaseMetaData::getURL");
+ return m_rConnection.getConnectionSettings().connectionURL;
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::getUserName() -I- */
+OUString SAL_CALL ODatabaseMetaData::getUserName()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getStringMetaData("getUserName", &sql::DatabaseMetaData::getUserName);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::getDriverName() -I- */
+OUString SAL_CALL ODatabaseMetaData::getDriverName()
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("ODatabaseMetaData::getDriverName");
+ OUString aValue( RTL_CONSTASCII_USTRINGPARAM( "MySQL Connector/OO.org" ) );
+ return aValue;
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::getDriverVersion() -I- */
+OUString SAL_CALL ODatabaseMetaData::getDriverVersion()
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("ODatabaseMetaData::getDriverVersion");
+ static const OUString sVersion( RTL_CONSTASCII_USTRINGPARAM( "0.9.2" ) );
+ return sVersion;
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::getDatabaseProductVersion() -I- */
+OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getStringMetaData("getDatabaseProductVersion", &sql::DatabaseMetaData::getDatabaseProductVersion);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::getDatabaseProductName() -I- */
+OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getStringMetaData("getDatabaseProductName", &sql::DatabaseMetaData::getDatabaseProductName);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::getProcedureTerm() -I- */
+OUString SAL_CALL ODatabaseMetaData::getProcedureTerm()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getStringMetaData("getProcedureTerm", &sql::DatabaseMetaData::getProcedureTerm);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::getSchemaTerm() -I- */
+OUString SAL_CALL ODatabaseMetaData::getSchemaTerm()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getStringMetaData("getSchemaTerm", &sql::DatabaseMetaData::getSchemaTerm);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::getDriverMajorVersion() -I- */
+sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMajorVersion()
+ throw(RuntimeException)
+{
+ OSL_TRACE("ODatabaseMetaData::getDriverMajorVersion");
+ return MYSQLC_VERSION_MAJOR;
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::getDefaultTransactionIsolation() -I- */
+sal_Int32 SAL_CALL ODatabaseMetaData::getDefaultTransactionIsolation()
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("ODatabaseMetaData::getDefaultTransactionIsolation");
+ try {
+ switch (meta->getDefaultTransactionIsolation()) {
+ case sql::TRANSACTION_SERIALIZABLE: return TransactionIsolation::SERIALIZABLE;
+ case sql::TRANSACTION_REPEATABLE_READ: return TransactionIsolation::REPEATABLE_READ;
+ case sql::TRANSACTION_READ_COMMITTED: return TransactionIsolation::READ_COMMITTED;
+ case sql::TRANSACTION_READ_UNCOMMITTED: return TransactionIsolation::READ_UNCOMMITTED;
+ }
+ } catch (sql::MethodNotImplementedException) {
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("ODatabaseMetaData::getDriverMajorVersion", *this);
+ } catch (sql::InvalidArgumentException) {
+ mysqlc_sdbc_driver::throwInvalidArgumentException("ODatabaseMetaData::getDriverMajorVersion", *this);
+ } catch (const sql::SQLException& e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_rConnection.getConnectionEncoding());
+ }
+ return TransactionIsolation::NONE;
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::getDriverMinorVersion() -I- */
+sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion()
+ throw(RuntimeException)
+{
+ OSL_TRACE("ODatabaseMetaData::getDriverMinorVersion");
+ return MYSQLC_VERSION_MINOR;
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::getSQLKeywords() -I- */
+OUString SAL_CALL ODatabaseMetaData::getSQLKeywords()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getStringMetaData("getSQLKeywords", &sql::DatabaseMetaData::getSQLKeywords);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::getSearchStringEscape() -I- */
+OUString SAL_CALL ODatabaseMetaData::getSearchStringEscape()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getStringMetaData("getSearchStringEscape", &sql::DatabaseMetaData::getSearchStringEscape);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::getStringFunctions() -I- */
+OUString SAL_CALL ODatabaseMetaData::getStringFunctions()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getStringMetaData("getStringFunctions", &sql::DatabaseMetaData::getStringFunctions);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::getTimeDateFunctions() -I- */
+OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getStringMetaData("getTimeDateFunctions", &sql::DatabaseMetaData::getTimeDateFunctions);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::getSystemFunctions() -I- */
+OUString SAL_CALL ODatabaseMetaData::getSystemFunctions()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getStringMetaData("getSystemFunctions", &sql::DatabaseMetaData::getSystemFunctions);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::getNumericFunctions() -I- */
+OUString SAL_CALL ODatabaseMetaData::getNumericFunctions()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getStringMetaData("getNumericFunctions", &sql::DatabaseMetaData::getNumericFunctions);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::supportsExtendedSQLGrammar() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::supportsExtendedSQLGrammar()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getBoolMetaData("supportsExtendedSQLGrammar", &sql::DatabaseMetaData::supportsExtendedSQLGrammar);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::supportsCoreSQLGrammar() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::supportsCoreSQLGrammar()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getBoolMetaData("supportsCoreSQLGrammar", &sql::DatabaseMetaData::supportsCoreSQLGrammar);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::supportsMinimumSQLGrammar() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::supportsMinimumSQLGrammar()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getBoolMetaData("supportsMinimumSQLGrammar", &sql::DatabaseMetaData::supportsMinimumSQLGrammar);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::supportsFullOuterJoins() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::supportsFullOuterJoins()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getBoolMetaData("supportsFullOuterJoins", &sql::DatabaseMetaData::supportsFullOuterJoins);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::supportsLimitedOuterJoins() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::supportsLimitedOuterJoins()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getBoolMetaData("supportsLimitedOuterJoins", &sql::DatabaseMetaData::supportsLimitedOuterJoins);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::getMaxColumnsInGroupBy() -I- */
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInGroupBy()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getInt32MetaData("getMaxColumnsInGroupBy", &sql::DatabaseMetaData::getMaxColumnsInGroupBy);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::getMaxColumnsInOrderBy() -I- */
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInOrderBy()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getInt32MetaData("getMaxColumnsInOrderBy", &sql::DatabaseMetaData::getMaxColumnsInOrderBy);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::getMaxColumnsInSelect() -I- */
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInSelect()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getInt32MetaData("getMaxColumnsInSelect", &sql::DatabaseMetaData::getMaxColumnsInSelect);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::getMaxUserNameLength() -I- */
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxUserNameLength()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getInt32MetaData("getMaxUserNameLength", &sql::DatabaseMetaData::getMaxUserNameLength);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::supportsResultSetType() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetType(sal_Int32 setType)
+ throw(SQLException, RuntimeException)
+{
+ return impl_getRSTypeMetaData("supportsResultSetType", &sql::DatabaseMetaData::supportsResultSetType, setType);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::supportsResultSetConcurrency() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetConcurrency(sal_Int32 setType, sal_Int32 concurrency)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("ODatabaseMetaData::supportsResultSetConcurrency");
+ /* TODO: Check this out */
+ try {
+ return meta->supportsResultSetConcurrency(setType, concurrency==com::sun::star::sdbc::TransactionIsolation::READ_COMMITTED?
+ sql::TRANSACTION_READ_COMMITTED:
+ (concurrency == com::sun::star::sdbc::TransactionIsolation::SERIALIZABLE?
+ sql::TRANSACTION_SERIALIZABLE:sql::TRANSACTION_SERIALIZABLE))? sal_True:sal_False;
+ } catch (sql::MethodNotImplementedException) {
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("ODatabaseMetaData::supportsResultSetConcurrency", *this);
+ } catch (sql::InvalidArgumentException) {
+ mysqlc_sdbc_driver::throwInvalidArgumentException("ODatabaseMetaData::supportsResultSetConcurrency", *this);
+ } catch (const sql::SQLException& e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_rConnection.getConnectionEncoding());
+ }
+ return sal_False;
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::ownUpdatesAreVisible() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::ownUpdatesAreVisible(sal_Int32 setType)
+ throw(SQLException, RuntimeException)
+{
+ return impl_getRSTypeMetaData("ownUpdatesAreVisible", &sql::DatabaseMetaData::ownUpdatesAreVisible, setType);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::ownDeletesAreVisible() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::ownDeletesAreVisible(sal_Int32 setType)
+ throw(SQLException, RuntimeException)
+{
+ return impl_getRSTypeMetaData("ownDeletesAreVisible", &sql::DatabaseMetaData::ownDeletesAreVisible, setType);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::ownInsertsAreVisible() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::ownInsertsAreVisible(sal_Int32 setType)
+ throw(SQLException, RuntimeException)
+{
+ return impl_getRSTypeMetaData("ownInsertsAreVisible", &sql::DatabaseMetaData::ownInsertsAreVisible, setType);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::othersUpdatesAreVisible() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::othersUpdatesAreVisible(sal_Int32 setType)
+ throw(SQLException, RuntimeException)
+{
+ return impl_getRSTypeMetaData("othersUpdatesAreVisible", &sql::DatabaseMetaData::othersUpdatesAreVisible, setType);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::othersDeletesAreVisible() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::othersDeletesAreVisible(sal_Int32 setType)
+ throw(SQLException, RuntimeException)
+{
+ return impl_getRSTypeMetaData("othersDeletesAreVisible", &sql::DatabaseMetaData::othersDeletesAreVisible, setType);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::othersInsertsAreVisible() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::othersInsertsAreVisible(sal_Int32 setType)
+ throw(SQLException, RuntimeException)
+{
+ return impl_getRSTypeMetaData("othersInsertsAreVisible", &sql::DatabaseMetaData::othersInsertsAreVisible, setType);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::updatesAreDetected() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::updatesAreDetected(sal_Int32 setType)
+ throw(SQLException, RuntimeException)
+{
+ return impl_getRSTypeMetaData("updatesAreDetected", &sql::DatabaseMetaData::updatesAreDetected, setType);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::deletesAreDetected() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::deletesAreDetected(sal_Int32 setType)
+ throw(SQLException, RuntimeException)
+{
+ return impl_getRSTypeMetaData("deletesAreDetected", &sql::DatabaseMetaData::deletesAreDetected, setType);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::insertsAreDetected() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::insertsAreDetected(sal_Int32 setType)
+ throw(SQLException, RuntimeException)
+{
+ return impl_getRSTypeMetaData("insertsAreDetected", &sql::DatabaseMetaData::insertsAreDetected, setType);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::supportsBatchUpdates() -I- */
+sal_Bool SAL_CALL ODatabaseMetaData::supportsBatchUpdates()
+ throw(SQLException, RuntimeException)
+{
+ return impl_getBoolMetaData("supportsBatchUpdates", &sql::DatabaseMetaData::supportsBatchUpdates);
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::getConnection() -I- */
+Reference< XConnection > SAL_CALL ODatabaseMetaData::getConnection()
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("ODatabaseMetaData::getConnection");
+ return (Reference< XConnection >)&m_rConnection;
+}
+/* }}} */
+
+
+/*
+ Here follow all methods which return(a resultset
+ the first methods is an example implementation how to use this resultset
+ of course you could implement it on your and you should do this because
+ the general way is more memory expensive
+*/
+
+/* {{{ ODatabaseMetaData::getTableTypes() -I- */
+Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes()
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("ODatabaseMetaData::getTableTypes");
+ const char * table_types[] = {"TABLE", "VIEW"};
+ sal_Int32 requiredVersion[] = {0, 50000};
+
+ Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY);
+ std::vector< std::vector< Any > > rRows;
+ rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding();
+
+ for (sal_uInt32 i = 0; i < 2; i++) {
+ if (m_rConnection.getMysqlVersion() >= requiredVersion[i]) {
+ std::vector< Any > aRow(1);
+ aRow.push_back(makeAny(mysqlc_sdbc_driver::convert(table_types[i], encoding)));
+ rRows.push_back(aRow);
+ }
+ }
+ lcl_setRows_throw(xResultSet, 5 ,rRows);
+ return xResultSet;
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::getTypeInfo() -I- */
+Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTypeInfo()
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("ODatabaseMetaData::getTypeInfo");
+ Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY);
+
+ std::vector< std::vector< Any > > rRows;
+
+ rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding();
+ unsigned int i = 0;
+ while (mysqlc_types[i].typeName) {
+ std::vector< Any > aRow(1);
+
+ aRow.push_back(makeAny(mysqlc_sdbc_driver::convert(mysqlc_types[i].typeName, encoding)));
+ aRow.push_back(makeAny(mysqlc_types[i].dataType));
+ aRow.push_back(makeAny(mysqlc_types[i].precision));
+ aRow.push_back(makeAny(mysqlc_sdbc_driver::convert(mysqlc_types[i].literalPrefix, encoding)));
+ aRow.push_back(makeAny(mysqlc_sdbc_driver::convert(mysqlc_types[i].literalSuffix, encoding)));
+ aRow.push_back(makeAny(mysqlc_sdbc_driver::convert(mysqlc_types[i].createParams, encoding)));
+ aRow.push_back(makeAny(mysqlc_types[i].nullable));
+ aRow.push_back(makeAny(mysqlc_types[i].caseSensitive));
+ aRow.push_back(makeAny(mysqlc_types[i].searchable));
+ aRow.push_back(makeAny(mysqlc_types[i].isUnsigned));
+ aRow.push_back(makeAny(mysqlc_types[i].fixedPrecScale));
+ aRow.push_back(makeAny(mysqlc_types[i].autoIncrement));
+ aRow.push_back(makeAny(mysqlc_sdbc_driver::convert(mysqlc_types[i].localTypeName, encoding)));
+ aRow.push_back(makeAny(mysqlc_types[i].minScale));
+ aRow.push_back(makeAny(mysqlc_types[i].maxScale));
+ aRow.push_back(makeAny(sal_Int32(0)));
+ aRow.push_back(makeAny(sal_Int32(0)));
+ aRow.push_back(makeAny(sal_Int32(10)));
+
+ rRows.push_back(aRow);
+ i++;
+ }
+
+ lcl_setRows_throw(xResultSet, 14, rRows);
+ return xResultSet;
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::getCatalogs() -I- */
+Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCatalogs()
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("ODatabaseMetaData::getCatalogs");
+
+ Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY);
+ std::vector< std::vector< Any > > rRows;
+
+ try {
+ rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding();
+ std::auto_ptr< sql::ResultSet> rset( meta->getCatalogs());
+ sql::ResultSetMetaData * rs_meta = rset->getMetaData();
+ sal_uInt32 columns = rs_meta->getColumnCount();
+ while (rset->next()) {
+ std::vector< Any > aRow(1);
+ for (sal_uInt32 i = 1; i <= columns; i++) {
+ aRow.push_back(makeAny(mysqlc_sdbc_driver::convert(rset->getString(i), encoding)));
+ }
+ rRows.push_back(aRow);
+ }
+ } catch (sql::MethodNotImplementedException) {
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("ODatabaseMetaData::getCatalogs", *this);
+ } catch (sql::InvalidArgumentException) {
+ mysqlc_sdbc_driver::throwInvalidArgumentException("ODatabaseMetaData::getCatalogs", *this);
+ } catch (const sql::SQLException& e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_rConnection.getConnectionEncoding());
+ }
+
+ lcl_setRows_throw(xResultSet, 0, rRows);
+ return xResultSet;
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::getSchemas() -I- */
+Reference< XResultSet > SAL_CALL ODatabaseMetaData::getSchemas()
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("ODatabaseMetaData::getSchemas");
+
+ Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY);
+ std::vector< std::vector< Any > > rRows;
+
+ try {
+ rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding();
+ std::auto_ptr< sql::ResultSet> rset( meta->getSchemas());
+ sql::ResultSetMetaData * rs_meta = rset->getMetaData();
+ sal_uInt32 columns = rs_meta->getColumnCount();
+ while (rset->next()) {
+ std::vector< Any > aRow(1);
+ bool informationSchema = false;
+ for (sal_uInt32 i = 1; i <= columns; i++) {
+ sql::SQLString columnStringValue = rset->getString(i);
+ if (i == 1) { // TABLE_SCHEM
+ informationSchema = (0 == columnStringValue.compare("information_schema"));
+ }
+ aRow.push_back(makeAny(mysqlc_sdbc_driver::convert(columnStringValue, encoding)));
+ }
+ if (!informationSchema ) {
+ rRows.push_back(aRow);
+ }
+ }
+ } catch (sql::MethodNotImplementedException) {
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("ODatabaseMetaData::getSchemas", *this);
+ } catch (sql::InvalidArgumentException) {
+ mysqlc_sdbc_driver::throwInvalidArgumentException("ODatabaseMetaData::getSchemas", *this);
+ } catch (const sql::SQLException& e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_rConnection.getConnectionEncoding());
+ }
+
+ lcl_setRows_throw(xResultSet, 1, rRows);
+ return xResultSet;
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::getColumnPrivileges() -I- */
+Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumnPrivileges(
+ const Any& catalog,
+ const OUString& schema,
+ const OUString& table,
+ const OUString& columnNamePattern)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("ODatabaseMetaData::getColumnPrivileges");
+ Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY);
+ std::vector< std::vector< Any > > rRows;
+
+ std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
+ sch(OUStringToOString(schema, m_rConnection.getConnectionEncoding()).getStr()),
+ tab(OUStringToOString(table, m_rConnection.getConnectionEncoding()).getStr()),
+ cNamePattern(OUStringToOString(columnNamePattern, m_rConnection.getConnectionEncoding()).getStr());
+ try {
+ rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding();
+ std::auto_ptr< sql::ResultSet> rset( meta->getColumnPrivileges(cat, sch, tab, cNamePattern.compare("")? cNamePattern:wild));
+
+ sql::ResultSetMetaData * rs_meta = rset->getMetaData();
+ sal_uInt32 columns = rs_meta->getColumnCount();
+ while (rset->next()) {
+ std::vector< Any > aRow(1);
+ for (sal_uInt32 i = 1; i <= columns; i++) {
+ aRow.push_back(makeAny(mysqlc_sdbc_driver::convert(rset->getString(i), encoding)));
+ }
+ rRows.push_back(aRow);
+ }
+ } catch (sql::MethodNotImplementedException) {
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("ODatabaseMetaData::getColumnPrivileges", *this);
+ } catch (sql::InvalidArgumentException) {
+ mysqlc_sdbc_driver::throwInvalidArgumentException("ODatabaseMetaData::getColumnPrivileges", *this);
+ } catch (const sql::SQLException& e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_rConnection.getConnectionEncoding());
+ }
+
+ lcl_setRows_throw(xResultSet, 2, rRows);
+ return xResultSet;
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::getColumns() -I- */
+Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns(
+ const Any& catalog,
+ const OUString& schemaPattern,
+ const OUString& tableNamePattern,
+ const OUString& columnNamePattern)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("ODatabaseMetaData::getColumns");
+ Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY);
+ std::vector< std::vector< Any > > rRows;
+ std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
+ sPattern(OUStringToOString(schemaPattern, m_rConnection.getConnectionEncoding()).getStr()),
+ tNamePattern(OUStringToOString(tableNamePattern, m_rConnection.getConnectionEncoding()).getStr()),
+ cNamePattern(OUStringToOString(columnNamePattern, m_rConnection.getConnectionEncoding()).getStr());
+
+ try {
+ std::auto_ptr< sql::ResultSet> rset( meta->getColumns(cat,
+ sPattern.compare("")? sPattern:wild,
+ tNamePattern.compare("")? tNamePattern:wild,
+ cNamePattern.compare("")? cNamePattern:wild));
+ rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding();
+ sql::ResultSetMetaData * rs_meta = rset->getMetaData();
+ sal_uInt32 columns = rs_meta->getColumnCount();
+ while (rset->next()) {
+ std::vector< Any > aRow(1);
+ for (sal_uInt32 i = 1; i <= columns; i++) {
+ if (i == 5) { // ColumnType
+ sal_Int32 sdbc_type = mysqlc_sdbc_driver::mysqlToOOOType(atoi(rset->getString(i).c_str()));
+ aRow.push_back(makeAny(sdbc_type));
+ } else {
+ aRow.push_back(makeAny(mysqlc_sdbc_driver::convert(rset->getString(i), encoding)));
+ }
+ }
+ rRows.push_back(aRow);
+ }
+ } catch (sql::MethodNotImplementedException) {
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("ODatabaseMetaData::getColumns", *this);
+ } catch (sql::InvalidArgumentException) {
+ mysqlc_sdbc_driver::throwInvalidArgumentException("ODatabaseMetaData::getColumns", *this);
+ } catch (const sql::SQLException& e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_rConnection.getConnectionEncoding());
+ }
+ lcl_setRows_throw(xResultSet, 3, rRows);
+ return xResultSet;
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::getTables() -I- */
+Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables(
+ const Any& catalog,
+ const OUString& schemaPattern,
+ const OUString& tableNamePattern,
+ const Sequence< OUString >& types )
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("ODatabaseMetaData::getTables");
+ sal_Int32 nLength = types.getLength();
+
+ Reference< XResultSet > xResultSet(getOwnConnection().
+ getDriver().getFactory()->createInstance(
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY);
+ std::vector< std::vector< Any > > rRows;
+
+ std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
+ sPattern(OUStringToOString(schemaPattern, m_rConnection.getConnectionEncoding()).getStr()),
+ tNamePattern(OUStringToOString(tableNamePattern, m_rConnection.getConnectionEncoding()).getStr());
+
+ std::list<sql::SQLString> tabTypes;
+ for (const OUString *pStart = types.getConstArray(), *p = pStart, *pEnd = pStart + nLength; p != pEnd; ++p) {
+ tabTypes.push_back(OUStringToOString(*p, m_rConnection.getConnectionEncoding()).getStr());
+ }
+
+ try {
+ std::auto_ptr< sql::ResultSet> rset( meta->getTables(cat,
+ sPattern.compare("")? sPattern:wild,
+ tNamePattern.compare("")? tNamePattern:wild,
+ tabTypes));
+
+ rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding();
+ sql::ResultSetMetaData * rs_meta = rset->getMetaData();
+ sal_uInt32 columns = rs_meta->getColumnCount();
+ while (rset->next()) {
+ std::vector< Any > aRow(1);
+ bool informationSchema = false;
+ for (sal_uInt32 i = 1; (i <= columns) && !informationSchema; ++i) {
+ sql::SQLString columnStringValue = rset->getString(i);
+ if (i == 2) { // TABLE_SCHEM
+ informationSchema = ( 0 == columnStringValue.compare("information_schema"));
+ }
+ aRow.push_back(makeAny(mysqlc_sdbc_driver::convert(columnStringValue, encoding)));
+ }
+ if (!informationSchema) {
+ rRows.push_back(aRow);
+ }
+ }
+ } catch (sql::MethodNotImplementedException) {
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("ODatabaseMetaData::getTables", *this);
+ } catch (sql::InvalidArgumentException) {
+ mysqlc_sdbc_driver::throwInvalidArgumentException("ODatabaseMetaData::getTables", *this);
+ } catch (const sql::SQLException& e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_rConnection.getConnectionEncoding());
+ }
+
+ lcl_setRows_throw(xResultSet, 4, rRows);
+ return xResultSet;
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::getProcedureColumns() -I- */
+Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedureColumns(
+ const Any& /* catalog */,
+ const OUString& /* schemaPattern */,
+ const OUString& /* procedureNamePattern */,
+ const OUString& /* columnNamePattern */)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("ODatabaseMetaData::getProcedureColumns");
+ // Currently there is no information available
+ return NULL;
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::getProcedures() -I- */
+Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedures(
+ const Any& catalog,
+ const OUString& schemaPattern,
+ const OUString& procedureNamePattern)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("ODatabaseMetaData::getProcedures");
+ Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY);
+ std::vector< std::vector< Any > > rRows;
+
+ std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
+ sPattern(OUStringToOString(schemaPattern, m_rConnection.getConnectionEncoding()).getStr()),
+ pNamePattern(OUStringToOString(procedureNamePattern, m_rConnection.getConnectionEncoding()).getStr());
+
+
+ try {
+ std::auto_ptr< sql::ResultSet> rset( meta->getProcedures(cat,
+ sPattern.compare("")? sPattern:wild,
+ pNamePattern.compare("")? pNamePattern:wild));
+
+ rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding();
+ sql::ResultSetMetaData * rs_meta = rset->getMetaData();
+ sal_uInt32 columns = rs_meta->getColumnCount();
+ while (rset->next()) {
+ std::vector< Any > aRow(1);
+ for (sal_uInt32 i = 1; i <= columns; i++) {
+ aRow.push_back(makeAny(mysqlc_sdbc_driver::convert(rset->getString(i), encoding)));
+ }
+ rRows.push_back(aRow);
+ }
+ } catch (sql::MethodNotImplementedException) {
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("ODatabaseMetaData::getProcedures", *this);
+ } catch (sql::InvalidArgumentException) {
+ mysqlc_sdbc_driver::throwInvalidArgumentException("ODatabaseMetaData::getProcedures", *this);
+ } catch (const sql::SQLException& e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_rConnection.getConnectionEncoding());
+ }
+
+ lcl_setRows_throw(xResultSet, 7,rRows);
+ return xResultSet;
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::getVersionColumns() -I- */
+Reference< XResultSet > SAL_CALL ODatabaseMetaData::getVersionColumns(
+ const Any& /* catalog */,
+ const OUString& /* schema */,
+ const OUString& /* table */)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("ODatabaseMetaData::getVersionColumns");
+ Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY);
+ std::vector< std::vector< Any > > rRows;
+ lcl_setRows_throw(xResultSet, 16,rRows);
+ return xResultSet;
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::getExportedKeys() -I- */
+Reference< XResultSet > SAL_CALL ODatabaseMetaData::getExportedKeys(
+ const Any& catalog ,
+ const OUString& schema ,
+ const OUString& table )
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("ODatabaseMetaData::getExportedKeys");
+ Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY);
+ std::vector< std::vector< Any > > rRows;
+ std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
+ sch(OUStringToOString(schema, m_rConnection.getConnectionEncoding()).getStr()),
+ tab(OUStringToOString(table, m_rConnection.getConnectionEncoding()).getStr());
+
+ try {
+ rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding();
+ std::auto_ptr< sql::ResultSet> rset( meta->getExportedKeys(cat, sch, tab));
+ sql::ResultSetMetaData * rs_meta = rset->getMetaData();
+ sal_uInt32 columns = rs_meta->getColumnCount();
+ while (rset->next()) {
+ std::vector< Any > aRow(1);
+ for (sal_uInt32 i = 1; i <= columns; i++) {
+ aRow.push_back(makeAny(mysqlc_sdbc_driver::convert(rset->getString(i), encoding)));
+ }
+ rRows.push_back(aRow);
+ }
+ } catch (sql::MethodNotImplementedException) {
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("ODatabaseMetaData::getExportedKeys", *this);
+ } catch (sql::InvalidArgumentException) {
+ mysqlc_sdbc_driver::throwInvalidArgumentException("ODatabaseMetaData::getExportedKeys", *this);
+ } catch (const sql::SQLException& e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_rConnection.getConnectionEncoding());
+ }
+
+ lcl_setRows_throw(xResultSet, 8, rRows);
+ return xResultSet;
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::getImportedKeys() -I- */
+Reference< XResultSet > SAL_CALL ODatabaseMetaData::getImportedKeys(
+ const Any& catalog,
+ const OUString& schema,
+ const OUString& table)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("ODatabaseMetaData::getImportedKeys");
+
+ Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY);
+ std::vector< std::vector< Any > > rRows;
+
+ std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
+ sch(OUStringToOString(schema, m_rConnection.getConnectionEncoding()).getStr()),
+ tab(OUStringToOString(table, m_rConnection.getConnectionEncoding()).getStr());
+
+ try {
+ rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding();
+ std::auto_ptr< sql::ResultSet> rset( meta->getImportedKeys(cat, sch, tab));
+ sql::ResultSetMetaData * rs_meta = rset->getMetaData();
+ sal_uInt32 columns = rs_meta->getColumnCount();
+ while (rset->next()) {
+ std::vector< Any > aRow(1);
+ for (sal_uInt32 i = 1; i <= columns; i++) {
+ aRow.push_back(makeAny(mysqlc_sdbc_driver::convert(rset->getString(i), encoding)));
+ }
+ rRows.push_back(aRow);
+ }
+ } catch (sql::MethodNotImplementedException) {
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("ODatabaseMetaData::getImportedKeys", *this);
+ } catch (sql::InvalidArgumentException) {
+ mysqlc_sdbc_driver::throwInvalidArgumentException("ODatabaseMetaData::getImportedKeys", *this);
+ } catch (const sql::SQLException& e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_rConnection.getConnectionEncoding());
+ }
+
+ lcl_setRows_throw(xResultSet,9,rRows);
+ return xResultSet;
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::getPrimaryKeys() -I- */
+Reference< XResultSet > SAL_CALL ODatabaseMetaData::getPrimaryKeys(
+ const Any& catalog,
+ const OUString& schema,
+ const OUString& table)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("ODatabaseMetaData::getPrimaryKeys");
+ Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY);
+ std::vector< std::vector< Any > > rRows;
+
+ std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
+ sch(OUStringToOString(schema, m_rConnection.getConnectionEncoding()).getStr()),
+ tab(OUStringToOString(table, m_rConnection.getConnectionEncoding()).getStr());
+
+ try {
+ rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding();
+ std::auto_ptr< sql::ResultSet> rset( meta->getPrimaryKeys(cat, sch, tab));
+ sql::ResultSetMetaData * rs_meta = rset->getMetaData();
+ sal_uInt32 columns = rs_meta->getColumnCount();
+ while (rset->next()) {
+ std::vector< Any > aRow(1);
+ for (sal_uInt32 i = 1; i <= columns; i++) {
+ aRow.push_back(makeAny(mysqlc_sdbc_driver::convert(rset->getString(i), encoding)));
+ }
+ rRows.push_back(aRow);
+ }
+ } catch (sql::MethodNotImplementedException) {
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("ODatabaseMetaData::getPrimaryKeys", *this);
+ } catch (sql::InvalidArgumentException) {
+ mysqlc_sdbc_driver::throwInvalidArgumentException("ODatabaseMetaData::getPrimaryKeys", *this);
+ } catch (const sql::SQLException& e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_rConnection.getConnectionEncoding());
+ }
+
+ lcl_setRows_throw(xResultSet, 10, rRows);
+ return xResultSet;
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::getIndexInfo() -I- */
+Reference< XResultSet > SAL_CALL ODatabaseMetaData::getIndexInfo(
+ const Any& catalog,
+ const OUString& schema,
+ const OUString& table,
+ sal_Bool unique,
+ sal_Bool approximate)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("ODatabaseMetaData::getIndexInfo");
+ Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY);
+ std::vector< std::vector< Any > > rRows;
+
+ std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
+ sch(OUStringToOString(schema, m_rConnection.getConnectionEncoding()).getStr()),
+ tab(OUStringToOString(table, m_rConnection.getConnectionEncoding()).getStr());
+
+ try {
+ rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding();
+ std::auto_ptr< sql::ResultSet> rset( meta->getIndexInfo(cat, sch, tab, unique, approximate));
+ sql::ResultSetMetaData * rs_meta = rset->getMetaData();
+ sal_uInt32 columns = rs_meta->getColumnCount();
+ while (rset->next()) {
+ std::vector< Any > aRow(1);
+ for (sal_uInt32 i = 1; i <= columns; i++) {
+ aRow.push_back(makeAny(mysqlc_sdbc_driver::convert(rset->getString(i), encoding)));
+ }
+ rRows.push_back(aRow);
+ }
+ } catch (sql::MethodNotImplementedException) {
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("ODatabaseMetaData::getIndexInfo", *this);
+ } catch (sql::InvalidArgumentException) {
+ mysqlc_sdbc_driver::throwInvalidArgumentException("ODatabaseMetaData::getIndexInfo", *this);
+ } catch (const sql::SQLException& e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_rConnection.getConnectionEncoding());
+ }
+
+ lcl_setRows_throw(xResultSet, 11, rRows);
+ return xResultSet;
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::getBestRowIdentifier() -I- */
+Reference< XResultSet > SAL_CALL ODatabaseMetaData::getBestRowIdentifier(
+ const Any& catalog,
+ const OUString& schema,
+ const OUString& table,
+ sal_Int32 scope,
+ sal_Bool nullable)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("ODatabaseMetaData::getBestRowIdentifier");
+ Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY);
+ std::vector< std::vector< Any > > rRows;
+
+ std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
+ sch(OUStringToOString(schema, m_rConnection.getConnectionEncoding()).getStr()),
+ tab(OUStringToOString(table, m_rConnection.getConnectionEncoding()).getStr());
+
+ try {
+ rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding();
+ std::auto_ptr< sql::ResultSet> rset( meta->getBestRowIdentifier(cat, sch, tab, scope, nullable));
+ sql::ResultSetMetaData * rs_meta = rset->getMetaData();
+ sal_uInt32 columns = rs_meta->getColumnCount();
+ while (rset->next()) {
+ std::vector< Any > aRow(1);
+ for (sal_uInt32 i = 1; i <= columns; i++) {
+ aRow.push_back(makeAny(mysqlc_sdbc_driver::convert(rset->getString(i), encoding)));
+ }
+ rRows.push_back(aRow);
+ }
+ } catch (sql::MethodNotImplementedException) {
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("ODatabaseMetaData::getBestRowIdentifier", *this);
+ } catch (sql::InvalidArgumentException) {
+ mysqlc_sdbc_driver::throwInvalidArgumentException("ODatabaseMetaData::getBestRowIdentifier", *this);
+ } catch (const sql::SQLException& e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_rConnection.getConnectionEncoding());
+ }
+
+ lcl_setRows_throw(xResultSet, 15, rRows);
+ return xResultSet;
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::getTablePrivileges() -I- */
+Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges(
+ const Any& catalog,
+ const OUString& schemaPattern,
+ const OUString& tableNamePattern)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("ODatabaseMetaData::getTablePrivileges");
+ Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY);
+ std::vector< std::vector< Any > > rRows;
+
+ std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
+ sPattern(OUStringToOString(schemaPattern, m_rConnection.getConnectionEncoding()).getStr()),
+ tPattern(OUStringToOString(tableNamePattern, m_rConnection.getConnectionEncoding()).getStr());
+
+ try {
+ static bool fakeTablePrivileges = false;
+ if (fakeTablePrivileges) {
+ static const sal_Char* allPrivileges[] = {
+ "ALTER", "DELETE", "DROP", "INDEX", "INSERT", "LOCK TABLES", "SELECT", "UPDATE"
+ };
+ Any userName; userName <<= getUserName();
+ for (size_t i = 0; i < sizeof( allPrivileges ) / sizeof( allPrivileges[0]); ++i) {
+ std::vector< Any > aRow;
+ aRow.push_back(makeAny( sal_Int32( i ) ));
+ aRow.push_back(catalog); // TABLE_CAT
+ aRow.push_back(makeAny( schemaPattern )); // TABLE_SCHEM
+ aRow.push_back(makeAny( tableNamePattern )); // TABLE_NAME
+ aRow.push_back(Any()); // GRANTOR
+ aRow.push_back(userName); // GRANTEE
+ aRow.push_back(makeAny( ::rtl::OUString::createFromAscii( allPrivileges[i] ) )); // PRIVILEGE
+ aRow.push_back(Any()); // IS_GRANTABLE
+
+ rRows.push_back(aRow);
+ }
+ } else {
+ rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding();
+ std::auto_ptr< sql::ResultSet> rset( meta->getTablePrivileges(cat, sPattern.compare("")? sPattern:wild, tPattern.compare("")? tPattern:wild));
+ sql::ResultSetMetaData * rs_meta = rset->getMetaData();
+ sal_uInt32 columns = rs_meta->getColumnCount();
+ while (rset->next()) {
+ std::vector< Any > aRow(1);
+ for (sal_uInt32 i = 1; i <= columns; i++) {
+ aRow.push_back(makeAny(mysqlc_sdbc_driver::convert(rset->getString(i), encoding)));
+ }
+ rRows.push_back(aRow);
+ }
+ }
+ } catch (sql::MethodNotImplementedException) {
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("ODatabaseMetaData::getTablePrivileges", *this);
+ } catch (sql::InvalidArgumentException) {
+ mysqlc_sdbc_driver::throwInvalidArgumentException("ODatabaseMetaData::getTablePrivileges", *this);
+ } catch (const sql::SQLException& e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_rConnection.getConnectionEncoding());
+ }
+
+ lcl_setRows_throw(xResultSet,12,rRows);
+ return xResultSet;
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::getCrossReference() -I- */
+Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCrossReference(
+ const Any& primaryCatalog,
+ const OUString& primarySchema,
+ const OUString& primaryTable,
+ const Any& foreignCatalog,
+ const OUString& foreignSchema,
+ const OUString& foreignTable)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("ODatabaseMetaData::getCrossReference");
+ Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY);
+ std::vector< std::vector< Any > > rRows;
+
+ std::string primaryCat(primaryCatalog.hasValue()? OUStringToOString(getStringFromAny(primaryCatalog), m_rConnection.getConnectionEncoding()).getStr():""),
+ foreignCat(foreignCatalog.hasValue()? OUStringToOString(getStringFromAny(foreignCatalog), m_rConnection.getConnectionEncoding()).getStr():""),
+ pSchema(OUStringToOString(primarySchema, m_rConnection.getConnectionEncoding()).getStr()),
+ pTable(OUStringToOString(primaryTable, m_rConnection.getConnectionEncoding()).getStr()),
+ fSchema(OUStringToOString(foreignSchema, m_rConnection.getConnectionEncoding()).getStr()),
+ fTable(OUStringToOString(foreignTable, m_rConnection.getConnectionEncoding()).getStr());
+
+ try {
+ rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding();
+ std::auto_ptr< sql::ResultSet> rset( meta->getCrossReference(primaryCat, pSchema, pTable, foreignCat, fSchema, fTable));
+ sql::ResultSetMetaData * rs_meta = rset->getMetaData();
+ sal_uInt32 columns = rs_meta->getColumnCount();
+ while (rset->next()) {
+ std::vector< Any > aRow(1);
+ for (sal_uInt32 i = 1; i <= columns; i++) {
+ aRow.push_back(makeAny(mysqlc_sdbc_driver::convert(rset->getString(i), encoding)));
+ }
+ rRows.push_back(aRow);
+ }
+ } catch (sql::MethodNotImplementedException) {
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("ODatabaseMetaData::getCrossReference", *this);
+ } catch (sql::InvalidArgumentException) {
+ mysqlc_sdbc_driver::throwInvalidArgumentException("ODatabaseMetaData::getCrossReference", *this);
+ } catch (const sql::SQLException& e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_rConnection.getConnectionEncoding());
+ }
+
+ lcl_setRows_throw(xResultSet,13,rRows);
+ return xResultSet;
+}
+/* }}} */
+
+
+/* {{{ ODatabaseMetaData::getUDTs() -I- */
+Reference< XResultSet > SAL_CALL ODatabaseMetaData::getUDTs(
+ const Any& /* catalog */,
+ const OUString& /* schemaPattern */,
+ const OUString& /* typeNamePattern */,
+ const Sequence< sal_Int32 >& /* types */)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("ODatabaseMetaData::getUDTs");
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("ODatabaseMetaData::getUDTs", *this);
+ return NULL;
+}
+/* }}} */
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noet sw=4 ts=4 fdm=marker
+ * vim<600: noet sw=4 ts=4
+ */
+
diff --git a/mysqlc/source/mysqlc_databasemetadata.hxx b/mysqlc/source/mysqlc_databasemetadata.hxx
new file mode 100644
index 000000000000..8e6680c3ac20
--- /dev/null
+++ b/mysqlc/source/mysqlc_databasemetadata.hxx
@@ -0,0 +1,243 @@
+/*************************************************************************
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2008 by Sun Microsystems, Inc.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* $RCSfile: mysqlc_databasemetadata.hxx,v $
+*
+* $Revision: 1.1.2.3 $
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org. If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+************************************************************************/
+
+#ifndef CONNECTIVITY_SDATABASEMETADATA_HXX
+#define CONNECTIVITY_SDATABASEMETADATA_HXX
+
+#include "mysqlc_connection.hxx"
+
+#ifndef _COM_SUN_STAR_SDBC_XDATABASEMETADATA_HPP_
+#include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
+#endif
+#ifndef _CPPUHELPER_IMPLBASE1_HXX_
+#include <cppuhelper/implbase1.hxx>
+#endif
+
+#include <cppconn/metadata.h>
+
+namespace connectivity
+{
+ namespace mysqlc
+ {
+ typedef ::com::sun::star::sdbc::SQLException my_SQLException;
+ typedef ::com::sun::star::uno::RuntimeException my_RuntimeException;
+ typedef ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > my_XResultSetRef;
+ using ::com::sun::star::uno::Any;
+ using ::rtl::OUString;
+
+ //**************************************************************
+ //************ Class: ODatabaseMetaData
+ //**************************************************************
+
+ typedef ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XDatabaseMetaData> ODatabaseMetaData_BASE;
+
+ class ODatabaseMetaData : public ODatabaseMetaData_BASE
+ {
+ OConnection& m_rConnection;
+ sal_Bool m_bUseCatalog;
+ protected:
+ sql::DatabaseMetaData * meta;
+ OUString identifier_quote_string;
+ bool identifier_quote_string_set;
+
+ private:
+ OUString impl_getStringMetaData( const sal_Char* _methodName, const std::string& (sql::DatabaseMetaData::*_Method)() );
+ OUString impl_getStringMetaData( const sal_Char* _methodName, std::string (sql::DatabaseMetaData::*_Method)() );
+ OUString impl_getStringMetaData( const sal_Char* _methodName, const sql::SQLString& (sql::DatabaseMetaData::*_Method)() );
+ OUString impl_getStringMetaData( const sal_Char* _methodName, sql::SQLString (sql::DatabaseMetaData::*_Method)() );
+ sal_Int32 impl_getInt32MetaData( const sal_Char* _methodName, unsigned int (sql::DatabaseMetaData::*_Method)() );
+ sal_Bool impl_getBoolMetaData( const sal_Char* _methodName, bool (sql::DatabaseMetaData::*_Method)() );
+ sal_Bool impl_getBoolMetaData( const sal_Char* _methodName, bool (sql::DatabaseMetaData::*_Method)(int), sal_Int32 _arg );
+ sal_Bool impl_getRSTypeMetaData( const sal_Char* _methodName, bool (sql::DatabaseMetaData::*_Method)(int), sal_Int32 _resultSetType );
+
+ public:
+ inline const OConnection& getOwnConnection() const { return m_rConnection; }
+
+ ODatabaseMetaData(OConnection& _rCon);
+ virtual ~ODatabaseMetaData();
+
+ // as I mentioned before this interface is really BIG
+ // XDatabaseMetaData
+ sal_Bool SAL_CALL allProceduresAreCallable() throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL allTablesAreSelectable() throw(my_SQLException, my_RuntimeException);
+ OUString SAL_CALL getURL() throw(my_SQLException, my_RuntimeException);
+ OUString SAL_CALL getUserName() throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL isReadOnly() throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL nullsAreSortedHigh() throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL nullsAreSortedLow() throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL nullsAreSortedAtStart() throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL nullsAreSortedAtEnd() throw(my_SQLException, my_RuntimeException);
+ OUString SAL_CALL getDatabaseProductName() throw(my_SQLException, my_RuntimeException);
+ OUString SAL_CALL getDatabaseProductVersion() throw(my_SQLException, my_RuntimeException);
+ OUString SAL_CALL getDriverName() throw(my_SQLException, my_RuntimeException);
+ OUString SAL_CALL getDriverVersion() throw(my_SQLException, my_RuntimeException);
+ sal_Int32 SAL_CALL getDriverMajorVersion() throw(my_RuntimeException);
+ sal_Int32 SAL_CALL getDriverMinorVersion() throw(my_RuntimeException);
+ sal_Bool SAL_CALL usesLocalFiles() throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL usesLocalFilePerTable() throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL supportsMixedCaseIdentifiers() throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL storesUpperCaseIdentifiers() throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL storesLowerCaseIdentifiers() throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL storesMixedCaseIdentifiers() throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL supportsMixedCaseQuotedIdentifiers() throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers() throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers() throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL storesMixedCaseQuotedIdentifiers() throw(my_SQLException, my_RuntimeException);
+ OUString SAL_CALL getIdentifierQuoteString() throw(my_SQLException, my_RuntimeException);
+ OUString SAL_CALL getSQLKeywords() throw(my_SQLException, my_RuntimeException);
+ OUString SAL_CALL getNumericFunctions() throw(my_SQLException, my_RuntimeException);
+ OUString SAL_CALL getStringFunctions() throw(my_SQLException, my_RuntimeException);
+ OUString SAL_CALL getSystemFunctions() throw(my_SQLException, my_RuntimeException);
+ OUString SAL_CALL getTimeDateFunctions() throw(my_SQLException, my_RuntimeException);
+ OUString SAL_CALL getSearchStringEscape() throw(my_SQLException, my_RuntimeException);
+ OUString SAL_CALL getExtraNameCharacters() throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL supportsAlterTableWithAddColumn() throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL supportsAlterTableWithDropColumn() throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL supportsColumnAliasing() throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL nullPlusNonNullIsNull() throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL supportsTypeConversion() throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL supportsConvert(sal_Int32 fromType, sal_Int32 toType)
+ throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL supportsTableCorrelationNames() throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL supportsDifferentTableCorrelationNames() throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL supportsExpressionsInOrderBy() throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL supportsOrderByUnrelated() throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL supportsGroupBy() throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL supportsGroupByUnrelated() throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL supportsGroupByBeyondSelect() throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL supportsLikeEscapeClause() throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL supportsMultipleResultSets() throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL supportsMultipleTransactions() throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL supportsNonNullableColumns() throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL supportsMinimumSQLGrammar() throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL supportsCoreSQLGrammar() throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL supportsExtendedSQLGrammar() throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL supportsANSI92EntryLevelSQL() throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL supportsANSI92IntermediateSQL() throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL supportsANSI92FullSQL() throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL supportsIntegrityEnhancementFacility()throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL supportsOuterJoins() throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL supportsFullOuterJoins() throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL supportsLimitedOuterJoins() throw(my_SQLException, my_RuntimeException);
+ OUString SAL_CALL getSchemaTerm() throw(my_SQLException, my_RuntimeException);
+ OUString SAL_CALL getProcedureTerm() throw(my_SQLException, my_RuntimeException);
+ OUString SAL_CALL getCatalogTerm() throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL isCatalogAtStart() throw(my_SQLException, my_RuntimeException);
+ OUString SAL_CALL getCatalogSeparator() throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL supportsSchemasInDataManipulation() throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL supportsSchemasInProcedureCalls() throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL supportsSchemasInTableDefinitions() throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL supportsSchemasInIndexDefinitions() throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions() throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL supportsCatalogsInDataManipulation() throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL supportsCatalogsInProcedureCalls() throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL supportsCatalogsInTableDefinitions() throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL supportsCatalogsInIndexDefinitions() throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL supportsCatalogsInPrivilegeDefinitions() throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL supportsPositionedDelete() throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL supportsPositionedUpdate() throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL supportsSelectForUpdate() throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL supportsStoredProcedures() throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL supportsSubqueriesInComparisons() throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL supportsSubqueriesInExists() throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL supportsSubqueriesInIns() throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL supportsSubqueriesInQuantifieds() throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL supportsCorrelatedSubqueries() throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL supportsUnion() throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL supportsUnionAll() throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL supportsOpenCursorsAcrossCommit() throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL supportsOpenCursorsAcrossRollback() throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL supportsOpenStatementsAcrossCommit() throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL supportsOpenStatementsAcrossRollback() throw(my_SQLException, my_RuntimeException);
+ sal_Int32 SAL_CALL getMaxBinaryLiteralLength() throw(my_SQLException, my_RuntimeException);
+ sal_Int32 SAL_CALL getMaxCharLiteralLength() throw(my_SQLException, my_RuntimeException);
+ sal_Int32 SAL_CALL getMaxColumnNameLength() throw(my_SQLException, my_RuntimeException);
+ sal_Int32 SAL_CALL getMaxColumnsInGroupBy() throw(my_SQLException, my_RuntimeException);
+ sal_Int32 SAL_CALL getMaxColumnsInIndex() throw(my_SQLException, my_RuntimeException);
+ sal_Int32 SAL_CALL getMaxColumnsInOrderBy() throw(my_SQLException, my_RuntimeException);
+ sal_Int32 SAL_CALL getMaxColumnsInSelect() throw(my_SQLException, my_RuntimeException);
+ sal_Int32 SAL_CALL getMaxColumnsInTable() throw(my_SQLException, my_RuntimeException);
+ sal_Int32 SAL_CALL getMaxConnections() throw(my_SQLException, my_RuntimeException);
+ sal_Int32 SAL_CALL getMaxCursorNameLength() throw(my_SQLException, my_RuntimeException);
+ sal_Int32 SAL_CALL getMaxIndexLength() throw(my_SQLException, my_RuntimeException);
+ sal_Int32 SAL_CALL getMaxSchemaNameLength() throw(my_SQLException, my_RuntimeException);
+ sal_Int32 SAL_CALL getMaxProcedureNameLength() throw(my_SQLException, my_RuntimeException);
+ sal_Int32 SAL_CALL getMaxCatalogNameLength() throw(my_SQLException, my_RuntimeException);
+ sal_Int32 SAL_CALL getMaxRowSize() throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL doesMaxRowSizeIncludeBlobs() throw(my_SQLException, my_RuntimeException);
+ sal_Int32 SAL_CALL getMaxStatementLength() throw(my_SQLException, my_RuntimeException);
+ sal_Int32 SAL_CALL getMaxStatements() throw(my_SQLException, my_RuntimeException);
+ sal_Int32 SAL_CALL getMaxTableNameLength() throw(my_SQLException, my_RuntimeException);
+ sal_Int32 SAL_CALL getMaxTablesInSelect() throw(my_SQLException, my_RuntimeException);
+ sal_Int32 SAL_CALL getMaxUserNameLength() throw(my_SQLException, my_RuntimeException);
+ sal_Int32 SAL_CALL getDefaultTransactionIsolation() throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL supportsTransactions() throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL supportsTransactionIsolationLevel(sal_Int32 level)
+ throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL supportsDataDefinitionAndDataManipulationTransactions()
+ throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly()throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit() throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions() throw(my_SQLException, my_RuntimeException);
+ my_XResultSetRef SAL_CALL getProcedures(const Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern) throw(my_SQLException, my_RuntimeException);
+ my_XResultSetRef SAL_CALL getProcedureColumns(const Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern, const OUString& columnNamePattern) throw(my_SQLException, my_RuntimeException);
+ my_XResultSetRef SAL_CALL getTables(const Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const ::com::sun::star::uno::Sequence< OUString >& types) throw(my_SQLException, my_RuntimeException);
+ my_XResultSetRef SAL_CALL getSchemas() throw(my_SQLException, my_RuntimeException);
+ my_XResultSetRef SAL_CALL getCatalogs() throw(my_SQLException, my_RuntimeException);
+ my_XResultSetRef SAL_CALL getTableTypes() throw(my_SQLException, my_RuntimeException);
+ my_XResultSetRef SAL_CALL getColumns(const Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern) throw(my_SQLException, my_RuntimeException);
+ my_XResultSetRef SAL_CALL getColumnPrivileges(const Any& catalog, const OUString& schema, const OUString& table, const OUString& columnNamePattern) throw(my_SQLException, my_RuntimeException);
+ my_XResultSetRef SAL_CALL getTablePrivileges(const Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern) throw(my_SQLException, my_RuntimeException);
+ my_XResultSetRef SAL_CALL getBestRowIdentifier(const Any& catalog, const OUString& schema, const OUString& table, sal_Int32 scope, sal_Bool nullable) throw(my_SQLException, my_RuntimeException);
+ my_XResultSetRef SAL_CALL getVersionColumns(const Any& catalog, const OUString& schema, const OUString& table) throw(my_SQLException, my_RuntimeException);
+ my_XResultSetRef SAL_CALL getPrimaryKeys(const Any& catalog, const OUString& schema, const OUString& table) throw(my_SQLException, my_RuntimeException);
+ my_XResultSetRef SAL_CALL getImportedKeys(const Any& catalog, const OUString& schema, const OUString& table) throw(my_SQLException, my_RuntimeException);
+ my_XResultSetRef SAL_CALL getExportedKeys(const Any& catalog, const OUString& schema, const OUString& table) throw(my_SQLException, my_RuntimeException);
+ my_XResultSetRef SAL_CALL getCrossReference(const Any& primaryCatalog, const OUString& primarySchema, const OUString& primaryTable, const Any& foreignCatalog, const OUString& foreignSchema, const OUString& foreignTable) throw(my_SQLException, my_RuntimeException);
+ my_XResultSetRef SAL_CALL getTypeInfo() throw(my_SQLException, my_RuntimeException);
+ my_XResultSetRef SAL_CALL getIndexInfo(const Any& catalog, const OUString& schema, const OUString& table, sal_Bool unique, sal_Bool approximate) throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL supportsResultSetType(sal_Int32 setType) throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL supportsResultSetConcurrency(sal_Int32 setType, sal_Int32 concurrency) throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL ownUpdatesAreVisible(sal_Int32 setType) throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL ownDeletesAreVisible(sal_Int32 setType) throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL ownInsertsAreVisible(sal_Int32 setType) throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL othersUpdatesAreVisible(sal_Int32 setType)throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL othersDeletesAreVisible(sal_Int32 setType)throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL othersInsertsAreVisible(sal_Int32 setType)throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL updatesAreDetected(sal_Int32 setType) throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL deletesAreDetected(sal_Int32 setType) throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL insertsAreDetected(sal_Int32 setType) throw(my_SQLException, my_RuntimeException);
+ sal_Bool SAL_CALL supportsBatchUpdates() throw(my_SQLException, my_RuntimeException);
+ my_XResultSetRef SAL_CALL getUDTs(const Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const ::com::sun::star::uno::Sequence< sal_Int32 >& types) throw(my_SQLException, my_RuntimeException);
+ ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection() throw(my_SQLException, my_RuntimeException);
+ };
+ }
+}
+
+#endif // CONNECTIVITY_SDATABASEMETADATA_HXX
diff --git a/mysqlc/source/mysqlc_driver.cxx b/mysqlc/source/mysqlc_driver.cxx
new file mode 100644
index 000000000000..af312af89d00
--- /dev/null
+++ b/mysqlc/source/mysqlc_driver.cxx
@@ -0,0 +1,368 @@
+/*************************************************************************
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2008 by Sun Microsystems, Inc.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* $RCSfile: mysqlc_driver.cxx,v $
+*
+* $Revision: 1.1.2.5 $
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org. If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+************************************************************************/
+#include "mysqlc_driver.hxx"
+#include "mysqlc_connection.hxx"
+#include "mysqlc_general.hxx"
+
+using namespace com::sun::star::uno;
+using namespace com::sun::star::lang;
+using namespace com::sun::star::beans;
+using namespace com::sun::star::sdbc;
+using namespace connectivity::mysqlc;
+using ::rtl::OUString;
+#include <stdio.h>
+
+#include <cppconn/exception.h>
+
+#ifdef SYSTEM_MYSQL_CPPCONN
+ #include <mysql_driver.h>
+#endif
+
+
+/* {{{ MysqlCDriver::MysqlCDriver() -I- */
+MysqlCDriver::MysqlCDriver(const Reference< XMultiServiceFactory >& _rxFactory)
+ : ODriver_BASE(m_aMutex)
+ ,m_xFactory(_rxFactory)
+#ifndef SYSTEM_MYSQL_CPPCONN
+ ,m_hCppConnModule( NULL )
+ ,m_bAttemptedLoadCppConn( false )
+#endif
+{
+ OSL_TRACE("MysqlCDriver::MysqlCDriver");
+ cppDriver = NULL;
+}
+/* }}} */
+
+
+/* {{{ MysqlCDriver::disposing() -I- */
+void MysqlCDriver::disposing()
+{
+ OSL_TRACE("MysqlCDriver::disposing");
+ ::osl::MutexGuard aGuard(m_aMutex);
+
+ // when driver will be destroied so all our connections have to be destroied as well
+ for (OWeakRefArray::iterator i = m_xConnections.begin(); m_xConnections.end() != i; ++i)
+ {
+ Reference< XComponent > xComp(i->get(), UNO_QUERY);
+ if (xComp.is()) {
+ xComp->dispose();
+ }
+ }
+ m_xConnections.clear();
+
+ ODriver_BASE::disposing();
+}
+/* }}} */
+
+
+// static ServiceInfo
+/* {{{ MysqlCDriver::getImplementationName_Static() -I- */
+OUString MysqlCDriver::getImplementationName_Static()
+ throw(RuntimeException)
+{
+ OSL_TRACE("MysqlCDriver::getImplementationName_Static");
+ return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.sdbc.mysqlc.MysqlCDriver" ) );
+}
+/* }}} */
+
+
+/* {{{ MysqlCDriver::getSupportedServiceNames_Static() -I- */
+Sequence< OUString > MysqlCDriver::getSupportedServiceNames_Static()
+ throw(RuntimeException)
+{
+ OSL_TRACE("MysqlCDriver::getSupportedServiceNames_Static");
+ // which service is supported
+ // for more information @see com.sun.star.sdbc.Driver
+ Sequence< OUString > aSNS(1);
+ aSNS[0] = OUString::createFromAscii("com.sun.star.sdbc.Driver");
+ return aSNS;
+}
+/* }}} */
+
+
+/* {{{ MysqlCDriver::getImplementationName() -I- */
+OUString SAL_CALL MysqlCDriver::getImplementationName()
+ throw(RuntimeException)
+{
+ OSL_TRACE("MysqlCDriver::getImplementationName");
+ return getImplementationName_Static();
+}
+/* }}} */
+
+
+/* {{{ MysqlCDriver::supportsService() -I- */
+sal_Bool SAL_CALL MysqlCDriver::supportsService(const OUString& _rServiceName)
+ throw(RuntimeException)
+{
+ OSL_TRACE("MysqlCDriver::supportsService");
+ Sequence< OUString > aSupported(getSupportedServiceNames());
+ const OUString* pSupported = aSupported.getConstArray();
+ const OUString* pEnd = pSupported + aSupported.getLength();
+ for (;pSupported != pEnd && !pSupported->equals(_rServiceName); ++pSupported){}
+
+ return (pSupported != pEnd);
+}
+/* }}} */
+
+
+/* {{{ MysqlCDriver::getSupportedServiceNames() -I- */
+Sequence< OUString > SAL_CALL MysqlCDriver::getSupportedServiceNames()
+ throw(RuntimeException)
+{
+ OSL_TRACE("MysqlCDriver::getSupportedServiceNames");
+ return getSupportedServiceNames_Static();
+}
+/* }}} */
+
+
+extern "C" { static void SAL_CALL thisModule() {} }
+
+void MysqlCDriver::impl_initCppConn_lck_throw()
+{
+#ifdef SYSTEM_MYSQL_CPPCONN
+ cppDriver = get_driver_instance();
+#else
+ if ( !m_bAttemptedLoadCppConn )
+ {
+ const ::rtl::OUString sModuleName = ::rtl::OUString::createFromAscii( CPPCONN_LIB );
+ m_hCppConnModule = osl_loadModuleRelative( &thisModule, sModuleName.pData, 0 );
+ m_bAttemptedLoadCppConn = true;
+ }
+
+ // attempted to load - was it successful?
+ if ( !m_hCppConnModule )
+ {
+ OSL_ENSURE( false, "MysqlCDriver::impl_initCppConn_lck_throw: could not load the " CPPCONN_LIB " library!");
+ throw SQLException(
+ ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Unable to load the " CPPCONN_LIB " library." ) ),
+ *this,
+ ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "08001" ) ), // "unable to connect"
+ 0,
+ Any()
+ );
+ }
+
+ // find the factory symbol
+ const ::rtl::OUString sSymbolName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "sql_mysql_get_driver_instance" ) );
+ typedef void* (* FGetMySQLDriver)();
+
+ const FGetMySQLDriver pFactoryFunction = (FGetMySQLDriver)( osl_getFunctionSymbol( m_hCppConnModule, sSymbolName.pData ) );
+ if ( !pFactoryFunction )
+ {
+ OSL_ENSURE( false, "MysqlCDriver::impl_initCppConn_lck_throw: could not find the factory symbol in " CPPCONN_LIB "!");
+ throw SQLException(
+ ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CPPCONN_LIB " is invalid: missing the driver factory function." ) ),
+ *this,
+ ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "08001" ) ), // "unable to connect"
+ 0,
+ Any()
+ );
+ }
+
+ cppDriver = static_cast< sql::Driver* >( (*pFactoryFunction)() );
+#endif
+ if ( !cppDriver )
+ {
+ throw SQLException(
+ ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Unable to obtain the MySQL_Driver instance from Connector/C++." ) ),
+ *this,
+ ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "08001" ) ), // "unable to connect"
+ 0,
+ Any()
+ );
+ }
+}
+
+/* {{{ MysqlCDriver::connect() -I- */
+Reference< XConnection > SAL_CALL MysqlCDriver::connect(const OUString& url, const Sequence< PropertyValue >& info)
+ throw(SQLException, RuntimeException)
+{
+ ::osl::MutexGuard aGuard( m_aMutex );
+
+ OSL_TRACE("MysqlCDriver::connect");
+ if (!acceptsURL(url)) {
+ return NULL;
+ }
+
+ if ( !cppDriver )
+ {
+ impl_initCppConn_lck_throw();
+ OSL_POSTCOND( cppDriver, "MySQLCDriver::connect: internal error." );
+ if ( !cppDriver )
+ throw RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MySQLCDriver::connect: internal error." ) ), *this );
+ }
+
+ Reference< XConnection > xConn;
+ // create a new connection with the given properties and append it to our vector
+ try {
+ OConnection* pCon = new OConnection(*this, cppDriver);
+ xConn = pCon;
+
+ pCon->construct(url,info);
+ m_xConnections.push_back(WeakReferenceHelper(*pCon));
+ }
+ catch (sql::SQLException &e)
+ {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, getDefaultEncoding());
+ }
+ return xConn;
+}
+/* }}} */
+
+
+/* {{{ MysqlCDriver::acceptsURL() -I- */
+sal_Bool SAL_CALL MysqlCDriver::acceptsURL(const OUString& url)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("MysqlCDriver::acceptsURL");
+ return (!url.compareTo(OUString::createFromAscii("sdbc:mysqlc:"), sizeof("sdbc:mysqlc:")-1));
+}
+/* }}} */
+
+
+/* {{{ MysqlCDriver::getPropertyInfo() -I- */
+Sequence< DriverPropertyInfo > SAL_CALL MysqlCDriver::getPropertyInfo(const OUString& url, const Sequence< PropertyValue >& /* info */)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("MysqlCDriver::getPropertyInfo");
+ if (acceptsURL(url)) {
+ ::std::vector< DriverPropertyInfo > aDriverInfo;
+
+ aDriverInfo.push_back(DriverPropertyInfo(
+ OUString(RTL_CONSTASCII_USTRINGPARAM("Hostname"))
+ ,OUString(RTL_CONSTASCII_USTRINGPARAM("Name of host"))
+ ,sal_True
+ ,OUString::createFromAscii("localhost")
+ ,Sequence< OUString >())
+ );
+ aDriverInfo.push_back(DriverPropertyInfo(
+ OUString(RTL_CONSTASCII_USTRINGPARAM("Port"))
+ ,OUString(RTL_CONSTASCII_USTRINGPARAM("Port"))
+ ,sal_True
+ ,OUString::createFromAscii("3306")
+ ,Sequence< OUString >())
+ );
+ return Sequence< DriverPropertyInfo >(&(aDriverInfo[0]),aDriverInfo.size());
+ }
+
+ return Sequence< DriverPropertyInfo >();
+}
+/* }}} */
+
+
+/* {{{ MysqlCDriver::getMajorVersion() -I- */
+sal_Int32 SAL_CALL MysqlCDriver::getMajorVersion()
+ throw(RuntimeException)
+{
+ OSL_TRACE("MysqlCDriver::getMajorVersion");
+ return MYSQLC_VERSION_MAJOR;
+}
+/* }}} */
+
+
+/* {{{ MysqlCDriver::getMinorVersion() -I- */
+sal_Int32 SAL_CALL MysqlCDriver::getMinorVersion()
+ throw(RuntimeException)
+{
+ OSL_TRACE("MysqlCDriver::getMinorVersion");
+ return MYSQLC_VERSION_MINOR;
+}
+/* }}} */
+
+
+namespace connectivity
+{
+namespace mysqlc
+{
+
+Reference< XInterface > SAL_CALL MysqlCDriver_CreateInstance(const Reference< XMultiServiceFactory >& _rxFactory)
+ throw(::com::sun::star::uno::Exception)
+{
+ return(*(new MysqlCDriver(_rxFactory)));
+}
+
+/* {{{ connectivity::mysqlc::release() -I- */
+void release(oslInterlockedCount& _refCount,
+ ::cppu::OBroadcastHelper& rBHelper,
+ Reference< XInterface >& _xInterface,
+ ::com::sun::star::lang::XComponent* _pObject)
+{
+ if (osl_decrementInterlockedCount(&_refCount) == 0) {
+ osl_incrementInterlockedCount(&_refCount);
+
+ if (!rBHelper.bDisposed && !rBHelper.bInDispose) {
+ // remember the parent
+ Reference< XInterface > xParent;
+ {
+ ::osl::MutexGuard aGuard(rBHelper.rMutex);
+ xParent = _xInterface;
+ _xInterface = NULL;
+ }
+
+ // First dispose
+ _pObject->dispose();
+
+ // only the alive ref holds the object
+ OSL_ASSERT(_refCount == 1);
+
+ // release the parent in the destructor
+ if (xParent.is()) {
+ ::osl::MutexGuard aGuard(rBHelper.rMutex);
+ _xInterface = xParent;
+ }
+ }
+ } else {
+ osl_incrementInterlockedCount(&_refCount);
+ }
+}
+/* }}} */
+
+
+
+/* {{{ connectivity::mysqlc::checkDisposed() -I- */
+void checkDisposed(sal_Bool _bThrow)
+ throw (DisposedException)
+{
+ if (_bThrow) {
+ throw DisposedException();
+ }
+}
+/* }}} */
+
+} /* mysqlc */
+} /* connectivity */
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noet sw=4 ts=4 fdm=marker
+ * vim<600: noet sw=4 ts=4
+ */
diff --git a/mysqlc/source/mysqlc_driver.hxx b/mysqlc/source/mysqlc_driver.hxx
new file mode 100644
index 000000000000..ede8eb9002f0
--- /dev/null
+++ b/mysqlc/source/mysqlc_driver.hxx
@@ -0,0 +1,118 @@
+/*************************************************************************
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2008 by Sun Microsystems, Inc.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* $RCSfile: mysqlc_driver.hxx,v $
+*
+* $Revision: 1.1.2.4 $
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org. If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+************************************************************************/
+
+#ifndef MYSQLC_SDRIVER_HXX
+#define MYSQLC_SDRIVER_HXX
+
+#include "mysqlc_connection.hxx"
+
+#include <com/sun/star/sdbc/XDriver.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+
+#include <cppuhelper/compbase2.hxx>
+#include <cppconn/driver.h>
+#include <osl/module.h>
+
+namespace connectivity
+{
+ namespace mysqlc
+ {
+ using ::rtl::OUString;
+ using ::com::sun::star::sdbc::SQLException;
+ using ::com::sun::star::uno::RuntimeException;
+ using ::com::sun::star::uno::Exception;
+ using ::com::sun::star::uno::Reference;
+ using ::com::sun::star::uno::Sequence;
+ Reference< ::com::sun::star::uno::XInterface > SAL_CALL MysqlCDriver_CreateInstance(const Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) throw(Exception);
+
+ typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::sdbc::XDriver,
+ ::com::sun::star::lang::XServiceInfo > ODriver_BASE;
+
+ typedef void* (SAL_CALL * OMysqlCConnection_CreateInstanceFunction)(void* _pDriver);
+
+ class MysqlCDriver : public ODriver_BASE
+ {
+ protected:
+ Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xFactory;
+ ::osl::Mutex m_aMutex; // mutex is need to control member access
+ OWeakRefArray m_xConnections; // vector containing a list
+ // of all the Connection objects
+ // for this Driver
+#ifndef SYSTEM_MYSQL_CPPCONN
+ oslModule m_hCppConnModule;
+ bool m_bAttemptedLoadCppConn;
+#endif
+
+ sql::Driver * cppDriver;
+
+ public:
+
+ MysqlCDriver(const Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory);
+
+ // OComponentHelper
+ void SAL_CALL disposing(void);
+ // XInterface
+ static OUString getImplementationName_Static() throw(RuntimeException);
+ static Sequence< OUString > getSupportedServiceNames_Static() throw(RuntimeException);
+
+ // XServiceInfo
+ OUString SAL_CALL getImplementationName() throw(RuntimeException);
+ sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(RuntimeException);
+ Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException);
+
+ // XDriver
+ Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL connect(const OUString& url, const Sequence< ::com::sun::star::beans::PropertyValue >& info)
+ throw(SQLException, RuntimeException);
+
+ sal_Bool SAL_CALL acceptsURL(const OUString& url) throw(SQLException, RuntimeException);
+ Sequence< ::com::sun::star::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo(const OUString& url, const Sequence< ::com::sun::star::beans::PropertyValue >& info)
+ throw(SQLException, RuntimeException);
+
+ sal_Int32 SAL_CALL getMajorVersion() throw(RuntimeException);
+ sal_Int32 SAL_CALL getMinorVersion() throw(RuntimeException);
+
+ inline Reference< ::com::sun::star::lang::XMultiServiceFactory > getFactory() const { return m_xFactory; }
+
+ rtl_TextEncoding getDefaultEncoding() { return RTL_TEXTENCODING_UTF8; }
+
+ private:
+ void impl_initCppConn_lck_throw();
+ };
+ } /* mysqlc */
+} /* connectivity */
+
+#endif // MYSQLC_SDRIVER_HXX
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noet sw=4 ts=4 fdm=marker
+ * vim<600: noet sw=4 ts=4
+ */
diff --git a/mysqlc/source/mysqlc_general.cxx b/mysqlc/source/mysqlc_general.cxx
new file mode 100644
index 000000000000..54058f0cef8c
--- /dev/null
+++ b/mysqlc/source/mysqlc_general.cxx
@@ -0,0 +1,176 @@
+/*************************************************************************
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2008 by Sun Microsystems, Inc.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* $RCSfile: mysqlc_general.cxx,v $
+*
+* $Revision: 1.1.2.3 $
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org. If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+************************************************************************/
+#include "mysqlc_general.hxx"
+#include "mysqlc_resultsetmetadata.hxx"
+
+#include <cppconn/exception.h>
+#include <cppconn/datatype.h>
+
+using com::sun::star::sdbc::SQLException;
+
+using com::sun::star::uno::UNO_QUERY;
+using com::sun::star::uno::Reference;
+using com::sun::star::uno::XInterface;
+using com::sun::star::uno::Any;
+using ::rtl::OUString;
+
+namespace mysqlc_sdbc_driver
+{
+// -----------------------------------------------------------------------------
+void throwFeatureNotImplementedException( const sal_Char* _pAsciiFeatureName, const Reference< XInterface >& _rxContext, const Any* _pNextException )
+ throw (SQLException)
+{
+ const ::rtl::OUString sMessage = ::rtl::OUString::createFromAscii( _pAsciiFeatureName ) + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": feature not implemented." ) );
+ throw SQLException(
+ sMessage,
+ _rxContext,
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HYC00")),
+ 0,
+ _pNextException ? *_pNextException : Any()
+ );
+}
+
+
+void throwInvalidArgumentException( const sal_Char* _pAsciiFeatureName, const Reference< XInterface >& _rxContext, const Any* _pNextException )
+ throw (SQLException)
+{
+ const ::rtl::OUString sMessage = ::rtl::OUString::createFromAscii( _pAsciiFeatureName ) + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": invalid arguments." ) );
+ throw SQLException(
+ sMessage,
+ _rxContext,
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HYC00")),
+ 0,
+ _pNextException ? *_pNextException : Any()
+ );
+}
+
+void translateAndThrow(const ::sql::SQLException& _error, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _context, const rtl_TextEncoding encoding)
+{
+ throw SQLException(
+ convert(_error.what(), encoding),
+ _context,
+ convert(_error.getSQLState(), encoding),
+ _error.getErrorCode(),
+ Any()
+ );
+}
+
+
+OUString getStringFromAny(const Any& _rAny)
+{
+ OUString nReturn;
+ OSL_VERIFY( _rAny >>= nReturn );
+ return nReturn;
+}
+
+
+int mysqlToOOOType(int cppConnType)
+ throw ()
+{
+ switch (cppConnType) {
+ case sql::DataType::BIT:
+ return com::sun::star::sdbc::DataType::VARCHAR;
+
+ case sql::DataType::TINYINT:
+ return com::sun::star::sdbc::DataType::TINYINT;
+
+ case sql::DataType::SMALLINT:
+ return com::sun::star::sdbc::DataType::SMALLINT;
+
+ case sql::DataType::INTEGER:
+ return com::sun::star::sdbc::DataType::INTEGER;
+
+ case sql::DataType::BIGINT:
+ return com::sun::star::sdbc::DataType::BIGINT;
+
+ case sql::DataType::REAL:
+ return com::sun::star::sdbc::DataType::REAL;
+
+ case sql::DataType::DOUBLE:
+ return com::sun::star::sdbc::DataType::DOUBLE;
+
+ case sql::DataType::DECIMAL:
+ return com::sun::star::sdbc::DataType::DECIMAL;
+
+ case sql::DataType::CHAR:
+ return com::sun::star::sdbc::DataType::CHAR;
+
+ case sql::DataType::BINARY:
+ return com::sun::star::sdbc::DataType::BINARY;
+
+ case sql::DataType::ENUM:
+ case sql::DataType::SET:
+ case sql::DataType::VARCHAR:
+ return com::sun::star::sdbc::DataType::VARCHAR;
+
+ case sql::DataType::VARBINARY:
+ return com::sun::star::sdbc::DataType::VARBINARY;
+
+ case sql::DataType::LONGVARCHAR:
+ return com::sun::star::sdbc::DataType::LONGVARCHAR;
+
+ case sql::DataType::LONGVARBINARY:
+ return com::sun::star::sdbc::DataType::LONGVARBINARY;
+
+ case sql::DataType::TIMESTAMP:
+ return com::sun::star::sdbc::DataType::TIMESTAMP;
+
+ case sql::DataType::DATE:
+ return com::sun::star::sdbc::DataType::DATE;
+
+ case sql::DataType::TIME:
+ return com::sun::star::sdbc::DataType::TIME;
+
+ case sql::DataType::GEOMETRY:
+ return com::sun::star::sdbc::DataType::VARCHAR;
+
+ case sql::DataType::SQLNULL:
+ return com::sun::star::sdbc::DataType::SQLNULL;
+
+ case sql::DataType::UNKNOWN:
+ return com::sun::star::sdbc::DataType::VARCHAR;
+ }
+
+ OSL_ENSURE( false, "mysqlToOOOType: unhandled case, falling back to VARCHAR" );
+ return com::sun::star::sdbc::DataType::VARCHAR;
+}
+
+
+::rtl::OUString convert(const ::std::string& _string, const rtl_TextEncoding encoding)
+{
+ return ::rtl::OUString( _string.c_str(), _string.size(), encoding );
+}
+
+::std::string convert(const ::rtl::OUString& _string, const rtl_TextEncoding encoding)
+{
+ return ::std::string( ::rtl::OUStringToOString( _string, encoding ).getStr() );
+}
+
+
+} /* namespace */
diff --git a/mysqlc/source/mysqlc_general.hxx b/mysqlc/source/mysqlc_general.hxx
new file mode 100644
index 000000000000..43cf1c8ef86e
--- /dev/null
+++ b/mysqlc/source/mysqlc_general.hxx
@@ -0,0 +1,66 @@
+/*************************************************************************
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2008 by Sun Microsystems, Inc.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* $RCSfile: mysqlc_general.hxx,v $
+*
+* $Revision: 1.1.2.3 $
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org. If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+************************************************************************/
+
+#ifndef _MYSQLC_GENERAL_
+#define _MYSQLC_GENERAL_
+
+#include <cppconn/exception.h>
+
+#include <com/sun/star/uno/XInterface.hpp>
+#include <com/sun/star/sdbc/SQLException.hpp>
+
+namespace mysqlc_sdbc_driver
+{
+ rtl::OUString getStringFromAny(const ::com::sun::star::uno::Any& _rAny);
+
+ void throwFeatureNotImplementedException(
+ const sal_Char* _pAsciiFeatureName,
+ const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxContext,
+ const ::com::sun::star::uno::Any* _pNextException = NULL
+ )
+ throw (::com::sun::star::sdbc::SQLException);
+
+ void throwInvalidArgumentException(
+ const sal_Char* _pAsciiFeatureName,
+ const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxContext,
+ const ::com::sun::star::uno::Any* _pNextException = NULL
+ )
+ throw (::com::sun::star::sdbc::SQLException);
+
+ void translateAndThrow(const ::sql::SQLException& _error, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _context, const rtl_TextEncoding encoding);
+
+ int mysqlToOOOType(int mysqlType) throw ();
+
+
+ ::rtl::OUString convert(const ::std::string& _string, const rtl_TextEncoding encoding);
+
+ ::std::string convert(const ::rtl::OUString& _string, const rtl_TextEncoding encoding);
+}
+
+#endif
diff --git a/mysqlc/source/mysqlc_preparedstatement.cxx b/mysqlc/source/mysqlc_preparedstatement.cxx
new file mode 100644
index 000000000000..a6c1cedb2acb
--- /dev/null
+++ b/mysqlc/source/mysqlc_preparedstatement.cxx
@@ -0,0 +1,944 @@
+/*************************************************************************
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2008 by Sun Microsystems, Inc.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* $RCSfile: mysqlc_preparedstatement.cxx,v $
+*
+* $Revision: 1.1.2.5 $
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org. If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+************************************************************************/
+
+#include "mysqlc_general.hxx"
+#include "mysqlc_preparedstatement.hxx"
+#include "mysqlc_propertyids.hxx"
+#include "mysqlc_resultsetmetadata.hxx"
+
+#include <com/sun/star/lang/DisposedException.hpp>
+#include <com/sun/star/sdbc/DataType.hpp>
+
+#include <cppconn/connection.h>
+#include <cppconn/exception.h>
+#include <cppconn/parameter_metadata.h>
+#include <cppconn/prepared_statement.h>
+#include <cppconn/statement.h>
+#include <cppuhelper/typeprovider.hxx>
+#include <osl/diagnose.h>
+
+#include <stdio.h>
+
+using namespace connectivity::mysqlc;
+using namespace com::sun::star::uno;
+using namespace com::sun::star::lang;
+using namespace com::sun::star::beans;
+using namespace com::sun::star::sdbc;
+using namespace com::sun::star::container;
+using namespace com::sun::star::io;
+using namespace com::sun::star::util;
+using ::osl::MutexGuard;
+using mysqlc_sdbc_driver::getStringFromAny;
+
+
+/* {{{ my_i_to_a() -I- */
+static inline char * my_i_to_a(char * buf, size_t buf_size, int a)
+{
+ snprintf(buf, buf_size, "%d", a);
+ return buf;
+}
+/* }}} */
+
+
+IMPLEMENT_SERVICE_INFO(OPreparedStatement,"com.sun.star.sdbcx.mysqlc.PreparedStatement","com.sun.star.sdbc.PreparedStatement");
+
+
+/* {{{ OPreparedStatement::OPreparedStatement() -I- */
+OPreparedStatement::OPreparedStatement(OConnection* _pConnection, sql::PreparedStatement * _cppPrepStmt)
+ :OCommonStatement(_pConnection, _cppPrepStmt)
+{
+ OSL_TRACE("OPreparedStatement::OPreparedStatement");
+ m_pConnection = _pConnection;
+ m_pConnection->acquire();
+
+ try {
+ m_paramCount = ((sql::PreparedStatement *)cppStatement)->getParameterMetaData()->getParameterCount();
+ } catch (sql::SQLException &e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding());
+ }
+}
+/* }}} */
+
+
+/* {{{ OPreparedStatement::~OPreparedStatement() -I- */
+OPreparedStatement::~OPreparedStatement()
+{
+ OSL_TRACE("OPreparedStatement::~OPreparedStatement");
+}
+/* }}} */
+
+
+/* {{{ OPreparedStatement::acquire() -I- */
+void SAL_CALL OPreparedStatement::acquire()
+ throw()
+{
+ OSL_TRACE("OPreparedStatement::acquire");
+ OCommonStatement::acquire();
+}
+/* }}} */
+
+
+/* {{{ OPreparedStatement::release() -I- */
+void SAL_CALL OPreparedStatement::release()
+ throw()
+{
+ OSL_TRACE("OPreparedStatement::release");
+ OCommonStatement::release();
+}
+/* }}} */
+
+
+/* {{{ OPreparedStatement::queryInterface() -I- */
+Any SAL_CALL OPreparedStatement::queryInterface(const Type & rType)
+ throw(RuntimeException)
+{
+ OSL_TRACE("OPreparedStatement::queryInterface");
+ Any aRet = OCommonStatement::queryInterface(rType);
+ if (!aRet.hasValue()) {
+ aRet = OPreparedStatement_BASE::queryInterface(rType);
+ }
+ return (aRet);
+}
+/* }}} */
+
+
+/* {{{ OPreparedStatement::getPropertySetInfo() -I- */
+Sequence< Type > SAL_CALL OPreparedStatement::getTypes()
+ throw(RuntimeException)
+{
+ OSL_TRACE("OPreparedStatement::getTypes");
+ return concatSequences(OPreparedStatement_BASE::getTypes(), OCommonStatement::getTypes());
+}
+/* }}} */
+
+
+/* {{{ OPreparedStatement::getMetaData() -I- */
+Reference< XResultSetMetaData > SAL_CALL OPreparedStatement::getMetaData()
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OPreparedStatement::getMetaData");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OPreparedStatement::rBHelper.bDisposed);
+
+ try {
+ if (!m_xMetaData.is()) {
+ m_xMetaData = new OResultSetMetaData(
+ ((sql::PreparedStatement *)cppStatement)->getMetaData(),
+ getOwnConnection()->getConnectionEncoding()
+ );
+ }
+ } catch (sql::MethodNotImplementedException) {
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::getMetaData", *this);
+ } catch (sql::SQLException &e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding());
+ }
+ return m_xMetaData;
+}
+/* }}} */
+
+
+/* {{{ OPreparedStatement::close() -I- */
+void SAL_CALL OPreparedStatement::close()
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OPreparedStatement::close");
+
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OPreparedStatement::rBHelper.bDisposed);
+
+ try {
+ clearWarnings();
+ clearParameters();
+ OCommonStatement::close();
+ } catch (SQLException) {
+ // If we get an error, ignore
+ }
+
+ // Remove this Statement object from the Connection object's
+ // list
+}
+/* }}} */
+
+
+/* {{{ OPreparedStatement::execute() -I- */
+sal_Bool SAL_CALL OPreparedStatement::execute()
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OPreparedStatement::execute");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OPreparedStatement::rBHelper.bDisposed);
+
+ sal_Bool success = sal_False;
+ try {
+ success = ((sql::PreparedStatement *)cppStatement)->execute()? sal_True:sal_False;
+ } catch (sql::SQLException &e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding());
+ }
+ return success;
+}
+/* }}} */
+
+
+/* {{{ OPreparedStatement::executeUpdate() -I- */
+sal_Int32 SAL_CALL OPreparedStatement::executeUpdate()
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OPreparedStatement::executeUpdate");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OPreparedStatement::rBHelper.bDisposed);
+
+ sal_Int32 affectedRows = sal_False;
+ try {
+ affectedRows = ((sql::PreparedStatement *)cppStatement)->executeUpdate();
+ } catch (sql::SQLException &e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding());
+ }
+ return affectedRows;
+}
+/* }}} */
+
+
+/* {{{ OPreparedStatement::getPropertySetInfo() -I- */
+void SAL_CALL OPreparedStatement::setString(sal_Int32 parameter, const OUString& x)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OPreparedStatement::setString");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OPreparedStatement::rBHelper.bDisposed);
+ checkParameterIndex(parameter);
+
+ try {
+ std::string stringie(::rtl::OUStringToOString(x, m_pConnection->getConnectionEncoding()).getStr());
+ ((sql::PreparedStatement *)cppStatement)->setString(parameter, stringie);
+ } catch (sql::MethodNotImplementedException) {
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::clearParameters", *this);
+ } catch (sql::SQLException &e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding());
+ }
+}
+/* }}} */
+
+
+/* {{{ OPreparedStatement::getConnection() -I- */
+Reference< XConnection > SAL_CALL OPreparedStatement::getConnection()
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OPreparedStatement::getConnection");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OPreparedStatement::rBHelper.bDisposed);
+
+ return (Reference< XConnection >)m_pConnection;
+}
+/* }}} */
+
+Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery(const OUString& sql)
+ throw(SQLException, RuntimeException)
+{
+ return OCommonStatement::executeQuery( sql );
+}
+
+sal_Int32 SAL_CALL OPreparedStatement::executeUpdate(const OUString& sql)
+ throw(SQLException, RuntimeException)
+{
+ return OCommonStatement::executeUpdate( sql );
+}
+
+sal_Bool SAL_CALL OPreparedStatement::execute( const OUString& sql )
+ throw(SQLException, RuntimeException)
+{
+ return OCommonStatement::execute( sql );
+}
+
+/* {{{ OPreparedStatement::executeQuery() -I- */
+Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery()
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OPreparedStatement::executeQuery");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OPreparedStatement::rBHelper.bDisposed);
+
+ Reference< XResultSet > xResultSet;
+ try {
+ sql::ResultSet * res = ((sql::PreparedStatement *)cppStatement)->executeQuery();
+ xResultSet = new OResultSet(this, res, getOwnConnection()->getConnectionEncoding());
+ } catch (sql::SQLException &e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding());
+ }
+ return xResultSet;
+}
+/* }}} */
+
+
+/* {{{ OPreparedStatement::setBoolean() -I- */
+void SAL_CALL OPreparedStatement::setBoolean(sal_Int32 parameter, sal_Bool x)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OPreparedStatement::setBoolean");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OPreparedStatement::rBHelper.bDisposed);
+ checkParameterIndex(parameter);
+
+ try {
+ ((sql::PreparedStatement *)cppStatement)->setBoolean(parameter, x);
+ } catch (sql::MethodNotImplementedException) {
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::setBoolean", *this);
+ } catch (sql::SQLException &e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding());
+ }
+}
+/* }}} */
+
+
+/* {{{ OPreparedStatement::setByte() -I- */
+void SAL_CALL OPreparedStatement::setByte(sal_Int32 parameter, sal_Int8 x)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OPreparedStatement::setByte");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OPreparedStatement::rBHelper.bDisposed);
+ checkParameterIndex(parameter);
+
+ try {
+ ((sql::PreparedStatement *)cppStatement)->setInt(parameter, x);
+ } catch (sql::MethodNotImplementedException) {
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::setByte", *this);
+ } catch (sql::SQLException &e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding());
+ }
+}
+/* }}} */
+
+
+/* {{{ OPreparedStatement::setDate() -I- */
+void SAL_CALL OPreparedStatement::setDate(sal_Int32 parameter, const Date& aData)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OPreparedStatement::setDate");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OPreparedStatement::rBHelper.bDisposed);
+ checkParameterIndex(parameter);
+
+ std::string dateStr;
+ char buf[20];
+ dateStr.append(my_i_to_a(buf, sizeof(buf)-1, aData.Year));
+ dateStr.append("-", 1);
+ dateStr.append(my_i_to_a(buf, sizeof(buf)-1, aData.Month));
+ dateStr.append("-", 1);
+ dateStr.append(my_i_to_a(buf, sizeof(buf)-1, aData.Day));
+
+ try {
+ ((sql::PreparedStatement *)cppStatement)->setDateTime(parameter, dateStr);
+ } catch (sql::MethodNotImplementedException) {
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::setDate", *this);
+ } catch (sql::SQLException &e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding());
+ }
+}
+/* }}} */
+
+
+/* {{{ OPreparedStatement::setTime() -I- */
+void SAL_CALL OPreparedStatement::setTime(sal_Int32 parameter, const Time& aVal)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OPreparedStatement::setTime");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OPreparedStatement::rBHelper.bDisposed);
+ checkParameterIndex(parameter);
+
+ std::string timeStr;
+ char buf[20];
+ timeStr.append(my_i_to_a(buf, sizeof(buf)-1, aVal.Hours));
+ timeStr.append(":", 1);
+ timeStr.append(my_i_to_a(buf, sizeof(buf)-1, aVal.Minutes));
+ timeStr.append(":", 1);
+ timeStr.append(my_i_to_a(buf, sizeof(buf)-1, aVal.Seconds));
+
+ try {
+ ((sql::PreparedStatement *)cppStatement)->setDateTime(parameter, timeStr);
+ } catch (sql::MethodNotImplementedException) {
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::setTime", *this);
+ } catch (sql::SQLException &e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding());
+ }
+}
+/* }}} */
+
+
+/* {{{ OPreparedStatement::setTimestamp() -I- */
+void SAL_CALL OPreparedStatement::setTimestamp(sal_Int32 parameter, const DateTime& aVal)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OPreparedStatement::setTimestamp");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OPreparedStatement::rBHelper.bDisposed);
+ checkParameterIndex(parameter);
+
+ std::string timeStr;
+ char buf[20];
+ timeStr.append(my_i_to_a(buf, sizeof(buf)-1, aVal.Year));
+ timeStr.append("-", 1);
+ timeStr.append(my_i_to_a(buf, sizeof(buf)-1, aVal.Month));
+ timeStr.append("-", 1);
+ timeStr.append(my_i_to_a(buf, sizeof(buf)-1, aVal.Day));
+
+ timeStr.append(" ", 1);
+
+ timeStr.append(my_i_to_a(buf, sizeof(buf)-1, aVal.Hours));
+ timeStr.append(":", 1);
+ timeStr.append(my_i_to_a(buf, sizeof(buf)-1, aVal.Minutes));
+ timeStr.append(":", 1);
+ timeStr.append(my_i_to_a(buf, sizeof(buf)-1, aVal.Seconds));
+
+ try {
+ ((sql::PreparedStatement *)cppStatement)->setDateTime(parameter, timeStr);
+ } catch (sql::MethodNotImplementedException) {
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::setTimestamp", *this);
+ } catch (sql::SQLException &e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding());
+ }
+}
+/* }}} */
+
+
+/* {{{ OPreparedStatement::setDouble() -I- */
+void SAL_CALL OPreparedStatement::setDouble(sal_Int32 parameter, double x)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OPreparedStatement::setDouble");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OPreparedStatement::rBHelper.bDisposed);
+ checkParameterIndex(parameter);
+
+ try {
+ ((sql::PreparedStatement *)cppStatement)->setDouble(parameter, x);
+ } catch (sql::MethodNotImplementedException) {
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::setDouble", *this);
+ } catch (sql::SQLException &e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding());
+ }
+}
+/* }}} */
+
+
+/* {{{ OPreparedStatement::setFloat() -I- */
+void SAL_CALL OPreparedStatement::setFloat(sal_Int32 parameter, float x)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OPreparedStatement::setFloat");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OPreparedStatement::rBHelper.bDisposed);
+ checkParameterIndex(parameter);
+
+ try {
+ ((sql::PreparedStatement *)cppStatement)->setDouble(parameter, x);
+ } catch (sql::MethodNotImplementedException) {
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::setFloat", *this);
+ } catch (sql::SQLException &e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding());
+ }
+}
+/* }}} */
+
+
+/* {{{ OPreparedStatement::setInt() -I- */
+void SAL_CALL OPreparedStatement::setInt(sal_Int32 parameter, sal_Int32 x)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OPreparedStatement::setInt");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OPreparedStatement::rBHelper.bDisposed);
+ checkParameterIndex(parameter);
+
+ try {
+ ((sql::PreparedStatement *)cppStatement)->setInt(parameter, x);
+ } catch (sql::MethodNotImplementedException) {
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::setInt", *this);
+ } catch (sql::SQLException &e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding());
+ }
+}
+/* }}} */
+
+
+/* {{{ OPreparedStatement::setLong() -I- */
+void SAL_CALL OPreparedStatement::setLong(sal_Int32 parameter, sal_Int64 aVal)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OPreparedStatement::setLong");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OPreparedStatement::rBHelper.bDisposed);
+ checkParameterIndex(parameter);
+
+ try {
+ ((sql::PreparedStatement *)cppStatement)->setInt64(parameter, aVal);
+ } catch (sql::MethodNotImplementedException) {
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::setLong", *this);
+ } catch (sql::SQLException &e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding());
+ }
+}
+/* }}} */
+
+
+/* {{{ OPreparedStatement::setNull() -I- */
+void SAL_CALL OPreparedStatement::setNull(sal_Int32 parameter, sal_Int32 sqlType)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OPreparedStatement::setNull");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OPreparedStatement::rBHelper.bDisposed);
+ checkParameterIndex(parameter);
+
+ try {
+ ((sql::PreparedStatement *)cppStatement)->setNull(parameter, sqlType);
+ } catch (sql::MethodNotImplementedException) {
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::setNull", *this);
+ } catch (sql::SQLException &e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding());
+ }
+}
+/* }}} */
+
+
+/* {{{ OPreparedStatement::setClob() -U- */
+void SAL_CALL OPreparedStatement::setClob(sal_Int32 parameter, const Reference< XClob >& /* x */)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OPreparedStatement::setClob");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OPreparedStatement::rBHelper.bDisposed);
+ checkParameterIndex(parameter);
+
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::setClob", *this);
+}
+/* }}} */
+
+
+/* {{{ OPreparedStatement::setBlob() -U- */
+void SAL_CALL OPreparedStatement::setBlob(sal_Int32 parameter, const Reference< XBlob >& /* x */)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OPreparedStatement::setBlob");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OPreparedStatement::rBHelper.bDisposed);
+ checkParameterIndex(parameter);
+
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::setBlob", *this);
+}
+/* }}} */
+
+
+/* {{{ OPreparedStatement::setArray() -U- */
+void SAL_CALL OPreparedStatement::setArray(sal_Int32 parameter, const Reference< XArray >& /* x */)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OPreparedStatement::setArray");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OPreparedStatement::rBHelper.bDisposed);
+ checkParameterIndex(parameter);
+
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::setArray", *this);
+}
+/* }}} */
+
+
+/* {{{ OPreparedStatement::setRef() -U- */
+void SAL_CALL OPreparedStatement::setRef(sal_Int32 parameter, const Reference< XRef >& /* x */)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OPreparedStatement::setRef");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OPreparedStatement::rBHelper.bDisposed);
+ checkParameterIndex(parameter);
+
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::setRef", *this);
+}
+/* }}} */
+
+namespace
+{
+ template < class COMPLEXTYPE >
+ bool impl_setObject( const Reference< XParameters >& _rxParam, sal_Int32 _parameterIndex, const Any& _value,
+ void ( SAL_CALL XParameters::*_Setter )( sal_Int32, const COMPLEXTYPE& ), bool _throwIfNotExtractable )
+ {
+ COMPLEXTYPE aValue;
+ if ( _value >>= aValue )
+ {
+ (_rxParam.get()->*_Setter)( _parameterIndex, aValue );
+ return true;
+ }
+
+ if ( _throwIfNotExtractable )
+ mysqlc_sdbc_driver::throwInvalidArgumentException( "OPreparedStatement::setObjectWithInfo", _rxParam );
+ return false;
+ }
+
+ template < class INTTYPE >
+ void impl_setObject( const Reference< XParameters >& _rxParam, sal_Int32 _parameterIndex, const Any& _value,
+ void ( SAL_CALL XParameters::*_Setter )( sal_Int32, INTTYPE ) )
+ {
+ sal_Int32 nValue(0);
+ if ( !( _value >>= nValue ) )
+ mysqlc_sdbc_driver::throwInvalidArgumentException( "OPreparedStatement::setObjectWithInfo", _rxParam );
+ (_rxParam.get()->*_Setter)( _parameterIndex, (INTTYPE)nValue );
+ }
+}
+
+/* {{{ OPreparedStatement::setObjectWithInfo() -U- */
+void SAL_CALL OPreparedStatement::setObjectWithInfo(sal_Int32 _parameterIndex, const Any& _value, sal_Int32 _targetSqlType, sal_Int32 /* scale */)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OPreparedStatement::setObjectWithInfo");
+ checkDisposed(OPreparedStatement::rBHelper.bDisposed);
+ MutexGuard aGuard(m_aMutex);
+ checkParameterIndex( _parameterIndex );
+
+ if ( !_value.hasValue() )
+ {
+ setNull( _parameterIndex, _targetSqlType );
+ return;
+ }
+
+ switch ( _targetSqlType )
+ {
+ case DataType::DECIMAL:
+ case DataType::NUMERIC:
+ {
+ double nValue(0);
+ if ( _value >>= nValue )
+ {
+ setDouble( _parameterIndex, nValue );
+ break;
+ }
+ }
+ // run through
+
+ case DataType::CHAR:
+ case DataType::VARCHAR:
+ case DataType::LONGVARCHAR:
+ impl_setObject( this, _parameterIndex, _value, &XParameters::setString, true );
+ break;
+
+ case DataType::BIGINT:
+ {
+ sal_Int64 nValue = 0;
+ if ( !( _value >>= nValue ) )
+ mysqlc_sdbc_driver::throwInvalidArgumentException( "OPreparedStatement::setObjectWithInfo", *this );
+ setLong( _parameterIndex, nValue );
+ }
+ break;
+
+ case DataType::FLOAT:
+ case DataType::REAL:
+ {
+ float nValue = 0;
+ if ( _value >>= nValue )
+ {
+ setFloat(_parameterIndex,nValue);
+ break;
+ }
+ }
+ // run through if we couldn't set a float value
+
+ case DataType::DOUBLE:
+ {
+ double nValue(0);
+ if ( !( _value >>= nValue ) )
+ mysqlc_sdbc_driver::throwInvalidArgumentException( "OPreparedStatement::setObjectWithInfo", *this );
+ setDouble( _parameterIndex, nValue );
+ }
+ break;
+
+ case DataType::DATE:
+ impl_setObject( this, _parameterIndex, _value, &XParameters::setDate, true );
+ break;
+
+ case DataType::TIME:
+ impl_setObject( this, _parameterIndex, _value, &XParameters::setTime, true );
+ break;
+
+ case DataType::TIMESTAMP:
+ impl_setObject( this, _parameterIndex, _value, &XParameters::setTimestamp, true );
+ break;
+
+ case DataType::BINARY:
+ case DataType::VARBINARY:
+ case DataType::LONGVARBINARY:
+ {
+ if ( impl_setObject( this, _parameterIndex, _value, &XParameters::setBytes, false )
+ || impl_setObject( this, _parameterIndex, _value, &XParameters::setBlob, false )
+ || impl_setObject( this, _parameterIndex, _value, &XParameters::setClob, false )
+ )
+ break;
+
+ Reference< ::com::sun::star::io::XInputStream > xBinStream;
+ if ( _value >>= xBinStream )
+ {
+ setBinaryStream( _parameterIndex, xBinStream, xBinStream->available() );
+ break;
+ }
+
+ mysqlc_sdbc_driver::throwInvalidArgumentException( "OPreparedStatement::setObjectWithInfo", *this );
+ }
+ break;
+
+ case DataType::BIT:
+ case DataType::BOOLEAN:
+ {
+ bool bValue( false );
+ if ( _value >>= bValue )
+ {
+ setBoolean( _parameterIndex, bValue );
+ break;
+ }
+ sal_Int32 nValue( 0 );
+ if ( _value >>= nValue )
+ {
+ setBoolean( _parameterIndex, ( nValue != 0 ) );
+ break;
+ }
+ mysqlc_sdbc_driver::throwInvalidArgumentException( "OPreparedStatement::setObjectWithInfo", *this );
+ }
+ break;
+
+ case DataType::TINYINT:
+ impl_setObject( this, _parameterIndex, _value, &XParameters::setByte );
+ break;
+
+ case DataType::SMALLINT:
+ impl_setObject( this, _parameterIndex, _value, &XParameters::setShort );
+ break;
+
+ case DataType::INTEGER:
+ impl_setObject( this, _parameterIndex, _value, &XParameters::setInt );
+ break;
+
+ default:
+ mysqlc_sdbc_driver::throwInvalidArgumentException( "OPreparedStatement::setObjectWithInfo", *this );
+ break;
+ }
+}
+/* }}} */
+
+
+/* {{{ OPreparedStatement::setObjectNull() -U- */
+void SAL_CALL OPreparedStatement::setObjectNull(sal_Int32 parameter, sal_Int32 /* sqlType */, const OUString& /* typeName */)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OPreparedStatement::setObjectNull");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OPreparedStatement::rBHelper.bDisposed);
+ checkParameterIndex(parameter);
+
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::setObjectNull", *this);
+}
+/* }}} */
+
+
+/* {{{ OPreparedStatement::setObject() -U- */
+void SAL_CALL OPreparedStatement::setObject(sal_Int32 parameter, const Any& /* x */)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OPreparedStatement::setObject");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OPreparedStatement::rBHelper.bDisposed);
+ checkParameterIndex(parameter);
+
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::setObject", *this);
+}
+/* }}} */
+
+
+/* {{{ OPreparedStatement::setShort() -I- */
+void SAL_CALL OPreparedStatement::setShort(sal_Int32 parameter, sal_Int16 x)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OPreparedStatement::setShort");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OPreparedStatement::rBHelper.bDisposed);
+ checkParameterIndex(parameter);
+
+ try {
+ ((sql::PreparedStatement *)cppStatement)->setInt(parameter, x);
+ } catch (sql::MethodNotImplementedException) {
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::setShort", *this);
+ } catch (sql::SQLException &e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding());
+ }
+}
+/* }}} */
+
+
+/* {{{ OPreparedStatement::setBytes() -I- */
+void SAL_CALL OPreparedStatement::setBytes(sal_Int32 parameter, const Sequence< sal_Int8 >& x)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OPreparedStatement::setBytes");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OPreparedStatement::rBHelper.bDisposed);
+ checkParameterIndex(parameter);
+
+ std::string blobby((char *)x.getConstArray(), x.getLength());
+ try {
+ ((sql::PreparedStatement *)cppStatement)->setString(parameter, blobby);
+ } catch (sql::MethodNotImplementedException) {
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::setBytes", *this);
+ } catch (sql::SQLException &e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding());
+ }
+}
+/* }}} */
+
+
+/* {{{ OPreparedStatement::setCharacterStream() -U- */
+void SAL_CALL OPreparedStatement::setCharacterStream(sal_Int32 parameter,
+ const Reference< XInputStream >& /* x */,
+ sal_Int32 /* length */)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OPreparedStatement::setCharacterStream");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OPreparedStatement::rBHelper.bDisposed);
+ checkParameterIndex(parameter);
+
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::setCharacterStream", *this);
+}
+/* }}} */
+
+
+/* {{{ OPreparedStatement::setBinaryStream() -U- */
+void SAL_CALL OPreparedStatement::setBinaryStream(sal_Int32 parameter,
+ const Reference< XInputStream >& /* x */,
+ sal_Int32 /* length */)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OPreparedStatement::setBinaryStream");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OPreparedStatement::rBHelper.bDisposed);
+ checkParameterIndex(parameter);
+
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::setBinaryStream", *this);
+}
+/* }}} */
+
+
+/* {{{ OPreparedStatement::clearParameters() -I- */
+void SAL_CALL OPreparedStatement::clearParameters()
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OPreparedStatement::clearParameters");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OPreparedStatement::rBHelper.bDisposed);
+
+ try {
+ ((sql::PreparedStatement *)cppStatement)->clearParameters();
+ } catch (sql::MethodNotImplementedException) {
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::clearParameters", *this);
+ } catch (sql::SQLException &e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding());
+ }
+}
+/* }}} */
+
+
+/* {{{ OPreparedStatement::clearBatch() -U- */
+void SAL_CALL OPreparedStatement::clearBatch()
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OPreparedStatement::clearBatch");
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::clearBatch", *this);
+}
+/* }}} */
+
+
+/* {{{ OPreparedStatement::addBatch() -U- */
+void SAL_CALL OPreparedStatement::addBatch()
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OPreparedStatement::addBatch");
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::addBatch", *this);
+}
+/* }}} */
+
+
+/* {{{ OPreparedStatement::executeBatch() -I- */
+Sequence< sal_Int32 > SAL_CALL OPreparedStatement::executeBatch()
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OPreparedStatement::executeBatch");
+ Sequence< sal_Int32 > aRet= Sequence< sal_Int32 > ();
+ return aRet;
+}
+/* }}} */
+
+
+/* {{{ OPreparedStatement::setFastPropertyValue_NoBroadcast() -I- */
+void OPreparedStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue)
+ throw(Exception)
+{
+ OSL_TRACE("OPreparedStatement::setFastPropertyValue_NoBroadcast");
+ switch(nHandle)
+ {
+ case PROPERTY_ID_RESULTSETCONCURRENCY:
+ break;
+ case PROPERTY_ID_RESULTSETTYPE:
+ break;
+ case PROPERTY_ID_FETCHDIRECTION:
+ break;
+ case PROPERTY_ID_USEBOOKMARKS:
+ break;
+ default:
+ /* XXX: Recursion ?? */
+ OPreparedStatement::setFastPropertyValue_NoBroadcast(nHandle,rValue);
+ }
+}
+/* }}} */
+
+
+/* {{{ OPreparedStatement::checkParameterIndex() -I- */
+void OPreparedStatement::checkParameterIndex(sal_Int32 column)
+{
+ OSL_TRACE("OPreparedStatement::checkColumnIndex");
+ if (column < 1 || column > (sal_Int32) m_paramCount) {
+ OUString buf( RTL_CONSTASCII_USTRINGPARAM( "Parameter index out of range" ) );
+ throw SQLException(buf, *this, OUString(), 1, Any ());
+ }
+}
+/* }}} */
+
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noet sw=4 ts=4 fdm=marker
+ * vim<600: noet sw=4 ts=4
+ */
diff --git a/mysqlc/source/mysqlc_preparedstatement.hxx b/mysqlc/source/mysqlc_preparedstatement.hxx
new file mode 100644
index 000000000000..f58e59982aaa
--- /dev/null
+++ b/mysqlc/source/mysqlc_preparedstatement.hxx
@@ -0,0 +1,194 @@
+/*************************************************************************
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2008 by Sun Microsystems, Inc.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* $RCSfile: mysqlc_preparedstatement.hxx,v $
+*
+* $Revision: 1.1.2.4 $
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org. If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+************************************************************************/
+
+#ifndef CONNECTIVITY_SPREPAREDSTATEMENT_HXX
+#define CONNECTIVITY_SPREPAREDSTATEMENT_HXX
+#include "mysqlc_statement.hxx"
+#include "mysqlc_resultset.hxx"
+
+#ifndef _COM_SUN_STAR_SDBC_XPREPAREDSTATEMENT_HPP_
+#include <com/sun/star/sdbc/XPreparedStatement.hpp>
+#endif
+#ifndef _COM_SUN_STAR_SDBC_XPARAMETERS_HPP_
+#include <com/sun/star/sdbc/XParameters.hpp>
+#endif
+#ifndef _COM_SUN_STAR_SDBC_XRESULTSETMETADATASUPPLIER_HPP_
+#include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp>
+#endif
+#ifndef _COM_SUN_STAR_SDBC_XPREPAREDBATCHEXECUTION_HPP_
+#include <com/sun/star/sdbc/XPreparedBatchExecution.hpp>
+#endif
+#ifndef _COM_SUN_STAR_IO_XINPUTSTREAM_HPP_
+#include <com/sun/star/io/XInputStream.hpp>
+#endif
+
+#include <cppconn/prepared_statement.h>
+
+namespace connectivity
+{
+ namespace mysqlc
+ {
+ using ::com::sun::star::uno::Reference;
+ using ::com::sun::star::uno::Any;
+ using ::com::sun::star::uno::Type;
+ using ::com::sun::star::sdbc::SQLException;
+ using ::com::sun::star::uno::RuntimeException;
+ using ::com::sun::star::sdbc::XResultSetMetaData;
+
+ class OBoundParam;
+ typedef ::cppu::ImplHelper5< ::com::sun::star::sdbc::XPreparedStatement,
+ ::com::sun::star::sdbc::XParameters,
+ ::com::sun::star::sdbc::XPreparedBatchExecution,
+ ::com::sun::star::sdbc::XResultSetMetaDataSupplier,
+ ::com::sun::star::lang::XServiceInfo> OPreparedStatement_BASE;
+
+ class OPreparedStatement : public OCommonStatement,
+ public OPreparedStatement_BASE
+ {
+ protected:
+ unsigned int m_paramCount; // number of placeholders
+ sal_Int32 m_nNumParams; // Number of parameter markers for the prepared statement
+ Reference< XResultSetMetaData > m_xMetaData;
+
+ void checkParameterIndex(sal_Int32 parameter);
+
+ protected:
+ void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const Any& rValue)
+ throw (::com::sun::star::uno::Exception);
+ virtual ~OPreparedStatement();
+ public:
+ DECLARE_SERVICE_INFO();
+ OPreparedStatement(OConnection* _pConnection, sql::PreparedStatement * cppPrepStmt);
+
+ //XInterface
+ Any SAL_CALL queryInterface(const Type & rType) throw(RuntimeException);
+ void SAL_CALL acquire() throw();
+ void SAL_CALL release() throw();
+
+ //XTypeProvider
+ ::com::sun::star::uno::Sequence< Type > SAL_CALL getTypes()
+ throw(RuntimeException);
+
+ // XPreparedStatement
+ Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL executeQuery() throw(SQLException, RuntimeException);
+ sal_Int32 SAL_CALL executeUpdate() throw(SQLException, RuntimeException);
+ sal_Bool SAL_CALL execute() throw(SQLException, RuntimeException);
+ Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection() throw(SQLException, RuntimeException);
+
+ // XStatement
+ ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL executeQuery(const OUString& sql)
+ throw(SQLException, RuntimeException);
+ sal_Int32 SAL_CALL executeUpdate(const OUString& sql)
+ throw(SQLException, RuntimeException);
+ sal_Bool SAL_CALL execute( const OUString& sql )
+ throw(SQLException, RuntimeException);
+
+ // XParameters
+ void SAL_CALL setNull(sal_Int32 parameter, sal_Int32 sqlType) throw(SQLException, RuntimeException);
+
+ void SAL_CALL setObjectNull(sal_Int32 parameter, sal_Int32 sqlType, const OUString& typeName)
+ throw(SQLException, RuntimeException);
+
+ void SAL_CALL setBoolean(sal_Int32 parameter, sal_Bool x) throw(SQLException, RuntimeException);
+
+ void SAL_CALL setByte(sal_Int32 parameter, sal_Int8 x) throw(SQLException, RuntimeException);
+
+ void SAL_CALL setShort(sal_Int32 parameter, sal_Int16 x) throw(SQLException, RuntimeException);
+
+ void SAL_CALL setInt(sal_Int32 parameter, sal_Int32 x) throw(SQLException, RuntimeException);
+
+ void SAL_CALL setLong(sal_Int32 parameter, sal_Int64 x) throw(SQLException, RuntimeException);
+
+ void SAL_CALL setFloat(sal_Int32 parameter, float x) throw(SQLException, RuntimeException);
+
+ void SAL_CALL setDouble(sal_Int32 parameter, double x) throw(SQLException, RuntimeException);
+
+ void SAL_CALL setString(sal_Int32 parameter, const OUString& x) throw(SQLException, RuntimeException);
+
+ void SAL_CALL setBytes(sal_Int32 parameter, const ::com::sun::star::uno::Sequence< sal_Int8 >& x)
+ throw(SQLException, RuntimeException);
+
+ void SAL_CALL setDate(sal_Int32 parameter, const ::com::sun::star::util::Date& x)
+ throw(SQLException, RuntimeException);
+
+ void SAL_CALL setTime(sal_Int32 parameter, const ::com::sun::star::util::Time& x)
+ throw(SQLException, RuntimeException);
+ void SAL_CALL setTimestamp(sal_Int32 parameter, const ::com::sun::star::util::DateTime& x)
+ throw(SQLException, RuntimeException);
+
+ void SAL_CALL setBinaryStream(sal_Int32 parameter, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length)
+ throw(SQLException, RuntimeException);
+
+ void SAL_CALL setCharacterStream(sal_Int32 parameter, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length)
+ throw(SQLException, RuntimeException);
+
+ void SAL_CALL setObject(sal_Int32 parameter, const Any& x) throw(SQLException, RuntimeException);
+
+ void SAL_CALL setObjectWithInfo(sal_Int32 parameter, const Any& x, sal_Int32 targetSqlType, sal_Int32 scale)
+ throw(SQLException, RuntimeException);
+
+ void SAL_CALL setRef(sal_Int32 parameter, const Reference< ::com::sun::star::sdbc::XRef >& x)
+ throw(SQLException, RuntimeException);
+
+ void SAL_CALL setBlob(sal_Int32 parameter, const Reference< ::com::sun::star::sdbc::XBlob >& x)
+ throw(SQLException, RuntimeException);
+
+ void SAL_CALL setClob(sal_Int32 parameter, const Reference< ::com::sun::star::sdbc::XClob >& x)
+ throw(SQLException, RuntimeException);
+
+ void SAL_CALL setArray(sal_Int32 parameter, const Reference< ::com::sun::star::sdbc::XArray >& x)
+ throw(SQLException, RuntimeException);
+
+ void SAL_CALL clearParameters() throw(SQLException, RuntimeException);
+
+ // XPreparedBatchExecution
+ void SAL_CALL addBatch() throw(SQLException, RuntimeException);
+ void SAL_CALL clearBatch() throw(SQLException, RuntimeException);
+ ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL executeBatch() throw(SQLException, RuntimeException);
+
+ // XCloseable
+ void SAL_CALL close() throw(SQLException, RuntimeException);
+
+ // XResultSetMetaDataSupplier
+ Reference< ::com::sun::star::sdbc::XResultSetMetaData > SAL_CALL getMetaData()
+ throw(SQLException, RuntimeException);
+ };
+ } /* mysqlc */
+} /* connectivity */
+#endif // CONNECTIVITY_SPREPAREDSTATEMENT_HXX
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noet sw=4 ts=4 fdm=marker
+ * vim<600: noet sw=4 ts=4
+ */
+
diff --git a/mysqlc/source/mysqlc_propertyids.cxx b/mysqlc/source/mysqlc_propertyids.cxx
new file mode 100644
index 000000000000..ae0be046ffb6
--- /dev/null
+++ b/mysqlc/source/mysqlc_propertyids.cxx
@@ -0,0 +1,210 @@
+/*************************************************************************
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2008 by Sun Microsystems, Inc.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* $RCSfile: mysqlc_propertyids.cxx,v $
+*
+* $Revision: 1.1.2.2 $
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org. If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+************************************************************************/
+
+#ifndef _OSL_DIAGNOSE_H_
+#include <osl/diagnose.h>
+#endif
+#include "mysqlc_propertyids.hxx"
+
+using ::rtl::OUString;
+
+namespace connectivity
+{
+namespace mysqlc
+{
+const sal_Char* getPROPERTY_QUERYTIMEOUT() { return "QueryTimeOut"; }
+const sal_Char* getPROPERTY_MAXFIELDSIZE() { return "MaxFieldSize"; }
+const sal_Char* getPROPERTY_MAXROWS() { return "MaxRows"; }
+const sal_Char* getPROPERTY_CURSORNAME() { return "CursorName"; }
+const sal_Char* getPROPERTY_RESULTSETCONCURRENCY() { return "ResultSetConcurrency"; }
+const sal_Char* getPROPERTY_RESULTSETTYPE() { return "ResultSetType"; }
+const sal_Char* getPROPERTY_FETCHDIRECTION() { return "FetchDirection"; }
+const sal_Char* getPROPERTY_FETCHSIZE() { return "FetchSize"; }
+const sal_Char* getPROPERTY_ESCAPEPROCESSING() { return "EscapeProcessing"; }
+const sal_Char* getPROPERTY_USEBOOKMARKS() { return "UseBookmarks"; }
+
+const sal_Char* getPROPERTY_NAME() { return "Name"; }
+const sal_Char* getPROPERTY_TYPE() { return "Type"; }
+const sal_Char* getPROPERTY_TYPENAME() { return "TypeName"; }
+const sal_Char* getPROPERTY_PRECISION() { return "Precision"; }
+const sal_Char* getPROPERTY_SCALE() { return "Scale"; }
+const sal_Char* getPROPERTY_ISNULLABLE() { return "IsNullable"; }
+const sal_Char* getPROPERTY_ISAUTOINCREMENT() { return "IsAutoIncrement"; }
+const sal_Char* getPROPERTY_ISROWVERSION() { return "IsRowVersion"; }
+const sal_Char* getPROPERTY_DESCRIPTION() { return "Description"; }
+const sal_Char* getPROPERTY_DEFAULTVALUE() { return "DefaultValue"; }
+
+const sal_Char* getPROPERTY_REFERENCEDTABLE() { return "ReferencedTable"; }
+const sal_Char* getPROPERTY_UPDATERULE() { return "UpdateRule"; }
+const sal_Char* getPROPERTY_DELETERULE() { return "DeleteRule"; }
+const sal_Char* getPROPERTY_CATALOG() { return "Catalog"; }
+const sal_Char* getPROPERTY_ISUNIQUE() { return "IsUnique"; }
+const sal_Char* getPROPERTY_ISPRIMARYKEYINDEX() { return "IsPrimaryKeyIndex"; }
+const sal_Char* getPROPERTY_ISCLUSTERED() { return "IsClustered"; }
+const sal_Char* getPROPERTY_ISASCENDING() { return "IsAscending"; }
+const sal_Char* getPROPERTY_SCHEMANAME() { return "SchemaName"; }
+const sal_Char* getPROPERTY_CATALOGNAME() { return "CatalogName"; }
+const sal_Char* getPROPERTY_COMMAND() { return "Command"; }
+const sal_Char* getPROPERTY_CHECKOPTION() { return "CheckOption"; }
+const sal_Char* getPROPERTY_PASSWORD() { return "Password"; }
+const sal_Char* getPROPERTY_RELATEDCOLUMN() { return "RelatedColumn"; }
+
+const sal_Char* getSTAT_INVALID_INDEX() { return "Invalid descriptor index"; }
+
+const sal_Char* getPROPERTY_FUNCTION() { return "Function"; }
+const sal_Char* getPROPERTY_TABLENAME() { return "TableName"; }
+const sal_Char* getPROPERTY_REALNAME() { return "RealName"; }
+const sal_Char* getPROPERTY_DBASEPRECISIONCHANGED() { return "DbasePrecisionChanged"; }
+const sal_Char* getPROPERTY_ISCURRENCY() { return "IsCurrency"; }
+const sal_Char* getPROPERTY_ISBOOKMARKABLE() { return "IsBookmarkable"; }
+
+const sal_Char* getPROPERTY_FORMATKEY() { return "FormatKey"; }
+const sal_Char* getPROPERTY_LOCALE() { return "Locale"; }
+
+const sal_Char* getPROPERTY_AUTOINCREMENTCREATION() { return "AutoIncrementCreation"; }
+const sal_Char* getPROPERTY_PRIVILEGES() { return "Privileges"; }
+ //============================================================
+ //= error messages
+ //============================================================
+const sal_Char* getERRORMSG_SEQUENCE() { return "Function sequence error"; }
+const sal_Char* getSQLSTATE_SEQUENCE() { return "HY010"; }
+const sal_Char* getSQLSTATE_GENERAL() { return "HY0000"; }
+const sal_Char* getSTR_DELIMITER() { return "/"; }
+
+
+
+/* {{{ OPropertyMap::~OPropertyMap() -I- */
+OPropertyMap::~OPropertyMap()
+{
+ ::std::map<sal_Int32 , rtl_uString*>::iterator aIter = m_aPropertyMap.begin();
+ for(; aIter != m_aPropertyMap.end(); ++aIter) {
+ if (aIter->second) {
+ rtl_uString_release(aIter->second);
+ }
+ }
+}
+/* }}} */
+
+
+/* {{{ OPropertyMap::getNameByIndex() -I- */
+OUString OPropertyMap::getNameByIndex(sal_Int32 idx) const
+{
+ OUString sRet;
+ ::std::map<sal_Int32 , rtl_uString*>::const_iterator aIter = m_aPropertyMap.find(idx);
+ if (aIter == m_aPropertyMap.end()) {
+ sRet = const_cast<OPropertyMap*>(this)->fillValue(idx);
+ } else {
+ sRet = aIter->second;
+ }
+ return sRet;
+}
+/* }}} */
+
+typedef const sal_Char * (*property_callback)();
+
+static const property_callback property_callbacks[PROPERTY_ID_LAST] =
+{
+ NULL, /* PROPERTY_ID_FIRST */
+ getPROPERTY_QUERYTIMEOUT,
+ getPROPERTY_MAXFIELDSIZE,
+ getPROPERTY_MAXROWS,
+ getPROPERTY_CURSORNAME,
+ getPROPERTY_RESULTSETCONCURRENCY,
+ getPROPERTY_RESULTSETTYPE,
+ getPROPERTY_FETCHDIRECTION,
+ getPROPERTY_FETCHSIZE,
+ getPROPERTY_ESCAPEPROCESSING,
+ getPROPERTY_USEBOOKMARKS,
+ // Column
+ getPROPERTY_NAME,
+ getPROPERTY_TYPE,
+ getPROPERTY_TYPENAME,
+ getPROPERTY_PRECISION,
+ getPROPERTY_SCALE,
+ getPROPERTY_ISNULLABLE,
+ getPROPERTY_ISAUTOINCREMENT,
+ getPROPERTY_ISROWVERSION,
+ getPROPERTY_DESCRIPTION,
+ getPROPERTY_DEFAULTVALUE,
+
+ getPROPERTY_REFERENCEDTABLE,
+ getPROPERTY_UPDATERULE,
+ getPROPERTY_DELETERULE,
+ getPROPERTY_CATALOG,
+ getPROPERTY_ISUNIQUE,
+ getPROPERTY_ISPRIMARYKEYINDEX,
+ getPROPERTY_ISCLUSTERED,
+ getPROPERTY_ISASCENDING,
+ getPROPERTY_SCHEMANAME,
+ getPROPERTY_CATALOGNAME,
+
+ getPROPERTY_COMMAND,
+ getPROPERTY_CHECKOPTION,
+ getPROPERTY_PASSWORD,
+ getPROPERTY_RELATEDCOLUMN,
+
+ getPROPERTY_FUNCTION,
+ getPROPERTY_TABLENAME,
+ getPROPERTY_REALNAME,
+ getPROPERTY_DBASEPRECISIONCHANGED,
+ getPROPERTY_ISCURRENCY,
+ getPROPERTY_ISBOOKMARKABLE,
+ getSTAT_INVALID_INDEX,
+ getERRORMSG_SEQUENCE,
+ getSQLSTATE_SEQUENCE,
+ getSQLSTATE_GENERAL,
+ getSTR_DELIMITER,
+ getPROPERTY_FORMATKEY,
+ getPROPERTY_LOCALE,
+ getPROPERTY_AUTOINCREMENTCREATION,
+ getPROPERTY_PRIVILEGES,
+};
+
+
+/* {{{ OPropertyMap::fillValue() -I- */
+OUString OPropertyMap::fillValue(sal_Int32 idx)
+{
+ rtl_uString* pStr = NULL;
+ rtl_uString_newFromAscii(&pStr, property_callbacks[idx]());
+ m_aPropertyMap[idx] = pStr;
+ return pStr;
+}
+/* }}} */
+
+} /* mysqlc */
+} /* connectivity */
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noet sw=4 ts=4 fdm=marker
+ * vim<600: noet sw=4 ts=4
+ */
diff --git a/mysqlc/source/mysqlc_propertyids.hxx b/mysqlc/source/mysqlc_propertyids.hxx
new file mode 100644
index 000000000000..31e756685c04
--- /dev/null
+++ b/mysqlc/source/mysqlc_propertyids.hxx
@@ -0,0 +1,136 @@
+
+#ifndef _CONNECTIVITY_PROPERTYIDS_HXX_
+#define _CONNECTIVITY_PROPERTYIDS_HXX_
+
+// this define has to be set to split the names into different dll's or so's
+// every dll has his own set of property names
+#ifndef _RTL_USTRING_
+#include <rtl/ustring.hxx>
+#endif
+#ifndef _MAP_
+#include <map>
+#endif
+
+namespace connectivity
+{
+namespace mysqlc
+{
+ class OPropertyMap
+ {
+ ::std::map<sal_Int32 , rtl_uString*> m_aPropertyMap;
+
+ ::rtl::OUString fillValue(sal_Int32 _nIndex);
+ public:
+ OPropertyMap()
+ {
+ }
+ ~OPropertyMap();
+ ::rtl::OUString getNameByIndex(sal_Int32 _nIndex) const;
+
+ static OPropertyMap& getPropMap()
+ {
+ static OPropertyMap s_aPropMap;
+ return s_aPropMap;
+ }
+ };
+
+
+ typedef const sal_Char* (*PVFN)();
+
+ struct UStringDescription
+ {
+ const sal_Char* pZeroTerminatedName;
+ sal_Int32 nLength;
+
+ UStringDescription(PVFN _fCharFkt);
+ operator ::rtl::OUString() const { return ::rtl::OUString(pZeroTerminatedName,nLength,RTL_TEXTENCODING_ASCII_US); }
+ ~UStringDescription();
+ private:
+ UStringDescription();
+ };
+
+
+enum
+{
+ PROPERTY_ID_FIRST = 0,
+ PROPERTY_ID_QUERYTIMEOUT,
+ PROPERTY_ID_MAXFIELDSIZE,
+ PROPERTY_ID_MAXROWS,
+ PROPERTY_ID_CURSORNAME,
+ PROPERTY_ID_RESULTSETCONCURRENCY,
+ PROPERTY_ID_RESULTSETTYPE,
+ PROPERTY_ID_FETCHDIRECTION,
+ PROPERTY_ID_FETCHSIZE,
+ PROPERTY_ID_ESCAPEPROCESSING,
+ PROPERTY_ID_USEBOOKMARKS,
+// Column
+ PROPERTY_ID_NAME,
+ PROPERTY_ID_TYPE,
+ PROPERTY_ID_TYPENAME,
+ PROPERTY_ID_PRECISION,
+ PROPERTY_ID_SCALE,
+ PROPERTY_ID_ISNULLABLE,
+ PROPERTY_ID_ISAUTOINCREMENT,
+ PROPERTY_ID_ISROWVERSION,
+ PROPERTY_ID_DESCRIPTION,
+ PROPERTY_ID_DEFAULTVALUE,
+
+ PROPERTY_ID_REFERENCEDTABLE,
+ PROPERTY_ID_UPDATERULE,
+ PROPERTY_ID_DELETERULE,
+ PROPERTY_ID_CATALOG,
+ PROPERTY_ID_ISUNIQUE,
+ PROPERTY_ID_ISPRIMARYKEYINDEX,
+ PROPERTY_ID_ISCLUSTERED,
+ PROPERTY_ID_ISASCENDING,
+ PROPERTY_ID_SCHEMANAME,
+ PROPERTY_ID_CATALOGNAME,
+
+ PROPERTY_ID_COMMAND,
+ PROPERTY_ID_CHECKOPTION,
+ PROPERTY_ID_PASSWORD,
+ PROPERTY_ID_RELATEDCOLUMN,
+
+ PROPERTY_ID_FUNCTION,
+ PROPERTY_ID_TABLENAME,
+ PROPERTY_ID_REALNAME,
+ PROPERTY_ID_DBASEPRECISIONCHANGED,
+ PROPERTY_ID_ISCURRENCY,
+ PROPERTY_ID_ISBOOKMARKABLE,
+
+ PROPERTY_ID_INVALID_INDEX,
+ PROPERTY_ID_ERRORMSG_SEQUENCE,
+ PROPERTY_ID_HY010,
+ PROPERTY_ID_HY0000,
+ PROPERTY_ID_DELIMITER,
+ PROPERTY_ID_FORMATKEY,
+ PROPERTY_ID_LOCALE,
+ PROPERTY_ID_IM001,
+
+ PROPERTY_ID_AUTOINCREMENTCREATION,
+
+ PROPERTY_ID_PRIVILEGES,
+
+ PROPERTY_ID_LAST
+};
+}/* mysqlc */
+}/* connectivity */
+
+//------------------------------------------------------------------------------
+#define DECL_PROP1IMPL(varname, type) \
+pProperties[nPos++] = Property(OPropertyMap::getPropMap().getNameByIndex(PROPERTY_ID_##varname), PROPERTY_ID_##varname, ::getCppuType(reinterpret_cast< type*>(NULL)),
+//------------------------------------------------------------------------------
+#define DECL_PROP0(varname, type) \
+ DECL_PROP1IMPL(varname, type) 0)
+//------------------------------------------------------------------------------
+#define DECL_BOOL_PROP1IMPL(varname) \
+ pProperties[nPos++] = Property(OPropertyMap::getPropMap().getNameByIndex(PROPERTY_ID_##varname), PROPERTY_ID_##varname, ::getBooleanCppuType(),
+//------------------------------------------------------------------------------
+#define DECL_BOOL_PROP0(varname) \
+ DECL_BOOL_PROP1IMPL(varname) 0)
+
+
+
+#endif // _CONNECTIVITY_PROPERTYIDS_HXX_
+
+
diff --git a/mysqlc/source/mysqlc_resultset.cxx b/mysqlc/source/mysqlc_resultset.cxx
new file mode 100644
index 000000000000..f6b6861b6a74
--- /dev/null
+++ b/mysqlc/source/mysqlc_resultset.cxx
@@ -0,0 +1,1509 @@
+/*************************************************************************
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2008 by Sun Microsystems, Inc.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* $RCSfile: mysqlc_resultset.cxx,v $
+*
+* $Revision: 1.1.2.5 $
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org. If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+************************************************************************/
+
+#include "mysqlc_propertyids.hxx"
+#include "mysqlc_general.hxx"
+#include "mysqlc_resultset.hxx"
+#include "mysqlc_resultsetmetadata.hxx"
+
+#include <com/sun/star/sdbc/DataType.hpp>
+#include <com/sun/star/beans/PropertyAttribute.hpp>
+#include <com/sun/star/sdbcx/CompareBookmark.hpp>
+#include <cppuhelper/typeprovider.hxx>
+#include <com/sun/star/lang/DisposedException.hpp>
+
+using namespace connectivity::mysqlc;
+using namespace cppu;
+using namespace com::sun::star::uno;
+using namespace com::sun::star::lang;
+using namespace com::sun::star::beans;
+using namespace com::sun::star::sdbc;
+using namespace com::sun::star::sdbcx;
+using namespace com::sun::star::container;
+using namespace com::sun::star::io;
+using namespace com::sun::star::util;
+using ::osl::MutexGuard;
+using ::rtl::OUString;
+
+#include <cppconn/resultset.h>
+#include <cppconn/resultset_metadata.h>
+
+#include <stdio.h>
+
+
+// IMPLEMENT_SERVICE_INFO(OResultSet,"com.sun.star.sdbcx.OResultSet","com.sun.star.sdbc.ResultSet");
+/* {{{ OResultSet::getImplementationName() -I- */
+OUString SAL_CALL OResultSet::getImplementationName()
+ throw (RuntimeException)
+{
+ OSL_TRACE("OResultSet::getImplementationName");
+ return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdbcx.mysqlc.ResultSet" ) );
+}
+/* }}} */
+
+
+/* {{{ OResultSet::getSupportedServiceNames() -I- */
+Sequence< OUString > SAL_CALL OResultSet::getSupportedServiceNames()
+ throw(RuntimeException)
+{
+ OSL_TRACE("OResultSet::getSupportedServiceNames");
+ Sequence< OUString > aSupported(2);
+ aSupported[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdbc.ResultSet" ) );
+ aSupported[1] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdbcx.ResultSet" ) );
+ return (aSupported);
+}
+/* }}} */
+
+
+/* {{{ OResultSet::supportsService() -I- */
+sal_Bool SAL_CALL OResultSet::supportsService(const OUString& _rServiceName)
+ throw(RuntimeException)
+{
+ OSL_TRACE("OResultSet::supportsService");
+ Sequence< OUString > aSupported(getSupportedServiceNames());
+ const OUString* pSupported = aSupported.getConstArray();
+ const OUString* pEnd = pSupported + aSupported.getLength();
+ for (;pSupported != pEnd && !pSupported->equals(_rServiceName); ++pSupported) {}
+
+ return (pSupported != pEnd);
+}
+/* }}} */
+
+
+/* {{{ OResultSet::OResultSet() -I- */
+OResultSet::OResultSet(OCommonStatement * pStmt, sql::ResultSet * result, rtl_TextEncoding _encoding )
+ : OResultSet_BASE(m_aMutex)
+ ,OPropertySetHelper(OResultSet_BASE::rBHelper)
+ ,m_aStatement((OWeakObject*)pStmt)
+ ,m_xMetaData(NULL)
+ ,m_result(result)
+ ,fieldCount( 0 )
+ ,m_encoding( _encoding )
+{
+ OSL_TRACE("OResultSet::OResultSet");
+ try {
+ sql::ResultSetMetaData * rs_meta = m_result->getMetaData();
+ fieldCount = rs_meta->getColumnCount();
+ } catch (sql::SQLException &e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding);
+ }
+}
+/* }}} */
+
+
+/* {{{ OResultSet::~OResultSet() -I- */
+OResultSet::~OResultSet()
+{
+ OSL_TRACE("OResultSet::~OResultSet");
+}
+/* }}} */
+
+
+/* {{{ OResultSet::disposing() -I- */
+void OResultSet::disposing()
+{
+ OSL_TRACE("OResultSet::disposing");
+ OPropertySetHelper::disposing();
+
+ MutexGuard aGuard(m_aMutex);
+
+ m_aStatement = NULL;
+ m_xMetaData = NULL;
+}
+/* }}} */
+
+
+/* {{{ OResultSet::queryInterface() -I- */
+Any SAL_CALL OResultSet::queryInterface(const Type & rType)
+ throw(RuntimeException)
+{
+ OSL_TRACE("OResultSet::queryInterface");
+ Any aRet = OPropertySetHelper::queryInterface(rType);
+ if (!aRet.hasValue()) {
+ aRet = OResultSet_BASE::queryInterface(rType);
+ }
+ return aRet;
+}
+/* }}} */
+
+
+/* {{{ OResultSet::getTypes() -I- */
+Sequence< Type > SAL_CALL OResultSet::getTypes()
+ throw(RuntimeException)
+{
+ OSL_TRACE("OResultSet::getTypes");
+ OTypeCollection aTypes( ::getCppuType((const Reference< XMultiPropertySet > *) NULL),
+ ::getCppuType((const Reference< XFastPropertySet > *) NULL),
+ ::getCppuType((const Reference< XPropertySet > *) NULL));
+
+ return concatSequences(aTypes.getTypes(), OResultSet_BASE::getTypes());
+}
+/* }}} */
+
+
+/* {{{ OResultSet::findColumn() -I- */
+sal_Int32 SAL_CALL OResultSet::findColumn(const OUString& columnName)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSet::findColumn");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
+
+ try {
+ // find the first column with the name columnName
+ sql::ResultSetMetaData * meta = m_result->getMetaData();
+ for (sal_uInt32 i = 1; i <= fieldCount; i++) {
+ if (columnName.equalsIgnoreAsciiCaseAscii(meta->getColumnName(i).c_str())) {
+ /* SDBC knows them indexed from 1 */
+ return i;
+ }
+ }
+ } catch (sql::SQLException &e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding);
+ }
+ return 0;
+}
+/* }}} */
+
+
+/* {{{ OResultSet::getBinaryStream() -U- */
+Reference< XInputStream > SAL_CALL OResultSet::getBinaryStream(sal_Int32 column)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSet::getBinaryStream");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
+ checkColumnIndex(column);
+
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSet::getBinaryStream", *this);
+ return NULL;
+}
+/* }}} */
+
+
+/* {{{ OResultSet::getCharacterStream() -U- */
+Reference< XInputStream > SAL_CALL OResultSet::getCharacterStream(sal_Int32 column)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSet::getCharacterStream");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
+ checkColumnIndex(column);
+
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSet::getCharacterStream", *this);
+ return NULL;
+}
+/* }}} */
+
+
+/* {{{ OResultSet::getBoolean() -I- */
+sal_Bool SAL_CALL OResultSet::getBoolean(sal_Int32 column)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSet::getBoolean");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
+
+ checkColumnIndex(column);
+ try {
+ return m_result->getBoolean(column)? sal_True:sal_False;
+ } catch (sql::SQLException &e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding);
+ }
+ return sal_False;
+#if 0
+ OUString str = getString(column);
+ switch (str[0]) {
+ case '1':
+ case 't':
+ case 'T':
+ case 'y':
+ case 'Y':
+ return sal_True;
+ }
+ return sal_False;
+#endif
+}
+/* }}} */
+
+
+/* {{{ OResultSet::getByte() -I- */
+sal_Int8 SAL_CALL OResultSet::getByte(sal_Int32 column)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSet::getByte");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
+
+ checkColumnIndex(column);
+ try {
+ return m_result->getInt(column);
+ } catch (sql::SQLException &e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding);
+ }
+ return 0; // fool compiler
+}
+/* }}} */
+
+
+/* {{{ OResultSet::getBytes() -I- */
+Sequence< sal_Int8 > SAL_CALL OResultSet::getBytes(sal_Int32 column)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSet::getBytes");
+
+ checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
+ MutexGuard aGuard(m_aMutex);
+
+
+ sql::SQLString val = m_result->getString(column);
+ if (!val.length()) {
+ return Sequence< sal_Int8>();
+ } else {
+ return Sequence< sal_Int8 > ((sal_Int8*)val.c_str(), val.length());
+ }
+}
+/* }}} */
+
+
+/* {{{ OResultSet::getDate() -I- */
+Date SAL_CALL OResultSet::getDate(sal_Int32 column)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSet::getDate");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
+ checkColumnIndex(column);
+
+ Date d;
+ try {
+ OUString dateString = getString(column);
+ OUString token;
+ sal_Int32 nIndex = 0, i=0;
+
+ do {
+ token = dateString.getToken (0, '-', nIndex);
+ switch (i) {
+ case 0:
+ d.Year = static_cast<sal_uInt16>(token.toInt32(10));
+ break;
+ case 1:
+ d.Month = static_cast<sal_uInt16>(token.toInt32(10));
+ break;
+ case 2:
+ d.Day = static_cast<sal_uInt16>(token.toInt32(10));
+ break;
+ default:;
+ }
+ i++;
+ } while (nIndex >= 0);
+ } catch (sql::SQLException &e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding);
+ }
+ return d;
+}
+/* }}} */
+
+
+/* {{{ OResultSet::getDouble() -I- */
+double SAL_CALL OResultSet::getDouble(sal_Int32 column)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSet::getDouble");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
+
+ checkColumnIndex(column);
+ try {
+ return m_result->getDouble(column);
+ } catch (sql::SQLException &e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding);
+ }
+ return 0.0; // fool compiler
+}
+/* }}} */
+
+
+/* {{{ OResultSet::getFloat() -I- */
+float SAL_CALL OResultSet::getFloat(sal_Int32 column)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSet::getFloat");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
+
+ checkColumnIndex(column);
+ try {
+ return m_result->getDouble(column);
+ } catch (sql::SQLException &e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding);
+ }
+ return 0.0; // fool compiler
+}
+/* }}} */
+
+
+/* {{{ OResultSet::getInt() -I- */
+sal_Int32 SAL_CALL OResultSet::getInt(sal_Int32 column)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSet::getInt");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
+
+ checkColumnIndex(column);
+ try {
+ return m_result->getInt(column);
+ } catch (sql::SQLException &e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding);
+ }
+ return 0; // fool compiler
+}
+/* }}} */
+
+
+/* {{{ OResultSet::getRow() -I- */
+sal_Int32 SAL_CALL OResultSet::getRow()
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSet::getRow");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
+
+ try {
+ return m_result->getRow();
+ } catch (sql::SQLException &e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding);
+ }
+ return 0; // fool compiler
+}
+/* }}} */
+
+
+/* {{{ OResultSet::getLong() -I- */
+sal_Int64 SAL_CALL OResultSet::getLong(sal_Int32 column)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSet::getLong");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
+
+ checkColumnIndex(column);
+ try {
+ return m_result->getInt64(column);
+ } catch (sql::SQLException &e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding);
+ }
+ return 0; // fool compiler
+}
+/* }}} */
+
+
+/* {{{ OResultSet::getMetaData() -I- */
+Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData()
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSet::getMetaData");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
+ try {
+ if (!m_xMetaData.is()) {
+ m_xMetaData = new OResultSetMetaData(m_result->getMetaData(), m_encoding);
+ }
+ } catch (sql::MethodNotImplementedException) {
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSet::getMetaData", *this);
+ } catch (sql::SQLException &e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding);
+ }
+ return m_xMetaData;
+}
+/* }}} */
+
+
+/* {{{ OResultSet::getArray() -U- */
+Reference< XArray > SAL_CALL OResultSet::getArray(sal_Int32 column)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSet::getArray");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
+ checkColumnIndex(column);
+
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSet::getArray", *this);
+ return NULL;
+}
+/* }}} */
+
+
+/* {{{ OResultSet::getClob() -U- */
+Reference< XClob > SAL_CALL OResultSet::getClob(sal_Int32 column)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSet::getClob");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
+ checkColumnIndex(column);
+
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSet::getClob", *this);
+ return NULL;
+}
+/* }}} */
+
+
+/* {{{ OResultSet::getBlob() -U- */
+Reference< XBlob > SAL_CALL OResultSet::getBlob(sal_Int32 column)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSet::getBlob");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
+ checkColumnIndex(column);
+
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSet::getBlob", *this);
+ return NULL;
+}
+/* }}} */
+
+
+/* {{{ OResultSet::getRef() -U- */
+Reference< XRef > SAL_CALL OResultSet::getRef(sal_Int32 column)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSet::getRef");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
+ checkColumnIndex(column);
+
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSet::getRef", *this);
+ return NULL;
+}
+/* }}} */
+
+
+/* {{{ OResultSet::getObject() -U- */
+Any SAL_CALL OResultSet::getObject(sal_Int32 column, const Reference< XNameAccess >& /* typeMap */)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSet::getObject");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
+ checkColumnIndex(column);
+
+ Any aRet= Any();
+
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSet::getObject", *this);
+ return aRet;
+}
+/* }}} */
+
+
+/* {{{ OResultSet::getShort() -I- */
+sal_Int16 SAL_CALL OResultSet::getShort(sal_Int32 column)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSet::getShort");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
+
+ try {
+ return (sal_Int16) m_result->getInt(column);
+ } catch (sql::SQLException &e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding);
+ }
+ return 0; // fool compiler
+}
+/* }}} */
+
+
+/* {{{ OResultSet::getString() -I- */
+OUString SAL_CALL OResultSet::getString(sal_Int32 column)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSet::getString");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
+
+ checkColumnIndex(column);
+
+ try {
+ sql::SQLString val = m_result->getString(column);
+ if (!m_result->wasNull()) {
+ return OUString( val.c_str(), val.length(), m_encoding );
+ } else {
+ return OUString();
+ }
+ } catch (sql::SQLException &e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding);
+ }
+ return OUString(); // fool compiler
+}
+/* }}} */
+
+
+/* {{{ OResultSet::getTime() -I- */
+Time SAL_CALL OResultSet::getTime(sal_Int32 column)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSet::getTime");
+ checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
+ MutexGuard aGuard(m_aMutex);
+
+ checkColumnIndex(column);
+ Time t;
+ OUString timeString = getString(column);
+ OUString token;
+ sal_Int32 nIndex, i=0;
+
+ nIndex = timeString.indexOf(' ') + 1;
+
+ do {
+ token = timeString.getToken (0, ':', nIndex);
+ switch (i) {
+ case 0:
+ t.Hours = static_cast<sal_uInt16>(token.toInt32(10));
+ break;
+ case 1:
+ t.Minutes = static_cast<sal_uInt16>(token.toInt32(10));
+ break;
+ case 2:
+ t.Seconds = static_cast<sal_uInt16>(token.toInt32(10));
+ break;
+ }
+ i++;
+ } while (nIndex >= 0);
+
+ return t;
+}
+/* }}} */
+
+
+/* {{{ OResultSet::getTimestamp() -I- */
+DateTime SAL_CALL OResultSet::getTimestamp(sal_Int32 column)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSet::getTimestamp");
+ checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
+ MutexGuard aGuard(m_aMutex);
+
+ checkColumnIndex(column);
+ DateTime dt;
+ Date d = getDate(column);
+ Time t = getTime(column);
+
+ dt.Year = d.Year;
+ dt.Month = d.Month;
+ dt.Day = d.Day;
+ dt.Hours = t.Hours;
+ dt.Minutes = t.Minutes;
+ dt.Seconds = t.Seconds;
+ return dt;
+}
+/* }}} */
+
+
+/* {{{ OResultSet::isBeforeFirst() -I- */
+sal_Bool SAL_CALL OResultSet::isBeforeFirst()
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSet::isBeforeFirst");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
+
+ try {
+ return m_result->isBeforeFirst()? sal_True:sal_False;
+ } catch (sql::SQLException &e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding);
+ }
+ return sal_False; //fool
+}
+/* }}} */
+
+
+/* {{{ OResultSet::isAfterLast() -I- */
+sal_Bool SAL_CALL OResultSet::isAfterLast()
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSet::isAfterLast");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
+
+ try {
+ return m_result->isAfterLast()? sal_True:sal_False;
+ } catch (sql::SQLException &e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding);
+ }
+ return sal_False; //fool
+}
+/* }}} */
+
+
+/* {{{ OResultSet::isFirst() -I- */
+sal_Bool SAL_CALL OResultSet::isFirst()
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSet::isFirst");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
+
+ try {
+ return m_result->isFirst();
+ } catch (sql::SQLException &e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding);
+ }
+ return sal_False; //fool
+}
+/* }}} */
+
+
+/* {{{ OResultSet::isLast() -I- */
+sal_Bool SAL_CALL OResultSet::isLast()
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSet::isLast");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
+
+ try {
+ return m_result->isLast()? sal_True:sal_False;
+ } catch (sql::SQLException &e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding);
+ }
+ return sal_False; //fool
+}
+/* }}} */
+
+
+/* {{{ OResultSet::beforeFirst() -I- */
+void SAL_CALL OResultSet::beforeFirst()
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSet::beforeFirst");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
+
+ try {
+ m_result->beforeFirst();
+ } catch (sql::SQLException &e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding);
+ }
+}
+/* }}} */
+
+
+/* {{{ OResultSet::afterLast() -I- */
+void SAL_CALL OResultSet::afterLast()
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSet::afterLast");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
+
+ try {
+ m_result->afterLast();
+ } catch (sql::SQLException &e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding);
+ }
+}
+/* }}} */
+
+
+/* {{{ OResultSet::close() -I- */
+void SAL_CALL OResultSet::close() throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSet::close");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
+
+ try {
+ m_result->close();
+ } catch (sql::SQLException &e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding);
+ }
+
+ dispose();
+}
+/* }}} */
+
+
+/* {{{ OResultSet::first() -I- */
+sal_Bool SAL_CALL OResultSet::first() throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSet::first");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
+
+ try {
+ return m_result->first()? sal_True:sal_False;
+ } catch (sql::SQLException &e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding);
+ }
+ return sal_False; //fool
+}
+/* }}} */
+
+
+/* {{{ OResultSet::last() -I- */
+sal_Bool SAL_CALL OResultSet::last()
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSet::last");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
+
+ try {
+ return m_result->last()? sal_True:sal_False;
+ } catch (sql::SQLException &e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding);
+ }
+ return sal_False; //fool
+}
+/* }}} */
+
+
+/* {{{ OResultSet::absolute() -I- */
+sal_Bool SAL_CALL OResultSet::absolute(sal_Int32 row)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSet::absolute");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
+
+ try {
+ return m_result->absolute(row)? sal_True:sal_False;
+ } catch (sql::SQLException &e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding);
+ }
+ return sal_False; //fool
+}
+/* }}} */
+
+
+/* {{{ OResultSet::relative() -I- */
+sal_Bool SAL_CALL OResultSet::relative(sal_Int32 row)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSet::relative");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
+
+ try {
+ return m_result->relative(row)? sal_True:sal_False;
+ } catch (sql::SQLException &e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding);
+ }
+ return sal_False; //fool
+}
+/* }}} */
+
+
+/* {{{ OResultSet::previous() -I- */
+sal_Bool SAL_CALL OResultSet::previous()
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSet::previous");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
+
+ try {
+ return m_result->previous()? sal_True:sal_False;
+ } catch (sql::SQLException &e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding);
+ }
+ return sal_False; //fool
+}
+/* }}} */
+
+
+/* {{{ OResultSet::getStatement() -I- */
+Reference< XInterface > SAL_CALL OResultSet::getStatement()
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSet::getStatement");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
+
+ return m_aStatement.get();
+}
+/* }}} */
+
+
+/* {{{ OResultSet::rowDeleted() -I- */
+sal_Bool SAL_CALL OResultSet::rowDeleted()
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSet::rowDeleted");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
+
+ return sal_False;
+}
+/* }}} */
+
+
+/* {{{ OResultSet::rowInserted() -I- */
+sal_Bool SAL_CALL OResultSet::rowInserted()
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSet::rowInserted");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
+
+ return sal_False;
+}
+/* }}} */
+
+
+/* {{{ OResultSet::rowUpdated() -I- */
+sal_Bool SAL_CALL OResultSet::rowUpdated()
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSet::rowUpdated");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
+
+ return sal_False;
+}
+/* }}} */
+
+
+/* {{{ OResultSet::next() -I- */
+sal_Bool SAL_CALL OResultSet::next()
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSet::next");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
+
+ try {
+ return m_result->next()? sal_True:sal_False;
+ } catch (sql::SQLException &e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding);
+ }
+ return sal_False; //fool
+}
+/* }}} */
+
+
+/* {{{ OResultSet::wasNull() -I- */
+sal_Bool SAL_CALL OResultSet::wasNull()
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSet::wasNull");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
+
+ try {
+ return m_result->wasNull()? sal_True:sal_False;
+ } catch (sql::SQLException &e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding);
+ }
+ return sal_False; //fool
+}
+/* }}} */
+
+
+/* {{{ OResultSet::cancel() -I- */
+void SAL_CALL OResultSet::cancel()
+ throw(RuntimeException)
+{
+ OSL_TRACE("OResultSet::cancel");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
+}
+/* }}} */
+
+
+/* {{{ OResultSet::clearWarnings() -I- */
+void SAL_CALL OResultSet::clearWarnings()
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSet::clearWarnings");
+}
+/* }}} */
+
+
+/* {{{ OResultSet::getWarnings() -I- */
+Any SAL_CALL OResultSet::getWarnings()
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSet::getWarnings");
+ Any aRet= Any();
+ return aRet;
+}
+/* }}} */
+
+
+/* {{{ OResultSet::insertRow() -I- */
+void SAL_CALL OResultSet::insertRow()
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSet::insertRow");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
+ // you only have to implement this if you want to insert new rows
+}
+/* }}} */
+
+
+/* {{{ OResultSet::updateRow() -I- */
+void SAL_CALL OResultSet::updateRow()
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSet::updateRow");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
+
+ // only when you allow updates
+}
+/* }}} */
+
+
+/* {{{ OResultSet::deleteRow() -I- */
+void SAL_CALL OResultSet::deleteRow()
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSet::deleteRow");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
+}
+/* }}} */
+
+
+/* {{{ OResultSet::cancelRowUpdates() -I- */
+void SAL_CALL OResultSet::cancelRowUpdates()
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSet::cancelRowUpdates");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
+}
+/* }}} */
+
+
+/* {{{ OResultSet::moveToInsertRow() -I- */
+void SAL_CALL OResultSet::moveToInsertRow()
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSet::moveToInsertRow");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
+
+ // only when you allow insert's
+}
+/* }}} */
+
+
+/* {{{ OResultSet::moveToCurrentRow() -I- */
+void SAL_CALL OResultSet::moveToCurrentRow()
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSet::moveToCurrentRow");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
+}
+/* }}} */
+
+
+/* {{{ OResultSet::updateNull() -U- */
+void SAL_CALL OResultSet::updateNull(sal_Int32 column)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSet::updateNull");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
+ checkColumnIndex(column);
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSet::updateNull", *this);
+}
+/* }}} */
+
+
+/* {{{ OResultSet::updateBoolean() -U- */
+void SAL_CALL OResultSet::updateBoolean(sal_Int32 column, sal_Bool /* x */)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSet::updateBoolean");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
+ checkColumnIndex(column);
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSet::updateBoolean", *this);
+}
+/* }}} */
+
+
+/* {{{ OResultSet::updateByte() -U- */
+void SAL_CALL OResultSet::updateByte(sal_Int32 column, sal_Int8 /* x */)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSet::updateByte");
+ checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
+ MutexGuard aGuard(m_aMutex);
+ checkColumnIndex(column);
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSet::updateByte", *this);
+}
+/* }}} */
+
+
+/* {{{ OResultSet::updateShort() -U- */
+void SAL_CALL OResultSet::updateShort(sal_Int32 column, sal_Int16 /* x */)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSet::updateShort");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
+ checkColumnIndex(column);
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSet::updateShort", *this);
+}
+/* }}} */
+
+
+/* {{{ OResultSet::updateInt() -U- */
+void SAL_CALL OResultSet::updateInt(sal_Int32 column, sal_Int32 /* x */)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSet::updateInt");
+ checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
+ MutexGuard aGuard(m_aMutex);
+ checkColumnIndex(column);
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSet::updateInt", *this);
+}
+/* }}} */
+
+
+/* {{{ OResultSet::updateLong() -U- */
+void SAL_CALL OResultSet::updateLong(sal_Int32 column, sal_Int64 /* x */)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSet::updateLong");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
+ checkColumnIndex(column);
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSet::updateLong", *this);
+}
+/* }}} */
+
+
+/* {{{ OResultSet::updateFloat() -U- */
+void SAL_CALL OResultSet::updateFloat(sal_Int32 column, float /* x */)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSet::updateFloat");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
+ checkColumnIndex(column);
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSet::updateFloat", *this);
+}
+/* }}} */
+
+
+/* {{{ OResultSet::updateDouble() -U- */
+void SAL_CALL OResultSet::updateDouble(sal_Int32 column, double /* x */)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSet::updateDouble");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
+ checkColumnIndex(column);
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSet::updateDouble", *this);
+}
+/* }}} */
+
+
+/* {{{ OResultSet::updateString() -U- */
+void SAL_CALL OResultSet::updateString(sal_Int32 column, const OUString& /* x */)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSet::updateString");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
+ checkColumnIndex(column);
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSet::updateString", *this);
+}
+/* }}} */
+
+
+/* {{{ OResultSet::updateBytes() -U- */
+void SAL_CALL OResultSet::updateBytes(sal_Int32 column, const Sequence< sal_Int8 >& /* x */)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSet::updateBytes");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
+ checkColumnIndex(column);
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSet::updateBytes", *this);
+}
+/* }}} */
+
+
+/* {{{ OResultSet::updateDate() -U- */
+void SAL_CALL OResultSet::updateDate(sal_Int32 column, const Date& /* x */)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSet::updateDate");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
+ checkColumnIndex(column);
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSet::updateDate", *this);
+}
+/* }}} */
+
+
+/* {{{ OResultSet::updateTime() -U- */
+void SAL_CALL OResultSet::updateTime(sal_Int32 column, const Time& /* x */)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSet::updateTime");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
+ checkColumnIndex(column);
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSet::updateTime", *this);
+}
+/* }}} */
+
+
+/* {{{ OResultSet::updateTimestamp() -U- */
+void SAL_CALL OResultSet::updateTimestamp(sal_Int32 column, const DateTime& /* x */)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSet::updateTimestamp");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
+ checkColumnIndex(column);
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSet::updateTimestamp", *this);
+}
+/* }}} */
+
+
+/* {{{ OResultSet::updateBinaryStream() -U- */
+void SAL_CALL OResultSet::updateBinaryStream(sal_Int32 column, const Reference< XInputStream >& /* x */,
+ sal_Int32 /* length */)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSet::updateBinaryStream");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
+ checkColumnIndex(column);
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSet::updateBinaryStream", *this);
+}
+/* }}} */
+
+
+/* {{{ OResultSet::updateCharacterStream() -U- */
+void SAL_CALL OResultSet::updateCharacterStream(sal_Int32 column, const Reference< XInputStream >& /* x */,
+ sal_Int32 /* length */)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSet::updateCharacterStream");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
+ checkColumnIndex(column);
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSet::updateCharacterStream", *this);
+}
+/* }}} */
+
+
+/* {{{ OResultSet::refreshRow() -U- */
+void SAL_CALL OResultSet::refreshRow()
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSet::refreshRow");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSet::refreshRow", *this);
+}
+/* }}} */
+
+
+/* {{{ OResultSet::updateObject() -U- */
+void SAL_CALL OResultSet::updateObject(sal_Int32 column, const Any& /* x */)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSet::updateObject");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
+ checkColumnIndex(column);
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSet::updateObject", *this);
+}
+/* }}} */
+
+
+/* {{{ OResultSet::updateNumericObject() -U- */
+void SAL_CALL OResultSet::updateNumericObject(sal_Int32 column, const Any& /* x */, sal_Int32 /* scale */)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSet::updateNumericObject");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
+ checkColumnIndex(column);
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSet::updateNumericObject", *this);
+}
+/* }}} */
+
+
+// XRowLocate
+/* {{{ OResultSet::getBookmark() -U- */
+Any SAL_CALL OResultSet::getBookmark()
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSet::getBookmark");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
+ Any aRet = Any();
+
+ // if you don't want to support bookmark you must remove the XRowLocate interface
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSet::getBookmark", *this);
+
+ return aRet;
+}
+/* }}} */
+
+
+/* {{{ OResultSet::moveToBookmark() -U- */
+sal_Bool SAL_CALL OResultSet::moveToBookmark(const Any& /* bookmark */)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSet::moveToBookmark");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
+
+ return sal_False;
+}
+/* }}} */
+
+
+/* {{{ OResultSet::moveRelativeToBookmark() -U- */
+sal_Bool SAL_CALL OResultSet::moveRelativeToBookmark(const Any& /* bookmark */, sal_Int32 /* rows */)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSet::moveRelativeToBookmark");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
+
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSet::moveRelativeToBookmark", *this);
+ return sal_False;
+}
+/* }}} */
+
+
+/* {{{ OResultSet::compareBookmarks() -I- */
+sal_Int32 SAL_CALL OResultSet::compareBookmarks(const Any& /* n1 */, const Any& /* n2 */)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSet::compareBookmarks");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
+
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSet::compareBookmarks", *this);
+
+ return CompareBookmark::NOT_EQUAL;
+}
+/* }}} */
+
+
+/* {{{ OResultSet::hasOrderedBookmarks() -I- */
+sal_Bool SAL_CALL OResultSet::hasOrderedBookmarks()
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSet::hasOrderedBookmarks");
+ return sal_False;
+}
+/* }}} */
+
+
+/* {{{ OResultSet::hashBookmark() -U- */
+sal_Int32 SAL_CALL OResultSet::hashBookmark(const Any& /* bookmark */)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSet::hashBookmark");
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSet::hashBookmark", *this);
+ return 0;
+}
+/* }}} */
+
+
+// XDeleteRows
+/* {{{ OResultSet::deleteRows() -U- */
+Sequence< sal_Int32 > SAL_CALL OResultSet::deleteRows(const Sequence< Any >& /* rows */)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSet::deleteRows");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
+ Sequence< sal_Int32 > aRet = Sequence< sal_Int32 >();
+
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSet::deleteRows", *this);
+ return aRet;
+}
+/* }}} */
+
+
+/* {{{ OResultSet::createArrayHelper() -I- */
+IPropertyArrayHelper * OResultSet::createArrayHelper() const
+{
+ OSL_TRACE("OResultSet::createArrayHelper");
+ Sequence< Property > aProps(5);
+ Property* pProperties = aProps.getArray();
+ sal_Int32 nPos = 0;
+ DECL_PROP0(FETCHDIRECTION, sal_Int32);
+ DECL_PROP0(FETCHSIZE, sal_Int32);
+ DECL_BOOL_PROP1IMPL(ISBOOKMARKABLE) PropertyAttribute::READONLY);
+ DECL_PROP1IMPL(RESULTSETCONCURRENCY,sal_Int32) PropertyAttribute::READONLY);
+ DECL_PROP1IMPL(RESULTSETTYPE, sal_Int32) PropertyAttribute::READONLY);
+
+ return new OPropertyArrayHelper(aProps);
+}
+/* }}} */
+
+
+/* {{{ OResultSet::getInfoHelper() -I- */
+IPropertyArrayHelper & OResultSet::getInfoHelper()
+{
+ OSL_TRACE("OResultSet::getInfoHelper");
+ return (*const_cast<OResultSet*>(this)->getArrayHelper());
+}
+/* }}} */
+
+
+/* {{{ OResultSet::convertFastPropertyValue() -I- */
+sal_Bool OResultSet::convertFastPropertyValue(Any & /* rConvertedValue */,
+ Any & /* rOldValue */,
+ sal_Int32 nHandle,
+ const Any& /* rValue */)
+ throw (::com::sun::star::lang::IllegalArgumentException)
+{
+ OSL_TRACE("OResultSet::convertFastPropertyValue");
+ switch (nHandle) {
+ case PROPERTY_ID_ISBOOKMARKABLE:
+ case PROPERTY_ID_CURSORNAME:
+ case PROPERTY_ID_RESULTSETCONCURRENCY:
+ case PROPERTY_ID_RESULTSETTYPE:
+ throw ::com::sun::star::lang::IllegalArgumentException();
+ case PROPERTY_ID_FETCHDIRECTION:
+ case PROPERTY_ID_FETCHSIZE:
+ default:
+ ;
+ }
+ return sal_False;
+}
+/* }}} */
+
+
+/* {{{ OResultSet::setFastPropertyValue_NoBroadcast() -I- */
+void OResultSet::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const Any& /* rValue */)
+ throw (Exception)
+{
+ OSL_TRACE("OResultSet::setFastPropertyValue_NoBroadcast");
+ switch (nHandle) {
+ case PROPERTY_ID_ISBOOKMARKABLE:
+ case PROPERTY_ID_CURSORNAME:
+ case PROPERTY_ID_RESULTSETCONCURRENCY:
+ case PROPERTY_ID_RESULTSETTYPE:
+ throw Exception();
+ case PROPERTY_ID_FETCHDIRECTION:
+ break;
+ case PROPERTY_ID_FETCHSIZE:
+ break;
+ default:
+ ;
+ }
+}
+/* }}} */
+
+
+/* {{{ OResultSet::getFastPropertyValue() -I- */
+void OResultSet::getFastPropertyValue(Any& _rValue, sal_Int32 nHandle) const
+{
+ OSL_TRACE("OResultSet::getFastPropertyValue");
+ switch (nHandle) {
+ case PROPERTY_ID_ISBOOKMARKABLE:
+ _rValue <<= sal_False;
+ break;
+ case PROPERTY_ID_CURSORNAME:
+ case PROPERTY_ID_RESULTSETCONCURRENCY:
+ case PROPERTY_ID_RESULTSETTYPE:
+ case PROPERTY_ID_FETCHDIRECTION:
+ case PROPERTY_ID_FETCHSIZE:
+ ;
+ default:
+ ;
+ }
+}
+/* }}} */
+
+
+/* {{{ OResultSet::acquire() -I- */
+void SAL_CALL OResultSet::acquire()
+ throw()
+{
+ OSL_TRACE("OResultSet::acquire");
+ OResultSet_BASE::acquire();
+}
+/* }}} */
+
+
+/* {{{ OResultSet::release() -I- */
+void SAL_CALL OResultSet::release()
+ throw()
+{
+ OSL_TRACE("OResultSet::release");
+ OResultSet_BASE::release();
+}
+/* }}} */
+
+
+/* {{{ OResultSet::getPropertySetInfo() -I- */
+::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OResultSet::getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException)
+{
+ OSL_TRACE("OResultSet::getPropertySetInfo");
+ return (::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()));
+}
+/* }}} */
+
+
+/* {{{ OResultSet::checkColumnIndex() -I- */
+void OResultSet::checkColumnIndex(sal_Int32 index)
+ throw (SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSet::checkColumnIndex");
+ if ((index < 1 || index > (int) fieldCount)) {
+ /* static object for efficiency or thread safety is a problem ? */
+ OUString buf( RTL_CONSTASCII_USTRINGPARAM( "index out of range" ) );
+ throw SQLException(buf, *this, OUString(), 1, Any());
+ }
+}
+/* }}} */
+
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noet sw=4 ts=4 fdm=marker
+ * vim<600: noet sw=4 ts=4
+ */
diff --git a/mysqlc/source/mysqlc_resultset.hxx b/mysqlc/source/mysqlc_resultset.hxx
new file mode 100644
index 000000000000..9a03ebe0cc68
--- /dev/null
+++ b/mysqlc/source/mysqlc_resultset.hxx
@@ -0,0 +1,337 @@
+/*************************************************************************
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2008 by Sun Microsystems, Inc.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* $RCSfile: mysqlc_resultset.hxx,v $
+*
+* $Revision: 1.1.2.4 $
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org. If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+************************************************************************/
+
+#ifndef MYSQLC_SRESULTSET_HXX
+#define MYSQLC_SRESULTSET_HXX
+
+#include "mysqlc_preparedstatement.hxx"
+#include "mysqlc_statement.hxx"
+#include "mysqlc_subcomponent.hxx"
+
+#include <com/sun/star/sdbc/XCloseable.hpp>
+#include <com/sun/star/sdbc/XColumnLocate.hpp>
+#include <com/sun/star/sdbc/XResultSet.hpp>
+#include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp>
+#include <com/sun/star/sdbc/XResultSetUpdate.hpp>
+#include <com/sun/star/sdbc/XRow.hpp>
+#include <com/sun/star/sdbc/XRowUpdate.hpp>
+#include <com/sun/star/sdbc/XWarningsSupplier.hpp>
+#include <com/sun/star/sdbcx/XDeleteRows.hpp>
+#include <com/sun/star/sdbcx/XRowLocate.hpp>
+#include <com/sun/star/util/XCancellable.hpp>
+
+#include <cppuhelper/compbase12.hxx>
+
+
+namespace connectivity
+{
+ namespace mysqlc
+ {
+ using ::rtl::OUString;
+ using ::com::sun::star::sdbc::SQLException;
+ using ::com::sun::star::uno::RuntimeException;
+ using ::com::sun::star::uno::Any;
+ typedef ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > my_XInputStreamRef;
+ typedef my_XNameAccessRef my_XNameAccessRef;
+
+ /*
+ ** OResultSet
+ */
+ typedef ::cppu::WeakComponentImplHelper12< ::com::sun::star::sdbc::XResultSet,
+ ::com::sun::star::sdbc::XRow,
+ ::com::sun::star::sdbc::XResultSetMetaDataSupplier,
+ ::com::sun::star::util::XCancellable,
+ ::com::sun::star::sdbc::XWarningsSupplier,
+ ::com::sun::star::sdbc::XResultSetUpdate,
+ ::com::sun::star::sdbc::XRowUpdate,
+ ::com::sun::star::sdbcx::XRowLocate,
+ ::com::sun::star::sdbcx::XDeleteRows,
+ ::com::sun::star::sdbc::XCloseable,
+ ::com::sun::star::sdbc::XColumnLocate,
+ ::com::sun::star::lang::XServiceInfo> OResultSet_BASE;
+
+ class OResultSet : public OBase_Mutex,
+ public OResultSet_BASE,
+ public ::cppu::OPropertySetHelper,
+ public OPropertyArrayUsageHelper<OResultSet>
+ {
+ protected:
+ ::com::sun::star::uno::WeakReferenceHelper m_aStatement;
+ ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData> m_xMetaData;
+ sql::ResultSet *m_result;
+ unsigned int fieldCount;
+ rtl_TextEncoding m_encoding;
+ // OPropertyArrayUsageHelper
+ ::cppu::IPropertyArrayHelper* createArrayHelper() const;
+ // OPropertySetHelper
+ ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper();
+
+ sal_Bool SAL_CALL convertFastPropertyValue(Any & rConvertedValue, Any & rOldValue, sal_Int32 nHandle, const Any& rValue)
+ throw (::com::sun::star::lang::IllegalArgumentException);
+
+ void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const Any& rValue)
+ throw (::com::sun::star::uno::Exception);
+
+ void SAL_CALL getFastPropertyValue(Any& rValue, sal_Int32 nHandle) const;
+
+ // you can't delete objects of this type
+ virtual ~OResultSet();
+
+ public:
+ DECLARE_SERVICE_INFO();
+
+ OResultSet( OCommonStatement* pStmt, sql::ResultSet *result, rtl_TextEncoding _encoding );
+
+ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > operator *()
+ {
+ return ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >(*(OResultSet_BASE*)this);
+ }
+
+ // ::cppu::OComponentHelper
+ void SAL_CALL disposing();
+
+ // XInterface
+ Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type & rType)
+ throw(RuntimeException);
+
+ void SAL_CALL acquire() throw();
+
+ void SAL_CALL release() throw();
+
+ //XTypeProvider
+ ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes()
+ throw(RuntimeException);
+
+ // XPropertySet
+ ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo()
+ throw(RuntimeException);
+
+ // XResultSet
+ sal_Bool SAL_CALL next() throw(SQLException, RuntimeException);
+
+ sal_Bool SAL_CALL isBeforeFirst() throw(SQLException, RuntimeException);
+
+ sal_Bool SAL_CALL isAfterLast() throw(SQLException, RuntimeException);
+
+ sal_Bool SAL_CALL isFirst() throw(SQLException, RuntimeException);
+
+ sal_Bool SAL_CALL isLast() throw(SQLException, RuntimeException);
+
+ void SAL_CALL beforeFirst() throw(SQLException, RuntimeException);
+
+ void SAL_CALL afterLast() throw(SQLException, RuntimeException);
+
+ sal_Bool SAL_CALL first() throw(SQLException, RuntimeException);
+
+ sal_Bool SAL_CALL last() throw(SQLException, RuntimeException);
+
+ sal_Int32 SAL_CALL getRow() throw(SQLException, RuntimeException);
+
+ sal_Bool SAL_CALL absolute(sal_Int32 row) throw(SQLException, RuntimeException);
+
+ sal_Bool SAL_CALL relative(sal_Int32 rows) throw(SQLException, RuntimeException);
+
+ sal_Bool SAL_CALL previous() throw(SQLException, RuntimeException);
+
+ void SAL_CALL refreshRow() throw(SQLException, RuntimeException);
+
+ sal_Bool SAL_CALL rowUpdated() throw(SQLException, RuntimeException);
+
+ sal_Bool SAL_CALL rowInserted() throw(SQLException, RuntimeException);
+
+ sal_Bool SAL_CALL rowDeleted() throw(SQLException, RuntimeException);
+
+ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getStatement()
+ throw(SQLException, RuntimeException);
+ // XRow
+ sal_Bool SAL_CALL wasNull() throw(SQLException, RuntimeException);
+
+ OUString SAL_CALL getString(sal_Int32 column) throw(SQLException, RuntimeException);
+
+ sal_Bool SAL_CALL getBoolean(sal_Int32 column) throw(SQLException, RuntimeException);
+
+ sal_Int8 SAL_CALL getByte(sal_Int32 column) throw(SQLException, RuntimeException);
+
+ sal_Int16 SAL_CALL getShort(sal_Int32 column) throw(SQLException, RuntimeException);
+
+ sal_Int32 SAL_CALL getInt(sal_Int32 column) throw(SQLException, RuntimeException);
+
+ sal_Int64 SAL_CALL getLong(sal_Int32 column) throw(SQLException, RuntimeException);
+
+ float SAL_CALL getFloat(sal_Int32 column) throw(SQLException, RuntimeException);
+
+ double SAL_CALL getDouble(sal_Int32 column) throw(SQLException, RuntimeException);
+
+ ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getBytes(sal_Int32 column)
+ throw(SQLException, RuntimeException);
+
+ ::com::sun::star::util::Date SAL_CALL getDate(sal_Int32 column)
+ throw(SQLException, RuntimeException);
+
+ ::com::sun::star::util::Time SAL_CALL getTime(sal_Int32 column)
+ throw(SQLException, RuntimeException);
+
+ ::com::sun::star::util::DateTime SAL_CALL getTimestamp(sal_Int32 column)
+ throw(SQLException, RuntimeException);
+
+ my_XInputStreamRef SAL_CALL getBinaryStream(sal_Int32 column)
+ throw(SQLException, RuntimeException);
+
+ my_XInputStreamRef SAL_CALL getCharacterStream(sal_Int32 column)
+ throw(SQLException, RuntimeException);
+
+ Any SAL_CALL getObject(sal_Int32 column, const my_XNameAccessRef& typeMap)
+ throw(SQLException, RuntimeException);
+
+ ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRef > SAL_CALL getRef(sal_Int32 column)
+ throw(SQLException, RuntimeException);
+
+ ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XBlob > SAL_CALL getBlob(sal_Int32 column)
+ throw(SQLException, RuntimeException);
+
+ ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XClob > SAL_CALL getClob(sal_Int32 column)
+ throw(SQLException, RuntimeException);
+
+ ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XArray > SAL_CALL getArray(sal_Int32 column)
+ throw(SQLException, RuntimeException);
+
+ // XResultSetMetaDataSupplier
+ ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > SAL_CALL getMetaData()
+ throw(SQLException, RuntimeException);
+
+ // XCancellable
+ void SAL_CALL cancel() throw(RuntimeException);
+
+ // XCloseable
+ void SAL_CALL close() throw(SQLException, RuntimeException);
+
+ // XWarningsSupplier
+ Any SAL_CALL getWarnings() throw(SQLException, RuntimeException);
+
+ void SAL_CALL clearWarnings() throw(SQLException, RuntimeException);
+
+ // XResultSetUpdate
+ void SAL_CALL insertRow() throw(SQLException, RuntimeException);
+
+ void SAL_CALL updateRow() throw(SQLException, RuntimeException);
+
+ void SAL_CALL deleteRow() throw(SQLException, RuntimeException);
+
+ void SAL_CALL cancelRowUpdates() throw(SQLException, RuntimeException);
+
+ void SAL_CALL moveToInsertRow() throw(SQLException, RuntimeException);
+
+ void SAL_CALL moveToCurrentRow() throw(SQLException, RuntimeException);
+
+ // XRowUpdate
+ void SAL_CALL updateNull(sal_Int32 column) throw(SQLException, RuntimeException);
+
+ void SAL_CALL updateBoolean(sal_Int32 column, sal_Bool x) throw(SQLException, RuntimeException);
+
+ void SAL_CALL updateByte(sal_Int32 column, sal_Int8 x) throw(SQLException, RuntimeException);
+
+ void SAL_CALL updateShort(sal_Int32 column, sal_Int16 x) throw(SQLException, RuntimeException);
+
+ void SAL_CALL updateInt(sal_Int32 column, sal_Int32 x) throw(SQLException, RuntimeException);
+
+ void SAL_CALL updateLong(sal_Int32 column, sal_Int64 x) throw(SQLException, RuntimeException);
+
+ void SAL_CALL updateFloat(sal_Int32 column, float x) throw(SQLException, RuntimeException);
+
+ void SAL_CALL updateDouble(sal_Int32 column, double x) throw(SQLException, RuntimeException);
+
+ void SAL_CALL updateString(sal_Int32 column, const OUString& x)
+ throw(SQLException, RuntimeException);
+
+ void SAL_CALL updateBytes(sal_Int32 column, const ::com::sun::star::uno::Sequence< sal_Int8 >& x)
+ throw(SQLException, RuntimeException);
+
+ void SAL_CALL updateDate(sal_Int32 column, const ::com::sun::star::util::Date& x)
+ throw(SQLException, RuntimeException);
+
+ void SAL_CALL updateTime(sal_Int32 column, const ::com::sun::star::util::Time& x)
+ throw(SQLException, RuntimeException);
+
+ void SAL_CALL updateTimestamp(sal_Int32 column, const ::com::sun::star::util::DateTime& x)
+ throw(SQLException, RuntimeException);
+
+ void SAL_CALL updateBinaryStream(sal_Int32 column, const my_XInputStreamRef& x, sal_Int32 length)
+ throw(SQLException, RuntimeException);
+
+ void SAL_CALL updateCharacterStream(sal_Int32 column, const my_XInputStreamRef& x, sal_Int32 length)
+ throw(SQLException, RuntimeException);
+
+ void SAL_CALL updateObject(sal_Int32 column, const Any& x)
+ throw(SQLException, RuntimeException);
+
+ void SAL_CALL updateNumericObject(sal_Int32 column, const Any& x, sal_Int32 scale)
+ throw(SQLException, RuntimeException);
+
+ // XColumnLocate
+ sal_Int32 SAL_CALL findColumn(const OUString& columnName)
+ throw(SQLException, RuntimeException);
+
+ // XRowLocate
+ Any SAL_CALL getBookmark() throw(SQLException, RuntimeException);
+
+ sal_Bool SAL_CALL moveToBookmark(const Any& bookmark)
+ throw(SQLException, RuntimeException);
+
+ sal_Bool SAL_CALL moveRelativeToBookmark(const Any& bookmark, sal_Int32 rows)
+ throw(SQLException, RuntimeException);
+
+ sal_Int32 SAL_CALL compareBookmarks(const Any& first, const Any& second)
+ throw(SQLException, RuntimeException);
+
+ sal_Bool SAL_CALL hasOrderedBookmarks() throw(SQLException, RuntimeException);
+
+ sal_Int32 SAL_CALL hashBookmark(const Any& bookmark)
+ throw(SQLException, RuntimeException);
+
+ // XDeleteRows
+ ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL deleteRows(const ::com::sun::star::uno::Sequence< Any >& rows)
+ throw(SQLException, RuntimeException);
+
+ void checkColumnIndex(sal_Int32 index) throw(SQLException, RuntimeException);
+
+ private:
+ using ::cppu::OPropertySetHelper::getFastPropertyValue;
+ };
+ } /* mysqlc */
+} /* connectivity */
+#endif // CONNECTIVITY_SRESULTSET_HXX
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noet sw=4 ts=4 fdm=marker
+ * vim<600: noet sw=4 ts=4
+ */
diff --git a/mysqlc/source/mysqlc_resultsetmetadata.cxx b/mysqlc/source/mysqlc_resultsetmetadata.cxx
new file mode 100644
index 000000000000..aaf9cc506c32
--- /dev/null
+++ b/mysqlc/source/mysqlc_resultsetmetadata.cxx
@@ -0,0 +1,468 @@
+/*************************************************************************
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2008 by Sun Microsystems, Inc.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* $RCSfile: mysqlc_resultsetmetadata.cxx,v $
+*
+* $Revision: 1.1.2.4 $
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org. If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+************************************************************************/
+
+#include "mysqlc_resultsetmetadata.hxx"
+#include "mysqlc_general.hxx"
+#include "cppconn/exception.h"
+
+#include <rtl/ustrbuf.hxx>
+
+using namespace connectivity::mysqlc;
+using namespace com::sun::star::uno;
+using namespace com::sun::star::lang;
+using namespace com::sun::star::sdbc;
+using ::rtl::OUString;
+
+// -------------------------------------------------------------------------
+OResultSetMetaData::~OResultSetMetaData()
+{
+}
+/* }}} */
+
+
+/* {{{ OResultSetMetaData::getColumnDisplaySize() -I- */
+sal_Int32 SAL_CALL OResultSetMetaData::getColumnDisplaySize(sal_Int32 column)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSetMetaData::getColumnDisplaySize");
+
+ try {
+ meta->getColumnDisplaySize(column);
+ } catch (sql::MethodNotImplementedException) {
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSetMetaData::getColumnDisplaySize", *this);
+ } catch (sql::SQLException &e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding);
+ }
+ return 0; // fool compiler
+}
+/* }}} */
+
+
+/* {{{ OResultSetMetaData::getColumnType() -I- */
+sal_Int32 SAL_CALL OResultSetMetaData::getColumnType(sal_Int32 column)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSetMetaData::getColumnType");
+ checkColumnIndex(column);
+
+ try {
+ return mysqlc_sdbc_driver::mysqlToOOOType(meta->getColumnType(column));
+ } catch (sql::MethodNotImplementedException) {
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSetMetaData::getMetaData", *this);
+ } catch (sql::SQLException &e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding);
+ }
+ return 0; // fool compiler
+}
+/* }}} */
+
+/*
+ XXX: This method doesn't throw exceptions at all.
+ Should it declare that it throws ?? What if throw() is removed?
+ Does it change the API, the open-close principle?
+*/
+/* {{{ OResultSetMetaData::getColumnCount() -I- */
+sal_Int32 SAL_CALL OResultSetMetaData::getColumnCount()
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSetMetaData::getColumnCount");
+ try {
+ return meta->getColumnCount();
+ } catch (sql::MethodNotImplementedException) {
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSetMetaData::getMetaData", *this);
+ } catch (sql::SQLException &e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding);
+ }
+ return 0; // fool compiler
+}
+/* }}} */
+
+
+/* {{{ OResultSetMetaData::isCaseSensitive() -I- */
+sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive(sal_Int32 column)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSetMetaData::isCaseSensitive");
+ checkColumnIndex(column);
+
+ try {
+ return meta->isCaseSensitive(column);
+ } catch (sql::MethodNotImplementedException) {
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSetMetaData::getMetaData", *this);
+ } catch (sql::SQLException &e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding);
+ }
+ return sal_False; // fool compiler
+}
+/* }}} */
+
+
+/* {{{ OResultSetMetaData::getSchemaName() -I- */
+OUString SAL_CALL OResultSetMetaData::getSchemaName(sal_Int32 column)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSetMetaData::getSchemaName");
+ checkColumnIndex(column);
+
+ try {
+ return convert(meta->getSchemaName(column));
+ } catch (sql::MethodNotImplementedException) {
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSetMetaData::getMetaData", *this);
+ } catch (sql::SQLException &e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding);
+ }
+ return OUString(); // fool compiler
+}
+/* }}} */
+
+
+/* {{{ OResultSetMetaData::getColumnName() -I- */
+OUString SAL_CALL OResultSetMetaData::getColumnName(sal_Int32 column)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSetMetaData::getColumnName");
+ checkColumnIndex(column);
+
+ try {
+ return convert( meta->getColumnName( column ) );
+ } catch (sql::MethodNotImplementedException) {
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSetMetaData::getMetaData", *this);
+ } catch (sql::SQLException &e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding);
+ }
+ return OUString(); // fool compiler
+}
+/* }}} */
+
+
+/* {{{ OResultSetMetaData::getTableName() -I- */
+OUString SAL_CALL OResultSetMetaData::getTableName(sal_Int32 column)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSetMetaData::getTableName");
+ checkColumnIndex(column);
+
+ try {
+ return convert(meta->getTableName(column));
+ } catch (sql::MethodNotImplementedException) {
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSetMetaData::getMetaData", *this);
+ } catch (sql::SQLException &e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding);
+ }
+ return OUString(); // fool compiler
+}
+/* }}} */
+
+
+/* {{{ OResultSetMetaData::getCatalogName() -I- */
+OUString SAL_CALL OResultSetMetaData::getCatalogName(sal_Int32 column)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSetMetaData::getCatalogName");
+ checkColumnIndex(column);
+
+ try {
+ return convert(meta->getCatalogName(column));
+ } catch (sql::MethodNotImplementedException) {
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSetMetaData::getMetaData", *this);
+ } catch (sql::SQLException &e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding);
+ }
+ return OUString(); // fool compiler
+}
+/* }}} */
+
+
+/* {{{ OResultSetMetaData::getColumnTypeName() -I- */
+OUString SAL_CALL OResultSetMetaData::getColumnTypeName(sal_Int32 column)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSetMetaData::getColumnTypeName");
+ checkColumnIndex(column);
+
+ try {
+ return convert(meta->getColumnTypeName(column));
+ } catch (sql::MethodNotImplementedException) {
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSetMetaData::getMetaData", *this);
+ } catch (sql::SQLException &e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding);
+ }
+ return OUString(); // fool compiler
+}
+/* }}} */
+
+
+/* {{{ OResultSetMetaData::getColumnLabel() -I- */
+OUString SAL_CALL OResultSetMetaData::getColumnLabel(sal_Int32 column)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSetMetaData::getColumnLabel");
+ checkColumnIndex(column);
+
+ try {
+ return convert(meta->getColumnLabel(column));
+ } catch (sql::MethodNotImplementedException) {
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSetMetaData::getMetaData", *this);
+ } catch (sql::SQLException &e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding);
+ }
+ return OUString(); // fool compiler
+}
+/* }}} */
+
+
+/* {{{ OResultSetMetaData::getColumnServiceName() -I- */
+OUString SAL_CALL OResultSetMetaData::getColumnServiceName(sal_Int32 column)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSetMetaData::getColumnServiceName");
+ checkColumnIndex(column);
+
+ OUString aRet = OUString();
+ return aRet;
+}
+/* }}} */
+
+
+/* {{{ OResultSetMetaData::isCurrency() -I- */
+sal_Bool SAL_CALL OResultSetMetaData::isCurrency(sal_Int32 column)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSetMetaData::isCurrency");
+ checkColumnIndex(column);
+
+ try {
+ return meta->isCurrency(column)? sal_True:sal_False;
+ } catch (sql::MethodNotImplementedException) {
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSetMetaData::getMetaData", *this);
+ } catch (sql::SQLException &e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding);
+ }
+ return sal_False; // fool compiler
+}
+/* }}} */
+
+
+/* {{{ OResultSetMetaData::isAutoIncrement() -I- */
+sal_Bool SAL_CALL OResultSetMetaData::isAutoIncrement(sal_Int32 column)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSetMetaData::isAutoIncrement");
+ checkColumnIndex(column);
+
+ try {
+ return meta->isAutoIncrement(column)? sal_True:sal_False;
+ } catch (sql::MethodNotImplementedException) {
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSetMetaData::getMetaData", *this);
+ } catch (sql::SQLException &e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding);
+ }
+ return sal_False; // fool compiler
+}
+/* }}} */
+
+
+/* {{{ OResultSetMetaData::isSigned() -I- */
+sal_Bool SAL_CALL OResultSetMetaData::isSigned(sal_Int32 column)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSetMetaData::isSigned");
+ checkColumnIndex(column);
+
+ try {
+ return meta->isSigned(column)? sal_True:sal_False;
+ } catch (sql::MethodNotImplementedException) {
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSetMetaData::getMetaData", *this);
+ } catch (sql::SQLException &e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding);
+ }
+ return sal_False; // fool compiler
+}
+/* }}} */
+
+
+/* {{{ OResultSetMetaData::getPrecision() -I- */
+sal_Int32 SAL_CALL OResultSetMetaData::getPrecision(sal_Int32 column)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSetMetaData::getPrecision");
+ checkColumnIndex(column);
+
+ try {
+ return meta->getPrecision(column);
+ } catch (sql::MethodNotImplementedException) {
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSetMetaData::getPrecision", *this);
+ } catch (sql::SQLException &e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding);
+ }
+ return 0; // fool compiler
+}
+/* }}} */
+
+
+/* {{{ OResultSetMetaData::getScale() -I- */
+sal_Int32 SAL_CALL OResultSetMetaData::getScale(sal_Int32 column)
+ throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
+{
+ OSL_TRACE("OResultSetMetaData::getScale");
+ checkColumnIndex(column);
+ try {
+ return meta->getScale(column);
+ } catch (sql::MethodNotImplementedException) {
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSetMetaData::getScale", *this);
+ } catch (sql::SQLException &e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding);
+ }
+ return 0; // fool compiler
+}
+/* }}} */
+
+
+/* {{{ OResultSetMetaData::isNullable() -I- */
+sal_Int32 SAL_CALL OResultSetMetaData::isNullable(sal_Int32 column)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSetMetaData::isNullable");
+ checkColumnIndex(column);
+
+ try {
+ return meta->isNullable(column)? sal_True:sal_False;
+ } catch (sql::MethodNotImplementedException) {
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSetMetaData::getMetaData", *this);
+ } catch (sql::SQLException &e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding);
+ }
+ return sal_False; // fool compiler
+}
+/* }}} */
+
+
+/* {{{ OResultSetMetaData::isSearchable() -I- */
+sal_Bool SAL_CALL OResultSetMetaData::isSearchable(sal_Int32 column)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSetMetaData::isSearchable");
+ checkColumnIndex(column);
+
+ try {
+ return meta->isSearchable(column)? sal_True:sal_False;
+ } catch (sql::MethodNotImplementedException) {
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSetMetaData::getMetaData", *this);
+ } catch (sql::SQLException &e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding);
+ }
+ return sal_False; // fool compiler
+}
+/* }}} */
+
+
+/* {{{ OResultSetMetaData::isReadOnly() -I- */
+sal_Bool SAL_CALL OResultSetMetaData::isReadOnly(sal_Int32 column)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSetMetaData::isReadOnly");
+ checkColumnIndex(column);
+
+ try {
+ return meta->isReadOnly(column)? sal_True:sal_False;
+ } catch (sql::MethodNotImplementedException) {
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSetMetaData::getMetaData", *this);
+ } catch (sql::SQLException &e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding);
+ }
+ return sal_False; // fool compiler
+}
+/* }}} */
+
+
+/* {{{ OResultSetMetaData::isDefinitelyWritable() -I- */
+sal_Bool SAL_CALL OResultSetMetaData::isDefinitelyWritable(sal_Int32 column)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSetMetaData::isDefinitelyWritable");
+ checkColumnIndex(column);
+
+ try {
+ return meta->isDefinitelyWritable(column)? sal_True:sal_False;
+ } catch (sql::MethodNotImplementedException) {
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSetMetaData::getMetaData", *this);
+ } catch (sql::SQLException &e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding);
+ }
+ return sal_False; // fool compiler
+}
+/* }}} */
+
+
+/* {{{ OResultSetMetaData::isWritable() -I- */
+sal_Bool SAL_CALL OResultSetMetaData::isWritable(sal_Int32 column)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSetMetaData::isWritable");
+ checkColumnIndex(column);
+
+ try {
+ return meta->isWritable(column)? sal_True:sal_False;
+ } catch (sql::MethodNotImplementedException) {
+ mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSetMetaData::getMetaData", *this);
+ } catch (sql::SQLException &e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding);
+ }
+ return sal_False; // fool compiler
+}
+/* }}} */
+
+
+/* {{{ OResultSetMetaData::checkColumnIndex() -I- */
+void OResultSetMetaData::checkColumnIndex(sal_Int32 columnIndex)
+ throw (SQLException, RuntimeException)
+{
+ OSL_TRACE("OResultSetMetaData::checkColumnIndex");
+ if (columnIndex < 1 || columnIndex > (sal_Int32) meta->getColumnCount()) {
+
+ ::rtl::OUStringBuffer buf;
+ buf.appendAscii( "Column index out of range (expected 1 to " );
+ buf.append( sal_Int32( meta->getColumnCount() ) );
+ buf.appendAscii( ", got " );
+ buf.append( sal_Int32( columnIndex ) );
+ buf.append( sal_Unicode( '.' ) );
+ throw SQLException( buf.makeStringAndClear(), *this, OUString(), 1, Any() );
+ }
+}
+/* }}} */
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noet sw=4 ts=4 fdm=marker
+ * vim<600: noet sw=4 ts=4
+ */
+
diff --git a/mysqlc/source/mysqlc_resultsetmetadata.hxx b/mysqlc/source/mysqlc_resultsetmetadata.hxx
new file mode 100644
index 000000000000..7793179a0844
--- /dev/null
+++ b/mysqlc/source/mysqlc_resultsetmetadata.hxx
@@ -0,0 +1,121 @@
+/*************************************************************************
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2008 by Sun Microsystems, Inc.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* $RCSfile: mysqlc_resultsetmetadata.hxx,v $
+*
+* $Revision: 1.1.2.4 $
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org. If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+************************************************************************/
+
+#ifndef CONNECTIVITY_SRESULSETMETADATA_HXX
+#define CONNECTIVITY_SRESULSETMETADATA_HXX
+
+#include "mysqlc_connection.hxx"
+
+#include <com/sun/star/sdbc/XResultSetMetaData.hpp>
+
+#include <cppuhelper/implbase1.hxx>
+#include <cppconn/resultset_metadata.h>
+
+namespace connectivity
+{
+ namespace mysqlc
+ {
+ using ::com::sun::star::sdbc::SQLException;
+ using ::com::sun::star::uno::RuntimeException;
+ using ::rtl::OUString;
+ //**************************************************************
+ //************ Class: ResultSetMetaData
+ //**************************************************************
+ typedef ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XResultSetMetaData> OResultSetMetaData_BASE;
+
+ class OResultSetMetaData : public OResultSetMetaData_BASE
+ {
+ sql::ResultSetMetaData * meta;
+ rtl_TextEncoding m_encoding;
+ protected:
+ virtual ~OResultSetMetaData();
+ public:
+ OResultSetMetaData( sql::ResultSetMetaData * _meta, rtl_TextEncoding _encoding )
+ :meta(_meta)
+ ,m_encoding( _encoding )
+ {
+ }
+
+ inline ::rtl::OUString convert( const ::std::string& _string ) const
+ {
+ return ::rtl::OUString( _string.c_str(), _string.size(), m_encoding );
+ }
+
+ /// Avoid ambigous cast error from the compiler.
+ inline operator ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > () throw()
+ { return this; }
+
+ sal_Int32 SAL_CALL getColumnCount() throw(SQLException, RuntimeException);
+
+ sal_Bool SAL_CALL isAutoIncrement(sal_Int32 column) throw(SQLException, RuntimeException);
+
+ sal_Bool SAL_CALL isCaseSensitive(sal_Int32 column) throw(SQLException, RuntimeException);
+
+ sal_Bool SAL_CALL isSearchable(sal_Int32 column) throw(SQLException, RuntimeException);
+
+ sal_Bool SAL_CALL isCurrency(sal_Int32 column) throw(SQLException, RuntimeException);
+
+ sal_Int32 SAL_CALL isNullable(sal_Int32 column) throw(SQLException, RuntimeException);
+
+ sal_Bool SAL_CALL isSigned(sal_Int32 column) throw(SQLException, RuntimeException);
+
+ sal_Int32 SAL_CALL getColumnDisplaySize(sal_Int32 column)throw(SQLException, RuntimeException);
+
+ OUString SAL_CALL getColumnLabel(sal_Int32 column) throw(SQLException, RuntimeException);
+
+ OUString SAL_CALL getColumnName(sal_Int32 column) throw(SQLException, RuntimeException);
+
+ OUString SAL_CALL getSchemaName(sal_Int32 column) throw(SQLException, RuntimeException);
+
+ sal_Int32 SAL_CALL getPrecision(sal_Int32 column) throw(SQLException, RuntimeException);
+
+ sal_Int32 SAL_CALL getScale(sal_Int32 column) throw(SQLException, RuntimeException);
+
+ OUString SAL_CALL getTableName(sal_Int32 column) throw(SQLException, RuntimeException);
+
+ OUString SAL_CALL getCatalogName(sal_Int32 column) throw(SQLException, RuntimeException);
+
+ sal_Int32 SAL_CALL getColumnType(sal_Int32 column) throw(SQLException, RuntimeException);
+
+ OUString SAL_CALL getColumnTypeName(sal_Int32 column) throw(SQLException, RuntimeException);
+
+ sal_Bool SAL_CALL isReadOnly(sal_Int32 column) throw(SQLException, RuntimeException);
+
+ sal_Bool SAL_CALL isWritable(sal_Int32 column) throw(SQLException, RuntimeException);
+
+ sal_Bool SAL_CALL isDefinitelyWritable(sal_Int32 column)throw(SQLException, RuntimeException);
+
+ OUString SAL_CALL getColumnServiceName(sal_Int32 column)throw(SQLException, RuntimeException);
+
+ void checkColumnIndex(sal_Int32 columnIndex) throw (SQLException, RuntimeException);
+ };
+ }
+}
+
+#endif // CONNECTIVITY_SRESULSETMETADATA_HXX
diff --git a/mysqlc/source/mysqlc_services.cxx b/mysqlc/source/mysqlc_services.cxx
new file mode 100644
index 000000000000..41ffd6b673cc
--- /dev/null
+++ b/mysqlc/source/mysqlc_services.cxx
@@ -0,0 +1,183 @@
+/*************************************************************************
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2008 by Sun Microsystems, Inc.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* $RCSfile: mysqlc_services.cxx,v $
+*
+* $Revision: 1.1.2.5 $
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org. If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+************************************************************************/
+
+#include "mysqlc_driver.hxx"
+
+#include <cppuhelper/factory.hxx>
+#include <osl/diagnose.h>
+#include <rtl/ustrbuf.hxx>
+
+using namespace connectivity::mysqlc;
+using ::rtl::OUString;
+using ::com::sun::star::uno::Reference;
+using ::com::sun::star::uno::Sequence;
+using ::com::sun::star::registry::XRegistryKey;
+using ::com::sun::star::lang::XSingleServiceFactory;
+using ::com::sun::star::lang::XMultiServiceFactory;
+
+typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc)
+ (
+ const Reference< XMultiServiceFactory > & rServiceManager,
+ const OUString & rComponentName,
+ ::cppu::ComponentInstantiation pCreateFunction,
+ const Sequence< OUString > & rServiceNames,
+ rtl_ModuleCount* _pTemp
+ );
+
+//***************************************************************************************
+//
+// Die vorgeschriebene C-API muss erfuellt werden!
+// Sie besteht aus drei Funktionen, die von dem Modul exportiert werden muessen.
+//
+
+//---------------------------------------------------------------------------------------
+void REGISTER_PROVIDER(
+ const OUString& aServiceImplName,
+ const Sequence< OUString>& Services,
+ const Reference< XRegistryKey > & xKey)
+{
+ ::rtl::OUStringBuffer aMainKeyName;
+ aMainKeyName.append( sal_Unicode( '/' ) );
+ aMainKeyName.append( aServiceImplName );
+ aMainKeyName.appendAscii( "/UNO/SERVICES" );
+
+ Reference< XRegistryKey > xNewKey( xKey->createKey( aMainKeyName.makeStringAndClear() ) );
+ OSL_ENSURE(xNewKey.is(), "SKELETON::component_writeInfo : could not create a registry key !");
+
+ for (sal_Int32 i = 0; i < Services.getLength(); ++i) {
+ xNewKey->createKey(Services[i]);
+ }
+}
+
+
+//---------------------------------------------------------------------------------------
+struct ProviderRequest
+{
+ Reference< XSingleServiceFactory > xRet;
+ Reference< XMultiServiceFactory > const xServiceManager;
+ OUString const sImplementationName;
+
+ ProviderRequest(
+ void* pServiceManager,
+ sal_Char const* pImplementationName
+ ) : xServiceManager(reinterpret_cast<XMultiServiceFactory*>(pServiceManager))
+ , sImplementationName(OUString::createFromAscii(pImplementationName))
+ {
+ }
+
+ /* {{{ CREATE_PROVIDER -I- */
+ inline sal_Bool CREATE_PROVIDER(
+ const OUString& Implname,
+ const Sequence< OUString > & Services,
+ ::cppu::ComponentInstantiation Factory,
+ createFactoryFunc creator
+ )
+ {
+ if (!xRet.is() && (Implname == sImplementationName)) {
+ try {
+ xRet = creator( xServiceManager, sImplementationName,Factory, Services,0);
+ } catch (...) {
+ }
+ }
+ return xRet.is();
+ }
+
+ void* getProvider() const { return xRet.get(); }
+};
+/* }}} */
+
+
+/* {{{ component_getImplementationEnvironment -I- */
+extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
+ const sal_Char **ppEnvTypeName,
+ uno_Environment ** /* ppEnv */
+ )
+{
+ *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
+}
+/* }}} */
+
+
+/* {{{ component_writeInfo -I- */
+extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(void * /* pServiceManager */, void * pRegistryKey)
+{
+ if (pRegistryKey) {
+ try {
+ Reference< XRegistryKey > xKey(reinterpret_cast< XRegistryKey*>(pRegistryKey));
+
+ REGISTER_PROVIDER(
+ MysqlCDriver::getImplementationName_Static(),
+ MysqlCDriver::getSupportedServiceNames_Static(), xKey);
+
+ return sal_True;
+ } catch (::com::sun::star::registry::InvalidRegistryException& ) {
+ OSL_ENSURE(sal_False, "SKELETON::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !");
+ }
+ }
+ return sal_False;
+}
+/* }}} */
+
+
+/* {{{ component_getFactory -I- */
+extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
+ const sal_Char * pImplementationName,
+ void * pServiceManager,
+ void * /* pRegistryKey */)
+{
+ void* pRet = 0;
+ if (pServiceManager) {
+ ProviderRequest aReq(pServiceManager,pImplementationName);
+
+ aReq.CREATE_PROVIDER(
+ MysqlCDriver::getImplementationName_Static(),
+ MysqlCDriver::getSupportedServiceNames_Static(),
+ MysqlCDriver_CreateInstance, ::cppu::createSingleFactory)
+ ;
+
+ if(aReq.xRet.is()) {
+ aReq.xRet->acquire();
+ }
+
+ pRet = aReq.getProvider();
+ }
+
+ return pRet;
+};
+/* }}} */
+
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noet sw=4 ts=4 fdm=marker
+ * vim<600: noet sw=4 ts=4
+ */
diff --git a/mysqlc/source/mysqlc_statement.cxx b/mysqlc/source/mysqlc_statement.cxx
new file mode 100644
index 000000000000..073970b4d058
--- /dev/null
+++ b/mysqlc/source/mysqlc_statement.cxx
@@ -0,0 +1,531 @@
+/*************************************************************************
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2008 by Sun Microsystems, Inc.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* $RCSfile: mysqlc_statement.cxx,v $
+*
+* $Revision: 1.1.2.4 $
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org. If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+************************************************************************/
+#include <stdio.h>
+#include "mysqlc_connection.hxx"
+#include "mysqlc_propertyids.hxx"
+#include "mysqlc_resultset.hxx"
+#include "mysqlc_statement.hxx"
+#include "mysqlc_general.hxx"
+
+#include <com/sun/star/lang/DisposedException.hpp>
+#include <com/sun/star/sdbc/FetchDirection.hpp>
+#include <com/sun/star/sdbc/ResultSetConcurrency.hpp>
+#include <com/sun/star/sdbc/ResultSetType.hpp>
+
+#include <cppconn/connection.h>
+#include <cppconn/exception.h>
+#include <cppconn/statement.h>
+#include <cppuhelper/typeprovider.hxx>
+#include <osl/diagnose.h>
+#include <osl/thread.h>
+
+#define USE_CPP_CONN 1
+
+using namespace connectivity::mysqlc;
+//------------------------------------------------------------------------------
+using namespace com::sun::star::uno;
+using namespace com::sun::star::lang;
+using namespace com::sun::star::beans;
+using namespace com::sun::star::sdbc;
+using namespace com::sun::star::sdbcx;
+using namespace com::sun::star::container;
+using namespace com::sun::star::io;
+using namespace com::sun::star::util;
+using ::osl::MutexGuard;
+using ::rtl::OUString;
+
+#include <stdio.h>
+
+/* {{{ OConnection::OCommonStatement() -I- */
+OCommonStatement::OCommonStatement(OConnection* _pConnection, sql::Statement *_cppStatement)
+ :OCommonStatement_IBase(m_aMutex)
+ ,OPropertySetHelper(OCommonStatement_IBase::rBHelper)
+ ,OStatement_CBase( (::cppu::OWeakObject*)_pConnection, this )
+ ,m_pConnection(_pConnection)
+ ,cppStatement(_cppStatement)
+ ,rBHelper(OCommonStatement_IBase::rBHelper)
+{
+ OSL_TRACE("OCommonStatement::OCommonStatement");
+ m_pConnection->acquire();
+}
+/* }}} */
+
+
+/* {{{ OConnection::~OCommonStatement() -I- */
+OCommonStatement::~OCommonStatement()
+{
+ OSL_TRACE("OCommonStatement::~OCommonStatement");
+}
+/* }}} */
+
+
+/* {{{ OConnection::disposeResultSet() -I- */
+void OCommonStatement::disposeResultSet()
+{
+ OSL_TRACE("OCommonStatement::disposeResultSet");
+ // free the cursor if alive
+ delete cppStatement;
+ cppStatement = NULL;
+}
+/* }}} */
+
+
+/* {{{ OConnection::disposing() -I- */
+void OCommonStatement::disposing()
+{
+ OSL_TRACE("OCommonStatement::disposing");
+ MutexGuard aGuard(m_aMutex);
+
+ disposeResultSet();
+
+ if (m_pConnection) {
+ m_pConnection->release();
+ m_pConnection = NULL;
+ }
+ delete cppStatement;
+
+ dispose_ChildImpl();
+ OCommonStatement_IBase::disposing();
+}
+/* }}} */
+
+
+/* {{{ OCommonStatement::queryInterface() -I- */
+Any SAL_CALL OCommonStatement::queryInterface(const Type & rType)
+ throw(RuntimeException)
+{
+ OSL_TRACE("OCommonStatement::queryInterface");
+ Any aRet = OCommonStatement_IBase::queryInterface(rType);
+ if (!aRet.hasValue()) {
+ aRet = OPropertySetHelper::queryInterface(rType);
+ }
+ return aRet;
+}
+/* }}} */
+
+
+/* {{{ OCommonStatement::getTypes() -I- */
+Sequence< Type > SAL_CALL OCommonStatement::getTypes()
+ throw(RuntimeException)
+{
+ OSL_TRACE("OCommonStatement::getTypes");
+ ::cppu::OTypeCollection aTypes( ::getCppuType( (const Reference< XMultiPropertySet > *)0 ),
+ ::getCppuType( (const Reference< XFastPropertySet > *)0 ),
+ ::getCppuType( (const Reference< XPropertySet > *)0 ));
+
+ return concatSequences(aTypes.getTypes(), OCommonStatement_IBase::getTypes());
+}
+/* }}} */
+
+
+/* {{{ OCommonStatement::cancel() -I- */
+void SAL_CALL OCommonStatement::cancel()
+ throw(RuntimeException)
+{
+ OSL_TRACE("OCommonStatement::cancel");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(rBHelper.bDisposed);
+ // cancel the current sql statement
+}
+/* }}} */
+
+
+/* {{{ OCommonStatement::close() -I- */
+void SAL_CALL OCommonStatement::close()
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OCommonStatement::close");
+ /*
+ We need a block for the checkDisposed call.
+ After the check we can call dispose() as we are not under lock ??
+ */
+ {
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(rBHelper.bDisposed);
+ }
+ dispose();
+}
+/* }}} */
+
+
+/* {{{ OStatement::clearBatch() -I- */
+void SAL_CALL OStatement::clearBatch()
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OStatement::clearBatch");
+ // if you support batches clear it here
+}
+/* }}} */
+
+
+/* {{{ OStatement::execute() -I- */
+sal_Bool SAL_CALL OCommonStatement::execute(const OUString& sql)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OCommonStatement::execute");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(rBHelper.bDisposed);
+ const ::rtl::OUString sSqlStatement = m_pConnection->transFormPreparedStatement( sql );
+
+ sal_Bool success = false;
+ try {
+ success = cppStatement->execute(OUStringToOString(sSqlStatement, m_pConnection->getConnectionSettings().encoding).getStr())? sal_True:sal_False;
+ } catch (sql::SQLException &e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding());
+ }
+ return success;
+}
+/* }}} */
+
+
+/* {{{ OStatement::executeQuery() -I- */
+Reference< XResultSet > SAL_CALL OCommonStatement::executeQuery(const OUString& sql)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OCommonStatement::executeQuery");
+
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(rBHelper.bDisposed);
+ const ::rtl::OUString sSqlStatement = m_pConnection->transFormPreparedStatement(sql);
+
+ Reference< XResultSet > xResultSet;
+ try {
+ std::auto_ptr< sql::ResultSet > rset(cppStatement->executeQuery(OUStringToOString(sSqlStatement, m_pConnection->getConnectionEncoding()).getStr()));
+ xResultSet = new OResultSet(this, rset.get(), m_pConnection->getConnectionEncoding());
+ rset.release();
+ } catch (sql::SQLException &e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding());
+ }
+ return xResultSet;
+}
+/* }}} */
+
+
+/* {{{ OStatement::getConnection() -I- */
+Reference< XConnection > SAL_CALL OCommonStatement::getConnection()
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OCommonStatement::getConnection");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(rBHelper.bDisposed);
+
+ // just return(our connection here
+ return ((Reference< XConnection >)m_pConnection);
+}
+/* }}} */
+
+
+/* {{{ OStatement::getUpdateCount() -I- */
+sal_Int32 SAL_CALL OCommonStatement::getUpdateCount()
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OCommonStatement::getUpdateCount");
+ return 0;
+}
+/* }}} */
+
+
+/* {{{ OStatement::queryInterface() -I- */
+Any SAL_CALL OStatement::queryInterface(const Type & rType)
+ throw(RuntimeException)
+{
+ OSL_TRACE("OStatement::queryInterface");
+ Any aRet = ::cppu::queryInterface(rType,static_cast< XBatchExecution*> (this));
+ if (!aRet.hasValue()) {
+ aRet = OCommonStatement::queryInterface(rType);
+ }
+ return (aRet);
+}
+/* }}} */
+
+
+/* {{{ OStatement::addBatch() -I- */
+void SAL_CALL OStatement::addBatch(const OUString& sql)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OStatement::addBatch");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(rBHelper.bDisposed);
+
+ m_aBatchList.push_back(sql);
+}
+/* }}} */
+
+
+/* {{{ OStatement::executeBatch() -I- */
+Sequence< sal_Int32 > SAL_CALL OStatement::executeBatch()
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OStatement::executeBatch");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(rBHelper.bDisposed);
+
+ Sequence< sal_Int32 > aRet = Sequence< sal_Int32 >();
+ return aRet;
+}
+/* }}} */
+
+
+/* {{{ OCommonStatement::executeUpdate() -I- */
+sal_Int32 SAL_CALL OCommonStatement::executeUpdate(const OUString& sql)
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OCommonStatement::executeUpdate");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(rBHelper.bDisposed);
+ const ::rtl::OUString sSqlStatement = m_pConnection->transFormPreparedStatement(sql);
+
+ sal_Int32 affectedRows = 0;
+ try {
+ affectedRows = cppStatement->executeUpdate(OUStringToOString(sSqlStatement, m_pConnection->getConnectionEncoding()).getStr());
+ } catch (sql::SQLException &e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding());
+ }
+ return affectedRows;
+}
+/* }}} */
+
+
+/* {{{ OCommonStatement::getResultSet() -I- */
+Reference< XResultSet > SAL_CALL OCommonStatement::getResultSet()
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OCommonStatement::getResultSet");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(rBHelper.bDisposed);
+
+ Reference< XResultSet > xResultSet;
+ try {
+ std::auto_ptr< sql::ResultSet > rset(cppStatement->getResultSet());
+ xResultSet = new OResultSet(this, rset.get(), m_pConnection->getConnectionEncoding());
+ rset.release();
+ } catch (sql::SQLException &e) {
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding());
+ }
+ return xResultSet;
+}
+/* }}} */
+
+
+/* {{{ OCommonStatement::getMoreResults() -I- */
+sal_Bool SAL_CALL OCommonStatement::getMoreResults()
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OCommonStatement::getMoreResults");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(rBHelper.bDisposed);
+
+ // if your driver supports more than only one resultset
+ // and has one more at this moment return(true
+ return (sal_False);
+}
+/* }}} */
+
+
+/* {{{ OCommonStatement::getWarnings() -I- */
+Any SAL_CALL OCommonStatement::getWarnings()
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OCommonStatement::getWarnings");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(rBHelper.bDisposed);
+
+ return makeAny(m_aLastWarning);
+}
+/* }}} */
+
+
+/* {{{ OCommonStatement::clearWarnings() -I- */
+void SAL_CALL OCommonStatement::clearWarnings()
+ throw(SQLException, RuntimeException)
+{
+ OSL_TRACE("OCommonStatement::clearWarnings");
+ MutexGuard aGuard(m_aMutex);
+ checkDisposed(rBHelper.bDisposed);
+
+ m_aLastWarning = SQLWarning();
+}
+/* }}} */
+
+
+/* {{{ OCommonStatement::createArrayHelper() -I- */
+::cppu::IPropertyArrayHelper* OCommonStatement::createArrayHelper( ) const
+{
+ OSL_TRACE("OCommonStatement::createArrayHelper");
+ // this properties are define by the service statement
+ // they must in alphabetic order
+ Sequence< Property > aProps(10);
+ Property* pProperties = aProps.getArray();
+ sal_Int32 nPos = 0;
+ DECL_PROP0(CURSORNAME, OUString);
+ DECL_BOOL_PROP0(ESCAPEPROCESSING);
+ DECL_PROP0(FETCHDIRECTION,sal_Int32);
+ DECL_PROP0(FETCHSIZE, sal_Int32);
+ DECL_PROP0(MAXFIELDSIZE,sal_Int32);
+ DECL_PROP0(MAXROWS, sal_Int32);
+ DECL_PROP0(QUERYTIMEOUT,sal_Int32);
+ DECL_PROP0(RESULTSETCONCURRENCY,sal_Int32);
+ DECL_PROP0(RESULTSETTYPE,sal_Int32);
+ DECL_BOOL_PROP0(USEBOOKMARKS);
+
+ return new ::cppu::OPropertyArrayHelper(aProps);
+}
+/* }}} */
+
+
+/* {{{ OCommonStatement::getInfoHelper() -I- */
+::cppu::IPropertyArrayHelper & OCommonStatement::getInfoHelper()
+{
+ OSL_TRACE("OCommonStatement::getInfoHelper");
+ return(*const_cast<OCommonStatement*>(this)->getArrayHelper());
+}
+/* }}} */
+
+
+/* {{{ OCommonStatement::convertFastPropertyValue() -I- */
+sal_Bool OCommonStatement::convertFastPropertyValue(
+ Any & /* rConvertedValue */, Any & /* rOldValue */,
+ sal_Int32 /* nHandle */, const Any& /* rValue */)
+ throw (IllegalArgumentException)
+{
+ OSL_TRACE("OCommonStatement::convertFastPropertyValue");
+ sal_Bool bConverted = sal_False;
+ // here we have to try to convert
+ return bConverted;
+}
+/* }}} */
+
+
+/* {{{ OCommonStatement::setFastPropertyValue_NoBroadcast() -I- */
+void OCommonStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const Any& /* rValue */)
+ throw (Exception)
+{
+ OSL_TRACE("OCommonStatement::setFastPropertyValue_NoBroadcast");
+ // set the value to what ever is nescessary
+ switch (nHandle) {
+ case PROPERTY_ID_QUERYTIMEOUT:
+ case PROPERTY_ID_MAXFIELDSIZE:
+ case PROPERTY_ID_MAXROWS:
+ case PROPERTY_ID_CURSORNAME:
+ case PROPERTY_ID_RESULTSETCONCURRENCY:
+ case PROPERTY_ID_RESULTSETTYPE:
+ case PROPERTY_ID_FETCHDIRECTION:
+ case PROPERTY_ID_FETCHSIZE:
+ case PROPERTY_ID_ESCAPEPROCESSING:
+ case PROPERTY_ID_USEBOOKMARKS:
+ default:
+ ;
+ }
+}
+/* }}} */
+
+
+/* {{{ OCommonStatement::getFastPropertyValue() -I- */
+void OCommonStatement::getFastPropertyValue(Any& _rValue, sal_Int32 nHandle) const
+{
+ OSL_TRACE("OCommonStatement::getFastPropertyValue");
+ switch (nHandle) {
+ case PROPERTY_ID_QUERYTIMEOUT:
+ case PROPERTY_ID_MAXFIELDSIZE:
+ case PROPERTY_ID_MAXROWS:
+ case PROPERTY_ID_CURSORNAME:
+ case PROPERTY_ID_RESULTSETCONCURRENCY:
+ case PROPERTY_ID_RESULTSETTYPE:
+ case PROPERTY_ID_FETCHDIRECTION:
+ case PROPERTY_ID_FETCHSIZE:
+ case PROPERTY_ID_ESCAPEPROCESSING:
+ break;
+ case PROPERTY_ID_USEBOOKMARKS:
+ _rValue <<= sal_False;
+ break;
+ default:
+ ;
+ }
+}
+/* }}} */
+
+IMPLEMENT_SERVICE_INFO(OStatement,"com.sun.star.sdbcx.OStatement","com.sun.star.sdbc.Statement");
+
+/* {{{ OCommonStatement::acquire() -I- */
+void SAL_CALL OCommonStatement::acquire()
+ throw()
+{
+ OSL_TRACE("OCommonStatement::acquire");
+ OCommonStatement_IBase::acquire();
+}
+/* }}} */
+
+
+/* {{{ OCommonStatement::release() -I- */
+void SAL_CALL OCommonStatement::release()
+ throw()
+{
+ OSL_TRACE("OCommonStatement::release");
+ relase_ChildImpl();
+}
+/* }}} */
+
+
+/* {{{ OStatement::acquire() -I- */
+void SAL_CALL OStatement::acquire()
+ throw()
+{
+ OSL_TRACE("OStatement::acquire");
+ OCommonStatement::acquire();
+}
+/* }}} */
+
+
+/* {{{ OStatement::release() -I- */
+void SAL_CALL OStatement::release()
+ throw()
+{
+ OSL_TRACE("OStatement::release");
+ OCommonStatement::release();
+}
+/* }}} */
+
+
+/* {{{ OCommonStatement::getPropertySetInfo() -I- */
+Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OCommonStatement::getPropertySetInfo()
+ throw(RuntimeException)
+{
+ OSL_TRACE("OCommonStatement::getPropertySetInfo");
+ return(::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()));
+}
+/* }}} */
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noet sw=4 ts=4 fdm=marker
+ * vim<600: noet sw=4 ts=4
+ */
diff --git a/mysqlc/source/mysqlc_statement.hxx b/mysqlc/source/mysqlc_statement.hxx
new file mode 100644
index 000000000000..e33244e987fd
--- /dev/null
+++ b/mysqlc/source/mysqlc_statement.hxx
@@ -0,0 +1,187 @@
+#ifndef MYSQLC_STATEMENT_HXX
+#define MYSQLC_STATEMENT_HXX
+
+#include "mysqlc_connection.hxx"
+#include "mysqlc_subcomponent.hxx"
+
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/sdbc/SQLWarning.hpp>
+#include <com/sun/star/sdbc/XBatchExecution.hpp>
+#include <com/sun/star/sdbc/XCloseable.hpp>
+#include <com/sun/star/sdbc/XMultipleResults.hpp>
+#include <com/sun/star/sdbc/XStatement.hpp>
+#include <com/sun/star/sdbc/XWarningsSupplier.hpp>
+#include <com/sun/star/util/XCancellable.hpp>
+
+#include <cppconn/statement.h>
+#include <cppuhelper/compbase5.hxx>
+#include <list>
+
+namespace connectivity
+{
+ namespace mysqlc
+ {
+ using ::com::sun::star::sdbc::SQLWarning;
+ using ::com::sun::star::sdbc::SQLException;
+ using ::com::sun::star::uno::Any;
+ using ::com::sun::star::uno::RuntimeException;
+ using ::rtl::OUString;
+
+ typedef ::cppu::WeakComponentImplHelper5< ::com::sun::star::sdbc::XStatement,
+ ::com::sun::star::sdbc::XWarningsSupplier,
+ ::com::sun::star::util::XCancellable,
+ ::com::sun::star::sdbc::XCloseable,
+ ::com::sun::star::sdbc::XMultipleResults> OCommonStatement_IBase;
+
+ class OCommonStatement;
+ typedef OSubComponent< OCommonStatement, OCommonStatement_IBase > OStatement_CBase;
+
+ //**************************************************************
+ //************ Class: OCommonStatement
+ // is a base class for the normal statement and for the prepared statement
+ //**************************************************************
+ class OCommonStatement :public OBase_Mutex
+ ,public OCommonStatement_IBase
+ ,public ::cppu::OPropertySetHelper
+ ,public OPropertyArrayUsageHelper<OCommonStatement>
+ ,public OStatement_CBase
+
+ {
+ friend class OSubComponent< OCommonStatement, OCommonStatement_IBase >;
+
+ private:
+ SQLWarning m_aLastWarning;
+
+ protected:
+ ::std::list< OUString> m_aBatchList;
+
+ OConnection* m_pConnection; // The owning Connection object
+
+ sql::Statement *cppStatement;
+
+ protected:
+ void disposeResultSet();
+
+ // OPropertyArrayUsageHelper
+ ::cppu::IPropertyArrayHelper* createArrayHelper( ) const;
+
+ // OPropertySetHelper
+ ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper();
+ sal_Bool SAL_CALL convertFastPropertyValue(Any & rConvertedValue, Any & rOldValue,
+ sal_Int32 nHandle, const Any& rValue)
+ throw (::com::sun::star::lang::IllegalArgumentException);
+
+ void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const Any& rValue)
+ throw(::com::sun::star::uno::Exception);
+
+ void SAL_CALL getFastPropertyValue(Any& rValue, sal_Int32 nHandle) const;
+ virtual ~OCommonStatement();
+
+ protected:
+ OCommonStatement(OConnection* _pConnection, sql::Statement *_cppStatement);
+
+ public:
+ ::cppu::OBroadcastHelper& rBHelper;
+ using OCommonStatement_IBase::operator ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >;
+
+ // OComponentHelper
+ void SAL_CALL disposing(void);
+
+ // XInterface
+ void SAL_CALL release() throw();
+
+ void SAL_CALL acquire() throw();
+
+ // XInterface
+ Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type & rType)
+ throw(RuntimeException);
+
+ //XTypeProvider
+ ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes()
+ throw(RuntimeException);
+
+ // XPropertySet
+ ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo()
+ throw(RuntimeException);
+
+ // XStatement
+ ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL executeQuery(const OUString& sql)
+ throw(SQLException, RuntimeException);
+
+ sal_Int32 SAL_CALL executeUpdate(const OUString& sql)
+ throw(SQLException, RuntimeException);
+
+ sal_Bool SAL_CALL execute( const OUString& sql )
+ throw(SQLException, RuntimeException);
+
+ ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection()
+ throw(SQLException, RuntimeException);
+
+ // XWarningsSupplier
+ Any SAL_CALL getWarnings() throw(SQLException, RuntimeException);
+
+ void SAL_CALL clearWarnings() throw(SQLException, RuntimeException);
+
+ // XCancellable
+ void SAL_CALL cancel() throw(RuntimeException);
+
+ // XCloseable
+ void SAL_CALL close() throw(SQLException, RuntimeException);
+
+ // XMultipleResults
+ ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getResultSet()
+ throw(SQLException, RuntimeException);
+
+ sal_Int32 SAL_CALL getUpdateCount() throw(SQLException, RuntimeException);
+
+ sal_Bool SAL_CALL getMoreResults() throw(SQLException, RuntimeException);
+
+ // other methods
+ OConnection* getOwnConnection() const { return m_pConnection;}
+
+ private:
+ using ::cppu::OPropertySetHelper::getFastPropertyValue;
+ };
+
+
+ class OStatement : public OCommonStatement,
+ public ::com::sun::star::sdbc::XBatchExecution,
+ public ::com::sun::star::lang::XServiceInfo
+
+ {
+ protected:
+ virtual ~OStatement(){}
+
+ public:
+ // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird:
+ OStatement(OConnection* _pConnection, sql::Statement *_cppStatement) : OCommonStatement(_pConnection, _cppStatement) {}
+ DECLARE_SERVICE_INFO();
+
+ Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType )
+ throw(RuntimeException);
+
+ void SAL_CALL acquire() throw();
+ void SAL_CALL release() throw();
+
+ // XBatchExecution
+ void SAL_CALL addBatch(const OUString& sql)
+ throw(SQLException, RuntimeException);
+
+ void SAL_CALL clearBatch() throw(SQLException, RuntimeException);
+
+ ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL executeBatch()
+ throw(SQLException, RuntimeException);
+
+ };
+ }
+}
+#endif // MYSQLC_STATEMENT_HXX
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noet sw=4 ts=4 fdm=marker
+ * vim<600: noet sw=4 ts=4
+ */
diff --git a/mysqlc/source/mysqlc_subcomponent.hxx b/mysqlc/source/mysqlc_subcomponent.hxx
new file mode 100644
index 000000000000..5d3bd2c9b4f3
--- /dev/null
+++ b/mysqlc/source/mysqlc_subcomponent.hxx
@@ -0,0 +1,255 @@
+/*************************************************************************
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2008 by Sun Microsystems, Inc.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* $RCSfile: mysqlc_subcomponent.hxx,v $
+*
+* $Revision: 1.1.2.2 $
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org. If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+************************************************************************/
+
+#ifndef _CONNECTIVITY_OSUBCOMPONENT_HXX_
+#define _CONNECTIVITY_OSUBCOMPONENT_HXX_
+
+#ifndef _CPPUHELPER_WEAK_HXX_
+#include <cppuhelper/weak.hxx>
+#endif
+#ifndef _CPPUHELPER_INTERFACECONTAINER_H_
+#include <cppuhelper/interfacecontainer.h>
+#endif
+#ifndef _COM_SUN_STAR_LANG_DISPOSEDEXCEPTION_HPP_
+#include <com/sun/star/lang/DisposedException.hpp>
+#endif
+#ifndef _CPPUHELPER_PROPSHLP_HXX
+#include <cppuhelper/propshlp.hxx>
+#endif
+#ifndef _OSL_MUTEX_HXX_
+#include <osl/mutex.hxx>
+#endif
+#ifndef _OSL_DIAGNOSE_H_
+#include <osl/diagnose.h>
+#endif
+
+namespace cppu {
+ class IPropertyArrayHelper;
+}
+
+namespace com
+{
+ namespace sun
+ {
+ namespace star
+ {
+ namespace lang
+ {
+ class XComponent;
+ }
+ }
+ }
+}
+namespace connectivity
+{
+
+ namespace mysqlc
+ {
+ void release(oslInterlockedCount& _refCount,
+ ::cppu::OBroadcastHelper& rBHelper,
+ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface,
+ ::com::sun::star::lang::XComponent* _pObject);
+
+ void checkDisposed(sal_Bool _bThrow) throw (::com::sun::star::lang::DisposedException);
+ //************************************************************
+ // OSubComponent
+ //************************************************************
+ template <class SELF, class WEAK> class OSubComponent
+ {
+ protected:
+ // the parent must support the tunnel implementation
+ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xParent;
+ SELF* m_pDerivedImplementation;
+
+ public:
+ OSubComponent(
+ const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xParent,
+ SELF* _pDerivedImplementation)
+ :m_xParent(_xParent)
+ ,m_pDerivedImplementation(_pDerivedImplementation)
+ {
+ }
+
+ protected:
+ void dispose_ChildImpl()
+ {
+ ::osl::MutexGuard aGuard(m_pDerivedImplementation->rBHelper.rMutex);
+ m_xParent = NULL;
+ }
+ void relase_ChildImpl()
+ {
+ release(m_pDerivedImplementation->m_refCount,
+ m_pDerivedImplementation->rBHelper,
+ m_xParent,
+ m_pDerivedImplementation);
+
+ m_pDerivedImplementation->WEAK::release();
+ }
+ };
+
+
+ template <class TYPE>
+ class OPropertyArrayUsageHelper
+ {
+ protected:
+ static sal_Int32 s_nRefCount;
+ static ::cppu::IPropertyArrayHelper* s_pProps;
+ static ::osl::Mutex s_aMutex;
+
+ public:
+ OPropertyArrayUsageHelper();
+ virtual ~OPropertyArrayUsageHelper()
+ { // ARGHHHHHHH ..... would like to implement this in proparrhlp_impl.hxx (as we do with all other methods)
+ // but SUNPRO 5 compiler (linker) doesn't like this
+ ::osl::MutexGuard aGuard(s_aMutex);
+ OSL_ENSURE(s_nRefCount > 0, "OPropertyArrayUsageHelper::~OPropertyArrayUsageHelper : suspicious call : have a refcount of 0 !");
+ if (!--s_nRefCount)
+ {
+ delete s_pProps;
+ s_pProps = NULL;
+ }
+ }
+
+ /** call this in the getInfoHelper method of your derived class. The method returns the array helper of the
+ class, which is created if neccessary.
+ */
+ ::cppu::IPropertyArrayHelper* getArrayHelper();
+
+ protected:
+ /** used to implement the creation of the array helper which is shared amongst all instances of the class.
+ This method needs to be implemented in derived classes.
+ <BR>
+ The method gets called with s_aMutex acquired.
+ <BR>
+ as long as IPropertyArrayHelper has no virtual destructor, the implementation of ~OPropertyArrayUsageHelper
+ assumes that you created an ::cppu::OPropertyArrayHelper when deleting s_pProps.
+ @return an pointer to the newly created array helper. Must not be NULL.
+ */
+ virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const = 0;
+ };
+
+ template<class TYPE>
+ sal_Int32 OPropertyArrayUsageHelper< TYPE >::s_nRefCount = 0;
+
+ template<class TYPE>
+ ::cppu::IPropertyArrayHelper* OPropertyArrayUsageHelper< TYPE >::s_pProps = NULL;
+
+ template<class TYPE>
+ ::osl::Mutex OPropertyArrayUsageHelper< TYPE >::s_aMutex;
+
+ //------------------------------------------------------------------
+ template <class TYPE>
+ OPropertyArrayUsageHelper<TYPE>::OPropertyArrayUsageHelper()
+ {
+ ::osl::MutexGuard aGuard(s_aMutex);
+ ++s_nRefCount;
+ }
+
+ //------------------------------------------------------------------
+ template <class TYPE>
+ ::cppu::IPropertyArrayHelper* OPropertyArrayUsageHelper<TYPE>::getArrayHelper()
+ {
+ OSL_ENSURE(s_nRefCount, "OPropertyArrayUsageHelper::getArrayHelper : suspicious call : have a refcount of 0 !");
+ if (!s_pProps) {
+ ::osl::MutexGuard aGuard(s_aMutex);
+ if (!s_pProps) {
+ s_pProps = createArrayHelper();
+ OSL_ENSURE(s_pProps, "OPropertyArrayUsageHelper::getArrayHelper : createArrayHelper returned nonsense !");
+ }
+ }
+ return s_pProps;
+ }
+
+
+ class OBase_Mutex
+ {
+ public:
+ ::osl::Mutex m_aMutex;
+ };
+
+ namespace internal
+ {
+ template <class T>
+ void implCopySequence(const T* _pSource, T*& _pDest, sal_Int32 _nSourceLen)
+ {
+ for (sal_Int32 i=0; i<_nSourceLen; ++i, ++_pSource, ++_pDest)
+ *_pDest = *_pSource;
+ }
+ }
+ //-------------------------------------------------------------------------
+ /// concat two sequences
+ template <class T>
+ ::com::sun::star::uno::Sequence<T> concatSequences(const ::com::sun::star::uno::Sequence<T>& _rLeft, const ::com::sun::star::uno::Sequence<T>& _rRight)
+ {
+ sal_Int32 nLeft(_rLeft.getLength()), nRight(_rRight.getLength());
+ const T* pLeft = _rLeft.getConstArray();
+ const T* pRight = _rRight.getConstArray();
+
+ sal_Int32 nReturnLen(nLeft + nRight);
+ ::com::sun::star::uno::Sequence<T> aReturn(nReturnLen);
+ T* pReturn = aReturn.getArray();
+
+ internal::implCopySequence(pLeft, pReturn, nLeft);
+ internal::implCopySequence(pRight, pReturn, nRight);
+
+ return aReturn;
+ }
+
+
+#define DECLARE_SERVICE_INFO() \
+ virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); \
+ virtual sal_Bool SAL_CALL supportsService(const ::rtl::OUString& ServiceName) throw(::com::sun::star::uno::RuntimeException); \
+ virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException) \
+
+#define IMPLEMENT_SERVICE_INFO(classname, implasciiname, serviceasciiname) \
+ ::rtl::OUString SAL_CALL classname::getImplementationName() throw (::com::sun::star::uno::RuntimeException) \
+ { \
+ return ::rtl::OUString::createFromAscii(implasciiname); \
+ } \
+ ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException) \
+ { \
+ ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(1); \
+ aSupported[0] = ::rtl::OUString::createFromAscii(serviceasciiname); \
+ return aSupported; \
+ } \
+ sal_Bool SAL_CALL classname::supportsService(const ::rtl::OUString& _rServiceName) throw(::com::sun::star::uno::RuntimeException) \
+ { \
+ Sequence< ::rtl::OUString > aSupported(getSupportedServiceNames()); \
+ const ::rtl::OUString* pSupported = aSupported.getConstArray(); \
+ const ::rtl::OUString* pEnd = pSupported + aSupported.getLength(); \
+ for (;pSupported != pEnd && !pSupported->equals(_rServiceName); ++pSupported) \
+ ; \
+ return pSupported != pEnd; \
+ } \
+
+
+ }
+}
+#endif // _CONNECTIVITY_OSUBCOMPONENT_HXX_
+
diff --git a/mysqlc/source/mysqlc_types.cxx b/mysqlc/source/mysqlc_types.cxx
new file mode 100644
index 000000000000..5176452336e5
--- /dev/null
+++ b/mysqlc/source/mysqlc_types.cxx
@@ -0,0 +1,792 @@
+/*************************************************************************
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2008 by Sun Microsystems, Inc.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* $RCSfile: mysqlc_types.cxx,v $
+*
+* $Revision: 1.1.2.2 $
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org. If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+************************************************************************/
+
+#include <stdio.h>
+#include <com/sun/star/sdbc/DataType.hpp>
+#include <com/sun/star/sdbc/ColumnValue.hpp>
+#include <com/sun/star/sdbc/ColumnSearch.hpp>
+#include "mysqlc_types.hxx"
+
+using namespace com::sun::star::sdbc;
+
+TypeInfoDef mysqlc_types[] = {
+
+ // ------------- MySQL-Type: BIT. SDBC-Type: Bit -------------
+ {
+ "BIT", // Typename
+ com::sun::star::sdbc::DataType::BIT, // sdbc-type
+ 1, // Precision
+ "", // Literal prefix
+ "", // Literal suffix
+ "", // Create params
+ com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable
+ sal_True, // case sensitive
+ com::sun::star::sdbc::ColumnSearch::FULL, // searchable
+ sal_False, // unsignable
+ sal_False, // fixed_prec_scale
+ sal_False, // auto_increment
+ "BIT", // local type name
+ 0, // minimum scale
+ 0, // maximum scale
+ 0, // sql data type (unsued)
+ 0, // sql datetime sub (unsued)
+ 10 // num prec radix
+ },
+
+ // ------------ MySQL-Type: BOOL. SDBC-Type: Bit -------------
+ {
+ "BOOL", // Typename
+ com::sun::star::sdbc::DataType::BIT, // sdbc-type
+ 1, // Precision
+ "", // Literal prefix
+ "", // Literal suffix
+ "", // Create params
+ com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable
+ sal_True, // case sensitive
+ com::sun::star::sdbc::ColumnSearch::FULL, // searchable
+ sal_False, // unsignable
+ sal_False, // fixed_prec_scale
+ sal_False, // auto_increment
+ "BOOL", // local type name
+ 0, // minimum scale
+ 0, // maximum scale
+ 0, // sql data type (unsued)
+ 0, // sql datetime sub (unsued)
+ 10 // num prec radix
+ },
+
+ // --------- MySQL-Type: TINYINT SDBC-Type: TINYINT ----------
+ {
+ "TINYINT", // Typename
+ com::sun::star::sdbc::DataType::TINYINT, // sdbc-type
+ 3, // Precision
+ "", // Literal prefix
+ "", // Literal suffix
+ "[(M)] [UNSIGNED] [ZEROFILL]", // Create params
+ com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable
+ sal_False, // case sensitive
+ com::sun::star::sdbc::ColumnSearch::FULL, // searchable
+ sal_True, // unsignable
+ sal_False, // fixed_prec_scale
+ sal_True, // auto_increment
+ "TINYINT", // local type name
+ 0, // minimum scale
+ 0, // maximum scale
+ 0, // sql data type (unsued)
+ 0, // sql datetime sub (unsued)
+ 10 // num prec radix
+ },
+
+ // ----------- MySQL-Type: BIGINT SDBC-Type: BIGINT ----------
+ {
+ "BIGINT", // Typename
+ com::sun::star::sdbc::DataType::BIGINT, // sdbc-type
+ 19, // Precision
+ "", // Literal prefix
+ "", // Literal suffix
+ "[(M)] [UNSIGNED] [ZEROFILL]", // Create params
+ com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable
+ sal_False, // case sensitive
+ com::sun::star::sdbc::ColumnSearch::FULL, // searchable
+ sal_True, // unsignable
+ sal_False, // fixed_prec_scale
+ sal_True, // auto_increment
+ "BIGINT", // local type name
+ 0, // minimum scale
+ 0, // maximum scale
+ 0, // sql data type (unsued)
+ 0, // sql datetime sub (unsued)
+ 10 // num prec radix
+ },
+
+ // ----------- MySQL-Type: LONG VARBINARY SDBC-Type: LONGVARBINARY ----------
+ {
+ "LONG VARBINARY", // Typename
+ com::sun::star::sdbc::DataType::LONGVARBINARY, // sdbc-type
+ 16777215, // Precision
+ "'", // Literal prefix
+ "'", // Literal suffix
+ "", // Create params
+ com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable
+ sal_True, // case sensitive
+ com::sun::star::sdbc::ColumnSearch::FULL, // searchable
+ sal_False, // unsignable
+ sal_False, // fixed_prec_scale
+ sal_False, // auto_increment
+ "LONG VARBINARY", // local type name
+ 0, // minimum scale
+ 0, // maximum scale
+ 0, // sql data type (unsued)
+ 0, // sql datetime sub (unsued)
+ 10 // num prec radix
+ },
+
+ // ----------- MySQL-Type: MEDIUMBLOB SDBC-Type: LONGVARBINARY ----------
+ {
+ "MEDIUMBLOB", // Typename
+ com::sun::star::sdbc::DataType::LONGVARBINARY, // sdbc-type
+ 16777215, // Precision
+ "'", // Literal prefix
+ "'", // Literal suffix
+ "", // Create params
+ com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable
+ sal_True, // case sensitive
+ com::sun::star::sdbc::ColumnSearch::FULL, // searchable
+ sal_False, // unsignable
+ sal_False, // fixed_prec_scale
+ sal_False, // auto_increment
+ "MEDIUMBLOB", // local type name
+ 0, // minimum scale
+ 0, // maximum scale
+ 0, // sql data type (unsued)
+ 0, // sql datetime sub (unsued)
+ 10 // num prec radix
+ },
+
+ // ----------- MySQL-Type: LONGBLOB SDBC-Type: LONGVARBINARY ----------
+ {
+ "LONGBLOB", // Typename
+ com::sun::star::sdbc::DataType::LONGVARBINARY, // sdbc-type
+ 0xFFFFFFFF, // Precision
+ "'", // Literal prefix
+ "'", // Literal suffix
+ "", // Create params
+ com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable
+ sal_True, // case sensitive
+ com::sun::star::sdbc::ColumnSearch::FULL, // searchable
+ sal_False, // unsignable
+ sal_False, // fixed_prec_scale
+ sal_False, // auto_increment
+ "LONGBLOB", // local type name
+ 0, // minimum scale
+ 0, // maximum scale
+ 0, // sql data type (unsued)
+ 0, // sql datetime sub (unsued)
+ 10 // num prec radix
+ },
+
+ // ----------- MySQL-Type: BLOB SDBC-Type: LONGVARBINARY ----------
+ {
+ "BLOB", // Typename
+ com::sun::star::sdbc::DataType::LONGVARBINARY, // sdbc-type
+ 0xFFFF, // Precision
+ "'", // Literal prefix
+ "'", // Literal suffix
+ "", // Create params
+ com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable
+ sal_True, // case sensitive
+ com::sun::star::sdbc::ColumnSearch::FULL, // searchable
+ sal_False, // unsignable
+ sal_False, // fixed_prec_scale
+ sal_False, // auto_increment
+ "BLOB", // local type name
+ 0, // minimum scale
+ 0, // maximum scale
+ 0, // sql data type (unsued)
+ 0, // sql datetime sub (unsued)
+ 10 // num prec radix
+ },
+
+ // ----------- MySQL-Type: TINYBLOB SDBC-Type: LONGVARBINARY ----------
+ {
+ "TINYBLOB", // Typename
+ com::sun::star::sdbc::DataType::LONGVARBINARY, // sdbc-type
+ 0xFF, // Precision
+ "'", // Literal prefix
+ "'", // Literal suffix
+ "", // Create params
+ com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable
+ sal_True, // case sensitive
+ com::sun::star::sdbc::ColumnSearch::FULL, // searchable
+ sal_False, // unsignable
+ sal_False, // fixed_prec_scale
+ sal_False, // auto_increment
+ "TINYBLOB", // local type name
+ 0, // minimum scale
+ 0, // maximum scale
+ 0, // sql data type (unsued)
+ 0, // sql datetime sub (unsued)
+ 10 // num prec radix
+ },
+
+ // ----------- MySQL-Type: VARBINARY SDBC-Type: VARBINARY ----------
+ {
+ "VARBINARY", // Typename
+ com::sun::star::sdbc::DataType::VARBINARY, // sdbc-type
+ 0xFF, // Precision
+ "'", // Literal prefix
+ "'", // Literal suffix
+ "(M)", // Create params
+ com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable
+ sal_True, // case sensitive
+ com::sun::star::sdbc::ColumnSearch::FULL, // searchable
+ sal_False, // unsignable
+ sal_False, // fixed_prec_scale
+ sal_False, // auto_increment
+ "VARBINARY", // local type name
+ 0, // minimum scale
+ 0, // maximum scale
+ 0, // sql data type (unsued)
+ 0, // sql datetime sub (unsued)
+ 10 // num prec radix
+ },
+
+ // ----------- MySQL-Type: BINARY SDBC-Type: BINARY ----------
+ {
+ "BINARY", // Typename
+ com::sun::star::sdbc::DataType::BINARY, // sdbc-type
+ 0xFF, // Precision
+ "'", // Literal prefix
+ "'", // Literal suffix
+ "(M)", // Create params
+ com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable
+ sal_True, // case sensitive
+ com::sun::star::sdbc::ColumnSearch::FULL, // searchable
+ sal_False, // unsignable
+ sal_False, // fixed_prec_scale
+ sal_False, // auto_increment
+ "VARBINARY", // local type name
+ 0, // minimum scale
+ 0, // maximum scale
+ 0, // sql data type (unsued)
+ 0, // sql datetime sub (unsued)
+ 10 // num prec radix
+ },
+
+ // ----------- MySQL-Type: LONG VARCHAR SDBC-Type: LONG VARCHAR ----------
+ {
+ "LONG VARCHAR", // Typename
+ com::sun::star::sdbc::DataType::LONGVARCHAR, // sdbc-type
+ 0xFFFFFF, // Precision
+ "'", // Literal prefix
+ "'", // Literal suffix
+ "", // Create params
+ com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable
+ sal_False, // case sensitive
+ com::sun::star::sdbc::ColumnSearch::FULL, // searchable
+ sal_False, // unsignable
+ sal_False, // fixed_prec_scale
+ sal_False, // auto_increment
+ "LONG VARCHAR", // local type name
+ 0, // minimum scale
+ 0, // maximum scale
+ 0, // sql data type (unsued)
+ 0, // sql datetime sub (unsued)
+ 10 // num prec radix
+ },
+
+ // ----------- MySQL-Type: MEDIUMTEXT SDBC-Type: LONG VARCHAR ----------
+ {
+ "MEDIUMTEXT", // Typename
+ com::sun::star::sdbc::DataType::LONGVARCHAR, // sdbc-type
+ 0xFFFFFF, // Precision
+ "'", // Literal prefix
+ "'", // Literal suffix
+ "", // Create params
+ com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable
+ sal_False, // case sensitive
+ com::sun::star::sdbc::ColumnSearch::FULL, // searchable
+ sal_False, // unsignable
+ sal_False, // fixed_prec_scale
+ sal_False, // auto_increment
+ "MEDIUMTEXT", // local type name
+ 0, // minimum scale
+ 0, // maximum scale
+ 0, // sql data type (unsued)
+ 0, // sql datetime sub (unsued)
+ 10 // num prec radix
+ },
+
+ // ----------- MySQL-Type: LONGTEXT SDBC-Type: LONG VARCHAR ----------
+ {
+ "LONGTEXT", // Typename
+ com::sun::star::sdbc::DataType::LONGVARCHAR, // sdbc-type
+ 0xFFFFFF, // Precision
+ "'", // Literal prefix
+ "'", // Literal suffix
+ "", // Create params
+ com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable
+ sal_False, // case sensitive
+ com::sun::star::sdbc::ColumnSearch::FULL, // searchable
+ sal_False, // unsignable
+ sal_False, // fixed_prec_scale
+ sal_False, // auto_increment
+ "LONGTEXT", // local type name
+ 0, // minimum scale
+ 0, // maximum scale
+ 0, // sql data type (unsued)
+ 0, // sql datetime sub (unsued)
+ 10 // num prec radix
+ },
+
+ // ----------- MySQL-Type: TEXT SDBC-Type: LONG VARCHAR ----------
+ {
+ "TEXT", // Typename
+ com::sun::star::sdbc::DataType::LONGVARCHAR, // sdbc-type
+ 0xFFFF, // Precision
+ "'", // Literal prefix
+ "'", // Literal suffix
+ "", // Create params
+ com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable
+ sal_False, // case sensitive
+ com::sun::star::sdbc::ColumnSearch::FULL, // searchable
+ sal_False, // unsignable
+ sal_False, // fixed_prec_scale
+ sal_False, // auto_increment
+ "TEXT", // local type name
+ 0, // minimum scale
+ 0, // maximum scale
+ 0, // sql data type (unsued)
+ 0, // sql datetime sub (unsued)
+ 10 // num prec radix
+ },
+
+ // ----------- MySQL-Type: TINYTEXT SDBC-Type: LONG VARCHAR ----------
+ {
+ "TINYTEXT", // Typename
+ com::sun::star::sdbc::DataType::LONGVARCHAR, // sdbc-type
+ 0xFF, // Precision
+ "'", // Literal prefix
+ "'", // Literal suffix
+ "", // Create params
+ com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable
+ sal_False, // case sensitive
+ com::sun::star::sdbc::ColumnSearch::FULL, // searchable
+ sal_False, // unsignable
+ sal_False, // fixed_prec_scale
+ sal_False, // auto_increment
+ "TINYTEXT", // local type name
+ 0, // minimum scale
+ 0, // maximum scale
+ 0, // sql data type (unsued)
+ 0, // sql datetime sub (unsued)
+ 10 // num prec radix
+ },
+
+ // ----------- MySQL-Type: CHAR SDBC-Type: CHAR ----------
+ {
+ "CHAR", // Typename
+ com::sun::star::sdbc::DataType::CHAR, // sdbc-type
+ 0xFF, // Precision
+ "'", // Literal prefix
+ "'", // Literal suffix
+ "(M)", // Create params
+ com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable
+ sal_False, // case sensitive
+ com::sun::star::sdbc::ColumnSearch::FULL, // searchable
+ sal_False, // unsignable
+ sal_False, // fixed_prec_scale
+ sal_False, // auto_increment
+ "NUMERIC", // local type name
+ 0, // minimum scale
+ 0, // maximum scale
+ 0, // sql data type (unsued)
+ 0, // sql datetime sub (unsued)
+ 10 // num prec radix
+ },
+
+ // ----------- MySQL-Type: DECIMAL SDBC-Type: DECIMAL ----------
+ {
+ "DECIMAL", // Typename
+ com::sun::star::sdbc::DataType::DECIMAL, // sdbc-type
+ 17, // Precision
+ "", // Literal prefix
+ "", // Literal suffix
+ "[(M[,D])] [ZEROFILL]", // Create params
+ com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable
+ sal_False, // case sensitive
+ com::sun::star::sdbc::ColumnSearch::FULL, // searchable
+ sal_False, // unsignable
+ sal_False, // fixed_prec_scale
+ sal_True, // auto_increment
+ "DECIMAL", // local type name
+ -308, // minimum scale
+ 308, // maximum scale
+ 0, // sql data type (unsued)
+ 0, // sql datetime sub (unsued)
+ 10 // num prec radix
+ },
+
+ // ----------- MySQL-Type: NUMERIC SDBC-Type: NUMERIC ----------
+ {
+ "NUMERIC", // Typename
+ com::sun::star::sdbc::DataType::NUMERIC, // sdbc-type
+ 17, // Precision
+ "", // Literal prefix
+ "", // Literal suffix
+ "[(M[,D])] [ZEROFILL]", // Create params
+ com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable
+ sal_False, // case sensitive
+ com::sun::star::sdbc::ColumnSearch::FULL, // searchable
+ sal_False, // unsignable
+ sal_False, // fixed_prec_scale
+ sal_True, // auto_increment
+ "NUMERIC", // local type name
+ -308, // minimum scale
+ 308, // maximum scale
+ 0, // sql data type (unsued)
+ 0, // sql datetime sub (unsued)
+ 10 // num prec radix
+ },
+
+ // ----------- MySQL-Type: INTEGER SDBC-Type: INTEGER ----------
+ {
+ "INTEGER", // Typename
+ com::sun::star::sdbc::DataType::INTEGER, // sdbc-type
+ 10, // Precision
+ "", // Literal prefix
+ "", // Literal suffix
+ "[(M)] [UNSIGNED] [ZEROFILL]", // Create params
+ com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable
+ sal_False, // case sensitive
+ com::sun::star::sdbc::ColumnSearch::FULL, // searchable
+ sal_True, // unsignable
+ sal_False, // fixed_prec_scale
+ sal_True, // auto_increment
+ "INTEGER", // local type name
+ 0, // minimum scale
+ 0, // maximum scale
+ 0, // sql data type (unsued)
+ 0, // sql datetime sub (unsued)
+ 10 // num prec radix
+ },
+
+ // ----------- MySQL-Type: INT SDBC-Type: INTEGER ----------
+ {
+ "INT", // Typename
+ com::sun::star::sdbc::DataType::INTEGER, // sdbc-type
+ 10, // Precision
+ "", // Literal prefix
+ "", // Literal suffix
+ "[(M)] [UNSIGNED] [ZEROFILL]", // Create params
+ com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable
+ sal_False, // case sensitive
+ com::sun::star::sdbc::ColumnSearch::FULL, // searchable
+ sal_True, // unsignable
+ sal_False, // fixed_prec_scale
+ sal_True, // auto_increment
+ "INT", // local type name
+ 0, // minimum scale
+ 0, // maximum scale
+ 0, // sql data type (unsued)
+ 0, // sql datetime sub (unsued)
+ 10 // num prec radix
+ },
+
+ // ----------- MySQL-Type: MEDIUMINT SDBC-Type: INTEGER ----------
+ {
+ "MEDIUMINT", // Typename
+ com::sun::star::sdbc::DataType::INTEGER, // sdbc-type
+ 7, // Precision
+ "", // Literal prefix
+ "", // Literal suffix
+ "[(M)] [UNSIGNED] [ZEROFILL]", // Create params
+ com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable
+ sal_False, // case sensitive
+ com::sun::star::sdbc::ColumnSearch::FULL, // searchable
+ sal_True, // unsignable
+ sal_False, // fixed_prec_scale
+ sal_True, // auto_increment
+ "MEDIUMINT", // local type name
+ 0, // minimum scale
+ 0, // maximum scale
+ 0, // sql data type (unsued)
+ 0, // sql datetime sub (unsued)
+ 10 // num prec radix
+ },
+
+ // ----------- MySQL-Type: SMALLINT SDBC-Type: INTEGER ----------
+ {
+ "SMALLINT", // Typename
+ com::sun::star::sdbc::DataType::SMALLINT, // sdbc-type
+ 5, // Precision
+ "", // Literal prefix
+ "", // Literal suffix
+ "[(M)] [UNSIGNED] [ZEROFILL]", // Create params
+ com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable
+ sal_False, // case sensitive
+ com::sun::star::sdbc::ColumnSearch::FULL, // searchable
+ sal_True, // unsignable
+ sal_False, // fixed_prec_scale
+ sal_True, // auto_increment
+ "SMALLINT", // local type name
+ 0, // minimum scale
+ 0, // maximum scale
+ 0, // sql data type (unsued)
+ 0, // sql datetime sub (unsued)
+ 10 // num prec radix
+ },
+
+ // ----------- MySQL-Type: FLOAT SDBC-Type: REAL ----------
+ {
+ "FLOAT", // Typename
+ com::sun::star::sdbc::DataType::REAL, // sdbc-type
+ 10, // Precision
+ "", // Literal prefix
+ "", // Literal suffix
+ "[(M,D)] [ZEROFILL]", // Create params
+ com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable
+ sal_False, // case sensitive
+ com::sun::star::sdbc::ColumnSearch::FULL, // searchable
+ sal_False, // unsignable
+ sal_False, // fixed_prec_scale
+ sal_True, // auto_increment
+ "FLOAT", // local type name
+ -38, // minimum scale
+ 38, // maximum scale
+ 0, // sql data type (unsued)
+ 0, // sql datetime sub (unsued)
+ 10 // num prec radix
+ },
+
+ // ----------- MySQL-Type: DOUBLE SDBC-Type: DOUBLE ----------
+ {
+ "DOUBLE", // Typename
+ com::sun::star::sdbc::DataType::DOUBLE, // sdbc-type
+ 17, // Precision
+ "", // Literal prefix
+ "", // Literal suffix
+ "[(M,D)] [ZEROFILL]", // Create params
+ com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable
+ sal_False, // case sensitive
+ com::sun::star::sdbc::ColumnSearch::FULL, // searchable
+ sal_False, // unsignable
+ sal_False, // fixed_prec_scale
+ sal_True, // auto_increment
+ "DOUBLE", // local type name
+ -308, // minimum scale
+ 308, // maximum scale
+ 0, // sql data type (unsued)
+ 0, // sql datetime sub (unsued)
+ 10 // num prec radix
+ },
+
+ // ----------- MySQL-Type: DOUBLE PRECISION SDBC-Type: DOUBLE ----------
+ {
+ "DOUBLE PRECISION", // Typename
+ com::sun::star::sdbc::DataType::DOUBLE, // sdbc-type
+ 17, // Precision
+ "", // Literal prefix
+ "", // Literal suffix
+ "[(M,D)] [ZEROFILL]", // Create params
+ com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable
+ sal_False, // case sensitive
+ com::sun::star::sdbc::ColumnSearch::FULL, // searchable
+ sal_False, // unsignable
+ sal_False, // fixed_prec_scale
+ sal_True, // auto_increment
+ "DOUBLE PRECISION", // local type name
+ -308, // minimum scale
+ 308, // maximum scale
+ 0, // sql data type (unsued)
+ 0, // sql datetime sub (unsued)
+ 10 // num prec radix
+ },
+
+ // ----------- MySQL-Type: REAL SDBC-Type: DOUBLE ----------
+ {
+ "REAL", // Typename
+ com::sun::star::sdbc::DataType::DOUBLE, // sdbc-type
+ 17, // Precision
+ "", // Literal prefix
+ "", // Literal suffix
+ "[(M,D)] [ZEROFILL]", // Create params
+ com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable
+ sal_False, // case sensitive
+ com::sun::star::sdbc::ColumnSearch::FULL, // searchable
+ sal_False, // unsignable
+ sal_False, // fixed_prec_scale
+ sal_True, // auto_increment
+ "REAL", // local type name
+ -308, // minimum scale
+ 308, // maximum scale
+ 0, // sql data type (unsued)
+ 0, // sql datetime sub (unsued)
+ 10 // num prec radix
+ },
+
+ // ----------- MySQL-Type: VARCHAR SDBC-Type: VARCHAR ----------
+ {
+ "VARCHAR", // Typename
+ com::sun::star::sdbc::DataType::VARCHAR, // sdbc-type
+ 255, // Precision
+ "'", // Literal prefix
+ "'", // Literal suffix
+ "(M)", // Create params
+ com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable
+ sal_False, // case sensitive
+ com::sun::star::sdbc::ColumnSearch::FULL, // searchable
+ sal_False, // unsignable
+ sal_False, // fixed_prec_scale
+ sal_False, // auto_increment
+ "VARCHAR", // local type name
+ 0, // minimum scale
+ 0, // maximum scale
+ 0, // sql data type (unsued)
+ 0, // sql datetime sub (unsued)
+ 10 // num prec radix
+ },
+
+ // ----------- MySQL-Type: ENUM SDBC-Type: VARCHAR ----------
+ {
+ "ENUM", // Typename
+ com::sun::star::sdbc::DataType::VARCHAR, // sdbc-type
+ 0xFFFF, // Precision
+ "'", // Literal prefix
+ "'", // Literal suffix
+ "", // Create params
+ com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable
+ sal_False, // case sensitive
+ com::sun::star::sdbc::ColumnSearch::FULL, // searchable
+ sal_False, // unsignable
+ sal_False, // fixed_prec_scale
+ sal_False, // auto_increment
+ "ENUM", // local type name
+ 0, // minimum scale
+ 0, // maximum scale
+ 0, // sql data type (unsued)
+ 0, // sql datetime sub (unsued)
+ 10 // num prec radix
+ },
+
+ // ----------- MySQL-Type: SET SDBC-Type: VARCHAR ----------
+ {
+ "SET", // Typename
+ com::sun::star::sdbc::DataType::VARCHAR, // sdbc-type
+ 64, // Precision
+ "'", // Literal prefix
+ "'", // Literal suffix
+ "", // Create params
+ com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable
+ sal_False, // case sensitive
+ com::sun::star::sdbc::ColumnSearch::FULL, // searchable
+ sal_False, // unsignable
+ sal_False, // fixed_prec_scale
+ sal_False, // auto_increment
+ "SET", // local type name
+ 0, // minimum scale
+ 0, // maximum scale
+ 0, // sql data type (unsued)
+ 0, // sql datetime sub (unsued)
+ 10 // num prec radix
+ },
+
+ // ----------- MySQL-Type: DATE SDBC-Type: DATE ----------
+ {
+ "DATE", // Typename
+ com::sun::star::sdbc::DataType::DATE, // sdbc-type
+ 0, // Precision
+ "'", // Literal prefix
+ "'", // Literal suffix
+ "", // Create params
+ com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable
+ sal_False, // case sensitive
+ com::sun::star::sdbc::ColumnSearch::FULL, // searchable
+ sal_False, // unsignable
+ sal_False, // fixed_prec_scale
+ sal_False, // auto_increment
+ "DATE", // local type name
+ 0, // minimum scale
+ 0, // maximum scale
+ 0, // sql data type (unsued)
+ 0, // sql datetime sub (unsued)
+ 10 // num prec radix
+ },
+
+ // ----------- MySQL-Type: TIME SDBC-Type: TIME ----------
+ {
+ "TIME", // Typename
+ com::sun::star::sdbc::DataType::TIME, // sdbc-type
+ 0, // Precision
+ "'", // Literal prefix
+ "'", // Literal suffix
+ "", // Create params
+ com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable
+ sal_False, // case sensitive
+ com::sun::star::sdbc::ColumnSearch::FULL, // searchable
+ sal_False, // unsignable
+ sal_False, // fixed_prec_scale
+ sal_False, // auto_increment
+ "TIME", // local type name
+ 0, // minimum scale
+ 0, // maximum scale
+ 0, // sql data type (unsued)
+ 0, // sql datetime sub (unsued)
+ 10 // num prec radix
+ },
+
+ // ----------- MySQL-Type: DATETIME SDBC-Type: TIMESTAMP ----------
+ {
+ "DATETIME", // Typename
+ com::sun::star::sdbc::DataType::TIMESTAMP, // sdbc-type
+ 0, // Precision
+ "'", // Literal prefix
+ "'", // Literal suffix
+ "", // Create params
+ com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable
+ sal_False, // case sensitive
+ com::sun::star::sdbc::ColumnSearch::FULL, // searchable
+ sal_False, // unsignable
+ sal_False, // fixed_prec_scale
+ sal_False, // auto_increment
+ "DATETIME", // local type name
+ 0, // minimum scale
+ 0, // maximum scale
+ 0, // sql data type (unsued)
+ 0, // sql datetime sub (unsued)
+ 10 // num prec radix
+ },
+
+ // ----------- MySQL-Type: TIMESTAMP SDBC-Type: TIMESTAMP ----------
+ {
+ "TIMESTAMP", // Typename
+ com::sun::star::sdbc::DataType::TIMESTAMP, // sdbc-type
+ 0, // Precision
+ "'", // Literal prefix
+ "'", // Literal suffix
+ "[(M)]", // Create params
+ com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable
+ sal_False, // case sensitive
+ com::sun::star::sdbc::ColumnSearch::FULL, // searchable
+ sal_False, // unsignable
+ sal_False, // fixed_prec_scale
+ sal_False, // auto_increment
+ "TIMESTAMP", // local type name
+ 0, // minimum scale
+ 0, // maximum scale
+ 0, // sql data type (unsued)
+ 0, // sql datetime sub (unsued)
+ 10 // num prec radix
+ },
+
+ // ----------- MySQL-Type: TIMESTAMP SDBC-Type: TIMESTAMP ----------
+ {
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+ }
+};
diff --git a/mysqlc/source/mysqlc_types.hxx b/mysqlc/source/mysqlc_types.hxx
new file mode 100644
index 000000000000..22c4135fbd8d
--- /dev/null
+++ b/mysqlc/source/mysqlc_types.hxx
@@ -0,0 +1,56 @@
+/*************************************************************************
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2008 by Sun Microsystems, Inc.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* $RCSfile: mysqlc_types.hxx,v $
+*
+* $Revision: 1.1.2.2 $
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org. If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+************************************************************************/
+
+#ifndef MYSQLC_TYPES_HXX
+#define MYSQLC_TYPES_HXX
+
+struct TypeInfoDef {
+ const char *typeName;
+ sal_Int32 dataType;
+ sal_Int32 precision;
+ const char *literalPrefix;
+ const char *literalSuffix;
+ const char *createParams;
+ sal_Int16 nullable;
+ sal_Bool caseSensitive;
+ sal_Int16 searchable;
+ sal_Bool isUnsigned;
+ sal_Bool fixedPrecScale;
+ sal_Bool autoIncrement;
+ const char *localTypeName;
+ sal_Int32 minScale;
+ sal_Int32 maxScale;
+ sal_Int32 sqlDataType;
+ sal_Int32 sqlDateTimeSub;
+ sal_Int32 numPrecRadix;
+};
+
+extern TypeInfoDef mysqlc_types[];
+
+#endif /* MYSQLC_TYPES_HXX */
diff --git a/mysqlc/source/registry/data/org/openoffice/Office/DataAccess/Drivers.xcu b/mysqlc/source/registry/data/org/openoffice/Office/DataAccess/Drivers.xcu
new file mode 100644
index 000000000000..3c076a4a3a7a
--- /dev/null
+++ b/mysqlc/source/registry/data/org/openoffice/Office/DataAccess/Drivers.xcu
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--***********************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: DataAccess.xcu,v $
+ * $Revision: 1.27 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************ -->
+<oor:component-data oor:name="Drivers" oor:package="org.openoffice.Office.DataAccess" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <node oor:name="Installed">
+ <node oor:name="sdbc:mysqlc:*" oor:op="replace">
+ <prop oor:name="Driver">
+ <value>com.sun.star.comp.sdbc.mysqlc.MysqlCDriver</value>
+ </prop>
+ <prop oor:name="DriverTypeDisplayName" oor:type="xs:string">
+ <value xml:lang="en-US">MySQL (Connector/OOo)</value>
+ </prop>
+ <node oor:name="Properties">
+ <node oor:name="CharSet" oor:op="replace">
+ <prop oor:name="Value" oor:type="xs:string">
+ <value></value>
+ </prop>
+ </node>
+ <node oor:name="LocalSocket" oor:op="replace">
+ <prop oor:name="Value" oor:type="xs:string">
+ <value></value>
+ </prop>
+ </node>
+ <node oor:name="NamedPipe" oor:op="replace">
+ <prop oor:name="Value" oor:type="xs:string">
+ <value></value>
+ </prop>
+ </node>
+ </node>
+ <node oor:name="Features">
+ <node oor:name="UseKeywordAsBeforeAlias" oor:op="replace">
+ <prop oor:name="Value" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
+ </node>
+ <node oor:name="IgnoreDriverPrivileges" oor:op="replace">
+ <prop oor:name="Value" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
+ </node>
+ <node oor:name="DisplayVersionColumns" oor:op="replace">
+ <prop oor:name="Value" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
+ </node>
+ <node oor:name="UseDOSLineEnds" oor:op="replace">
+ <prop oor:name="Value" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
+ </node>
+ <node oor:name="BooleanComparisonMode" oor:op="replace">
+ <prop oor:name="Value" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
+ </node>
+ <node oor:name="FormsCheckRequiredFields" oor:op="replace">
+ <prop oor:name="Value" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
+ </node>
+ </node>
+ <node oor:name="MetaData">
+ <node oor:name="SupportsTableCreation" oor:op="replace">
+ <prop oor:name="Value" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
+ </node>
+ <node oor:name="Authentication" oor:op="replace">
+ <prop oor:name="Value" oor:type="xs:string">
+ <value>UserPassword</value>
+ </prop>
+ </node>
+ </node>
+ </node>
+ </node>
+</oor:component-data>
diff --git a/mysqlc/version.mk b/mysqlc/version.mk
new file mode 100644
index 000000000000..81a2cfd23da8
--- /dev/null
+++ b/mysqlc/version.mk
@@ -0,0 +1,38 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2008 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+MYSQLC_VERSION_MAJOR=1
+MYSQLC_VERSION_MINOR=0
+MYSQLC_VERSION_MICRO=1
+
+# the title, as displayed in the Extension Manager
+MYSQLC_TITLE=MySQL Connector for OpenOffice.org
+
+# the status of the extension
+# if this is different from "final", it will be appended to the title displayed in the Extension Manager
+# and also added to the file name of the resulting .oxt file
+MYSQLC_STATUS=Alpha
diff --git a/reportbuilder/java/com/sun/star/report/DataRow.java b/reportbuilder/java/com/sun/star/report/DataRow.java
index 47f471113362..8d255a516217 100644
--- a/reportbuilder/java/com/sun/star/report/DataRow.java
+++ b/reportbuilder/java/com/sun/star/report/DataRow.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: DataRow.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/DataSource.java b/reportbuilder/java/com/sun/star/report/DataSource.java
index 42d78abcc9d1..c786b8b6d5c4 100644
--- a/reportbuilder/java/com/sun/star/report/DataSource.java
+++ b/reportbuilder/java/com/sun/star/report/DataSource.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: DataSource.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/DataSourceException.java b/reportbuilder/java/com/sun/star/report/DataSourceException.java
index cbb6b394f914..c513dd9344b5 100644
--- a/reportbuilder/java/com/sun/star/report/DataSourceException.java
+++ b/reportbuilder/java/com/sun/star/report/DataSourceException.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: DataSourceException.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/DataSourceFactory.java b/reportbuilder/java/com/sun/star/report/DataSourceFactory.java
index 01a64436e7c0..36b794a3599a 100644
--- a/reportbuilder/java/com/sun/star/report/DataSourceFactory.java
+++ b/reportbuilder/java/com/sun/star/report/DataSourceFactory.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: DataSourceFactory.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/ImageService.java b/reportbuilder/java/com/sun/star/report/ImageService.java
index a407164d965a..3160fac1f718 100644
--- a/reportbuilder/java/com/sun/star/report/ImageService.java
+++ b/reportbuilder/java/com/sun/star/report/ImageService.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: ImageService.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/InputRepository.java b/reportbuilder/java/com/sun/star/report/InputRepository.java
index 88a519cb7113..aefed0461831 100644
--- a/reportbuilder/java/com/sun/star/report/InputRepository.java
+++ b/reportbuilder/java/com/sun/star/report/InputRepository.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: InputRepository.java,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/JobDefinitionException.java b/reportbuilder/java/com/sun/star/report/JobDefinitionException.java
index 74a33077fcf8..5623caf3d1a1 100644
--- a/reportbuilder/java/com/sun/star/report/JobDefinitionException.java
+++ b/reportbuilder/java/com/sun/star/report/JobDefinitionException.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: JobDefinitionException.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/JobProgressIndicator.java b/reportbuilder/java/com/sun/star/report/JobProgressIndicator.java
index 585394207568..06066a2ab757 100644
--- a/reportbuilder/java/com/sun/star/report/JobProgressIndicator.java
+++ b/reportbuilder/java/com/sun/star/report/JobProgressIndicator.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: JobProgressIndicator.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/JobProperties.java b/reportbuilder/java/com/sun/star/report/JobProperties.java
index 9d8932c1219b..c934451dfbac 100644
--- a/reportbuilder/java/com/sun/star/report/JobProperties.java
+++ b/reportbuilder/java/com/sun/star/report/JobProperties.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: JobProperties.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/OfficeToken.java b/reportbuilder/java/com/sun/star/report/OfficeToken.java
index ceddb98f077e..2c25942f3762 100644
--- a/reportbuilder/java/com/sun/star/report/OfficeToken.java
+++ b/reportbuilder/java/com/sun/star/report/OfficeToken.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: OfficeToken.java,v $
- * $Revision: 1.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/OutputRepository.java b/reportbuilder/java/com/sun/star/report/OutputRepository.java
index 0fd3c08f40ec..3dd0823762d0 100644
--- a/reportbuilder/java/com/sun/star/report/OutputRepository.java
+++ b/reportbuilder/java/com/sun/star/report/OutputRepository.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: OutputRepository.java,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/ParameterMap.java b/reportbuilder/java/com/sun/star/report/ParameterMap.java
index 45a5206583ed..0a5dfce9317b 100644
--- a/reportbuilder/java/com/sun/star/report/ParameterMap.java
+++ b/reportbuilder/java/com/sun/star/report/ParameterMap.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: ParameterMap.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/ReportAddIn.java b/reportbuilder/java/com/sun/star/report/ReportAddIn.java
index 112e182a0663..620955c98db7 100644
--- a/reportbuilder/java/com/sun/star/report/ReportAddIn.java
+++ b/reportbuilder/java/com/sun/star/report/ReportAddIn.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: ReportAddIn.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/ReportEngine.java b/reportbuilder/java/com/sun/star/report/ReportEngine.java
index 0e5260dff253..2518cb1742f0 100644
--- a/reportbuilder/java/com/sun/star/report/ReportEngine.java
+++ b/reportbuilder/java/com/sun/star/report/ReportEngine.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: ReportEngine.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/ReportEngineMetaData.java b/reportbuilder/java/com/sun/star/report/ReportEngineMetaData.java
index 49ef491177ae..25d39b732448 100644
--- a/reportbuilder/java/com/sun/star/report/ReportEngineMetaData.java
+++ b/reportbuilder/java/com/sun/star/report/ReportEngineMetaData.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: ReportEngineMetaData.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/ReportEngineParameterNames.java b/reportbuilder/java/com/sun/star/report/ReportEngineParameterNames.java
index c8798d02436e..2796537f758a 100644
--- a/reportbuilder/java/com/sun/star/report/ReportEngineParameterNames.java
+++ b/reportbuilder/java/com/sun/star/report/ReportEngineParameterNames.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: ReportEngineParameterNames.java,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/ReportExecutionException.java b/reportbuilder/java/com/sun/star/report/ReportExecutionException.java
index d9b0a77cbe09..6fc8fb1ac29f 100644
--- a/reportbuilder/java/com/sun/star/report/ReportExecutionException.java
+++ b/reportbuilder/java/com/sun/star/report/ReportExecutionException.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: ReportExecutionException.java,v $
- * $Revision: 1.3 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/ReportExpression.java b/reportbuilder/java/com/sun/star/report/ReportExpression.java
index f26fbd6cec8b..a828ee6ddba4 100644
--- a/reportbuilder/java/com/sun/star/report/ReportExpression.java
+++ b/reportbuilder/java/com/sun/star/report/ReportExpression.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: ReportExpression.java,v $
- * $Revision: 1.3 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/ReportExpressionMetaData.java b/reportbuilder/java/com/sun/star/report/ReportExpressionMetaData.java
index c2caabfec78e..3223044d2270 100644
--- a/reportbuilder/java/com/sun/star/report/ReportExpressionMetaData.java
+++ b/reportbuilder/java/com/sun/star/report/ReportExpressionMetaData.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: ReportExpressionMetaData.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/ReportFunction.java b/reportbuilder/java/com/sun/star/report/ReportFunction.java
index e7127552cb39..24be767c1a71 100644
--- a/reportbuilder/java/com/sun/star/report/ReportFunction.java
+++ b/reportbuilder/java/com/sun/star/report/ReportFunction.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: ReportFunction.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/ReportJob.java b/reportbuilder/java/com/sun/star/report/ReportJob.java
index 6f93f5db8b0c..9bda7926f7d4 100644
--- a/reportbuilder/java/com/sun/star/report/ReportJob.java
+++ b/reportbuilder/java/com/sun/star/report/ReportJob.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: ReportJob.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/ReportJobDefinition.java b/reportbuilder/java/com/sun/star/report/ReportJobDefinition.java
index 1bad0c4f0de4..89724ec20fe5 100644
--- a/reportbuilder/java/com/sun/star/report/ReportJobDefinition.java
+++ b/reportbuilder/java/com/sun/star/report/ReportJobDefinition.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: ReportJobDefinition.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/ReportJobFactory.java b/reportbuilder/java/com/sun/star/report/ReportJobFactory.java
index fda22b4d907e..1771f0bedb22 100644
--- a/reportbuilder/java/com/sun/star/report/ReportJobFactory.java
+++ b/reportbuilder/java/com/sun/star/report/ReportJobFactory.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: ReportJobFactory.java,v $
- * $Revision: 1.3 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/SDBCReportData.java b/reportbuilder/java/com/sun/star/report/SDBCReportData.java
index 610cbde2a796..67d662de261f 100644
--- a/reportbuilder/java/com/sun/star/report/SDBCReportData.java
+++ b/reportbuilder/java/com/sun/star/report/SDBCReportData.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: SDBCReportData.java,v $
- * $Revision: 1.6.32.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/SDBCReportDataFactory.java b/reportbuilder/java/com/sun/star/report/SDBCReportDataFactory.java
index 5c3032e3a7f9..79d37c6fcd45 100644
--- a/reportbuilder/java/com/sun/star/report/SDBCReportDataFactory.java
+++ b/reportbuilder/java/com/sun/star/report/SDBCReportDataFactory.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: SDBCReportDataFactory.java,v $
- * $Revision: 1.9.18.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/SOImageService.java b/reportbuilder/java/com/sun/star/report/SOImageService.java
index 075981414957..86dfde5d6043 100644
--- a/reportbuilder/java/com/sun/star/report/SOImageService.java
+++ b/reportbuilder/java/com/sun/star/report/SOImageService.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: SOImageService.java,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/StorageRepository.java b/reportbuilder/java/com/sun/star/report/StorageRepository.java
index b25d481ddc98..d448a71ece2f 100644
--- a/reportbuilder/java/com/sun/star/report/StorageRepository.java
+++ b/reportbuilder/java/com/sun/star/report/StorageRepository.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: StorageRepository.java,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/function/metadata/Author-Function.properties b/reportbuilder/java/com/sun/star/report/function/metadata/Author-Function.properties
index 4dfc3e01f0be..a8313094932f 100644
--- a/reportbuilder/java/com/sun/star/report/function/metadata/Author-Function.properties
+++ b/reportbuilder/java/com/sun/star/report/function/metadata/Author-Function.properties
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: Author-Function.properties,v $
-#
-# $Revision: 1.2 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
@@ -30,4 +26,4 @@
#*************************************************************************
display-name=AUTHOR
-description=Returns the author of the report. \ No newline at end of file
+description=Returns the author of the report.
diff --git a/reportbuilder/java/com/sun/star/report/function/metadata/Author-Function_en_US.properties b/reportbuilder/java/com/sun/star/report/function/metadata/Author-Function_en_US.properties
index 4dfc3e01f0be..a8313094932f 100644
--- a/reportbuilder/java/com/sun/star/report/function/metadata/Author-Function_en_US.properties
+++ b/reportbuilder/java/com/sun/star/report/function/metadata/Author-Function_en_US.properties
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: Author-Function.properties,v $
-#
-# $Revision: 1.2 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
@@ -30,4 +26,4 @@
#*************************************************************************
display-name=AUTHOR
-description=Returns the author of the report. \ No newline at end of file
+description=Returns the author of the report.
diff --git a/reportbuilder/java/com/sun/star/report/function/metadata/AuthorFunction.java b/reportbuilder/java/com/sun/star/report/function/metadata/AuthorFunction.java
index 1bbf417a4b8e..fa40e3d9dd10 100644
--- a/reportbuilder/java/com/sun/star/report/function/metadata/AuthorFunction.java
+++ b/reportbuilder/java/com/sun/star/report/function/metadata/AuthorFunction.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: AuthorFunction.java,v $
- * $Revision: 1.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/function/metadata/AuthorFunctionDescription.java b/reportbuilder/java/com/sun/star/report/function/metadata/AuthorFunctionDescription.java
index 3413239388e8..f8c1032bfb16 100644
--- a/reportbuilder/java/com/sun/star/report/function/metadata/AuthorFunctionDescription.java
+++ b/reportbuilder/java/com/sun/star/report/function/metadata/AuthorFunctionDescription.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: AuthorFunctionDescription.java,v $
- * $Revision: 1.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/function/metadata/MetaDataFunctionCategory.java b/reportbuilder/java/com/sun/star/report/function/metadata/MetaDataFunctionCategory.java
index 2e47bafaceca..8fa0e5d80ac5 100644
--- a/reportbuilder/java/com/sun/star/report/function/metadata/MetaDataFunctionCategory.java
+++ b/reportbuilder/java/com/sun/star/report/function/metadata/MetaDataFunctionCategory.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: MetaDataFunctionCategory.java,v $
- * $Revision: 1.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/function/metadata/Title-Function.properties b/reportbuilder/java/com/sun/star/report/function/metadata/Title-Function.properties
index ef678be150da..6c9ab290bc69 100644
--- a/reportbuilder/java/com/sun/star/report/function/metadata/Title-Function.properties
+++ b/reportbuilder/java/com/sun/star/report/function/metadata/Title-Function.properties
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: Title-Function.properties,v $
-#
-# $Revision: 1.2 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
@@ -30,4 +26,4 @@
#*************************************************************************
display-name=TITLE
-description=Returns the title of the report. \ No newline at end of file
+description=Returns the title of the report.
diff --git a/reportbuilder/java/com/sun/star/report/function/metadata/Title-Function_en_US.properties b/reportbuilder/java/com/sun/star/report/function/metadata/Title-Function_en_US.properties
index ef678be150da..6c9ab290bc69 100644
--- a/reportbuilder/java/com/sun/star/report/function/metadata/Title-Function_en_US.properties
+++ b/reportbuilder/java/com/sun/star/report/function/metadata/Title-Function_en_US.properties
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: Title-Function.properties,v $
-#
-# $Revision: 1.2 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
@@ -30,4 +26,4 @@
#*************************************************************************
display-name=TITLE
-description=Returns the title of the report. \ No newline at end of file
+description=Returns the title of the report.
diff --git a/reportbuilder/java/com/sun/star/report/function/metadata/TitleFunction.java b/reportbuilder/java/com/sun/star/report/function/metadata/TitleFunction.java
index 928bbaa0f0ec..64e17dfbdfa9 100644
--- a/reportbuilder/java/com/sun/star/report/function/metadata/TitleFunction.java
+++ b/reportbuilder/java/com/sun/star/report/function/metadata/TitleFunction.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: TitleFunction.java,v $
- * $Revision: 1.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/function/metadata/TitleFunctionDescription.java b/reportbuilder/java/com/sun/star/report/function/metadata/TitleFunctionDescription.java
index 83e9c5de464f..7ed8a61bd06a 100644
--- a/reportbuilder/java/com/sun/star/report/function/metadata/TitleFunctionDescription.java
+++ b/reportbuilder/java/com/sun/star/report/function/metadata/TitleFunctionDescription.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: TitleFunctionDescription.java,v $
- * $Revision: 1.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/function/metadata/category.properties b/reportbuilder/java/com/sun/star/report/function/metadata/category.properties
index c193c5c7374a..504df7f45b3f 100644
--- a/reportbuilder/java/com/sun/star/report/function/metadata/category.properties
+++ b/reportbuilder/java/com/sun/star/report/function/metadata/category.properties
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: category.properties,v $
-#
-# $Revision: 1.2 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/function/metadata/category_en_US.properties b/reportbuilder/java/com/sun/star/report/function/metadata/category_en_US.properties
index 44b7ed1d5e9b..b380d19cc640 100644
--- a/reportbuilder/java/com/sun/star/report/function/metadata/category_en_US.properties
+++ b/reportbuilder/java/com/sun/star/report/function/metadata/category_en_US.properties
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: category.properties,v $
-#
-# $Revision: 1.2 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
@@ -30,4 +26,4 @@
#*************************************************************************
display-name=MetaData
-description=Contains functions about meta data \ No newline at end of file
+description=Contains functions about meta data
diff --git a/reportbuilder/java/com/sun/star/report/function/metadata/makefile.mk b/reportbuilder/java/com/sun/star/report/function/metadata/makefile.mk
index 1025bcea7cb7..99c80bd919b7 100644
--- a/reportbuilder/java/com/sun/star/report/function/metadata/makefile.mk
+++ b/reportbuilder/java/com/sun/star/report/function/metadata/makefile.mk
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.3.22.2 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/makefile.mk b/reportbuilder/java/com/sun/star/report/makefile.mk
index 5b36aff44ee8..f72daadb2f57 100644
--- a/reportbuilder/java/com/sun/star/report/makefile.mk
+++ b/reportbuilder/java/com/sun/star/report/makefile.mk
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.8.46.2 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/DefaultNameGenerator.java b/reportbuilder/java/com/sun/star/report/pentaho/DefaultNameGenerator.java
index d73b1c222512..a364aeca1119 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/DefaultNameGenerator.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/DefaultNameGenerator.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: DefaultNameGenerator.java,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/OfficeNamespaces.java b/reportbuilder/java/com/sun/star/report/pentaho/OfficeNamespaces.java
index 84fac5773588..45e5f64c4670 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/OfficeNamespaces.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/OfficeNamespaces.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: OfficeNamespaces.java,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/PentahoFormulaContext.java b/reportbuilder/java/com/sun/star/report/pentaho/PentahoFormulaContext.java
index 846053cd6bc4..c2cf31ef24bd 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/PentahoFormulaContext.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/PentahoFormulaContext.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PentahoFormulaContext.java,v $
- * $Revision: 1.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/PentahoReportAddIn.java b/reportbuilder/java/com/sun/star/report/pentaho/PentahoReportAddIn.java
index db8ad9e4409e..a4222fdaa3b3 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/PentahoReportAddIn.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/PentahoReportAddIn.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PentahoReportAddIn.java,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/PentahoReportEngine.java b/reportbuilder/java/com/sun/star/report/pentaho/PentahoReportEngine.java
index d114edf34f71..024486071685 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/PentahoReportEngine.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/PentahoReportEngine.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PentahoReportEngine.java,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/PentahoReportEngineMetaData.java b/reportbuilder/java/com/sun/star/report/pentaho/PentahoReportEngineMetaData.java
index 1f4dce14950d..911840e6d2bd 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/PentahoReportEngineMetaData.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/PentahoReportEngineMetaData.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PentahoReportEngineMetaData.java,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/PentahoReportJob.java b/reportbuilder/java/com/sun/star/report/pentaho/PentahoReportJob.java
index 23f959e05943..032ccb67d965 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/PentahoReportJob.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/PentahoReportJob.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PentahoReportJob.java,v $
- * $Revision: 1.8.16.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/SOFormulaOpCodeMapper.java b/reportbuilder/java/com/sun/star/report/pentaho/SOFormulaOpCodeMapper.java
index 7a25d05c593f..516bf508e698 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/SOFormulaOpCodeMapper.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/SOFormulaOpCodeMapper.java
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: SOFormulaOpCodeMapper.java,v $
- *
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/SOFormulaParser.java b/reportbuilder/java/com/sun/star/report/pentaho/SOFormulaParser.java
index 4ef8a43f954a..06ede8903733 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/SOFormulaParser.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/SOFormulaParser.java
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: SOFormulaParser.java,v $
- *
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/SOFunctionManager.java b/reportbuilder/java/com/sun/star/report/pentaho/SOFunctionManager.java
index 3b890b940c6f..c6a7a8117dc3 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/SOFunctionManager.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/SOFunctionManager.java
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: XFunctionManager.java,v $
- *
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/SOReportJobFactory.java b/reportbuilder/java/com/sun/star/report/pentaho/SOReportJobFactory.java
index b1f886d664c5..0d03edb1555e 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/SOReportJobFactory.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/SOReportJobFactory.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: SOReportJobFactory.java,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/StarFunctionCategory.java b/reportbuilder/java/com/sun/star/report/pentaho/StarFunctionCategory.java
index 2c8b9d9f8786..5dcfa9514700 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/StarFunctionCategory.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/StarFunctionCategory.java
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: StarFunctionCategory.java,v $
- *
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/StarFunctionDescription.java b/reportbuilder/java/com/sun/star/report/pentaho/StarFunctionDescription.java
index da84dc57746f..640aa27e46ac 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/StarFunctionDescription.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/StarFunctionDescription.java
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: StarFunctionDescription.java,v $
- *
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/StarReportData.java b/reportbuilder/java/com/sun/star/report/pentaho/StarReportData.java
index 7d65f881ec6c..0edb8c197054 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/StarReportData.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/StarReportData.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: StarReportData.java,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/StarReportDataFactory.java b/reportbuilder/java/com/sun/star/report/pentaho/StarReportDataFactory.java
index 07359dc33452..f021e9c186bd 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/StarReportDataFactory.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/StarReportDataFactory.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: StarReportDataFactory.java,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/StarReportModule.java b/reportbuilder/java/com/sun/star/report/pentaho/StarReportModule.java
index 6558e30db9f4..b3497fc51377 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/StarReportModule.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/StarReportModule.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: StarReportModule.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/configuration.properties b/reportbuilder/java/com/sun/star/report/pentaho/configuration.properties
index 186b8568cb6a..1b0cafb0909b 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/configuration.properties
+++ b/reportbuilder/java/com/sun/star/report/pentaho/configuration.properties
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: configuration.properties,v $
-#
-# $Revision: 1.6 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/expressions/SumExpression.java b/reportbuilder/java/com/sun/star/report/pentaho/expressions/SumExpression.java
index 2e4f9f396088..43e85d41a9f9 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/expressions/SumExpression.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/expressions/SumExpression.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: SumExpression.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/expressions/SumExpressionMetaData.java b/reportbuilder/java/com/sun/star/report/pentaho/expressions/SumExpressionMetaData.java
index b29b4ebb7ddb..92450f7d97cf 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/expressions/SumExpressionMetaData.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/expressions/SumExpressionMetaData.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: SumExpressionMetaData.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/AbstractReportElementLayoutController.java b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/AbstractReportElementLayoutController.java
index 622699aa89d6..385c0457bf2f 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/AbstractReportElementLayoutController.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/AbstractReportElementLayoutController.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: AbstractReportElementLayoutController.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FixedTextLayoutController.java b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FixedTextLayoutController.java
index 7a96eabbb6b5..90292e93657a 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FixedTextLayoutController.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FixedTextLayoutController.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: FixedTextLayoutController.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormatValueUtility.java b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormatValueUtility.java
index 405fe4a2815b..d5f3d7386114 100755
--- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormatValueUtility.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormatValueUtility.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: FormatValueUtility.java,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormattedTextLayoutController.java b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormattedTextLayoutController.java
index 16bc355f8b77..e6995cfcc876 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormattedTextLayoutController.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormattedTextLayoutController.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: FormattedTextLayoutController.java,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/ImageElementContext.java b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/ImageElementContext.java
index 7b9624ed6e4a..9a2def45d32c 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/ImageElementContext.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/ImageElementContext.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: ImageElementContext.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/ImageElementLayoutController.java b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/ImageElementLayoutController.java
index 81e17b73e276..80ebbcc5f118 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/ImageElementLayoutController.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/ImageElementLayoutController.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: ImageElementLayoutController.java,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/ObjectOleLayoutController.java b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/ObjectOleLayoutController.java
index b0de84bda31e..08ab0ae0d792 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/ObjectOleLayoutController.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/ObjectOleLayoutController.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: ObjectOleLayoutController.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeDetailLayoutController.java b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeDetailLayoutController.java
index 9358e62a8590..83d8686e8bf6 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeDetailLayoutController.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeDetailLayoutController.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: OfficeDetailLayoutController.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeGroupLayoutController.java b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeGroupLayoutController.java
index 12604e931238..fa7852fbc156 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeGroupLayoutController.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeGroupLayoutController.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: OfficeGroupLayoutController.java,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeGroupSectionLayoutController.java b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeGroupSectionLayoutController.java
index 4eb40749e3fe..f89d3c047d15 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeGroupSectionLayoutController.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeGroupSectionLayoutController.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: OfficeGroupSectionLayoutController.java,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeRepeatingStructureLayoutController.java b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeRepeatingStructureLayoutController.java
index 1ccf6b634bcf..790d18527f14 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeRepeatingStructureLayoutController.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeRepeatingStructureLayoutController.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: OfficeRepeatingStructureLayoutController.java,v $
- * $Revision: 1.3 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeReportLayoutController.java b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeReportLayoutController.java
index 5baffc4c346b..119c277bcf36 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeReportLayoutController.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeReportLayoutController.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: OfficeReportLayoutController.java,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeTableLayoutController.java b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeTableLayoutController.java
index f8c9a1111a8d..5c0e95a190ec 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeTableLayoutController.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeTableLayoutController.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: OfficeTableLayoutController.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeTableTemplateLayoutController.java b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeTableTemplateLayoutController.java
index 738ccb4f07f4..7b83c6976fea 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeTableTemplateLayoutController.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeTableTemplateLayoutController.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: OfficeTableTemplateLayoutController.java,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/TableCellLayoutController.java b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/TableCellLayoutController.java
index 5393a5e13a15..de718e8fc700 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/TableCellLayoutController.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/TableCellLayoutController.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: TableCellLayoutController.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/VariablesCollection.java b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/VariablesCollection.java
index ca8687541545..e5a9eb60e4f8 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/VariablesCollection.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/VariablesCollection.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: VariablesCollection.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/VariablesDeclarationLayoutController.java b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/VariablesDeclarationLayoutController.java
index e59a699109f4..e00255ed824a 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/VariablesDeclarationLayoutController.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/VariablesDeclarationLayoutController.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: VariablesDeclarationLayoutController.java,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/loader/InputRepositoryLoader.java b/reportbuilder/java/com/sun/star/report/pentaho/loader/InputRepositoryLoader.java
index fc6021202e68..9f0c9ca61aac 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/loader/InputRepositoryLoader.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/loader/InputRepositoryLoader.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: InputRepositoryLoader.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/loader/InputRepositoryResourceData.java b/reportbuilder/java/com/sun/star/report/pentaho/loader/InputRepositoryResourceData.java
index 798f11d18194..25ad7f232126 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/loader/InputRepositoryResourceData.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/loader/InputRepositoryResourceData.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: InputRepositoryResourceData.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/loader/InputResourceKey.java b/reportbuilder/java/com/sun/star/report/pentaho/loader/InputResourceKey.java
index 4fd3787dd676..b9491fc3dec6 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/loader/InputResourceKey.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/loader/InputResourceKey.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: InputResourceKey.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/makefile.mk b/reportbuilder/java/com/sun/star/report/pentaho/makefile.mk
index 36e83afac2d0..2927967886a6 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/makefile.mk
+++ b/reportbuilder/java/com/sun/star/report/pentaho/makefile.mk
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.7.58.2 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/DataStyle.java b/reportbuilder/java/com/sun/star/report/pentaho/model/DataStyle.java
index 37ffed4ecd8d..1a5635f0c492 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/DataStyle.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/DataStyle.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: DataStyle.java,v $
- * $Revision: 1.3 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/FixedTextElement.java b/reportbuilder/java/com/sun/star/report/pentaho/model/FixedTextElement.java
index c216f6aad214..124fc5e13827 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/FixedTextElement.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/FixedTextElement.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: FixedTextElement.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/FontFaceDeclsSection.java b/reportbuilder/java/com/sun/star/report/pentaho/model/FontFaceDeclsSection.java
index 96e9eed7c2fe..615ef535d9bb 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/FontFaceDeclsSection.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/FontFaceDeclsSection.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: FontFaceDeclsSection.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/FontFaceElement.java b/reportbuilder/java/com/sun/star/report/pentaho/model/FontFaceElement.java
index 46516557f97a..76c6efcd82a7 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/FontFaceElement.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/FontFaceElement.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: FontFaceElement.java,v $
- * $Revision: 1.3 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/FormatCondition.java b/reportbuilder/java/com/sun/star/report/pentaho/model/FormatCondition.java
index 2f4d459229d6..471c383466a9 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/FormatCondition.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/FormatCondition.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: FormatCondition.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/FormattedTextElement.java b/reportbuilder/java/com/sun/star/report/pentaho/model/FormattedTextElement.java
index 3852cdabb86a..182f6a998681 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/FormattedTextElement.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/FormattedTextElement.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: FormattedTextElement.java,v $
- * $Revision: 1.3 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/ImageElement.java b/reportbuilder/java/com/sun/star/report/pentaho/model/ImageElement.java
index f7832a9618c7..95cbaeeb2b63 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/ImageElement.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/ImageElement.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: ImageElement.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/ObjectOleElement.java b/reportbuilder/java/com/sun/star/report/pentaho/model/ObjectOleElement.java
index 2950e1c8d2ff..84f41523c79a 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/ObjectOleElement.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/ObjectOleElement.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: ObjectOleElement.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeDetailSection.java b/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeDetailSection.java
index a31f66a805b6..14614b2548e0 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeDetailSection.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeDetailSection.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: OfficeDetailSection.java,v $
- * $Revision: 1.3 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeDocument.java b/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeDocument.java
index 41cc7aaa68d4..c3166709337e 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeDocument.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeDocument.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: OfficeDocument.java,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeGroup.java b/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeGroup.java
index eca3f20fe0ef..12ab01c318f3 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeGroup.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeGroup.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: OfficeGroup.java,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeGroupSection.java b/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeGroupSection.java
index 72c8e97ddb6a..2429d3798224 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeGroupSection.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeGroupSection.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: OfficeGroupSection.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeMasterPage.java b/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeMasterPage.java
index 209f0866271a..60b294e62ae8 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeMasterPage.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeMasterPage.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: OfficeMasterPage.java,v $
- * $Revision: 1.3 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeMasterStyles.java b/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeMasterStyles.java
index 866a604c3f9f..f0e44618334a 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeMasterStyles.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeMasterStyles.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: OfficeMasterStyles.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeReport.java b/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeReport.java
index 5804396b36be..cf873b9452d5 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeReport.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeReport.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: OfficeReport.java,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeStyle.java b/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeStyle.java
index acb4b88359d0..79a824bbcc45 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeStyle.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeStyle.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: OfficeStyle.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeStyles.java b/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeStyles.java
index aa08f75e38a4..c809eec1b485 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeStyles.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeStyles.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: OfficeStyles.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeStylesCollection.java b/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeStylesCollection.java
index a4a4d4b544ab..f1a958217067 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeStylesCollection.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeStylesCollection.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: OfficeStylesCollection.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeTableSection.java b/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeTableSection.java
index bf77ebcd1253..9df11ff0156c 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeTableSection.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeTableSection.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: OfficeTableSection.java,v $
- * $Revision: 1.3 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/PageLayout.java b/reportbuilder/java/com/sun/star/report/pentaho/model/PageLayout.java
index 9499d0557f29..5d89e203ac05 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/PageLayout.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/PageLayout.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PageLayout.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/PageSection.java b/reportbuilder/java/com/sun/star/report/pentaho/model/PageSection.java
index 537a1cc3af42..fc3532ca70a4 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/PageSection.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/PageSection.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PageSection.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/RawText.java b/reportbuilder/java/com/sun/star/report/pentaho/model/RawText.java
index 8dd1dcf7430d..47b275a0a5b7 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/RawText.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/RawText.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: RawText.java,v $
- * $Revision: 1.3 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/ReportElement.java b/reportbuilder/java/com/sun/star/report/pentaho/model/ReportElement.java
index a3c9838be19d..8bab74072f3b 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/ReportElement.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/ReportElement.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: ReportElement.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/TableCellElement.java b/reportbuilder/java/com/sun/star/report/pentaho/model/TableCellElement.java
index 501a8dbe8131..bbe2c7dadf78 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/TableCellElement.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/TableCellElement.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: TableCellElement.java,v $
- * $Revision: 1.3 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/VariablesDeclarationSection.java b/reportbuilder/java/com/sun/star/report/pentaho/model/VariablesDeclarationSection.java
index fc03e863ff64..d50935f837fb 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/VariablesDeclarationSection.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/VariablesDeclarationSection.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: VariablesDeclarationSection.java,v $
- * $Revision: 1.3 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/module.properties b/reportbuilder/java/com/sun/star/report/pentaho/module.properties
index a2f9f7f4222b..7038a47a410c 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/module.properties
+++ b/reportbuilder/java/com/sun/star/report/pentaho/module.properties
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: module.properties,v $
-#
-# $Revision: 1.3 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/output/ImageProducer.java b/reportbuilder/java/com/sun/star/report/pentaho/output/ImageProducer.java
index ac98c9a97953..d307fe1726f4 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/output/ImageProducer.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/output/ImageProducer.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: ImageProducer.java,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/output/OfficeDocumentReportTarget.java b/reportbuilder/java/com/sun/star/report/pentaho/output/OfficeDocumentReportTarget.java
index 3892944eb1f2..23e65b569a29 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/output/OfficeDocumentReportTarget.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/output/OfficeDocumentReportTarget.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: OfficeDocumentReportTarget.java,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/output/OleProducer.java b/reportbuilder/java/com/sun/star/report/pentaho/output/OleProducer.java
index 66b0a0435b17..7194e456a351 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/output/OleProducer.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/output/OleProducer.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: OleProducer.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/output/StyleUtilities.java b/reportbuilder/java/com/sun/star/report/pentaho/output/StyleUtilities.java
index 4bccca1e9612..d901d15fad16 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/output/StyleUtilities.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/output/StyleUtilities.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: StyleUtilities.java,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/output/StylesWriter.java b/reportbuilder/java/com/sun/star/report/pentaho/output/StylesWriter.java
index 24fb64d3b95e..bf68c10f4b9d 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/output/StylesWriter.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/output/StylesWriter.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: StylesWriter.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/output/chart/ChartRawReportProcessor.java b/reportbuilder/java/com/sun/star/report/pentaho/output/chart/ChartRawReportProcessor.java
index 1845fc59a78f..5bf338dedf3c 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/output/chart/ChartRawReportProcessor.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/output/chart/ChartRawReportProcessor.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: ChartRawReportProcessor.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/output/chart/ChartRawReportTarget.java b/reportbuilder/java/com/sun/star/report/pentaho/output/chart/ChartRawReportTarget.java
index 05e70d1e49e2..edf914733067 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/output/chart/ChartRawReportTarget.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/output/chart/ChartRawReportTarget.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: ChartRawReportTarget.java,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/output/spreadsheet/SpreadsheetRawReportProcessor.java b/reportbuilder/java/com/sun/star/report/pentaho/output/spreadsheet/SpreadsheetRawReportProcessor.java
index ddc644d52ef3..61cd7f56c270 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/output/spreadsheet/SpreadsheetRawReportProcessor.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/output/spreadsheet/SpreadsheetRawReportProcessor.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: SpreadsheetRawReportProcessor.java,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget.java b/reportbuilder/java/com/sun/star/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget.java
index 01e5135c3613..90101412d0ad 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: SpreadsheetRawReportTarget.java,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/output/text/MasterPageFactory.java b/reportbuilder/java/com/sun/star/report/pentaho/output/text/MasterPageFactory.java
index ca3047a16c16..6abc2096c624 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/output/text/MasterPageFactory.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/output/text/MasterPageFactory.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: MasterPageFactory.java,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/output/text/PageBreakDefinition.java b/reportbuilder/java/com/sun/star/report/pentaho/output/text/PageBreakDefinition.java
index 23372228d33d..4632d81b8970 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/output/text/PageBreakDefinition.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/output/text/PageBreakDefinition.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PageBreakDefinition.java,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/output/text/PageContext.java b/reportbuilder/java/com/sun/star/report/pentaho/output/text/PageContext.java
index 740582c9b347..8ac38e4e43ea 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/output/text/PageContext.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/output/text/PageContext.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PageContext.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/output/text/TextRawReportProcessor.java b/reportbuilder/java/com/sun/star/report/pentaho/output/text/TextRawReportProcessor.java
index 3b23ffb4c3df..01ab1a72dbd5 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/output/text/TextRawReportProcessor.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/output/text/TextRawReportProcessor.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: TextRawReportProcessor.java,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/output/text/TextRawReportTarget.java b/reportbuilder/java/com/sun/star/report/pentaho/output/text/TextRawReportTarget.java
index 947087a17c11..a5fc3a0ad4db 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/output/text/TextRawReportTarget.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/output/text/TextRawReportTarget.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: TextRawReportTarget.java,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/output/text/VariablesDeclarations.java b/reportbuilder/java/com/sun/star/report/pentaho/output/text/VariablesDeclarations.java
index a348fb9b67fb..6e7534df735e 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/output/text/VariablesDeclarations.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/output/text/VariablesDeclarations.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: VariablesDeclarations.java,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/AttributeSpecification.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/AttributeSpecification.java
index e4f6e121c277..98a47a23aae7 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/AttributeSpecification.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/AttributeSpecification.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: AttributeSpecification.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/ElementReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/ElementReadHandler.java
index 3bfe49fc2c27..81efe8fbd073 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/ElementReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/ElementReadHandler.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: ElementReadHandler.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/OfficeDocumentXmlResourceFactory.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/OfficeDocumentXmlResourceFactory.java
index e3b8f7374d43..2bcf3a824737 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/OfficeDocumentXmlResourceFactory.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/OfficeDocumentXmlResourceFactory.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: OfficeDocumentXmlResourceFactory.java,v $
- * $Revision: 1.3 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/OfficeParserUtil.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/OfficeParserUtil.java
index 266cfa529d5a..ce34affe7d80 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/OfficeParserUtil.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/OfficeParserUtil.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: OfficeParserUtil.java,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/OfficeStylesXmlResourceFactory.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/OfficeStylesXmlResourceFactory.java
index 6971eb857a20..33108e0dc438 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/OfficeStylesXmlResourceFactory.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/OfficeStylesXmlResourceFactory.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: OfficeStylesXmlResourceFactory.java,v $
- * $Revision: 1.3 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/StarStyleXmlFactoryModule.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/StarStyleXmlFactoryModule.java
index ff3dfc494436..1e57df98ee51 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/StarStyleXmlFactoryModule.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/StarStyleXmlFactoryModule.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: StarStyleXmlFactoryModule.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/StarXmlFactoryModule.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/StarXmlFactoryModule.java
index e69df1b60bbe..695bf52428cf 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/StarXmlFactoryModule.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/StarXmlFactoryModule.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: StarXmlFactoryModule.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/StyleMapper.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/StyleMapper.java
index 81f92f7ebaea..aaae0b7795b5 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/StyleMapper.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/StyleMapper.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: StyleMapper.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/chart/ChartReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/chart/ChartReadHandler.java
index 820a8fee65e6..9ec31aa498cc 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/chart/ChartReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/chart/ChartReadHandler.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: ChartReadHandler.java,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/data/DataStyleReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/data/DataStyleReadHandler.java
index b4787ca63cb9..61069584c3bb 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/data/DataStyleReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/data/DataStyleReadHandler.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: DataStyleReadHandler.java,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/draw/ObjectOleReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/draw/ObjectOleReadHandler.java
index 6630d1e73962..6774c4374507 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/draw/ObjectOleReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/draw/ObjectOleReadHandler.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: ObjectOleReadHandler.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/office/BodyReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/office/BodyReadHandler.java
index acb6a9e5da2b..1f08dd533220 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/office/BodyReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/office/BodyReadHandler.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: BodyReadHandler.java,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/office/DocumentContentReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/office/DocumentContentReadHandler.java
index 64255c2ae373..61208e765052 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/office/DocumentContentReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/office/DocumentContentReadHandler.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: DocumentContentReadHandler.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/office/DocumentStylesReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/office/DocumentStylesReadHandler.java
index 32f7c54fa08a..f3665f967c11 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/office/DocumentStylesReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/office/DocumentStylesReadHandler.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: DocumentStylesReadHandler.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/office/FontFaceDeclsReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/office/FontFaceDeclsReadHandler.java
index 7e40681faee3..058aca7bec32 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/office/FontFaceDeclsReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/office/FontFaceDeclsReadHandler.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: FontFaceDeclsReadHandler.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/office/MasterStylesReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/office/MasterStylesReadHandler.java
index deed7bdc0d84..52854a57af40 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/office/MasterStylesReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/office/MasterStylesReadHandler.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: MasterStylesReadHandler.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt-schema-v1.0-os.xsd b/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt-schema-v1.0-os.xsd
index f65b34149429..82984c73afe2 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt-schema-v1.0-os.xsd
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt-schema-v1.0-os.xsd
@@ -2,14 +2,10 @@
<!--
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- Copyright 2008 by Sun Microsystems, Inc.
+ Copyright 2000, 2010 Oracle and/or its affiliates.
OpenOffice.org - a multi-platform office productivity suite
- $RCSfile: rpt-schema-v1.0-os.xsd,v $
-
- $Revision: 1.3 $
-
This file is part of OpenOffice.org.
OpenOffice.org is free software: you can redistribute it and/or modify
@@ -26,7 +22,7 @@
version 3 along with OpenOffice.org. If not, see
<http://www.openoffice.org/license.html>
for a copy of the LGPLv3 License.
-
+
-->
<!---->
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/ConditionalPrintExpressionReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/ConditionalPrintExpressionReadHandler.java
index 7378637bae15..77ac9622a44e 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/ConditionalPrintExpressionReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/ConditionalPrintExpressionReadHandler.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: ConditionalPrintExpressionReadHandler.java,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/DetailRootTableReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/DetailRootTableReadHandler.java
index 246e09814ee8..a8252667ff1f 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/DetailRootTableReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/DetailRootTableReadHandler.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: DetailRootTableReadHandler.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/FixedContentReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/FixedContentReadHandler.java
index a11d42509f14..f414fc680bc1 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/FixedContentReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/FixedContentReadHandler.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: FixedContentReadHandler.java,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/FormatConditionReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/FormatConditionReadHandler.java
index 840027027940..2409c9aca053 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/FormatConditionReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/FormatConditionReadHandler.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: FormatConditionReadHandler.java,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/FormattedTextReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/FormattedTextReadHandler.java
index 7f98e3f79f6a..8b312aa80ba7 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/FormattedTextReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/FormattedTextReadHandler.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: FormattedTextReadHandler.java,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/FunctionReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/FunctionReadHandler.java
index b5ba5a24642e..67c8bb133920 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/FunctionReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/FunctionReadHandler.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: FunctionReadHandler.java,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/GroupReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/GroupReadHandler.java
index b9c6cb42d77e..108157fcfc64 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/GroupReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/GroupReadHandler.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: GroupReadHandler.java,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/GroupSectionReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/GroupSectionReadHandler.java
index ae7c45f192ac..99a34abc1d42 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/GroupSectionReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/GroupSectionReadHandler.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: GroupSectionReadHandler.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/ImageReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/ImageReadHandler.java
index e570a5135fca..50d52818159d 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/ImageReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/ImageReadHandler.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: ImageReadHandler.java,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/MasterDetailReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/MasterDetailReadHandler.java
index e9b1d8959333..b1093f0957e0 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/MasterDetailReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/MasterDetailReadHandler.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: MasterDetailReadHandler.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/ReportElementReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/ReportElementReadHandler.java
index 9177d66db974..e683fba93116 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/ReportElementReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/ReportElementReadHandler.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: ReportElementReadHandler.java,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/ReportReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/ReportReadHandler.java
index 1d0acf709161..53e0bd247144 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/ReportReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/ReportReadHandler.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: ReportReadHandler.java,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/RootTableReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/RootTableReadHandler.java
index 7f1604d0e7ea..f6ca4e955ec2 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/RootTableReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/RootTableReadHandler.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: RootTableReadHandler.java,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/SubDocumentReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/SubDocumentReadHandler.java
index ab635a6b095b..945ed1a35cc0 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/SubDocumentReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/SubDocumentReadHandler.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: SubDocumentReadHandler.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/selectors.properties b/reportbuilder/java/com/sun/star/report/pentaho/parser/selectors.properties
index eca5a9072c9b..a8f0ad275941 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/selectors.properties
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/selectors.properties
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: selectors.properties,v $
-#
-# $Revision: 1.3 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/style/FontFaceReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/style/FontFaceReadHandler.java
index 0c7b8747c9d5..035c4db1cdfc 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/style/FontFaceReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/style/FontFaceReadHandler.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: FontFaceReadHandler.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/style/MasterPageReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/style/MasterPageReadHandler.java
index 75773988cf76..481042588854 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/style/MasterPageReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/style/MasterPageReadHandler.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: MasterPageReadHandler.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/style/OfficeStyleReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/style/OfficeStyleReadHandler.java
index 0a541495c8dd..a25155b28310 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/style/OfficeStyleReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/style/OfficeStyleReadHandler.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: OfficeStyleReadHandler.java,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/style/OfficeStylesReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/style/OfficeStylesReadHandler.java
index 4c4a2e80d19a..cf68aa1f0e00 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/style/OfficeStylesReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/style/OfficeStylesReadHandler.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: OfficeStylesReadHandler.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/style/PageLayoutReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/style/PageLayoutReadHandler.java
index 5ee10d2b936b..162b58884f27 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/style/PageLayoutReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/style/PageLayoutReadHandler.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PageLayoutReadHandler.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/style/StyleDefinitionReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/style/StyleDefinitionReadHandler.java
index 0fd0655d4e22..bf63a72c64c7 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/style/StyleDefinitionReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/style/StyleDefinitionReadHandler.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: StyleDefinitionReadHandler.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/OneOfConstantsMapper.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/OneOfConstantsMapper.java
index 8e385f2ba859..3cdecbcba2fb 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/OneOfConstantsMapper.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/OneOfConstantsMapper.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: OneOfConstantsMapper.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/draw/TextAreaVerticalAlignMapper.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/draw/TextAreaVerticalAlignMapper.java
index 8418815f3b7d..4a42e58b1ad5 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/draw/TextAreaVerticalAlignMapper.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/draw/TextAreaVerticalAlignMapper.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: TextAreaVerticalAlignMapper.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/BackgroundColorMapper.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/BackgroundColorMapper.java
index a2ca9ca9e496..e81d0d126f20 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/BackgroundColorMapper.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/BackgroundColorMapper.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: BackgroundColorMapper.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/BorderRightMapper.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/BorderRightMapper.java
index 14b9f4dd5b3b..7dd84ebf21f8 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/BorderRightMapper.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/BorderRightMapper.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: BorderRightMapper.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/ColorMapper.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/ColorMapper.java
index f824646a9df4..e4d595bcf719 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/ColorMapper.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/ColorMapper.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: ColorMapper.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/FontSizeMapper.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/FontSizeMapper.java
index 94c701431527..ecc5e084b459 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/FontSizeMapper.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/FontSizeMapper.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: FontSizeMapper.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/FontStyleMapper.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/FontStyleMapper.java
index 5c6111c1f55a..0003be5618fd 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/FontStyleMapper.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/FontStyleMapper.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: FontStyleMapper.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/FontWeightMapper.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/FontWeightMapper.java
index ec73596462e5..2a3f4109903d 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/FontWeightMapper.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/FontWeightMapper.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: FontWeightMapper.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/TextAlignMapper.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/TextAlignMapper.java
index b619442076b6..817dfb956380 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/TextAlignMapper.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/TextAlignMapper.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: TextAlignMapper.java,v $
- * $Revision: 1.3 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontFamilyGenericMapper.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontFamilyGenericMapper.java
index fce338d5688b..4d61bc9ff871 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontFamilyGenericMapper.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontFamilyGenericMapper.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: FontFamilyGenericMapper.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontFamilyMapper.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontFamilyMapper.java
index 696fb557bdde..bde78e2ed0bf 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontFamilyMapper.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontFamilyMapper.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: FontFamilyMapper.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontNameMapper.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontNameMapper.java
index cc6cd926f7c7..2e8ed93c7f3b 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontNameMapper.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontNameMapper.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: FontNameMapper.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontPitchMapper.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontPitchMapper.java
index 79dceddb88c6..93de4f494104 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontPitchMapper.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontPitchMapper.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: FontPitchMapper.java,v $
- * $Revision: 1.3 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontReliefMapper.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontReliefMapper.java
index a9c18a8f7dc4..8d5070ab59e9 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontReliefMapper.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontReliefMapper.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: FontReliefMapper.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextEmphasizeMapper.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextEmphasizeMapper.java
index e465e7da1527..83f2e576bcea 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextEmphasizeMapper.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextEmphasizeMapper.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: TextEmphasizeMapper.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextUnderlineColorMapper.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextUnderlineColorMapper.java
index b6b3812a834e..091ae5f57286 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextUnderlineColorMapper.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextUnderlineColorMapper.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: TextUnderlineColorMapper.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextUnderlineStyleMapper.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextUnderlineStyleMapper.java
index fcc4e8cc6a7a..16f31d192e92 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextUnderlineStyleMapper.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextUnderlineStyleMapper.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: TextUnderlineStyleMapper.java,v $
- * $Revision: 1.3 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextUnderlineWidthMapper.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextUnderlineWidthMapper.java
index fbc4d7498be2..92846ba947e8 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextUnderlineWidthMapper.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextUnderlineWidthMapper.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: TextUnderlineWidthMapper.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextUnderlineWordMode.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextUnderlineWordMode.java
index aa23d66b131f..f11dc31a3c37 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextUnderlineWordMode.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextUnderlineWordMode.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: TextUnderlineWordMode.java,v $
- * $Revision: 1.3 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/VerticalAlignMapper.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/VerticalAlignMapper.java
index 9b56b1ae14be..aff90e41ee11 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/VerticalAlignMapper.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/VerticalAlignMapper.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: VerticalAlignMapper.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/table/ColumnWidthMapper.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/table/ColumnWidthMapper.java
index 82adc828982c..6f53d9a49733 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/table/ColumnWidthMapper.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/table/ColumnWidthMapper.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: ColumnWidthMapper.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/table/RowHeightMapper.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/table/RowHeightMapper.java
index 57e4dcd9c559..c1aeb5f9494e 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/table/RowHeightMapper.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/table/RowHeightMapper.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: RowHeightMapper.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/table/CoveredCellReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/table/CoveredCellReadHandler.java
index 66b11863df77..8a9ca1077485 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/table/CoveredCellReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/table/CoveredCellReadHandler.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: CoveredCellReadHandler.java,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableCellReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableCellReadHandler.java
index 7d34b5e18346..9d963fd46326 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableCellReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableCellReadHandler.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: TableCellReadHandler.java,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableColumnReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableColumnReadHandler.java
index 172e8b475459..491ea24697cd 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableColumnReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableColumnReadHandler.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: TableColumnReadHandler.java,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableColumnsReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableColumnsReadHandler.java
index a72a5249af4c..7de47122e4ef 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableColumnsReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableColumnsReadHandler.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: TableColumnsReadHandler.java,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableReadHandler.java
index 365000792277..00b858755338 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableReadHandler.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: TableReadHandler.java,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableRowReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableRowReadHandler.java
index 14af3abf601a..c62511958de5 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableRowReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableRowReadHandler.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: TableRowReadHandler.java,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableRowsReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableRowsReadHandler.java
index 77db358f8165..1e5750a2a0da 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableRowsReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableRowsReadHandler.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: TableRowsReadHandler.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/text/TextContentReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/text/TextContentReadHandler.java
index 19af5196fa2b..98303dffe6db 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/text/TextContentReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/text/TextContentReadHandler.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: TextContentReadHandler.java,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/xlink/XLinkReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/xlink/XLinkReadHandler.java
index e8ff4b3f65df..a11d0c30e812 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/xlink/XLinkReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/xlink/XLinkReadHandler.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: XLinkReadHandler.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/styles/LengthCalculator.java b/reportbuilder/java/com/sun/star/report/pentaho/styles/LengthCalculator.java
index 1e041d6bce8d..0665066f2a9f 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/styles/LengthCalculator.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/styles/LengthCalculator.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: LengthCalculator.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapper.java b/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapper.java
index 6cb6add68697..eaf2b24043ee 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapper.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapper.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: StyleMapper.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapperKey.java b/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapperKey.java
index 496bfd23387f..447a0b958fd8 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapperKey.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapperKey.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: StyleMapperKey.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapperXmlFactoryModule.java b/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapperXmlFactoryModule.java
index 09802517e0a2..95f8322de730 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapperXmlFactoryModule.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapperXmlFactoryModule.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: StyleMapperXmlFactoryModule.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapperXmlResourceFactory.java b/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapperXmlResourceFactory.java
index 5574bf022353..48baade4ebc0 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapperXmlResourceFactory.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapperXmlResourceFactory.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: StyleMapperXmlResourceFactory.java,v $
- * $Revision: 1.3 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMappingDocumentReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMappingDocumentReadHandler.java
index 135d6667144c..07491b3fa4e3 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMappingDocumentReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMappingDocumentReadHandler.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: StyleMappingDocumentReadHandler.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMappingReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMappingReadHandler.java
index 7db04ffc5d93..a6acb33e14e4 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMappingReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMappingReadHandler.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: StyleMappingReadHandler.java,v $
- * $Revision: 1.3 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMappingRule.java b/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMappingRule.java
index e0fbd62a77d8..9698e73ce67b 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMappingRule.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMappingRule.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: StyleMappingRule.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/styles/stylemapper.xml b/reportbuilder/java/com/sun/star/report/pentaho/styles/stylemapper.xml
index e6fa1d089921..11ca5fcd8ae4 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/styles/stylemapper.xml
+++ b/reportbuilder/java/com/sun/star/report/pentaho/styles/stylemapper.xml
@@ -3,14 +3,10 @@
<!--
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- Copyright 2008 by Sun Microsystems, Inc.
+ Copyright 2000, 2010 Oracle and/or its affiliates.
OpenOffice.org - a multi-platform office productivity suite
- $RCSfile: stylemapper.xml,v $
-
- $Revision: 1.5 $
-
This file is part of OpenOffice.org.
OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/styles/stylemapper.xsd b/reportbuilder/java/com/sun/star/report/pentaho/styles/stylemapper.xsd
index 93392a6f0ea1..05e7d0c204f2 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/styles/stylemapper.xsd
+++ b/reportbuilder/java/com/sun/star/report/pentaho/styles/stylemapper.xsd
@@ -2,14 +2,10 @@
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- Copyright 2008 by Sun Microsystems, Inc.
+ Copyright 2000, 2010 Oracle and/or its affiliates.
OpenOffice.org - a multi-platform office productivity suite
- $RCSfile: stylemapper.xsd,v $
-
- $Revision: 1.3 $
-
This file is part of OpenOffice.org.
OpenOffice.org is free software: you can redistribute it and/or modify
@@ -26,7 +22,7 @@
version 3 along with OpenOffice.org. If not, see
<http://www.openoffice.org/license.html>
for a copy of the LGPLv3 License.
-
+
-->
<xsd:schema version="0.9"
diff --git a/reportbuilder/java/com/sun/star/report/util/DefaultJobProperties.java b/reportbuilder/java/com/sun/star/report/util/DefaultJobProperties.java
index 096882a29c02..cbebe708ee65 100644
--- a/reportbuilder/java/com/sun/star/report/util/DefaultJobProperties.java
+++ b/reportbuilder/java/com/sun/star/report/util/DefaultJobProperties.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: DefaultJobProperties.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/util/DefaultParameterMap.java b/reportbuilder/java/com/sun/star/report/util/DefaultParameterMap.java
index f6766a53f1a9..917e022d53af 100644
--- a/reportbuilder/java/com/sun/star/report/util/DefaultParameterMap.java
+++ b/reportbuilder/java/com/sun/star/report/util/DefaultParameterMap.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: DefaultParameterMap.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/util/DefaultReportJobDefinition.java b/reportbuilder/java/com/sun/star/report/util/DefaultReportJobDefinition.java
index 83ea4eb0eedc..dbd943bb0ea1 100644
--- a/reportbuilder/java/com/sun/star/report/util/DefaultReportJobDefinition.java
+++ b/reportbuilder/java/com/sun/star/report/util/DefaultReportJobDefinition.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: DefaultReportJobDefinition.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/util/ManifestWriter.java b/reportbuilder/java/com/sun/star/report/util/ManifestWriter.java
index c07e7ae0e262..b69ceb001409 100644
--- a/reportbuilder/java/com/sun/star/report/util/ManifestWriter.java
+++ b/reportbuilder/java/com/sun/star/report/util/ManifestWriter.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: ManifestWriter.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/util/ReportUtil.java b/reportbuilder/java/com/sun/star/report/util/ReportUtil.java
index e2b3602e19fb..464f0e9901b7 100644
--- a/reportbuilder/java/com/sun/star/report/util/ReportUtil.java
+++ b/reportbuilder/java/com/sun/star/report/util/ReportUtil.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: ReportUtil.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/com/sun/star/report/util/makefile.mk b/reportbuilder/java/com/sun/star/report/util/makefile.mk
index 5ef3f02b0a1f..d7c84fcbaca3 100644
--- a/reportbuilder/java/com/sun/star/report/util/makefile.mk
+++ b/reportbuilder/java/com/sun/star/report/util/makefile.mk
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.9 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/jfreereport.properties b/reportbuilder/java/jfreereport.properties
index 7d36d8aa9d27..2548cb110089 100644
--- a/reportbuilder/java/jfreereport.properties
+++ b/reportbuilder/java/jfreereport.properties
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: jfreereport.properties,v $
-#
-# $Revision: 1.4 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/libformula.properties b/reportbuilder/java/libformula.properties
index 9b361be358ea..c9a7d35d1afe 100644
--- a/reportbuilder/java/libformula.properties
+++ b/reportbuilder/java/libformula.properties
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: libformula.properties,v $
-#
-# $Revision: 1.2 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
@@ -31,8 +27,8 @@
##
# Any configuration will happen here.
-org.pentaho.reporting.libraries.formula.datesystem.StartYear=1930
-org.pentaho.reporting.libraries.formula.datesystem.ExcelHack=false
+org.pentaho.reporting.libraries.formula.datesystem.StartYear=1930
+org.pentaho.reporting.libraries.formula.datesystem.ExcelHack=false
#
# A list of all known functions.
diff --git a/reportbuilder/java/loader.properties b/reportbuilder/java/loader.properties
index 44e7d0f706f4..fc5926371eaf 100644
--- a/reportbuilder/java/loader.properties
+++ b/reportbuilder/java/loader.properties
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: loader.properties,v $
-#
-# $Revision: 1.3 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/java/makefile.mk b/reportbuilder/java/makefile.mk
index cc7e468456fd..ba62a0dd5acf 100644
--- a/reportbuilder/java/makefile.mk
+++ b/reportbuilder/java/makefile.mk
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.6 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/registry/data/org/openoffice/Office/Accelerators.xcu b/reportbuilder/registry/data/org/openoffice/Office/Accelerators.xcu
index 921fbe8c21b0..ebb6ac365443 100644
--- a/reportbuilder/registry/data/org/openoffice/Office/Accelerators.xcu
+++ b/reportbuilder/registry/data/org/openoffice/Office/Accelerators.xcu
@@ -3,13 +3,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: Common.xcu,v $
- * $Revision: 1.52 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/registry/data/org/openoffice/Office/DataAccess.xcu b/reportbuilder/registry/data/org/openoffice/Office/DataAccess.xcu
index a58f4f0fd247..e40b13f257bb 100644
--- a/reportbuilder/registry/data/org/openoffice/Office/DataAccess.xcu
+++ b/reportbuilder/registry/data/org/openoffice/Office/DataAccess.xcu
@@ -3,13 +3,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: DataAccess.xcu,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/registry/data/org/openoffice/Office/Embedding.xcu b/reportbuilder/registry/data/org/openoffice/Office/Embedding.xcu
index b4546ae728ee..521166e1d4c8 100644
--- a/reportbuilder/registry/data/org/openoffice/Office/Embedding.xcu
+++ b/reportbuilder/registry/data/org/openoffice/Office/Embedding.xcu
@@ -3,13 +3,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: Embedding.xcu,v $
- * $Revision: 1.3 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/registry/data/org/openoffice/Office/ExtendedColorScheme.xcu b/reportbuilder/registry/data/org/openoffice/Office/ExtendedColorScheme.xcu
index a5c874b9d6e4..1cde8649d07a 100644
--- a/reportbuilder/registry/data/org/openoffice/Office/ExtendedColorScheme.xcu
+++ b/reportbuilder/registry/data/org/openoffice/Office/ExtendedColorScheme.xcu
@@ -1,198 +1,195 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--***********************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: ExtendedColorScheme.xcu,v $
- * $Revision: 1.2 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************ -->
-<oor:component-data oor:name="ExtendedColorScheme" oor:package="org.openoffice.Office" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <node oor:name="ExtendedColorScheme">
- <prop oor:name="CurrentColorScheme">
- <value>default</value>
- </prop>
- <node oor:name="ColorSchemes">
- <node oor:name="default" oor:op="replace">
- <node oor:name="SunReportBuilder" oor:op="replace">
- <node oor:name="Entries">
- <node oor:name="ReportHeader" oor:op="replace">
- <prop oor:name="Color">
- <value>0x007Fa04C</value>
- </prop>
- <prop oor:name="DefaultColor">
- <value>0x007Fa04C</value>
- </prop>
- </node>
- <node oor:name="ReportFooter" oor:op="replace">
- <prop oor:name="Color">
- <value>0x007Fa04C</value>
- </prop>
- <prop oor:name="DefaultColor">
- <value>0x007Fa04C</value>
- </prop>
- </node>
- <node oor:name="PageHeader" oor:op="replace">
- <prop oor:name="Color">
- <value>0x00F0C158/</value>
- </prop>
- <prop oor:name="DefaultColor">
- <value>0x00F0C158/</value>
- </prop>
- </node>
- <node oor:name="PageFooter" oor:op="replace">
- <prop oor:name="Color">
- <value>0x00F0C158</value>
- </prop>
- <prop oor:name="DefaultColor">
- <value>0x00F0C158</value>
- </prop>
- </node>
- <node oor:name="GroupHeader" oor:op="replace">
- <prop oor:name="Color">
- <value>0x00AAC1D2</value>
- </prop>
- <prop oor:name="DefaultColor">
- <value>0x00AAC1D2</value>
- </prop>
- </node>
- <node oor:name="GroupFooter" oor:op="replace">
- <prop oor:name="Color">
- <value>0x00AAC1D2</value>
- </prop>
- <prop oor:name="DefaultColor">
- <value>0x00AAC1D2</value>
- </prop>
- </node>
- <node oor:name="ColumnHeader" oor:op="replace">
- <prop oor:name="Color">
- <value>0x00AAC1D2</value>
- </prop>
- <prop oor:name="DefaultColor">
- <value>0x00AAC1D2</value>
- </prop>
- </node>
- <node oor:name="ColumnFooter" oor:op="replace">
- <prop oor:name="Color">
- <value>0x00AAC1D2</value>
- </prop>
- <prop oor:name="DefaultColor">
- <value>0x00AAC1D2</value>
- </prop>
- </node>
- <node oor:name="Detail" oor:op="replace">
- <prop oor:name="Color">
- <value>0x00F1C4A2</value>
- </prop>
- <prop oor:name="DefaultColor">
- <value>0x00F1C4A2</value>
- </prop>
- </node>
- <node oor:name="OverlappedControl" oor:op="replace">
- <prop oor:name="Color">
- <value>0x00FF3366</value>
- </prop>
- <prop oor:name="DefaultColor">
- <value>0x00FF3366</value>
- </prop>
- </node>
- <node oor:name="TextBoxBoundContent" oor:op="replace">
- <prop oor:name="Color">
- <value>0x00808080</value>
- </prop>
- <prop oor:name="DefaultColor">
- <value>0x00808080</value>
- </prop>
- </node>
- </node>
- </node>
- </node>
- </node>
- </node>
- <node oor:name="EntryNames">
- <node oor:name="SunReportBuilder" oor:op="replace">
- <prop oor:name="DisplayName">
- <value xml:lang="en-US">Sun Report Builder</value>
- </prop>
- <node oor:name="Entries">
- <node oor:name="ReportHeader" oor:op="replace">
- <prop oor:name="DisplayName">
- <value xml:lang="en-US">Report Header</value>
- </prop>
- </node>
- <node oor:name="ReportFooter" oor:op="replace">
- <prop oor:name="DisplayName">
- <value xml:lang="en-US">Report Footer</value>
- </prop>
- </node>
- <node oor:name="PageHeader" oor:op="replace">
- <prop oor:name="DisplayName">
- <value xml:lang="en-US">Page Header</value>
- </prop>
- </node>
- <node oor:name="PageFooter" oor:op="replace">
- <prop oor:name="DisplayName">
- <value xml:lang="en-US">Page Footer</value>
- </prop>
- </node>
- <node oor:name="GroupHeader" oor:op="replace">
- <prop oor:name="DisplayName">
- <value xml:lang="en-US">Group Header</value>
- </prop>
- </node>
- <node oor:name="GroupFooter" oor:op="replace">
- <prop oor:name="DisplayName">
- <value xml:lang="en-US">Group Footer</value>
- </prop>
- </node>
- <node oor:name="ColumnHeader" oor:op="replace">
- <prop oor:name="DisplayName">
- <value xml:lang="en-US">Column Header</value>
- </prop>
- </node>
- <node oor:name="ColumnFooter" oor:op="replace">
- <prop oor:name="DisplayName">
- <value xml:lang="en-US">Column Footer</value>
- </prop>
- </node>
- <node oor:name="Detail" oor:op="replace">
- <prop oor:name="DisplayName">
- <value xml:lang="en-US">Detail</value>
- </prop>
- </node>
- <node oor:name="OverlappedControl" oor:op="replace">
- <prop oor:name="DisplayName">
- <value xml:lang="en-US">Overlapped Control</value>
- </prop>
- </node>
- <node oor:name="TextBoxBoundContent" oor:op="replace">
- <prop oor:name="DisplayName">
- <value xml:lang="en-US">Text Box Bound Content</value>
- </prop>
- </node>
- </node>
- </node>
- </node>
-</oor:component-data>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--***********************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************ -->
+<oor:component-data oor:name="ExtendedColorScheme" oor:package="org.openoffice.Office" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <node oor:name="ExtendedColorScheme">
+ <prop oor:name="CurrentColorScheme">
+ <value>default</value>
+ </prop>
+ <node oor:name="ColorSchemes">
+ <node oor:name="default" oor:op="replace">
+ <node oor:name="SunReportBuilder" oor:op="replace">
+ <node oor:name="Entries">
+ <node oor:name="ReportHeader" oor:op="replace">
+ <prop oor:name="Color">
+ <value>8364108</value> <!-- 0x007Fa04C -->
+ </prop>
+ <prop oor:name="DefaultColor">
+ <value>8364108</value> <!-- 0x007Fa04C -->
+ </prop>
+ </node>
+ <node oor:name="ReportFooter" oor:op="replace">
+ <prop oor:name="Color">
+ <value>8364108</value> <!-- 0x007Fa04C -->
+ </prop>
+ <prop oor:name="DefaultColor">
+ <value>8364108</value> <!-- 0x007Fa04C -->
+ </prop>
+ </node>
+ <node oor:name="PageHeader" oor:op="replace">
+ <prop oor:name="Color">
+ <value>15778136</value> <!-- 0x00F0C158 -->
+ </prop>
+ <prop oor:name="DefaultColor">
+ <value>15778136</value> <!-- 0x00F0C158 -->
+ </prop>
+ </node>
+ <node oor:name="PageFooter" oor:op="replace">
+ <prop oor:name="Color">
+ <value>15778136</value> <!-- 0x00F0C158 -->
+ </prop>
+ <prop oor:name="DefaultColor">
+ <value>15778136</value> <!-- 0x00F0C158 -->
+ </prop>
+ </node>
+ <node oor:name="GroupHeader" oor:op="replace">
+ <prop oor:name="Color">
+ <value>11190738</value> <!-- 0x00AAC1D2 -->
+ </prop>
+ <prop oor:name="DefaultColor">
+ <value>11190738</value> <!-- 0x00AAC1D2 -->
+ </prop>
+ </node>
+ <node oor:name="GroupFooter" oor:op="replace">
+ <prop oor:name="Color">
+ <value>11190738</value> <!-- 0x00AAC1D2 -->
+ </prop>
+ <prop oor:name="DefaultColor">
+ <value>11190738</value> <!-- 0x00AAC1D2 -->
+ </prop>
+ </node>
+ <node oor:name="ColumnHeader" oor:op="replace">
+ <prop oor:name="Color">
+ <value>11190738</value> <!-- 0x00AAC1D2 -->
+ </prop>
+ <prop oor:name="DefaultColor">
+ <value>11190738</value> <!-- 0x00AAC1D2 -->
+ </prop>
+ </node>
+ <node oor:name="ColumnFooter" oor:op="replace">
+ <prop oor:name="Color">
+ <value>11190738</value> <!-- 0x00AAC1D2 -->
+ </prop>
+ <prop oor:name="DefaultColor">
+ <value>11190738</value> <!-- 0x00AAC1D2 -->
+ </prop>
+ </node>
+ <node oor:name="Detail" oor:op="replace">
+ <prop oor:name="Color">
+ <value>15844514</value> <!-- 0x00F1C4A2 -->
+ </prop>
+ <prop oor:name="DefaultColor">
+ <value>15844514</value> <!-- 0x00F1C4A2 -->
+ </prop>
+ </node>
+ <node oor:name="OverlappedControl" oor:op="replace">
+ <prop oor:name="Color">
+ <value>16724838</value> <!-- 0x00FF3366 -->
+ </prop>
+ <prop oor:name="DefaultColor">
+ <value>16724838</value> <!-- 0x00FF3366 -->
+ </prop>
+ </node>
+ <node oor:name="TextBoxBoundContent" oor:op="replace">
+ <prop oor:name="Color">
+ <value>8421504</value> <!-- 0x00808080 -->
+ </prop>
+ <prop oor:name="DefaultColor">
+ <value>8421504</value> <!-- 0x00808080 -->
+ </prop>
+ </node>
+ </node>
+ </node>
+ </node>
+ </node>
+ </node>
+ <node oor:name="EntryNames">
+ <node oor:name="SunReportBuilder" oor:op="replace">
+ <prop oor:name="DisplayName">
+ <value xml:lang="en-US">Sun Report Builder</value>
+ </prop>
+ <node oor:name="Entries">
+ <node oor:name="ReportHeader" oor:op="replace">
+ <prop oor:name="DisplayName">
+ <value xml:lang="en-US">Report Header</value>
+ </prop>
+ </node>
+ <node oor:name="ReportFooter" oor:op="replace">
+ <prop oor:name="DisplayName">
+ <value xml:lang="en-US">Report Footer</value>
+ </prop>
+ </node>
+ <node oor:name="PageHeader" oor:op="replace">
+ <prop oor:name="DisplayName">
+ <value xml:lang="en-US">Page Header</value>
+ </prop>
+ </node>
+ <node oor:name="PageFooter" oor:op="replace">
+ <prop oor:name="DisplayName">
+ <value xml:lang="en-US">Page Footer</value>
+ </prop>
+ </node>
+ <node oor:name="GroupHeader" oor:op="replace">
+ <prop oor:name="DisplayName">
+ <value xml:lang="en-US">Group Header</value>
+ </prop>
+ </node>
+ <node oor:name="GroupFooter" oor:op="replace">
+ <prop oor:name="DisplayName">
+ <value xml:lang="en-US">Group Footer</value>
+ </prop>
+ </node>
+ <node oor:name="ColumnHeader" oor:op="replace">
+ <prop oor:name="DisplayName">
+ <value xml:lang="en-US">Column Header</value>
+ </prop>
+ </node>
+ <node oor:name="ColumnFooter" oor:op="replace">
+ <prop oor:name="DisplayName">
+ <value xml:lang="en-US">Column Footer</value>
+ </prop>
+ </node>
+ <node oor:name="Detail" oor:op="replace">
+ <prop oor:name="DisplayName">
+ <value xml:lang="en-US">Detail</value>
+ </prop>
+ </node>
+ <node oor:name="OverlappedControl" oor:op="replace">
+ <prop oor:name="DisplayName">
+ <value xml:lang="en-US">Overlapped Control</value>
+ </prop>
+ </node>
+ <node oor:name="TextBoxBoundContent" oor:op="replace">
+ <prop oor:name="DisplayName">
+ <value xml:lang="en-US">Text Box Bound Content</value>
+ </prop>
+ </node>
+ </node>
+ </node>
+ </node>
+</oor:component-data>
+
diff --git a/reportbuilder/registry/data/org/openoffice/Office/Paths.xcu b/reportbuilder/registry/data/org/openoffice/Office/Paths.xcu
index 906046fe4955..cba53df0ffce 100644
--- a/reportbuilder/registry/data/org/openoffice/Office/Paths.xcu
+++ b/reportbuilder/registry/data/org/openoffice/Office/Paths.xcu
@@ -3,14 +3,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: Paths.xcu,v $
- *
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/registry/data/org/openoffice/Office/ReportDesign.xcu b/reportbuilder/registry/data/org/openoffice/Office/ReportDesign.xcu
index 6b9d770b6cb6..0a9c957a52bb 100644
--- a/reportbuilder/registry/data/org/openoffice/Office/ReportDesign.xcu
+++ b/reportbuilder/registry/data/org/openoffice/Office/ReportDesign.xcu
@@ -3,13 +3,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: ReportDesign.xcu,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/registry/data/org/openoffice/Office/UI/Controller.xcu b/reportbuilder/registry/data/org/openoffice/Office/UI/Controller.xcu
index e09a8137f848..c45a2e27a1bb 100644
--- a/reportbuilder/registry/data/org/openoffice/Office/UI/Controller.xcu
+++ b/reportbuilder/registry/data/org/openoffice/Office/UI/Controller.xcu
@@ -3,13 +3,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: Controller.xcu,v $
- * $Revision: 1.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/registry/data/org/openoffice/Office/UI/DbReportWindowState.xcu b/reportbuilder/registry/data/org/openoffice/Office/UI/DbReportWindowState.xcu
index 7dba5df7901e..229502286ccb 100644
--- a/reportbuilder/registry/data/org/openoffice/Office/UI/DbReportWindowState.xcu
+++ b/reportbuilder/registry/data/org/openoffice/Office/UI/DbReportWindowState.xcu
@@ -1,157 +1,154 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--***********************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: DbReportWindowState.xcu,v $
- * $Revision: 1.2 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************ -->
-<oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:name="DbReportWindowState" oor:package="org.openoffice.Office.UI">
- <node oor:name="UIElements">
- <node oor:name="States">
- <node oor:name="private:resource/toolbar/toolbar" oor:op="replace">
- <prop oor:name="DockPos" oor:type="xs:string">
- <value>0,1</value>
- </prop>
- <prop oor:name="Docked" oor:type="xs:boolean">
- <value>true</value>
- </prop>
- <prop oor:name="DockingArea" oor:type="xs:int">
- <value>0</value>
- </prop>
- <prop oor:name="Style" oor:type="xs:int">
- <value>0</value>
- </prop>
- <prop oor:name="UIName" oor:type="xs:string">
- <value xml:lang="en-US">Standard</value>
- </prop>
- <prop oor:name="Visible" oor:type="xs:boolean">
- <value>true</value>
- </prop>
- </node>
- <node oor:name="private:resource/toolbar/Formatting" oor:op="replace">
- <prop oor:name="DockPos" oor:type="xs:string">
- <value>0,1</value>
- </prop>
- <prop oor:name="Docked" oor:type="xs:boolean">
- <value>true</value>
- </prop>
- <prop oor:name="DockingArea" oor:type="xs:int">
- <value>0</value>
- </prop>
- <prop oor:name="UIName" oor:type="xs:string">
- <value xml:lang="en-US">Formatting</value>
- </prop>
- <prop oor:name="Visible" oor:type="xs:boolean">
- <value>true</value>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--***********************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************ -->
+<oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:name="DbReportWindowState" oor:package="org.openoffice.Office.UI">
+ <node oor:name="UIElements">
+ <node oor:name="States">
+ <node oor:name="private:resource/toolbar/toolbar" oor:op="replace">
+ <prop oor:name="DockPos" oor:type="xs:string">
+ <value>0,1</value>
+ </prop>
+ <prop oor:name="Docked" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
+ <prop oor:name="DockingArea" oor:type="xs:int">
+ <value>0</value>
+ </prop>
+ <prop oor:name="Style" oor:type="xs:int">
+ <value>0</value>
+ </prop>
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">Standard</value>
+ </prop>
+ <prop oor:name="Visible" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
+ </node>
+ <node oor:name="private:resource/toolbar/Formatting" oor:op="replace">
+ <prop oor:name="DockPos" oor:type="xs:string">
+ <value>0,1</value>
+ </prop>
+ <prop oor:name="Docked" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
+ <prop oor:name="DockingArea" oor:type="xs:int">
+ <value>0</value>
+ </prop>
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">Formatting</value>
+ </prop>
+ <prop oor:name="Visible" oor:type="xs:boolean">
+ <value>true</value>
</prop>
- </node>
- <node oor:name="private:resource/toolbar/reportcontrols" oor:op="replace">
- <prop oor:name="UIName" oor:type="xs:string">
- <value xml:lang="en-US">Report Controls</value>
- </prop>
- <prop oor:name="DockPos" oor:type="xs:string">
- <value>0,2</value>
- </prop>
- <prop oor:name="Docked" oor:type="xs:boolean">
- <value>true</value>
- </prop>
- <prop oor:name="Visible" oor:type="xs:boolean">
- <value>true</value>
- </prop>
- </node>
- <node oor:name="private:resource/toolbar/drawbar" oor:op="replace">
- <prop oor:name="UIName" oor:type="xs:string">
- <value xml:lang="en-US">Drawing objects</value>
- </prop>
- <prop oor:name="DockPos" oor:type="xs:string">
- <value>297,2</value>
- </prop>
- <prop oor:name="Docked" oor:type="xs:boolean">
- <value>true</value>
- </prop>
- <prop oor:name="Visible" oor:type="xs:boolean">
- <value>false</value>
- </prop>
- </node>
- <node oor:name="private:resource/toolbar/alignmentbar" oor:op="replace">
- <prop oor:name="UIName" oor:type="xs:string">
- <value xml:lang="en-US">Align</value>
- </prop>
- <prop oor:name="DockPos" oor:type="xs:string">
- <value>489,2</value>
- </prop>
- <prop oor:name="Docked" oor:type="xs:boolean">
- <value>true</value>
- </prop>
- <prop oor:name="Visible" oor:type="xs:boolean">
- <value>true</value>
- </prop>
- </node>
- <node oor:name="private:resource/toolbar/sectionalignmentbar" oor:op="replace">
- <prop oor:name="UIName" oor:type="xs:string">
- <value xml:lang="en-US">Align at Section</value>
- </prop>
- <prop oor:name="DockPos" oor:type="xs:string">
- <value>0,2</value>
- </prop>
- <prop oor:name="Docked" oor:type="xs:boolean">
- <value>true</value>
- </prop>
- <prop oor:name="Visible" oor:type="xs:boolean">
- <value>true</value>
- </prop>
- </node>
- <node oor:name="private:resource/toolbar/sectionshrinkbar" oor:op="replace">
- <prop oor:name="UIName" oor:type="xs:string">
- <value xml:lang="en-US">Shrink at Section</value>
- </prop>
- <prop oor:name="DockPos" oor:type="xs:string">
- <value>0,2</value>
- </prop>
- <prop oor:name="Docked" oor:type="xs:boolean">
- <value>true</value>
- </prop>
- <prop oor:name="Visible" oor:type="xs:boolean">
- <value>true</value>
- </prop>
- </node>
- <node oor:name="private:resource/toolbar/resizebar" oor:op="replace">
- <prop oor:name="UIName" oor:type="xs:string">
- <value xml:lang="en-US">Object Resizing</value>
- </prop>
- <prop oor:name="DockPos" oor:type="xs:string">
- <value>670,2</value>
- </prop>
- <prop oor:name="Docked" oor:type="xs:boolean">
- <value>true</value>
- </prop>
- <prop oor:name="Visible" oor:type="xs:boolean">
- <value>true</value>
- </prop>
- </node>
- </node>
- </node>
-</oor:component-data>
+ </node>
+ <node oor:name="private:resource/toolbar/reportcontrols" oor:op="replace">
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">Report Controls</value>
+ </prop>
+ <prop oor:name="DockPos" oor:type="xs:string">
+ <value>0,2</value>
+ </prop>
+ <prop oor:name="Docked" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
+ <prop oor:name="Visible" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
+ </node>
+ <node oor:name="private:resource/toolbar/drawbar" oor:op="replace">
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">Drawing objects</value>
+ </prop>
+ <prop oor:name="DockPos" oor:type="xs:string">
+ <value>297,2</value>
+ </prop>
+ <prop oor:name="Docked" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
+ <prop oor:name="Visible" oor:type="xs:boolean">
+ <value>false</value>
+ </prop>
+ </node>
+ <node oor:name="private:resource/toolbar/alignmentbar" oor:op="replace">
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">Align</value>
+ </prop>
+ <prop oor:name="DockPos" oor:type="xs:string">
+ <value>489,2</value>
+ </prop>
+ <prop oor:name="Docked" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
+ <prop oor:name="Visible" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
+ </node>
+ <node oor:name="private:resource/toolbar/sectionalignmentbar" oor:op="replace">
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">Align at Section</value>
+ </prop>
+ <prop oor:name="DockPos" oor:type="xs:string">
+ <value>0,2</value>
+ </prop>
+ <prop oor:name="Docked" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
+ <prop oor:name="Visible" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
+ </node>
+ <node oor:name="private:resource/toolbar/sectionshrinkbar" oor:op="replace">
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">Shrink at Section</value>
+ </prop>
+ <prop oor:name="DockPos" oor:type="xs:string">
+ <value>0,2</value>
+ </prop>
+ <prop oor:name="Docked" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
+ <prop oor:name="Visible" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
+ </node>
+ <node oor:name="private:resource/toolbar/resizebar" oor:op="replace">
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">Object Resizing</value>
+ </prop>
+ <prop oor:name="DockPos" oor:type="xs:string">
+ <value>670,2</value>
+ </prop>
+ <prop oor:name="Docked" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
+ <prop oor:name="Visible" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
+ </node>
+ </node>
+ </node>
+</oor:component-data>
diff --git a/reportbuilder/registry/data/org/openoffice/Office/UI/ReportCommands.xcu b/reportbuilder/registry/data/org/openoffice/Office/UI/ReportCommands.xcu
index 0f8f3eead344..ed78f4b13608 100644
--- a/reportbuilder/registry/data/org/openoffice/Office/UI/ReportCommands.xcu
+++ b/reportbuilder/registry/data/org/openoffice/Office/UI/ReportCommands.xcu
@@ -1,406 +1,403 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--***********************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: ReportCommands.xcu,v $
- * $Revision: 1.2.2.1 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************ -->
-<oor:component-data oor:name="ReportCommands" oor:package="org.openoffice.Office.UI" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <node oor:name="UserInterface">
- <node oor:name="Commands">
- <node oor:name=".uno:ReportHeaderFooter" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Report Header/Footer</value>
- </prop>
- </node>
- <node oor:name=".uno:PageHeaderFooter" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Page Header/Footer</value>
- </prop>
- </node>
- <node oor:name=".uno:ShowRuler" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">~Ruler</value>
- </prop>
- </node>
- <node oor:name=".uno:DbSortingAndGrouping" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">~Sorting and Grouping</value>
- </prop>
- <prop oor:name="Properties" oor:type="xs:int">
- <value>1</value>
- </prop>
- </node>
- <node oor:name=".uno:AddField" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">~Add Field</value>
- </prop>
- <prop oor:name="Properties" oor:type="xs:int">
- <value>1</value>
- </prop>
- </node>
- <node oor:name=".uno:ConditionalFormatting" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">~Conditional Formatting...</value>
- </prop>
- </node>
- <node oor:name=".uno:PageDialog" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Page Settings</value>
- </prop>
- <prop oor:name="ContextLabel" oor:type="xs:string">
- <value xml:lang="en-US">~Page...</value>
- </prop>
- </node>
- <node oor:name=".uno:ResetAttributes" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">~Default Formatting</value>
- </prop>
- </node>
- <node oor:name=".uno:InsertPageNumberField" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">~Page Numbers...</value>
- </prop>
- </node>
- <node oor:name=".uno:InsertDateTimeField" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">~Date and Time...</value>
- </prop>
- </node>
- <node oor:name=".uno:SelectReport" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">~Select Report</value>
- </prop>
- </node>
- <node oor:name=".uno:SubReportInNewWindow" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">~Subreport in New Window...</value>
- </prop>
- </node>
- <node oor:name=".uno:FontColor" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Font Color</value>
- </prop>
- <prop oor:name="Properties" oor:type="xs:int">
- <value>1</value>
- </prop>
- </node>
- <node oor:name=".uno:GridMenu" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Gr~id</value>
- </prop>
- </node>
- <node oor:name=".uno:ColumnHeaderFooter" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">~Column Header/Footer</value>
- </prop>
- </node>
- <node oor:name=".uno:PasteSpecial" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Paste ~Special...</value>
- </prop>
- </node>
- <node oor:name=".uno:ExecuteReport" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Execute Report...</value>
- </prop>
- <prop oor:name="Properties" oor:type="xs:int">
- <value>1</value>
- </prop>
- </node>
- <node oor:name=".uno:ImageControl" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Graphic...</value>
- </prop>
- </node>
- <node oor:name=".uno:TextDocument" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Text Document</value>
- </prop>
- </node>
- <node oor:name=".uno:Spreadsheet" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Spreadsheet Document</value>
- </prop>
- </node>
- <node oor:name=".uno:ReportNavigator" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Report Navigator</value>
- </prop>
- <prop oor:name="Properties" oor:type="xs:int">
- <value>1</value>
- </prop>
- </node>
- <node oor:name=".uno:SmallestWidth" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Fit to smallest width</value>
- </prop>
- <prop oor:name="Properties" oor:type="xs:int">
- <value>1</value>
- </prop>
- </node>
- <node oor:name=".uno:SmallestHeight" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Fit to smallest height</value>
- </prop>
- <prop oor:name="Properties" oor:type="xs:int">
- <value>1</value>
- </prop>
- </node>
- <node oor:name=".uno:GreatestWidth" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Fit to greatest width</value>
- </prop>
- <prop oor:name="Properties" oor:type="xs:int">
- <value>1</value>
- </prop>
- </node>
- <node oor:name=".uno:GreatestHeight" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Fit to greatest height</value>
- </prop>
- <prop oor:name="Properties" oor:type="xs:int">
- <value>1</value>
- </prop>
- </node>
- <node oor:name=".uno:ControlProperties" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Properties</value>
- </prop>
- <prop oor:name="Properties" oor:type="xs:int">
- <value>1</value>
- </prop>
- </node>
- <node oor:name=".uno:Distribution" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Distribution...</value>
- </prop>
- </node>
- <node oor:name=".uno:SelectAllInSection" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">~Select Objects in Section</value>
- </prop>
- </node>
- <node oor:name=".uno:SectionAlignLeft" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Left Align on Section</value>
- </prop>
- <prop oor:name="Properties" oor:type="xs:int">
- <value>1</value>
- </prop>
- </node>
- <node oor:name=".uno:SectionAlignRight" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Right Align on Section</value>
- </prop>
- <prop oor:name="Properties" oor:type="xs:int">
- <value>1</value>
- </prop>
- </node>
- <node oor:name=".uno:SectionAlignTop" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Top Align on Section</value>
- </prop>
- <prop oor:name="Properties" oor:type="xs:int">
- <value>1</value>
- </prop>
- </node>
- <node oor:name=".uno:SectionAlignBottom" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Bottom Align on Section</value>
- </prop>
- <prop oor:name="Properties" oor:type="xs:int">
- <value>1</value>
- </prop>
- </node>
- <node oor:name=".uno:SectionAlignCenter" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Centered on Section</value>
- </prop>
- </node>
- <node oor:name=".uno:SectionAlignMiddle" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Middle on Section</value>
- </prop>
- <prop oor:name="Properties" oor:type="xs:int">
- <value>1</value>
- </prop>
- </node>
- <node oor:name=".uno:SelectAllLabels" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Select all Labels</value>
- </prop>
- </node>
- <node oor:name=".uno:SelectAllEdits" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Select all Formatted Fields</value>
- </prop>
- </node>
-
- <!-- U will find corresponding icons in default_images/res/commandimagelist. -->
- <!-- The name has no .uno: prefix but lc_ or lch_ or sc_ or sch_ -->
-
- <node oor:name=".uno:EditShapeMenu" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Shape Arrange</value>
- </prop>
- </node>
-
- <node oor:name=".uno:EditControlMenu" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Control</value>
- </prop>
- </node>
-
- <!--
- <node oor:name=".uno:EditSectionMenu" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Section</value>
- </prop>
- </node>
--->
-
- <node oor:name=".uno:AlignmentMenu" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Alignment</value>
- </prop>
- </node>
-
- <node oor:name=".uno:ResizeMenu" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Resize</value>
- </prop>
- </node>
-
- <node oor:name=".uno:SectionAlignmentMenu" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Section alignment</value>
- </prop>
- </node>
-
- <node oor:name=".uno:ReportControlMenu" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Report Controls</value>
- </prop>
- </node>
-
- <node oor:name=".uno:ShapesMenu" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Shapes</value>
- </prop>
- </node>
-
- <node oor:name=".uno:BasicShapesMenu" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Basic Shapes</value>
- </prop>
- </node>
-
- <node oor:name=".uno:SymbolShapesMenu" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Symbol Shapes</value>
- </prop>
- </node>
-
- <node oor:name=".uno:ArrowShapesMenu" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Arrow Shapes</value>
- </prop>
- </node>
-
- <node oor:name=".uno:FlowChartShapesMenu" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">FlowChart Shapes</value>
- </prop>
- </node>
-
- <node oor:name=".uno:CalloutShapesMenu" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Callout Shapes</value>
- </prop>
- </node>
-
- <node oor:name=".uno:StarShapesMenu" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Star Shapes</value>
- </prop>
- </node>
-
- <node oor:name=".uno:SectionShrinkMenu" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Section</value>
- </prop>
- </node>
- <node oor:name=".uno:SectionShrink" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Shrink</value>
- </prop>
- <prop oor:name="Properties" oor:type="xs:int">
- <value>1</value>
- </prop>
- </node>
- <node oor:name=".uno:SectionShrinkTop" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Shrink from top</value>
- </prop>
- <prop oor:name="Properties" oor:type="xs:int">
- <value>1</value>
- </prop>
- </node>
- <node oor:name=".uno:SectionShrinkBottom" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Shrink from bottom</value>
- </prop>
- <prop oor:name="Properties" oor:type="xs:int">
- <value>1</value>
- </prop>
- </node>
-
- </node>
- <node oor:name="Popups">
- <node oor:name=".uno:ExportReportTo" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Report Output Format</value>
- </prop>
- </node>
- <node oor:name=".uno:SnapLinesMenu" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">~Guides</value>
- </prop>
- </node>
- <node oor:name=".uno:ObjectResize" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Object Resizing</value>
- </prop>
- </node>
- <node oor:name=".uno:ArrangeMenu" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">A~rrange</value>
- </prop>
- </node>
- </node>
- </node>
-</oor:component-data>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--***********************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************ -->
+<oor:component-data oor:name="ReportCommands" oor:package="org.openoffice.Office.UI" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <node oor:name="UserInterface">
+ <node oor:name="Commands">
+ <node oor:name=".uno:ReportHeaderFooter" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Report Header/Footer</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:PageHeaderFooter" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Page Header/Footer</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:ShowRuler" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">~Ruler</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:DbSortingAndGrouping" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">~Sorting and Grouping</value>
+ </prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>1</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:AddField" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">~Add Field</value>
+ </prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>1</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:ConditionalFormatting" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">~Conditional Formatting...</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:PageDialog" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Page Settings</value>
+ </prop>
+ <prop oor:name="ContextLabel" oor:type="xs:string">
+ <value xml:lang="en-US">~Page...</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:ResetAttributes" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">~Default Formatting</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:InsertPageNumberField" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">~Page Numbers...</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:InsertDateTimeField" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">~Date and Time...</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:SelectReport" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">~Select Report</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:SubReportInNewWindow" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">~Subreport in New Window...</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:FontColor" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Font Color</value>
+ </prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>1</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:GridMenu" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Gr~id</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:ColumnHeaderFooter" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">~Column Header/Footer</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:PasteSpecial" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Paste ~Special...</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:ExecuteReport" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Execute Report...</value>
+ </prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>1</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:ImageControl" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Graphic...</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:TextDocument" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Text Document</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:Spreadsheet" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Spreadsheet Document</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:ReportNavigator" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Report Navigator</value>
+ </prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>1</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:SmallestWidth" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Fit to smallest width</value>
+ </prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>1</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:SmallestHeight" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Fit to smallest height</value>
+ </prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>1</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:GreatestWidth" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Fit to greatest width</value>
+ </prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>1</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:GreatestHeight" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Fit to greatest height</value>
+ </prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>1</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:ControlProperties" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Properties</value>
+ </prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>1</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:Distribution" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Distribution...</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:SelectAllInSection" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">~Select Objects in Section</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:SectionAlignLeft" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Left Align on Section</value>
+ </prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>1</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:SectionAlignRight" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Right Align on Section</value>
+ </prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>1</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:SectionAlignTop" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Top Align on Section</value>
+ </prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>1</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:SectionAlignBottom" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Bottom Align on Section</value>
+ </prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>1</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:SectionAlignCenter" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Centered on Section</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:SectionAlignMiddle" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Middle on Section</value>
+ </prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>1</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:SelectAllLabels" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Select all Labels</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:SelectAllEdits" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Select all Formatted Fields</value>
+ </prop>
+ </node>
+
+ <!-- U will find corresponding icons in default_images/res/commandimagelist. -->
+ <!-- The name has no .uno: prefix but lc_ or lch_ or sc_ or sch_ -->
+
+ <node oor:name=".uno:EditShapeMenu" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Shape Arrange</value>
+ </prop>
+ </node>
+
+ <node oor:name=".uno:EditControlMenu" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Control</value>
+ </prop>
+ </node>
+
+ <!--
+ <node oor:name=".uno:EditSectionMenu" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Section</value>
+ </prop>
+ </node>
+-->
+
+ <node oor:name=".uno:AlignmentMenu" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Alignment</value>
+ </prop>
+ </node>
+
+ <node oor:name=".uno:ResizeMenu" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Resize</value>
+ </prop>
+ </node>
+
+ <node oor:name=".uno:SectionAlignmentMenu" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Section alignment</value>
+ </prop>
+ </node>
+
+ <node oor:name=".uno:ReportControlMenu" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Report Controls</value>
+ </prop>
+ </node>
+
+ <node oor:name=".uno:ShapesMenu" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Shapes</value>
+ </prop>
+ </node>
+
+ <node oor:name=".uno:BasicShapesMenu" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Basic Shapes</value>
+ </prop>
+ </node>
+
+ <node oor:name=".uno:SymbolShapesMenu" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Symbol Shapes</value>
+ </prop>
+ </node>
+
+ <node oor:name=".uno:ArrowShapesMenu" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Arrow Shapes</value>
+ </prop>
+ </node>
+
+ <node oor:name=".uno:FlowChartShapesMenu" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">FlowChart Shapes</value>
+ </prop>
+ </node>
+
+ <node oor:name=".uno:CalloutShapesMenu" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Callout Shapes</value>
+ </prop>
+ </node>
+
+ <node oor:name=".uno:StarShapesMenu" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Star Shapes</value>
+ </prop>
+ </node>
+
+ <node oor:name=".uno:SectionShrinkMenu" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Section</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:SectionShrink" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Shrink</value>
+ </prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>1</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:SectionShrinkTop" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Shrink from top</value>
+ </prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>1</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:SectionShrinkBottom" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Shrink from bottom</value>
+ </prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>1</value>
+ </prop>
+ </node>
+
+ </node>
+ <node oor:name="Popups">
+ <node oor:name=".uno:ExportReportTo" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Report Output Format</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:SnapLinesMenu" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">~Guides</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:ObjectResize" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Object Resizing</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:ArrangeMenu" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">A~rrange</value>
+ </prop>
+ </node>
+ </node>
+ </node>
+</oor:component-data>
diff --git a/reportbuilder/registry/data/org/openoffice/Office/UI/makefile.mk b/reportbuilder/registry/data/org/openoffice/Office/UI/makefile.mk
index ac56e29fcc36..8a9e8ec1d7e6 100644
--- a/reportbuilder/registry/data/org/openoffice/Office/UI/makefile.mk
+++ b/reportbuilder/registry/data/org/openoffice/Office/UI/makefile.mk
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.2 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/registry/data/org/openoffice/Office/makefile.mk b/reportbuilder/registry/data/org/openoffice/Office/makefile.mk
index c84efdbb5660..b6a12fa1fc0c 100644
--- a/reportbuilder/registry/data/org/openoffice/Office/makefile.mk
+++ b/reportbuilder/registry/data/org/openoffice/Office/makefile.mk
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.8.6.1 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/registry/data/org/openoffice/Setup.xcu b/reportbuilder/registry/data/org/openoffice/Setup.xcu
index f7112cc0735e..86913d0eb5b8 100644
--- a/reportbuilder/registry/data/org/openoffice/Setup.xcu
+++ b/reportbuilder/registry/data/org/openoffice/Setup.xcu
@@ -3,13 +3,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: Setup.xcu,v $
- * $Revision: 1.2.6.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/registry/data/org/openoffice/TypeDetection/Filter.xcu b/reportbuilder/registry/data/org/openoffice/TypeDetection/Filter.xcu
index 0c713f691283..3760b439fbc4 100644
--- a/reportbuilder/registry/data/org/openoffice/TypeDetection/Filter.xcu
+++ b/reportbuilder/registry/data/org/openoffice/TypeDetection/Filter.xcu
@@ -3,13 +3,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: Filter.xcu,v $
- * $Revision: 1.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/registry/data/org/openoffice/TypeDetection/Types.xcu b/reportbuilder/registry/data/org/openoffice/TypeDetection/Types.xcu
index d957ecc9c33b..c36b31fbe2aa 100644
--- a/reportbuilder/registry/data/org/openoffice/TypeDetection/Types.xcu
+++ b/reportbuilder/registry/data/org/openoffice/TypeDetection/Types.xcu
@@ -3,13 +3,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: Types.xcu,v $
- * $Revision: 1.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/registry/data/org/openoffice/TypeDetection/makefile.mk b/reportbuilder/registry/data/org/openoffice/TypeDetection/makefile.mk
index b604c0a68fbe..4b4cd2eae67c 100644
--- a/reportbuilder/registry/data/org/openoffice/TypeDetection/makefile.mk
+++ b/reportbuilder/registry/data/org/openoffice/TypeDetection/makefile.mk
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.2 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/registry/data/org/openoffice/makefile.mk b/reportbuilder/registry/data/org/openoffice/makefile.mk
index a3379e70e46b..c5da644bef65 100644
--- a/reportbuilder/registry/data/org/openoffice/makefile.mk
+++ b/reportbuilder/registry/data/org/openoffice/makefile.mk
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.2.6.1 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/registry/schema/org/openoffice/Office/ReportDesign.xcs b/reportbuilder/registry/schema/org/openoffice/Office/ReportDesign.xcs
index 24dc3f74780e..8311358f233c 100644
--- a/reportbuilder/registry/schema/org/openoffice/Office/ReportDesign.xcs
+++ b/reportbuilder/registry/schema/org/openoffice/Office/ReportDesign.xcs
@@ -3,13 +3,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: ReportDesign.xcs,v $
- * $Revision: 1.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/registry/schema/org/openoffice/Office/UI/DbReportWindowState.xcs b/reportbuilder/registry/schema/org/openoffice/Office/UI/DbReportWindowState.xcs
index e3773dffb3a7..2807eaa957b1 100644
--- a/reportbuilder/registry/schema/org/openoffice/Office/UI/DbReportWindowState.xcs
+++ b/reportbuilder/registry/schema/org/openoffice/Office/UI/DbReportWindowState.xcs
@@ -3,13 +3,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: DbReportWindowState.xcs,v $
- * $Revision: 1.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/registry/schema/org/openoffice/Office/UI/ReportCommands.xcs b/reportbuilder/registry/schema/org/openoffice/Office/UI/ReportCommands.xcs
index 833ca974feb7..e162eebd3f5f 100644
--- a/reportbuilder/registry/schema/org/openoffice/Office/UI/ReportCommands.xcs
+++ b/reportbuilder/registry/schema/org/openoffice/Office/UI/ReportCommands.xcs
@@ -3,13 +3,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: ReportCommands.xcs,v $
- * $Revision: 1.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/registry/schema/org/openoffice/Office/UI/makefile.mk b/reportbuilder/registry/schema/org/openoffice/Office/UI/makefile.mk
index 971d89cf5cb6..fcca28c000fc 100644
--- a/reportbuilder/registry/schema/org/openoffice/Office/UI/makefile.mk
+++ b/reportbuilder/registry/schema/org/openoffice/Office/UI/makefile.mk
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.2 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/registry/schema/org/openoffice/Office/makefile.mk b/reportbuilder/registry/schema/org/openoffice/Office/makefile.mk
index e221710e8359..81f01626bb8d 100644
--- a/reportbuilder/registry/schema/org/openoffice/Office/makefile.mk
+++ b/reportbuilder/registry/schema/org/openoffice/Office/makefile.mk
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.2 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/template/en-US/wizard/report/makefile.mk b/reportbuilder/template/en-US/wizard/report/makefile.mk
index 0044d1550d8a..0de25c33c8dd 100644
--- a/reportbuilder/template/en-US/wizard/report/makefile.mk
+++ b/reportbuilder/template/en-US/wizard/report/makefile.mk
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.3 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/template/makefile.mk b/reportbuilder/template/makefile.mk
index 2db1c2b5a38f..4c9782add419 100644
--- a/reportbuilder/template/makefile.mk
+++ b/reportbuilder/template/makefile.mk
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.2 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/template/registry/data/org/openoffice/Office/Paths.xcu b/reportbuilder/template/registry/data/org/openoffice/Office/Paths.xcu
index 93f4e9a79111..65ee5a1b4dbb 100644
--- a/reportbuilder/template/registry/data/org/openoffice/Office/Paths.xcu
+++ b/reportbuilder/template/registry/data/org/openoffice/Office/Paths.xcu
@@ -3,14 +3,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: Paths.xcu,v $
- *
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/template/registry/data/org/openoffice/Office/makefile.mk b/reportbuilder/template/registry/data/org/openoffice/Office/makefile.mk
index ae34fe45955e..e10c06b48f8e 100644
--- a/reportbuilder/template/registry/data/org/openoffice/Office/makefile.mk
+++ b/reportbuilder/template/registry/data/org/openoffice/Office/makefile.mk
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.2 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/template/wizard/report/makefile.mk b/reportbuilder/template/wizard/report/makefile.mk
index 3e9a6da02e53..ffe2f9f1db83 100644
--- a/reportbuilder/template/wizard/report/makefile.mk
+++ b/reportbuilder/template/wizard/report/makefile.mk
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.2 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/util/hidother.src b/reportbuilder/util/hidother.src
index 89b847314401..a06b9d89a4ec 100644
--- a/reportbuilder/util/hidother.src
+++ b/reportbuilder/util/hidother.src
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: hidother.src,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/util/makefile.mk b/reportbuilder/util/makefile.mk
index cd65b814abf9..f36b1f50406c 100644
--- a/reportbuilder/util/makefile.mk
+++ b/reportbuilder/util/makefile.mk
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.21.2.2 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/util/makefile.pmk b/reportbuilder/util/makefile.pmk
index 87409c959047..566132247f9f 100644
--- a/reportbuilder/util/makefile.pmk
+++ b/reportbuilder/util/makefile.pmk
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.pmk,v $
-#
-# $Revision: 1.6 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/reportbuilder/util/target.pmk b/reportbuilder/util/target.pmk
index 42cc9e453b97..dfe8b8124e5b 100644
--- a/reportbuilder/util/target.pmk
+++ b/reportbuilder/util/target.pmk
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: target.pmk,v $
-#
-# $Revision: 1.3 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/inc/makefile.mk b/sdext/inc/makefile.mk
index 199a1c0eee59..637bde83fa99 100644
--- a/sdext/inc/makefile.mk
+++ b/sdext/inc/makefile.mk
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.2 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/inc/pch/precompiled_sdext.cxx b/sdext/inc/pch/precompiled_sdext.cxx
index 481bc4b21d9e..b49fcac717ea 100644
--- a/sdext/inc/pch/precompiled_sdext.cxx
+++ b/sdext/inc/pch/precompiled_sdext.cxx
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: precompiled_sdext.cxx,v $
- * $Revision: 1.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/inc/pch/precompiled_sdext.hxx b/sdext/inc/pch/precompiled_sdext.hxx
index 25015f6d34c4..3220aa3f6e4c 100644
--- a/sdext/inc/pch/precompiled_sdext.hxx
+++ b/sdext/inc/pch/precompiled_sdext.hxx
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: precompiled_sdext.hxx,v $
- * $Revision: 1.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/minimizer/aboutdialog.cxx b/sdext/source/minimizer/aboutdialog.cxx
index 2f9e83cd3f6a..f495da9994ea 100644
--- a/sdext/source/minimizer/aboutdialog.cxx
+++ b/sdext/source/minimizer/aboutdialog.cxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: aboutdialog.cxx,v $
- *
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/minimizer/aboutdialog.hxx b/sdext/source/minimizer/aboutdialog.hxx
index 17b0deac59fd..3bc402fb2543 100644
--- a/sdext/source/minimizer/aboutdialog.hxx
+++ b/sdext/source/minimizer/aboutdialog.hxx
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: aboutdialog.hxx,v $
- * $Revision: 1.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/minimizer/configurationaccess.cxx b/sdext/source/minimizer/configurationaccess.cxx
index a902e2e7c486..07da054b7aa4 100644
--- a/sdext/source/minimizer/configurationaccess.cxx
+++ b/sdext/source/minimizer/configurationaccess.cxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: configurationaccess.cxx,v $
- *
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/minimizer/configurationaccess.hxx b/sdext/source/minimizer/configurationaccess.hxx
index 346b228b803e..5c9060250e17 100644
--- a/sdext/source/minimizer/configurationaccess.hxx
+++ b/sdext/source/minimizer/configurationaccess.hxx
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: configurationaccess.hxx,v $
- * $Revision: 1.3 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/minimizer/fileopendialog.cxx b/sdext/source/minimizer/fileopendialog.cxx
index 8135335a8221..832914e5c8ab 100644
--- a/sdext/source/minimizer/fileopendialog.cxx
+++ b/sdext/source/minimizer/fileopendialog.cxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: fileopendialog.cxx,v $
- *
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/minimizer/fileopendialog.hxx b/sdext/source/minimizer/fileopendialog.hxx
index afcfee1e49ac..af6b49f24f9d 100644
--- a/sdext/source/minimizer/fileopendialog.hxx
+++ b/sdext/source/minimizer/fileopendialog.hxx
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: fileopendialog.hxx,v $
- * $Revision: 1.3 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/minimizer/graphiccollector.cxx b/sdext/source/minimizer/graphiccollector.cxx
index 94c824a56951..74ed91cbd099 100644
--- a/sdext/source/minimizer/graphiccollector.cxx
+++ b/sdext/source/minimizer/graphiccollector.cxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: graphiccollector.cxx,v $
- *
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/minimizer/graphiccollector.hxx b/sdext/source/minimizer/graphiccollector.hxx
index 4e6b736b9872..cf2c35e3ae92 100644
--- a/sdext/source/minimizer/graphiccollector.hxx
+++ b/sdext/source/minimizer/graphiccollector.hxx
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: graphiccollector.hxx,v $
- * $Revision: 1.3 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/minimizer/impoptimizer.cxx b/sdext/source/minimizer/impoptimizer.cxx
index a72867bda5f8..298c12e6b958 100644
--- a/sdext/source/minimizer/impoptimizer.cxx
+++ b/sdext/source/minimizer/impoptimizer.cxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: impoptimizer.cxx,v $
- *
- * $Revision: 1.13 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/minimizer/impoptimizer.hxx b/sdext/source/minimizer/impoptimizer.hxx
index 827ff954a227..9dacb8b1f2cc 100644
--- a/sdext/source/minimizer/impoptimizer.hxx
+++ b/sdext/source/minimizer/impoptimizer.hxx
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: impoptimizer.hxx,v $
- * $Revision: 1.3 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/minimizer/informationdialog.cxx b/sdext/source/minimizer/informationdialog.cxx
index b3b0e21ac13e..3c4dbf69895d 100644
--- a/sdext/source/minimizer/informationdialog.cxx
+++ b/sdext/source/minimizer/informationdialog.cxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: informationdialog.cxx,v $
- *
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/minimizer/informationdialog.hxx b/sdext/source/minimizer/informationdialog.hxx
index 713eed9426a9..30a43774efee 100644
--- a/sdext/source/minimizer/informationdialog.hxx
+++ b/sdext/source/minimizer/informationdialog.hxx
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: informationdialog.hxx,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/minimizer/makefile.mk b/sdext/source/minimizer/makefile.mk
index 89b1e16c955f..1140494e17de 100644
--- a/sdext/source/minimizer/makefile.mk
+++ b/sdext/source/minimizer/makefile.mk
@@ -1,15 +1,11 @@
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
+#
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.13 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/minimizer/minimizer.pmk b/sdext/source/minimizer/minimizer.pmk
index 00ebc166f735..f832f2dea2d5 100644
--- a/sdext/source/minimizer/minimizer.pmk
+++ b/sdext/source/minimizer/minimizer.pmk
@@ -1,15 +1,11 @@
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
+#
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: minimizer.pmk,v $
-#
-# $Revision: 1.3 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/minimizer/optimizationstats.cxx b/sdext/source/minimizer/optimizationstats.cxx
index 9358f8010bcf..3c5605345f6c 100644
--- a/sdext/source/minimizer/optimizationstats.cxx
+++ b/sdext/source/minimizer/optimizationstats.cxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: optimizationstats.cxx,v $
- *
- * $Revision: 1.3 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/minimizer/optimizationstats.hxx b/sdext/source/minimizer/optimizationstats.hxx
index 15603449c437..361200dde85c 100644
--- a/sdext/source/minimizer/optimizationstats.hxx
+++ b/sdext/source/minimizer/optimizationstats.hxx
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: optimizationstats.hxx,v $
- * $Revision: 1.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/minimizer/optimizerdialog.cxx b/sdext/source/minimizer/optimizerdialog.cxx
index c1bd8646ff89..6966e342da92 100644
--- a/sdext/source/minimizer/optimizerdialog.cxx
+++ b/sdext/source/minimizer/optimizerdialog.cxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: optimizerdialog.cxx,v $
- *
- * $Revision: 1.11 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/minimizer/optimizerdialog.hrc b/sdext/source/minimizer/optimizerdialog.hrc
index b6b4b6d33b5c..bc3fd49a277f 100644
--- a/sdext/source/minimizer/optimizerdialog.hrc
+++ b/sdext/source/minimizer/optimizerdialog.hrc
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: optimizerdialog.hrc,v $
- * $Revision: 1.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/minimizer/optimizerdialog.hxx b/sdext/source/minimizer/optimizerdialog.hxx
index 28a425121990..bb01a5f06c56 100644
--- a/sdext/source/minimizer/optimizerdialog.hxx
+++ b/sdext/source/minimizer/optimizerdialog.hxx
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: optimizerdialog.hxx,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/minimizer/optimizerdialogcontrols.cxx b/sdext/source/minimizer/optimizerdialogcontrols.cxx
index 7a39bf1c1dc6..8f5761b3be6a 100644
--- a/sdext/source/minimizer/optimizerdialogcontrols.cxx
+++ b/sdext/source/minimizer/optimizerdialogcontrols.cxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: optimizerdialogcontrols.cxx,v $
- *
- * $Revision: 1.14 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/minimizer/pagecollector.cxx b/sdext/source/minimizer/pagecollector.cxx
index e40da22afa0a..55f088e4be4f 100644
--- a/sdext/source/minimizer/pagecollector.cxx
+++ b/sdext/source/minimizer/pagecollector.cxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: pagecollector.cxx,v $
- *
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/minimizer/pagecollector.hxx b/sdext/source/minimizer/pagecollector.hxx
index a17111cca9ec..dcec45b824b5 100644
--- a/sdext/source/minimizer/pagecollector.hxx
+++ b/sdext/source/minimizer/pagecollector.hxx
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: pagecollector.hxx,v $
- * $Revision: 1.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/minimizer/pppoptimizer.cxx b/sdext/source/minimizer/pppoptimizer.cxx
index fc0b19997eb5..ea27c7457522 100644
--- a/sdext/source/minimizer/pppoptimizer.cxx
+++ b/sdext/source/minimizer/pppoptimizer.cxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: pppoptimizer.cxx,v $
- *
- * $Revision: 1.3 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/minimizer/pppoptimizer.hxx b/sdext/source/minimizer/pppoptimizer.hxx
index c02b5579082b..556c2f6f1313 100644
--- a/sdext/source/minimizer/pppoptimizer.hxx
+++ b/sdext/source/minimizer/pppoptimizer.hxx
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: pppoptimizer.hxx,v $
- * $Revision: 1.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/minimizer/pppoptimizerdialog.cxx b/sdext/source/minimizer/pppoptimizerdialog.cxx
index 802815681ca0..854d4d9cebcd 100644
--- a/sdext/source/minimizer/pppoptimizerdialog.cxx
+++ b/sdext/source/minimizer/pppoptimizerdialog.cxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: pppoptimizerdialog.cxx,v $
- *
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/minimizer/pppoptimizerdialog.hxx b/sdext/source/minimizer/pppoptimizerdialog.hxx
index 071b383fe4e8..9a071f6fb77b 100644
--- a/sdext/source/minimizer/pppoptimizerdialog.hxx
+++ b/sdext/source/minimizer/pppoptimizerdialog.hxx
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: pppoptimizerdialog.hxx,v $
- * $Revision: 1.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/minimizer/pppoptimizertoken.cxx b/sdext/source/minimizer/pppoptimizertoken.cxx
index d9fc6086cacd..b36078ea2af4 100644
--- a/sdext/source/minimizer/pppoptimizertoken.cxx
+++ b/sdext/source/minimizer/pppoptimizertoken.cxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: pppoptimizertoken.cxx,v $
- *
- * $Revision: 1.11 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/minimizer/pppoptimizertoken.hxx b/sdext/source/minimizer/pppoptimizertoken.hxx
index 81a93e236c4c..9f544dd1a5bf 100644
--- a/sdext/source/minimizer/pppoptimizertoken.hxx
+++ b/sdext/source/minimizer/pppoptimizertoken.hxx
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: pppoptimizertoken.hxx,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/minimizer/pppoptimizeruno.cxx b/sdext/source/minimizer/pppoptimizeruno.cxx
index 5a78ef428d65..ae5a10455451 100644
--- a/sdext/source/minimizer/pppoptimizeruno.cxx
+++ b/sdext/source/minimizer/pppoptimizeruno.cxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: pppoptimizeruno.cxx,v $
- *
- * $Revision: 1.3 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/minimizer/registry/data/org/openoffice/Office/UI/makefile.mk b/sdext/source/minimizer/registry/data/org/openoffice/Office/UI/makefile.mk
index 7ac99ef1ff59..c9c83d21f5c8 100644
--- a/sdext/source/minimizer/registry/data/org/openoffice/Office/UI/makefile.mk
+++ b/sdext/source/minimizer/registry/data/org/openoffice/Office/UI/makefile.mk
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.4 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/minimizer/registry/data/org/openoffice/Office/extension/makefile.mk b/sdext/source/minimizer/registry/data/org/openoffice/Office/extension/makefile.mk
index fff7baf7871a..aa0d275a969a 100644
--- a/sdext/source/minimizer/registry/data/org/openoffice/Office/extension/makefile.mk
+++ b/sdext/source/minimizer/registry/data/org/openoffice/Office/extension/makefile.mk
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.4 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/minimizer/registry/data/org/openoffice/Office/makefile.mk b/sdext/source/minimizer/registry/data/org/openoffice/Office/makefile.mk
index 9f59fc327900..659e888045d9 100644
--- a/sdext/source/minimizer/registry/data/org/openoffice/Office/makefile.mk
+++ b/sdext/source/minimizer/registry/data/org/openoffice/Office/makefile.mk
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.4 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/minimizer/unodialog.cxx b/sdext/source/minimizer/unodialog.cxx
index 00a697f9625d..b9f7b50ca91f 100644
--- a/sdext/source/minimizer/unodialog.cxx
+++ b/sdext/source/minimizer/unodialog.cxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: unodialog.cxx,v $
- *
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/minimizer/unodialog.hxx b/sdext/source/minimizer/unodialog.hxx
index 83ecde2180b7..58a3141b2627 100644
--- a/sdext/source/minimizer/unodialog.hxx
+++ b/sdext/source/minimizer/unodialog.hxx
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: unodialog.hxx,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/pdfimport/filterdet.cxx b/sdext/source/pdfimport/filterdet.cxx
index a85a6e8e8247..9dac0acf7e1e 100644
--- a/sdext/source/pdfimport/filterdet.cxx
+++ b/sdext/source/pdfimport/filterdet.cxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: filterdet.cxx,v $
- *
- * $Revision: 1.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/pdfimport/filterdet.hxx b/sdext/source/pdfimport/filterdet.hxx
index e9604d486634..5a35320c91c5 100644
--- a/sdext/source/pdfimport/filterdet.hxx
+++ b/sdext/source/pdfimport/filterdet.hxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: filterdet.hxx,v $
- *
- * $Revision: 1.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/pdfimport/inc/contentsink.hxx b/sdext/source/pdfimport/inc/contentsink.hxx
index fee855435409..cd0a7d037e35 100755
--- a/sdext/source/pdfimport/inc/contentsink.hxx
+++ b/sdext/source/pdfimport/inc/contentsink.hxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: contentsink.hxx,v $
- *
- * $Revision: 1.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/pdfimport/inc/odfemitter.hxx b/sdext/source/pdfimport/inc/odfemitter.hxx
index e36a4dc91ce9..3b93b13a3c82 100644
--- a/sdext/source/pdfimport/inc/odfemitter.hxx
+++ b/sdext/source/pdfimport/inc/odfemitter.hxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: odfemitter.hxx,v $
- *
- * $Revision: 1.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/pdfimport/inc/pdfihelper.hxx b/sdext/source/pdfimport/inc/pdfihelper.hxx
index 2614ff8b334c..bcc69b0e9eda 100755
--- a/sdext/source/pdfimport/inc/pdfihelper.hxx
+++ b/sdext/source/pdfimport/inc/pdfihelper.hxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: pdfihelper.hxx,v $
- *
- * $Revision: 1.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/pdfimport/inc/pdfparse.hxx b/sdext/source/pdfimport/inc/pdfparse.hxx
index d7d1ea1a4dbd..4d19d9140a09 100644
--- a/sdext/source/pdfimport/inc/pdfparse.hxx
+++ b/sdext/source/pdfimport/inc/pdfparse.hxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: pdfparse.hxx,v $
- *
- * $Revision: 1.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/pdfimport/inc/saxemitter.hxx b/sdext/source/pdfimport/inc/saxemitter.hxx
index ef892b47c973..54f5a0fbd554 100644
--- a/sdext/source/pdfimport/inc/saxemitter.hxx
+++ b/sdext/source/pdfimport/inc/saxemitter.hxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: saxemitter.hxx,v $
- *
- * $Revision: 1.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/pdfimport/inc/treevisitorfactory.hxx b/sdext/source/pdfimport/inc/treevisitorfactory.hxx
index 28566027b6f2..c573b63b6012 100644
--- a/sdext/source/pdfimport/inc/treevisitorfactory.hxx
+++ b/sdext/source/pdfimport/inc/treevisitorfactory.hxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: treevisitorfactory.hxx,v $
- *
- * $Revision: 1.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/pdfimport/inc/wrapper.hxx b/sdext/source/pdfimport/inc/wrapper.hxx
index c51f33a4edc4..1867bd094aa6 100755
--- a/sdext/source/pdfimport/inc/wrapper.hxx
+++ b/sdext/source/pdfimport/inc/wrapper.hxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: wrapper.hxx,v $
- *
- * $Revision: 1.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/pdfimport/inc/xmlemitter.hxx b/sdext/source/pdfimport/inc/xmlemitter.hxx
index 94e73212640c..8fa3b0f16868 100644
--- a/sdext/source/pdfimport/inc/xmlemitter.hxx
+++ b/sdext/source/pdfimport/inc/xmlemitter.hxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: xmlemitter.hxx,v $
- *
- * $Revision: 1.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/pdfimport/makefile.mk b/sdext/source/pdfimport/makefile.mk
index f8c6f71f0d3d..318ff6bfda1f 100644
--- a/sdext/source/pdfimport/makefile.mk
+++ b/sdext/source/pdfimport/makefile.mk
@@ -1,15 +1,11 @@
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
+#
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.2.4.1 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/pdfimport/misc/makefile.mk b/sdext/source/pdfimport/misc/makefile.mk
index 0c901273a781..27f71cca46e4 100644
--- a/sdext/source/pdfimport/misc/makefile.mk
+++ b/sdext/source/pdfimport/misc/makefile.mk
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.3 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/pdfimport/misc/pdfihelper.cxx b/sdext/source/pdfimport/misc/pdfihelper.cxx
index 17b4690ce0a1..f434395abbfd 100644
--- a/sdext/source/pdfimport/misc/pdfihelper.cxx
+++ b/sdext/source/pdfimport/misc/pdfihelper.cxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: pdfihelper.cxx,v $
- *
- * $Revision: 1.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/pdfimport/misc/pwdinteract.cxx b/sdext/source/pdfimport/misc/pwdinteract.cxx
index eb194b36c75b..a68c63054137 100644
--- a/sdext/source/pdfimport/misc/pwdinteract.cxx
+++ b/sdext/source/pdfimport/misc/pwdinteract.cxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: pwdinteract.cxx,v $
- *
- * $Revision: 1.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/pdfimport/odf/makefile.mk b/sdext/source/pdfimport/odf/makefile.mk
index 4c0ecf8662a6..0f0f5b15b611 100644
--- a/sdext/source/pdfimport/odf/makefile.mk
+++ b/sdext/source/pdfimport/odf/makefile.mk
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.3 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/pdfimport/odf/odfemitter.cxx b/sdext/source/pdfimport/odf/odfemitter.cxx
index 283e0f9500df..c834c6074714 100644
--- a/sdext/source/pdfimport/odf/odfemitter.cxx
+++ b/sdext/source/pdfimport/odf/odfemitter.cxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: odfemitter.cxx,v $
- *
- * $Revision: 1.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/pdfimport/pdfiadaptor.cxx b/sdext/source/pdfimport/pdfiadaptor.cxx
index 43f11c173d1c..08faf9a87f69 100644
--- a/sdext/source/pdfimport/pdfiadaptor.cxx
+++ b/sdext/source/pdfimport/pdfiadaptor.cxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: pdfiadaptor.cxx,v $
- *
- * $Revision: 1.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/pdfimport/pdfiadaptor.hxx b/sdext/source/pdfimport/pdfiadaptor.hxx
index 2ccbcc7b6a10..ba0495fe2134 100644
--- a/sdext/source/pdfimport/pdfiadaptor.hxx
+++ b/sdext/source/pdfimport/pdfiadaptor.hxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: pdfiadaptor.hxx,v $
- *
- * $Revision: 1.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/pdfimport/pdfisettings.pmk b/sdext/source/pdfimport/pdfisettings.pmk
index 8c31d1b93be4..b0f6ae4b5939 100644
--- a/sdext/source/pdfimport/pdfisettings.pmk
+++ b/sdext/source/pdfimport/pdfisettings.pmk
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: pdfisettings.pmk,v $
-#
-# $Revision: 1.2 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/pdfimport/pdfparse/makefile.mk b/sdext/source/pdfimport/pdfparse/makefile.mk
index 9cbb5f1b92fd..db549581e6f5 100644
--- a/sdext/source/pdfimport/pdfparse/makefile.mk
+++ b/sdext/source/pdfimport/pdfparse/makefile.mk
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.3 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/pdfimport/pdfparse/pdfentries.cxx b/sdext/source/pdfimport/pdfparse/pdfentries.cxx
index 9374e20f12bc..2d163118a5ec 100644
--- a/sdext/source/pdfimport/pdfparse/pdfentries.cxx
+++ b/sdext/source/pdfimport/pdfparse/pdfentries.cxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: pdfentries.cxx,v $
- *
- * $Revision: 1.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/pdfimport/pdfparse/pdfparse.cxx b/sdext/source/pdfimport/pdfparse/pdfparse.cxx
index 36734cfcbc84..b8d0aaca6b74 100644
--- a/sdext/source/pdfimport/pdfparse/pdfparse.cxx
+++ b/sdext/source/pdfimport/pdfparse/pdfparse.cxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: pdfparse.cxx,v $
- *
- * $Revision: 1.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/pdfimport/sax/emitcontext.cxx b/sdext/source/pdfimport/sax/emitcontext.cxx
index 17ff27e8dfc5..6ea6a977b20f 100644
--- a/sdext/source/pdfimport/sax/emitcontext.cxx
+++ b/sdext/source/pdfimport/sax/emitcontext.cxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: emitcontext.cxx,v $
- *
- * $Revision: 1.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/pdfimport/sax/emitcontext.hxx b/sdext/source/pdfimport/sax/emitcontext.hxx
index aa84d006deda..880aaa90d4e8 100644
--- a/sdext/source/pdfimport/sax/emitcontext.hxx
+++ b/sdext/source/pdfimport/sax/emitcontext.hxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: emitcontext.hxx,v $
- *
- * $Revision: 1.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/pdfimport/sax/makefile.mk b/sdext/source/pdfimport/sax/makefile.mk
index d813b01dfa92..39c3c9f1e4d2 100644
--- a/sdext/source/pdfimport/sax/makefile.mk
+++ b/sdext/source/pdfimport/sax/makefile.mk
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.3 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/pdfimport/sax/saxattrlist.cxx b/sdext/source/pdfimport/sax/saxattrlist.cxx
index df1d1dce256c..4b5cf9c7a4df 100644
--- a/sdext/source/pdfimport/sax/saxattrlist.cxx
+++ b/sdext/source/pdfimport/sax/saxattrlist.cxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: saxattrlist.cxx,v $
- *
- * $Revision: 1.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/pdfimport/sax/saxattrlist.hxx b/sdext/source/pdfimport/sax/saxattrlist.hxx
index 57b2427f8e12..0866467e2d1f 100644
--- a/sdext/source/pdfimport/sax/saxattrlist.hxx
+++ b/sdext/source/pdfimport/sax/saxattrlist.hxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: saxattrlist.hxx,v $
- *
- * $Revision: 1.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/pdfimport/services.cxx b/sdext/source/pdfimport/services.cxx
index 548961ace6f2..53d9cbc6c992 100644
--- a/sdext/source/pdfimport/services.cxx
+++ b/sdext/source/pdfimport/services.cxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: services.cxx,v $
- *
- * $Revision: 1.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/pdfimport/test/export.map b/sdext/source/pdfimport/test/export.map
index bfd13f454044..709047ae63e5 100755
--- a/sdext/source/pdfimport/test/export.map
+++ b/sdext/source/pdfimport/test/export.map
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: export.map,v $
-#
-# $Revision: 1.2 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/pdfimport/test/makefile.mk b/sdext/source/pdfimport/test/makefile.mk
index eea005178ae3..3d525d2e38b4 100755
--- a/sdext/source/pdfimport/test/makefile.mk
+++ b/sdext/source/pdfimport/test/makefile.mk
@@ -1,15 +1,11 @@
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
+#
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.2 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/pdfimport/test/outputwrap.hxx b/sdext/source/pdfimport/test/outputwrap.hxx
index 3b149ab449bc..8471398d29cf 100644
--- a/sdext/source/pdfimport/test/outputwrap.hxx
+++ b/sdext/source/pdfimport/test/outputwrap.hxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: outputwrap.hxx,v $
- *
- * $Revision: 1.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/pdfimport/test/pdf2xml.cxx b/sdext/source/pdfimport/test/pdf2xml.cxx
index 3912c442845b..c8605c162fa2 100644
--- a/sdext/source/pdfimport/test/pdf2xml.cxx
+++ b/sdext/source/pdfimport/test/pdf2xml.cxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: pdf2xml.cxx,v $
- *
- * $Revision: 1.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/pdfimport/test/pdfunzip.cxx b/sdext/source/pdfimport/test/pdfunzip.cxx
index c9e5ece0b3ac..bab28f572707 100644
--- a/sdext/source/pdfimport/test/pdfunzip.cxx
+++ b/sdext/source/pdfimport/test/pdfunzip.cxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: pdfunzip.cxx,v $
- *
- * $Revision: 1.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/pdfimport/test/testdocs/makefile.mk b/sdext/source/pdfimport/test/testdocs/makefile.mk
index a4ee31116cdf..41e869e74f68 100644
--- a/sdext/source/pdfimport/test/testdocs/makefile.mk
+++ b/sdext/source/pdfimport/test/testdocs/makefile.mk
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.2 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/pdfimport/test/tests.cxx b/sdext/source/pdfimport/test/tests.cxx
index 075116e3784a..99d2dc309c59 100755
--- a/sdext/source/pdfimport/test/tests.cxx
+++ b/sdext/source/pdfimport/test/tests.cxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: tests.cxx,v $
- *
- * $Revision: 1.2.6.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/pdfimport/tree/drawtreevisiting.cxx b/sdext/source/pdfimport/tree/drawtreevisiting.cxx
index 71928fd98fcf..664a19c7763d 100644
--- a/sdext/source/pdfimport/tree/drawtreevisiting.cxx
+++ b/sdext/source/pdfimport/tree/drawtreevisiting.cxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: drawtreevisiting.cxx,v $
- *
- * $Revision: 1.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/pdfimport/tree/drawtreevisiting.hxx b/sdext/source/pdfimport/tree/drawtreevisiting.hxx
index a9fdb22a48d6..b7b94371c6da 100644
--- a/sdext/source/pdfimport/tree/drawtreevisiting.hxx
+++ b/sdext/source/pdfimport/tree/drawtreevisiting.hxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: drawtreevisiting.hxx,v $
- *
- * $Revision: 1.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/pdfimport/tree/genericelements.cxx b/sdext/source/pdfimport/tree/genericelements.cxx
index 00fc2cd9636d..a89ea641012d 100644
--- a/sdext/source/pdfimport/tree/genericelements.cxx
+++ b/sdext/source/pdfimport/tree/genericelements.cxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: genericelements.cxx,v $
- *
- * $Revision: 1.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/pdfimport/tree/genericelements.hxx b/sdext/source/pdfimport/tree/genericelements.hxx
index 029032579d57..88293673ee3a 100644
--- a/sdext/source/pdfimport/tree/genericelements.hxx
+++ b/sdext/source/pdfimport/tree/genericelements.hxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: genericelements.hxx,v $
- *
- * $Revision: 1.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/pdfimport/tree/imagecontainer.cxx b/sdext/source/pdfimport/tree/imagecontainer.cxx
index 25433839c6b9..a4a8a5665997 100644
--- a/sdext/source/pdfimport/tree/imagecontainer.cxx
+++ b/sdext/source/pdfimport/tree/imagecontainer.cxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: imagecontainer.cxx,v $
- *
- * $Revision: 1.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/pdfimport/tree/imagecontainer.hxx b/sdext/source/pdfimport/tree/imagecontainer.hxx
index 530bfe64b37c..8453e7fc83f1 100644
--- a/sdext/source/pdfimport/tree/imagecontainer.hxx
+++ b/sdext/source/pdfimport/tree/imagecontainer.hxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: imagecontainer.hxx,v $
- *
- * $Revision: 1.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/pdfimport/tree/makefile.mk b/sdext/source/pdfimport/tree/makefile.mk
index 347bad8667b0..827833296f4a 100644
--- a/sdext/source/pdfimport/tree/makefile.mk
+++ b/sdext/source/pdfimport/tree/makefile.mk
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.3 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.cxx b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
index 997ede16f454..d132c8f74c31 100644
--- a/sdext/source/pdfimport/tree/pdfiprocessor.cxx
+++ b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: pdfiprocessor.cxx,v $
- *
- * $Revision: 1.3.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.hxx b/sdext/source/pdfimport/tree/pdfiprocessor.hxx
index 06f738ea61a9..6a9d4ab85a4d 100644
--- a/sdext/source/pdfimport/tree/pdfiprocessor.hxx
+++ b/sdext/source/pdfimport/tree/pdfiprocessor.hxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: pdfiprocessor.hxx,v $
- *
- * $Revision: 1.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/pdfimport/tree/style.cxx b/sdext/source/pdfimport/tree/style.cxx
index 7d7a29231544..471aa9878ff2 100644
--- a/sdext/source/pdfimport/tree/style.cxx
+++ b/sdext/source/pdfimport/tree/style.cxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: style.cxx,v $
- *
- * $Revision: 1.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/pdfimport/tree/style.hxx b/sdext/source/pdfimport/tree/style.hxx
index bdb9d4771816..bd5f1361564c 100644
--- a/sdext/source/pdfimport/tree/style.hxx
+++ b/sdext/source/pdfimport/tree/style.hxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: style.hxx,v $
- *
- * $Revision: 1.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/pdfimport/tree/treevisiting.hxx b/sdext/source/pdfimport/tree/treevisiting.hxx
index 0aba4cd547cb..261c8e70797d 100644
--- a/sdext/source/pdfimport/tree/treevisiting.hxx
+++ b/sdext/source/pdfimport/tree/treevisiting.hxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: treevisiting.hxx,v $
- *
- * $Revision: 1.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/pdfimport/tree/treevisitorfactory.cxx b/sdext/source/pdfimport/tree/treevisitorfactory.cxx
index a95dfea37d90..e8a44bbe661d 100644
--- a/sdext/source/pdfimport/tree/treevisitorfactory.cxx
+++ b/sdext/source/pdfimport/tree/treevisitorfactory.cxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: treevisitorfactory.cxx,v $
- *
- * $Revision: 1.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/pdfimport/tree/writertreevisiting.cxx b/sdext/source/pdfimport/tree/writertreevisiting.cxx
index b4d02ce00ceb..0a64d9d87d35 100644
--- a/sdext/source/pdfimport/tree/writertreevisiting.cxx
+++ b/sdext/source/pdfimport/tree/writertreevisiting.cxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: writertreevisiting.cxx,v $
- *
- * $Revision: 1.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/pdfimport/tree/writertreevisiting.hxx b/sdext/source/pdfimport/tree/writertreevisiting.hxx
index a02dcc6d6712..4c1efb44caec 100644
--- a/sdext/source/pdfimport/tree/writertreevisiting.hxx
+++ b/sdext/source/pdfimport/tree/writertreevisiting.hxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: writertreevisiting.hxx,v $
- *
- * $Revision: 1.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/pdfimport/wrapper/makefile.mk b/sdext/source/pdfimport/wrapper/makefile.mk
index ce02047986e5..743633c8b612 100755
--- a/sdext/source/pdfimport/wrapper/makefile.mk
+++ b/sdext/source/pdfimport/wrapper/makefile.mk
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.3 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/pdfimport/wrapper/wrapper.cxx b/sdext/source/pdfimport/wrapper/wrapper.cxx
index 9e23a061b760..abab9d783225 100755
--- a/sdext/source/pdfimport/wrapper/wrapper.cxx
+++ b/sdext/source/pdfimport/wrapper/wrapper.cxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: wrapper.cxx,v $
- *
- * $Revision: 1.2.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/pdfimport/xpdftest/makefile.mk b/sdext/source/pdfimport/xpdftest/makefile.mk
index 9748e3d3a516..9ebd9160fe38 100644
--- a/sdext/source/pdfimport/xpdftest/makefile.mk
+++ b/sdext/source/pdfimport/xpdftest/makefile.mk
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.1.2.2 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/pdfimport/xpdfwrapper/makefile.mk b/sdext/source/pdfimport/xpdfwrapper/makefile.mk
index f45840dd8d7c..0d74baf215fa 100644
--- a/sdext/source/pdfimport/xpdfwrapper/makefile.mk
+++ b/sdext/source/pdfimport/xpdfwrapper/makefile.mk
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.1.2.2 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
index 3c72a27e6d35..1fa9ff32b530 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
@@ -2,12 +2,6 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: pdfioutdev_gpl.cxx,v $
- *
- * $Revision: 1.1.2.1 $
- *
- * last change: $Author: cmc $ $Date: 2008/08/25 16:17:55 $
- *
* The Contents of this file are made available subject to
* the terms of GNU General Public License Version 2.
*
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
index 43a1038f02d6..dfb578d06862 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
@@ -2,12 +2,6 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: pdfioutdev_gpl.hxx,v $
- *
- * $Revision: 1.1.2.1 $
- *
- * last change: $Author: cmc $ $Date: 2008/08/25 16:17:55 $
- *
* The Contents of this file are made available subject to
* the terms of GNU General Public License Version 2.
*
diff --git a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
index fadf71e2c20e..6011b6989576 100644
--- a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
@@ -2,12 +2,6 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: wrapper_gpl.cxx,v $
- *
- * $Revision: 1.1.2.1 $
- *
- * last change: $Author: cmc $ $Date: 2008/08/25 16:17:55 $
- *
* The Contents of this file are made available subject to
* the terms of GNU General Public License Version 2.
*
diff --git a/sdext/source/presenter/PresenterAccessibility.cxx b/sdext/source/presenter/PresenterAccessibility.cxx
index 4480c05b4cbf..614ab9e433a3 100755
--- a/sdext/source/presenter/PresenterAccessibility.cxx
+++ b/sdext/source/presenter/PresenterAccessibility.cxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PresenterPane.hxx,v $
- *
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/presenter/PresenterAccessibility.hxx b/sdext/source/presenter/PresenterAccessibility.hxx
index 28c86c749eed..04b4bc214650 100755
--- a/sdext/source/presenter/PresenterAccessibility.hxx
+++ b/sdext/source/presenter/PresenterAccessibility.hxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PresenterPane.hxx,v $
- *
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/presenter/PresenterAnimation.cxx b/sdext/source/presenter/PresenterAnimation.cxx
index 1e84c7b9b3c3..40b626ecec0a 100644
--- a/sdext/source/presenter/PresenterAnimation.cxx
+++ b/sdext/source/presenter/PresenterAnimation.cxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PresenterAnimation.cxx,v $
- *
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/presenter/PresenterAnimation.hxx b/sdext/source/presenter/PresenterAnimation.hxx
index fdd30a171d4d..a1148cd03737 100644
--- a/sdext/source/presenter/PresenterAnimation.hxx
+++ b/sdext/source/presenter/PresenterAnimation.hxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PresenterAnimation.hxx,v $
- *
- * $Revision: 1.3 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/presenter/PresenterAnimator.cxx b/sdext/source/presenter/PresenterAnimator.cxx
index c730edaa57d6..572b2b4ff2ec 100644
--- a/sdext/source/presenter/PresenterAnimator.cxx
+++ b/sdext/source/presenter/PresenterAnimator.cxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PresenterAnimator.cxx,v $
- *
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/presenter/PresenterAnimator.hxx b/sdext/source/presenter/PresenterAnimator.hxx
index 71656f707de3..0c0efadb22f7 100644
--- a/sdext/source/presenter/PresenterAnimator.hxx
+++ b/sdext/source/presenter/PresenterAnimator.hxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PresenterAnimator.hxx,v $
- *
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/presenter/PresenterBitmapContainer.cxx b/sdext/source/presenter/PresenterBitmapContainer.cxx
index 76b82b3797cf..024bb6ffb5d0 100644
--- a/sdext/source/presenter/PresenterBitmapContainer.cxx
+++ b/sdext/source/presenter/PresenterBitmapContainer.cxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PresenterBitmapContainer.cxx,v $
- *
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/presenter/PresenterBitmapContainer.hxx b/sdext/source/presenter/PresenterBitmapContainer.hxx
index 0cd873957790..12811032e578 100644
--- a/sdext/source/presenter/PresenterBitmapContainer.hxx
+++ b/sdext/source/presenter/PresenterBitmapContainer.hxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PresenterBitmapContainer.hxx,v $
- *
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/presenter/PresenterButton.cxx b/sdext/source/presenter/PresenterButton.cxx
index 215cd48598db..2d75885b8a35 100644
--- a/sdext/source/presenter/PresenterButton.cxx
+++ b/sdext/source/presenter/PresenterButton.cxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PresenterButton.cxx,v $
- *
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/presenter/PresenterButton.hxx b/sdext/source/presenter/PresenterButton.hxx
index 72cc3923f1ac..bbd93864f100 100644
--- a/sdext/source/presenter/PresenterButton.hxx
+++ b/sdext/source/presenter/PresenterButton.hxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PresenterButton.hxx,v $
- *
- * $Revision: 1.3 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/presenter/PresenterCanvasHelper.cxx b/sdext/source/presenter/PresenterCanvasHelper.cxx
index 14103d088f4a..e9c72764fcc5 100644
--- a/sdext/source/presenter/PresenterCanvasHelper.cxx
+++ b/sdext/source/presenter/PresenterCanvasHelper.cxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PresenterCanvasHelper.cxx,v $
- *
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/presenter/PresenterCanvasHelper.hxx b/sdext/source/presenter/PresenterCanvasHelper.hxx
index f254b5c2d6a1..71d5bc40a023 100644
--- a/sdext/source/presenter/PresenterCanvasHelper.hxx
+++ b/sdext/source/presenter/PresenterCanvasHelper.hxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PresenterCanvasHelper.hxx,v $
- *
- * $Revision: 1.3 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/presenter/PresenterClock.cxx b/sdext/source/presenter/PresenterClock.cxx
index ded91201e09c..bccce731efb0 100644
--- a/sdext/source/presenter/PresenterClock.cxx
+++ b/sdext/source/presenter/PresenterClock.cxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PresenterClock.cxx,v $
- *
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/presenter/PresenterClock.hxx b/sdext/source/presenter/PresenterClock.hxx
index b0a55fae7ff9..810ae5941803 100644
--- a/sdext/source/presenter/PresenterClock.hxx
+++ b/sdext/source/presenter/PresenterClock.hxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PresenterClock.hxx,v $
- *
- * $Revision: 1.3 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/presenter/PresenterComponent.cxx b/sdext/source/presenter/PresenterComponent.cxx
index 2a6fb433f102..ea921c692a73 100644
--- a/sdext/source/presenter/PresenterComponent.cxx
+++ b/sdext/source/presenter/PresenterComponent.cxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PresenterComponent.cxx,v $
- *
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/presenter/PresenterComponent.hxx b/sdext/source/presenter/PresenterComponent.hxx
index 87758b2954dc..4ff1a173ad6b 100644
--- a/sdext/source/presenter/PresenterComponent.hxx
+++ b/sdext/source/presenter/PresenterComponent.hxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PresenterComponent.hxx,v $
- *
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/presenter/PresenterConfigurationAccess.cxx b/sdext/source/presenter/PresenterConfigurationAccess.cxx
index c3a1fed30f3a..fb1aca149d26 100644
--- a/sdext/source/presenter/PresenterConfigurationAccess.cxx
+++ b/sdext/source/presenter/PresenterConfigurationAccess.cxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PresenterConfigurationAccess.cxx,v $
- *
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/presenter/PresenterConfigurationAccess.hxx b/sdext/source/presenter/PresenterConfigurationAccess.hxx
index ffeb7a224c65..8657de24a015 100644
--- a/sdext/source/presenter/PresenterConfigurationAccess.hxx
+++ b/sdext/source/presenter/PresenterConfigurationAccess.hxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PresenterConfigurationAccess.hxx,v $
- *
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/presenter/PresenterController.cxx b/sdext/source/presenter/PresenterController.cxx
index 699df813bb9d..42208f670f56 100644
--- a/sdext/source/presenter/PresenterController.cxx
+++ b/sdext/source/presenter/PresenterController.cxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PresenterController.cxx,v $
- *
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/presenter/PresenterController.hxx b/sdext/source/presenter/PresenterController.hxx
index 114e28157443..c2f3a91a6018 100644
--- a/sdext/source/presenter/PresenterController.hxx
+++ b/sdext/source/presenter/PresenterController.hxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PresenterController.hxx,v $
- *
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/presenter/PresenterCurrentSlideObserver.cxx b/sdext/source/presenter/PresenterCurrentSlideObserver.cxx
index 604908ac3254..f516630a87a9 100644
--- a/sdext/source/presenter/PresenterCurrentSlideObserver.cxx
+++ b/sdext/source/presenter/PresenterCurrentSlideObserver.cxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PresenterCurrentSlideObserver.cxx,v $
- *
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/presenter/PresenterCurrentSlideObserver.hxx b/sdext/source/presenter/PresenterCurrentSlideObserver.hxx
index 7b6f231f0576..f224ba71f07c 100644
--- a/sdext/source/presenter/PresenterCurrentSlideObserver.hxx
+++ b/sdext/source/presenter/PresenterCurrentSlideObserver.hxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PresenterCurrentSlideObserver.hxx,v $
- *
- * $Revision: 1.3 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/presenter/PresenterExtensionIdentifier.txx b/sdext/source/presenter/PresenterExtensionIdentifier.txx
index 9d8590da57dc..aae3b82e687a 100644
--- a/sdext/source/presenter/PresenterExtensionIdentifier.txx
+++ b/sdext/source/presenter/PresenterExtensionIdentifier.txx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PresenterExtensionIdentifier.txx,v $
- *
- * $Revision: 1.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/presenter/PresenterFrameworkObserver.cxx b/sdext/source/presenter/PresenterFrameworkObserver.cxx
index 6dffa2d012ac..13c0cf2a72a0 100644
--- a/sdext/source/presenter/PresenterFrameworkObserver.cxx
+++ b/sdext/source/presenter/PresenterFrameworkObserver.cxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PresenterFrameworkObserver.cxx,v $
- *
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/presenter/PresenterFrameworkObserver.hxx b/sdext/source/presenter/PresenterFrameworkObserver.hxx
index a9aff60d9070..15b6463a6a86 100644
--- a/sdext/source/presenter/PresenterFrameworkObserver.hxx
+++ b/sdext/source/presenter/PresenterFrameworkObserver.hxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PresenterFrameworkObserver.hxx,v $
- *
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/presenter/PresenterGeometryHelper.cxx b/sdext/source/presenter/PresenterGeometryHelper.cxx
index 9e8aaaa86bb1..b613f8d0c1f5 100644
--- a/sdext/source/presenter/PresenterGeometryHelper.cxx
+++ b/sdext/source/presenter/PresenterGeometryHelper.cxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PresenterGeometryHelper.cxx,v $
- *
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/presenter/PresenterGeometryHelper.hxx b/sdext/source/presenter/PresenterGeometryHelper.hxx
index 1a0a53c2f5cd..b920b5da778b 100644
--- a/sdext/source/presenter/PresenterGeometryHelper.hxx
+++ b/sdext/source/presenter/PresenterGeometryHelper.hxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PresenterGeometryHelper.hxx,v $
- *
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/presenter/PresenterHelpView.cxx b/sdext/source/presenter/PresenterHelpView.cxx
index 9b545a0f42bd..0e08ad6e92ce 100644
--- a/sdext/source/presenter/PresenterHelpView.cxx
+++ b/sdext/source/presenter/PresenterHelpView.cxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PresenterHelpView.cxx,v $
- *
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/presenter/PresenterHelpView.hxx b/sdext/source/presenter/PresenterHelpView.hxx
index 03bcf31f06d4..8b25bf81b485 100644
--- a/sdext/source/presenter/PresenterHelpView.hxx
+++ b/sdext/source/presenter/PresenterHelpView.hxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PresenterHelpView.hxx,v $
- *
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/presenter/PresenterHelper.cxx b/sdext/source/presenter/PresenterHelper.cxx
index e012005e2e92..8f3b882abd4b 100644
--- a/sdext/source/presenter/PresenterHelper.cxx
+++ b/sdext/source/presenter/PresenterHelper.cxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PresenterHelper.cxx,v $
- *
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/presenter/PresenterHelper.hxx b/sdext/source/presenter/PresenterHelper.hxx
index 118087221bad..dcfbef0eecca 100644
--- a/sdext/source/presenter/PresenterHelper.hxx
+++ b/sdext/source/presenter/PresenterHelper.hxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PresenterHelper.hxx,v $
- *
- * $Revision: 1.3 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/presenter/PresenterNotesView.cxx b/sdext/source/presenter/PresenterNotesView.cxx
index 4a90b76247a1..10837aaaef64 100644
--- a/sdext/source/presenter/PresenterNotesView.cxx
+++ b/sdext/source/presenter/PresenterNotesView.cxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PresenterNotesView.cxx,v $
- *
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/presenter/PresenterNotesView.hxx b/sdext/source/presenter/PresenterNotesView.hxx
index 743770989b0d..9f37718f2956 100644
--- a/sdext/source/presenter/PresenterNotesView.hxx
+++ b/sdext/source/presenter/PresenterNotesView.hxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PresenterNotesView.hxx,v $
- *
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/presenter/PresenterPaintManager.cxx b/sdext/source/presenter/PresenterPaintManager.cxx
index 11bcb04cca57..433d52076526 100644
--- a/sdext/source/presenter/PresenterPaintManager.cxx
+++ b/sdext/source/presenter/PresenterPaintManager.cxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PresenterPaintManager.cxx,v $
- *
- * $Revision: 1.3 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/presenter/PresenterPaintManager.hxx b/sdext/source/presenter/PresenterPaintManager.hxx
index 97b1099cdf49..faabb53cc378 100644
--- a/sdext/source/presenter/PresenterPaintManager.hxx
+++ b/sdext/source/presenter/PresenterPaintManager.hxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PresenterPaintManager.hxx,v $
- *
- * $Revision: 1.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/presenter/PresenterPane.cxx b/sdext/source/presenter/PresenterPane.cxx
index 320878c32103..509fc4acacaa 100644
--- a/sdext/source/presenter/PresenterPane.cxx
+++ b/sdext/source/presenter/PresenterPane.cxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PresenterPane.cxx,v $
- *
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/presenter/PresenterPane.hxx b/sdext/source/presenter/PresenterPane.hxx
index 9b9bdbfeb8df..96471f68e5d6 100644
--- a/sdext/source/presenter/PresenterPane.hxx
+++ b/sdext/source/presenter/PresenterPane.hxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PresenterPane.hxx,v $
- *
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/presenter/PresenterPaneAnimator.cxx b/sdext/source/presenter/PresenterPaneAnimator.cxx
index 97978b21a6a0..a37b58e55c60 100644
--- a/sdext/source/presenter/PresenterPaneAnimator.cxx
+++ b/sdext/source/presenter/PresenterPaneAnimator.cxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PresenterPaneAnimator.cxx,v $
- *
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/presenter/PresenterPaneAnimator.hxx b/sdext/source/presenter/PresenterPaneAnimator.hxx
index 13eaa07338bc..9b04f94084b0 100644
--- a/sdext/source/presenter/PresenterPaneAnimator.hxx
+++ b/sdext/source/presenter/PresenterPaneAnimator.hxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PresenterPaneAnimator.hxx,v $
- *
- * $Revision: 1.3 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/presenter/PresenterPaneBase.cxx b/sdext/source/presenter/PresenterPaneBase.cxx
index dcf05cc79469..840342ad700d 100644
--- a/sdext/source/presenter/PresenterPaneBase.cxx
+++ b/sdext/source/presenter/PresenterPaneBase.cxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PresenterPaneBase.cxx,v $
- *
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/presenter/PresenterPaneBase.hxx b/sdext/source/presenter/PresenterPaneBase.hxx
index 5d205c326f0e..cbe9b2a41ea6 100644
--- a/sdext/source/presenter/PresenterPaneBase.hxx
+++ b/sdext/source/presenter/PresenterPaneBase.hxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PresenterPaneBase.hxx,v $
- *
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/presenter/PresenterPaneBorderManager.cxx b/sdext/source/presenter/PresenterPaneBorderManager.cxx
index 279af6def692..03860d18273d 100644
--- a/sdext/source/presenter/PresenterPaneBorderManager.cxx
+++ b/sdext/source/presenter/PresenterPaneBorderManager.cxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PresenterPaneBorderManager.cxx,v $
- *
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/presenter/PresenterPaneBorderManager.hxx b/sdext/source/presenter/PresenterPaneBorderManager.hxx
index c8f71edb0e94..73dc6e86bd7c 100644
--- a/sdext/source/presenter/PresenterPaneBorderManager.hxx
+++ b/sdext/source/presenter/PresenterPaneBorderManager.hxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PresenterPaneBorderManager.hxx,v $
- *
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/presenter/PresenterPaneBorderPainter.cxx b/sdext/source/presenter/PresenterPaneBorderPainter.cxx
index 7c84218dfb12..9e691954c806 100644
--- a/sdext/source/presenter/PresenterPaneBorderPainter.cxx
+++ b/sdext/source/presenter/PresenterPaneBorderPainter.cxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PresenterPaneBorderPainter.cxx,v $
- *
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/presenter/PresenterPaneBorderPainter.hxx b/sdext/source/presenter/PresenterPaneBorderPainter.hxx
index 45fbe3340cd5..7affd4d3e46c 100644
--- a/sdext/source/presenter/PresenterPaneBorderPainter.hxx
+++ b/sdext/source/presenter/PresenterPaneBorderPainter.hxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PresenterPaneBorderPainter.hxx,v $
- *
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/presenter/PresenterPaneContainer.cxx b/sdext/source/presenter/PresenterPaneContainer.cxx
index 0fb36d0a34ad..0b1a5d0eaeac 100644
--- a/sdext/source/presenter/PresenterPaneContainer.cxx
+++ b/sdext/source/presenter/PresenterPaneContainer.cxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PresenterPaneContainer.cxx,v $
- *
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/presenter/PresenterPaneContainer.hxx b/sdext/source/presenter/PresenterPaneContainer.hxx
index 584bd8fcfb94..bce80465fe3e 100644
--- a/sdext/source/presenter/PresenterPaneContainer.hxx
+++ b/sdext/source/presenter/PresenterPaneContainer.hxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PresenterPaneContainer.hxx,v $
- *
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/presenter/PresenterPaneFactory.cxx b/sdext/source/presenter/PresenterPaneFactory.cxx
index c5e6403de440..d9a90b9ef99b 100644
--- a/sdext/source/presenter/PresenterPaneFactory.cxx
+++ b/sdext/source/presenter/PresenterPaneFactory.cxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PresenterPaneFactory.cxx,v $
- *
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/presenter/PresenterPaneFactory.hxx b/sdext/source/presenter/PresenterPaneFactory.hxx
index c8f2a070ef6f..13296b763359 100644
--- a/sdext/source/presenter/PresenterPaneFactory.hxx
+++ b/sdext/source/presenter/PresenterPaneFactory.hxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PresenterPaneFactory.hxx,v $
- *
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/presenter/PresenterProtocolHandler.cxx b/sdext/source/presenter/PresenterProtocolHandler.cxx
index 8e29da2544b8..3f9c44c8f433 100644
--- a/sdext/source/presenter/PresenterProtocolHandler.cxx
+++ b/sdext/source/presenter/PresenterProtocolHandler.cxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PresenterProtocolHandler.cxx,v $
- *
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/presenter/PresenterProtocolHandler.hxx b/sdext/source/presenter/PresenterProtocolHandler.hxx
index 3dc1da454c30..cb005acb84e5 100644
--- a/sdext/source/presenter/PresenterProtocolHandler.hxx
+++ b/sdext/source/presenter/PresenterProtocolHandler.hxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PresenterProtocolHandler.hxx,v $
- *
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/presenter/PresenterScreen.cxx b/sdext/source/presenter/PresenterScreen.cxx
index 52ad08583539..22a1b2fe623f 100644
--- a/sdext/source/presenter/PresenterScreen.cxx
+++ b/sdext/source/presenter/PresenterScreen.cxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PresenterScreen.cxx,v $
- *
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/presenter/PresenterScreen.hxx b/sdext/source/presenter/PresenterScreen.hxx
index e56f841f5cd3..191542f7503c 100644
--- a/sdext/source/presenter/PresenterScreen.hxx
+++ b/sdext/source/presenter/PresenterScreen.hxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PresenterScreen.hxx,v $
- *
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/presenter/PresenterScrollBar.cxx b/sdext/source/presenter/PresenterScrollBar.cxx
index d72f79024d41..21b06c392715 100644
--- a/sdext/source/presenter/PresenterScrollBar.cxx
+++ b/sdext/source/presenter/PresenterScrollBar.cxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PresenterScrollBar.cxx,v $
- *
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/presenter/PresenterScrollBar.hxx b/sdext/source/presenter/PresenterScrollBar.hxx
index 2f8bdc222946..4f197b347017 100644
--- a/sdext/source/presenter/PresenterScrollBar.hxx
+++ b/sdext/source/presenter/PresenterScrollBar.hxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PresenterScrollBar.hxx,v $
- *
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/presenter/PresenterSlidePreview.cxx b/sdext/source/presenter/PresenterSlidePreview.cxx
index d80c29605174..1187f14cf5ee 100644
--- a/sdext/source/presenter/PresenterSlidePreview.cxx
+++ b/sdext/source/presenter/PresenterSlidePreview.cxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PresenterSlidePreview.cxx,v $
- *
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/presenter/PresenterSlidePreview.hxx b/sdext/source/presenter/PresenterSlidePreview.hxx
index 4806ad4b2626..a88f4f3de2c8 100644
--- a/sdext/source/presenter/PresenterSlidePreview.hxx
+++ b/sdext/source/presenter/PresenterSlidePreview.hxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PresenterSlidePreview.hxx,v $
- *
- * $Revision: 1.3 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/presenter/PresenterSlideShowView.cxx b/sdext/source/presenter/PresenterSlideShowView.cxx
index e0fe026516b8..cc4ef895888d 100644
--- a/sdext/source/presenter/PresenterSlideShowView.cxx
+++ b/sdext/source/presenter/PresenterSlideShowView.cxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PresenterSlideShowView.cxx,v $
- *
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/presenter/PresenterSlideShowView.hxx b/sdext/source/presenter/PresenterSlideShowView.hxx
index 4bb12a1aadb0..4ce6212c0ff0 100644
--- a/sdext/source/presenter/PresenterSlideShowView.hxx
+++ b/sdext/source/presenter/PresenterSlideShowView.hxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PresenterSlideShowView.hxx,v $
- *
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/presenter/PresenterSlideSorter.cxx b/sdext/source/presenter/PresenterSlideSorter.cxx
index f29a311f2013..2b096d849cf6 100644
--- a/sdext/source/presenter/PresenterSlideSorter.cxx
+++ b/sdext/source/presenter/PresenterSlideSorter.cxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PresenterSlideSorter.cxx,v $
- *
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/presenter/PresenterSlideSorter.hxx b/sdext/source/presenter/PresenterSlideSorter.hxx
index a86b36180eed..15208b9160a5 100644
--- a/sdext/source/presenter/PresenterSlideSorter.hxx
+++ b/sdext/source/presenter/PresenterSlideSorter.hxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PresenterSlideSorter.hxx,v $
- *
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/presenter/PresenterSprite.cxx b/sdext/source/presenter/PresenterSprite.cxx
index 0199030aa4b5..04513b9332d4 100644
--- a/sdext/source/presenter/PresenterSprite.cxx
+++ b/sdext/source/presenter/PresenterSprite.cxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PresenterSprite.cxx,v $
- *
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/presenter/PresenterSprite.hxx b/sdext/source/presenter/PresenterSprite.hxx
index 93f6a4f88f66..19f8de4d5984 100644
--- a/sdext/source/presenter/PresenterSprite.hxx
+++ b/sdext/source/presenter/PresenterSprite.hxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PresenterSprite.hxx,v $
- *
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/presenter/PresenterSpritePane.cxx b/sdext/source/presenter/PresenterSpritePane.cxx
index c22add7c9299..07807eef8e2f 100644
--- a/sdext/source/presenter/PresenterSpritePane.cxx
+++ b/sdext/source/presenter/PresenterSpritePane.cxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PresenterSpritePane.cxx,v $
- *
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/presenter/PresenterSpritePane.hxx b/sdext/source/presenter/PresenterSpritePane.hxx
index 42ea005cacf7..b90f5c5a26a7 100644
--- a/sdext/source/presenter/PresenterSpritePane.hxx
+++ b/sdext/source/presenter/PresenterSpritePane.hxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PresenterSpritePane.hxx,v $
- *
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/presenter/PresenterTextView.cxx b/sdext/source/presenter/PresenterTextView.cxx
index 2bb334b376f3..8cd308dc230f 100755
--- a/sdext/source/presenter/PresenterTextView.cxx
+++ b/sdext/source/presenter/PresenterTextView.cxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PresenterNotesView.hxx,v $
- *
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/presenter/PresenterTextView.hxx b/sdext/source/presenter/PresenterTextView.hxx
index e168645ba01d..048eec9c3c0f 100755
--- a/sdext/source/presenter/PresenterTextView.hxx
+++ b/sdext/source/presenter/PresenterTextView.hxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PresenterNotesView.hxx,v $
- *
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/presenter/PresenterTheme.cxx b/sdext/source/presenter/PresenterTheme.cxx
index 81aaf693f8d9..c9a14bf4a48b 100644
--- a/sdext/source/presenter/PresenterTheme.cxx
+++ b/sdext/source/presenter/PresenterTheme.cxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PresenterTheme.cxx,v $
- *
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/presenter/PresenterTheme.hxx b/sdext/source/presenter/PresenterTheme.hxx
index cde59fe350ba..99cfa3803d96 100644
--- a/sdext/source/presenter/PresenterTheme.hxx
+++ b/sdext/source/presenter/PresenterTheme.hxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PresenterTheme.hxx,v $
- *
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/presenter/PresenterTimer.cxx b/sdext/source/presenter/PresenterTimer.cxx
index 8acdec7ff417..84a5323eff34 100644
--- a/sdext/source/presenter/PresenterTimer.cxx
+++ b/sdext/source/presenter/PresenterTimer.cxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PresenterTimer.cxx,v $
- *
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/presenter/PresenterTimer.hxx b/sdext/source/presenter/PresenterTimer.hxx
index 812c0dfed5f0..690f4b49108e 100644
--- a/sdext/source/presenter/PresenterTimer.hxx
+++ b/sdext/source/presenter/PresenterTimer.hxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PresenterTimer.hxx,v $
- *
- * $Revision: 1.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/presenter/PresenterToolBar.cxx b/sdext/source/presenter/PresenterToolBar.cxx
index 313b175d40a8..fc6ddbd86f05 100644
--- a/sdext/source/presenter/PresenterToolBar.cxx
+++ b/sdext/source/presenter/PresenterToolBar.cxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PresenterToolBar.cxx,v $
- *
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/presenter/PresenterToolBar.hxx b/sdext/source/presenter/PresenterToolBar.hxx
index 8657843c69ce..bb8b83f7dec3 100644
--- a/sdext/source/presenter/PresenterToolBar.hxx
+++ b/sdext/source/presenter/PresenterToolBar.hxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PresenterToolBar.hxx,v $
- *
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/presenter/PresenterUIPainter.cxx b/sdext/source/presenter/PresenterUIPainter.cxx
index 74b9e9e4f131..deeda371ac79 100644
--- a/sdext/source/presenter/PresenterUIPainter.cxx
+++ b/sdext/source/presenter/PresenterUIPainter.cxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PresenterUIPainter.cxx,v $
- *
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/presenter/PresenterUIPainter.hxx b/sdext/source/presenter/PresenterUIPainter.hxx
index d01bcbe00ee9..ea4de820649a 100644
--- a/sdext/source/presenter/PresenterUIPainter.hxx
+++ b/sdext/source/presenter/PresenterUIPainter.hxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PresenterUIPainter.hxx,v $
- *
- * $Revision: 1.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/presenter/PresenterViewFactory.cxx b/sdext/source/presenter/PresenterViewFactory.cxx
index ecd8b11b1b3a..31c9b5453211 100644
--- a/sdext/source/presenter/PresenterViewFactory.cxx
+++ b/sdext/source/presenter/PresenterViewFactory.cxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PresenterViewFactory.cxx,v $
- *
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/presenter/PresenterViewFactory.hxx b/sdext/source/presenter/PresenterViewFactory.hxx
index 7472f4912f0d..5640d612e498 100644
--- a/sdext/source/presenter/PresenterViewFactory.hxx
+++ b/sdext/source/presenter/PresenterViewFactory.hxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PresenterViewFactory.hxx,v $
- *
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/presenter/PresenterWindowManager.cxx b/sdext/source/presenter/PresenterWindowManager.cxx
index 53db58867e27..4b424e44c437 100644
--- a/sdext/source/presenter/PresenterWindowManager.cxx
+++ b/sdext/source/presenter/PresenterWindowManager.cxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PresenterWindowManager.cxx,v $
- *
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/presenter/PresenterWindowManager.hxx b/sdext/source/presenter/PresenterWindowManager.hxx
index 6631ec70d413..e6428b6de464 100644
--- a/sdext/source/presenter/PresenterWindowManager.hxx
+++ b/sdext/source/presenter/PresenterWindowManager.hxx
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PresenterWindowManager.hxx,v $
- *
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/makefile.mk b/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/makefile.mk
index 854644169f17..95678f13aa11 100644
--- a/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/makefile.mk
+++ b/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/makefile.mk
@@ -1,15 +1,11 @@
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
+#
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.10 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp b/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp
index 8ef828812dd6..dd06ace98f95 100644
--- a/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp
+++ b/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.12 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/presenter/makefile.mk b/sdext/source/presenter/makefile.mk
index a4b08861004d..6f3538d7f806 100644
--- a/sdext/source/presenter/makefile.mk
+++ b/sdext/source/presenter/makefile.mk
@@ -1,15 +1,11 @@
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
+#
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.10 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/presenter/registry/data/org/openoffice/Office/extension/PresenterScreen.xcu b/sdext/source/presenter/registry/data/org/openoffice/Office/extension/PresenterScreen.xcu
index b407d9215621..22316392f807 100644
--- a/sdext/source/presenter/registry/data/org/openoffice/Office/extension/PresenterScreen.xcu
+++ b/sdext/source/presenter/registry/data/org/openoffice/Office/extension/PresenterScreen.xcu
@@ -3,14 +3,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PresenterScreen.xcu,v $
- *
- * $Revision: 1.3 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/presenter/registry/data/org/openoffice/Office/extension/makefile.mk b/sdext/source/presenter/registry/data/org/openoffice/Office/extension/makefile.mk
index ba7236db5939..d3efd284ff66 100644
--- a/sdext/source/presenter/registry/data/org/openoffice/Office/extension/makefile.mk
+++ b/sdext/source/presenter/registry/data/org/openoffice/Office/extension/makefile.mk
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.2 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/presenter/registry/data/org/openoffice/Office/makefile.mk b/sdext/source/presenter/registry/data/org/openoffice/Office/makefile.mk
index 576c5b573f1e..358ffd9f59a5 100644
--- a/sdext/source/presenter/registry/data/org/openoffice/Office/makefile.mk
+++ b/sdext/source/presenter/registry/data/org/openoffice/Office/makefile.mk
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.3 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/source/presenter/registry/schema/org/openoffice/Office/extension/PresenterScreen.xcs b/sdext/source/presenter/registry/schema/org/openoffice/Office/extension/PresenterScreen.xcs
index 58f23c625db2..0e68614234f1 100644
--- a/sdext/source/presenter/registry/schema/org/openoffice/Office/extension/PresenterScreen.xcs
+++ b/sdext/source/presenter/registry/schema/org/openoffice/Office/extension/PresenterScreen.xcs
@@ -3,14 +3,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PresenterScreen.xcs,v $
- *
- * $Revision: 1.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sdext/util/makefile.pmk b/sdext/util/makefile.pmk
index d83ec77523d9..0bfd6ddce0f1 100644
--- a/sdext/util/makefile.pmk
+++ b/sdext/util/makefile.pmk
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.pmk,v $
-#
-# $Revision: 1.3 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/swext/makefile.pmk b/swext/makefile.pmk
index 54f01d9ea5eb..8e43f2f723f0 100644
--- a/swext/makefile.pmk
+++ b/swext/makefile.pmk
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.pmk,v $
-#
-# $Revision: 1.2 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/swext/mediawiki/build.xml b/swext/mediawiki/build.xml
index 85cee3089555..ff96fe578ca6 100644
--- a/swext/mediawiki/build.xml
+++ b/swext/mediawiki/build.xml
@@ -3,14 +3,10 @@
*
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- Copyright 2008 by Sun Microsystems, Inc.
+ Copyright 2000, 2010 Oracle and/or its affiliates.
OpenOffice.org - a multi-platform office productivity suite
- $RCSfile: build.xml,v $
-
- $Revision: 1.20.8.1 $
-
This file is part of OpenOffice.org.
OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/swext/mediawiki/dialogs/EditSetting.xdl b/swext/mediawiki/dialogs/EditSetting.xdl
index fdaa4001a3ae..fb5a103f5b7b 100644
--- a/swext/mediawiki/dialogs/EditSetting.xdl
+++ b/swext/mediawiki/dialogs/EditSetting.xdl
@@ -3,14 +3,10 @@
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- Copyright 2008 by Sun Microsystems, Inc.
+ Copyright 2000, 2010 Oracle and/or its affiliates.
OpenOffice.org - a multi-platform office productivity suite
- $RCSfile: EditSetting.xdl,v $
-
- $Revision: 1.10 $
-
This file is part of OpenOffice.org.
OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/swext/mediawiki/dialogs/Module1.xba b/swext/mediawiki/dialogs/Module1.xba
index eea82fd5bad3..c54705ca51cd 100644
--- a/swext/mediawiki/dialogs/Module1.xba
+++ b/swext/mediawiki/dialogs/Module1.xba
@@ -1,33 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--***********************************************************************
-
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
- Copyright 2008 by Sun Microsystems, Inc.
-
- OpenOffice.org - a multi-platform office productivity suite
-
- $RCSfile: Module1.xba,v $
-
- $Revision: 1.2 $
-
- This file is part of OpenOffice.org.
-
- OpenOffice.org is free software: you can redistribute it and/or modify
- it under the terms of the GNU Lesser General Public License version 3
- only, as published by the Free Software Foundation.
-
- OpenOffice.org is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Lesser General Public License version 3 for more details
- (a copy is included in the LICENSE file that accompanied this code).
-
- You should have received a copy of the GNU Lesser General Public License
- version 3 along with OpenOffice.org. If not, see
- <http://www.openoffice.org/license.html>
- for a copy of the LGPLv3 License.
-
+'
+' DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+'
+' Copyright 2000, 2010 Oracle and/or its affiliates.
+'
+' OpenOffice.org - a multi-platform office productivity suite
+'
+' This file is part of OpenOffice.org.
+'
+' OpenOffice.org is free software: you can redistribute it and/or modify
+' it under the terms of the GNU Lesser General Public License version 3
+' only, as published by the Free Software Foundation.
+'
+' OpenOffice.org is distributed in the hope that it will be useful,
+' but WITHOUT ANY WARRANTY; without even the implied warranty of
+' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+' GNU Lesser General Public License version 3 for more details
+' (a copy is included in the LICENSE file that accompanied this code).
+'
+' You should have received a copy of the GNU Lesser General Public License
+' version 3 along with OpenOffice.org. If not, see
+' <http://www.openoffice.org/license.html>
+' for a copy of the LGPLv3 License.
+'
************************************************************************ -->
<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
<script:module xmlns:script="http://openoffice.org/2000/script" script:name="Module1" script:language="StarBasic">REM ***** BASIC *****
diff --git a/swext/mediawiki/dialogs/SendToMediaWiki.xdl b/swext/mediawiki/dialogs/SendToMediaWiki.xdl
index 60e9b88cacf5..cd690c5f23ec 100644
--- a/swext/mediawiki/dialogs/SendToMediaWiki.xdl
+++ b/swext/mediawiki/dialogs/SendToMediaWiki.xdl
@@ -3,14 +3,10 @@
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- Copyright 2008 by Sun Microsystems, Inc.
+ Copyright 2000, 2010 Oracle and/or its affiliates.
OpenOffice.org - a multi-platform office productivity suite
- $RCSfile: SendToMediaWiki.xdl,v $
-
- $Revision: 1.14 $
-
This file is part of OpenOffice.org.
OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/swext/mediawiki/dialogs/Settings.xdl b/swext/mediawiki/dialogs/Settings.xdl
index bc32d13e0169..adf818a95611 100644
--- a/swext/mediawiki/dialogs/Settings.xdl
+++ b/swext/mediawiki/dialogs/Settings.xdl
@@ -3,14 +3,10 @@
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- Copyright 2008 by Sun Microsystems, Inc.
+ Copyright 2000, 2010 Oracle and/or its affiliates.
OpenOffice.org - a multi-platform office productivity suite
- $RCSfile: Settings.xdl,v $
-
- $Revision: 1.9 $
-
This file is part of OpenOffice.org.
OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/swext/mediawiki/dialogs/dialog.xlb b/swext/mediawiki/dialogs/dialog.xlb
index 7ca128330219..3dade31769d5 100644
--- a/swext/mediawiki/dialogs/dialog.xlb
+++ b/swext/mediawiki/dialogs/dialog.xlb
@@ -3,14 +3,10 @@
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- Copyright 2008 by Sun Microsystems, Inc.
+ Copyright 2000, 2010 Oracle and/or its affiliates.
OpenOffice.org - a multi-platform office productivity suite
- $RCSfile: dialog.xlb,v $
-
- $Revision: 1.4 $
-
This file is part of OpenOffice.org.
OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/swext/mediawiki/dialogs/script.xlb b/swext/mediawiki/dialogs/script.xlb
index 6cd129d6e6de..5ca371402a91 100644
--- a/swext/mediawiki/dialogs/script.xlb
+++ b/swext/mediawiki/dialogs/script.xlb
@@ -3,14 +3,10 @@
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- Copyright 2008 by Sun Microsystems, Inc.
+ Copyright 2000, 2010 Oracle and/or its affiliates.
OpenOffice.org - a multi-platform office productivity suite
- $RCSfile: script.xlb,v $
-
- $Revision: 1.2 $
-
This file is part of OpenOffice.org.
OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/swext/mediawiki/help/makefile.mk b/swext/mediawiki/help/makefile.mk
index b706f3369e59..010533be5689 100644
--- a/swext/mediawiki/help/makefile.mk
+++ b/swext/mediawiki/help/makefile.mk
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.3 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/swext/mediawiki/help/wiki.xhp b/swext/mediawiki/help/wiki.xhp
index 861decd3d369..22f97274814d 100644
--- a/swext/mediawiki/help/wiki.xhp
+++ b/swext/mediawiki/help/wiki.xhp
@@ -3,13 +3,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: wiki.xhp,v $
- * $Revision: 1.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/swext/mediawiki/help/wikiaccount.xhp b/swext/mediawiki/help/wikiaccount.xhp
index af833bf17807..8d1d57ba1d25 100644
--- a/swext/mediawiki/help/wikiaccount.xhp
+++ b/swext/mediawiki/help/wikiaccount.xhp
@@ -3,13 +3,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: wikiaccount.xhp,v $
- * $Revision: 1.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/swext/mediawiki/help/wikiformats.xhp b/swext/mediawiki/help/wikiformats.xhp
index 124b1e4fea88..fd9c98e19fae 100644
--- a/swext/mediawiki/help/wikiformats.xhp
+++ b/swext/mediawiki/help/wikiformats.xhp
@@ -3,13 +3,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: wikiformats.xhp,v $
- * $Revision: 1.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/swext/mediawiki/help/wikisend.xhp b/swext/mediawiki/help/wikisend.xhp
index a8bc560e7ed2..f9a5613b5184 100644
--- a/swext/mediawiki/help/wikisend.xhp
+++ b/swext/mediawiki/help/wikisend.xhp
@@ -3,13 +3,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: wikisend.xhp,v $
- * $Revision: 1.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/swext/mediawiki/help/wikisettings.xhp b/swext/mediawiki/help/wikisettings.xhp
index 72b2e46dbc2a..22611a29027a 100644
--- a/swext/mediawiki/help/wikisettings.xhp
+++ b/swext/mediawiki/help/wikisettings.xhp
@@ -3,13 +3,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: wikisettings.xhp,v $
- * $Revision: 1.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/swext/mediawiki/makefile.mk b/swext/mediawiki/makefile.mk
index 203ed6227359..9d051397a319 100644
--- a/swext/mediawiki/makefile.mk
+++ b/swext/mediawiki/makefile.mk
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.12 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/swext/mediawiki/src/com/sun/star/wiki/EditPageParser.java b/swext/mediawiki/src/com/sun/star/wiki/EditPageParser.java
index b442e1f04a8d..a0ed06ab4399 100644
--- a/swext/mediawiki/src/com/sun/star/wiki/EditPageParser.java
+++ b/swext/mediawiki/src/com/sun/star/wiki/EditPageParser.java
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: EditPageParser.java,v $
- *
- * $Revision: 1.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/swext/mediawiki/src/com/sun/star/wiki/Helper.java b/swext/mediawiki/src/com/sun/star/wiki/Helper.java
index f5a858c540e2..7862cdd42912 100644
--- a/swext/mediawiki/src/com/sun/star/wiki/Helper.java
+++ b/swext/mediawiki/src/com/sun/star/wiki/Helper.java
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: Helper.java,v $
- *
- * $Revision: 1.20 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/swext/mediawiki/src/com/sun/star/wiki/MainThreadDialogExecutor.java b/swext/mediawiki/src/com/sun/star/wiki/MainThreadDialogExecutor.java
index 68678b5bc413..dbf849fa4ef0 100644
--- a/swext/mediawiki/src/com/sun/star/wiki/MainThreadDialogExecutor.java
+++ b/swext/mediawiki/src/com/sun/star/wiki/MainThreadDialogExecutor.java
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: MainThreadDialogExecutor.java,v $
- *
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/swext/mediawiki/src/com/sun/star/wiki/Settings.java b/swext/mediawiki/src/com/sun/star/wiki/Settings.java
index 27027618b2a6..d14c4eae4b52 100644
--- a/swext/mediawiki/src/com/sun/star/wiki/Settings.java
+++ b/swext/mediawiki/src/com/sun/star/wiki/Settings.java
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: Settings.java,v $
- *
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/swext/mediawiki/src/com/sun/star/wiki/WikiArticle.java b/swext/mediawiki/src/com/sun/star/wiki/WikiArticle.java
index 819d37fa1889..13bb55abcedf 100644
--- a/swext/mediawiki/src/com/sun/star/wiki/WikiArticle.java
+++ b/swext/mediawiki/src/com/sun/star/wiki/WikiArticle.java
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: WikiArticle.java,v $
- *
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/swext/mediawiki/src/com/sun/star/wiki/WikiCancelException.java b/swext/mediawiki/src/com/sun/star/wiki/WikiCancelException.java
index 249619e59ff4..73369c997727 100644
--- a/swext/mediawiki/src/com/sun/star/wiki/WikiCancelException.java
+++ b/swext/mediawiki/src/com/sun/star/wiki/WikiCancelException.java
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: WikiCancelException.java,v $
- *
- * $Revision: 1.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/swext/mediawiki/src/com/sun/star/wiki/WikiDialog.java b/swext/mediawiki/src/com/sun/star/wiki/WikiDialog.java
index 67c77a6cc21c..e91f053169e7 100644
--- a/swext/mediawiki/src/com/sun/star/wiki/WikiDialog.java
+++ b/swext/mediawiki/src/com/sun/star/wiki/WikiDialog.java
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: WikiDialog.java,v $
- *
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java b/swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java
index 9d8646fa0b40..721b432779a1 100644
--- a/swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java
+++ b/swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: WikiEditSettingDialog.java,v $
- *
- * $Revision: 1.26 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java b/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java
index 5083a58d954b..0350e07fe8b6 100644
--- a/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java
+++ b/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: WikiEditorImpl.java,v $
- *
- * $Revision: 1.11 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/swext/mediawiki/src/com/sun/star/wiki/WikiOptionsEventHandlerImpl.java b/swext/mediawiki/src/com/sun/star/wiki/WikiOptionsEventHandlerImpl.java
index 5859e11fd32e..8b635d85c316 100644
--- a/swext/mediawiki/src/com/sun/star/wiki/WikiOptionsEventHandlerImpl.java
+++ b/swext/mediawiki/src/com/sun/star/wiki/WikiOptionsEventHandlerImpl.java
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: WikiOptionsEventHandlerImpl.java,v $
- *
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java b/swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java
index c74706bc6816..317f35a3170b 100644
--- a/swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java
+++ b/swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: WikiPropDialog.java,v $
- *
- * $Revision: 1.19 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/swext/mediawiki/src/com/sun/star/wiki/WikiProtocolSocketFactory.java b/swext/mediawiki/src/com/sun/star/wiki/WikiProtocolSocketFactory.java
index 218dbfb7f0c7..653eaca8466a 100644
--- a/swext/mediawiki/src/com/sun/star/wiki/WikiProtocolSocketFactory.java
+++ b/swext/mediawiki/src/com/sun/star/wiki/WikiProtocolSocketFactory.java
@@ -2,14 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: WikiProtocolSocketFactory.java,v $
- *
- * $Revision: 1.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/swext/mediawiki/src/makefile.mk b/swext/mediawiki/src/makefile.mk
index 6a8e140d4b4d..ab656fe01733 100644
--- a/swext/mediawiki/src/makefile.mk
+++ b/swext/mediawiki/src/makefile.mk
@@ -1,15 +1,11 @@
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
+#
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.3 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/swext/mediawiki/src/registry/data/org/openoffice/Office/Addons.xcu b/swext/mediawiki/src/registry/data/org/openoffice/Office/Addons.xcu
index 012b46987eb5..b8e96e1f1139 100644
--- a/swext/mediawiki/src/registry/data/org/openoffice/Office/Addons.xcu
+++ b/swext/mediawiki/src/registry/data/org/openoffice/Office/Addons.xcu
@@ -3,14 +3,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: Addons.xcu,v $
- *
- * $Revision: 1.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/swext/mediawiki/src/registry/data/org/openoffice/Office/Custom/WikiExtension.xcu b/swext/mediawiki/src/registry/data/org/openoffice/Office/Custom/WikiExtension.xcu
index cfa97b9a752d..8dbde907af37 100644
--- a/swext/mediawiki/src/registry/data/org/openoffice/Office/Custom/WikiExtension.xcu
+++ b/swext/mediawiki/src/registry/data/org/openoffice/Office/Custom/WikiExtension.xcu
@@ -3,14 +3,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: WikiExtension.xcu,v $
- *
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/swext/mediawiki/src/registry/data/org/openoffice/Office/Custom/makefile.mk b/swext/mediawiki/src/registry/data/org/openoffice/Office/Custom/makefile.mk
index ee1144a47ba7..82f8303054ab 100644
--- a/swext/mediawiki/src/registry/data/org/openoffice/Office/Custom/makefile.mk
+++ b/swext/mediawiki/src/registry/data/org/openoffice/Office/Custom/makefile.mk
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.4 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/swext/mediawiki/src/registry/data/org/openoffice/Office/OptionsDialog.xcu b/swext/mediawiki/src/registry/data/org/openoffice/Office/OptionsDialog.xcu
index ec52a7f16b6b..f6498c5faef3 100644
--- a/swext/mediawiki/src/registry/data/org/openoffice/Office/OptionsDialog.xcu
+++ b/swext/mediawiki/src/registry/data/org/openoffice/Office/OptionsDialog.xcu
@@ -3,14 +3,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: OptionsDialog.xcu,v $
- *
- * $Revision: 1.3 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/swext/mediawiki/src/registry/data/org/openoffice/Office/Paths.xcu b/swext/mediawiki/src/registry/data/org/openoffice/Office/Paths.xcu
index 82586e861c6c..e39bbc75471c 100644
--- a/swext/mediawiki/src/registry/data/org/openoffice/Office/Paths.xcu
+++ b/swext/mediawiki/src/registry/data/org/openoffice/Office/Paths.xcu
@@ -1,36 +1,36 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!--***********************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************ -->
-<oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:name="Paths" oor:package="org.openoffice.Office">
- <node oor:name="Paths">
- <node oor:name="Template" oor:op="fuse">
- <node oor:name="InternalPaths">
- <node oor:name="%origin%/templates" oor:op="fuse"/>
- </node>
- </node>
- </node>
-</oor:component-data>
+<?xml version='1.0' encoding='UTF-8'?>
+<!--***********************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************ -->
+<oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:name="Paths" oor:package="org.openoffice.Office">
+ <node oor:name="Paths">
+ <node oor:name="Template" oor:op="fuse">
+ <node oor:name="InternalPaths">
+ <node oor:name="%origin%/templates" oor:op="fuse"/>
+ </node>
+ </node>
+ </node>
+</oor:component-data>
diff --git a/swext/mediawiki/src/registry/data/org/openoffice/Office/ProtocolHandler.xcu b/swext/mediawiki/src/registry/data/org/openoffice/Office/ProtocolHandler.xcu
index 66cf4af577e3..501c0a42548c 100644
--- a/swext/mediawiki/src/registry/data/org/openoffice/Office/ProtocolHandler.xcu
+++ b/swext/mediawiki/src/registry/data/org/openoffice/Office/ProtocolHandler.xcu
@@ -3,14 +3,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: ProtocolHandler.xcu,v $
- *
- * $Revision: 1.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/swext/mediawiki/src/registry/data/org/openoffice/Office/makefile.mk b/swext/mediawiki/src/registry/data/org/openoffice/Office/makefile.mk
index c9ff540bff5b..3d1409827390 100644
--- a/swext/mediawiki/src/registry/data/org/openoffice/Office/makefile.mk
+++ b/swext/mediawiki/src/registry/data/org/openoffice/Office/makefile.mk
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.4 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/Filter.xcu b/swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/Filter.xcu
index 32577a7cbd8b..d0ddad5b2a7c 100644
--- a/swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/Filter.xcu
+++ b/swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/Filter.xcu
@@ -1,56 +1,56 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!--***********************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************ -->
-<!DOCTYPE oor:component-data SYSTEM "../../../../component-update.dtd">
-<oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:package="org.openoffice.TypeDetection" oor:name="Filter">
- <node oor:name="Filters">
- <node oor:name="MediaWiki" oor:op="fuse">
- <prop oor:name="FileFormatVersion"><value>0</value></prop>
- <prop oor:name="Type"><value>MediaWiki</value></prop>
- <prop oor:name="DocumentService"><value>com.sun.star.text.TextDocument</value></prop>
- <prop oor:name="UIComponent"/>
- <prop oor:name="UserData"><value oor:separator=",">com.sun.star.documentconversion.XSLTFilter,,,com.sun.star.comp.Writer.XMLOasisExporter,,%origin%/filter/odt2mediawiki.xsl</value></prop>
- <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.XmlFilterAdaptor</value></prop>
- <prop oor:name="UIName">
- <value xml:lang="x-default">MediaWiki</value>
- </prop>
- <prop oor:name="Flags"><value>EXPORT ALIEN 3RDPARTYFILTER</value></prop>
- </node>
- <node oor:name="MediaWiki_Web" oor:op="fuse">
- <prop oor:name="FileFormatVersion"><value>0</value></prop>
- <prop oor:name="Type"><value>MediaWiki</value></prop>
- <prop oor:name="DocumentService"><value>com.sun.star.text.WebDocument</value></prop>
- <prop oor:name="UIComponent"/>
- <prop oor:name="UserData"><value oor:separator=",">com.sun.star.documentconversion.XSLTFilter,,,com.sun.star.comp.Writer.XMLOasisExporter,,%origin%/filter/odt2mediawiki.xsl</value></prop>
- <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.XmlFilterAdaptor</value></prop>
- <prop oor:name="UIName">
- <value xml:lang="x-default">MediaWiki</value>
- </prop>
- <prop oor:name="Flags"><value>EXPORT ALIEN 3RDPARTYFILTER</value></prop>
- </node>
- </node>
-</oor:component-data>
+<?xml version='1.0' encoding='UTF-8'?>
+<!--***********************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************ -->
+<!DOCTYPE oor:component-data SYSTEM "../../../../component-update.dtd">
+<oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:package="org.openoffice.TypeDetection" oor:name="Filter">
+ <node oor:name="Filters">
+ <node oor:name="MediaWiki" oor:op="fuse">
+ <prop oor:name="FileFormatVersion"><value>0</value></prop>
+ <prop oor:name="Type"><value>MediaWiki</value></prop>
+ <prop oor:name="DocumentService"><value>com.sun.star.text.TextDocument</value></prop>
+ <prop oor:name="UIComponent"/>
+ <prop oor:name="UserData"><value oor:separator=",">com.sun.star.documentconversion.XSLTFilter,,,com.sun.star.comp.Writer.XMLOasisExporter,,%origin%/filter/odt2mediawiki.xsl</value></prop>
+ <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.XmlFilterAdaptor</value></prop>
+ <prop oor:name="UIName">
+ <value xml:lang="x-default">MediaWiki</value>
+ </prop>
+ <prop oor:name="Flags"><value>EXPORT ALIEN 3RDPARTYFILTER</value></prop>
+ </node>
+ <node oor:name="MediaWiki_Web" oor:op="fuse">
+ <prop oor:name="FileFormatVersion"><value>0</value></prop>
+ <prop oor:name="Type"><value>MediaWiki</value></prop>
+ <prop oor:name="DocumentService"><value>com.sun.star.text.WebDocument</value></prop>
+ <prop oor:name="UIComponent"/>
+ <prop oor:name="UserData"><value oor:separator=",">com.sun.star.documentconversion.XSLTFilter,,,com.sun.star.comp.Writer.XMLOasisExporter,,%origin%/filter/odt2mediawiki.xsl</value></prop>
+ <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.XmlFilterAdaptor</value></prop>
+ <prop oor:name="UIName">
+ <value xml:lang="x-default">MediaWiki</value>
+ </prop>
+ <prop oor:name="Flags"><value>EXPORT ALIEN 3RDPARTYFILTER</value></prop>
+ </node>
+ </node>
+</oor:component-data>
diff --git a/swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/Types.xcu b/swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/Types.xcu
index 2417be198b59..64031b844aaf 100644
--- a/swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/Types.xcu
+++ b/swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/Types.xcu
@@ -1,44 +1,44 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!--***********************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************ -->
-<!DOCTYPE oor:component-data SYSTEM "../../../../component-update.dtd">
-<oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:package="org.openoffice.TypeDetection" oor:name="Types">
- <node oor:name="Types">
- <node oor:name="MediaWiki" oor:op="fuse">
- <prop oor:name="DetectService"><value>com.sun.star.comp.filters.XMLFilterDetect</value></prop>
- <prop oor:name="URLPattern"/>
- <prop oor:name="Extensions"><value>txt</value></prop>
- <prop oor:name="MediaType"/>
- <prop oor:name="Preferred"><value>false</value></prop>
- <prop oor:name="PreferredFilter"/>
- <prop oor:name="UIName">
- <value xml:lang="x-default">MediaWiki</value>
- </prop>
- <prop oor:name="ClipboardFormat"/>
- </node>
- </node>
-</oor:component-data>
+<?xml version='1.0' encoding='UTF-8'?>
+<!--***********************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************ -->
+<!DOCTYPE oor:component-data SYSTEM "../../../../component-update.dtd">
+<oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:package="org.openoffice.TypeDetection" oor:name="Types">
+ <node oor:name="Types">
+ <node oor:name="MediaWiki" oor:op="fuse">
+ <prop oor:name="DetectService"><value>com.sun.star.comp.filters.XMLFilterDetect</value></prop>
+ <prop oor:name="URLPattern"/>
+ <prop oor:name="Extensions"><value>txt</value></prop>
+ <prop oor:name="MediaType"/>
+ <prop oor:name="Preferred"><value>false</value></prop>
+ <prop oor:name="PreferredFilter"/>
+ <prop oor:name="UIName">
+ <value xml:lang="x-default">MediaWiki</value>
+ </prop>
+ <prop oor:name="ClipboardFormat"/>
+ </node>
+ </node>
+</oor:component-data>
diff --git a/swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/makefile.mk b/swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/makefile.mk
index 4ef01de9ded2..3224851026c0 100644
--- a/swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/makefile.mk
+++ b/swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/makefile.mk
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.4 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/swext/mediawiki/src/registry/schema/org/openoffice/Office/Custom/WikiExtension.xcs b/swext/mediawiki/src/registry/schema/org/openoffice/Office/Custom/WikiExtension.xcs
index d87ac892f7c4..d210ec999507 100644
--- a/swext/mediawiki/src/registry/schema/org/openoffice/Office/Custom/WikiExtension.xcs
+++ b/swext/mediawiki/src/registry/schema/org/openoffice/Office/Custom/WikiExtension.xcs
@@ -3,14 +3,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: WikiExtension.xcs,v $
- *
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/swext/mediawiki/src/registry/schema/org/openoffice/Office/Custom/makefile.mk b/swext/mediawiki/src/registry/schema/org/openoffice/Office/Custom/makefile.mk
index 6eeb71fa588e..bbbb9c664cbb 100644
--- a/swext/mediawiki/src/registry/schema/org/openoffice/Office/Custom/makefile.mk
+++ b/swext/mediawiki/src/registry/schema/org/openoffice/Office/Custom/makefile.mk
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.4 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/swext/mediawiki/src/uno-extension-manifest.xml b/swext/mediawiki/src/uno-extension-manifest.xml
index e98fd85e94ef..f3d9a0e2399b 100644
--- a/swext/mediawiki/src/uno-extension-manifest.xml
+++ b/swext/mediawiki/src/uno-extension-manifest.xml
@@ -3,14 +3,10 @@
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- Copyright 2008 by Sun Microsystems, Inc.
+ Copyright 2000, 2010 Oracle and/or its affiliates.
OpenOffice.org - a multi-platform office productivity suite
- $RCSfile: uno-extension-manifest.xml,v $
-
- $Revision: 1.5 $
-
This file is part of OpenOffice.org.
OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/tomcat/makefile.mk b/tomcat/makefile.mk
index 34f0ebdcad5d..a4d8236b267f 100755
--- a/tomcat/makefile.mk
+++ b/tomcat/makefile.mk
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.4 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xpdf/makefile.mk b/xpdf/makefile.mk
index 5960ff96d5c4..0a138b8d84aa 100644
--- a/xpdf/makefile.mk
+++ b/xpdf/makefile.mk
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.7.4.1 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify