summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:08:13 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:08:13 +0200
commit3bb01d6eda13bf1b4a538a24707605153fe4e37e (patch)
tree65089ad2a2c6268e4c4ffc753ae2374bd2169089
parent1dd3ecc26716372f4e0aeb7578acfd997f125a61 (diff)
recreated tag libreoffice-3.3.3.1 which had these commits:
commit 8ad61991552caa3f97cc10dc468ce722f2a7217a (tag: refs/tags/libreoffice-3.3.3.1) Author: Petr Mladek <pmladek@suse.cz> Date: Tue May 31 17:39:04 2011 +0200 Version 3.3.3.1, tag libreoffice-3.3.3.1 (3.3.3-rc1) commit 4e3b67b32df4df0f1afe0abe0c0dc9a56829986c Author: Andras Timar <atimar@suse.com> Date: Sun May 29 21:38:41 2011 +0200 l10n: add br, et, and tr to NLPSolver + fixes to fr and nb nlpsolver/locale/NLPSolverCommon_bg.properties | 22 +++++++++++++++ nlpsolver/locale/NLPSolverCommon_et.properties | 22 +++++++++++++++ nlpsolver/locale/NLPSolverCommon_nb.properties | 2 +- nlpsolver/locale/NLPSolverCommon_tr.properties | 22 +++++++++++++++ .../locale/NLPSolverStatusDialog_bg.properties | 28 ++++++++++++++++++++ .../locale/NLPSolverStatusDialog_et.properties | 28 ++++++++++++++++++++ .../locale/NLPSolverStatusDialog_fr.properties | 4 +- .../locale/NLPSolverStatusDialog_tr.properties | 28 ++++++++++++++++++++ 8 files changed, 153 insertions(+), 3 deletions(-)
Notes
Notes: split repo tag: extensions_libreoffice-3.3.3.1 split repo tag: extensions_libreoffice-3.3.4.1
-rw-r--r--migrationanalysis/src/driver_docs/ulf2dat.pl14
-rw-r--r--migrationanalysis/src/msokill/StdAfx.cpp6
-rw-r--r--migrationanalysis/src/msokill/StdAfx.h4
-rw-r--r--migrationanalysis/src/msokill/msokill.cpp34
-rw-r--r--migrationanalysis/src/wizard/res_defines.h158
-rwxr-xr-xmysqlc/source/description.xml6
-rw-r--r--mysqlc/source/mysqlc.xml126
-rw-r--r--mysqlc/source/mysqlc_connection.cxx62
-rw-r--r--mysqlc/source/mysqlc_connection.hxx40
-rw-r--r--mysqlc/source/mysqlc_databasemetadata.cxx46
-rw-r--r--mysqlc/source/mysqlc_databasemetadata.hxx240
-rw-r--r--mysqlc/source/mysqlc_driver.cxx10
-rw-r--r--mysqlc/source/mysqlc_driver.hxx22
-rw-r--r--mysqlc/source/mysqlc_general.cxx10
-rw-r--r--mysqlc/source/mysqlc_general.hxx2
-rw-r--r--mysqlc/source/mysqlc_preparedstatement.cxx38
-rw-r--r--mysqlc/source/mysqlc_preparedstatement.hxx38
-rw-r--r--mysqlc/source/mysqlc_propertyids.cxx112
-rw-r--r--mysqlc/source/mysqlc_propertyids.hxx10
-rw-r--r--mysqlc/source/mysqlc_resultset.cxx18
-rw-r--r--mysqlc/source/mysqlc_resultset.hxx116
-rw-r--r--mysqlc/source/mysqlc_resultsetmetadata.cxx4
-rw-r--r--mysqlc/source/mysqlc_resultsetmetadata.hxx40
-rw-r--r--mysqlc/source/mysqlc_services.cxx18
-rw-r--r--mysqlc/source/mysqlc_statement.cxx18
-rw-r--r--mysqlc/source/mysqlc_statement.hxx30
-rw-r--r--mysqlc/source/mysqlc_subcomponent.hxx78
-rw-r--r--mysqlc/source/mysqlc_types.cxx2
-rw-r--r--mysqlc/source/mysqlc_types.hxx6
-rw-r--r--mysqlc/source/registry/data/org/openoffice/Office/DataAccess/Drivers.xcu2
-rw-r--r--nlpsolver/locale/NLPSolverCommon_bg.properties22
-rw-r--r--nlpsolver/locale/NLPSolverCommon_et.properties22
-rw-r--r--nlpsolver/locale/NLPSolverCommon_nb.properties2
-rw-r--r--nlpsolver/locale/NLPSolverCommon_tr.properties22
-rw-r--r--nlpsolver/locale/NLPSolverStatusDialog_bg.properties28
-rw-r--r--nlpsolver/locale/NLPSolverStatusDialog_et.properties28
-rw-r--r--nlpsolver/locale/NLPSolverStatusDialog_fr.properties4
-rw-r--r--nlpsolver/locale/NLPSolverStatusDialog_tr.properties28
-rw-r--r--reportbuilder/java/com/sun/star/report/DataRow.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/DataSource.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/DataSourceException.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/DataSourceFactory.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/ImageService.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/InputRepository.java4
-rw-r--r--reportbuilder/java/com/sun/star/report/JobDefinitionException.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/JobProgressIndicator.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/JobProperties.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/OfficeToken.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/OutputRepository.java4
-rw-r--r--reportbuilder/java/com/sun/star/report/ParameterMap.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/ReportAddIn.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/ReportEngine.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/ReportEngineMetaData.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/ReportEngineParameterNames.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/ReportExecutionException.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/ReportExpression.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/ReportExpressionMetaData.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/ReportFunction.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/ReportJob.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/ReportJobDefinition.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/ReportJobFactory.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/SDBCReportData.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/SDBCReportDataFactory.java4
-rw-r--r--reportbuilder/java/com/sun/star/report/SOImageService.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/StorageRepository.java8
-rw-r--r--reportbuilder/java/com/sun/star/report/function/metadata/AuthorFunction.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/function/metadata/AuthorFunctionDescription.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/function/metadata/MetaDataFunctionCategory.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/function/metadata/TitleFunction.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/function/metadata/TitleFunctionDescription.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/DefaultNameGenerator.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/OfficeNamespaces.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/PentahoFormulaContext.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/PentahoReportAddIn.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/PentahoReportEngine.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/PentahoReportEngineMetaData.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/PentahoReportJob.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/SOFormulaOpCodeMapper.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/SOFormulaParser.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/SOFunctionManager.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/SOReportJobFactory.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/StarFunctionCategory.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/StarFunctionDescription.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/StarReportData.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/StarReportDataFactory.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/StarReportModule.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/expressions/SumExpression.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/expressions/SumExpressionMetaData.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/AbstractReportElementLayoutController.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FixedTextLayoutController.java2
-rwxr-xr-xreportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormatValueUtility.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormattedTextLayoutController.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/ImageElementContext.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/ImageElementLayoutController.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/ObjectOleLayoutController.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeDetailLayoutController.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeGroupLayoutController.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeGroupSectionLayoutController.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeRepeatingStructureLayoutController.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeReportLayoutController.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeTableLayoutController.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeTableTemplateLayoutController.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/TableCellLayoutController.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/VariablesCollection.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/VariablesDeclarationLayoutController.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/loader/InputRepositoryLoader.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/loader/InputRepositoryResourceData.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/loader/InputResourceKey.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/model/DataStyle.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/model/FixedTextElement.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/model/FontFaceDeclsSection.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/model/FontFaceElement.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/model/FormatCondition.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/model/FormattedTextElement.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/model/ImageElement.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/model/ObjectOleElement.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/model/OfficeDetailSection.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/model/OfficeDocument.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/model/OfficeGroup.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/model/OfficeGroupSection.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/model/OfficeMasterPage.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/model/OfficeMasterStyles.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/model/OfficeReport.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/model/OfficeStyle.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/model/OfficeStyles.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/model/OfficeStylesCollection.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/model/OfficeTableSection.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/model/PageLayout.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/model/PageSection.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/model/RawText.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/model/ReportElement.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/model/TableCellElement.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/model/VariablesDeclarationSection.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/output/ImageProducer.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/output/OfficeDocumentReportTarget.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/output/OleProducer.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/output/StyleUtilities.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/output/StylesWriter.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/output/chart/ChartRawReportProcessor.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/output/chart/ChartRawReportTarget.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/output/spreadsheet/SpreadsheetRawReportProcessor.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/output/text/MasterPageFactory.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/output/text/PageBreakDefinition.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/output/text/PageContext.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/output/text/TextRawReportProcessor.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/output/text/TextRawReportTarget.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/output/text/VariablesDeclarations.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/AttributeSpecification.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/ElementReadHandler.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/OfficeDocumentXmlResourceFactory.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/OfficeParserUtil.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/OfficeStylesXmlResourceFactory.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/StarStyleXmlFactoryModule.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/StarXmlFactoryModule.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/StyleMapper.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/chart/ChartReadHandler.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/data/DataStyleReadHandler.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/draw/ObjectOleReadHandler.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/office/BodyReadHandler.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/office/DocumentContentReadHandler.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/office/DocumentStylesReadHandler.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/office/FontFaceDeclsReadHandler.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/office/MasterStylesReadHandler.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/ConditionalPrintExpressionReadHandler.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/DetailRootTableReadHandler.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/FixedContentReadHandler.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/FormatConditionReadHandler.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/FormattedTextReadHandler.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/FunctionReadHandler.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/GroupReadHandler.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/GroupSectionReadHandler.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/ImageReadHandler.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/MasterDetailReadHandler.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/ReportElementReadHandler.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/ReportReadHandler.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/RootTableReadHandler.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/SubDocumentReadHandler.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/style/FontFaceReadHandler.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/style/MasterPageReadHandler.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/style/OfficeStyleReadHandler.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/style/OfficeStylesReadHandler.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/style/PageLayoutReadHandler.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/style/StyleDefinitionReadHandler.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/OneOfConstantsMapper.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/draw/TextAreaVerticalAlignMapper.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/BackgroundColorMapper.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/BorderRightMapper.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/ColorMapper.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/FontSizeMapper.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/FontStyleMapper.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/FontWeightMapper.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/TextAlignMapper.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontFamilyGenericMapper.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontFamilyMapper.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontNameMapper.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontPitchMapper.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontReliefMapper.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextEmphasizeMapper.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextUnderlineColorMapper.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextUnderlineStyleMapper.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextUnderlineWidthMapper.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextUnderlineWordMode.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/VerticalAlignMapper.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/table/ColumnWidthMapper.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/table/RowHeightMapper.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/table/CoveredCellReadHandler.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableCellReadHandler.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableColumnReadHandler.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableColumnsReadHandler.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableReadHandler.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableRowReadHandler.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableRowsReadHandler.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/text/TextContentReadHandler.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/xlink/XLinkReadHandler.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/styles/LengthCalculator.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapper.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapperKey.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapperXmlFactoryModule.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapperXmlResourceFactory.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMappingDocumentReadHandler.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMappingReadHandler.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMappingRule.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/styles/stylemapper.xml12
-rw-r--r--reportbuilder/java/com/sun/star/report/util/DefaultJobProperties.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/util/DefaultParameterMap.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/util/DefaultReportJobDefinition.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/util/ManifestWriter.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/util/ReportUtil.java2
-rw-r--r--reportbuilder/registry/data/org/openoffice/Office/Accelerators.xcu6
-rw-r--r--reportbuilder/registry/data/org/openoffice/Office/DataAccess.xcu2
-rw-r--r--reportbuilder/registry/data/org/openoffice/Office/Embedding.xcu2
-rw-r--r--reportbuilder/registry/data/org/openoffice/Office/ExtendedColorScheme.xcu2
-rw-r--r--reportbuilder/registry/data/org/openoffice/Office/Paths.xcu2
-rw-r--r--reportbuilder/registry/data/org/openoffice/Office/ReportDesign.xcu2
-rw-r--r--reportbuilder/registry/data/org/openoffice/Office/UI/Controller.xcu2
-rw-r--r--reportbuilder/registry/data/org/openoffice/Office/UI/DbReportWindowState.xcu2
-rw-r--r--reportbuilder/registry/data/org/openoffice/Office/UI/ReportCommands.xcu2
-rw-r--r--reportbuilder/registry/data/org/openoffice/Setup.xcu2
-rw-r--r--reportbuilder/registry/data/org/openoffice/TypeDetection/Filter.xcu2
-rw-r--r--reportbuilder/registry/data/org/openoffice/TypeDetection/Types.xcu2
-rw-r--r--reportbuilder/template/pre.xml2
-rw-r--r--reportbuilder/template/registry/data/org/openoffice/Office/Paths.xcu2
-rwxr-xr-xreportbuilder/util/description.xml2
-rw-r--r--reportbuilder/util/hidother.src84
-rw-r--r--sdext/inc/pch/precompiled_sdext.cxx2
-rw-r--r--sdext/inc/pch/precompiled_sdext.hxx2
-rw-r--r--sdext/source/minimizer/configurationaccess.cxx120
-rw-r--r--sdext/source/minimizer/configurationaccess.hxx46
-rw-r--r--sdext/source/minimizer/fileopendialog.cxx18
-rw-r--r--sdext/source/minimizer/fileopendialog.hxx8
-rw-r--r--sdext/source/minimizer/graphiccollector.cxx8
-rw-r--r--sdext/source/minimizer/graphiccollector.hxx38
-rw-r--r--sdext/source/minimizer/impoptimizer.cxx84
-rw-r--r--sdext/source/minimizer/impoptimizer.hxx40
-rw-r--r--sdext/source/minimizer/informationdialog.cxx50
-rw-r--r--sdext/source/minimizer/informationdialog.hxx14
-rw-r--r--sdext/source/minimizer/optimizationstats.cxx2
-rw-r--r--sdext/source/minimizer/optimizationstats.hxx2
-rw-r--r--sdext/source/minimizer/optimizerdialog.cxx60
-rw-r--r--sdext/source/minimizer/optimizerdialog.hrc12
-rw-r--r--sdext/source/minimizer/optimizerdialog.hxx60
-rw-r--r--sdext/source/minimizer/optimizerdialogcontrols.cxx78
-rw-r--r--sdext/source/minimizer/pagecollector.cxx2
-rw-r--r--sdext/source/minimizer/pagecollector.hxx2
-rw-r--r--sdext/source/minimizer/pppoptimizer.cxx4
-rw-r--r--sdext/source/minimizer/pppoptimizer.hxx4
-rw-r--r--sdext/source/minimizer/pppoptimizerdialog.cxx18
-rw-r--r--sdext/source/minimizer/pppoptimizerdialog.hxx8
-rw-r--r--sdext/source/minimizer/pppoptimizertoken.cxx466
-rw-r--r--sdext/source/minimizer/pppoptimizertoken.hxx4
-rw-r--r--sdext/source/minimizer/pppoptimizeruno.cxx8
-rw-r--r--sdext/source/minimizer/registry/data/org/openoffice/Office/extension/SunPresentationMinimizer.xcu30
-rw-r--r--sdext/source/minimizer/unodialog.cxx6
-rw-r--r--sdext/source/minimizer/unodialog.hxx36
-rwxr-xr-xsdext/source/pdfimport/config/description.xml2
-rw-r--r--sdext/source/pdfimport/config/pdf_import_filter.xcu6
-rw-r--r--sdext/source/pdfimport/filterdet.cxx6
-rw-r--r--sdext/source/pdfimport/filterdet.hxx12
-rw-r--r--sdext/source/pdfimport/inc/contentsink.hxx38
-rw-r--r--sdext/source/pdfimport/inc/odfemitter.hxx6
-rw-r--r--sdext/source/pdfimport/inc/pdfihelper.hxx16
-rw-r--r--sdext/source/pdfimport/inc/pdfparse.hxx46
-rw-r--r--sdext/source/pdfimport/inc/saxemitter.hxx4
-rw-r--r--sdext/source/pdfimport/inc/treevisitorfactory.hxx2
-rw-r--r--sdext/source/pdfimport/inc/wrapper.hxx10
-rw-r--r--sdext/source/pdfimport/inc/xmlemitter.hxx4
-rw-r--r--sdext/source/pdfimport/misc/pdfihelper.cxx6
-rw-r--r--sdext/source/pdfimport/misc/pwdinteract.cxx2
-rw-r--r--sdext/source/pdfimport/odf/odfemitter.cxx2
-rw-r--r--sdext/source/pdfimport/pdfiadaptor.cxx18
-rw-r--r--sdext/source/pdfimport/pdfiadaptor.hxx26
-rw-r--r--sdext/source/pdfimport/pdfparse/pdfentries.cxx70
-rw-r--r--sdext/source/pdfimport/pdfparse/pdfparse.cxx82
-rw-r--r--sdext/source/pdfimport/sax/emitcontext.cxx2
-rw-r--r--sdext/source/pdfimport/sax/emitcontext.hxx12
-rw-r--r--sdext/source/pdfimport/sax/saxattrlist.cxx6
-rw-r--r--sdext/source/pdfimport/sax/saxattrlist.hxx10
-rw-r--r--sdext/source/pdfimport/services.cxx4
-rwxr-xr-xsdext/source/pdfimport/test/export.map2
-rw-r--r--sdext/source/pdfimport/test/outputwrap.hxx8
-rw-r--r--sdext/source/pdfimport/test/pdf2xml.cxx2
-rw-r--r--sdext/source/pdfimport/test/pdfunzip.cxx50
-rw-r--r--sdext/source/pdfimport/test/testdocs/pictxt_pdfi_unittest_draw.xml1160
-rw-r--r--sdext/source/pdfimport/test/testdocs/pictxt_pdfi_unittest_impress.xml1160
-rw-r--r--sdext/source/pdfimport/test/testdocs/pictxt_pdfi_unittest_writer.xml60
-rw-r--r--sdext/source/pdfimport/test/testdocs/txtpic_pdfi_unittest_draw.xml1160
-rw-r--r--sdext/source/pdfimport/test/testdocs/txtpic_pdfi_unittest_impress.xml1160
-rw-r--r--sdext/source/pdfimport/test/testdocs/txtpic_pdfi_unittest_writer.xml60
-rw-r--r--sdext/source/pdfimport/test/testdocs/txtpictxt_pdfi_unittest_draw.xml1160
-rw-r--r--sdext/source/pdfimport/test/testdocs/txtpictxt_pdfi_unittest_impress.xml1160
-rw-r--r--sdext/source/pdfimport/test/testdocs/txtpictxt_pdfi_unittest_writer.xml60
-rw-r--r--sdext/source/pdfimport/test/tests.cxx2
-rw-r--r--sdext/source/pdfimport/tree/drawtreevisiting.cxx234
-rw-r--r--sdext/source/pdfimport/tree/drawtreevisiting.hxx12
-rw-r--r--sdext/source/pdfimport/tree/genericelements.cxx26
-rw-r--r--sdext/source/pdfimport/tree/genericelements.hxx64
-rw-r--r--sdext/source/pdfimport/tree/imagecontainer.cxx2
-rw-r--r--sdext/source/pdfimport/tree/imagecontainer.hxx8
-rw-r--r--sdext/source/pdfimport/tree/pdfiprocessor.cxx58
-rw-r--r--sdext/source/pdfimport/tree/pdfiprocessor.hxx66
-rw-r--r--sdext/source/pdfimport/tree/style.cxx24
-rw-r--r--sdext/source/pdfimport/tree/style.hxx30
-rw-r--r--sdext/source/pdfimport/tree/treevisiting.hxx4
-rw-r--r--sdext/source/pdfimport/tree/treevisitorfactory.cxx16
-rw-r--r--sdext/source/pdfimport/tree/writertreevisiting.cxx200
-rw-r--r--sdext/source/pdfimport/tree/writertreevisiting.hxx20
-rw-r--r--sdext/source/pdfimport/wrapper/wrapper.cxx80
-rw-r--r--sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx154
-rw-r--r--sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx56
-rw-r--r--sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx80
-rw-r--r--sdext/source/pdfimport/xpdfwrapper/pnghelper.hxx16
-rw-r--r--sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx32
-rw-r--r--sdext/source/presenter/PresenterAccessibility.cxx156
-rw-r--r--sdext/source/presenter/PresenterAccessibility.hxx10
-rw-r--r--sdext/source/presenter/PresenterAnimation.cxx2
-rw-r--r--sdext/source/presenter/PresenterAnimation.hxx2
-rw-r--r--sdext/source/presenter/PresenterAnimator.cxx12
-rw-r--r--sdext/source/presenter/PresenterAnimator.hxx2
-rw-r--r--sdext/source/presenter/PresenterBitmapContainer.cxx14
-rw-r--r--sdext/source/presenter/PresenterBitmapContainer.hxx4
-rw-r--r--sdext/source/presenter/PresenterButton.cxx16
-rw-r--r--sdext/source/presenter/PresenterButton.hxx14
-rw-r--r--sdext/source/presenter/PresenterCanvasHelper.cxx12
-rw-r--r--sdext/source/presenter/PresenterCanvasHelper.hxx4
-rw-r--r--sdext/source/presenter/PresenterClock.cxx40
-rw-r--r--sdext/source/presenter/PresenterClock.hxx14
-rw-r--r--sdext/source/presenter/PresenterComponent.cxx8
-rw-r--r--sdext/source/presenter/PresenterComponent.hxx2
-rw-r--r--sdext/source/presenter/PresenterConfigurationAccess.cxx18
-rw-r--r--sdext/source/presenter/PresenterConfigurationAccess.hxx6
-rw-r--r--sdext/source/presenter/PresenterController.cxx26
-rw-r--r--sdext/source/presenter/PresenterController.hxx14
-rw-r--r--sdext/source/presenter/PresenterCurrentSlideObserver.cxx2
-rw-r--r--sdext/source/presenter/PresenterCurrentSlideObserver.hxx2
-rw-r--r--sdext/source/presenter/PresenterFrameworkObserver.cxx8
-rw-r--r--sdext/source/presenter/PresenterFrameworkObserver.hxx6
-rw-r--r--sdext/source/presenter/PresenterGeometryHelper.cxx10
-rw-r--r--sdext/source/presenter/PresenterGeometryHelper.hxx6
-rw-r--r--sdext/source/presenter/PresenterHelpView.cxx20
-rw-r--r--sdext/source/presenter/PresenterHelpView.hxx10
-rw-r--r--sdext/source/presenter/PresenterHelper.cxx4
-rw-r--r--sdext/source/presenter/PresenterHelper.hxx2
-rw-r--r--sdext/source/presenter/PresenterNotesView.cxx26
-rw-r--r--sdext/source/presenter/PresenterNotesView.hxx18
-rw-r--r--sdext/source/presenter/PresenterPaintManager.cxx6
-rw-r--r--sdext/source/presenter/PresenterPaintManager.hxx2
-rw-r--r--sdext/source/presenter/PresenterPane.cxx6
-rw-r--r--sdext/source/presenter/PresenterPane.hxx10
-rw-r--r--sdext/source/presenter/PresenterPaneAnimator.cxx64
-rw-r--r--sdext/source/presenter/PresenterPaneAnimator.hxx2
-rw-r--r--sdext/source/presenter/PresenterPaneBase.cxx16
-rw-r--r--sdext/source/presenter/PresenterPaneBase.hxx10
-rw-r--r--sdext/source/presenter/PresenterPaneBorderManager.cxx26
-rw-r--r--sdext/source/presenter/PresenterPaneBorderManager.hxx20
-rw-r--r--sdext/source/presenter/PresenterPaneBorderPainter.cxx46
-rw-r--r--sdext/source/presenter/PresenterPaneBorderPainter.hxx6
-rw-r--r--sdext/source/presenter/PresenterPaneContainer.cxx14
-rw-r--r--sdext/source/presenter/PresenterPaneContainer.hxx10
-rw-r--r--sdext/source/presenter/PresenterPaneFactory.cxx12
-rw-r--r--sdext/source/presenter/PresenterPaneFactory.hxx8
-rw-r--r--sdext/source/presenter/PresenterProtocolHandler.cxx26
-rw-r--r--sdext/source/presenter/PresenterProtocolHandler.hxx8
-rw-r--r--sdext/source/presenter/PresenterScreen.cxx32
-rw-r--r--sdext/source/presenter/PresenterScreen.hxx12
-rw-r--r--sdext/source/presenter/PresenterScrollBar.cxx44
-rw-r--r--sdext/source/presenter/PresenterScrollBar.hxx20
-rw-r--r--sdext/source/presenter/PresenterSlidePreview.cxx8
-rw-r--r--sdext/source/presenter/PresenterSlidePreview.hxx6
-rw-r--r--sdext/source/presenter/PresenterSlideShowView.cxx18
-rw-r--r--sdext/source/presenter/PresenterSlideShowView.hxx60
-rw-r--r--sdext/source/presenter/PresenterSlideSorter.cxx60
-rw-r--r--sdext/source/presenter/PresenterSlideSorter.hxx16
-rw-r--r--sdext/source/presenter/PresenterSprite.cxx2
-rw-r--r--sdext/source/presenter/PresenterSprite.hxx12
-rw-r--r--sdext/source/presenter/PresenterSpritePane.cxx4
-rw-r--r--sdext/source/presenter/PresenterSpritePane.hxx12
-rw-r--r--sdext/source/presenter/PresenterTextView.cxx20
-rw-r--r--sdext/source/presenter/PresenterTextView.hxx16
-rw-r--r--sdext/source/presenter/PresenterTheme.cxx24
-rw-r--r--sdext/source/presenter/PresenterTheme.hxx8
-rw-r--r--sdext/source/presenter/PresenterTimer.cxx24
-rw-r--r--sdext/source/presenter/PresenterTimer.hxx12
-rw-r--r--sdext/source/presenter/PresenterToolBar.cxx72
-rw-r--r--sdext/source/presenter/PresenterToolBar.hxx28
-rw-r--r--sdext/source/presenter/PresenterUIPainter.cxx6
-rw-r--r--sdext/source/presenter/PresenterUIPainter.hxx4
-rw-r--r--sdext/source/presenter/PresenterViewFactory.cxx30
-rw-r--r--sdext/source/presenter/PresenterViewFactory.hxx8
-rw-r--r--sdext/source/presenter/PresenterWindowManager.cxx58
-rw-r--r--sdext/source/presenter/PresenterWindowManager.hxx14
-rw-r--r--sdext/source/presenter/registry/data/org/openoffice/Office/extension/PresenterScreen.xcu8
-rw-r--r--swext/mediawiki/build.xml12
-rw-r--r--swext/mediawiki/src/com/sun/star/wiki/EditPageParser.java22
-rw-r--r--swext/mediawiki/src/com/sun/star/wiki/Helper.java142
-rw-r--r--swext/mediawiki/src/com/sun/star/wiki/MainThreadDialogExecutor.java16
-rw-r--r--swext/mediawiki/src/com/sun/star/wiki/Settings.java88
-rw-r--r--swext/mediawiki/src/com/sun/star/wiki/WikiArticle.java88
-rw-r--r--swext/mediawiki/src/com/sun/star/wiki/WikiCancelException.java2
-rw-r--r--swext/mediawiki/src/com/sun/star/wiki/WikiDialog.java56
-rw-r--r--swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java64
-rw-r--r--swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java140
-rw-r--r--swext/mediawiki/src/com/sun/star/wiki/WikiOptionsEventHandlerImpl.java22
-rw-r--r--swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java40
-rw-r--r--swext/mediawiki/src/com/sun/star/wiki/WikiProtocolSocketFactory.java12
-rw-r--r--swext/mediawiki/src/registry/data/org/openoffice/Office/Addons.xcu2
-rw-r--r--swext/mediawiki/src/registry/data/org/openoffice/Office/Custom/WikiExtension.xcu10
-rw-r--r--swext/mediawiki/src/registry/data/org/openoffice/Office/OptionsDialog.xcu2
-rw-r--r--swext/mediawiki/src/registry/data/org/openoffice/Office/Paths.xcu2
-rw-r--r--swext/mediawiki/src/registry/data/org/openoffice/Office/ProtocolHandler.xcu2
-rw-r--r--swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/Filter.xcu2
-rw-r--r--swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/Types.xcu2
-rw-r--r--swext/mediawiki/src/uno-extension-manifest.xml48
433 files changed, 7171 insertions, 7021 deletions
diff --git a/migrationanalysis/src/driver_docs/ulf2dat.pl b/migrationanalysis/src/driver_docs/ulf2dat.pl
index 25b1fe2f7ebc..e97eb32e0f62 100644
--- a/migrationanalysis/src/driver_docs/ulf2dat.pl
+++ b/migrationanalysis/src/driver_docs/ulf2dat.pl
@@ -4,7 +4,7 @@ eval 'exec perl -wS $0 ${1+"$@"}'
#*************************************************************************
#
# 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
@@ -62,7 +62,7 @@ if ( $help ) {
open IN, "<$in_name" or die "Could not open $in_name for reading $! $^E";
-foreach $lang ( keys %files )
+foreach $lang ( keys %files )
{
open "F_$lang",">$files{$lang}" or die "Could not open $files{$lang} for writing $! $^E";
binmode "F_$lang";
@@ -80,7 +80,7 @@ while ( <IN> )
if ( $line =~ /^\[(.*)\]$/ )
{
$new_ID = $1;
-
+
write_transunit();
$ID = $new_ID;
%transunit = ();
@@ -117,11 +117,11 @@ sub write_transunit
{
$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";
- }
+ }
}
@@ -131,9 +131,9 @@ sub get_options {
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$/;
+# $arg =~ /.*[/\]([^/\]*)\.dat$/;
$lang = $1;
print "got $lang = $arg\n";
$files{ $lang } = $arg;
diff --git a/migrationanalysis/src/msokill/StdAfx.cpp b/migrationanalysis/src/msokill/StdAfx.cpp
index 79d505fb449a..2785112a345b 100644
--- a/migrationanalysis/src/msokill/StdAfx.cpp
+++ b/migrationanalysis/src/msokill/StdAfx.cpp
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -27,8 +27,8 @@
************************************************************************/
// 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
+// msokill.pch will be the pre-compiled header
+// stdafx.obj will contain the pre-compiled type information
#include "stdafx.h"
diff --git a/migrationanalysis/src/msokill/StdAfx.h b/migrationanalysis/src/msokill/StdAfx.h
index 1a26d751fd5d..88357f68f3f1 100644
--- a/migrationanalysis/src/msokill/StdAfx.h
+++ b/migrationanalysis/src/msokill/StdAfx.h
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -40,7 +40,7 @@
#pragma once
#endif // _MSC_VER > 1000
-#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
+#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
#include <stdio.h>
#pragma warning(push, 1)
diff --git a/migrationanalysis/src/msokill/msokill.cpp b/migrationanalysis/src/msokill/msokill.cpp
index 2125b3f773c7..32f602290b5b 100644
--- a/migrationanalysis/src/msokill/msokill.cpp
+++ b/migrationanalysis/src/msokill/msokill.cpp
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -135,12 +135,12 @@ BOOL KillAppFromWindow(
printf("App %s: window not found.\n,", appName);
#endif
bRet = FALSE;
- } else {
+ } 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
@@ -150,7 +150,7 @@ BOOL KillAppFromWindow(
} else {
if (!TerminateProcess(hProcess, 0)) {
LPTSTR lpMsgBuf;
- FormatMessage(
+ FormatMessage(
FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
NULL, GetLastError(), MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
(LPTSTR) &lpMsgBuf, 0, NULL );
@@ -185,19 +185,19 @@ BOOL CloseActiveDialogs() {
}
/*--------------------------------------------------------------
- Callback for EnumChildWindows that sends close message to
+ Callback for EnumChildWindows that sends close message to
any dialogs that match window class of MSO dialogs
--------------------------------------------------------------*/
-BOOL CALLBACK CloseOfficeDlgProc(HWND hwndChild, LPARAM)
-{
+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++;
@@ -215,21 +215,21 @@ BOOL CALLBACK CloseOfficeDlgProc(HWND hwndChild, LPARAM)
SendMessage(hwndChild, WM_CLOSE, 0, 0);
}
}
-
- return TRUE;
-}
+
+ return TRUE;
+}
/*--------------------------------------------------------------
- Callback for EnumChildWindows that counts numnnber of
+ Callback for EnumChildWindows that counts numnnber of
dialogs that match window class of MSO dialogs
--------------------------------------------------------------*/
-BOOL CALLBACK CountOfficeDlgProc(HWND hwndChild, LPARAM)
+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++;
@@ -242,12 +242,12 @@ BOOL CALLBACK CountOfficeDlgProc(HWND hwndChild, LPARAM)
}
}
- return TRUE;
-}
+ return TRUE;
+}
/*--------------------------------------------------------------
Simple usage message...
-
+
-------------------------------------------------------------*/
void printUsage() {
printf("Recovery Assistant Utility - try and put MSO apps in a recoverable state\n");
diff --git a/migrationanalysis/src/wizard/res_defines.h b/migrationanalysis/src/wizard/res_defines.h
index 046e6fc71dc7..63c63c8026e8 100644
--- a/migrationanalysis/src/wizard/res_defines.h
+++ b/migrationanalysis/src/wizard/res_defines.h
@@ -3,85 +3,85 @@
#define RES_DEFINES_H_INCLUDED
#define RID_STR_ANALYZE_SETUP_COMPLETE 1400
-#define RID_STR_ANALYZE_NUM_DOCS 1401
-#define RID_STR_ANALYZE_RUN_TOOL 1404
-#define RID_STR_ANALYZE_VIEW_RESULTS 1406
-#define RID_STR_ANALYZE_COMPLETED 1412
-#define RID_STR_ANALYZE_START 1413
-#define RID_STR_ANALYZE_VIEW_NOW 1414
-#define RID_STR_ANALYZE_VIEW_LATER 1415
+#define RID_STR_ANALYZE_NUM_DOCS 1401
+#define RID_STR_ANALYZE_RUN_TOOL 1404
+#define RID_STR_ANALYZE_VIEW_RESULTS 1406
+#define RID_STR_ANALYZE_COMPLETED 1412
+#define RID_STR_ANALYZE_START 1413
+#define RID_STR_ANALYZE_VIEW_NOW 1414
+#define RID_STR_ANALYZE_VIEW_LATER 1415
#define RID_STR_ANALYSE_NOT_RUN 1416
#define RID_STR_ANALYZE_PREPARE_DOCS 1411
-#define RID_STR_ANALYZE_DOCUMENTS 1402
-#define RID_STR_ANALYZE_TEMPLATES 1403
-#define RID_STR_ANALYZE_DOCUMENTS_XLS 1408
-#define RID_STR_ANALYZE_DOCUMENTS_PPT 1409
+#define RID_STR_ANALYZE_DOCUMENTS 1402
+#define RID_STR_ANALYZE_TEMPLATES 1403
+#define RID_STR_ANALYZE_DOCUMENTS_XLS 1408
+#define RID_STR_ANALYZE_DOCUMENTS_PPT 1409
-#define RID_STR_ERROR_AUTOMATION_SERVER_FAILED 1920
+#define RID_STR_ERROR_AUTOMATION_SERVER_FAILED 1920
#define RID_STR_ERROR_CANNOT_CREATE_RESULTS_DIRECTORY 1904
#define RID_STR_ERROR_CHOOSE_DOCUMENT_TYPE 1902
-#define RID_STR_ERROR_CREATE_FILE 1922
+#define RID_STR_ERROR_CREATE_FILE 1922
#define RID_STR_ERROR_EXCEL_ANALYSIS_FAILED 1907
#define RID_STR_ERROR_EXCEL_OPEN 1918
#define RID_STR_ERROR_MACRO_SECURITY_SET 1919
#define RID_STR_ERROR_MISSING_DOCUMENTS_DIRECTORY 1901
-#define RID_STR_ERROR_MISSING_EXCEL_DRIVER 1906
-#define RID_STR_ERROR_MISSING_ISSUES_LIST 1915
-#define RID_STR_ERROR_MISSING_MIGRATION_RESULTS 1900
-#define RID_STR_ERROR_MISSING_POWERPOINT_DRIVER 1911
-#define RID_STR_ERROR_MISSING_README 1910
-#define RID_STR_ERROR_MISSING_RESULTS_TEMPLATE 1905
-#define RID_STR_ERROR_MISSING_WORD_DRIVER 1908
-#define RID_STR_ERROR_MSOFFICE_9_REQUIRED 1913
-#define RID_STR_ERROR_NO_RESULTS_DIRECTORY 1921
-#define RID_STR_ERROR_POWERPOINT_ANALYSIS_FAILED 1912
-#define RID_STR_ERROR_RESULTS_DIRECTORY_DOES_NOT_EXIST 1903
-#define RID_STR_ERROR_RESULTS_SPREADSHEET_OPEN 1917
-#define RID_STR_ERROR_VERSION_MISMATCH 1914
-#define RID_STR_ERROR_WIN2000_REQUIRED 1916
-#define RID_STR_ERROR_WORD_ANALYSIS_FAILED 1909
-#define RID_STR_ERROR_APP_NOT_INSTALLED 1924
-#define RID_STR_ERROR_CDROM_NOT_ALLOWED 1925
-#define RID_STR_ERROR_CDROM_NOT_READY 1926
-#define RID_STR_ERROR_NO_WRITE_TO_READ_ONLY_FOLDER 1927
-#define RID_STR_ERROR_APPLICATION_STILL_RUNNING 1928
-#define RID_STR_ERROR_MISSING_IMPORTANT_FILE 1929
-
-
-#define RID_STR_INTRODUCTION 1100
-#define RID_STR_INTRODUCTION_INTRO1 1101
-#define RID_STR_INTRODUCTION_INTRO2 1102
-#define RID_STR_INTRODUCTION_INTRO3 1104
-
-#define RID_STR_NAVBAR_BACK_BTN 1021
-#define RID_STR_NAVBAR_EXIT_BTN 1024
-#define RID_STR_NAVBAR_FINISH_BTN 1023
-#define RID_STR_NAVBAR_HELP_BTN 1020
-#define RID_STR_NAVBAR_NEXT_BTN 1022
+#define RID_STR_ERROR_MISSING_EXCEL_DRIVER 1906
+#define RID_STR_ERROR_MISSING_ISSUES_LIST 1915
+#define RID_STR_ERROR_MISSING_MIGRATION_RESULTS 1900
+#define RID_STR_ERROR_MISSING_POWERPOINT_DRIVER 1911
+#define RID_STR_ERROR_MISSING_README 1910
+#define RID_STR_ERROR_MISSING_RESULTS_TEMPLATE 1905
+#define RID_STR_ERROR_MISSING_WORD_DRIVER 1908
+#define RID_STR_ERROR_MSOFFICE_9_REQUIRED 1913
+#define RID_STR_ERROR_NO_RESULTS_DIRECTORY 1921
+#define RID_STR_ERROR_POWERPOINT_ANALYSIS_FAILED 1912
+#define RID_STR_ERROR_RESULTS_DIRECTORY_DOES_NOT_EXIST 1903
+#define RID_STR_ERROR_RESULTS_SPREADSHEET_OPEN 1917
+#define RID_STR_ERROR_VERSION_MISMATCH 1914
+#define RID_STR_ERROR_WIN2000_REQUIRED 1916
+#define RID_STR_ERROR_WORD_ANALYSIS_FAILED 1909
+#define RID_STR_ERROR_APP_NOT_INSTALLED 1924
+#define RID_STR_ERROR_CDROM_NOT_ALLOWED 1925
+#define RID_STR_ERROR_CDROM_NOT_READY 1926
+#define RID_STR_ERROR_NO_WRITE_TO_READ_ONLY_FOLDER 1927
+#define RID_STR_ERROR_APPLICATION_STILL_RUNNING 1928
+#define RID_STR_ERROR_MISSING_IMPORTANT_FILE 1929
+
+
+#define RID_STR_INTRODUCTION 1100
+#define RID_STR_INTRODUCTION_INTRO1 1101
+#define RID_STR_INTRODUCTION_INTRO2 1102
+#define RID_STR_INTRODUCTION_INTRO3 1104
+
+#define RID_STR_NAVBAR_BACK_BTN 1021
+#define RID_STR_NAVBAR_EXIT_BTN 1024
+#define RID_STR_NAVBAR_FINISH_BTN 1023
+#define RID_STR_NAVBAR_HELP_BTN 1020
+#define RID_STR_NAVBAR_NEXT_BTN 1022
#define RID_STR_RESULTS_CHOOSE_OPTIONS 1300
#define RID_STR_RESULTS_RESULTS_SPREADSHEET 1301
-#define RID_STR_RESULTS_ANALYSIS_XLS 1302
+#define RID_STR_RESULTS_ANALYSIS_XLS 1302
#define RID_STR_RESULTS_RESULTS_DIRECTORY 1304
-#define RID_STR_RESULTS_CHOOSE_SAVE_OPTIONS 1311
-#define RID_STR_RESULTS_CHOOSE_PROMPT 1312
-#define RID_STR_RESULTS_CHOOSE_OVERWRITE 1313
-#define RID_STR_RESULTS_CHOOSE_APPEND 1314
-
-#define RID_STR_OTHER_APPLICATON_LOG_PATH 1812
-#define RID_STR_OTHER_RUNNING 1810
-#define RID_STR_OTHER_SELECT_ANALYZE_DIRECTORY 1806
-#define RID_STR_OTHER_SELECT_RESULTS_DIRECTORY 1807
-#define RID_STR_OTHER_XML_RESULTS 1815
-#define RID_STR_OTHER_README_PATH 1805
-
-#define RID_STR_DOCUMENTS_CHOOSE_DOCUMENTS 1200
-#define RID_STR_DOCUMENTS_DOCUMENTS_DIRECTORY 1201
-#define RID_STR_DOCUMENTS_INCLUDE_SUBDIRECTORIES 1202
-#define RID_STR_DOCUMENTS_ROOT_C 1205
+#define RID_STR_RESULTS_CHOOSE_SAVE_OPTIONS 1311
+#define RID_STR_RESULTS_CHOOSE_PROMPT 1312
+#define RID_STR_RESULTS_CHOOSE_OVERWRITE 1313
+#define RID_STR_RESULTS_CHOOSE_APPEND 1314
+
+#define RID_STR_OTHER_APPLICATON_LOG_PATH 1812
+#define RID_STR_OTHER_RUNNING 1810
+#define RID_STR_OTHER_SELECT_ANALYZE_DIRECTORY 1806
+#define RID_STR_OTHER_SELECT_RESULTS_DIRECTORY 1807
+#define RID_STR_OTHER_XML_RESULTS 1815
+#define RID_STR_OTHER_README_PATH 1805
+
+#define RID_STR_DOCUMENTS_CHOOSE_DOCUMENTS 1200
+#define RID_STR_DOCUMENTS_DOCUMENTS_DIRECTORY 1201
+#define RID_STR_DOCUMENTS_INCLUDE_SUBDIRECTORIES 1202
+#define RID_STR_DOCUMENTS_ROOT_C 1205
#define RID_STR_DOCUMENTS_CHOOSE_DOC_TYPES 1206
#define RID_STR_DOCUMENTS_CHOOSE_WORD 1207
#define RID_STR_DOCUMENTS_CHOOSE_DOC 1208
@@ -93,26 +93,26 @@
#define RID_STR_DOCUMENTS_CHOOSE_PPT 1214
#define RID_STR_DOCUMENTS_CHOOSE_POT 1215
-#define RID_STR_SIDEBAR_STEPS 1040
-#define RID_STR_SIDEBAR_INTRODUCTION 1041
-#define RID_STR_SIDEBAR_DOCUMENTS 1042
-#define RID_STR_SIDEBAR_RESULTS 1043
-#define RID_STR_SIDEBAR_ANALYZE 1044
+#define RID_STR_SIDEBAR_STEPS 1040
+#define RID_STR_SIDEBAR_INTRODUCTION 1041
+#define RID_STR_SIDEBAR_DOCUMENTS 1042
+#define RID_STR_SIDEBAR_RESULTS 1043
+#define RID_STR_SIDEBAR_ANALYZE 1044
-#define RID_STR_TITLE 1000
-#define RID_STR_PRODUCTNAME 1001
+#define RID_STR_TITLE 1000
+#define RID_STR_PRODUCTNAME 1001
// Preparation
#define RID_STR_SIDEBAR_ANALYZE_PREP 1074
#define RID_STR_TITLE_PREP 1030
-#define RID_STR_INTRODUCTION_INTRO1_PREP 1131
-#define RID_STR_INTRODUCTION_INTRO2_PREP 1132
-#define RID_STR_INTRODUCTION_INTRO3_PREP 1134
+#define RID_STR_INTRODUCTION_INTRO1_PREP 1131
+#define RID_STR_INTRODUCTION_INTRO2_PREP 1132
+#define RID_STR_INTRODUCTION_INTRO3_PREP 1134
-#define RID_STR_DOCUMENTS_CHOOSE_DOCUMENTS_PREP 1230
-#define RID_STR_DOCUMENTS_INCLUDE_SUBDIRECTORIES_PREP 1232
+#define RID_STR_DOCUMENTS_CHOOSE_DOCUMENTS_PREP 1230
+#define RID_STR_DOCUMENTS_INCLUDE_SUBDIRECTORIES_PREP 1232
#define RID_STR_DOCUMENTS_CHOOSE_DOC_TYPES_PREP 1236
#define RID_STR_IGNORE_OLDER_CB_ID 1231
@@ -121,16 +121,16 @@
#define RID_STR_IGNORE_OLDER_12_MONTHS_ID 1235
#define RID_STR_RESULTS_CHOOSE_OPTIONS_PREP 1330
-#define RID_STR_RESULTS_ANALYSIS_XLS_PREP 1332
+#define RID_STR_RESULTS_ANALYSIS_XLS_PREP 1332
-#define RID_STR_ANALYZE_NUM_DOCS_PREP 1431
-#define RID_STR_ANALYZE_SETUP_COMPLETE_PREP 1430
+#define RID_STR_ANALYZE_NUM_DOCS_PREP 1431
+#define RID_STR_ANALYZE_SETUP_COMPLETE_PREP 1430
#define RID_STR_ANALYZE_IGNORED_DOCS 1435
#define RID_STR_OTHER_PLEASE_REFER_TO_README_PREP 1838
#define RID_STR_OTHER_XML_RESULTS_PREP 1845
#define RID_STR_OTHER_PREPARE_PROMPT_PREP 1846
-#define RID_STR_OTHER_PREPARE_COMPLETED_PREP 1847
+#define RID_STR_OTHER_PREPARE_COMPLETED_PREP 1847
// Progress
#define RID_STR_PROGRESS_CAPTION 1820
diff --git a/mysqlc/source/description.xml b/mysqlc/source/description.xml
index 458ee6efb4d1..cc32c2531043 100755
--- a/mysqlc/source/description.xml
+++ b/mysqlc/source/description.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<description xmlns="http://openoffice.org/extensions/description/2006" xmlns:d="http://openoffice.org/extensions/description/2006"
+<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#" />
+ <version value="#VERSION#" />
<platform value="UPDATED_SUPPORTED_PLATFORM" />
<display-name>
<name lang="en-US">#TITLE#</name>
@@ -21,4 +21,4 @@
<extension-description>
<src lang="#LANG#" xlink:href="description/description_#LANG#.txt"/>
</extension-description>
-</description>
+</description>
diff --git a/mysqlc/source/mysqlc.xml b/mysqlc/source/mysqlc.xml
index 04e7d4ae708e..5c19802f162c 100644
--- a/mysqlc/source/mysqlc.xml
+++ b/mysqlc/source/mysqlc.xml
@@ -11,69 +11,69 @@
<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>
+ <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>
- <runtime-module-dependency> cppuhelper </runtime-module-dependency>
- <runtime-module-dependency> cppu1 </runtime-module-dependency>
- <runtime-module-dependency> sal1 </runtime-module-dependency>
+ <runtime-module-dependency> cppuhelper </runtime-module-dependency>
+ <runtime-module-dependency> cppu1 </runtime-module-dependency>
+ <runtime-module-dependency> sal1 </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>
+ <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
index ac601e24465a..124d10861b1c 100644
--- a/mysqlc/source/mysqlc_connection.cxx
+++ b/mysqlc/source/mysqlc_connection.cxx
@@ -1,7 +1,7 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
* 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
@@ -74,7 +74,7 @@ using ::rtl::OUString;
/* {{{ OConnection::OConnection() -I- */
-OConnection::OConnection(MysqlCDriver& _rDriver, sql::Driver * _cppDriver)
+OConnection::OConnection(MysqlCDriver& _rDriver, sql::Driver * _cppDriver)
:OMetaConnection_BASE(m_aMutex)
,OSubComponent<OConnection, OConnection_BASE>((::cppu::OWeakObject*)&_rDriver, this)
,m_xMetaData(NULL)
@@ -116,7 +116,7 @@ void SAL_CALL OConnection::release()
#endif
/* {{{ OConnection::construct() -I- */
-void OConnection::construct(const OUString& url, const Sequence< PropertyValue >& info)
+void OConnection::construct(const OUString& url, const Sequence< PropertyValue >& info)
throw(SQLException)
{
OSL_TRACE("OConnection::construct");
@@ -161,8 +161,8 @@ void OConnection::construct(const OUString& url, const Sequence< PropertyValue >
}
// get user and password for mysql connection
- const PropertyValue *pIter = info.getConstArray();
- const PropertyValue *pEnd = pIter + info.getLength();
+ const PropertyValue *pIter = info.getConstArray();
+ const PropertyValue *pEnd = pIter + info.getLength();
OUString aUser, aPass, sUnixSocket, sNamedPipe;
bool unixSocketPassed = false;
bool namedPipePassed = false;
@@ -402,7 +402,7 @@ void SAL_CALL OConnection::commit()
m_settings.cppConnection->commit();
} catch (sql::SQLException & e) {
mysqlc_sdbc_driver::translateAndThrow(e, *this, getConnectionEncoding());
- }
+ }
}
/* }}} */
@@ -475,7 +475,7 @@ void SAL_CALL OConnection::setReadOnly(sal_Bool 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);
@@ -495,11 +495,11 @@ void SAL_CALL OConnection::setCatalog(const OUString& catalog)
checkDisposed(OConnection_BASE::rBHelper.bDisposed);
try {
-// m_settings.cppConnection->setCatalog(OUStringToOString(catalog, m_settings.encoding).getStr());
+// 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());
- }
+ }
}
/* }}} */
@@ -548,7 +548,7 @@ void SAL_CALL OConnection::setTransactionIsolation(sal_Int32 level)
break;
case TransactionIsolation::NONE:
cpplevel = sql::TRANSACTION_SERIALIZABLE;
- break;
+ break;
default:;
/* XXX: Exception ?? */
}
@@ -571,16 +571,16 @@ sal_Int32 SAL_CALL OConnection::getTransactionIsolation()
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;
+ 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;
}
/* }}} */
@@ -683,8 +683,8 @@ void OConnection::disposing()
}
m_aStatements.clear();
- m_bClosed = sal_True;
- m_xMetaData = WeakReference< XDatabaseMetaData >();
+ m_bClosed = sal_True;
+ m_xMetaData = WeakReference< XDatabaseMetaData >();
dispose_ChildImpl();
OConnection_BASE::disposing();
@@ -710,14 +710,14 @@ OUString OConnection::getMysqlVariable(const char *varname)
try {
XStatement * stmt = new OStatement(this, m_settings.cppConnection->createStatement());
- Reference< XResultSet > rs = stmt->executeQuery( aStatement.makeStringAndClear() );
+ 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;
}
@@ -749,17 +749,17 @@ sal_Int32 OConnection::getMysqlVersion()
// 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;
+// 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)
@@ -775,7 +775,7 @@ sal_Int32 OConnection::getMysqlVersion()
} catch(const Exception&) {}
}
if ( m_xParameterSubstitution.is() ) {
- try {
+ try {
sSqlStatement = m_xParameterSubstitution->substituteVariables(sSqlStatement,sal_True);
} catch(const Exception&) { }
}
diff --git a/mysqlc/source/mysqlc_connection.hxx b/mysqlc/source/mysqlc_connection.hxx
index 20f9ffac141c..ac3c4ccd79a2 100644
--- a/mysqlc/source/mysqlc_connection.hxx
+++ b/mysqlc/source/mysqlc_connection.hxx
@@ -1,7 +1,7 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
* 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
@@ -79,7 +79,7 @@ namespace connectivity
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,
+ typedef ::cppu::WeakComponentImplHelper3< ::com::sun::star::sdbc::XConnection,
::com::sun::star::sdbc::XWarningsSupplier,
::com::sun::star::lang::XServiceInfo
> OMetaConnection_BASE;
@@ -112,33 +112,33 @@ namespace connectivity
::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
+ 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
+ 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;
+ sal_Bool m_bClosed;
+ sal_Bool m_bUseCatalog; // should we use the catalog on filebased databases
+ sal_Bool m_bUseOldDateFormat;
- void buildTypeInfo() throw(SQLException);
+ void buildTypeInfo() throw(SQLException);
public:
OUString getMysqlVariable(const char *varname)
throw(SQLException, RuntimeException);
- sal_Int32 getMysqlVersion()
+ sal_Int32 getMysqlVersion()
throw(SQLException, RuntimeException);
virtual void construct(const OUString& url,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info)
@@ -147,7 +147,7 @@ namespace connectivity
OConnection(MysqlCDriver& _rDriver, sql::Driver * cppDriver);
virtual ~OConnection();
- void closeAllStatements () throw(SQLException);
+ void closeAllStatements () throw(SQLException);
rtl_TextEncoding getConnectionEncoding() { return m_settings.encoding; }
@@ -157,7 +157,7 @@ namespace connectivity
virtual void SAL_CALL disposing(void);
// XInterface
- virtual void SAL_CALL release() throw();
+ virtual void SAL_CALL release() throw();
// XServiceInfo
DECLARE_SERVICE_INFO();
@@ -228,12 +228,12 @@ namespace connectivity
//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; }
+ 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.
diff --git a/mysqlc/source/mysqlc_databasemetadata.cxx b/mysqlc/source/mysqlc_databasemetadata.cxx
index a0ecf2ab854c..498ed77cd275 100644
--- a/mysqlc/source/mysqlc_databasemetadata.cxx
+++ b/mysqlc/source/mysqlc_databasemetadata.cxx
@@ -1,7 +1,7 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
* 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
@@ -255,8 +255,8 @@ sal_Bool ODatabaseMetaData::impl_getRSTypeMetaData(const sal_Char* _methodName,
{
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;
+ 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);
@@ -1200,10 +1200,10 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getDefaultTransactionIsolation()
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;
+ 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);
@@ -1380,7 +1380,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetConcurrency(sal_Int32 setT
try {
return meta->supportsResultSetConcurrency(setType, concurrency==com::sun::star::sdbc::TransactionIsolation::READ_COMMITTED?
sql::TRANSACTION_READ_COMMITTED:
- (concurrency == com::sun::star::sdbc::TransactionIsolation::SERIALIZABLE?
+ (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);
@@ -1658,7 +1658,7 @@ Reference< XResultSet > SAL_CALL 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;
- ext_std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
+ ext_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());
@@ -1690,17 +1690,17 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumnPrivileges(
/* {{{ ODatabaseMetaData::getColumns() -I- */
-Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns(
+Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns(
const Any& catalog,
const OUString& schemaPattern,
- const OUString& tableNamePattern,
+ 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;
- ext_std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
+ ext_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());
@@ -1739,9 +1739,9 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns(
/* {{{ ODatabaseMetaData::getTables() -I- */
-Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables(
+Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables(
const Any& catalog,
- const OUString& schemaPattern,
+ const OUString& schemaPattern,
const OUString& tableNamePattern,
const Sequence< OUString >& types )
throw(SQLException, RuntimeException)
@@ -1803,7 +1803,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables(
/* {{{ ODatabaseMetaData::getProcedureColumns() -I- */
Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedureColumns(
const Any& /* catalog */,
- const OUString& /* schemaPattern */,
+ const OUString& /* schemaPattern */,
const OUString& /* procedureNamePattern */,
const OUString& /* columnNamePattern */)
throw(SQLException, RuntimeException)
@@ -1830,7 +1830,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedures(
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,
@@ -1886,7 +1886,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getExportedKeys(
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;
- ext_std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
+ ext_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());
@@ -1928,7 +1928,7 @@ Reference< XResultSet > SAL_CALL 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;
- ext_std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
+ ext_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());
@@ -2012,7 +2012,7 @@ Reference< XResultSet > SAL_CALL 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;
- ext_std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
+ ext_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());
@@ -2043,7 +2043,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getIndexInfo(
/* {{{ ODatabaseMetaData::getBestRowIdentifier() -I- */
-Reference< XResultSet > SAL_CALL ODatabaseMetaData::getBestRowIdentifier(
+Reference< XResultSet > SAL_CALL ODatabaseMetaData::getBestRowIdentifier(
const Any& catalog,
const OUString& schema,
const OUString& table,
@@ -2055,7 +2055,7 @@ Reference< XResultSet > SAL_CALL 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;
- ext_std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
+ ext_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());
@@ -2096,7 +2096,7 @@ Reference< XResultSet > SAL_CALL 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;
- ext_std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
+ ext_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());
@@ -2161,7 +2161,7 @@ Reference< XResultSet > SAL_CALL 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;
- ext_std::string primaryCat(primaryCatalog.hasValue()? OUStringToOString(getStringFromAny(primaryCatalog), m_rConnection.getConnectionEncoding()).getStr():""),
+ ext_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()),
diff --git a/mysqlc/source/mysqlc_databasemetadata.hxx b/mysqlc/source/mysqlc_databasemetadata.hxx
index 3904df0cb04f..5b9941430cd3 100644
--- a/mysqlc/source/mysqlc_databasemetadata.hxx
+++ b/mysqlc/source/mysqlc_databasemetadata.hxx
@@ -1,7 +1,7 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
* 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
@@ -58,12 +58,12 @@ namespace connectivity
class ODatabaseMetaData : public ODatabaseMetaData_BASE
{
- OConnection& m_rConnection;
- sal_Bool m_bUseCatalog;
+ OConnection& m_rConnection;
+ sal_Bool m_bUseCatalog;
protected:
sql::DatabaseMetaData * meta;
- OUString identifier_quote_string;
- bool identifier_quote_string_set;
+ OUString identifier_quote_string;
+ bool identifier_quote_string_set;
private:
OUString impl_getStringMetaData( const sal_Char* _methodName, const ext_std::string& (sql::DatabaseMetaData::*_Method)() );
@@ -83,127 +83,127 @@ namespace connectivity
// 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 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 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 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 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 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 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_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);
+ 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);
@@ -223,15 +223,15 @@ namespace connectivity
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 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 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);
diff --git a/mysqlc/source/mysqlc_driver.cxx b/mysqlc/source/mysqlc_driver.cxx
index 6b77cd94b2e2..1d4d27890dc7 100644
--- a/mysqlc/source/mysqlc_driver.cxx
+++ b/mysqlc/source/mysqlc_driver.cxx
@@ -1,7 +1,7 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
* 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
@@ -67,7 +67,7 @@ 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)
{
@@ -99,7 +99,7 @@ Sequence< OUString > MysqlCDriver::getSupportedServiceNames_Static()
throw(RuntimeException)
{
OSL_TRACE("MysqlCDriver::getSupportedServiceNames_Static");
- // which service is supported
+ // 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");
@@ -231,7 +231,7 @@ Reference< XConnection > SAL_CALL MysqlCDriver::connect(const OUString& url, con
}
catch (sql::SQLException &e)
{
- mysqlc_sdbc_driver::translateAndThrow(e, *this, getDefaultEncoding());
+ mysqlc_sdbc_driver::translateAndThrow(e, *this, getDefaultEncoding());
}
return xConn;
}
@@ -312,7 +312,7 @@ Reference< XInterface > SAL_CALL MysqlCDriver_CreateInstance(const Reference< X
/* {{{ connectivity::mysqlc::release() -I- */
void release(oslInterlockedCount& _refCount,
::cppu::OBroadcastHelper& rBHelper,
- Reference< XInterface >& _xInterface,
+ Reference< XInterface >& _xInterface,
::com::sun::star::lang::XComponent* _pObject)
{
if (osl_decrementInterlockedCount(&_refCount) == 0) {
diff --git a/mysqlc/source/mysqlc_driver.hxx b/mysqlc/source/mysqlc_driver.hxx
index d3c367ad4549..3a17fd531425 100644
--- a/mysqlc/source/mysqlc_driver.hxx
+++ b/mysqlc/source/mysqlc_driver.hxx
@@ -1,7 +1,7 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
* 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
@@ -54,7 +54,7 @@ namespace connectivity
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,
+ typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::sdbc::XDriver,
::com::sun::star::lang::XServiceInfo > ODriver_BASE;
typedef void* (SAL_CALL * OMysqlCConnection_CreateInstanceFunction)(void* _pDriver);
@@ -63,8 +63,8 @@ namespace connectivity
{
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
+ ::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
@@ -81,13 +81,13 @@ namespace connectivity
// OComponentHelper
void SAL_CALL disposing(void);
// XInterface
- static OUString getImplementationName_Static() throw(RuntimeException);
- static Sequence< OUString > getSupportedServiceNames_Static() throw(RuntimeException);
+ 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);
+ 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)
@@ -97,8 +97,8 @@ namespace connectivity
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);
+ 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; }
diff --git a/mysqlc/source/mysqlc_general.cxx b/mysqlc/source/mysqlc_general.cxx
index e4fa7a58254c..03e1264d3cc1 100644
--- a/mysqlc/source/mysqlc_general.cxx
+++ b/mysqlc/source/mysqlc_general.cxx
@@ -1,7 +1,7 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
* 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
@@ -129,19 +129,19 @@ int mysqlToOOOType(int cppConnType)
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;
@@ -150,7 +150,7 @@ int mysqlToOOOType(int cppConnType)
case sql::DataType::GEOMETRY:
return com::sun::star::sdbc::DataType::VARCHAR;
-
+
case sql::DataType::SQLNULL:
return com::sun::star::sdbc::DataType::SQLNULL;
diff --git a/mysqlc/source/mysqlc_general.hxx b/mysqlc/source/mysqlc_general.hxx
index 113301eaa666..5e4463bec38d 100644
--- a/mysqlc/source/mysqlc_general.hxx
+++ b/mysqlc/source/mysqlc_general.hxx
@@ -1,7 +1,7 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
* 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
diff --git a/mysqlc/source/mysqlc_preparedstatement.cxx b/mysqlc/source/mysqlc_preparedstatement.cxx
index f81865849450..89507b64b14d 100644
--- a/mysqlc/source/mysqlc_preparedstatement.cxx
+++ b/mysqlc/source/mysqlc_preparedstatement.cxx
@@ -1,7 +1,7 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
* 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
@@ -146,7 +146,7 @@ Reference< XResultSetMetaData > SAL_CALL OPreparedStatement::getMetaData()
OSL_TRACE("OPreparedStatement::getMetaData");
MutexGuard aGuard(m_aMutex);
checkDisposed(OPreparedStatement::rBHelper.bDisposed);
-
+
try {
if (!m_xMetaData.is()) {
m_xMetaData = new OResultSetMetaData(
@@ -172,7 +172,7 @@ void SAL_CALL OPreparedStatement::close()
MutexGuard aGuard(m_aMutex);
checkDisposed(OPreparedStatement::rBHelper.bDisposed);
-
+
try {
clearWarnings();
clearParameters();
@@ -213,7 +213,7 @@ sal_Int32 SAL_CALL OPreparedStatement::executeUpdate()
OSL_TRACE("OPreparedStatement::executeUpdate");
MutexGuard aGuard(m_aMutex);
checkDisposed(OPreparedStatement::rBHelper.bDisposed);
-
+
sal_Int32 affectedRows = sal_False;
try {
affectedRows = ((sql::PreparedStatement *)cppStatement)->executeUpdate();
@@ -241,7 +241,7 @@ void SAL_CALL OPreparedStatement::setString(sal_Int32 parameter, const OUString&
mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::clearParameters", *this);
} catch (sql::SQLException &e) {
mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding());
- }
+ }
}
/* }}} */
@@ -311,7 +311,7 @@ void SAL_CALL OPreparedStatement::setBoolean(sal_Int32 parameter, sal_Bool x)
mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::setBoolean", *this);
} catch (sql::SQLException &e) {
mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding());
- }
+ }
}
/* }}} */
@@ -331,7 +331,7 @@ void SAL_CALL OPreparedStatement::setByte(sal_Int32 parameter, sal_Int8 x)
mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::setByte", *this);
} catch (sql::SQLException &e) {
mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding());
- }
+ }
}
/* }}} */
@@ -359,7 +359,7 @@ void SAL_CALL OPreparedStatement::setDate(sal_Int32 parameter, const Date& aData
mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::setDate", *this);
} catch (sql::SQLException &e) {
mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding());
- }
+ }
}
/* }}} */
@@ -387,7 +387,7 @@ void SAL_CALL OPreparedStatement::setTime(sal_Int32 parameter, const Time& aVal)
mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::setTime", *this);
} catch (sql::SQLException &e) {
mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding());
- }
+ }
}
/* }}} */
@@ -423,7 +423,7 @@ void SAL_CALL OPreparedStatement::setTimestamp(sal_Int32 parameter, const DateTi
mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::setTimestamp", *this);
} catch (sql::SQLException &e) {
mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding());
- }
+ }
}
/* }}} */
@@ -443,7 +443,7 @@ void SAL_CALL OPreparedStatement::setDouble(sal_Int32 parameter, double x)
mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::setDouble", *this);
} catch (sql::SQLException &e) {
mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding());
- }
+ }
}
/* }}} */
@@ -463,7 +463,7 @@ void SAL_CALL OPreparedStatement::setFloat(sal_Int32 parameter, float x)
mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::setFloat", *this);
} catch (sql::SQLException &e) {
mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding());
- }
+ }
}
/* }}} */
@@ -483,7 +483,7 @@ void SAL_CALL OPreparedStatement::setInt(sal_Int32 parameter, sal_Int32 x)
mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::setInt", *this);
} catch (sql::SQLException &e) {
mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding());
- }
+ }
}
/* }}} */
@@ -503,7 +503,7 @@ void SAL_CALL OPreparedStatement::setLong(sal_Int32 parameter, sal_Int64 aVal)
mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::setLong", *this);
} catch (sql::SQLException &e) {
mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding());
- }
+ }
}
/* }}} */
@@ -523,7 +523,7 @@ void SAL_CALL OPreparedStatement::setNull(sal_Int32 parameter, sal_Int32 sqlType
mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::setNull", *this);
} catch (sql::SQLException &e) {
mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding());
- }
+ }
}
/* }}} */
@@ -792,7 +792,7 @@ void SAL_CALL OPreparedStatement::setShort(sal_Int32 parameter, sal_Int16 x)
mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::setShort", *this);
} catch (sql::SQLException &e) {
mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding());
- }
+ }
}
/* }}} */
@@ -806,14 +806,14 @@ void SAL_CALL OPreparedStatement::setBytes(sal_Int32 parameter, const Sequence<
checkDisposed(OPreparedStatement::rBHelper.bDisposed);
checkParameterIndex(parameter);
- ext_std::string blobby((char *)x.getConstArray(), x.getLength());
+ ext_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());
- }
+ }
}
/* }}} */
@@ -864,7 +864,7 @@ void SAL_CALL OPreparedStatement::clearParameters()
mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::clearParameters", *this);
} catch (sql::SQLException &e) {
mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding());
- }
+ }
}
/* }}} */
diff --git a/mysqlc/source/mysqlc_preparedstatement.hxx b/mysqlc/source/mysqlc_preparedstatement.hxx
index daf2610f996d..65d9492b76dd 100644
--- a/mysqlc/source/mysqlc_preparedstatement.hxx
+++ b/mysqlc/source/mysqlc_preparedstatement.hxx
@@ -1,7 +1,7 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
* 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
@@ -55,18 +55,18 @@ namespace connectivity
using ::com::sun::star::sdbc::XResultSetMetaData;
class OBoundParam;
- typedef ::cppu::ImplHelper5< ::com::sun::star::sdbc::XPreparedStatement,
+ 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,
+ 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
+ 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);
@@ -80,7 +80,7 @@ namespace connectivity
OPreparedStatement(OConnection* _pConnection, sql::PreparedStatement * cppPrepStmt);
//XInterface
- Any SAL_CALL queryInterface(const Type & rType) throw(RuntimeException);
+ Any SAL_CALL queryInterface(const Type & rType) throw(RuntimeException);
void SAL_CALL acquire() throw();
void SAL_CALL release() throw();
@@ -89,7 +89,7 @@ namespace connectivity
throw(RuntimeException);
// XPreparedStatement
- Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL executeQuery() throw(SQLException, RuntimeException);
+ 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);
@@ -103,26 +103,26 @@ namespace connectivity
throw(SQLException, RuntimeException);
// XParameters
- void SAL_CALL setNull(sal_Int32 parameter, sal_Int32 sqlType) throw(SQLException, RuntimeException);
+ 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 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 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 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 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 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 setFloat(sal_Int32 parameter, float x) throw(SQLException, RuntimeException);
- void SAL_CALL setDouble(sal_Int32 parameter, double 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 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);
@@ -141,7 +141,7 @@ namespace connectivity
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 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);
@@ -163,7 +163,7 @@ namespace connectivity
// 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);
+ ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL executeBatch() throw(SQLException, RuntimeException);
// XCloseable
void SAL_CALL close() throw(SQLException, RuntimeException);
@@ -184,6 +184,6 @@ namespace connectivity
* vim600: noet sw=4 ts=4 fdm=marker
* vim<600: noet sw=4 ts=4
*/
-
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/mysqlc/source/mysqlc_propertyids.cxx b/mysqlc/source/mysqlc_propertyids.cxx
index 77cfa7b01b9e..ecd6e2b4a8f2 100644
--- a/mysqlc/source/mysqlc_propertyids.cxx
+++ b/mysqlc/source/mysqlc_propertyids.cxx
@@ -1,7 +1,7 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
* 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
@@ -37,64 +37,64 @@ 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"; }
+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 "/"; }
+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 "/"; }
diff --git a/mysqlc/source/mysqlc_propertyids.hxx b/mysqlc/source/mysqlc_propertyids.hxx
index 294ed509ee23..9fc802efdae4 100644
--- a/mysqlc/source/mysqlc_propertyids.hxx
+++ b/mysqlc/source/mysqlc_propertyids.hxx
@@ -18,7 +18,7 @@ namespace mysqlc
{
class OPropertyMap
{
- ::std::map<sal_Int32 , rtl_uString*> m_aPropertyMap;
+ ::std::map<sal_Int32 , rtl_uString*> m_aPropertyMap;
::rtl::OUString fillValue(sal_Int32 _nIndex);
public:
@@ -40,10 +40,10 @@ namespace mysqlc
struct UStringDescription
{
- const sal_Char* pZeroTerminatedName;
+ const sal_Char* pZeroTerminatedName;
sal_Int32 nLength;
- UStringDescription(PVFN _fCharFkt);
+ UStringDescription(PVFN _fCharFkt);
operator ::rtl::OUString() const { return ::rtl::OUString(pZeroTerminatedName,nLength,RTL_TEXTENCODING_ASCII_US); }
~UStringDescription();
private:
@@ -121,13 +121,13 @@ enum
#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) \
+#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) \
+#define DECL_BOOL_PROP0(varname) \
DECL_BOOL_PROP1IMPL(varname) 0)
diff --git a/mysqlc/source/mysqlc_resultset.cxx b/mysqlc/source/mysqlc_resultset.cxx
index c55744baa956..2898d12cf02e 100644
--- a/mysqlc/source/mysqlc_resultset.cxx
+++ b/mysqlc/source/mysqlc_resultset.cxx
@@ -1,7 +1,7 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
* 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
@@ -61,7 +61,7 @@ using ::rtl::OUString;
#include <stdio.h>
-// IMPLEMENT_SERVICE_INFO(OResultSet,"com.sun.star.sdbcx.OResultSet","com.sun.star.sdbc.ResultSet");
+// IMPLEMENT_SERVICE_INFO(OResultSet,"com.sun.star.sdbcx.OResultSet","com.sun.star.sdbc.ResultSet");
/* {{{ OResultSet::getImplementationName() -I- */
OUString SAL_CALL OResultSet::getImplementationName()
throw (RuntimeException)
@@ -101,7 +101,7 @@ sal_Bool SAL_CALL OResultSet::supportsService(const OUString& _rServiceName)
/* {{{ OResultSet::OResultSet() -I- */
-OResultSet::OResultSet(OCommonStatement * pStmt, sql::ResultSet * result, rtl_TextEncoding _encoding )
+OResultSet::OResultSet(OCommonStatement * pStmt, sql::ResultSet * result, rtl_TextEncoding _encoding )
: OResultSet_BASE(m_aMutex)
,OPropertySetHelper(OResultSet_BASE::rBHelper)
,m_aStatement((OWeakObject*)pStmt)
@@ -162,7 +162,7 @@ Sequence< Type > SAL_CALL OResultSet::getTypes()
throw(RuntimeException)
{
OSL_TRACE("OResultSet::getTypes");
- OTypeCollection aTypes( ::getCppuType((const Reference< XMultiPropertySet > *) NULL),
+ OTypeCollection aTypes( ::getCppuType((const Reference< XMultiPropertySet > *) NULL),
::getCppuType((const Reference< XFastPropertySet > *) NULL),
::getCppuType((const Reference< XPropertySet > *) NULL));
@@ -269,7 +269,7 @@ 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);
@@ -861,7 +861,7 @@ sal_Bool SAL_CALL OResultSet::rowDeleted()
/* {{{ 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);
@@ -1366,11 +1366,11 @@ IPropertyArrayHelper * OResultSet::createArrayHelper() const
Sequence< Property > aProps(5);
Property* pProperties = aProps.getArray();
sal_Int32 nPos = 0;
- DECL_PROP0(FETCHDIRECTION, sal_Int32);
- DECL_PROP0(FETCHSIZE, sal_Int32);
+ 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);
+ DECL_PROP1IMPL(RESULTSETTYPE, sal_Int32) PropertyAttribute::READONLY);
return new OPropertyArrayHelper(aProps);
}
diff --git a/mysqlc/source/mysqlc_resultset.hxx b/mysqlc/source/mysqlc_resultset.hxx
index 87cd76979ec0..981d0bd7b97a 100644
--- a/mysqlc/source/mysqlc_resultset.hxx
+++ b/mysqlc/source/mysqlc_resultset.hxx
@@ -1,7 +1,7 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
* 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
@@ -62,9 +62,9 @@ namespace connectivity
typedef my_XNameAccessRef my_XNameAccessRef;
/*
- ** OResultSet
+ ** OResultSet
*/
- typedef ::cppu::WeakComponentImplHelper12< ::com::sun::star::sdbc::XResultSet,
+ typedef ::cppu::WeakComponentImplHelper12< ::com::sun::star::sdbc::XResultSet,
::com::sun::star::sdbc::XRow,
::com::sun::star::sdbc::XResultSetMetaDataSupplier,
::com::sun::star::util::XCancellable,
@@ -77,16 +77,16 @@ namespace connectivity
::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>
+ 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::WeakReferenceHelper m_aStatement;
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData> m_xMetaData;
- sql::ResultSet *m_result;
- unsigned int fieldCount;
+ sql::ResultSet *m_result;
+ unsigned int fieldCount;
rtl_TextEncoding m_encoding;
// OPropertyArrayUsageHelper
::cppu::IPropertyArrayHelper* createArrayHelper() const;
@@ -106,7 +106,7 @@ namespace connectivity
public:
DECLARE_SERVICE_INFO();
-
+
OResultSet( OCommonStatement* pStmt, sql::ResultSet *result, rtl_TextEncoding _encoding );
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > operator *()
@@ -121,9 +121,9 @@ namespace connectivity
Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type & rType)
throw(RuntimeException);
- void SAL_CALL acquire() throw();
+ void SAL_CALL acquire() throw();
- void SAL_CALL release() throw();
+ void SAL_CALL release() throw();
//XTypeProvider
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes()
@@ -134,60 +134,60 @@ namespace connectivity
throw(RuntimeException);
// XResultSet
- sal_Bool SAL_CALL next() throw(SQLException, RuntimeException);
+ sal_Bool SAL_CALL next() throw(SQLException, RuntimeException);
- sal_Bool SAL_CALL isBeforeFirst() throw(SQLException, RuntimeException);
+ sal_Bool SAL_CALL isBeforeFirst() throw(SQLException, RuntimeException);
- sal_Bool SAL_CALL isAfterLast() throw(SQLException, RuntimeException);
+ sal_Bool SAL_CALL isAfterLast() throw(SQLException, RuntimeException);
- sal_Bool SAL_CALL isFirst() throw(SQLException, RuntimeException);
+ sal_Bool SAL_CALL isFirst() throw(SQLException, RuntimeException);
- sal_Bool SAL_CALL isLast() throw(SQLException, RuntimeException);
+ sal_Bool SAL_CALL isLast() throw(SQLException, RuntimeException);
- void SAL_CALL beforeFirst() throw(SQLException, RuntimeException);
+ void SAL_CALL beforeFirst() throw(SQLException, RuntimeException);
- void SAL_CALL afterLast() throw(SQLException, RuntimeException);
+ void SAL_CALL afterLast() throw(SQLException, RuntimeException);
- sal_Bool SAL_CALL first() throw(SQLException, RuntimeException);
+ sal_Bool SAL_CALL first() throw(SQLException, RuntimeException);
- sal_Bool SAL_CALL last() throw(SQLException, RuntimeException);
+ sal_Bool SAL_CALL last() throw(SQLException, RuntimeException);
- sal_Int32 SAL_CALL getRow() 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 absolute(sal_Int32 row) throw(SQLException, RuntimeException);
- sal_Bool SAL_CALL relative(sal_Int32 rows) throw(SQLException, RuntimeException);
+ sal_Bool SAL_CALL relative(sal_Int32 rows) throw(SQLException, RuntimeException);
- sal_Bool SAL_CALL previous() throw(SQLException, RuntimeException);
+ sal_Bool SAL_CALL previous() throw(SQLException, RuntimeException);
- void SAL_CALL refreshRow() throw(SQLException, RuntimeException);
+ void SAL_CALL refreshRow() throw(SQLException, RuntimeException);
- sal_Bool SAL_CALL rowUpdated() throw(SQLException, RuntimeException);
+ sal_Bool SAL_CALL rowUpdated() throw(SQLException, RuntimeException);
- sal_Bool SAL_CALL rowInserted() throw(SQLException, RuntimeException);
+ sal_Bool SAL_CALL rowInserted() throw(SQLException, RuntimeException);
- sal_Bool SAL_CALL rowDeleted() 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);
+ OUString SAL_CALL getString(sal_Int32 column) throw(SQLException, RuntimeException);
- sal_Bool SAL_CALL getBoolean(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_Int8 SAL_CALL getByte(sal_Int32 column) throw(SQLException, RuntimeException);
- sal_Int16 SAL_CALL getShort(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_Int32 SAL_CALL getInt(sal_Int32 column) throw(SQLException, RuntimeException);
- sal_Int64 SAL_CALL getLong(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);
+ float SAL_CALL getFloat(sal_Int32 column) throw(SQLException, RuntimeException);
- double SAL_CALL getDouble(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);
@@ -227,45 +227,45 @@ namespace connectivity
throw(SQLException, RuntimeException);
// XCancellable
- void SAL_CALL cancel() throw(RuntimeException);
+ void SAL_CALL cancel() throw(RuntimeException);
// XCloseable
- void SAL_CALL close() throw(SQLException, RuntimeException);
+ void SAL_CALL close() throw(SQLException, RuntimeException);
// XWarningsSupplier
- Any SAL_CALL getWarnings() throw(SQLException, RuntimeException);
+ Any SAL_CALL getWarnings() throw(SQLException, RuntimeException);
- void SAL_CALL clearWarnings() throw(SQLException, RuntimeException);
+ void SAL_CALL clearWarnings() throw(SQLException, RuntimeException);
// XResultSetUpdate
- void SAL_CALL insertRow() throw(SQLException, RuntimeException);
+ void SAL_CALL insertRow() throw(SQLException, RuntimeException);
- void SAL_CALL updateRow() throw(SQLException, RuntimeException);
+ void SAL_CALL updateRow() throw(SQLException, RuntimeException);
- void SAL_CALL deleteRow() throw(SQLException, RuntimeException);
+ void SAL_CALL deleteRow() throw(SQLException, RuntimeException);
- void SAL_CALL cancelRowUpdates() throw(SQLException, RuntimeException);
+ void SAL_CALL cancelRowUpdates() throw(SQLException, RuntimeException);
- void SAL_CALL moveToInsertRow() throw(SQLException, RuntimeException);
+ void SAL_CALL moveToInsertRow() throw(SQLException, RuntimeException);
- void SAL_CALL moveToCurrentRow() throw(SQLException, RuntimeException);
+ void SAL_CALL moveToCurrentRow() throw(SQLException, RuntimeException);
// XRowUpdate
- void SAL_CALL updateNull(sal_Int32 column) throw(SQLException, RuntimeException);
+ 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 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 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 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 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 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 updateFloat(sal_Int32 column, float x) throw(SQLException, RuntimeException);
- void SAL_CALL updateDouble(sal_Int32 column, double 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);
@@ -299,7 +299,7 @@ namespace connectivity
throw(SQLException, RuntimeException);
// XRowLocate
- Any SAL_CALL getBookmark() throw(SQLException, RuntimeException);
+ Any SAL_CALL getBookmark() throw(SQLException, RuntimeException);
sal_Bool SAL_CALL moveToBookmark(const Any& bookmark)
throw(SQLException, RuntimeException);
@@ -310,7 +310,7 @@ namespace connectivity
sal_Int32 SAL_CALL compareBookmarks(const Any& first, const Any& second)
throw(SQLException, RuntimeException);
- sal_Bool SAL_CALL hasOrderedBookmarks() throw(SQLException, RuntimeException);
+ sal_Bool SAL_CALL hasOrderedBookmarks() throw(SQLException, RuntimeException);
sal_Int32 SAL_CALL hashBookmark(const Any& bookmark)
throw(SQLException, RuntimeException);
diff --git a/mysqlc/source/mysqlc_resultsetmetadata.cxx b/mysqlc/source/mysqlc_resultsetmetadata.cxx
index 933bc7d57e98..7078033da440 100644
--- a/mysqlc/source/mysqlc_resultsetmetadata.cxx
+++ b/mysqlc/source/mysqlc_resultsetmetadata.cxx
@@ -1,7 +1,7 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
* 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
@@ -86,7 +86,7 @@ sal_Int32 SAL_CALL OResultSetMetaData::getColumnType(sal_Int32 column)
/*
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?
+ Does it change the API, the open-close principle?
*/
/* {{{ OResultSetMetaData::getColumnCount() -I- */
sal_Int32 SAL_CALL OResultSetMetaData::getColumnCount()
diff --git a/mysqlc/source/mysqlc_resultsetmetadata.hxx b/mysqlc/source/mysqlc_resultsetmetadata.hxx
index 93bc107fd455..e9bad5ffd6ea 100644
--- a/mysqlc/source/mysqlc_resultsetmetadata.hxx
+++ b/mysqlc/source/mysqlc_resultsetmetadata.hxx
@@ -1,7 +1,7 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
* 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
@@ -74,49 +74,49 @@ namespace connectivity
inline operator ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > () throw()
{ return this; }
- sal_Int32 SAL_CALL getColumnCount() throw(SQLException, RuntimeException);
+ sal_Int32 SAL_CALL getColumnCount() throw(SQLException, RuntimeException);
- sal_Bool SAL_CALL isAutoIncrement(sal_Int32 column) 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 isCaseSensitive(sal_Int32 column) throw(SQLException, RuntimeException);
- sal_Bool SAL_CALL isSearchable(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_Bool SAL_CALL isCurrency(sal_Int32 column) throw(SQLException, RuntimeException);
- sal_Int32 SAL_CALL isNullable(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_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 getColumnLabel(sal_Int32 column) throw(SQLException, RuntimeException);
- OUString SAL_CALL getColumnName(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);
+ 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 getPrecision(sal_Int32 column) throw(SQLException, RuntimeException);
- sal_Int32 SAL_CALL getScale(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 getTableName(sal_Int32 column) throw(SQLException, RuntimeException);
- OUString SAL_CALL getCatalogName(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);
+ sal_Int32 SAL_CALL getColumnType(sal_Int32 column) throw(SQLException, RuntimeException);
- OUString SAL_CALL getColumnTypeName(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 isReadOnly(sal_Int32 column) throw(SQLException, RuntimeException);
- sal_Bool SAL_CALL isWritable(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);
+ void checkColumnIndex(sal_Int32 columnIndex) throw (SQLException, RuntimeException);
};
}
}
diff --git a/mysqlc/source/mysqlc_services.cxx b/mysqlc/source/mysqlc_services.cxx
index 4111870f874c..fea6bd1c446f 100644
--- a/mysqlc/source/mysqlc_services.cxx
+++ b/mysqlc/source/mysqlc_services.cxx
@@ -1,7 +1,7 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
* 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
@@ -45,7 +45,7 @@ using ::com::sun::star::lang::XMultiServiceFactory;
typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc)
(
const Reference< XMultiServiceFactory > & rServiceManager,
- const OUString & rComponentName,
+ const OUString & rComponentName,
::cppu::ComponentInstantiation pCreateFunction,
const Sequence< OUString > & rServiceNames,
rtl_ModuleCount* _pTemp
@@ -59,8 +59,8 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc)
//---------------------------------------------------------------------------------------
void REGISTER_PROVIDER(
- const OUString& aServiceImplName,
- const Sequence< OUString>& Services,
+ const OUString& aServiceImplName,
+ const Sequence< OUString>& Services,
const Reference< XRegistryKey > & xKey)
{
::rtl::OUStringBuffer aMainKeyName;
@@ -94,7 +94,7 @@ struct ProviderRequest
/* {{{ CREATE_PROVIDER -I- */
inline sal_Bool CREATE_PROVIDER(
- const OUString& Implname,
+ const OUString& Implname,
const Sequence< OUString > & Services,
::cppu::ComponentInstantiation Factory,
createFactoryFunc creator
@@ -116,8 +116,8 @@ struct ProviderRequest
/* {{{ component_getImplementationEnvironment -I- */
extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
- const sal_Char **ppEnvTypeName,
- uno_Environment ** /* ppEnv */
+ const sal_Char **ppEnvTypeName,
+ uno_Environment ** /* ppEnv */
)
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
@@ -129,11 +129,11 @@ extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnviron
extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(void * /* pServiceManager */, void * pRegistryKey)
{
if (pRegistryKey) {
- try {
+ try {
Reference< XRegistryKey > xKey(reinterpret_cast< XRegistryKey*>(pRegistryKey));
REGISTER_PROVIDER(
- MysqlCDriver::getImplementationName_Static(),
+ MysqlCDriver::getImplementationName_Static(),
MysqlCDriver::getSupportedServiceNames_Static(), xKey);
return sal_True;
diff --git a/mysqlc/source/mysqlc_statement.cxx b/mysqlc/source/mysqlc_statement.cxx
index 64a06e6fde34..902edc10b0d8 100644
--- a/mysqlc/source/mysqlc_statement.cxx
+++ b/mysqlc/source/mysqlc_statement.cxx
@@ -1,7 +1,7 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
* 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
@@ -64,7 +64,7 @@ using ::rtl::OUString;
#include <stdio.h>
/* {{{ OConnection::OCommonStatement() -I- */
-OCommonStatement::OCommonStatement(OConnection* _pConnection, sql::Statement *_cppStatement)
+OCommonStatement::OCommonStatement(OConnection* _pConnection, sql::Statement *_cppStatement)
:OCommonStatement_IBase(m_aMutex)
,OPropertySetHelper(OCommonStatement_IBase::rBHelper)
,OStatement_CBase( (::cppu::OWeakObject*)_pConnection, this )
@@ -136,7 +136,7 @@ Sequence< Type > SAL_CALL OCommonStatement::getTypes()
throw(RuntimeException)
{
OSL_TRACE("OCommonStatement::getTypes");
- ::cppu::OTypeCollection aTypes( ::getCppuType( (const Reference< XMultiPropertySet > *)0 ),
+ ::cppu::OTypeCollection aTypes( ::getCppuType( (const Reference< XMultiPropertySet > *)0 ),
::getCppuType( (const Reference< XFastPropertySet > *)0 ),
::getCppuType( (const Reference< XPropertySet > *)0 ));
@@ -163,7 +163,7 @@ void SAL_CALL OCommonStatement::close()
{
OSL_TRACE("OCommonStatement::close");
/*
- We need a block for the checkDisposed call.
+ We need a block for the checkDisposed call.
After the check we can call dispose() as we are not under lock ??
*/
{
@@ -342,7 +342,7 @@ sal_Bool SAL_CALL OCommonStatement::getMoreResults()
MutexGuard aGuard(m_aMutex);
checkDisposed(rBHelper.bDisposed);
- // if your driver supports more than only one resultset
+ // if your driver supports more than only one resultset
// and has one more at this moment return(true
return (sal_False);
}
@@ -384,12 +384,12 @@ void SAL_CALL OCommonStatement::clearWarnings()
Sequence< Property > aProps(10);
Property* pProperties = aProps.getArray();
sal_Int32 nPos = 0;
- DECL_PROP0(CURSORNAME, OUString);
+ DECL_PROP0(CURSORNAME, OUString);
DECL_BOOL_PROP0(ESCAPEPROCESSING);
DECL_PROP0(FETCHDIRECTION,sal_Int32);
- DECL_PROP0(FETCHSIZE, sal_Int32);
+ DECL_PROP0(FETCHSIZE, sal_Int32);
DECL_PROP0(MAXFIELDSIZE,sal_Int32);
- DECL_PROP0(MAXROWS, sal_Int32);
+ DECL_PROP0(MAXROWS, sal_Int32);
DECL_PROP0(QUERYTIMEOUT,sal_Int32);
DECL_PROP0(RESULTSETCONCURRENCY,sal_Int32);
DECL_PROP0(RESULTSETTYPE,sal_Int32);
@@ -451,7 +451,7 @@ void OCommonStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const
void OCommonStatement::getFastPropertyValue(Any& _rValue, sal_Int32 nHandle) const
{
OSL_TRACE("OCommonStatement::getFastPropertyValue");
- switch (nHandle) {
+ switch (nHandle) {
case PROPERTY_ID_QUERYTIMEOUT:
case PROPERTY_ID_MAXFIELDSIZE:
case PROPERTY_ID_MAXROWS:
diff --git a/mysqlc/source/mysqlc_statement.hxx b/mysqlc/source/mysqlc_statement.hxx
index 8a7fb500a0a8..2e0aea26321c 100644
--- a/mysqlc/source/mysqlc_statement.hxx
+++ b/mysqlc/source/mysqlc_statement.hxx
@@ -30,7 +30,7 @@ namespace connectivity
using ::com::sun::star::uno::RuntimeException;
using ::rtl::OUString;
- typedef ::cppu::WeakComponentImplHelper5< ::com::sun::star::sdbc::XStatement,
+ typedef ::cppu::WeakComponentImplHelper5< ::com::sun::star::sdbc::XStatement,
::com::sun::star::sdbc::XWarningsSupplier,
::com::sun::star::util::XCancellable,
::com::sun::star::sdbc::XCloseable,
@@ -56,11 +56,11 @@ namespace connectivity
SQLWarning m_aLastWarning;
protected:
- ::std::list< OUString> m_aBatchList;
+ ::std::list< OUString> m_aBatchList;
- OConnection* m_pConnection; // The owning Connection object
+ OConnection* m_pConnection; // The owning Connection object
- sql::Statement *cppStatement;
+ sql::Statement *cppStatement;
protected:
void disposeResultSet();
@@ -91,9 +91,9 @@ namespace connectivity
void SAL_CALL disposing(void);
// XInterface
- void SAL_CALL release() throw();
+ void SAL_CALL release() throw();
- void SAL_CALL acquire() throw();
+ void SAL_CALL acquire() throw();
// XInterface
Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type & rType)
@@ -121,15 +121,15 @@ namespace connectivity
throw(SQLException, RuntimeException);
// XWarningsSupplier
- Any SAL_CALL getWarnings() throw(SQLException, RuntimeException);
+ Any SAL_CALL getWarnings() throw(SQLException, RuntimeException);
- void SAL_CALL clearWarnings() throw(SQLException, RuntimeException);
+ void SAL_CALL clearWarnings() throw(SQLException, RuntimeException);
// XCancellable
- void SAL_CALL cancel() throw(RuntimeException);
+ void SAL_CALL cancel() throw(RuntimeException);
// XCloseable
- void SAL_CALL close() throw(SQLException, RuntimeException);
+ void SAL_CALL close() throw(SQLException, RuntimeException);
// XMultipleResults
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getResultSet()
@@ -137,7 +137,7 @@ namespace connectivity
sal_Int32 SAL_CALL getUpdateCount() throw(SQLException, RuntimeException);
- sal_Bool SAL_CALL getMoreResults() throw(SQLException, RuntimeException);
+ sal_Bool SAL_CALL getMoreResults() throw(SQLException, RuntimeException);
// other methods
OConnection* getOwnConnection() const { return m_pConnection;}
@@ -147,7 +147,7 @@ namespace connectivity
};
- class OStatement : public OCommonStatement,
+ class OStatement : public OCommonStatement,
public ::com::sun::star::sdbc::XBatchExecution,
public ::com::sun::star::lang::XServiceInfo
@@ -163,14 +163,14 @@ namespace connectivity
Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType )
throw(RuntimeException);
- void SAL_CALL acquire() throw();
- void SAL_CALL release() throw();
+ 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);
+ void SAL_CALL clearBatch() throw(SQLException, RuntimeException);
::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL executeBatch()
throw(SQLException, RuntimeException);
diff --git a/mysqlc/source/mysqlc_subcomponent.hxx b/mysqlc/source/mysqlc_subcomponent.hxx
index 8cf2f2b8b7e1..853091aa53d8 100644
--- a/mysqlc/source/mysqlc_subcomponent.hxx
+++ b/mysqlc/source/mysqlc_subcomponent.hxx
@@ -1,7 +1,7 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
* 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
@@ -74,7 +74,7 @@ namespace connectivity
protected:
// the parent must support the tunnel implementation
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xParent;
- SELF* m_pDerivedImplementation;
+ SELF* m_pDerivedImplementation;
public:
OSubComponent(
@@ -107,14 +107,14 @@ namespace connectivity
class OPropertyArrayUsageHelper
{
protected:
- static sal_Int32 s_nRefCount;
- static ::cppu::IPropertyArrayHelper* s_pProps;
- static ::osl::Mutex s_aMutex;
+ 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)
+ { // 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 !");
@@ -128,7 +128,7 @@ namespace connectivity
/** 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();
+ ::cppu::IPropertyArrayHelper* getArrayHelper();
protected:
/** used to implement the creation of the array helper which is shared amongst all instances of the class.
@@ -138,19 +138,19 @@ namespace connectivity
<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.
+ @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>
+ sal_Int32 OPropertyArrayUsageHelper< TYPE >::s_nRefCount = 0;
- template<class TYPE>
- ::cppu::IPropertyArrayHelper* OPropertyArrayUsageHelper< TYPE >::s_pProps = NULL;
+ template<class TYPE>
+ ::cppu::IPropertyArrayHelper* OPropertyArrayUsageHelper< TYPE >::s_pProps = NULL;
- template<class TYPE>
- ::osl::Mutex OPropertyArrayUsageHelper< TYPE >::s_aMutex;
+ template<class TYPE>
+ ::osl::Mutex OPropertyArrayUsageHelper< TYPE >::s_aMutex;
//------------------------------------------------------------------
template <class TYPE>
@@ -211,31 +211,31 @@ namespace connectivity
}
-#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; \
- } \
+#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; \
+ } \
}
diff --git a/mysqlc/source/mysqlc_types.cxx b/mysqlc/source/mysqlc_types.cxx
index c363143d901d..24d40efdc194 100644
--- a/mysqlc/source/mysqlc_types.cxx
+++ b/mysqlc/source/mysqlc_types.cxx
@@ -1,7 +1,7 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
* 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
diff --git a/mysqlc/source/mysqlc_types.hxx b/mysqlc/source/mysqlc_types.hxx
index 4d5d844ac480..2ddd2ee251d4 100644
--- a/mysqlc/source/mysqlc_types.hxx
+++ b/mysqlc/source/mysqlc_types.hxx
@@ -1,7 +1,7 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
* 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
@@ -47,8 +47,8 @@ struct TypeInfoDef {
const char *localTypeName;
sal_Int32 minScale;
sal_Int32 maxScale;
- sal_Int32 sqlDataType;
- sal_Int32 sqlDateTimeSub;
+ sal_Int32 sqlDataType;
+ sal_Int32 sqlDateTimeSub;
sal_Int32 numPrecRadix;
};
diff --git a/mysqlc/source/registry/data/org/openoffice/Office/DataAccess/Drivers.xcu b/mysqlc/source/registry/data/org/openoffice/Office/DataAccess/Drivers.xcu
index 3c076a4a3a7a..b9f239ebc03c 100644
--- a/mysqlc/source/registry/data/org/openoffice/Office/DataAccess/Drivers.xcu
+++ b/mysqlc/source/registry/data/org/openoffice/Office/DataAccess/Drivers.xcu
@@ -2,7 +2,7 @@
<!--***********************************************************************
*
* 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
diff --git a/nlpsolver/locale/NLPSolverCommon_bg.properties b/nlpsolver/locale/NLPSolverCommon_bg.properties
new file mode 100644
index 000000000000..830440ebb6f9
--- /dev/null
+++ b/nlpsolver/locale/NLPSolverCommon_bg.properties
@@ -0,0 +1,22 @@
+# x-no-translate
+#BaseNLPSolver
+NLPSolverCommon.Properties.AssumeNonNegative=\u041F\u0440\u0438\u0435\u043C\u0430\u043D\u0435 \u043D\u0430 \u043F\u0440\u043E\u043C\u0435\u043D\u043B\u0438\u0432\u0438\u0442\u0435 \u0437\u0430 \u043D\u0435\u043E\u0442\u0440\u0438\u0446\u0430\u0442\u0435\u043B\u043D\u0438
+#BaseEvolutionarySolver
+NLPSolverCommon.Properties.SwarmSize=\u0420\u0430\u0437\u043C\u0435\u0440 \u043D\u0430 \u0440\u043E\u044F
+NLPSolverCommon.Properties.LibrarySize=\u0420\u0430\u0437\u043C\u0435\u0440 \u043D\u0430 \u0431\u0438\u0431\u043B\u0438\u043E\u0442\u0435\u043A\u0430\u0442\u0430
+NLPSolverCommon.Properties.LearningCycles=\u041E\u0431\u0443\u0447\u0430\u0432\u0430\u0449\u0438 \u0446\u0438\u043A\u043B\u0438
+NLPSolverCommon.Properties.GuessVariableRange=\u041E\u0446\u0435\u043D\u043A\u0430 \u043D\u0430 \u0433\u0440\u0430\u043D\u0438\u0446\u0438\u0442\u0435 \u043D\u0430 \u043F\u0440\u043E\u043C\u0435\u043D\u043B\u0438\u0432\u0438\u0442\u0435
+NLPSolverCommon.Properties.VariableRangeThreshold=\u041F\u0440\u0430\u0433 \u0437\u0430 \u0433\u0440\u0430\u043D\u0438\u0446\u0438\u0442\u0435 \u043D\u0430 \u043F\u0440\u043E\u043C\u0435\u043D\u043B\u0438\u0432\u0438\u0442\u0435 (\u043F\u0440\u0438 \u043E\u0446\u0435\u043D\u044F\u0432\u0430\u043D\u0435)
+NLPSolverCommon.Properties.UseACRComparator=\u0421\u0440\u0430\u0432\u043D\u044F\u0432\u0430\u043D\u0435 \u0447\u0440\u0435\u0437 ACR (\u0432\u043C\u0435\u0441\u0442\u043E BCH)
+NLPSolverCommon.Properties.UseRandomStartingPoint=\u0418\u0437\u043F\u043E\u043B\u0437\u0432\u0430\u043D\u0435 \u043D\u0430 \u0441\u043B\u0443\u0447\u0430\u0439\u043D\u0430 \u043D\u0430\u0447\u0430\u043B\u043D\u0430 \u0442\u043E\u0447\u043A\u0430
+NLPSolverCommon.Properties.StagnationLimit=\u0413\u0440\u0430\u043D\u0438\u0446\u0430 \u043D\u0430 \u0441\u0442\u0430\u0433\u043D\u0430\u0446\u0438\u044F
+NLPSolverCommon.Properties.Tolerance=\u0422\u043E\u043B\u0435\u0440\u0430\u043D\u0441 \u043D\u0430 \u0441\u0442\u0430\u0433\u043D\u0430\u0446\u0438\u044F
+NLPSolverCommon.Properties.EnhancedSolverStatus=\u041F\u043E\u043A\u0430\u0437\u0432\u0430\u043D\u0435 \u043D\u0430 \u0440\u0430\u0437\u0448\u0438\u0440\u0435\u043D\u043E \u0441\u044A\u0441\u0442\u043E\u044F\u043D\u0438\u0435
+#DEPS
+NLPSolverCommon.Properties.AgentSwitchRate=\u041D\u0438\u0432\u043E \u043D\u0430 \u043F\u0440\u0435\u0432\u043A\u043B\u044E\u0447\u0432\u0430\u043D\u0435 \u043D\u0430 \u0430\u0433\u0435\u043D\u0442\u0430 (\u0432\u0435\u0440\u043E\u044F\u0442\u043D\u043E\u0441\u0442 \u043D\u0430 \u0414\u0415)
+NLPSolverCommon.Properties.DEFactor=\u0414\u0415: \u043A\u043E\u0435\u0444\u0438\u0446\u0438\u0435\u043D\u0442 \u043D\u0430 \u043C\u0430\u0449\u0430\u0431\u0438\u0440\u0430\u043D\u0435 (0\u20131,2)
+NLPSolverCommon.Properties.DECR=\u0414\u0415: \u0432\u0435\u0440\u043E\u044F\u0442\u043D\u043E\u0441\u0442 \u0437\u0430 \u043A\u0440\u044A\u0441\u0442\u043E\u0441\u0432\u0430\u043D\u0435 (0\u20131)
+NLPSolverCommon.Properties.PSC1=\u0420\u0427: \u043A\u043E\u0433\u043D\u0438\u0442\u0438\u0432\u043D\u0430 \u043A\u043E\u043D\u0441\u0442\u0430\u043D\u0442\u0430
+NLPSolverCommon.Properties.PSC2=\u0420\u0427: \u0441\u043E\u0446\u0438\u0430\u043B\u043D\u0430 \u043A\u043E\u043D\u0441\u0442\u0430\u043D\u0442\u0430
+NLPSolverCommon.Properties.PSWeight=\u0420\u0427: \u043A\u043E\u0435\u0444\u0438\u0446\u0438\u0435\u043D\u0442 \u043D\u0430 \u0441\u0432\u0438\u0432\u0430\u043D\u0435
+NLPSolverCommon.Properties.PSCL=\u0420\u0427: \u0432\u0435\u0440\u043E\u044F\u0442\u043D\u043E\u0441\u0442 \u0437\u0430 \u043C\u0443\u0442\u0430\u0446\u0438\u044F (0\u20130,005)
diff --git a/nlpsolver/locale/NLPSolverCommon_et.properties b/nlpsolver/locale/NLPSolverCommon_et.properties
new file mode 100644
index 000000000000..49a4bdfd5440
--- /dev/null
+++ b/nlpsolver/locale/NLPSolverCommon_et.properties
@@ -0,0 +1,22 @@
+# x-no-translate
+#BaseNLPSolver
+NLPSolverCommon.Properties.AssumeNonNegative=Mittenegatiivsete muutujate eeldamine
+#BaseEvolutionarySolver
+NLPSolverCommon.Properties.SwarmSize=S\u00FClemi suurus
+NLPSolverCommon.Properties.LibrarySize=Teegi suurus
+NLPSolverCommon.Properties.LearningCycles=\u00D5ppimists\u00FCklite arv
+NLPSolverCommon.Properties.GuessVariableRange=Muutujapiiride oletamine
+NLPSolverCommon.Properties.VariableRangeThreshold=Muutujapiiride l\u00E4vi (oletamisel)
+NLPSolverCommon.Properties.UseACRComparator=ACR komparaatori kasutamine (BCH asemel)
+NLPSolverCommon.Properties.UseRandomStartingPoint=Juhusliku alguspunkti kasutamine
+NLPSolverCommon.Properties.StagnationLimit=Seisakuraja
+NLPSolverCommon.Properties.Tolerance=Seisakutolerants
+NLPSolverCommon.Properties.EnhancedSolverStatus=Lahendaja t\u00E4iendatud oleku kuvamine
+#DEPS
+NLPSolverCommon.Properties.AgentSwitchRate=Agent Switch Rate (DE t\u00F5en\u00E4osus)
+NLPSolverCommon.Properties.DEFactor=DE: skaleerimistegur (0-1,2)
+NLPSolverCommon.Properties.DECR=DE: ristumist\u00F5en\u00E4osus (0-1)
+NLPSolverCommon.Properties.PSC1=PS: kognitiivsuskonstant
+NLPSolverCommon.Properties.PSC2=PS: sotsiaalkonstant
+NLPSolverCommon.Properties.PSWeight=PS: ahenemiskoefitsient
+NLPSolverCommon.Properties.PSCL=PS: mutatsioonit\u00F5en\u00E4osus (0-0,005)
diff --git a/nlpsolver/locale/NLPSolverCommon_nb.properties b/nlpsolver/locale/NLPSolverCommon_nb.properties
index 3b88d95b50f8..477fea9c0f99 100644
--- a/nlpsolver/locale/NLPSolverCommon_nb.properties
+++ b/nlpsolver/locale/NLPSolverCommon_nb.properties
@@ -1,6 +1,6 @@
# x-no-translate
#BaseNLPSolver
-NLPSolverCommon.Properties.AssumeNonNegative=Assume Non-Negative Variables
+NLPSolverCommon.Properties.AssumeNonNegative=Anta positive variabler
#BaseEvolutionarySolver
NLPSolverCommon.Properties.SwarmSize=Size of Swarm
NLPSolverCommon.Properties.LibrarySize=Bibliotekst\u00F8rrelse
diff --git a/nlpsolver/locale/NLPSolverCommon_tr.properties b/nlpsolver/locale/NLPSolverCommon_tr.properties
new file mode 100644
index 000000000000..87d2929d4f0f
--- /dev/null
+++ b/nlpsolver/locale/NLPSolverCommon_tr.properties
@@ -0,0 +1,22 @@
+# x-no-translate
+#BaseNLPSolver
+NLPSolverCommon.Properties.AssumeNonNegative=Negatif olmayan De\u011Fi\u015Fkenleri Varsay
+#BaseEvolutionarySolver
+NLPSolverCommon.Properties.SwarmSize=Y\u0131\u011F\u0131n\u0131n Boyutu
+NLPSolverCommon.Properties.LibrarySize=K\u00FCt\u00FCphanenin Boyutu
+NLPSolverCommon.Properties.LearningCycles=\u00D6\u011Frenme Evreleri
+NLPSolverCommon.Properties.GuessVariableRange=De\u011Fi\u015Fken \u00D6l\u00E7\u00FCs\u00FC Tahmini
+NLPSolverCommon.Properties.VariableRangeThreshold=De\u011Fi\u015Fken \u00D6l\u00E7\u00FCs\u00FC S\u0131n\u0131r\u0131 (tahmin ediyorken)
+NLPSolverCommon.Properties.UseACRComparator=ACR Kar\u015F\u0131la\u015Ft\u0131r\u0131c\u0131s\u0131n\u0131 kullan (BCH'nin yerine)
+NLPSolverCommon.Properties.UseRandomStartingPoint=Rasgele ba\u015Flama noktas\u0131 kullan
+NLPSolverCommon.Properties.StagnationLimit=Durgunluk S\u0131n\u0131r\u0131
+NLPSolverCommon.Properties.Tolerance=Durgunluk Tolerans\u0131
+NLPSolverCommon.Properties.EnhancedSolverStatus=Geli\u015Ftirilmi\u015F \u00E7\u00F6z\u00FCc\u00FC durumunu g\u00F6ster
+#DEPS
+NLPSolverCommon.Properties.AgentSwitchRate=Arac\u0131 Ge\u00E7i\u015F Oran\u0131 (DE Olas\u0131l\u0131\u011F\u0131)
+NLPSolverCommon.Properties.DEFactor=DE: \u00D6l\u00E7\u00FCleme Fakt\u00F6r\u00FC (0-1.2)
+NLPSolverCommon.Properties.DECR=DE: A\u015Fma Olas\u0131l\u0131\u011F\u0131 (0-1)
+NLPSolverCommon.Properties.PSC1=PS: Bili\u015Fsel Sabit
+NLPSolverCommon.Properties.PSC2=PS: Sosyal Sabit
+NLPSolverCommon.Properties.PSWeight=PS: \u0130n\u015Fa Fakt\u00F6r\u00FC
+NLPSolverCommon.Properties.PSCL=PS: T\u00FCrde\u011Fi\u015Fim Olas\u0131l\u0131\u011F\u0131 (0-0.005)
diff --git a/nlpsolver/locale/NLPSolverStatusDialog_bg.properties b/nlpsolver/locale/NLPSolverStatusDialog_bg.properties
new file mode 100644
index 000000000000..791513f3236c
--- /dev/null
+++ b/nlpsolver/locale/NLPSolverStatusDialog_bg.properties
@@ -0,0 +1,28 @@
+# x-no-translate
+#Dialog
+NLPSolverStatusDialog.Dialog.Caption=\u0421\u044A\u0441\u0442\u043E\u044F\u043D\u0438\u0435
+#Controls
+NLPSolverStatusDialog.Controls.lblSolution=\u0422\u0435\u043A\u0443\u0449\u043E \u0440\u0435\u0448\u0435\u043D\u0438\u0435:
+NLPSolverStatusDialog.Controls.lblIteration=\u0418\u0442\u0435\u0440\u0430\u0446\u0438\u044F:
+NLPSolverStatusDialog.Controls.lblStagnation=\u0421\u0442\u0430\u0433\u043D\u0430\u0446\u0438\u044F:
+NLPSolverStatusDialog.Controls.lblRuntime=\u0412\u0440\u0435\u043C\u0435 \u043D\u0430 \u0438\u0437\u043F\u044A\u043B\u043D\u0435\u043D\u0438\u0435:
+NLPSolverStatusDialog.Controls.btnStop=\u0421\u043F\u0438\u0440\u0430\u043D\u0435
+NLPSolverStatusDialog.Controls.btnOK=OK
+NLPSolverStatusDialog.Controls.btnContinue=\u041F\u0440\u043E\u0434\u044A\u043B\u0436\u0430\u0432\u0430\u043D\u0435
+#Messages
+NLPSolverStatusDialog.Message.StopIteration=\u0414\u043E\u0441\u0442\u0438\u0433\u043D\u0430\u0442 \u0435 \u043C\u0430\u043A\u0441\u0438\u043C\u0443\u043C\u044A\u0442 \u043D\u0430 \u0438\u0442\u0435\u0440\u0430\u0446\u0438\u0438\u0442\u0435.
+NLPSolverStatusDialog.Message.StopStagnation=\u041F\u0440\u043E\u0446\u0435\u0441\u044A\u0442 \u0435 \u0441\u043F\u0440\u044F\u043D \u043F\u043E\u0440\u0430\u0434\u0438 \u0441\u0442\u0430\u0433\u043D\u0430\u0446\u0438\u044F.
+NLPSolverStatusDialog.Message.StopUser=\u041F\u0440\u043E\u0446\u0435\u0441\u044A\u0442 \u0435 \u043F\u0440\u0435\u043A\u044A\u0441\u043D\u0430\u0442 \u043E\u0442 \u043F\u043E\u0442\u0440\u0435\u0431\u0438\u0442\u0435\u043B\u044F.
+NLPSolverStatusDialog.Message.CurrentIteration=\u041F\u0440\u043E\u0446\u0435\u0441\u044A\u0442 \u0435 \u0441\u043F\u0440\u044F\u043D \u043D\u0430 \u0438\u0442\u0435\u0440\u0430\u0446\u0438\u044F %d \u043E\u0442 %d.
+#Time formatting
+NLPSolverStatusDialog.Time.Nanoseconds=\u043D\u0430\u043D\u043E\u0441\u0435\u043A\u0443\u043D\u0434\u0438
+NLPSolverStatusDialog.Time.Microseconds=\u043C\u0438\u043A\u0440\u043E\u0441\u0435\u043A\u0443\u043D\u0434\u0438
+NLPSolverStatusDialog.Time.Milliseconds=\u043C\u0438\u043B\u0438\u0441\u0435\u043A\u0443\u043D\u0434\u0438
+NLPSolverStatusDialog.Time.Second=\u0441\u0435\u043A\u0443\u043D\u0434\u0430
+NLPSolverStatusDialog.Time.Seconds=\u0441\u0435\u043A\u0443\u043D\u0434\u0438
+NLPSolverStatusDialog.Time.Minute=\u043C\u0438\u043D\u0443\u0442\u0430
+NLPSolverStatusDialog.Time.Minutes=\u043C\u0438\u043D\u0443\u0442\u0438
+NLPSolverStatusDialog.Time.Hour=\u0447\u0430\u0441
+NLPSolverStatusDialog.Time.Hours=\u0447\u0430\u0441\u0430
+NLPSolverStatusDialog.Time.Day=\u0434\u0435\u043D
+NLPSolverStatusDialog.Time.Days=\u0434\u043D\u0438
diff --git a/nlpsolver/locale/NLPSolverStatusDialog_et.properties b/nlpsolver/locale/NLPSolverStatusDialog_et.properties
new file mode 100644
index 000000000000..ffc1e7a1abb3
--- /dev/null
+++ b/nlpsolver/locale/NLPSolverStatusDialog_et.properties
@@ -0,0 +1,28 @@
+# x-no-translate
+#Dialog
+NLPSolverStatusDialog.Dialog.Caption=Lahendaja olek
+#Controls
+NLPSolverStatusDialog.Controls.lblSolution=Praegune lahendus:
+NLPSolverStatusDialog.Controls.lblIteration=Iteratsioon:
+NLPSolverStatusDialog.Controls.lblStagnation=Seisak:
+NLPSolverStatusDialog.Controls.lblRuntime=T\u00F6\u00F6 kestus:
+NLPSolverStatusDialog.Controls.btnStop=Peata
+NLPSolverStatusDialog.Controls.btnOK=Sobib
+NLPSolverStatusDialog.Controls.btnContinue=J\u00E4tka
+#Messages
+NLPSolverStatusDialog.Message.StopIteration=Saavutati iteratsioonide maksimaalne arv.
+NLPSolverStatusDialog.Message.StopStagnation=Protsess peatati seisaku t\u00F5ttu.
+NLPSolverStatusDialog.Message.StopUser=Kasutaja katkestas protsessi.
+NLPSolverStatusDialog.Message.CurrentIteration=Protsess peatati %d. iteratsioonil %d-st.
+#Time formatting
+NLPSolverStatusDialog.Time.Nanoseconds=nanosekundit
+NLPSolverStatusDialog.Time.Microseconds=mikrosekundit
+NLPSolverStatusDialog.Time.Milliseconds=millisekundit
+NLPSolverStatusDialog.Time.Second=sekund
+NLPSolverStatusDialog.Time.Seconds=sekundit
+NLPSolverStatusDialog.Time.Minute=minut
+NLPSolverStatusDialog.Time.Minutes=minutit
+NLPSolverStatusDialog.Time.Hour=tund
+NLPSolverStatusDialog.Time.Hours=tundi
+NLPSolverStatusDialog.Time.Day=p\u00E4ev
+NLPSolverStatusDialog.Time.Days=p\u00E4eva
diff --git a/nlpsolver/locale/NLPSolverStatusDialog_fr.properties b/nlpsolver/locale/NLPSolverStatusDialog_fr.properties
index de6c1a9de7a9..bdd7028fbb3b 100644
--- a/nlpsolver/locale/NLPSolverStatusDialog_fr.properties
+++ b/nlpsolver/locale/NLPSolverStatusDialog_fr.properties
@@ -2,7 +2,7 @@
#Dialog
NLPSolverStatusDialog.Dialog.Caption=\u00C9tat du solveur
#Controls
-NLPSolverStatusDialog.Controls.lblSolution=Solution actuelle :
+NLPSolverStatusDialog.Controls.lblSolution=Solution actuelle :
NLPSolverStatusDialog.Controls.lblIteration=It\u00E9ration :
NLPSolverStatusDialog.Controls.lblStagnation=Stagnation :
NLPSolverStatusDialog.Controls.lblRuntime=Dur\u00E9e d'ex\u00E9cution :
@@ -17,7 +17,7 @@ NLPSolverStatusDialog.Message.CurrentIteration=Processus arr\u00EAt\u00E9 \u00E0
#Time formatting
NLPSolverStatusDialog.Time.Nanoseconds=Nanosecondes
NLPSolverStatusDialog.Time.Microseconds=Microsecondes
-NLPSolverStatusDialog.Time.Milliseconds=Millisecondes
+NLPSolverStatusDialog.Time.Milliseconds=Millisecondes
NLPSolverStatusDialog.Time.Second=Seconde
NLPSolverStatusDialog.Time.Seconds=Secondes
NLPSolverStatusDialog.Time.Minute=Minute
diff --git a/nlpsolver/locale/NLPSolverStatusDialog_tr.properties b/nlpsolver/locale/NLPSolverStatusDialog_tr.properties
new file mode 100644
index 000000000000..1570c061abff
--- /dev/null
+++ b/nlpsolver/locale/NLPSolverStatusDialog_tr.properties
@@ -0,0 +1,28 @@
+# x-no-translate
+#Dialog
+NLPSolverStatusDialog.Dialog.Caption=\u00C7\u00F6z\u00FCmleyici Durumu
+#Controls
+NLPSolverStatusDialog.Controls.lblSolution=Ge\u00E7erli \u00C7\u00F6z\u00FCm:
+NLPSolverStatusDialog.Controls.lblIteration=Tekrarlama:
+NLPSolverStatusDialog.Controls.lblStagnation=Durgunluk:
+NLPSolverStatusDialog.Controls.lblRuntime=\u00C7al\u0131\u015Fma zaman\u0131
+NLPSolverStatusDialog.Controls.btnStop=Dur
+NLPSolverStatusDialog.Controls.btnOK=Tamam
+NLPSolverStatusDialog.Controls.btnContinue=Devam Et
+#Messages
+NLPSolverStatusDialog.Message.StopIteration=En fazla yinelemeye ula\u015F\u0131ld\u0131.
+NLPSolverStatusDialog.Message.StopStagnation=Durgunluk nedeniyle i\u015Flem durduruldu.
+NLPSolverStatusDialog.Message.StopUser=Kullan\u0131c\u0131 m\u00FCdahalesi nedeniyle i\u015Flem durduruldu.
+NLPSolverStatusDialog.Message.CurrentIteration=\u0130\u015Flem %d %d yinelemede durduruldu
+#Time formatting
+NLPSolverStatusDialog.Time.Nanoseconds=Nanosaniye
+NLPSolverStatusDialog.Time.Microseconds=Mikrosaniyeler
+NLPSolverStatusDialog.Time.Milliseconds=Milisaniye
+NLPSolverStatusDialog.Time.Second=Saniye
+NLPSolverStatusDialog.Time.Seconds=Saniyeler
+NLPSolverStatusDialog.Time.Minute=Dakika
+NLPSolverStatusDialog.Time.Minutes=Dakika
+NLPSolverStatusDialog.Time.Hour=Saat
+NLPSolverStatusDialog.Time.Hours=Saat
+NLPSolverStatusDialog.Time.Day=G\u00FCn
+NLPSolverStatusDialog.Time.Days=G\u00FCn
diff --git a/reportbuilder/java/com/sun/star/report/DataRow.java b/reportbuilder/java/com/sun/star/report/DataRow.java
index 8d255a516217..0bbb5132d1f7 100644
--- a/reportbuilder/java/com/sun/star/report/DataRow.java
+++ b/reportbuilder/java/com/sun/star/report/DataRow.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
diff --git a/reportbuilder/java/com/sun/star/report/DataSource.java b/reportbuilder/java/com/sun/star/report/DataSource.java
index c786b8b6d5c4..83b5b537bbb1 100644
--- a/reportbuilder/java/com/sun/star/report/DataSource.java
+++ b/reportbuilder/java/com/sun/star/report/DataSource.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
diff --git a/reportbuilder/java/com/sun/star/report/DataSourceException.java b/reportbuilder/java/com/sun/star/report/DataSourceException.java
index c513dd9344b5..019c76eda183 100644
--- a/reportbuilder/java/com/sun/star/report/DataSourceException.java
+++ b/reportbuilder/java/com/sun/star/report/DataSourceException.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
diff --git a/reportbuilder/java/com/sun/star/report/DataSourceFactory.java b/reportbuilder/java/com/sun/star/report/DataSourceFactory.java
index 36b794a3599a..290b5ddb599d 100644
--- a/reportbuilder/java/com/sun/star/report/DataSourceFactory.java
+++ b/reportbuilder/java/com/sun/star/report/DataSourceFactory.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
diff --git a/reportbuilder/java/com/sun/star/report/ImageService.java b/reportbuilder/java/com/sun/star/report/ImageService.java
index d7224ed792eb..4eaf95383150 100644
--- a/reportbuilder/java/com/sun/star/report/ImageService.java
+++ b/reportbuilder/java/com/sun/star/report/ImageService.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
diff --git a/reportbuilder/java/com/sun/star/report/InputRepository.java b/reportbuilder/java/com/sun/star/report/InputRepository.java
index 2e02abf591b7..38dd89bc4826 100644
--- a/reportbuilder/java/com/sun/star/report/InputRepository.java
+++ b/reportbuilder/java/com/sun/star/report/InputRepository.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
@@ -56,7 +56,7 @@ public interface InputRepository
InputStream createInputStream(final String name) throws IOException;
/** allows to acces sub repositories inside this repository
- *
+ *
* @param name describes the path to the sub repository
* @return the sub repository
* @throws java.io.IOException when the sub repository doesn't exist.
diff --git a/reportbuilder/java/com/sun/star/report/JobDefinitionException.java b/reportbuilder/java/com/sun/star/report/JobDefinitionException.java
index 5623caf3d1a1..4a888c0633e0 100644
--- a/reportbuilder/java/com/sun/star/report/JobDefinitionException.java
+++ b/reportbuilder/java/com/sun/star/report/JobDefinitionException.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
diff --git a/reportbuilder/java/com/sun/star/report/JobProgressIndicator.java b/reportbuilder/java/com/sun/star/report/JobProgressIndicator.java
index 06066a2ab757..c324e9f89afd 100644
--- a/reportbuilder/java/com/sun/star/report/JobProgressIndicator.java
+++ b/reportbuilder/java/com/sun/star/report/JobProgressIndicator.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
diff --git a/reportbuilder/java/com/sun/star/report/JobProperties.java b/reportbuilder/java/com/sun/star/report/JobProperties.java
index c934451dfbac..897301e56980 100644
--- a/reportbuilder/java/com/sun/star/report/JobProperties.java
+++ b/reportbuilder/java/com/sun/star/report/JobProperties.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
diff --git a/reportbuilder/java/com/sun/star/report/OfficeToken.java b/reportbuilder/java/com/sun/star/report/OfficeToken.java
index 2c25942f3762..667146970ec3 100644
--- a/reportbuilder/java/com/sun/star/report/OfficeToken.java
+++ b/reportbuilder/java/com/sun/star/report/OfficeToken.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
diff --git a/reportbuilder/java/com/sun/star/report/OutputRepository.java b/reportbuilder/java/com/sun/star/report/OutputRepository.java
index c5283b9c1325..7d2f0b53c4a6 100644
--- a/reportbuilder/java/com/sun/star/report/OutputRepository.java
+++ b/reportbuilder/java/com/sun/star/report/OutputRepository.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
@@ -53,7 +53,7 @@ public interface OutputRepository
OutputStream createOutputStream(final String name, final String mimeType) throws IOException;
/** allows to acces sub repositories inside this repository
- *
+ *
* @param name describes the path to the sub repository
* @param mimeType
* @return the sub repository
diff --git a/reportbuilder/java/com/sun/star/report/ParameterMap.java b/reportbuilder/java/com/sun/star/report/ParameterMap.java
index 0a5dfce9317b..1169e8c1fc86 100644
--- a/reportbuilder/java/com/sun/star/report/ParameterMap.java
+++ b/reportbuilder/java/com/sun/star/report/ParameterMap.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
diff --git a/reportbuilder/java/com/sun/star/report/ReportAddIn.java b/reportbuilder/java/com/sun/star/report/ReportAddIn.java
index 620955c98db7..190f550007b8 100644
--- a/reportbuilder/java/com/sun/star/report/ReportAddIn.java
+++ b/reportbuilder/java/com/sun/star/report/ReportAddIn.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
diff --git a/reportbuilder/java/com/sun/star/report/ReportEngine.java b/reportbuilder/java/com/sun/star/report/ReportEngine.java
index 2518cb1742f0..65fbb1197b9f 100644
--- a/reportbuilder/java/com/sun/star/report/ReportEngine.java
+++ b/reportbuilder/java/com/sun/star/report/ReportEngine.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
diff --git a/reportbuilder/java/com/sun/star/report/ReportEngineMetaData.java b/reportbuilder/java/com/sun/star/report/ReportEngineMetaData.java
index 25d39b732448..e26f367cca7d 100644
--- a/reportbuilder/java/com/sun/star/report/ReportEngineMetaData.java
+++ b/reportbuilder/java/com/sun/star/report/ReportEngineMetaData.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
diff --git a/reportbuilder/java/com/sun/star/report/ReportEngineParameterNames.java b/reportbuilder/java/com/sun/star/report/ReportEngineParameterNames.java
index 2796537f758a..adc74b9ef961 100644
--- a/reportbuilder/java/com/sun/star/report/ReportEngineParameterNames.java
+++ b/reportbuilder/java/com/sun/star/report/ReportEngineParameterNames.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
diff --git a/reportbuilder/java/com/sun/star/report/ReportExecutionException.java b/reportbuilder/java/com/sun/star/report/ReportExecutionException.java
index 6fc8fb1ac29f..d8a3edac376a 100644
--- a/reportbuilder/java/com/sun/star/report/ReportExecutionException.java
+++ b/reportbuilder/java/com/sun/star/report/ReportExecutionException.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
diff --git a/reportbuilder/java/com/sun/star/report/ReportExpression.java b/reportbuilder/java/com/sun/star/report/ReportExpression.java
index a828ee6ddba4..2daa4da1584b 100644
--- a/reportbuilder/java/com/sun/star/report/ReportExpression.java
+++ b/reportbuilder/java/com/sun/star/report/ReportExpression.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
diff --git a/reportbuilder/java/com/sun/star/report/ReportExpressionMetaData.java b/reportbuilder/java/com/sun/star/report/ReportExpressionMetaData.java
index 3223044d2270..67957471e42f 100644
--- a/reportbuilder/java/com/sun/star/report/ReportExpressionMetaData.java
+++ b/reportbuilder/java/com/sun/star/report/ReportExpressionMetaData.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
diff --git a/reportbuilder/java/com/sun/star/report/ReportFunction.java b/reportbuilder/java/com/sun/star/report/ReportFunction.java
index 24be767c1a71..3b5d31a730db 100644
--- a/reportbuilder/java/com/sun/star/report/ReportFunction.java
+++ b/reportbuilder/java/com/sun/star/report/ReportFunction.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
diff --git a/reportbuilder/java/com/sun/star/report/ReportJob.java b/reportbuilder/java/com/sun/star/report/ReportJob.java
index 9bda7926f7d4..c9f31638a1e4 100644
--- a/reportbuilder/java/com/sun/star/report/ReportJob.java
+++ b/reportbuilder/java/com/sun/star/report/ReportJob.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
diff --git a/reportbuilder/java/com/sun/star/report/ReportJobDefinition.java b/reportbuilder/java/com/sun/star/report/ReportJobDefinition.java
index 89724ec20fe5..615e9a918ee7 100644
--- a/reportbuilder/java/com/sun/star/report/ReportJobDefinition.java
+++ b/reportbuilder/java/com/sun/star/report/ReportJobDefinition.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
diff --git a/reportbuilder/java/com/sun/star/report/ReportJobFactory.java b/reportbuilder/java/com/sun/star/report/ReportJobFactory.java
index 1771f0bedb22..68eafdeb36a7 100644
--- a/reportbuilder/java/com/sun/star/report/ReportJobFactory.java
+++ b/reportbuilder/java/com/sun/star/report/ReportJobFactory.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
diff --git a/reportbuilder/java/com/sun/star/report/SDBCReportData.java b/reportbuilder/java/com/sun/star/report/SDBCReportData.java
index 769657aa6bf5..21e1ab22ff22 100644
--- a/reportbuilder/java/com/sun/star/report/SDBCReportData.java
+++ b/reportbuilder/java/com/sun/star/report/SDBCReportData.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
diff --git a/reportbuilder/java/com/sun/star/report/SDBCReportDataFactory.java b/reportbuilder/java/com/sun/star/report/SDBCReportDataFactory.java
index 78ac17a7ba08..d3f701712f2d 100644
--- a/reportbuilder/java/com/sun/star/report/SDBCReportDataFactory.java
+++ b/reportbuilder/java/com/sun/star/report/SDBCReportDataFactory.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
@@ -348,7 +348,7 @@ public class SDBCReportDataFactory implements DataSourceFactory
// should not happen
// assert False
}
-
+
return null;
}
diff --git a/reportbuilder/java/com/sun/star/report/SOImageService.java b/reportbuilder/java/com/sun/star/report/SOImageService.java
index 6d67ebabc0d1..67412f4b4b3f 100644
--- a/reportbuilder/java/com/sun/star/report/SOImageService.java
+++ b/reportbuilder/java/com/sun/star/report/SOImageService.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
diff --git a/reportbuilder/java/com/sun/star/report/StorageRepository.java b/reportbuilder/java/com/sun/star/report/StorageRepository.java
index 9bf610b70606..8ecbb380e154 100644
--- a/reportbuilder/java/com/sun/star/report/StorageRepository.java
+++ b/reportbuilder/java/com/sun/star/report/StorageRepository.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
@@ -66,9 +66,9 @@ public class StorageRepository implements InputRepository, OutputRepository
private final String rootURL;
/**
- *
- * @param input
- * @param output
+ *
+ * @param input
+ * @param output
* @param rootURL
* @throws java.io.IOException
*/
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 11eb9e038a60..84d771d5a9ec 100644
--- a/reportbuilder/java/com/sun/star/report/function/metadata/AuthorFunction.java
+++ b/reportbuilder/java/com/sun/star/report/function/metadata/AuthorFunction.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 f8c1032bfb16..9275abc70d58 100644
--- a/reportbuilder/java/com/sun/star/report/function/metadata/AuthorFunctionDescription.java
+++ b/reportbuilder/java/com/sun/star/report/function/metadata/AuthorFunctionDescription.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 8fa0e5d80ac5..4cb767e870e3 100644
--- a/reportbuilder/java/com/sun/star/report/function/metadata/MetaDataFunctionCategory.java
+++ b/reportbuilder/java/com/sun/star/report/function/metadata/MetaDataFunctionCategory.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 55c3d6ff381c..89d5ad9ddd4c 100644
--- a/reportbuilder/java/com/sun/star/report/function/metadata/TitleFunction.java
+++ b/reportbuilder/java/com/sun/star/report/function/metadata/TitleFunction.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 7ed8a61bd06a..572521f33857 100644
--- a/reportbuilder/java/com/sun/star/report/function/metadata/TitleFunctionDescription.java
+++ b/reportbuilder/java/com/sun/star/report/function/metadata/TitleFunctionDescription.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/DefaultNameGenerator.java b/reportbuilder/java/com/sun/star/report/pentaho/DefaultNameGenerator.java
index 620ddcee98eb..8d6ecfa7b603 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/DefaultNameGenerator.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/DefaultNameGenerator.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/OfficeNamespaces.java b/reportbuilder/java/com/sun/star/report/pentaho/OfficeNamespaces.java
index 823bf6540f47..ddb5f88e2161 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/OfficeNamespaces.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/OfficeNamespaces.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/PentahoFormulaContext.java b/reportbuilder/java/com/sun/star/report/pentaho/PentahoFormulaContext.java
index c68424de99c9..85a89b56ebfb 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/PentahoFormulaContext.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/PentahoFormulaContext.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/PentahoReportAddIn.java b/reportbuilder/java/com/sun/star/report/pentaho/PentahoReportAddIn.java
index a4222fdaa3b3..61e551ffcbf7 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/PentahoReportAddIn.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/PentahoReportAddIn.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/PentahoReportEngine.java b/reportbuilder/java/com/sun/star/report/pentaho/PentahoReportEngine.java
index 8ee9d8547363..fc0ed6506adb 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/PentahoReportEngine.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/PentahoReportEngine.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/PentahoReportEngineMetaData.java b/reportbuilder/java/com/sun/star/report/pentaho/PentahoReportEngineMetaData.java
index c32f490c9b73..e8017403ef70 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/PentahoReportEngineMetaData.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/PentahoReportEngineMetaData.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/PentahoReportJob.java b/reportbuilder/java/com/sun/star/report/pentaho/PentahoReportJob.java
index a30a97a1e7e1..b420850a9d0b 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/PentahoReportJob.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/PentahoReportJob.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/SOFormulaOpCodeMapper.java b/reportbuilder/java/com/sun/star/report/pentaho/SOFormulaOpCodeMapper.java
index f5d6d654aa0e..22982222db67 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/SOFormulaOpCodeMapper.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/SOFormulaOpCodeMapper.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/SOFormulaParser.java b/reportbuilder/java/com/sun/star/report/pentaho/SOFormulaParser.java
index 4dbf435f28ec..d3a6593adddb 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/SOFormulaParser.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/SOFormulaParser.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/SOFunctionManager.java b/reportbuilder/java/com/sun/star/report/pentaho/SOFunctionManager.java
index 7a7c1e159bf7..f5c53dae739a 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/SOFunctionManager.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/SOFunctionManager.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/SOReportJobFactory.java b/reportbuilder/java/com/sun/star/report/pentaho/SOReportJobFactory.java
index b02c2010a14d..ab87cb381e73 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/SOReportJobFactory.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/SOReportJobFactory.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/StarFunctionCategory.java b/reportbuilder/java/com/sun/star/report/pentaho/StarFunctionCategory.java
index 7825a2b34c4a..0c7eb7af03a8 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/StarFunctionCategory.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/StarFunctionCategory.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/StarFunctionDescription.java b/reportbuilder/java/com/sun/star/report/pentaho/StarFunctionDescription.java
index f0debc672118..80f508124ea5 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/StarFunctionDescription.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/StarFunctionDescription.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/StarReportData.java b/reportbuilder/java/com/sun/star/report/pentaho/StarReportData.java
index b53271cb78d1..6546b0c13825 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/StarReportData.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/StarReportData.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/StarReportDataFactory.java b/reportbuilder/java/com/sun/star/report/pentaho/StarReportDataFactory.java
index 3f5beae7e6be..9eae60f3121a 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/StarReportDataFactory.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/StarReportDataFactory.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/StarReportModule.java b/reportbuilder/java/com/sun/star/report/pentaho/StarReportModule.java
index b3497fc51377..8152a5e12f8b 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/StarReportModule.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/StarReportModule.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 c86b2186d08e..84f43eccf644 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/expressions/SumExpression.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/expressions/SumExpression.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 21f8f4c4471b..8d05446f585c 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/expressions/SumExpressionMetaData.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/expressions/SumExpressionMetaData.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 85f841a11338..b11862fe3e59 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/AbstractReportElementLayoutController.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/AbstractReportElementLayoutController.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 6ac7b7551bec..3e3993c9003f 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FixedTextLayoutController.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FixedTextLayoutController.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 fc1baaa8c9a3..57e858517d47 100755
--- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormatValueUtility.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormatValueUtility.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 5a6b8f948372..e5ebde9caac7 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormattedTextLayoutController.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormattedTextLayoutController.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 9a2def45d32c..14acf7b24ff2 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/ImageElementContext.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/ImageElementContext.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 78f504107348..017110241254 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/ImageElementLayoutController.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/ImageElementLayoutController.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 1fcb1b67ec81..b5bd376ab547 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/ObjectOleLayoutController.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/ObjectOleLayoutController.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 b5f77d2a2971..4409a3a25884 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeDetailLayoutController.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeDetailLayoutController.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 9055c2a5bdd1..55fa47370bd8 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeGroupLayoutController.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeGroupLayoutController.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 21086d6584d9..c455528b147a 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeGroupSectionLayoutController.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeGroupSectionLayoutController.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 790d18527f14..b50e1f8f619b 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeRepeatingStructureLayoutController.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeRepeatingStructureLayoutController.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 2ad88388b347..cbf7412e6dbe 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeReportLayoutController.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeReportLayoutController.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 9ce1be656b53..b537520ea677 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeTableLayoutController.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeTableLayoutController.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 6c6f997d84aa..5bf05ecda555 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeTableTemplateLayoutController.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeTableTemplateLayoutController.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 f3c5ef383057..3ce77c6d14b4 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/TableCellLayoutController.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/TableCellLayoutController.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 a0ca9d8c98b6..1d2d82faf872 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/VariablesCollection.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/VariablesCollection.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 ba54e200f652..5a78a25b84c1 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/VariablesDeclarationLayoutController.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/VariablesDeclarationLayoutController.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 f8e2b4294feb..124b4cd00332 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/loader/InputRepositoryLoader.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/loader/InputRepositoryLoader.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 4341c386113e..23e952c4aac2 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/loader/InputRepositoryResourceData.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/loader/InputRepositoryResourceData.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 b9491fc3dec6..b9b5e05e4615 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/loader/InputResourceKey.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/loader/InputResourceKey.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 8e2f62c81a32..7ec9ac86e378 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/DataStyle.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/DataStyle.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 124fc5e13827..3a1d18df4828 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/FixedTextElement.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/FixedTextElement.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 0f1a9330e82d..fb6b41e201de 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/FontFaceDeclsSection.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/FontFaceDeclsSection.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 cbd29672a305..03bd5282e28d 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/FontFaceElement.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/FontFaceElement.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 471c383466a9..a19506d47dd7 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/FormatCondition.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/FormatCondition.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 182f6a998681..8e425771a469 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/FormattedTextElement.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/FormattedTextElement.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 176500134191..3c6222fbe7fd 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/ImageElement.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/ImageElement.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 84f41523c79a..63de51e74c95 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/ObjectOleElement.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/ObjectOleElement.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 14614b2548e0..7f528efab6fb 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeDetailSection.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeDetailSection.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 f17c1d0d65c0..03540e755178 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeDocument.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeDocument.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 92e6964ea622..21e8fab4c473 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeGroup.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeGroup.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 262d95782572..93c0c9bf2318 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeGroupSection.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeGroupSection.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 68d508a4b2bd..fd5a99d478fe 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeMasterPage.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeMasterPage.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 562f369b9087..abdbaf39c21e 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeMasterStyles.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeMasterStyles.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 cf873b9452d5..ba3fbddc1d57 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeReport.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeReport.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 3968df62dcd9..ae7f544248fa 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeStyle.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeStyle.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 0af1062505c7..690d496eb3b7 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeStyles.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeStyles.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 b2fdf3e43f57..4d6e7eaaf2fd 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeStylesCollection.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeStylesCollection.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 9df11ff0156c..fca244fd8d47 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeTableSection.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeTableSection.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 47030c3fe638..3c59c7011c40 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/PageLayout.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/PageLayout.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 ae4aa55a3d9d..49bb0787a69d 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/PageSection.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/PageSection.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 47b275a0a5b7..6b286e85e263 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/RawText.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/RawText.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 5821351d2d9e..8de4adf0ce1c 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/ReportElement.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/ReportElement.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 bbe2c7dadf78..db5801287690 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/TableCellElement.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/TableCellElement.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 d50935f837fb..e8c072a7935c 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/VariablesDeclarationSection.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/VariablesDeclarationSection.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 b3d6485d9195..31b1ac6b6be2 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/output/ImageProducer.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/output/ImageProducer.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 b41252a17089..68bf32352af3 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/output/OfficeDocumentReportTarget.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/output/OfficeDocumentReportTarget.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 ef9296707af3..b457f175eafc 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/output/OleProducer.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/output/OleProducer.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 939583be8365..82bfc743f529 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/output/StyleUtilities.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/output/StyleUtilities.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 54b7d0d0159c..5ab27b4e7dca 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/output/StylesWriter.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/output/StylesWriter.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 72d799e1a204..eab8ba125eeb 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
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 f76d43bb807a..3b1061a92912 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
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 6876ea5be028..bc711fc3cda3 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
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 d2c4ebd96e3c..f163029a7970 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
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 ff680e14657a..b8cd54d3b027 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
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 4632d81b8970..8bfb02563370 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
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 8aa0bb09a1f1..a306ce4be7c0 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
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 00d4aff11de9..79832e8e9188 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
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 9f3746086b87..a780e0a9455f 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
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 b79d18b56a0b..74fecc92d411 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
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 98a47a23aae7..c7d72c7d4933 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/AttributeSpecification.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/AttributeSpecification.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 c90f6425d971..d85761ee3665 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/ElementReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/ElementReadHandler.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 4177a75f81be..cb815162bae3 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/OfficeDocumentXmlResourceFactory.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/OfficeDocumentXmlResourceFactory.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 5272a987957f..4b0c6c008046 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/OfficeParserUtil.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/OfficeParserUtil.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 28d646eb8a23..a94187ba4eb9 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/OfficeStylesXmlResourceFactory.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/OfficeStylesXmlResourceFactory.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 baa6531fbd08..9851ebc834d7 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/StarStyleXmlFactoryModule.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/StarStyleXmlFactoryModule.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 ce16d222eaba..23c6555f6f58 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/StarXmlFactoryModule.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/StarXmlFactoryModule.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 aaae0b7795b5..d14b31f48a0e 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/StyleMapper.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/StyleMapper.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 9f899389b27b..e8538e3d56b9 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
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 e2effde8dfc3..d58f53a02a66 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
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 e5d38f2d364a..5f27c0b64485 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
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 b77c0e80e321..18b10dc31240 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
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 1f57c7c61205..780a286d2d49 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
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 c8bf1268ab3c..a0d484861d51 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
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 bfd0e99e170d..ece7a250d78a 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
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 61263a216dca..55b7325d2e8b 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
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 02d23aec10bd..005c177308db 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
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 a8252667ff1f..68a4871e2a00 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
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 e414a1bbe16c..69f119c896e2 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
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 581dd79f418e..58d1334e437e 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
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 4c94cb910d79..5d71ed9c4442 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
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 233e0692dd07..f846e70dbf9d 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
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 3516f6e047ad..f4ff094f57b9 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
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 99a34abc1d42..3ab79122cc55 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
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 1695eac68fe0..8e0be61371d5 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
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 59671bfbbe60..5bb4555a8290 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
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 4359581da3a6..55909f50b3d5 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
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 f6db6905da13..4331f882d156 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
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 70075f96b017..573dcd96a26f 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
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 081e8bf2020e..567aaf82db55 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
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 fb20e3783123..cb9a5688b137 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
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 d662e8028ab6..3a6f8b41cf2b 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
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 2433a7dfa2c1..5287bda0ad06 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
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 d679c1c0f412..6480048861ff 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
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 d781a05305f7..8db9e7dfd3bb 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
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 5dcd52d04782..909fea32caae 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
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 2832007d5ec0..d96f70b897ac 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
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 eb3217022f97..7d3ac8087331 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
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 f5f680ce295e..532d848cb30c 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
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 c4769b9f2708..d5a973ad0ac8 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
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 6ab7454dbc59..36622b8b5548 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
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 a28c293feef3..a0e6a01461af 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
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 e33a3c437c46..1610bbfc7715 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
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 c611b09cc444..a16e4679fb8a 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
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 2820dc3d83f7..8f459efd22cd 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
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 c3159f54e1a3..82d156c63084 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
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 808c57523361..70fe95e5f756 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
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 8cc6721cffc3..24caf8d9a58a 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
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 c7f10d61cb00..e4fabb1446e0 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
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 6d4f90c3beda..dbfc023e89ab 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
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 1ba4c480d58d..d6d10c8d6027 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
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 f247f2c171fc..62f66284c2e9 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
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 bfb1f64a8035..c8c4a9ae63ed 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
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 63628b9ed60d..30a98deac48d 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
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 9cc2a62c157e..7b681be849b7 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
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 9994a1413b4f..5eacfb8415e1 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
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 89c5769f15a6..95ba9b6c1742 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
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 5d94f4101059..351a5c8c2ca5 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
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 34158230c3c1..46047b51a3ed 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
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 9d963fd46326..792b0f05c9b3 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
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 4b8bc8498d91..fdfebaa75be4 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
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 d1c23bb63957..29a732bb0bd1 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
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 2eb20bdc96ac..bb302ab94ff9 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
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 d86410140103..a18f7598a755 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
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 00a61ffb8573..e73fe308b5bd 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
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 ae0c29f13d3c..172438b8d2c0 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
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 54a6cae8eaaa..c77e543b1b3a 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
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 0665066f2a9f..e9033db374c9 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/styles/LengthCalculator.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/styles/LengthCalculator.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 cee02bae0430..a015e48e4804 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapper.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapper.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 447a0b958fd8..46c3b9e847a1 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapperKey.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapperKey.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 95f8322de730..263abf29737e 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapperXmlFactoryModule.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapperXmlFactoryModule.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 3fecbbfc882e..bc54f18079e9 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapperXmlResourceFactory.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapperXmlResourceFactory.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 b0acf047df7f..144e05c7b080 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMappingDocumentReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMappingDocumentReadHandler.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 1ec2dc111cb0..42484e184c05 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMappingReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMappingReadHandler.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 9698e73ce67b..42695eb04489 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMappingRule.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMappingRule.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
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 11ca5fcd8ae4..112f55979cc3 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/styles/stylemapper.xml
+++ b/reportbuilder/java/com/sun/star/report/pentaho/styles/stylemapper.xml
@@ -2,23 +2,23 @@
<!--
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>
diff --git a/reportbuilder/java/com/sun/star/report/util/DefaultJobProperties.java b/reportbuilder/java/com/sun/star/report/util/DefaultJobProperties.java
index 050ad47615cd..41752e935e13 100644
--- a/reportbuilder/java/com/sun/star/report/util/DefaultJobProperties.java
+++ b/reportbuilder/java/com/sun/star/report/util/DefaultJobProperties.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
diff --git a/reportbuilder/java/com/sun/star/report/util/DefaultParameterMap.java b/reportbuilder/java/com/sun/star/report/util/DefaultParameterMap.java
index 0fdda8f21d61..5d50fb13558a 100644
--- a/reportbuilder/java/com/sun/star/report/util/DefaultParameterMap.java
+++ b/reportbuilder/java/com/sun/star/report/util/DefaultParameterMap.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
diff --git a/reportbuilder/java/com/sun/star/report/util/DefaultReportJobDefinition.java b/reportbuilder/java/com/sun/star/report/util/DefaultReportJobDefinition.java
index dbd943bb0ea1..5115128da6a8 100644
--- a/reportbuilder/java/com/sun/star/report/util/DefaultReportJobDefinition.java
+++ b/reportbuilder/java/com/sun/star/report/util/DefaultReportJobDefinition.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
diff --git a/reportbuilder/java/com/sun/star/report/util/ManifestWriter.java b/reportbuilder/java/com/sun/star/report/util/ManifestWriter.java
index f1b6f7a56ab3..03e30c33b24d 100644
--- a/reportbuilder/java/com/sun/star/report/util/ManifestWriter.java
+++ b/reportbuilder/java/com/sun/star/report/util/ManifestWriter.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
diff --git a/reportbuilder/java/com/sun/star/report/util/ReportUtil.java b/reportbuilder/java/com/sun/star/report/util/ReportUtil.java
index 464f0e9901b7..82fbb2f5be34 100644
--- a/reportbuilder/java/com/sun/star/report/util/ReportUtil.java
+++ b/reportbuilder/java/com/sun/star/report/util/ReportUtil.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
diff --git a/reportbuilder/registry/data/org/openoffice/Office/Accelerators.xcu b/reportbuilder/registry/data/org/openoffice/Office/Accelerators.xcu
index ebb6ac365443..8ee03947ff62 100644
--- a/reportbuilder/registry/data/org/openoffice/Office/Accelerators.xcu
+++ b/reportbuilder/registry/data/org/openoffice/Office/Accelerators.xcu
@@ -2,7 +2,7 @@
<!--***********************************************************************
*
* 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
@@ -142,14 +142,14 @@
<value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
</prop>
</node>
-
+
<node oor:name="ADD" oor:op="replace">
<prop oor:name="Command">
<value xml:lang="en-US">.uno:ExpandSection</value>
<value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
</prop>
</node>
-
+
</node>
</node>
</node>
diff --git a/reportbuilder/registry/data/org/openoffice/Office/DataAccess.xcu b/reportbuilder/registry/data/org/openoffice/Office/DataAccess.xcu
index e40b13f257bb..0126b505e58a 100644
--- a/reportbuilder/registry/data/org/openoffice/Office/DataAccess.xcu
+++ b/reportbuilder/registry/data/org/openoffice/Office/DataAccess.xcu
@@ -2,7 +2,7 @@
<!--***********************************************************************
*
* 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
diff --git a/reportbuilder/registry/data/org/openoffice/Office/Embedding.xcu b/reportbuilder/registry/data/org/openoffice/Office/Embedding.xcu
index 521166e1d4c8..6d64a5e693e5 100644
--- a/reportbuilder/registry/data/org/openoffice/Office/Embedding.xcu
+++ b/reportbuilder/registry/data/org/openoffice/Office/Embedding.xcu
@@ -2,7 +2,7 @@
<!--***********************************************************************
*
* 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
diff --git a/reportbuilder/registry/data/org/openoffice/Office/ExtendedColorScheme.xcu b/reportbuilder/registry/data/org/openoffice/Office/ExtendedColorScheme.xcu
index e17460345a61..255eeffd601e 100644
--- a/reportbuilder/registry/data/org/openoffice/Office/ExtendedColorScheme.xcu
+++ b/reportbuilder/registry/data/org/openoffice/Office/ExtendedColorScheme.xcu
@@ -2,7 +2,7 @@
<!--***********************************************************************
*
* 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
diff --git a/reportbuilder/registry/data/org/openoffice/Office/Paths.xcu b/reportbuilder/registry/data/org/openoffice/Office/Paths.xcu
index cba53df0ffce..8d67fdf03645 100644
--- a/reportbuilder/registry/data/org/openoffice/Office/Paths.xcu
+++ b/reportbuilder/registry/data/org/openoffice/Office/Paths.xcu
@@ -2,7 +2,7 @@
<!--***********************************************************************
*
* 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
diff --git a/reportbuilder/registry/data/org/openoffice/Office/ReportDesign.xcu b/reportbuilder/registry/data/org/openoffice/Office/ReportDesign.xcu
index 0a9c957a52bb..1d29ed5f4413 100644
--- a/reportbuilder/registry/data/org/openoffice/Office/ReportDesign.xcu
+++ b/reportbuilder/registry/data/org/openoffice/Office/ReportDesign.xcu
@@ -2,7 +2,7 @@
<!--***********************************************************************
*
* 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
diff --git a/reportbuilder/registry/data/org/openoffice/Office/UI/Controller.xcu b/reportbuilder/registry/data/org/openoffice/Office/UI/Controller.xcu
index c45a2e27a1bb..2a1c46c96f7c 100644
--- a/reportbuilder/registry/data/org/openoffice/Office/UI/Controller.xcu
+++ b/reportbuilder/registry/data/org/openoffice/Office/UI/Controller.xcu
@@ -2,7 +2,7 @@
<!--***********************************************************************
*
* 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
diff --git a/reportbuilder/registry/data/org/openoffice/Office/UI/DbReportWindowState.xcu b/reportbuilder/registry/data/org/openoffice/Office/UI/DbReportWindowState.xcu
index 229502286ccb..879db0790ea8 100644
--- a/reportbuilder/registry/data/org/openoffice/Office/UI/DbReportWindowState.xcu
+++ b/reportbuilder/registry/data/org/openoffice/Office/UI/DbReportWindowState.xcu
@@ -2,7 +2,7 @@
<!--***********************************************************************
*
* 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
diff --git a/reportbuilder/registry/data/org/openoffice/Office/UI/ReportCommands.xcu b/reportbuilder/registry/data/org/openoffice/Office/UI/ReportCommands.xcu
index ed78f4b13608..31bfd76fd1a0 100644
--- a/reportbuilder/registry/data/org/openoffice/Office/UI/ReportCommands.xcu
+++ b/reportbuilder/registry/data/org/openoffice/Office/UI/ReportCommands.xcu
@@ -2,7 +2,7 @@
<!--***********************************************************************
*
* 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
diff --git a/reportbuilder/registry/data/org/openoffice/Setup.xcu b/reportbuilder/registry/data/org/openoffice/Setup.xcu
index 55ff435f718e..2f51d595e96d 100644
--- a/reportbuilder/registry/data/org/openoffice/Setup.xcu
+++ b/reportbuilder/registry/data/org/openoffice/Setup.xcu
@@ -2,7 +2,7 @@
<!--***********************************************************************
*
* 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
diff --git a/reportbuilder/registry/data/org/openoffice/TypeDetection/Filter.xcu b/reportbuilder/registry/data/org/openoffice/TypeDetection/Filter.xcu
index 3760b439fbc4..d0475c369b36 100644
--- a/reportbuilder/registry/data/org/openoffice/TypeDetection/Filter.xcu
+++ b/reportbuilder/registry/data/org/openoffice/TypeDetection/Filter.xcu
@@ -2,7 +2,7 @@
<!--***********************************************************************
*
* 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
diff --git a/reportbuilder/registry/data/org/openoffice/TypeDetection/Types.xcu b/reportbuilder/registry/data/org/openoffice/TypeDetection/Types.xcu
index c36b31fbe2aa..f728dfb4e0e1 100644
--- a/reportbuilder/registry/data/org/openoffice/TypeDetection/Types.xcu
+++ b/reportbuilder/registry/data/org/openoffice/TypeDetection/Types.xcu
@@ -2,7 +2,7 @@
<!--***********************************************************************
*
* 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
diff --git a/reportbuilder/template/pre.xml b/reportbuilder/template/pre.xml
index a1426ca2fb4e..e36e2ecc7643 100644
--- a/reportbuilder/template/pre.xml
+++ b/reportbuilder/template/pre.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<description xmlns="http://openoffice.org/extensions/description/2006"
- xmlns:d="http://openoffice.org/extensions/description/2006"
+ xmlns:d="http://openoffice.org/extensions/description/2006"
xmlns:xlink="http://www.w3.org/1999/xlink">
<registration>
<simple-license accept-by="admin" default-license-id="en-US" >
diff --git a/reportbuilder/template/registry/data/org/openoffice/Office/Paths.xcu b/reportbuilder/template/registry/data/org/openoffice/Office/Paths.xcu
index 65ee5a1b4dbb..b46d8a6b20ef 100644
--- a/reportbuilder/template/registry/data/org/openoffice/Office/Paths.xcu
+++ b/reportbuilder/template/registry/data/org/openoffice/Office/Paths.xcu
@@ -2,7 +2,7 @@
<!--***********************************************************************
*
* 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
diff --git a/reportbuilder/util/description.xml b/reportbuilder/util/description.xml
index 4b0372d53de9..367f59b35344 100755
--- a/reportbuilder/util/description.xml
+++ b/reportbuilder/util/description.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<description xmlns="http://openoffice.org/extensions/description/2006"
- xmlns:d="http://openoffice.org/extensions/description/2006"
+ xmlns:d="http://openoffice.org/extensions/description/2006"
xmlns:xlink="http://www.w3.org/1999/xlink">
<display-name>
<name lang="en-US">Report Builder</name>
diff --git a/reportbuilder/util/hidother.src b/reportbuilder/util/hidother.src
index a06b9d89a4ec..f85a8c8ff625 100644
--- a/reportbuilder/util/hidother.src
+++ b/reportbuilder/util/hidother.src
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
@@ -32,42 +32,42 @@
#include <svx/svxids.hrc>
#endif
-hidspecial UID_RPT_RPT_APP_VIEW { HelpId = UID_RPT_RPT_APP_VIEW ; };
-hidspecial UID_RPT_SCROLLWINDOW { HelpId = UID_RPT_SCROLLWINDOW ; };
-hidspecial UID_RPT_REPORTWINDOW { HelpId = UID_RPT_REPORTWINDOW ; };
-hidspecial HID_RPT_HORZ_RULER { HelpId = HID_RPT_HORZ_RULER ; };
-hidspecial UID_RPT_SECTIONSWINDOW { HelpId = UID_RPT_SECTIONSWINDOW ; };
-hidspecial UID_RPT_VIEWSWINDOW { HelpId = UID_RPT_VIEWSWINDOW ; };
-hidspecial HID_RPT_ENDMARKER { HelpId = HID_RPT_ENDMARKER ; };
-hidspecial HID_RPT_SPLITTER { HelpId = HID_RPT_SPLITTER ; };
-hidspecial HID_REPORTSECTION { HelpId = HID_REPORTSECTION ; };
-hidspecial HID_RPT_HORZ_SCROLLBAR { HelpId = HID_RPT_HORZ_SCROLLBAR ; };
-hidspecial HID_RPT_VERT_SCROLLBAR { HelpId = HID_RPT_VERT_SCROLLBAR ; };
-hidspecial HID_RPT_STARTMARKER { HelpId = HID_RPT_STARTMARKER ; };
+hidspecial UID_RPT_RPT_APP_VIEW { HelpId = UID_RPT_RPT_APP_VIEW ; };
+hidspecial UID_RPT_SCROLLWINDOW { HelpId = UID_RPT_SCROLLWINDOW ; };
+hidspecial UID_RPT_REPORTWINDOW { HelpId = UID_RPT_REPORTWINDOW ; };
+hidspecial HID_RPT_HORZ_RULER { HelpId = HID_RPT_HORZ_RULER ; };
+hidspecial UID_RPT_SECTIONSWINDOW { HelpId = UID_RPT_SECTIONSWINDOW ; };
+hidspecial UID_RPT_VIEWSWINDOW { HelpId = UID_RPT_VIEWSWINDOW ; };
+hidspecial HID_RPT_ENDMARKER { HelpId = HID_RPT_ENDMARKER ; };
+hidspecial HID_RPT_SPLITTER { HelpId = HID_RPT_SPLITTER ; };
+hidspecial HID_REPORTSECTION { HelpId = HID_REPORTSECTION ; };
+hidspecial HID_RPT_HORZ_SCROLLBAR { HelpId = HID_RPT_HORZ_SCROLLBAR ; };
+hidspecial HID_RPT_VERT_SCROLLBAR { HelpId = HID_RPT_VERT_SCROLLBAR ; };
+hidspecial HID_RPT_STARTMARKER { HelpId = HID_RPT_STARTMARKER ; };
-hidspecial SID_RPT_SHOWREPORTEXPLORER { HelpId = SID_RPT_SHOWREPORTEXPLORER ; };
-hidspecial SID_PAGEHEADERFOOTER { HelpId = SID_PAGEHEADERFOOTER ; };
-hidspecial SID_REPORTHEADERFOOTER { HelpId = SID_REPORTHEADERFOOTER ; };
-hidspecial SID_SORTINGANDGROUPING { HelpId = SID_SORTINGANDGROUPING ; };
-hidspecial SID_INSERT_FLD_PGNUMBER { HelpId = SID_INSERT_FLD_PGNUMBER ; };
-hidspecial SID_CONDITIONALFORMATTING { HelpId = SID_CONDITIONALFORMATTING ; };
-hidspecial SID_PAGEDIALOG { HelpId = SID_PAGEDIALOG ; };
-hidspecial SID_SETCONTROLDEFAULTS { HelpId = SID_SETCONTROLDEFAULTS ; };
-hidspecial SID_INSERTBREAK { HelpId = SID_INSERTBREAK ; };
-hidspecial HID_RPT_FIELDEXPRESSION { HelpId = HID_RPT_FIELDEXPRESSION ; };
-hidspecial HID_RPT_SORTORDER { HelpId = HID_RPT_SORTORDER ; };
-hidspecial HID_RPT_GROUPSBRW { HelpId = HID_RPT_GROUPSBRW ; };
-hidspecial HID_RPT_GROUPSSORTING_DLG { HelpId = HID_RPT_GROUPSSORTING_DLG ; };
-hidspecial HID_RPT_PAGENUMBERS_DLG { HelpId = HID_RPT_PAGENUMBERS_DLG ; };
-hidspecial HID_RPT_DATETIME_DLG { HelpId = HID_RPT_DATETIME_DLG ; };
-hidspecial HID_RPT_CONDFORMAT_DLG { HelpId = HID_RPT_CONDFORMAT_DLG ; };
-hidspecial HID_RPT_CRTL_FORMAT_PREVIEW { HelpId = HID_RPT_CRTL_FORMAT_PREVIEW ; };
-hidspecial HID_RPT_COND_DLG { HelpId = HID_RPT_COND_DLG ; };
+hidspecial SID_RPT_SHOWREPORTEXPLORER { HelpId = SID_RPT_SHOWREPORTEXPLORER ; };
+hidspecial SID_PAGEHEADERFOOTER { HelpId = SID_PAGEHEADERFOOTER ; };
+hidspecial SID_REPORTHEADERFOOTER { HelpId = SID_REPORTHEADERFOOTER ; };
+hidspecial SID_SORTINGANDGROUPING { HelpId = SID_SORTINGANDGROUPING ; };
+hidspecial SID_INSERT_FLD_PGNUMBER { HelpId = SID_INSERT_FLD_PGNUMBER ; };
+hidspecial SID_CONDITIONALFORMATTING { HelpId = SID_CONDITIONALFORMATTING ; };
+hidspecial SID_PAGEDIALOG { HelpId = SID_PAGEDIALOG ; };
+hidspecial SID_SETCONTROLDEFAULTS { HelpId = SID_SETCONTROLDEFAULTS ; };
+hidspecial SID_INSERTBREAK { HelpId = SID_INSERTBREAK ; };
+hidspecial HID_RPT_FIELDEXPRESSION { HelpId = HID_RPT_FIELDEXPRESSION ; };
+hidspecial HID_RPT_SORTORDER { HelpId = HID_RPT_SORTORDER ; };
+hidspecial HID_RPT_GROUPSBRW { HelpId = HID_RPT_GROUPSBRW ; };
+hidspecial HID_RPT_GROUPSSORTING_DLG { HelpId = HID_RPT_GROUPSSORTING_DLG ; };
+hidspecial HID_RPT_PAGENUMBERS_DLG { HelpId = HID_RPT_PAGENUMBERS_DLG ; };
+hidspecial HID_RPT_DATETIME_DLG { HelpId = HID_RPT_DATETIME_DLG ; };
+hidspecial HID_RPT_CONDFORMAT_DLG { HelpId = HID_RPT_CONDFORMAT_DLG ; };
+hidspecial HID_RPT_CRTL_FORMAT_PREVIEW { HelpId = HID_RPT_CRTL_FORMAT_PREVIEW ; };
+hidspecial HID_RPT_COND_DLG { HelpId = HID_RPT_COND_DLG ; };
hidspecial HID_RPT_POPUP_COLOR_CTRL { HelpId = HID_RPT_POPUP_COLOR_CTRL ; };
hidspecial HID_RPT_POPUP_COLOR { HelpId = HID_RPT_POPUP_COLOR ; };
-hidspecial SID_ESCAPE { HelpId = SID_ESCAPE ; };
-hidspecial HID_RPT_PROPDLG_TAB_GENERAL { HelpId = HID_RPT_PROPDLG_TAB_GENERAL ; };
-hidspecial HID_RPT_PROPDLG_TAB_DATA { HelpId = HID_RPT_PROPDLG_TAB_DATA ; };
+hidspecial SID_ESCAPE { HelpId = SID_ESCAPE ; };
+hidspecial HID_RPT_PROPDLG_TAB_GENERAL { HelpId = HID_RPT_PROPDLG_TAB_GENERAL ; };
+hidspecial HID_RPT_PROPDLG_TAB_DATA { HelpId = HID_RPT_PROPDLG_TAB_DATA ; };
hidspecial HID_RPT_PROP_FORCENEWPAGE { HelpId = HID_RPT_PROP_FORCENEWPAGE; };
hidspecial HID_RPT_PROP_NEWROWORCOL { HelpId = HID_RPT_PROP_NEWROWORCOL; };
@@ -120,14 +120,14 @@ hidspecial HID_RPT_PROP_CONTROLBACKGROUNDTRANSPARENT { HelpId = HID_RPT_PROP_
hidspecial SID_ARRANGEMENU { HelpId = SID_ARRANGEMENU; };
hidspecial SID_SELECTALL_IN_SECTION { HelpId = SID_SELECTALL_IN_SECTION; };
-hidspecial SID_SECTION_ALIGN { HelpId = SID_SECTION_ALIGN; };
-hidspecial SID_SECTION_ALIGN_LEFT { HelpId = SID_SECTION_ALIGN_LEFT; };
-hidspecial SID_SECTION_ALIGN_CENTER { HelpId = SID_SECTION_ALIGN_CENTER; };
-hidspecial SID_SECTION_ALIGN_RIGHT { HelpId = SID_SECTION_ALIGN_RIGHT; };
-hidspecial SID_SECTION_ALIGN_UP { HelpId = SID_SECTION_ALIGN_UP; };
-hidspecial SID_SECTION_ALIGN_MIDDLE { HelpId = SID_SECTION_ALIGN_MIDDLE; };
-hidspecial SID_SECTION_ALIGN_DOWN { HelpId = SID_SECTION_ALIGN_DOWN; };
-hidspecial SID_NEXT_MARK { HelpId = SID_NEXT_MARK; };
+hidspecial SID_SECTION_ALIGN { HelpId = SID_SECTION_ALIGN; };
+hidspecial SID_SECTION_ALIGN_LEFT { HelpId = SID_SECTION_ALIGN_LEFT; };
+hidspecial SID_SECTION_ALIGN_CENTER { HelpId = SID_SECTION_ALIGN_CENTER; };
+hidspecial SID_SECTION_ALIGN_RIGHT { HelpId = SID_SECTION_ALIGN_RIGHT; };
+hidspecial SID_SECTION_ALIGN_UP { HelpId = SID_SECTION_ALIGN_UP; };
+hidspecial SID_SECTION_ALIGN_MIDDLE { HelpId = SID_SECTION_ALIGN_MIDDLE; };
+hidspecial SID_SECTION_ALIGN_DOWN { HelpId = SID_SECTION_ALIGN_DOWN; };
+hidspecial SID_NEXT_MARK { HelpId = SID_NEXT_MARK; };
hidspecial SID_PREV_MARK { HelpId = SID_PREV_MARK; };
hidspecial UID_RPT_PROP_CHARTTYPE_DLG { HelpId = UID_RPT_PROP_CHARTTYPE_DLG; };
diff --git a/sdext/inc/pch/precompiled_sdext.cxx b/sdext/inc/pch/precompiled_sdext.cxx
index 071aae824858..4fb89ae1585a 100644
--- a/sdext/inc/pch/precompiled_sdext.cxx
+++ b/sdext/inc/pch/precompiled_sdext.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
diff --git a/sdext/inc/pch/precompiled_sdext.hxx b/sdext/inc/pch/precompiled_sdext.hxx
index ea496150e83e..46ba80cdc77e 100644
--- a/sdext/inc/pch/precompiled_sdext.hxx
+++ b/sdext/inc/pch/precompiled_sdext.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
diff --git a/sdext/source/minimizer/configurationaccess.cxx b/sdext/source/minimizer/configurationaccess.cxx
index 7e89eecbcd36..83187bc5b15e 100644
--- a/sdext/source/minimizer/configurationaccess.cxx
+++ b/sdext/source/minimizer/configurationaccess.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -70,21 +70,21 @@ void OptimizerSettings::LoadSettingsFromConfiguration( const Reference< XNameAcc
Any aValue( rSettings->getByName( aPropertyName ) );
switch( TKGet( aPropertyName ) )
{
- case TK_Name : aValue >>= maName; break;
- case TK_JPEGCompression : aValue >>= mbJPEGCompression; break;
- case TK_JPEGQuality : aValue >>= mnJPEGQuality; break;
- case TK_RemoveCropArea : aValue >>= mbRemoveCropArea; break;
- case TK_ImageResolution : aValue >>= mnImageResolution; break;
- case TK_EmbedLinkedGraphics : aValue >>= mbEmbedLinkedGraphics; break;
- case TK_OLEOptimization : aValue >>= mbOLEOptimization; break;
- case TK_OLEOptimizationType : aValue >>= mnOLEOptimizationType; break;
- case TK_DeleteUnusedMasterPages : aValue >>= mbDeleteUnusedMasterPages; break;
- case TK_DeleteHiddenSlides : aValue >>= mbDeleteHiddenSlides; break;
- case TK_DeleteNotesPages : aValue >>= mbDeleteNotesPages ;break;
- case TK_SaveAs : aValue >>= mbSaveAs; break;
-// case TK_SaveAsURL : aValue >>= maSaveAsURL; break; // URL is not saved to configuration
-// case TK_FilterName : aValue >>= maFilterName; break; // URL is not saved to configuration
- case TK_OpenNewDocument : aValue >>= mbOpenNewDocument; break;
+ case TK_Name : aValue >>= maName; break;
+ case TK_JPEGCompression : aValue >>= mbJPEGCompression; break;
+ case TK_JPEGQuality : aValue >>= mnJPEGQuality; break;
+ case TK_RemoveCropArea : aValue >>= mbRemoveCropArea; break;
+ case TK_ImageResolution : aValue >>= mnImageResolution; break;
+ case TK_EmbedLinkedGraphics : aValue >>= mbEmbedLinkedGraphics; break;
+ case TK_OLEOptimization : aValue >>= mbOLEOptimization; break;
+ case TK_OLEOptimizationType : aValue >>= mnOLEOptimizationType; break;
+ case TK_DeleteUnusedMasterPages : aValue >>= mbDeleteUnusedMasterPages; break;
+ case TK_DeleteHiddenSlides : aValue >>= mbDeleteHiddenSlides; break;
+ case TK_DeleteNotesPages : aValue >>= mbDeleteNotesPages ;break;
+ case TK_SaveAs : aValue >>= mbSaveAs; break;
+// case TK_SaveAsURL : aValue >>= maSaveAsURL; break; // URL is not saved to configuration
+// case TK_FilterName : aValue >>= maFilterName; break; // URL is not saved to configuration
+ case TK_OpenNewDocument : aValue >>= mbOpenNewDocument; break;
default: break;
}
}
@@ -112,11 +112,11 @@ void OptimizerSettings::SaveSettingsToConfiguration( const Reference< XNameRepla
TKGet( TK_DeleteHiddenSlides ),
TKGet( TK_DeleteNotesPages ),
TKGet( TK_SaveAs ),
-// TKGet( TK_SaveAsURL ),
-// TKGet( TK_FilterName ),
- TKGet( TK_OpenNewDocument ) };
+// TKGet( TK_SaveAsURL ),
+// TKGet( TK_FilterName ),
+ TKGet( TK_OpenNewDocument ) };
- Any pValues[] = {
+ Any pValues[] = {
Any( maName ),
Any( mbJPEGCompression ),
Any( mnJPEGQuality ),
@@ -129,8 +129,8 @@ void OptimizerSettings::SaveSettingsToConfiguration( const Reference< XNameRepla
Any( mbDeleteHiddenSlides ),
Any( mbDeleteNotesPages ),
Any( mbSaveAs ),
-// Any( maSaveAsURL ),
-// Any( maFilterName ),
+// Any( maSaveAsURL ),
+// Any( maFilterName ),
Any( mbOpenNewDocument ) };
sal_Int32 i, nCount = sizeof( pNames ) / sizeof( OUString );
@@ -160,7 +160,7 @@ sal_Bool OptimizerSettings::operator==( const OptimizerSettings& rOptimizerSetti
&& ( rOptimizerSettings.mbDeleteUnusedMasterPages == mbDeleteUnusedMasterPages )
&& ( rOptimizerSettings.mbDeleteHiddenSlides == mbDeleteHiddenSlides )
&& ( rOptimizerSettings.mbDeleteNotesPages == mbDeleteNotesPages );
-// && ( rOptimizerSettings.mbOpenNewDocument == mbOpenNewDocument );
+// && ( rOptimizerSettings.mbOpenNewDocument == mbOpenNewDocument );
}
@@ -234,7 +234,7 @@ void ConfigurationAccess::LoadStrings()
}
catch( Exception& )
{
- }
+ }
}
}
}
@@ -344,8 +344,8 @@ Reference< XInterface > ConfigurationAccess::OpenConfiguration( bool bReadOnly )
{
Sequence< Any > aCreationArguments( 2 );
aCreationArguments[0] = makeAny( PropertyValue(
- OUString( RTL_CONSTASCII_USTRINGPARAM( "nodepath" ) ), 0,
- makeAny( GetPathToConfigurationRoot() ),
+ OUString( RTL_CONSTASCII_USTRINGPARAM( "nodepath" ) ), 0,
+ makeAny( GetPathToConfigurationRoot() ),
PropertyState_DIRECT_VALUE ) );
aCreationArguments[1] = makeAny(beans::PropertyValue(
OUString( RTL_CONSTASCII_USTRINGPARAM( "lazywrite" ) ), 0, makeAny( true ),
@@ -369,7 +369,7 @@ Reference< XInterface > ConfigurationAccess::OpenConfiguration( bool bReadOnly )
}
Reference< XInterface > ConfigurationAccess::GetConfigurationNode(
- const Reference< XInterface >& xRoot,
+ const Reference< XInterface >& xRoot,
const OUString& sPathToNode )
{
Reference< XInterface > xNode;
@@ -405,22 +405,22 @@ com::sun::star::uno::Any ConfigurationAccess::GetConfigProperty( const PPPOptimi
{
switch( ePropertyToken )
{
- case TK_Name : aRetValue <<= rSettings.maName; break;
- case TK_JPEGCompression : aRetValue <<= rSettings.mbJPEGCompression; break;
- case TK_JPEGQuality : aRetValue <<= rSettings.mnJPEGQuality; break;
- case TK_RemoveCropArea : aRetValue <<= rSettings.mbRemoveCropArea; break;
- case TK_ImageResolution : aRetValue <<= rSettings.mnImageResolution; break;
- case TK_EmbedLinkedGraphics : aRetValue <<= rSettings.mbEmbedLinkedGraphics; break;
- case TK_OLEOptimization : aRetValue <<= rSettings.mbOLEOptimization; break;
- case TK_OLEOptimizationType : aRetValue <<= rSettings.mnOLEOptimizationType; break;
- case TK_DeleteUnusedMasterPages : aRetValue <<= rSettings.mbDeleteUnusedMasterPages; break;
- case TK_DeleteHiddenSlides : aRetValue <<= rSettings.mbDeleteHiddenSlides; break;
- case TK_DeleteNotesPages : aRetValue <<= rSettings.mbDeleteNotesPages; break;
- case TK_SaveAs : aRetValue <<= rSettings.mbSaveAs; break;
- case TK_SaveAsURL : aRetValue <<= rSettings.maSaveAsURL; break;
- case TK_FilterName : aRetValue <<= rSettings.maFilterName; break;
- case TK_OpenNewDocument : aRetValue <<= rSettings.mbOpenNewDocument; break;
- case TK_EstimatedFileSize : aRetValue <<= rSettings.mnEstimatedFileSize; break;
+ case TK_Name : aRetValue <<= rSettings.maName; break;
+ case TK_JPEGCompression : aRetValue <<= rSettings.mbJPEGCompression; break;
+ case TK_JPEGQuality : aRetValue <<= rSettings.mnJPEGQuality; break;
+ case TK_RemoveCropArea : aRetValue <<= rSettings.mbRemoveCropArea; break;
+ case TK_ImageResolution : aRetValue <<= rSettings.mnImageResolution; break;
+ case TK_EmbedLinkedGraphics : aRetValue <<= rSettings.mbEmbedLinkedGraphics; break;
+ case TK_OLEOptimization : aRetValue <<= rSettings.mbOLEOptimization; break;
+ case TK_OLEOptimizationType : aRetValue <<= rSettings.mnOLEOptimizationType; break;
+ case TK_DeleteUnusedMasterPages : aRetValue <<= rSettings.mbDeleteUnusedMasterPages; break;
+ case TK_DeleteHiddenSlides : aRetValue <<= rSettings.mbDeleteHiddenSlides; break;
+ case TK_DeleteNotesPages : aRetValue <<= rSettings.mbDeleteNotesPages; break;
+ case TK_SaveAs : aRetValue <<= rSettings.mbSaveAs; break;
+ case TK_SaveAsURL : aRetValue <<= rSettings.maSaveAsURL; break;
+ case TK_FilterName : aRetValue <<= rSettings.maFilterName; break;
+ case TK_OpenNewDocument : aRetValue <<= rSettings.mbOpenNewDocument; break;
+ case TK_EstimatedFileSize : aRetValue <<= rSettings.mnEstimatedFileSize; break;
default:
break;
}
@@ -438,23 +438,23 @@ void ConfigurationAccess::SetConfigProperty( const PPPOptimizerTokenEnum eProper
{
switch( ePropertyToken )
{
- case TK_Name : rValue >>= rSettings.maName; break;
- case TK_JPEGCompression : rValue >>= rSettings.mbJPEGCompression; break;
- case TK_JPEGQuality : rValue >>= rSettings.mnJPEGQuality; break;
- case TK_RemoveCropArea : rValue >>= rSettings.mbRemoveCropArea; break;
- case TK_ImageResolution : rValue >>= rSettings.mnImageResolution; break;
- case TK_EmbedLinkedGraphics : rValue >>= rSettings.mbEmbedLinkedGraphics; break;
- case TK_OLEOptimization : rValue >>= rSettings.mbOLEOptimization; break;
- case TK_OLEOptimizationType : rValue >>= rSettings.mnOLEOptimizationType; break;
- case TK_DeleteUnusedMasterPages : rValue >>= rSettings.mbDeleteUnusedMasterPages; break;
- case TK_DeleteHiddenSlides : rValue >>= rSettings.mbDeleteHiddenSlides; break;
- case TK_DeleteNotesPages : rValue >>= rSettings.mbDeleteNotesPages; break;
- case TK_CustomShowName : rValue >>= rSettings.maCustomShowName; break;
- case TK_SaveAs : rValue >>= rSettings.mbSaveAs; break;
- case TK_SaveAsURL : rValue >>= rSettings.maSaveAsURL; break;
- case TK_FilterName : rValue >>= rSettings.maFilterName; break;
- case TK_OpenNewDocument : rValue >>= rSettings.mbOpenNewDocument; break;
- case TK_EstimatedFileSize : rValue >>= rSettings.mnEstimatedFileSize; break;
+ case TK_Name : rValue >>= rSettings.maName; break;
+ case TK_JPEGCompression : rValue >>= rSettings.mbJPEGCompression; break;
+ case TK_JPEGQuality : rValue >>= rSettings.mnJPEGQuality; break;
+ case TK_RemoveCropArea : rValue >>= rSettings.mbRemoveCropArea; break;
+ case TK_ImageResolution : rValue >>= rSettings.mnImageResolution; break;
+ case TK_EmbedLinkedGraphics : rValue >>= rSettings.mbEmbedLinkedGraphics; break;
+ case TK_OLEOptimization : rValue >>= rSettings.mbOLEOptimization; break;
+ case TK_OLEOptimizationType : rValue >>= rSettings.mnOLEOptimizationType; break;
+ case TK_DeleteUnusedMasterPages : rValue >>= rSettings.mbDeleteUnusedMasterPages; break;
+ case TK_DeleteHiddenSlides : rValue >>= rSettings.mbDeleteHiddenSlides; break;
+ case TK_DeleteNotesPages : rValue >>= rSettings.mbDeleteNotesPages; break;
+ case TK_CustomShowName : rValue >>= rSettings.maCustomShowName; break;
+ case TK_SaveAs : rValue >>= rSettings.mbSaveAs; break;
+ case TK_SaveAsURL : rValue >>= rSettings.maSaveAsURL; break;
+ case TK_FilterName : rValue >>= rSettings.maFilterName; break;
+ case TK_OpenNewDocument : rValue >>= rSettings.mbOpenNewDocument; break;
+ case TK_EstimatedFileSize : rValue >>= rSettings.mnEstimatedFileSize; break;
default:
break;
}
diff --git a/sdext/source/minimizer/configurationaccess.hxx b/sdext/source/minimizer/configurationaccess.hxx
index 436ae90fe071..2ccc8ece8428 100644
--- a/sdext/source/minimizer/configurationaccess.hxx
+++ b/sdext/source/minimizer/configurationaccess.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -47,24 +47,24 @@
struct OptimizerSettings
{
- rtl::OUString maName;
- sal_Bool mbJPEGCompression;
- sal_Int32 mnJPEGQuality;
- sal_Bool mbRemoveCropArea;
- sal_Int32 mnImageResolution;
- sal_Bool mbEmbedLinkedGraphics;
- sal_Bool mbOLEOptimization;
- sal_Int16 mnOLEOptimizationType;
- sal_Bool mbDeleteUnusedMasterPages;
- sal_Bool mbDeleteHiddenSlides;
- sal_Bool mbDeleteNotesPages;
- rtl::OUString maCustomShowName;
- sal_Bool mbSaveAs;
- rtl::OUString maSaveAsURL;
- rtl::OUString maFilterName;
- sal_Bool mbOpenNewDocument;
- sal_Int64 mnEstimatedFileSize;
-
+ rtl::OUString maName;
+ sal_Bool mbJPEGCompression;
+ sal_Int32 mnJPEGQuality;
+ sal_Bool mbRemoveCropArea;
+ sal_Int32 mnImageResolution;
+ sal_Bool mbEmbedLinkedGraphics;
+ sal_Bool mbOLEOptimization;
+ sal_Int16 mnOLEOptimizationType;
+ sal_Bool mbDeleteUnusedMasterPages;
+ sal_Bool mbDeleteHiddenSlides;
+ sal_Bool mbDeleteNotesPages;
+ rtl::OUString maCustomShowName;
+ sal_Bool mbSaveAs;
+ rtl::OUString maSaveAsURL;
+ rtl::OUString maFilterName;
+ sal_Bool mbOpenNewDocument;
+ sal_Int64 mnEstimatedFileSize;
+
OptimizerSettings() :
mbJPEGCompression( sal_False ),
mnJPEGQuality( 90 ),
@@ -80,13 +80,13 @@ struct OptimizerSettings
mbOpenNewDocument( sal_True ),
mnEstimatedFileSize( 0 ){};
~OptimizerSettings(){};
-
+
void LoadSettingsFromConfiguration( const com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >& rSettings );
void SaveSettingsToConfiguration( const com::sun::star::uno::Reference< com::sun::star::container::XNameReplace >& rSettings );
sal_Bool operator==( const OptimizerSettings& rOptimizerSettings ) const;
-};
+};
class ConfigurationAccess
{
public :
@@ -108,7 +108,7 @@ class ConfigurationAccess
sal_Int32 GetConfigProperty( const PPPOptimizerTokenEnum, const sal_Int32 nDefault ) const;
com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > GetConfigurationSequence();
-
+
// getting access to the OptimizerSettings list
std::vector< OptimizerSettings >& GetOptimizerSettings() { return maSettings; };
std::vector< OptimizerSettings >::iterator GetOptimizerSettingsByName( const rtl::OUString& rName );
@@ -136,6 +136,6 @@ class ConfigurationAccess
const com::sun::star::uno::Reference< com::sun::star::uno::XInterface >& xRoot, const rtl::OUString& sPathToNode );
};
-#endif // _CONFIGURATION_ACCESS_HXX_
+#endif // _CONFIGURATION_ACCESS_HXX_
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/minimizer/fileopendialog.cxx b/sdext/source/minimizer/fileopendialog.cxx
index 6091e34cf614..ef5cd430ca36 100644
--- a/sdext/source/minimizer/fileopendialog.cxx
+++ b/sdext/source/minimizer/fileopendialog.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -71,7 +71,7 @@ FileOpenDialog::FileOpenDialog( const Reference< XComponentContext >& rxMSF ) :
mxMSF( rxMSF )
{
Sequence< Any > aInitPropSeq( 1 );
- aInitPropSeq[ 0 ] <<= (sal_Int16)TemplateDescription::FILESAVE_AUTOEXTENSION; // TemplateDescription.FILEOPEN_SIMPLE
+ aInitPropSeq[ 0 ] <<= (sal_Int16)TemplateDescription::FILESAVE_AUTOEXTENSION; // TemplateDescription.FILEOPEN_SIMPLE
mxFilePicker = Reference < XFilePicker >( mxMSF->getServiceManager()->createInstanceWithArgumentsAndContext(
OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.FilePicker" ) ), aInitPropSeq, rxMSF ),UNO_QUERY_THROW );
@@ -117,10 +117,10 @@ FileOpenDialog::FileOpenDialog( const Reference< XComponentContext >& rxMSF ) :
j = aFilterProperties.getLength();
}
break;
- case TK_Name : rProperty.Value >>= aFilterEntry.maName; break;
- case TK_UIName : rProperty.Value >>= aFilterEntry.maUIName; break;
- case TK_Type : rProperty.Value >>= aFilterEntry.maType; break;
- case TK_Flags : rProperty.Value >>= aFilterEntry.maFlags; break;
+ case TK_Name : rProperty.Value >>= aFilterEntry.maName; break;
+ case TK_UIName : rProperty.Value >>= aFilterEntry.maUIName; break;
+ case TK_Type : rProperty.Value >>= aFilterEntry.maType; break;
+ case TK_Flags : rProperty.Value >>= aFilterEntry.maFlags; break;
default : break;
}
}
@@ -139,7 +139,7 @@ FileOpenDialog::FileOpenDialog( const Reference< XComponentContext >& rxMSF ) :
OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.TypeDetection" ) ), rxMSF ), UNO_QUERY_THROW );
Sequence< OUString > aTypeList( xFilters->getElementNames() );
-// mxFilePicker->setDefaultName( );
+// mxFilePicker->setDefaultName( );
Reference< XFilterManager > xFilterManager( mxFilePicker, UNO_QUERY_THROW );
std::vector< FilterEntry >::iterator aIter( aFilterEntryList.begin() );
@@ -184,12 +184,12 @@ void FileOpenDialog::setDefaultName( const rtl::OUString& rDefaultName )
{
mxFilePicker->setDefaultName( rDefaultName );
}
-::rtl::OUString FileOpenDialog::getURL() const
+::rtl::OUString FileOpenDialog::getURL() const
{
Sequence< OUString > aFileSeq( mxFilePicker->getFiles() );
return aFileSeq.getLength() ? aFileSeq[ 0 ] : OUString();
};
-::rtl::OUString FileOpenDialog::getFilterName() const
+::rtl::OUString FileOpenDialog::getFilterName() const
{
rtl::OUString aFilterName;
Reference< XFilterManager > xFilterManager( mxFilePicker, UNO_QUERY_THROW );
diff --git a/sdext/source/minimizer/fileopendialog.hxx b/sdext/source/minimizer/fileopendialog.hxx
index 8ddbba752113..6cb2d615f145 100644
--- a/sdext/source/minimizer/fileopendialog.hxx
+++ b/sdext/source/minimizer/fileopendialog.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -63,12 +63,12 @@ public :
sal_Int16 execute();
void setDefaultName( const rtl::OUString& );
-// void setDefaultDirectory( const rtl::OUString& );
+// void setDefaultDirectory( const rtl::OUString& );
- ::rtl::OUString getURL() const;
+ ::rtl::OUString getURL() const;
::rtl::OUString getFilterName() const;
};
-#endif // _FILEOPEN_DIALOG_HXX_
+#endif // _FILEOPEN_DIALOG_HXX_
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/minimizer/graphiccollector.cxx b/sdext/source/minimizer/graphiccollector.cxx
index d4258e66953c..66b33b690a03 100644
--- a/sdext/source/minimizer/graphiccollector.cxx
+++ b/sdext/source/minimizer/graphiccollector.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -218,7 +218,7 @@ void ImpCollectBackgroundGraphic( const Reference< XComponentContext >& rxMSF, c
Reference< XPropertySet > xPropertySet( rxDrawPage, UNO_QUERY_THROW );
xPropertySet->getPropertyValue( TKGet( TK_Width ) ) >>= aLogicalSize.Width;
xPropertySet->getPropertyValue( TKGet( TK_Height ) ) >>= aLogicalSize.Height;
-
+
Reference< XPropertySet > xBackgroundPropSet;
if ( xPropertySet->getPropertyValue( TKGet( TK_Background ) ) >>= xBackgroundPropSet )
ImpAddFillBitmapEntity( rxMSF, xBackgroundPropSet, aLogicalSize, rGraphicEntities, rGraphicSettings, xPropertySet );
@@ -267,7 +267,7 @@ awt::Size GraphicCollector::GetOriginalSize( const Reference< XComponentContext
if ( xGraphicPropertySet->getPropertyValue( TKGet( TK_Size100thMM ) ) >>= aSize100thMM )
{
if ( !aSize100thMM.Width && !aSize100thMM.Height )
- { // MAPMODE_PIXEL USED :-(
+ { // MAPMODE_PIXEL USED :-(
awt::Size aSourceSizePixel( 0, 0 );
if ( xGraphicPropertySet->getPropertyValue( TKGet( TK_SizePixel ) ) >>= aSourceSizePixel )
{
@@ -404,7 +404,7 @@ void ImpCountBackgroundGraphic( const Reference< XComponentContext >& /* rxMSF *
Reference< XPropertySet > xPropertySet( rxDrawPage, UNO_QUERY_THROW );
xPropertySet->getPropertyValue( TKGet( TK_Width ) ) >>= aLogicalSize.Width;
xPropertySet->getPropertyValue( TKGet( TK_Height ) ) >>= aLogicalSize.Height;
-
+
Reference< XPropertySet > xBackgroundPropSet;
if ( xPropertySet->getPropertyValue( TKGet( TK_Background ) ) >>= xBackgroundPropSet )
{
diff --git a/sdext/source/minimizer/graphiccollector.hxx b/sdext/source/minimizer/graphiccollector.hxx
index f67e06058cfa..392a632ba334 100644
--- a/sdext/source/minimizer/graphiccollector.hxx
+++ b/sdext/source/minimizer/graphiccollector.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -42,11 +42,11 @@
struct GraphicSettings
{
- sal_Bool mbJPEGCompression;
- sal_Int32 mnJPEGQuality;
- sal_Bool mbRemoveCropArea;
- sal_Int32 mnImageResolution;
- sal_Bool mbEmbedLinkedGraphics;
+ sal_Bool mbJPEGCompression;
+ sal_Int32 mnJPEGQuality;
+ sal_Bool mbRemoveCropArea;
+ sal_Int32 mnImageResolution;
+ sal_Bool mbEmbedLinkedGraphics;
GraphicSettings( sal_Bool bJPEGCompression, sal_Int32 nJPEGQuality, sal_Bool bRemoveCropArea,
sal_Int32 nImageResolution, sal_Bool bEmbedLinkedGraphics )
@@ -63,25 +63,25 @@ class GraphicCollector
struct GraphicUser
{
- com::sun::star::uno::Reference< com::sun::star::drawing::XShape > mxShape; // if mbFillBitmap is false the xShape has
- com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > mxPropertySet; // to be used otherwise the PropertySet
- com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > mxPagePropertySet;
- rtl::OUString maGraphicURL;
- rtl::OUString maGraphicStreamURL;
- com::sun::star::text::GraphicCrop maGraphicCropLogic;
- com::sun::star::awt::Size maLogicalSize;
- sal_Bool mbFillBitmap;
+ com::sun::star::uno::Reference< com::sun::star::drawing::XShape > mxShape; // if mbFillBitmap is false the xShape has
+ com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > mxPropertySet; // to be used otherwise the PropertySet
+ com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > mxPagePropertySet;
+ rtl::OUString maGraphicURL;
+ rtl::OUString maGraphicStreamURL;
+ com::sun::star::text::GraphicCrop maGraphicCropLogic;
+ com::sun::star::awt::Size maLogicalSize;
+ sal_Bool mbFillBitmap;
GraphicUser() : mxShape(), maGraphicCropLogic( 0, 0, 0, 0 ), mbFillBitmap( sal_False ) {};
};
struct GraphicEntity
{
- com::sun::star::uno::Reference< com::sun::star::graphic::XGraphic > mxGraphic; // the corresponding XGraphic of the Shape
- com::sun::star::awt::Size maLogicalSize; // the biggest logical size the graphic will be displayed
- sal_Bool mbRemoveCropArea; //
- com::sun::star::text::GraphicCrop maGraphicCropLogic;
- std::vector< GraphicUser > maUser;
+ com::sun::star::uno::Reference< com::sun::star::graphic::XGraphic > mxGraphic; // the corresponding XGraphic of the Shape
+ com::sun::star::awt::Size maLogicalSize; // the biggest logical size the graphic will be displayed
+ sal_Bool mbRemoveCropArea; //
+ com::sun::star::text::GraphicCrop maGraphicCropLogic;
+ std::vector< GraphicUser > maUser;
GraphicEntity( const com::sun::star::uno::Reference< com::sun::star::graphic::XGraphic >& xGraphic, const GraphicUser& rUser )
: mxGraphic( xGraphic ), maLogicalSize( rUser.maLogicalSize ), mbRemoveCropArea( sal_False ), maGraphicCropLogic( 0, 0, 0, 0 ) { maUser.push_back( rUser ); };
diff --git a/sdext/source/minimizer/impoptimizer.cxx b/sdext/source/minimizer/impoptimizer.cxx
index d2e00fb94f26..9d4e49e5f951 100644
--- a/sdext/source/minimizer/impoptimizer.cxx
+++ b/sdext/source/minimizer/impoptimizer.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -236,13 +236,13 @@ void ImpCompressGraphic( Reference< XGraphicProvider >& rxGraphicProvider, const
Sequence< PropertyValue > aFilterData( 8 );
aFilterData[ 0 ].Name = TKGet( TK_ImageResolution );
aFilterData[ 0 ].Value <<= nImageResolution;
- aFilterData[ 1 ].Name = TKGet( TK_ColorMode ); // todo: jpeg color mode (0->true color, 1->greyscale)
+ aFilterData[ 1 ].Name = TKGet( TK_ColorMode ); // todo: jpeg color mode (0->true color, 1->greyscale)
aFilterData[ 1 ].Value <<= (sal_Int32)0;
- aFilterData[ 2 ].Name = TKGet( TK_Quality ); // quality that is used if we export to jpeg
+ aFilterData[ 2 ].Name = TKGet( TK_Quality ); // quality that is used if we export to jpeg
aFilterData[ 2 ].Value <<= nJPEGQuality;
- aFilterData[ 3 ].Name = TKGet( TK_Compression ); // compression that is used if we export to png
+ aFilterData[ 3 ].Name = TKGet( TK_Compression ); // compression that is used if we export to png
aFilterData[ 3 ].Value <<= (sal_Int32)6;
- aFilterData[ 4 ].Name = TKGet( TK_Interlaced ); // interlaced is turned off if we export to png
+ aFilterData[ 4 ].Name = TKGet( TK_Interlaced ); // interlaced is turned off if we export to png
aFilterData[ 4 ].Value <<= (sal_Int32)0;
aFilterData[ 5 ].Name = TKGet( TK_LogicalSize );
aFilterData[ 5 ].Value <<= rLogicalSize;
@@ -250,9 +250,9 @@ void ImpCompressGraphic( Reference< XGraphicProvider >& rxGraphicProvider, const
aFilterData[ 6 ].Value <<= bRemoveCropping;
aFilterData[ 7 ].Name = TKGet( TK_GraphicCropLogic );
aFilterData[ 7 ].Value <<= rGraphicCropLogic;
-
+
Sequence< PropertyValue > aArgs( 3 );
- aArgs[ 0 ].Name = TKGet( TK_MimeType ); // the GraphicProvider is using "MimeType", the GraphicExporter "MediaType"...
+ aArgs[ 0 ].Name = TKGet( TK_MimeType ); // the GraphicProvider is using "MimeType", the GraphicExporter "MediaType"...
aArgs[ 0 ].Value <<= rDestMimeType;
aArgs[ 1 ].Name = TKGet( TK_OutputStream );
aArgs[ 1 ].Value <<= rxOutputStream;
@@ -282,8 +282,8 @@ Reference< XGraphic > ImpCompressGraphic( const Reference< XComponentContext >&
if ( nGraphicType == com::sun::star::graphic::GraphicType::PIXEL )
{
sal_Bool bTransparent = sal_False;
- sal_Bool bAlpha = sal_False;
- sal_Bool bAnimated = sal_False;
+ sal_Bool bAlpha = sal_False;
+ sal_Bool bAnimated = sal_False;
awt::Size aSourceSizePixel( 0, 0 );
text::GraphicCrop aGraphicCropPixel( 0, 0, 0, 0 );
@@ -295,7 +295,7 @@ Reference< XGraphic > ImpCompressGraphic( const Reference< XComponentContext >&
{
awt::Size aDestSizePixel( aSourceSizePixel );
if ( !bAnimated )
- {
+ {
sal_Bool bNeedsOptimizing = sal_False;
sal_Bool bRemoveCropArea( rGraphicSettings.mbRemoveCropArea );
@@ -329,7 +329,7 @@ Reference< XGraphic > ImpCompressGraphic( const Reference< XComponentContext >&
if ( rGraphicSettings.mbJPEGCompression && !bTransparent && !bAlpha && !bAnimated )
{
aDestMimeType = OUString( RTL_CONSTASCII_USTRINGPARAM( "image/jpeg" ) );
-// if( aSourceMimeType != aDestMimeType )
+// if( aSourceMimeType != aDestMimeType )
bNeedsOptimizing = sal_True;
}
if ( bRemoveCropArea )
@@ -427,7 +427,7 @@ void CompressGraphics( ImpOptimizer& rOptimizer, const Reference< XComponentCont
if ( aGraphicUserIter->maGraphicCropLogic.Left || aGraphicUserIter->maGraphicCropLogic.Top
|| aGraphicUserIter->maGraphicCropLogic.Right || aGraphicUserIter->maGraphicCropLogic.Bottom )
- { // removing crop area was not possible or should't been applied
+ { // removing crop area was not possible or should't been applied
text::GraphicCrop aGraphicCropLogic( 0, 0, 0, 0 );
if ( !aGraphicSettings.mbRemoveCropArea )
{
@@ -481,19 +481,19 @@ void CompressGraphics( ImpOptimizer& rOptimizer, const Reference< XComponentCont
// ----------------
ImpOptimizer::ImpOptimizer( const Reference< XComponentContext >& rxMSF, const Reference< XModel >& rxModel ) :
- mxMSF ( rxMSF ),
- mxModel ( rxModel ),
- mbJPEGCompression ( sal_False ),
- mnJPEGQuality ( 90 ),
- mbRemoveCropArea ( sal_False ),
- mnImageResolution ( 0 ),
- mbEmbedLinkedGraphics ( sal_True ),
- mbOLEOptimization ( sal_False ),
- mnOLEOptimizationType ( 0 ),
- mbDeleteUnusedMasterPages ( sal_False ),
- mbDeleteHiddenSlides ( sal_False ),
- mbDeleteNotesPages ( sal_False ),
- mbOpenNewDocument ( sal_True )
+ mxMSF ( rxMSF ),
+ mxModel ( rxModel ),
+ mbJPEGCompression ( sal_False ),
+ mnJPEGQuality ( 90 ),
+ mbRemoveCropArea ( sal_False ),
+ mnImageResolution ( 0 ),
+ mbEmbedLinkedGraphics ( sal_True ),
+ mbOLEOptimization ( sal_False ),
+ mnOLEOptimizationType ( 0 ),
+ mbDeleteUnusedMasterPages ( sal_False ),
+ mbDeleteHiddenSlides ( sal_False ),
+ mbDeleteNotesPages ( sal_False ),
+ mbOpenNewDocument ( sal_True )
{
}
@@ -619,21 +619,21 @@ sal_Bool ImpOptimizer::Optimize( const Sequence< PropertyValue >& rArguments )
{
switch( TKGet( aSettings[ j ].Name ) )
{
- case TK_JPEGCompression : aSettings[ j ].Value >>= mbJPEGCompression; break;
- case TK_JPEGQuality : aSettings[ j ].Value >>= mnJPEGQuality; break;
- case TK_RemoveCropArea : aSettings[ j ].Value >>= mbRemoveCropArea; break;
- case TK_ImageResolution : aSettings[ j ].Value >>= mnImageResolution; break;
- case TK_EmbedLinkedGraphics : aSettings[ j ].Value >>= mbEmbedLinkedGraphics; break;
- case TK_OLEOptimization : aSettings[ j ].Value >>= mbOLEOptimization; break;
- case TK_OLEOptimizationType : aSettings[ j ].Value >>= mnOLEOptimizationType; break;
- case TK_CustomShowName : aSettings[ j ].Value >>= maCustomShowName; break;
+ case TK_JPEGCompression : aSettings[ j ].Value >>= mbJPEGCompression; break;
+ case TK_JPEGQuality : aSettings[ j ].Value >>= mnJPEGQuality; break;
+ case TK_RemoveCropArea : aSettings[ j ].Value >>= mbRemoveCropArea; break;
+ case TK_ImageResolution : aSettings[ j ].Value >>= mnImageResolution; break;
+ case TK_EmbedLinkedGraphics : aSettings[ j ].Value >>= mbEmbedLinkedGraphics; break;
+ case TK_OLEOptimization : aSettings[ j ].Value >>= mbOLEOptimization; break;
+ case TK_OLEOptimizationType : aSettings[ j ].Value >>= mnOLEOptimizationType; break;
+ case TK_CustomShowName : aSettings[ j ].Value >>= maCustomShowName; break;
case TK_DeleteUnusedMasterPages : aSettings[ j ].Value >>= mbDeleteUnusedMasterPages; break;
- case TK_DeleteHiddenSlides : aSettings[ j ].Value >>= mbDeleteHiddenSlides; break;
- case TK_DeleteNotesPages : aSettings[ j ].Value >>= mbDeleteNotesPages; break;
- case TK_SaveAsURL : aSettings[ j ].Value >>= maSaveAsURL; break;
- case TK_FilterName : aSettings[ j ].Value >>= maFilterName; break;
- case TK_OpenNewDocument : aSettings[ j ].Value >>= mbOpenNewDocument; break;
- case TK_EstimatedFileSize : aSettings[ j ].Value >>= nEstimatedFileSize; break;
+ case TK_DeleteHiddenSlides : aSettings[ j ].Value >>= mbDeleteHiddenSlides; break;
+ case TK_DeleteNotesPages : aSettings[ j ].Value >>= mbDeleteNotesPages; break;
+ case TK_SaveAsURL : aSettings[ j ].Value >>= maSaveAsURL; break;
+ case TK_FilterName : aSettings[ j ].Value >>= maFilterName; break;
+ case TK_OpenNewDocument : aSettings[ j ].Value >>= mbOpenNewDocument; break;
+ case TK_EstimatedFileSize : aSettings[ j ].Value >>= nEstimatedFileSize; break;
default: break;
}
}
@@ -649,7 +649,7 @@ sal_Bool ImpOptimizer::Optimize( const Sequence< PropertyValue >& rArguments )
Reference< XFrame > xSelf;
if ( maSaveAsURL.getLength() )
{
-
+
SetStatusValue( TK_Progress, Any( static_cast< sal_Int32 >( 10 ) ) );
SetStatusValue( TK_Status, Any( TKGet( STR_DUPLICATING_PRESENTATION ) ) );
DispatchStatus();
@@ -697,7 +697,7 @@ sal_Bool ImpOptimizer::Optimize( const Sequence< PropertyValue >& rArguments )
mxModel->lockControllers();
bRet = Optimize();
mxModel->unlockControllers();
-
+
// clearing undo stack:
Reference< XFrame > xFrame( xSelf.is() ? xSelf : mxInformationDialog );
if ( xFrame.is() )
@@ -723,7 +723,7 @@ sal_Bool ImpOptimizer::Optimize( const Sequence< PropertyValue >& rArguments )
SetStatusValue( TK_OpenNewDocument, Any( mbOpenNewDocument ) );
DispatchStatus();
}
-
+
if ( maSaveAsURL.getLength() )
{
if ( mbOpenNewDocument && xSelf.is() )
diff --git a/sdext/source/minimizer/impoptimizer.hxx b/sdext/source/minimizer/impoptimizer.hxx
index ac3b4e8c36e4..9112cbd1bd61 100644
--- a/sdext/source/minimizer/impoptimizer.hxx
+++ b/sdext/source/minimizer/impoptimizer.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -50,27 +50,27 @@ class ImpOptimizer : public OptimizationStats
{
private:
- com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > mxMSF;
- com::sun::star::uno::Reference< com::sun::star::frame::XModel > mxModel;
- com::sun::star::uno::Reference< com::sun::star::frame::XDispatch > mxStatusDispatcher;
+ com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > mxMSF;
+ com::sun::star::uno::Reference< com::sun::star::frame::XModel > mxModel;
+ com::sun::star::uno::Reference< com::sun::star::frame::XDispatch > mxStatusDispatcher;
- sal_Bool mbJPEGCompression;
- sal_Int32 mnJPEGQuality;
- sal_Bool mbRemoveCropArea;
- sal_Int32 mnImageResolution;
- sal_Bool mbEmbedLinkedGraphics;
- sal_Bool mbOLEOptimization;
- sal_Int32 mnOLEOptimizationType;
- rtl::OUString maCustomShowName;
- sal_Bool mbDeleteUnusedMasterPages;
- sal_Bool mbDeleteHiddenSlides;
- sal_Bool mbDeleteNotesPages;
- rtl::OUString maSaveAsURL;
- rtl::OUString maFilterName;
- sal_Bool mbOpenNewDocument;
+ sal_Bool mbJPEGCompression;
+ sal_Int32 mnJPEGQuality;
+ sal_Bool mbRemoveCropArea;
+ sal_Int32 mnImageResolution;
+ sal_Bool mbEmbedLinkedGraphics;
+ sal_Bool mbOLEOptimization;
+ sal_Int32 mnOLEOptimizationType;
+ rtl::OUString maCustomShowName;
+ sal_Bool mbDeleteUnusedMasterPages;
+ sal_Bool mbDeleteHiddenSlides;
+ sal_Bool mbDeleteNotesPages;
+ rtl::OUString maSaveAsURL;
+ rtl::OUString maFilterName;
+ sal_Bool mbOpenNewDocument;
com::sun::star::uno::Reference< com::sun::star::frame::XFrame > mxInformationDialog;
-
+
sal_Bool Optimize();
public:
@@ -80,7 +80,7 @@ public:
~ImpOptimizer();
sal_Bool Optimize( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rArguments );
- void DispatchStatus();
+ void DispatchStatus();
};
#endif
diff --git a/sdext/source/minimizer/informationdialog.cxx b/sdext/source/minimizer/informationdialog.cxx
index 17f900ccc6b6..de6bd58aeb04 100644
--- a/sdext/source/minimizer/informationdialog.cxx
+++ b/sdext/source/minimizer/informationdialog.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -38,10 +38,10 @@
#include "com/sun/star/util/URL.hpp"
#include "com/sun/star/util/XURLTransformer.hpp"
-#define DIALOG_WIDTH 240
-#define DIALOG_HEIGHT 80
-#define PAGE_POS_X 35
-#define PAGE_WIDTH ( DIALOG_WIDTH - PAGE_POS_X ) - 6
+#define DIALOG_WIDTH 240
+#define DIALOG_HEIGHT 80
+#define PAGE_POS_X 35
+#define PAGE_WIDTH ( DIALOG_WIDTH - PAGE_POS_X ) - 6
// ---------------------
@@ -78,7 +78,7 @@ rtl::OUString InsertFixedText( InformationDialog& rInformationDialog, const rtl:
TKGet( TK_TabIndex ),
TKGet( TK_Width ) };
- Any pValues[] = {
+ Any pValues[] = {
Any( nHeight ),
Any( rLabel ),
Any( bMultiLine ),
@@ -90,8 +90,8 @@ rtl::OUString InsertFixedText( InformationDialog& rInformationDialog, const rtl:
sal_Int32 nCount = sizeof( pNames ) / sizeof( OUString );
- Sequence< rtl::OUString > aNames( pNames, nCount );
- Sequence< Any > aValues( pValues, nCount );
+ Sequence< rtl::OUString > aNames( pNames, nCount );
+ Sequence< Any > aValues( pValues, nCount );
rInformationDialog.insertFixedText( rControlName, aNames, aValues );
return rControlName;
@@ -109,7 +109,7 @@ rtl::OUString InsertImage( InformationDialog& rInformationDialog, const OUString
TKGet( TK_ScaleImage ),
TKGet( TK_Width ) };
- Any pValues[] = {
+ Any pValues[] = {
Any( sal_Int16( 0 ) ),
Any( nHeight ),
Any( rURL ),
@@ -119,8 +119,8 @@ rtl::OUString InsertImage( InformationDialog& rInformationDialog, const OUString
Any( nWidth ) };
sal_Int32 nCount = sizeof( pNames ) / sizeof( OUString );
- Sequence< rtl::OUString > aNames( pNames, nCount );
- Sequence< Any > aValues( pValues, nCount );
+ Sequence< rtl::OUString > aNames( pNames, nCount );
+ Sequence< Any > aValues( pValues, nCount );
rInformationDialog.insertImage( rControlName, aNames, aValues );
return rControlName;
@@ -140,7 +140,7 @@ rtl::OUString InsertCheckBox( InformationDialog& rInformationDialog, const OUStr
TKGet( TK_TabIndex ),
TKGet( TK_Width ) };
- Any pValues[] = {
+ Any pValues[] = {
Any( sal_True ),
Any( nHeight ),
Any( rLabel ),
@@ -152,8 +152,8 @@ rtl::OUString InsertCheckBox( InformationDialog& rInformationDialog, const OUStr
sal_Int32 nCount = sizeof( pNames ) / sizeof( OUString );
- Sequence< rtl::OUString > aNames( pNames, nCount );
- Sequence< Any > aValues( pValues, nCount );
+ Sequence< rtl::OUString > aNames( pNames, nCount );
+ Sequence< Any > aValues( pValues, nCount );
Reference< XCheckBox > xCheckBox( rInformationDialog.insertCheckBox( rControlName, aNames, aValues ) );
if ( xItemListener.is() )
@@ -175,7 +175,7 @@ rtl::OUString InsertButton( InformationDialog& rInformationDialog, const OUStrin
TKGet( TK_TabIndex ),
TKGet( TK_Width ) };
- Any pValues[] = {
+ Any pValues[] = {
Any( sal_True ),
Any( nHeight ),
Any( rInformationDialog.getString( nResID ) ),
@@ -189,8 +189,8 @@ rtl::OUString InsertButton( InformationDialog& rInformationDialog, const OUStrin
sal_Int32 nCount = sizeof( pNames ) / sizeof( OUString );
- Sequence< rtl::OUString > aNames( pNames, nCount );
- Sequence< Any > aValues( pValues, nCount );
+ Sequence< rtl::OUString > aNames( pNames, nCount );
+ Sequence< Any > aValues( pValues, nCount );
rInformationDialog.insertButton( rControlName, xActionListener, aNames, aValues );
return rControlName;
@@ -229,7 +229,7 @@ OUString InformationDialog::ImpGetStandardImage( const OUString& sPrivateURL )
{
OUString aDestMimeType( RTL_CONSTASCII_USTRINGPARAM( "image/png" ) );
Sequence< PropertyValue > aArgs2( 2 );
- aArgs2[ 0 ].Name = TKGet( TK_MimeType ); // the GraphicProvider is using "MimeType", the GraphicExporter "MediaType"...
+ aArgs2[ 0 ].Name = TKGet( TK_MimeType ); // the GraphicProvider is using "MimeType", the GraphicExporter "MediaType"...
aArgs2[ 0 ].Value <<= aDestMimeType;
aArgs2[ 1 ].Name = TKGet( TK_OutputStream );
aArgs2[ 1 ].Value <<= xOutputStream;
@@ -260,7 +260,7 @@ void InformationDialog::InitDialog()
TKGet( TK_Title ),
TKGet( TK_Width ) };
- Any pValues[] = {
+ Any pValues[] = {
Any( sal_True ),
Any( nDialogHeight ),
Any( sal_True ),
@@ -268,13 +268,13 @@ void InformationDialog::InitDialog()
Any( sal_Int32( 115 ) ),
Any( getString( STR_SUN_OPTIMIZATION_WIZARD2 ) ),
Any( sal_Int32( DIALOG_WIDTH ) ) };
-
+
sal_Int32 nCount = sizeof( pNames ) / sizeof( OUString );
- Sequence< rtl::OUString > aNames( pNames, nCount );
- Sequence< Any > aValues( pValues, nCount );
+ Sequence< rtl::OUString > aNames( pNames, nCount );
+ Sequence< Any > aValues( pValues, nCount );
- mxDialogModelMultiPropertySet->setPropertyValues( aNames, aValues );
+ mxDialogModelMultiPropertySet->setPropertyValues( aNames, aValues );
sal_Int64 nSource = mnSourceSize;
sal_Int64 nDest = mnDestSize;
@@ -335,7 +335,7 @@ void InformationDialog::InitDialog()
if ( k >= 0 )
aInfoString = aInfoString.replaceAt( k, aTitlePlaceholder.getLength(), aTitle );
- com::sun::star::uno::Reference< com::sun::star::awt::XItemListener > xItemListener;
+ com::sun::star::uno::Reference< com::sun::star::awt::XItemListener > xItemListener;
InsertImage( *this, rtl::OUString( rtl::OUString::createFromAscii( "aboutimage" ) ), ImpGetStandardImage( rtl::OUString::createFromAscii( "private:standardimage/query" ) ), 5, 5, 25, 25 );
InsertFixedText( *this, rtl::OUString( rtl::OUString::createFromAscii( "fixedtext" ) ), aInfoString, PAGE_POS_X, 6, PAGE_WIDTH, 24, sal_True, 0 );
if ( maSaveAsURL.getLength() )
@@ -363,7 +363,7 @@ InformationDialog::InformationDialog( const Reference< XComponentContext > &rxMS
Reference< XFrame > xFrame( mxController->getFrame() );
Reference< XWindow > xContainerWindow( xFrame->getContainerWindow() );
Reference< XWindowPeer > xWindowPeer( xContainerWindow, UNO_QUERY_THROW );
- createWindowPeer( xWindowPeer );
+ createWindowPeer( xWindowPeer );
InitDialog();
}
diff --git a/sdext/source/minimizer/informationdialog.hxx b/sdext/source/minimizer/informationdialog.hxx
index 44d2d4c035be..0b38f57eb177 100644
--- a/sdext/source/minimizer/informationdialog.hxx
+++ b/sdext/source/minimizer/informationdialog.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -60,19 +60,19 @@ public :
sal_Bool& bOpenNewDocument, const sal_Int64& nSourceSize, const sal_Int64& nDestSize, const sal_Int64& nApproxDest );
~InformationDialog();
- sal_Bool execute();
+ sal_Bool execute();
private :
com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >mxMSF;
- com::sun::star::uno::Reference< com::sun::star::frame::XFrame > mxFrame;
- com::sun::star::uno::Reference< com::sun::star::io::XStream > mxTempFile;
+ com::sun::star::uno::Reference< com::sun::star::frame::XFrame > mxFrame;
+ com::sun::star::uno::Reference< com::sun::star::io::XStream > mxTempFile;
- com::sun::star::uno::Reference< com::sun::star::awt::XActionListener > mxActionListener;
+ com::sun::star::uno::Reference< com::sun::star::awt::XActionListener > mxActionListener;
rtl::OUString ImpGetStandardImage( const rtl::OUString& rPrivateURL );
void InitDialog();
-
+
sal_Int64 mnSourceSize;
sal_Int64 mnDestSize;
sal_Int64 mnApproxSize;
@@ -93,7 +93,7 @@ public:
virtual void SAL_CALL actionPerformed( const ::com::sun::star::awt::ActionEvent& Event ) throw ( com::sun::star::uno::RuntimeException );
virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw ( com::sun::star::uno::RuntimeException);
private:
-
+
InformationDialog& mrInformationDialog;
};
diff --git a/sdext/source/minimizer/optimizationstats.cxx b/sdext/source/minimizer/optimizationstats.cxx
index 8f6eaeeb7f1c..a1e22ea08548 100644
--- a/sdext/source/minimizer/optimizationstats.cxx
+++ b/sdext/source/minimizer/optimizationstats.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
diff --git a/sdext/source/minimizer/optimizationstats.hxx b/sdext/source/minimizer/optimizationstats.hxx
index 3359b5888627..5a45de99f62e 100644
--- a/sdext/source/minimizer/optimizationstats.hxx
+++ b/sdext/source/minimizer/optimizationstats.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
diff --git a/sdext/source/minimizer/optimizerdialog.cxx b/sdext/source/minimizer/optimizerdialog.cxx
index 17fd2b1cdde5..32bac3134ef5 100644
--- a/sdext/source/minimizer/optimizerdialog.cxx
+++ b/sdext/source/minimizer/optimizerdialog.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -71,7 +71,7 @@ void OptimizerDialog::InitDialog()
TKGet( TK_Title ),
TKGet( TK_Width ) };
- Any pValues[] = {
+ Any pValues[] = {
Any( sal_True ),
Any( sal_Int32( DIALOG_HEIGHT ) ),
Any( sal_True ),
@@ -79,13 +79,13 @@ void OptimizerDialog::InitDialog()
Any( sal_Int32( 52 ) ),
Any( getString( STR_SUN_OPTIMIZATION_WIZARD2 ) ),
Any( sal_Int32( OD_DIALOG_WIDTH ) ) };
-
+
sal_Int32 nCount = sizeof( pNames ) / sizeof( OUString );
- Sequence< rtl::OUString > aNames( pNames, nCount );
- Sequence< Any > aValues( pValues, nCount );
+ Sequence< rtl::OUString > aNames( pNames, nCount );
+ Sequence< Any > aValues( pValues, nCount );
- mxDialogModelMultiPropertySet->setPropertyValues( aNames, aValues );
+ mxDialogModelMultiPropertySet->setPropertyValues( aNames, aValues );
}
// -----------------------------------------------------------------------------
@@ -102,7 +102,7 @@ void OptimizerDialog::InitRoadmap()
TKGet( TK_TabIndex ),
TKGet( TK_Width ) };
- Any pValues[] = {
+ Any pValues[] = {
Any( sal_Int32( DIALOG_HEIGHT - 26 ) ),
Any( sal_Int32( 0 ) ),
Any( sal_Int32( 0 ) ),
@@ -112,11 +112,11 @@ void OptimizerDialog::InitRoadmap()
sal_Int32 nCount = sizeof( pNames ) / sizeof( OUString );
- Sequence< rtl::OUString > aNames( pNames, nCount );
- Sequence< Any > aValues( pValues, nCount );
+ Sequence< rtl::OUString > aNames( pNames, nCount );
+ Sequence< Any > aValues( pValues, nCount );
mxRoadmapControlModel = insertControlModel( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlRoadmapModel" ) ),
- TKGet( TK_rdmNavi ), aNames, aValues );
+ TKGet( TK_rdmNavi ), aNames, aValues );
Reference< XPropertySet > xPropertySet( mxRoadmapControlModel, UNO_QUERY_THROW );
xPropertySet->setPropertyValue( TKGet( TK_Name ), Any( TKGet( TK_rdmNavi ) ) );
@@ -168,13 +168,13 @@ void OptimizerDialog::InsertRoadmapItem( const sal_Int32 nIndex, const sal_Bool
void OptimizerDialog::UpdateConfiguration()
{
- sal_Int16 nInt16 = 0;
- OUString aString;
- Any aAny;
+ sal_Int16 nInt16 = 0;
+ OUString aString;
+ Any aAny;
Sequence< sal_Int16 > aSelectedItems;
Sequence< OUString > aStringItemList;
-
+
// page0
aAny = getControlProperty( TKGet( TK_ListBox0Pg0 ), TKGet( TK_SelectedItems ) );
if ( aAny >>= aSelectedItems )
@@ -266,7 +266,7 @@ sal_Bool OptimizerDialog::execute()
Reference< XItemEventBroadcaster > maRoadmapBroadcaster( mxRoadmapControl, UNO_QUERY_THROW );
maRoadmapBroadcaster->addItemListener( mxItemListener );
UnoDialog::execute();
- UpdateConfiguration(); // taking actual control settings for the configuration
+ UpdateConfiguration(); // taking actual control settings for the configuration
maRoadmapBroadcaster->removeItemListener( mxItemListener );
return mbStatus;
}
@@ -282,14 +282,14 @@ void OptimizerDialog::SwitchPage( sal_Int16 nNewStep )
disableControl( TKGet( TK_btnNavBack ) );
else if ( nOldStep == 0 )
enableControl( TKGet( TK_btnNavBack ) );
-
+
if ( nNewStep == MAX_STEP )
disableControl( TKGet( TK_btnNavNext ) );
else if ( nOldStep == MAX_STEP )
enableControl( TKGet( TK_btnNavNext ) );
setControlProperty( TKGet( TK_rdmNavi ), TKGet( TK_CurrentItemID ), Any( nNewStep ) );
-
+
DeactivatePage( nOldStep );
UpdateControlStates( nNewStep );
@@ -547,7 +547,7 @@ void ActionListener::actionPerformed( const ActionEvent& rEvent )
Reference< XLayoutManager > xLayoutManager;
if ( xPropSet->getPropertyValue( OUString::createFromAscii( "LayoutManager" ) ) >>= xLayoutManager )
{
- xLayoutManager->setVisible( sal_False );
+ xLayoutManager->setVisible( sal_False );
xLayoutManager->hideElement( OUString::createFromAscii( "private:resource/menubar/menubar" ) );
xLayoutManager->destroyElement( OUString::createFromAscii( "private:resource/statusbar/statusbar" ) );
}
@@ -559,8 +559,8 @@ void ActionListener::actionPerformed( const ActionEvent& rEvent )
}
}
break;
- case TK_btnNavBack : mrOptimizerDialog.SwitchPage( mrOptimizerDialog.mnCurrentStep - 1 ); break;
- case TK_btnNavNext : mrOptimizerDialog.SwitchPage( mrOptimizerDialog.mnCurrentStep + 1 ); break;
+ case TK_btnNavBack : mrOptimizerDialog.SwitchPage( mrOptimizerDialog.mnCurrentStep - 1 ); break;
+ case TK_btnNavNext : mrOptimizerDialog.SwitchPage( mrOptimizerDialog.mnCurrentStep + 1 ); break;
case TK_btnNavFinish :
{
mrOptimizerDialog.UpdateConfiguration();
@@ -574,9 +574,9 @@ void ActionListener::actionPerformed( const ActionEvent& rEvent )
mrOptimizerDialog.setControlProperty( TKGet( TK_btnNavCancel ), TKGet( TK_Enabled ), Any( sal_False ) );
mrOptimizerDialog.setControlProperty( TKGet( TK_FixedText0Pg4 ), TKGet( TK_Enabled ), Any( sal_True ) );
- // check if we have to open the FileDialog
- sal_Bool bSuccessfullyExecuted = sal_True;
- sal_Int16 nInt16 = 0;
+ // check if we have to open the FileDialog
+ sal_Bool bSuccessfullyExecuted = sal_True;
+ sal_Int16 nInt16 = 0;
mrOptimizerDialog.getControlProperty( TKGet( TK_RadioButton1Pg4 ), TKGet( TK_State ) ) >>= nInt16;
if ( nInt16 )
{
@@ -629,7 +629,7 @@ void ActionListener::actionPerformed( const ActionEvent& rEvent )
}
}
if ( bSuccessfullyExecuted )
- { // now check if we have to store a session template
+ { // now check if we have to store a session template
nInt16 = 0;
OUString aSettingsName;
mrOptimizerDialog.getControlProperty( TKGet( TK_CheckBox1Pg4 ), TKGet( TK_State ) ) >>= nInt16;
@@ -682,8 +682,8 @@ void ActionListener::actionPerformed( const ActionEvent& rEvent )
}
}
break;
- case TK_btnNavCancel : mrOptimizerDialog.endExecute( sal_False ); break;
- case TK_Button0Pg0 : // delete configuration
+ case TK_btnNavCancel : mrOptimizerDialog.endExecute( sal_False ); break;
+ case TK_Button0Pg0 : // delete configuration
{
OUString aSelectedItem( mrOptimizerDialog.GetSelectedString( TK_ListBox0Pg0 ) );
if ( aSelectedItem.getLength() )
@@ -781,7 +781,7 @@ void SpinListenerFormattedField0Pg1::up( const SpinEvent& /* rEvent */ )
fDouble += 9;
if ( fDouble > 100 )
fDouble = 100;
- mrOptimizerDialog.setControlProperty( TKGet( TK_FormattedField0Pg1 ), TKGet( TK_EffectiveValue ), Any( fDouble ) );
+ mrOptimizerDialog.setControlProperty( TKGet( TK_FormattedField0Pg1 ), TKGet( TK_EffectiveValue ), Any( fDouble ) );
mrOptimizerDialog.SetConfigProperty( TK_JPEGQuality, Any( (sal_Int32)fDouble ) );
}
}
@@ -795,20 +795,20 @@ void SpinListenerFormattedField0Pg1::down( const SpinEvent& /* rEvent */ )
fDouble -= 9;
if ( fDouble < 0 )
fDouble = 0;
- mrOptimizerDialog.setControlProperty( TKGet( TK_FormattedField0Pg1 ), TKGet( TK_EffectiveValue ), Any( fDouble ) );
+ mrOptimizerDialog.setControlProperty( TKGet( TK_FormattedField0Pg1 ), TKGet( TK_EffectiveValue ), Any( fDouble ) );
mrOptimizerDialog.SetConfigProperty( TK_JPEGQuality, Any( (sal_Int32)fDouble ) );
}
}
void SpinListenerFormattedField0Pg1::first( const SpinEvent& /* rEvent */ )
throw ( com::sun::star::uno::RuntimeException )
{
- mrOptimizerDialog.setControlProperty( TKGet( TK_FormattedField0Pg1 ), TKGet( TK_EffectiveValue ), Any( static_cast< double >( 0 ) ) );
+ mrOptimizerDialog.setControlProperty( TKGet( TK_FormattedField0Pg1 ), TKGet( TK_EffectiveValue ), Any( static_cast< double >( 0 ) ) );
mrOptimizerDialog.SetConfigProperty( TK_JPEGQuality, Any( (sal_Int32)0 ) );
}
void SpinListenerFormattedField0Pg1::last( const SpinEvent& /* rEvent */ )
throw ( com::sun::star::uno::RuntimeException )
{
- mrOptimizerDialog.setControlProperty( TKGet( TK_FormattedField0Pg1 ), TKGet( TK_EffectiveValue ), Any( static_cast< double >( 100 ) ) );
+ mrOptimizerDialog.setControlProperty( TKGet( TK_FormattedField0Pg1 ), TKGet( TK_EffectiveValue ), Any( static_cast< double >( 100 ) ) );
mrOptimizerDialog.SetConfigProperty( TK_JPEGQuality, Any( (sal_Int32)100 ) );
}
void SpinListenerFormattedField0Pg1::disposing( const ::com::sun::star::lang::EventObject& /* Source */ )
diff --git a/sdext/source/minimizer/optimizerdialog.hrc b/sdext/source/minimizer/optimizerdialog.hrc
index bc3fd49a277f..9bf81f9d612a 100644
--- a/sdext/source/minimizer/optimizerdialog.hrc
+++ b/sdext/source/minimizer/optimizerdialog.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
@@ -27,10 +27,10 @@
#ifndef _OPTIMIZERDIALOG_HRC
#define _OPTIMIZERDIALOG_HRC
-#define ITEM_ID_INTRODUCTION 0
-#define ITEM_ID_SLIDES 1
-#define ITEM_ID_GRAPHIC_OPTIMIZATION 2
-#define ITEM_ID_OLE_OPTIMIZATION 3
-#define ITEM_ID_SUMMARY 4
+#define ITEM_ID_INTRODUCTION 0
+#define ITEM_ID_SLIDES 1
+#define ITEM_ID_GRAPHIC_OPTIMIZATION 2
+#define ITEM_ID_OLE_OPTIMIZATION 3
+#define ITEM_ID_SUMMARY 4
#endif
diff --git a/sdext/source/minimizer/optimizerdialog.hxx b/sdext/source/minimizer/optimizerdialog.hxx
index 08036c056069..af661121dbcb 100644
--- a/sdext/source/minimizer/optimizerdialog.hxx
+++ b/sdext/source/minimizer/optimizerdialog.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -53,16 +53,16 @@
#include <com/sun/star/frame/XDesktop.hpp>
#include <com/sun/star/awt/PushButtonType.hpp>
-#define MAX_STEP 4
-#define OD_DIALOG_WIDTH 330
-#define DIALOG_HEIGHT 210
-#define BUTTON_WIDTH 50
-#define BUTTON_HEIGHT 14
-#define BUTTON_POS_Y DIALOG_HEIGHT - BUTTON_HEIGHT - 6
+#define MAX_STEP 4
+#define OD_DIALOG_WIDTH 330
+#define DIALOG_HEIGHT 210
+#define BUTTON_WIDTH 50
+#define BUTTON_HEIGHT 14
+#define BUTTON_POS_Y DIALOG_HEIGHT - BUTTON_HEIGHT - 6
-#define PAGE_POS_X 91
-#define PAGE_POS_Y 8
-#define PAGE_WIDTH OD_DIALOG_WIDTH - PAGE_POS_X
+#define PAGE_POS_X 91
+#define PAGE_POS_Y 8
+#define PAGE_WIDTH OD_DIALOG_WIDTH - PAGE_POS_X
// -------------------
// - OPTIMIZERDIALOG -
@@ -75,26 +75,26 @@ public :
com::sun::star::uno::Reference< com::sun::star::frame::XDispatch > rxStatusDispatcher );
~OptimizerDialog();
- sal_Bool execute();
+ sal_Bool execute();
- sal_Int16 mnCurrentStep;
- sal_Int16 mnTabIndex;
- sal_Bool mbIsReadonly;
+ sal_Int16 mnCurrentStep;
+ sal_Int16 mnTabIndex;
+ sal_Bool mbIsReadonly;
private :
com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >mxMSF;
- com::sun::star::uno::Reference< com::sun::star::frame::XFrame > mxFrame;
+ com::sun::star::uno::Reference< com::sun::star::frame::XFrame > mxFrame;
- com::sun::star::uno::Reference< com::sun::star::uno::XInterface > mxRoadmapControl;
- com::sun::star::uno::Reference< com::sun::star::uno::XInterface > mxRoadmapControlModel;
+ com::sun::star::uno::Reference< com::sun::star::uno::XInterface > mxRoadmapControl;
+ com::sun::star::uno::Reference< com::sun::star::uno::XInterface > mxRoadmapControlModel;
- com::sun::star::uno::Reference< com::sun::star::awt::XItemListener > mxItemListener;
- com::sun::star::uno::Reference< com::sun::star::awt::XActionListener > mxActionListener;
- com::sun::star::uno::Reference< com::sun::star::awt::XActionListener > mxActionListenerListBox0Pg0;
- com::sun::star::uno::Reference< com::sun::star::awt::XTextListener > mxTextListenerFormattedField0Pg1;
- com::sun::star::uno::Reference< com::sun::star::awt::XTextListener > mxTextListenerComboBox0Pg1;
- com::sun::star::uno::Reference< com::sun::star::awt::XSpinListener > mxSpinListenerFormattedField0Pg1;
- com::sun::star::uno::Reference< com::sun::star::frame::XDispatch > mxStatusDispatcher;
+ com::sun::star::uno::Reference< com::sun::star::awt::XItemListener > mxItemListener;
+ com::sun::star::uno::Reference< com::sun::star::awt::XActionListener > mxActionListener;
+ com::sun::star::uno::Reference< com::sun::star::awt::XActionListener > mxActionListenerListBox0Pg0;
+ com::sun::star::uno::Reference< com::sun::star::awt::XTextListener > mxTextListenerFormattedField0Pg1;
+ com::sun::star::uno::Reference< com::sun::star::awt::XTextListener > mxTextListenerComboBox0Pg1;
+ com::sun::star::uno::Reference< com::sun::star::awt::XSpinListener > mxSpinListenerFormattedField0Pg1;
+ com::sun::star::uno::Reference< com::sun::star::frame::XDispatch > mxStatusDispatcher;
std::vector< std::vector< rtl::OUString > > maControlPages;
@@ -161,7 +161,7 @@ public:
virtual void SAL_CALL actionPerformed( const ::com::sun::star::awt::ActionEvent& Event ) throw ( com::sun::star::uno::RuntimeException );
virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw ( com::sun::star::uno::RuntimeException);
private:
-
+
OptimizerDialog& mrOptimizerDialog;
};
@@ -175,7 +175,7 @@ public:
virtual void SAL_CALL actionPerformed( const ::com::sun::star::awt::ActionEvent& Event ) throw ( com::sun::star::uno::RuntimeException );
virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw ( com::sun::star::uno::RuntimeException);
private:
-
+
OptimizerDialog& mrOptimizerDialog;
};
@@ -189,7 +189,7 @@ public:
virtual void SAL_CALL textChanged( const ::com::sun::star::awt::TextEvent& Event ) throw ( com::sun::star::uno::RuntimeException );
virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw ( com::sun::star::uno::RuntimeException);
private:
-
+
OptimizerDialog& mrOptimizerDialog;
};
@@ -203,7 +203,7 @@ public:
virtual void SAL_CALL textChanged( const ::com::sun::star::awt::TextEvent& Event ) throw ( com::sun::star::uno::RuntimeException );
virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw ( com::sun::star::uno::RuntimeException);
private:
-
+
OptimizerDialog& mrOptimizerDialog;
};
@@ -220,7 +220,7 @@ public:
virtual void SAL_CALL last( const ::com::sun::star::awt::SpinEvent& Event ) throw ( com::sun::star::uno::RuntimeException );
virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw ( com::sun::star::uno::RuntimeException);
private:
-
+
OptimizerDialog& mrOptimizerDialog;
};
@@ -238,7 +238,7 @@ public:
virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& aEvent ) throw (com::sun::star::uno::RuntimeException) ;
private:
-
+
com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& mrXFrame;
};
diff --git a/sdext/source/minimizer/optimizerdialogcontrols.cxx b/sdext/source/minimizer/optimizerdialogcontrols.cxx
index bdd3cf0e80c1..a72ec1482d48 100644
--- a/sdext/source/minimizer/optimizerdialogcontrols.cxx
+++ b/sdext/source/minimizer/optimizerdialogcontrols.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -81,7 +81,7 @@ rtl::OUString InsertSeparator( OptimizerDialog& rOptimizerDialog, const OUString
TKGet( TK_Step ),
TKGet( TK_Width ) };
- Any pValues[] = {
+ Any pValues[] = {
Any( nHeight ),
Any( nOrientation ),
Any( nPosX ),
@@ -91,8 +91,8 @@ rtl::OUString InsertSeparator( OptimizerDialog& rOptimizerDialog, const OUString
sal_Int32 nCount = sizeof( pNames ) / sizeof( OUString );
- Sequence< rtl::OUString > aNames( pNames, nCount );
- Sequence< Any > aValues( pValues, nCount );
+ Sequence< rtl::OUString > aNames( pNames, nCount );
+ Sequence< Any > aValues( pValues, nCount );
rOptimizerDialog.insertControlModel( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlFixedLineModel" ) ),
rControlName, aNames, aValues );
@@ -115,7 +115,7 @@ rtl::OUString InsertButton( OptimizerDialog& rOptimizerDialog, const OUString& r
TKGet( TK_TabIndex ),
TKGet( TK_Width ) };
- Any pValues[] = {
+ Any pValues[] = {
Any( bEnabled ),
Any( nHeight ),
Any( rOptimizerDialog.getString( nResID ) ),
@@ -129,8 +129,8 @@ rtl::OUString InsertButton( OptimizerDialog& rOptimizerDialog, const OUString& r
sal_Int32 nCount = sizeof( pNames ) / sizeof( OUString );
- Sequence< rtl::OUString > aNames( pNames, nCount );
- Sequence< Any > aValues( pValues, nCount );
+ Sequence< rtl::OUString > aNames( pNames, nCount );
+ Sequence< Any > aValues( pValues, nCount );
rOptimizerDialog.insertButton( rControlName, xActionListener, aNames, aValues );
return rControlName;
@@ -151,7 +151,7 @@ rtl::OUString InsertFixedText( OptimizerDialog& rOptimizerDialog, const rtl::OUS
TKGet( TK_TabIndex ),
TKGet( TK_Width ) };
- Any pValues[] = {
+ Any pValues[] = {
Any( nHeight ),
Any( rLabel ),
Any( bMultiLine ),
@@ -163,8 +163,8 @@ rtl::OUString InsertFixedText( OptimizerDialog& rOptimizerDialog, const rtl::OUS
sal_Int32 nCount = sizeof( pNames ) / sizeof( OUString );
- Sequence< rtl::OUString > aNames( pNames, nCount );
- Sequence< Any > aValues( pValues, nCount );
+ Sequence< rtl::OUString > aNames( pNames, nCount );
+ Sequence< Any > aValues( pValues, nCount );
rOptimizerDialog.insertFixedText( rControlName, aNames, aValues );
if ( bBold )
@@ -188,7 +188,7 @@ rtl::OUString InsertCheckBox( OptimizerDialog& rOptimizerDialog, const OUString&
TKGet( TK_TabIndex ),
TKGet( TK_Width ) };
- Any pValues[] = {
+ Any pValues[] = {
Any( sal_True ),
Any( nHeight ),
Any( rLabel ),
@@ -200,8 +200,8 @@ rtl::OUString InsertCheckBox( OptimizerDialog& rOptimizerDialog, const OUString&
sal_Int32 nCount = sizeof( pNames ) / sizeof( OUString );
- Sequence< rtl::OUString > aNames( pNames, nCount );
- Sequence< Any > aValues( pValues, nCount );
+ Sequence< rtl::OUString > aNames( pNames, nCount );
+ Sequence< Any > aValues( pValues, nCount );
Reference< XCheckBox > xCheckBox( rOptimizerDialog.insertCheckBox( rControlName, aNames, aValues ) );
if ( xItemListener.is() )
@@ -228,7 +228,7 @@ rtl::OUString InsertFormattedField( OptimizerDialog& rOptimizerDialog, const OUS
TKGet( TK_TabIndex ),
TKGet( TK_Width ) };
- Any pValues[] = {
+ Any pValues[] = {
Any( fEffectiveMax ),
Any( fEffectiveMin ),
Any( sal_True ),
@@ -243,8 +243,8 @@ rtl::OUString InsertFormattedField( OptimizerDialog& rOptimizerDialog, const OUS
sal_Int32 nCount = sizeof( pNames ) / sizeof( OUString );
- Sequence< rtl::OUString > aNames( pNames, nCount );
- Sequence< Any > aValues( pValues, nCount );
+ Sequence< rtl::OUString > aNames( pNames, nCount );
+ Sequence< Any > aValues( pValues, nCount );
Reference< XTextComponent > xTextComponent( rOptimizerDialog.insertFormattedField( rControlName, aNames, aValues ), UNO_QUERY_THROW );
if ( xTextListener.is() )
@@ -275,7 +275,7 @@ rtl::OUString InsertComboBox( OptimizerDialog& rOptimizerDialog, const OUString&
TKGet( TK_TabIndex ),
TKGet( TK_Width ) };
- Any pValues[] = {
+ Any pValues[] = {
Any( sal_True ),
Any( bEnabled ),
Any( nHeight ),
@@ -289,8 +289,8 @@ rtl::OUString InsertComboBox( OptimizerDialog& rOptimizerDialog, const OUString&
sal_Int32 nCount = sizeof( pNames ) / sizeof( OUString );
- Sequence< rtl::OUString > aNames( pNames, nCount );
- Sequence< Any > aValues( pValues, nCount );
+ Sequence< rtl::OUString > aNames( pNames, nCount );
+ Sequence< Any > aValues( pValues, nCount );
Reference< XTextComponent > xTextComponent( rOptimizerDialog.insertComboBox( rControlName, aNames, aValues ), UNO_QUERY_THROW );
if ( xTextListener.is() )
@@ -313,7 +313,7 @@ rtl::OUString InsertRadioButton( OptimizerDialog& rOptimizerDialog, const rtl::O
TKGet( TK_TabIndex ),
TKGet( TK_Width ) };
- Any pValues[] = {
+ Any pValues[] = {
Any( nHeight ),
Any( rLabel ),
Any( bMultiLine ),
@@ -325,8 +325,8 @@ rtl::OUString InsertRadioButton( OptimizerDialog& rOptimizerDialog, const rtl::O
sal_Int32 nCount = sizeof( pNames ) / sizeof( OUString );
- Sequence< rtl::OUString > aNames( pNames, nCount );
- Sequence< Any > aValues( pValues, nCount );
+ Sequence< rtl::OUString > aNames( pNames, nCount );
+ Sequence< Any > aValues( pValues, nCount );
Reference< XRadioButton > xRadioButton( rOptimizerDialog.insertRadioButton( rControlName, aNames, aValues ) );
if ( xItemListener.is() )
@@ -353,7 +353,7 @@ rtl::OUString InsertListBox( OptimizerDialog& rOptimizerDialog, const OUString&
TKGet( TK_TabIndex ),
TKGet( TK_Width ) };
- Any pValues[] = {
+ Any pValues[] = {
Any( sal_True ),
Any( bEnabled ),
Any( nHeight ),
@@ -368,8 +368,8 @@ rtl::OUString InsertListBox( OptimizerDialog& rOptimizerDialog, const OUString&
sal_Int32 nCount = sizeof( pNames ) / sizeof( OUString );
- Sequence< rtl::OUString > aNames( pNames, nCount );
- Sequence< Any > aValues( pValues, nCount );
+ Sequence< rtl::OUString > aNames( pNames, nCount );
+ Sequence< Any > aValues( pValues, nCount );
Reference< XListBox > xListBox( rOptimizerDialog.insertListBox( rControlName, aNames, aValues ) );
if ( xListBox.is() )
@@ -381,10 +381,10 @@ rtl::OUString InsertListBox( OptimizerDialog& rOptimizerDialog, const OUString&
void OptimizerDialog::InitNavigationBar()
{
- sal_Int32 nCancelPosX = OD_DIALOG_WIDTH - BUTTON_WIDTH - 6;
- sal_Int32 nFinishPosX = nCancelPosX - 6 - BUTTON_WIDTH;
- sal_Int32 nNextPosX = nFinishPosX - 6 - BUTTON_WIDTH;
- sal_Int32 nBackPosX = nNextPosX - 3 - BUTTON_WIDTH;
+ sal_Int32 nCancelPosX = OD_DIALOG_WIDTH - BUTTON_WIDTH - 6;
+ sal_Int32 nFinishPosX = nCancelPosX - 6 - BUTTON_WIDTH;
+ sal_Int32 nNextPosX = nFinishPosX - 6 - BUTTON_WIDTH;
+ sal_Int32 nBackPosX = nNextPosX - 3 - BUTTON_WIDTH;
InsertSeparator( *this, TKGet( TK_lnNavSep1 ), 0, 0, DIALOG_HEIGHT - 26, OD_DIALOG_WIDTH, 1 );
InsertSeparator( *this, TKGet( TK_lnNavSep2 ), 1, 85, 0, 1, BUTTON_POS_Y - 6 );
@@ -406,7 +406,7 @@ void OptimizerDialog::UpdateControlStatesPage0()
short nSelectedItem = -1;
Sequence< OUString > aItemList;
const std::vector< OptimizerSettings >& rList( GetOptimizerSettings() );
- if ( rList.size() > 1 ) // the first session in the list is the actual one -> skipping first one
+ if ( rList.size() > 1 ) // the first session in the list is the actual one -> skipping first one
{
aItemList.realloc( rList.size() - 1 );
for ( i = 1; i < rList.size(); i++ )
@@ -425,7 +425,7 @@ void OptimizerDialog::UpdateControlStatesPage0()
{
aSelectedItems.realloc( 1 );
aSelectedItems[ 0 ] = nSelectedItem;
- if ( nSelectedItem > 2 ) // only allowing to delete custom themes, the first can|t be deleted
+ if ( nSelectedItem > 2 ) // only allowing to delete custom themes, the first can|t be deleted
bRemoveButtonEnabled = sal_True;
}
setControlProperty( TKGet( TK_ListBox0Pg0 ), TKGet( TK_StringItemList ), Any( aItemList ) );
@@ -630,7 +630,7 @@ void OptimizerDialog::UpdateControlStatesPage4()
sal_uInt32 w;
Sequence< OUString > aItemList;
const std::vector< OptimizerSettings >& rList( GetOptimizerSettings() );
- if ( rList.size() > 1 ) // the first session in the list is the actual one -> skipping first one
+ if ( rList.size() > 1 ) // the first session in the list is the actual one -> skipping first one
{
aItemList.realloc( rList.size() - 1 );
for ( w = 1; w < rList.size(); w++ )
@@ -640,7 +640,7 @@ void OptimizerDialog::UpdateControlStatesPage4()
// now check if it is sensible to enable the combo box
sal_Bool bSaveSettingsEnabled = sal_True;
- if ( rList.size() > 1 ) // the first session in the list is the actual one -> skipping first one
+ if ( rList.size() > 1 ) // the first session in the list is the actual one -> skipping first one
{
for ( w = 1; w < rList.size(); w++ )
{
@@ -769,7 +769,7 @@ void OptimizerDialog::UpdateControlStatesPage4()
sal_Int32 i = aStr.indexOf( aImagePlaceholder, 0 );
if ( i >= 0 )
aStr = aStr.replaceAt( i, aImagePlaceholder.getLength(), OUString::valueOf( nGraphics ) );
-
+
sal_Int32 j = aStr.indexOf( aQualityPlaceholder, 0 );
if ( j >= 0 )
aStr = aStr.replaceAt( j, aQualityPlaceholder.getLength(), OUString::valueOf( nJPEGQuality ) );
@@ -846,7 +846,7 @@ void OptimizerDialog::UpdateControlStatesPage4()
void OptimizerDialog::InitPage4()
{
- { // creating progress bar:
+ { // creating progress bar:
OUString pNames[] = {
TKGet( TK_Height ),
TKGet( TK_Name ),
@@ -857,7 +857,7 @@ void OptimizerDialog::InitPage4()
TKGet( TK_ProgressValueMin ),
TKGet( TK_Width ) };
- Any pValues[] = {
+ Any pValues[] = {
Any( (sal_Int32)12 ),
Any( TKGet( STR_SAVE_AS ) ),
Any( (sal_Int32)( PAGE_POS_X + 6 ) ),
@@ -869,8 +869,8 @@ void OptimizerDialog::InitPage4()
sal_Int32 nCount = sizeof( pNames ) / sizeof( OUString );
- Sequence< rtl::OUString > aNames( pNames, nCount );
- Sequence< Any > aValues( pValues, nCount );
+ Sequence< rtl::OUString > aNames( pNames, nCount );
+ Sequence< Any > aValues( pValues, nCount );
Reference< XMultiPropertySet > xMultiPropertySet( insertControlModel( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlProgressBarModel" ) ),
TKGet( TK_Progress ), aNames, aValues ), UNO_QUERY );
@@ -879,7 +879,7 @@ void OptimizerDialog::InitPage4()
Sequence< OUString > aItemList;
std::vector< rtl::OUString > aControlList;
aControlList.push_back( InsertFixedText( *this, TKGet( TK_FixedText0Pg4 ), getString( STR_SUMMARY_TITLE ), PAGE_POS_X, PAGE_POS_Y, PAGE_WIDTH, 8, sal_False, sal_True, mnTabIndex++ ) );
-// aControlList.push_back( InsertSeparator( *this, TKGet( TK_Separator0Pg4 ), 0, PAGE_POS_X + 6, PAGE_POS_Y + 90, PAGE_WIDTH - 12, 1 ) );
+// aControlList.push_back( InsertSeparator( *this, TKGet( TK_Separator0Pg4 ), 0, PAGE_POS_X + 6, PAGE_POS_Y + 90, PAGE_WIDTH - 12, 1 ) );
aControlList.push_back( InsertFixedText( *this, TKGet( TK_FixedText4Pg4 ), OUString(), PAGE_POS_X + 6, PAGE_POS_Y + 14, PAGE_WIDTH - 12, 8, sal_False, sal_False, mnTabIndex++ ) );
aControlList.push_back( InsertFixedText( *this, TKGet( TK_FixedText5Pg4 ), OUString(), PAGE_POS_X + 6, PAGE_POS_Y + 22, PAGE_WIDTH - 12, 8, sal_False, sal_False, mnTabIndex++ ) );
diff --git a/sdext/source/minimizer/pagecollector.cxx b/sdext/source/minimizer/pagecollector.cxx
index e9f733533475..33522109549c 100644
--- a/sdext/source/minimizer/pagecollector.cxx
+++ b/sdext/source/minimizer/pagecollector.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
diff --git a/sdext/source/minimizer/pagecollector.hxx b/sdext/source/minimizer/pagecollector.hxx
index 3387dd92213f..60c0292ee111 100644
--- a/sdext/source/minimizer/pagecollector.hxx
+++ b/sdext/source/minimizer/pagecollector.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
diff --git a/sdext/source/minimizer/pppoptimizer.cxx b/sdext/source/minimizer/pppoptimizer.cxx
index 4fac633ca4dc..9fbd5233a5f9 100644
--- a/sdext/source/minimizer/pppoptimizer.cxx
+++ b/sdext/source/minimizer/pppoptimizer.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -107,7 +107,7 @@ Reference< com::sun::star::frame::XDispatch > SAL_CALL PPPOptimizer::queryDispat
Reference < XDispatch > xRet;
if ( aURL.Protocol.compareToAscii( "vnd.com.sun.star.comp.PPPOptimizer:" ) == 0 )
{
-// if ( aURL.Path.compareToAscii( "Function1" ) == 0 )
+// if ( aURL.Path.compareToAscii( "Function1" ) == 0 )
xRet = this;
}
return xRet;
diff --git a/sdext/source/minimizer/pppoptimizer.hxx b/sdext/source/minimizer/pppoptimizer.hxx
index eaa4502e8d5f..871e8c886cd9 100644
--- a/sdext/source/minimizer/pppoptimizer.hxx
+++ b/sdext/source/minimizer/pppoptimizer.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -54,7 +54,7 @@ class PPPOptimizer : public cppu::WeakImplHelper4<
public:
PPPOptimizer( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxMSF );
- virtual ~PPPOptimizer();
+ virtual ~PPPOptimizer();
// XInitialization
void SAL_CALL initialize( const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& aArguments )
diff --git a/sdext/source/minimizer/pppoptimizerdialog.cxx b/sdext/source/minimizer/pppoptimizerdialog.cxx
index 5729eda5c4dc..776c2d9d32e6 100644
--- a/sdext/source/minimizer/pppoptimizerdialog.cxx
+++ b/sdext/source/minimizer/pppoptimizerdialog.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -29,8 +29,8 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sdext.hxx"
-#include "pppoptimizerdialog.hxx"
-#include "optimizerdialog.hxx"
+#include "pppoptimizerdialog.hxx"
+#include "optimizerdialog.hxx"
using namespace ::rtl;
using namespace ::com::sun::star::uno;
@@ -65,7 +65,7 @@ PPPOptimizerDialog::~PPPOptimizerDialog()
void SAL_CALL PPPOptimizerDialog::initialize( const Sequence< Any >& aArguments )
throw ( Exception, RuntimeException )
{
- if( aArguments.getLength() != 1 )
+ if( aArguments.getLength() != 1 )
throw IllegalArgumentException();
aArguments[ 0 ] >>= mxFrame;
@@ -83,13 +83,13 @@ OUString SAL_CALL PPPOptimizerDialog::getImplementationName()
return PPPOptimizerDialog_getImplementationName();
}
-sal_Bool SAL_CALL PPPOptimizerDialog::supportsService( const OUString& ServiceName )
+sal_Bool SAL_CALL PPPOptimizerDialog::supportsService( const OUString& ServiceName )
throw ( RuntimeException )
{
return ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SERVICE_NAME ) );
}
-Sequence< OUString > SAL_CALL PPPOptimizerDialog::getSupportedServiceNames()
+Sequence< OUString > SAL_CALL PPPOptimizerDialog::getSupportedServiceNames()
throw (RuntimeException)
{
return PPPOptimizerDialog_getSupportedServiceNames();
@@ -161,7 +161,7 @@ void SAL_CALL PPPOptimizerDialog::dispatch( const URL& rURL,
sBuf.append( rtl::OUString::valueOf( nFileSizeDest >> 10 ) );
sBuf.append( rtl::OUString::createFromAscii( "KB." ) );
OUString sResult( sBuf.makeStringAndClear() );
-// mpOptimizerDialog->showMessageBox( sResult, sResult, sal_False );
+// mpOptimizerDialog->showMessageBox( sResult, sResult, sal_False );
}
delete mpOptimizerDialog, mpOptimizerDialog = NULL;
}
@@ -201,7 +201,7 @@ OUString PPPOptimizerDialog_getImplementationName()
return OUString ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.SunPresentationMinimizerImp" ) );
}
-Sequence< OUString > PPPOptimizerDialog_getSupportedServiceNames()
+Sequence< OUString > PPPOptimizerDialog_getSupportedServiceNames()
{
Sequence < OUString > aRet(1);
OUString* pArray = aRet.getArray();
@@ -209,7 +209,7 @@ Sequence< OUString > PPPOptimizerDialog_getSupportedServiceNames()
return aRet;
}
-Reference< XInterface > PPPOptimizerDialog_createInstance( const Reference< XComponentContext > & rSMgr)
+Reference< XInterface > PPPOptimizerDialog_createInstance( const Reference< XComponentContext > & rSMgr)
throw( Exception )
{
return (cppu::OWeakObject*) new PPPOptimizerDialog( rSMgr );
diff --git a/sdext/source/minimizer/pppoptimizerdialog.hxx b/sdext/source/minimizer/pppoptimizerdialog.hxx
index 712db18cb7ee..76fad42b6a9d 100644
--- a/sdext/source/minimizer/pppoptimizerdialog.hxx
+++ b/sdext/source/minimizer/pppoptimizerdialog.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -48,7 +48,7 @@
// ----------------------
class OptimizerDialog;
-class PPPOptimizerDialog : public ::cppu::WeakImplHelper4<
+class PPPOptimizerDialog : public ::cppu::WeakImplHelper4<
com::sun::star::lang::XInitialization,
com::sun::star::lang::XServiceInfo,
com::sun::star::frame::XDispatchProvider,
@@ -58,12 +58,12 @@ class PPPOptimizerDialog : public ::cppu::WeakImplHelper4<
com::sun::star::uno::Reference< com::sun::star::frame::XFrame > mxFrame;
com::sun::star::uno::Reference< com::sun::star::frame::XController > mxController;
- OptimizerDialog* mpOptimizerDialog;
+ OptimizerDialog* mpOptimizerDialog;
public:
PPPOptimizerDialog( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxMSF );
- virtual ~PPPOptimizerDialog();
+ virtual ~PPPOptimizerDialog();
// XInitialization
void SAL_CALL initialize( const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& aArguments )
diff --git a/sdext/source/minimizer/pppoptimizertoken.cxx b/sdext/source/minimizer/pppoptimizertoken.cxx
index ef80a02798ab..e213a065d489 100644
--- a/sdext/source/minimizer/pppoptimizertoken.cxx
+++ b/sdext/source/minimizer/pppoptimizertoken.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -51,261 +51,261 @@ static ::osl::Mutex& getHashMapMutex()
struct TokenTable
{
- const char* pS;
- PPPOptimizerTokenEnum pE;
+ const char* pS;
+ PPPOptimizerTokenEnum pE;
};
-
-static const TokenTable pTokenTableArray[] =
+
+static const TokenTable pTokenTableArray[] =
{
- { "rdmNavi", TK_rdmNavi },
- { "lnNavSep1", TK_lnNavSep1 },
- { "lnNavSep2", TK_lnNavSep2 },
- { "btnNavHelp", TK_btnNavHelp },
- { "btnNavBack", TK_btnNavBack },
- { "btnNavNext", TK_btnNavNext },
- { "btnNavFinish", TK_btnNavFinish },
- { "btnNavCancel", TK_btnNavCancel },
+ { "rdmNavi", TK_rdmNavi },
+ { "lnNavSep1", TK_lnNavSep1 },
+ { "lnNavSep2", TK_lnNavSep2 },
+ { "btnNavHelp", TK_btnNavHelp },
+ { "btnNavBack", TK_btnNavBack },
+ { "btnNavNext", TK_btnNavNext },
+ { "btnNavFinish", TK_btnNavFinish },
+ { "btnNavCancel", TK_btnNavCancel },
- { "FixedText0Pg0", TK_FixedText0Pg0 },
- { "FixedText1Pg0", TK_FixedText1Pg0 },
- { "Separator1Pg0", TK_Separator1Pg0 },
- { "FixedText2Pg0", TK_FixedText2Pg0 },
- { "ListBox0Pg0", TK_ListBox0Pg0 },
- { "Button0Pg0", TK_Button0Pg0 },
- { "RadioButton0Pg1", TK_RadioButton0Pg1 },
- { "RadioButton1Pg1", TK_RadioButton1Pg1 },
- { "FixedText0Pg1", TK_FixedText0Pg1 },
- { "CheckBox1Pg1", TK_CheckBox1Pg1 },
- { "FixedText1Pg1", TK_FixedText1Pg1 },
- { "FixedText2Pg1", TK_FixedText2Pg1 },
- { "FormattedField0Pg1", TK_FormattedField0Pg1 },
- { "ComboBox0Pg1", TK_ComboBox0Pg1 },
- { "CheckBox2Pg1", TK_CheckBox2Pg1 },
- { "FixedText0Pg2", TK_FixedText0Pg2 },
- { "FixedText1Pg2", TK_FixedText1Pg2 },
- { "CheckBox0Pg2", TK_CheckBox0Pg2 },
- { "RadioButton0Pg2", TK_RadioButton0Pg2 },
- { "RadioButton1Pg2", TK_RadioButton1Pg2 },
- { "FixedText0Pg3", TK_FixedText0Pg3 },
- { "CheckBox0Pg3", TK_CheckBox0Pg3 },
- { "FixedText1Pg3", TK_FixedText1Pg3 },
- { "CheckBox1Pg3", TK_CheckBox1Pg3 },
- { "FixedText2Pg3", TK_FixedText2Pg3 },
- { "CheckBox2Pg3", TK_CheckBox2Pg3 },
- { "CheckBox3Pg3", TK_CheckBox3Pg3 },
- { "ListBox0Pg3", TK_ListBox0Pg3 },
- { "Separator0Pg4", TK_Separator0Pg4 },
- { "RadioButton0Pg4", TK_RadioButton0Pg4 },
- { "RadioButton1Pg4", TK_RadioButton1Pg4 },
- { "Separator1Pg4", TK_Separator1Pg4 },
- { "FixedText0Pg4", TK_FixedText0Pg4 },
- { "FixedText1Pg4", TK_FixedText1Pg4 },
- { "FixedText2Pg4", TK_FixedText2Pg4 },
- { "FixedText3Pg4", TK_FixedText3Pg4 },
- { "FixedText4Pg4", TK_FixedText4Pg4 },
- { "FixedText5Pg4", TK_FixedText5Pg4 },
- { "FixedText6Pg4", TK_FixedText6Pg4 },
- { "FixedText7Pg4", TK_FixedText7Pg4 },
- { "FixedText8Pg4", TK_FixedText8Pg4 },
- { "CheckBox1Pg4", TK_CheckBox1Pg4 },
- { "ComboBox0Pg4", TK_ComboBox0Pg4 },
+ { "FixedText0Pg0", TK_FixedText0Pg0 },
+ { "FixedText1Pg0", TK_FixedText1Pg0 },
+ { "Separator1Pg0", TK_Separator1Pg0 },
+ { "FixedText2Pg0", TK_FixedText2Pg0 },
+ { "ListBox0Pg0", TK_ListBox0Pg0 },
+ { "Button0Pg0", TK_Button0Pg0 },
+ { "RadioButton0Pg1", TK_RadioButton0Pg1 },
+ { "RadioButton1Pg1", TK_RadioButton1Pg1 },
+ { "FixedText0Pg1", TK_FixedText0Pg1 },
+ { "CheckBox1Pg1", TK_CheckBox1Pg1 },
+ { "FixedText1Pg1", TK_FixedText1Pg1 },
+ { "FixedText2Pg1", TK_FixedText2Pg1 },
+ { "FormattedField0Pg1", TK_FormattedField0Pg1 },
+ { "ComboBox0Pg1", TK_ComboBox0Pg1 },
+ { "CheckBox2Pg1", TK_CheckBox2Pg1 },
+ { "FixedText0Pg2", TK_FixedText0Pg2 },
+ { "FixedText1Pg2", TK_FixedText1Pg2 },
+ { "CheckBox0Pg2", TK_CheckBox0Pg2 },
+ { "RadioButton0Pg2", TK_RadioButton0Pg2 },
+ { "RadioButton1Pg2", TK_RadioButton1Pg2 },
+ { "FixedText0Pg3", TK_FixedText0Pg3 },
+ { "CheckBox0Pg3", TK_CheckBox0Pg3 },
+ { "FixedText1Pg3", TK_FixedText1Pg3 },
+ { "CheckBox1Pg3", TK_CheckBox1Pg3 },
+ { "FixedText2Pg3", TK_FixedText2Pg3 },
+ { "CheckBox2Pg3", TK_CheckBox2Pg3 },
+ { "CheckBox3Pg3", TK_CheckBox3Pg3 },
+ { "ListBox0Pg3", TK_ListBox0Pg3 },
+ { "Separator0Pg4", TK_Separator0Pg4 },
+ { "RadioButton0Pg4", TK_RadioButton0Pg4 },
+ { "RadioButton1Pg4", TK_RadioButton1Pg4 },
+ { "Separator1Pg4", TK_Separator1Pg4 },
+ { "FixedText0Pg4", TK_FixedText0Pg4 },
+ { "FixedText1Pg4", TK_FixedText1Pg4 },
+ { "FixedText2Pg4", TK_FixedText2Pg4 },
+ { "FixedText3Pg4", TK_FixedText3Pg4 },
+ { "FixedText4Pg4", TK_FixedText4Pg4 },
+ { "FixedText5Pg4", TK_FixedText5Pg4 },
+ { "FixedText6Pg4", TK_FixedText6Pg4 },
+ { "FixedText7Pg4", TK_FixedText7Pg4 },
+ { "FixedText8Pg4", TK_FixedText8Pg4 },
+ { "CheckBox1Pg4", TK_CheckBox1Pg4 },
+ { "ComboBox0Pg4", TK_ComboBox0Pg4 },
- { "_blank", TK__blank },
- { "_self", TK__self },
- { "Activated", TK_Activated },
- { "Align", TK_Align },
- { "Alpha", TK_Alpha },
- { "Animated", TK_Animated },
- { "Background", TK_Background },
- { "BitmapPath", TK_BitmapPath },
- { "Border", TK_Border },
- { "Closeable", TK_Closeable },
- { "ColorMode", TK_ColorMode },
- { "Complete", TK_Complete },
- { "Compression", TK_Compression },
- { "CurrentItemID", TK_CurrentItemID },
- { "DefaultButton", TK_DefaultButton },
- { "DocumentService", TK_DocumentService },
- { "Dropdown", TK_Dropdown },
- { "EffectiveValue", TK_EffectiveValue },
- { "EffectiveMin", TK_EffectiveMin },
- { "EffectiveMax", TK_EffectiveMax },
- { "Enabled", TK_Enabled },
- { "Extensions", TK_Extensions },
+ { "_blank", TK__blank },
+ { "_self", TK__self },
+ { "Activated", TK_Activated },
+ { "Align", TK_Align },
+ { "Alpha", TK_Alpha },
+ { "Animated", TK_Animated },
+ { "Background", TK_Background },
+ { "BitmapPath", TK_BitmapPath },
+ { "Border", TK_Border },
+ { "Closeable", TK_Closeable },
+ { "ColorMode", TK_ColorMode },
+ { "Complete", TK_Complete },
+ { "Compression", TK_Compression },
+ { "CurrentItemID", TK_CurrentItemID },
+ { "DefaultButton", TK_DefaultButton },
+ { "DocumentService", TK_DocumentService },
+ { "Dropdown", TK_Dropdown },
+ { "EffectiveValue", TK_EffectiveValue },
+ { "EffectiveMin", TK_EffectiveMin },
+ { "EffectiveMax", TK_EffectiveMax },
+ { "Enabled", TK_Enabled },
+ { "Extensions", TK_Extensions },
{ "FileSizeDestination",TK_FileSizeDestination },
- { "FileSizeSource", TK_FileSizeSource },
- { "FillBitmap", TK_FillBitmap },
+ { "FileSizeSource", TK_FileSizeSource },
+ { "FillBitmap", TK_FillBitmap },
{ "FillBitmapLogicalSize",TK_FillBitmapLogicalSize },
- { "FillBitmapMode", TK_FillBitmapMode },
- { "FillBitmapSizeX", TK_FillBitmapSizeX },
- { "FillBitmapSizeY", TK_FillBitmapSizeY },
- { "FillBitmapURL", TK_FillBitmapURL },
- { "FillStyle", TK_FillStyle },
- { "FilterData", TK_FilterData },
- { "FilterName", TK_FilterName },
- { "Flags", TK_Flags },
- { "FontDescriptor", TK_FontDescriptor },
- { "Graphic", TK_Graphic },
- { "GraphicCrop", TK_GraphicCrop },
- { "GraphicCropLogic", TK_GraphicCropLogic },
- { "GraphicURL", TK_GraphicURL },
- { "GraphicStreamURL", TK_GraphicStreamURL },
- { "Height", TK_Height },
- { "HelpFile", TK_HelpFile },
- { "Hidden", TK_Hidden },
- { "ID", TK_ID },
- { "ImageURL", TK_ImageURL },
- { "InformationDialog", TK_InformationDialog },
- { "InputStream", TK_InputStream },
- { "Interlaced", TK_Interlaced },
- { "IsInternal", TK_IsInternal },
- { "Label", TK_Label },
- { "LineCount", TK_LineCount },
- { "LogicalHeight", TK_LogicalHeight },
- { "LogicalWidth", TK_LogicalWidth },
- { "LogicalSize", TK_LogicalSize },
- { "MimeType", TK_MimeType },
- { "Moveable", TK_Moveable },
- { "MultiLine", TK_MultiLine },
- { "MultiSelection", TK_MultiSelection },
- { "Name", TK_Name },
- { "Orientation", TK_Orientation },
- { "OutputStream", TK_OutputStream },
- { "PixelHeight", TK_PixelHeight },
- { "PixelWidth", TK_PixelWidth },
- { "PositionX", TK_PositionX },
- { "PositionY", TK_PositionY },
- { "Progress", TK_Progress },
- { "ProgressValue", TK_ProgressValue },
- { "ProgressValueMax", TK_ProgressValueMax },
- { "ProgressValueMin", TK_ProgressValueMin },
- { "PushButtonType", TK_PushButtonType },
- { "Quality", TK_Quality },
- { "ReadOnly", TK_ReadOnly },
- { "Repeat", TK_Repeat },
- { "ScaleImage", TK_ScaleImage },
- { "SelectedItems", TK_SelectedItems },
- { "Settings", TK_Settings },
- { "Size100thMM", TK_Size100thMM },
- { "SizePixel", TK_SizePixel },
- { "Spin", TK_Spin },
- { "Step", TK_Step },
- { "State", TK_State },
- { "StatusDispatcher", TK_StatusDispatcher },
- { "StringItemList", TK_StringItemList },
- { "Strings", TK_Strings },
- { "TabIndex", TK_TabIndex },
- { "Template", TK_Template },
- { "Text", TK_Text },
- { "Title", TK_Title },
- { "Transparent", TK_Transparent },
- { "Type", TK_Type },
- { "UIName", TK_UIName },
- { "Value", TK_Value },
- { "Width", TK_Width },
- { "ZOrder", TK_ZOrder },
+ { "FillBitmapMode", TK_FillBitmapMode },
+ { "FillBitmapSizeX", TK_FillBitmapSizeX },
+ { "FillBitmapSizeY", TK_FillBitmapSizeY },
+ { "FillBitmapURL", TK_FillBitmapURL },
+ { "FillStyle", TK_FillStyle },
+ { "FilterData", TK_FilterData },
+ { "FilterName", TK_FilterName },
+ { "Flags", TK_Flags },
+ { "FontDescriptor", TK_FontDescriptor },
+ { "Graphic", TK_Graphic },
+ { "GraphicCrop", TK_GraphicCrop },
+ { "GraphicCropLogic", TK_GraphicCropLogic },
+ { "GraphicURL", TK_GraphicURL },
+ { "GraphicStreamURL", TK_GraphicStreamURL },
+ { "Height", TK_Height },
+ { "HelpFile", TK_HelpFile },
+ { "Hidden", TK_Hidden },
+ { "ID", TK_ID },
+ { "ImageURL", TK_ImageURL },
+ { "InformationDialog", TK_InformationDialog },
+ { "InputStream", TK_InputStream },
+ { "Interlaced", TK_Interlaced },
+ { "IsInternal", TK_IsInternal },
+ { "Label", TK_Label },
+ { "LineCount", TK_LineCount },
+ { "LogicalHeight", TK_LogicalHeight },
+ { "LogicalWidth", TK_LogicalWidth },
+ { "LogicalSize", TK_LogicalSize },
+ { "MimeType", TK_MimeType },
+ { "Moveable", TK_Moveable },
+ { "MultiLine", TK_MultiLine },
+ { "MultiSelection", TK_MultiSelection },
+ { "Name", TK_Name },
+ { "Orientation", TK_Orientation },
+ { "OutputStream", TK_OutputStream },
+ { "PixelHeight", TK_PixelHeight },
+ { "PixelWidth", TK_PixelWidth },
+ { "PositionX", TK_PositionX },
+ { "PositionY", TK_PositionY },
+ { "Progress", TK_Progress },
+ { "ProgressValue", TK_ProgressValue },
+ { "ProgressValueMax", TK_ProgressValueMax },
+ { "ProgressValueMin", TK_ProgressValueMin },
+ { "PushButtonType", TK_PushButtonType },
+ { "Quality", TK_Quality },
+ { "ReadOnly", TK_ReadOnly },
+ { "Repeat", TK_Repeat },
+ { "ScaleImage", TK_ScaleImage },
+ { "SelectedItems", TK_SelectedItems },
+ { "Settings", TK_Settings },
+ { "Size100thMM", TK_Size100thMM },
+ { "SizePixel", TK_SizePixel },
+ { "Spin", TK_Spin },
+ { "Step", TK_Step },
+ { "State", TK_State },
+ { "StatusDispatcher", TK_StatusDispatcher },
+ { "StringItemList", TK_StringItemList },
+ { "Strings", TK_Strings },
+ { "TabIndex", TK_TabIndex },
+ { "Template", TK_Template },
+ { "Text", TK_Text },
+ { "Title", TK_Title },
+ { "Transparent", TK_Transparent },
+ { "Type", TK_Type },
+ { "UIName", TK_UIName },
+ { "Value", TK_Value },
+ { "Width", TK_Width },
+ { "ZOrder", TK_ZOrder },
- { "LastUsedSettings", TK_LastUsedSettings },
- { "Settings/Templates", TK_Settings_Templates },
+ { "LastUsedSettings", TK_LastUsedSettings },
+ { "Settings/Templates", TK_Settings_Templates },
{ "Settings/Templates/",TK_Settings_Templates_ },
- { "JPEGCompression", TK_JPEGCompression },
- { "JPEGQuality", TK_JPEGQuality },
- { "RemoveCropArea", TK_RemoveCropArea },
- { "ImageResolution", TK_ImageResolution },
+ { "JPEGCompression", TK_JPEGCompression },
+ { "JPEGQuality", TK_JPEGQuality },
+ { "RemoveCropArea", TK_RemoveCropArea },
+ { "ImageResolution", TK_ImageResolution },
{ "EmbedLinkedGraphics",TK_EmbedLinkedGraphics },
- { "OLEOptimization", TK_OLEOptimization },
+ { "OLEOptimization", TK_OLEOptimization },
{ "OLEOptimizationType",TK_OLEOptimizationType },
{ "DeleteUnusedMasterPages", TK_DeleteUnusedMasterPages },
{ "DeleteHiddenSlides", TK_DeleteHiddenSlides },
- { "DeleteNotesPages", TK_DeleteNotesPages },
- { "CustomShowName", TK_CustomShowName },
- { "SaveAs", TK_SaveAs },
- { "SaveAsURL", TK_SaveAsURL },
- { "OpenNewDocument", TK_OpenNewDocument },
- { "EstimatedFileSize", TK_EstimatedFileSize },
+ { "DeleteNotesPages", TK_DeleteNotesPages },
+ { "CustomShowName", TK_CustomShowName },
+ { "SaveAs", TK_SaveAs },
+ { "SaveAsURL", TK_SaveAsURL },
+ { "OpenNewDocument", TK_OpenNewDocument },
+ { "EstimatedFileSize", TK_EstimatedFileSize },
- { "Status", TK_Status },
- { "Pages", TK_Pages },
- { "CurrentPage", TK_CurrentPage },
- { "GraphicObjects", TK_GraphicObjects },
+ { "Status", TK_Status },
+ { "Pages", TK_Pages },
+ { "CurrentPage", TK_CurrentPage },
+ { "GraphicObjects", TK_GraphicObjects },
{ "CurrentGraphicObject",TK_CurrentGraphicObject },
- { "OLEObjects", TK_OLEObjects },
- { "CurrentOLEObject", TK_CurrentOLEObject },
+ { "OLEObjects", TK_OLEObjects },
+ { "CurrentOLEObject", TK_CurrentOLEObject },
{ "STR_SUN_OPTIMIZATION_WIZARD2",STR_SUN_OPTIMIZATION_WIZARD2 },
- { "STR_STEPS", STR_STEPS },
- { "STR_HELP", STR_HELP },
- { "STR_BACK", STR_BACK },
- { "STR_NEXT", STR_NEXT },
- { "STR_FINISH", STR_FINISH },
- { "STR_CANCEL", STR_CANCEL },
- { "STR_INTRODUCTION", STR_INTRODUCTION },
- { "STR_INTRODUCTION_T", STR_INTRODUCTION_T },
- { "STR_CHOSE_SETTINGS", STR_CHOSE_SETTINGS },
- { "STR_REMOVE", STR_REMOVE },
- { "STR_GRAPHIC_OPTIMIZATION", STR_GRAPHIC_OPTIMIZATION },
- { "STR_IMAGE_OPTIMIZATION", STR_IMAGE_OPTIMIZATION },
- { "STR_LOSSLESS_COMPRESSION", STR_LOSSLESS_COMPRESSION },
- { "STR_JPEG_COMPRESSION", STR_JPEG_COMPRESSION },
- { "STR_QUALITY", STR_QUALITY },
- { "STR_REMOVE_CROP_AREA", STR_REMOVE_CROP_AREA },
- { "STR_IMAGE_RESOLUTION", STR_IMAGE_RESOLUTION },
- { "STR_IMAGE_RESOLUTION_0", STR_IMAGE_RESOLUTION_0 },
- { "STR_IMAGE_RESOLUTION_1", STR_IMAGE_RESOLUTION_1 },
- { "STR_IMAGE_RESOLUTION_2", STR_IMAGE_RESOLUTION_2 },
- { "STR_IMAGE_RESOLUTION_3", STR_IMAGE_RESOLUTION_3 },
- { "STR_EMBED_LINKED_GRAPHICS", STR_EMBED_LINKED_GRAPHICS },
- { "STR_OLE_OBJECTS", STR_OLE_OBJECTS },
- { "STR_OLE_OPTIMIZATION", STR_OLE_OPTIMIZATION },
- { "STR_OLE_REPLACE", STR_OLE_REPLACE },
- { "STR_ALL_OLE_OBJECTS", STR_ALL_OLE_OBJECTS },
- { "STR_ALIEN_OLE_OBJECTS_ONLY", STR_ALIEN_OLE_OBJECTS_ONLY },
- { "STR__OLE_OBJECTS_DESC", STR_OLE_OBJECTS_DESC },
- { "STR_NO_OLE_OBJECTS_DESC", STR_NO_OLE_OBJECTS_DESC },
- { "STR_SLIDES", STR_SLIDES },
- { "STR_CHOOSE_SLIDES", STR_CHOOSE_SLIDES },
- { "STR_MASTER_PAGES", STR_MASTER_PAGES },
- { "STR_DELETE_MASTER_PAGES", STR_DELETE_MASTER_PAGES },
- { "STR_DELETE_NOTES_PAGES", STR_DELETE_NOTES_PAGES },
- { "STR_DELETE_HIDDEN_SLIDES", STR_DELETE_HIDDEN_SLIDES },
- { "STR_CUSTOM_SHOW", STR_CUSTOM_SHOW },
- { "STR_SUMMARY", STR_SUMMARY },
- { "STR_SUMMARY_TITLE", STR_SUMMARY_TITLE },
- { "STR_PROGRESS", STR_PROGRESS },
- { "STR_OBJECTS_OPTIMIZED", STR_OBJECTS_OPTIMIZED },
- { "STR_APPLY_TO_CURRENT", STR_APPLY_TO_CURRENT },
- { "STR_AUTOMATICALLY_OPEN", STR_AUTOMATICALLY_OPEN },
- { "STR_SAVE_SETTINGS", STR_SAVE_SETTINGS },
- { "STR_SAVE_AS", STR_SAVE_AS },
- { "STR_DELETE_SLIDES", STR_DELETE_SLIDES },
- { "STR_OPTIMIZE_IMAGES", STR_OPTIMIZE_IMAGES },
- { "STR_CREATE_REPLACEMENT", STR_CREATE_REPLACEMENT },
- { "STR_CURRENT_FILESIZE", STR_CURRENT_FILESIZE },
- { "STR_ESTIMATED_FILESIZE", STR_ESTIMATED_FILESIZE },
- { "STR_MB", STR_MB },
- { "MY_SETTINGS", STR_MY_SETTINGS },
- { "STR_DEFAULT_SESSION", STR_DEFAULT_SESSION },
- { "STR_MODIFY_WARNING", STR_MODIFY_WARNING },
- { "STR_YES", STR_YES },
- { "STR_OK", STR_OK },
- { "STR_INFO_1", STR_INFO_1 },
- { "STR_INFO_2", STR_INFO_2 },
- { "STR_INFO_3", STR_INFO_3 },
- { "STR_INFO_4", STR_INFO_4 },
+ { "STR_STEPS", STR_STEPS },
+ { "STR_HELP", STR_HELP },
+ { "STR_BACK", STR_BACK },
+ { "STR_NEXT", STR_NEXT },
+ { "STR_FINISH", STR_FINISH },
+ { "STR_CANCEL", STR_CANCEL },
+ { "STR_INTRODUCTION", STR_INTRODUCTION },
+ { "STR_INTRODUCTION_T", STR_INTRODUCTION_T },
+ { "STR_CHOSE_SETTINGS", STR_CHOSE_SETTINGS },
+ { "STR_REMOVE", STR_REMOVE },
+ { "STR_GRAPHIC_OPTIMIZATION", STR_GRAPHIC_OPTIMIZATION },
+ { "STR_IMAGE_OPTIMIZATION", STR_IMAGE_OPTIMIZATION },
+ { "STR_LOSSLESS_COMPRESSION", STR_LOSSLESS_COMPRESSION },
+ { "STR_JPEG_COMPRESSION", STR_JPEG_COMPRESSION },
+ { "STR_QUALITY", STR_QUALITY },
+ { "STR_REMOVE_CROP_AREA", STR_REMOVE_CROP_AREA },
+ { "STR_IMAGE_RESOLUTION", STR_IMAGE_RESOLUTION },
+ { "STR_IMAGE_RESOLUTION_0", STR_IMAGE_RESOLUTION_0 },
+ { "STR_IMAGE_RESOLUTION_1", STR_IMAGE_RESOLUTION_1 },
+ { "STR_IMAGE_RESOLUTION_2", STR_IMAGE_RESOLUTION_2 },
+ { "STR_IMAGE_RESOLUTION_3", STR_IMAGE_RESOLUTION_3 },
+ { "STR_EMBED_LINKED_GRAPHICS", STR_EMBED_LINKED_GRAPHICS },
+ { "STR_OLE_OBJECTS", STR_OLE_OBJECTS },
+ { "STR_OLE_OPTIMIZATION", STR_OLE_OPTIMIZATION },
+ { "STR_OLE_REPLACE", STR_OLE_REPLACE },
+ { "STR_ALL_OLE_OBJECTS", STR_ALL_OLE_OBJECTS },
+ { "STR_ALIEN_OLE_OBJECTS_ONLY", STR_ALIEN_OLE_OBJECTS_ONLY },
+ { "STR__OLE_OBJECTS_DESC", STR_OLE_OBJECTS_DESC },
+ { "STR_NO_OLE_OBJECTS_DESC", STR_NO_OLE_OBJECTS_DESC },
+ { "STR_SLIDES", STR_SLIDES },
+ { "STR_CHOOSE_SLIDES", STR_CHOOSE_SLIDES },
+ { "STR_MASTER_PAGES", STR_MASTER_PAGES },
+ { "STR_DELETE_MASTER_PAGES", STR_DELETE_MASTER_PAGES },
+ { "STR_DELETE_NOTES_PAGES", STR_DELETE_NOTES_PAGES },
+ { "STR_DELETE_HIDDEN_SLIDES", STR_DELETE_HIDDEN_SLIDES },
+ { "STR_CUSTOM_SHOW", STR_CUSTOM_SHOW },
+ { "STR_SUMMARY", STR_SUMMARY },
+ { "STR_SUMMARY_TITLE", STR_SUMMARY_TITLE },
+ { "STR_PROGRESS", STR_PROGRESS },
+ { "STR_OBJECTS_OPTIMIZED", STR_OBJECTS_OPTIMIZED },
+ { "STR_APPLY_TO_CURRENT", STR_APPLY_TO_CURRENT },
+ { "STR_AUTOMATICALLY_OPEN", STR_AUTOMATICALLY_OPEN },
+ { "STR_SAVE_SETTINGS", STR_SAVE_SETTINGS },
+ { "STR_SAVE_AS", STR_SAVE_AS },
+ { "STR_DELETE_SLIDES", STR_DELETE_SLIDES },
+ { "STR_OPTIMIZE_IMAGES", STR_OPTIMIZE_IMAGES },
+ { "STR_CREATE_REPLACEMENT", STR_CREATE_REPLACEMENT },
+ { "STR_CURRENT_FILESIZE", STR_CURRENT_FILESIZE },
+ { "STR_ESTIMATED_FILESIZE", STR_ESTIMATED_FILESIZE },
+ { "STR_MB", STR_MB },
+ { "MY_SETTINGS", STR_MY_SETTINGS },
+ { "STR_DEFAULT_SESSION", STR_DEFAULT_SESSION },
+ { "STR_MODIFY_WARNING", STR_MODIFY_WARNING },
+ { "STR_YES", STR_YES },
+ { "STR_OK", STR_OK },
+ { "STR_INFO_1", STR_INFO_1 },
+ { "STR_INFO_2", STR_INFO_2 },
+ { "STR_INFO_3", STR_INFO_3 },
+ { "STR_INFO_4", STR_INFO_4 },
{ "STR_DUPLICATING_PRESENTATION",STR_DUPLICATING_PRESENTATION },
- { "STR_DELETING_SLIDES", STR_DELETING_SLIDES },
- { "STR_OPTIMIZING_GRAPHICS", STR_OPTIMIZING_GRAPHICS },
+ { "STR_DELETING_SLIDES", STR_DELETING_SLIDES },
+ { "STR_OPTIMIZING_GRAPHICS", STR_OPTIMIZING_GRAPHICS },
{ "STR_CREATING_OLE_REPLACEMENTS",STR_CREATING_OLE_REPLACEMENTS },
- { "STR_FileSizeSeparator", STR_FILESIZESEPARATOR },
-
- { "Last", TK_Last },
- { "NotFound", TK_NotFound }
+ { "STR_FileSizeSeparator", STR_FILESIZESEPARATOR },
+
+ { "Last", TK_Last },
+ { "NotFound", TK_NotFound }
};
PPPOptimizerTokenEnum TKGet( const rtl::OUString& rToken )
{
if ( !pHashMap )
- { // init hash map
+ { // init hash map
::osl::MutexGuard aGuard( getHashMapMutex() );
if ( !pHashMap )
{
diff --git a/sdext/source/minimizer/pppoptimizertoken.hxx b/sdext/source/minimizer/pppoptimizertoken.hxx
index 19ae973c7572..3a4cf2f93637 100644
--- a/sdext/source/minimizer/pppoptimizertoken.hxx
+++ b/sdext/source/minimizer/pppoptimizertoken.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -274,7 +274,7 @@ enum PPPOptimizerTokenEnum
STR_CREATING_OLE_REPLACEMENTS,
STR_FILESIZESEPARATOR,
- TK_Last,
+ TK_Last,
TK_NotFound
};
diff --git a/sdext/source/minimizer/pppoptimizeruno.cxx b/sdext/source/minimizer/pppoptimizeruno.cxx
index 1bb4d182bb2b..a905ccb037d9 100644
--- a/sdext/source/minimizer/pppoptimizeruno.cxx
+++ b/sdext/source/minimizer/pppoptimizeruno.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -51,7 +51,7 @@ extern "C"
}
// -------------------------------------------------------------------------
-
+
sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistryKey )
{
if (pRegistryKey)
@@ -68,7 +68,7 @@ extern "C"
for ( nPos = rSNL1.getLength(); nPos--; )
xNewKey->createKey( pArray1[nPos] );
- xNewKey = reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( PPPOptimizerDialog_getImplementationName() );
+ xNewKey = reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( PPPOptimizerDialog_getImplementationName() );
xNewKey = xNewKey->createKey( OUString::createFromAscii( "/UNO/SERVICES" ) );
const Sequence< OUString > & rSNL2 = PPPOptimizerDialog_getSupportedServiceNames();
const OUString * pArray2 = rSNL2.getConstArray();
@@ -99,7 +99,7 @@ extern "C"
{
xFactory = createSingleComponentFactory(
PPPOptimizer_createInstance,
- OUString::createFromAscii( pImplName ),
+ OUString::createFromAscii( pImplName ),
PPPOptimizer_getSupportedServiceNames() );
}
diff --git a/sdext/source/minimizer/registry/data/org/openoffice/Office/extension/SunPresentationMinimizer.xcu b/sdext/source/minimizer/registry/data/org/openoffice/Office/extension/SunPresentationMinimizer.xcu
index 08324953d32c..0cf414778f8a 100644
--- a/sdext/source/minimizer/registry/data/org/openoffice/Office/extension/SunPresentationMinimizer.xcu
+++ b/sdext/source/minimizer/registry/data/org/openoffice/Office/extension/SunPresentationMinimizer.xcu
@@ -53,7 +53,7 @@
</prop>
<prop oor:name="STR_LOSSLESS_COMPRESSION">
<value xml:lang="en-US">~Lossless compression</value>
- </prop>
+ </prop>
<prop oor:name="STR_JPEG_COMPRESSION">
<value xml:lang="en-US">~JPEG compression</value>
</prop>
@@ -80,7 +80,7 @@
</prop>
<prop oor:name="STR_EMBED_LINKED_GRAPHICS">
<value xml:lang="en-US">~Break links to external graphics</value>
- </prop>
+ </prop>
<prop oor:name="STR_OLE_OBJECTS">
<value xml:lang="en-US">OLE Objects</value>
</prop>
@@ -105,7 +105,7 @@ The current presentation contains OLE objects.</value>
<value xml:lang="en-US">Object Linking and Embedding (OLE) is a technology that allows embedding and linking to documents and other objects.
The current presentation contains no OLE objects.</value>
- </prop>
+ </prop>
<prop oor:name="STR_SLIDES">
<value xml:lang="en-US">Slides</value>
</prop>
@@ -180,13 +180,13 @@ The current presentation contains no OLE objects.</value>
</prop>
<prop oor:name="STR_YES">
<value xml:lang="en-US">~Yes</value>
- </prop>
+ </prop>
<prop oor:name="STR_OK">
<value xml:lang="en-US">OK</value>
- </prop>
+ </prop>
<prop oor:name="STR_INFO_1">
<value xml:lang="en-US">The @MINIMIZEREXTENSIONPRODUCTNAME@ has successfully updated the presentation '%TITLE'. The file size has changed from %OLDFILESIZE MB to %NEWFILESIZE MB.</value>
- </prop>
+ </prop>
<prop oor:name="STR_INFO_2">
<value xml:lang="en-US">The @MINIMIZEREXTENSIONPRODUCTNAME@ has successfully updated the presentation '%TITLE'. The file size has changed from %OLDFILESIZE MB to approximated %NEWFILESIZE MB.</value>
</prop>
@@ -230,7 +230,7 @@ The current presentation contains no OLE objects.</value>
</prop>
<prop oor:name="EmbedLinkedGraphics">
<value>true</value>
- </prop>
+ </prop>
<prop oor:name="OLEOptimization">
<value>true</value>
</prop>
@@ -251,11 +251,11 @@ The current presentation contains no OLE objects.</value>
</prop>
<prop oor:name="OpenNewDocument">
<value>true</value>
- </prop>
+ </prop>
</node>
<node oor:name="Settings">
<node oor:name="Templates">
- <node oor:name="template1" oor:op="replace">
+ <node oor:name="template1" oor:op="replace">
<prop oor:name="Name">
<value xml:lang="en-US">Screen optimized (smallest file size)</value>
</prop>
@@ -294,7 +294,7 @@ The current presentation contains no OLE objects.</value>
</prop>
<prop oor:name="OpenNewDocument">
<value>true</value>
- </prop>
+ </prop>
</node>
<node oor:name="template2" oor:op="replace">
<prop oor:name="Name">
@@ -314,7 +314,7 @@ The current presentation contains no OLE objects.</value>
</prop>
<prop oor:name="EmbedLinkedGraphics">
<value>true</value>
- </prop>
+ </prop>
<prop oor:name="OLEOptimization">
<value>true</value>
</prop>
@@ -335,7 +335,7 @@ The current presentation contains no OLE objects.</value>
</prop>
<prop oor:name="OpenNewDocument">
<value>true</value>
- </prop>
+ </prop>
</node>
<node oor:name="template3" oor:op="replace">
<prop oor:name="Name">
@@ -355,7 +355,7 @@ The current presentation contains no OLE objects.</value>
</prop>
<prop oor:name="EmbedLinkedGraphics">
<value>true</value>
- </prop>
+ </prop>
<prop oor:name="OLEOptimization">
<value>true</value>
</prop>
@@ -376,8 +376,8 @@ The current presentation contains no OLE objects.</value>
</prop>
<prop oor:name="OpenNewDocument">
<value>true</value>
- </prop>
- </node>
+ </prop>
+ </node>
</node>
</node>
</oor:component-data>
diff --git a/sdext/source/minimizer/unodialog.cxx b/sdext/source/minimizer/unodialog.cxx
index e5f6fdceeed3..554a3537710c 100644
--- a/sdext/source/minimizer/unodialog.cxx
+++ b/sdext/source/minimizer/unodialog.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -77,7 +77,7 @@ UnoDialog::UnoDialog( const Reference< XComponentContext > &rxMSF, Reference< XF
Reference< XFrame > xFrame( mxController->getFrame() );
Reference< XWindow > xContainerWindow( xFrame->getContainerWindow() );
mxWindowPeer = Reference< XWindowPeer >( xContainerWindow, UNO_QUERY_THROW );
- createWindowPeer( mxWindowPeer );
+ createWindowPeer( mxWindowPeer );
}
// -----------------------------------------------------------------------------
@@ -113,7 +113,7 @@ Reference< XWindowPeer > UnoDialog::createWindowPeer( Reference< XWindowPeer > x
xParentPeer = xToolkit->getDesktopWindow();
mxReschedule = Reference< XReschedule >( xToolkit, UNO_QUERY );
mxControl->createPeer( xToolkit, xParentPeer );
-// xWindowPeer = xControl.getPeer();
+// xWindowPeer = xControl.getPeer();
return mxControl->getPeer();
}
diff --git a/sdext/source/minimizer/unodialog.hxx b/sdext/source/minimizer/unodialog.hxx
index 78e3fd0f409c..39c366474301 100644
--- a/sdext/source/minimizer/unodialog.hxx
+++ b/sdext/source/minimizer/unodialog.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -119,28 +119,28 @@ public :
void enableControl( const rtl::OUString& rControlName );
void disableControl( const rtl::OUString& rControlName );
- com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > mxMSF;
- com::sun::star::uno::Reference< com::sun::star::frame::XController > mxController;
- com::sun::star::uno::Reference< com::sun::star::awt::XReschedule > mxReschedule;
+ com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > mxMSF;
+ com::sun::star::uno::Reference< com::sun::star::frame::XController > mxController;
+ com::sun::star::uno::Reference< com::sun::star::awt::XReschedule > mxReschedule;
- com::sun::star::uno::Reference< com::sun::star::uno::XInterface > mxDialogModel;
- com::sun::star::uno::Reference< com::sun::star::beans::XMultiPropertySet > mxDialogModelMultiPropertySet;
- com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > mxDialogModelPropertySet;
- com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > mxDialogModelMSF;
- com::sun::star::uno::Reference< com::sun::star::container::XNameContainer > mxDialogModelNameContainer;
- com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > mxDialogModelNameAccess;
+ com::sun::star::uno::Reference< com::sun::star::uno::XInterface > mxDialogModel;
+ com::sun::star::uno::Reference< com::sun::star::beans::XMultiPropertySet > mxDialogModelMultiPropertySet;
+ com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > mxDialogModelPropertySet;
+ com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > mxDialogModelMSF;
+ com::sun::star::uno::Reference< com::sun::star::container::XNameContainer > mxDialogModelNameContainer;
+ com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > mxDialogModelNameAccess;
- com::sun::star::uno::Reference< com::sun::star::awt::XControlModel > mxControlModel;
+ com::sun::star::uno::Reference< com::sun::star::awt::XControlModel > mxControlModel;
- com::sun::star::uno::Reference< com::sun::star::awt::XDialog > mxDialog;
- com::sun::star::uno::Reference< com::sun::star::awt::XControl > mxControl;
- com::sun::star::uno::Reference< com::sun::star::awt::XWindowPeer > mxWindowPeer;
+ com::sun::star::uno::Reference< com::sun::star::awt::XDialog > mxDialog;
+ com::sun::star::uno::Reference< com::sun::star::awt::XControl > mxControl;
+ com::sun::star::uno::Reference< com::sun::star::awt::XWindowPeer > mxWindowPeer;
- com::sun::star::uno::Reference< com::sun::star::awt::XControlContainer > mxDialogControlContainer;
- com::sun::star::uno::Reference< com::sun::star::lang::XComponent > mxDialogComponent;
- com::sun::star::uno::Reference< com::sun::star::awt::XWindow > mxDialogWindow;
+ com::sun::star::uno::Reference< com::sun::star::awt::XControlContainer > mxDialogControlContainer;
+ com::sun::star::uno::Reference< com::sun::star::lang::XComponent > mxDialogComponent;
+ com::sun::star::uno::Reference< com::sun::star::awt::XWindow > mxDialogWindow;
- sal_Bool mbStatus;
+ sal_Bool mbStatus;
};
#endif // UNODIALOG_HXX
diff --git a/sdext/source/pdfimport/config/description.xml b/sdext/source/pdfimport/config/description.xml
index 0b4031a5a63f..b7340a1f27b5 100755
--- a/sdext/source/pdfimport/config/description.xml
+++ b/sdext/source/pdfimport/config/description.xml
@@ -21,7 +21,7 @@
<display-name>
<name lang="en-US">PDF Import</name>
</display-name>
-
+
<icon>
<default xlink:href="images/extension_32.png" />
<high-contrast xlink:href="images/extension_32_h.png" />
diff --git a/sdext/source/pdfimport/config/pdf_import_filter.xcu b/sdext/source/pdfimport/config/pdf_import_filter.xcu
index 89ad84b7a6cf..f10a0022fa82 100644
--- a/sdext/source/pdfimport/config/pdf_import_filter.xcu
+++ b/sdext/source/pdfimport/config/pdf_import_filter.xcu
@@ -9,7 +9,7 @@
<value>0</value>
</prop>
<prop oor:name="FilterService" oor:type="xs:string">
- <!-- stacks filters for XML import. see UserData below.
+ <!-- stacks filters for XML import. see UserData below.
the _Writer_ in the impl name is a misnomer -->
<value>com.sun.star.comp.Writer.XmlFilterAdaptor</value>
</prop>
@@ -38,7 +38,7 @@
<value>0</value>
</prop>
<prop oor:name="FilterService" oor:type="xs:string">
- <!-- stacks filters for XML import. see UserData below.
+ <!-- stacks filters for XML import. see UserData below.
the _Writer_ in the impl name is a misnomer -->
<value>com.sun.star.comp.Writer.XmlFilterAdaptor</value>
</prop>
@@ -67,7 +67,7 @@
<value>0</value>
</prop>
<prop oor:name="FilterService" oor:type="xs:string">
- <!-- stacks filters for XML import. see UserData below.
+ <!-- stacks filters for XML import. see UserData below.
the _Writer_ in the impl name is a misnomer -->
<value>com.sun.star.comp.Writer.XmlFilterAdaptor</value>
</prop>
diff --git a/sdext/source/pdfimport/filterdet.cxx b/sdext/source/pdfimport/filterdet.cxx
index bfd237d85570..265ccbcad0e1 100644
--- a/sdext/source/pdfimport/filterdet.cxx
+++ b/sdext/source/pdfimport/filterdet.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -104,7 +104,7 @@ namespace {
{}
void initControls( const uno::Reference<awt::XControlContainer>& xControls,
- const rtl::OUString& rFilename )
+ const rtl::OUString& rFilename )
{
m_xListbox.set(xControls->getControl(
rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ListBox" ))),
@@ -710,7 +710,7 @@ uno::Reference< io::XStream > getAdditionalStream( const rtl::OUString&
xEmbed.clear();
break;
}
-
+
rtl::OUString aDocName( rInPDFFileURL.copy( rInPDFFileURL.lastIndexOf( sal_Unicode('/') )+1 ) );
bool bEntered = false;
diff --git a/sdext/source/pdfimport/filterdet.hxx b/sdext/source/pdfimport/filterdet.hxx
index 3532b0180333..2ca62d139ed2 100644
--- a/sdext/source/pdfimport/filterdet.hxx
+++ b/sdext/source/pdfimport/filterdet.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -42,22 +42,22 @@
namespace pdfi
{
-typedef ::cppu::WeakComponentImplHelper1<
+typedef ::cppu::WeakComponentImplHelper1<
com::sun::star::document::XExtendedFilterDetection > PDFDetectorBase;
class PDFDetector : private cppu::BaseMutex,
public PDFDetectorBase
{
private:
- com::sun::star::uno::Reference<
+ com::sun::star::uno::Reference<
com::sun::star::uno::XComponentContext > m_xContext;
public:
- explicit PDFDetector( const ::com::sun::star::uno::Reference<
- ::com::sun::star::uno::XComponentContext >& xContext );
+ explicit PDFDetector( const ::com::sun::star::uno::Reference<
+ ::com::sun::star::uno::XComponentContext >& xContext );
// XExtendedFilterDetection
- virtual rtl::OUString SAL_CALL detect( com::sun::star::uno::Sequence<
+ virtual rtl::OUString SAL_CALL detect( com::sun::star::uno::Sequence<
com::sun::star::beans::PropertyValue >& io_rDescriptor )
throw (com::sun::star::uno::RuntimeException);
};
diff --git a/sdext/source/pdfimport/inc/contentsink.hxx b/sdext/source/pdfimport/inc/contentsink.hxx
index 204eb7499a50..5919028e1858 100644
--- a/sdext/source/pdfimport/inc/contentsink.hxx
+++ b/sdext/source/pdfimport/inc/contentsink.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -35,7 +35,7 @@
#include <boost/shared_ptr.hpp>
namespace rtl { class OUString; }
-namespace com { namespace sun { namespace star {
+namespace com { namespace sun { namespace star {
namespace rendering
{
class XPolyPolygon2D;
@@ -47,7 +47,7 @@ namespace geometry
struct RealRectangle2D;
struct RealPoint2D;
struct RealSize2D;
-}
+}
namespace beans
{
struct PropertyValue;
@@ -86,7 +86,7 @@ namespace pdfi
bool isUnderline;
bool isOutline;
double size; // device pixel
-
+
bool operator==(const FontAttributes& rFont) const
{
return familyName == rFont.familyName &&
@@ -106,18 +106,18 @@ namespace pdfi
struct ContentSink
{
virtual ~ContentSink() {}
-
+
/// Total number of pages for upcoming document
virtual void setPageNum( sal_Int32 nNumPages ) = 0;
virtual void startPage( const ::com::sun::star::geometry::RealSize2D& rSize ) = 0;
virtual void endPage() = 0;
-
+
virtual void hyperLink( const ::com::sun::star::geometry::RealRectangle2D& rBounds,
const ::rtl::OUString& rURI ) = 0;
-
+
virtual void pushState() = 0;
virtual void popState() = 0;
-
+
virtual void setFlatness( double ) = 0;
virtual void setTransformation( const ::com::sun::star::geometry::AffineMatrix2D& rMatrix ) = 0;
virtual void setLineDash( const ::com::sun::star::uno::Sequence<double>& dashes,
@@ -131,27 +131,27 @@ namespace pdfi
virtual void setBlendMode( sal_Int8 blendMode ) = 0;
virtual void setFont( const FontAttributes& rFont ) = 0;
virtual void setTextRenderMode( sal_Int32 ) = 0;
+
-
- virtual void strokePath( const ::com::sun::star::uno::Reference<
+ virtual void strokePath( const ::com::sun::star::uno::Reference<
::com::sun::star::rendering::XPolyPolygon2D >& rPath ) = 0;
- virtual void fillPath( const ::com::sun::star::uno::Reference<
+ virtual void fillPath( const ::com::sun::star::uno::Reference<
::com::sun::star::rendering::XPolyPolygon2D >& rPath ) = 0;
- virtual void eoFillPath( const ::com::sun::star::uno::Reference<
+ virtual void eoFillPath( const ::com::sun::star::uno::Reference<
::com::sun::star::rendering::XPolyPolygon2D >& rPath ) = 0;
-
- virtual void intersectClip(const ::com::sun::star::uno::Reference<
+
+ virtual void intersectClip(const ::com::sun::star::uno::Reference<
::com::sun::star::rendering::XPolyPolygon2D >& rPath) = 0;
- virtual void intersectEoClip(const ::com::sun::star::uno::Reference<
+ virtual void intersectEoClip(const ::com::sun::star::uno::Reference<
::com::sun::star::rendering::XPolyPolygon2D >& rPath) = 0;
-
+
virtual void drawGlyphs( const rtl::OUString& rGlyphs,
const ::com::sun::star::geometry::RealRectangle2D& rRect,
const ::com::sun::star::geometry::Matrix2D& rFontMatrix ) = 0;
/// issued when a sequence of associated glyphs is drawn
virtual void endText() = 0;
-
+
/// draws given bitmap as a mask (using current fill color)
virtual void drawMask(const ::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyValue>& xBitmap,
@@ -159,13 +159,13 @@ namespace pdfi
/// Given image must already be color-mapped and normalized to sRGB.
virtual void drawImage(const ::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyValue>& xBitmap ) = 0;
- /** Given image must already be color-mapped and normalized to sRGB.
+ /** Given image must already be color-mapped and normalized to sRGB.
maskColors must contain two sequences of color components
*/
virtual void drawColorMaskedImage(const ::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyValue>& xBitmap,
- const ::com::sun::star::uno::Sequence<
+ const ::com::sun::star::uno::Sequence<
::com::sun::star::uno::Any>& xMaskColors ) = 0;
virtual void drawMaskedImage(const ::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyValue>& xBitmap,
diff --git a/sdext/source/pdfimport/inc/odfemitter.hxx b/sdext/source/pdfimport/inc/odfemitter.hxx
index d7e1c27097b7..f8c958e31c5e 100644
--- a/sdext/source/pdfimport/inc/odfemitter.hxx
+++ b/sdext/source/pdfimport/inc/odfemitter.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -32,14 +32,14 @@
#include "xmlemitter.hxx"
#include <com/sun/star/uno/Reference.hxx>
-namespace com { namespace sun { namespace star { namespace io
+namespace com { namespace sun { namespace star { namespace io
{
class XOutputStream;
} } } }
namespace pdfi
{
- XmlEmitterSharedPtr createOdfEmitter( const com::sun::star::uno::Reference<
+ XmlEmitterSharedPtr createOdfEmitter( const com::sun::star::uno::Reference<
com::sun::star::io::XOutputStream>& xOut );
}
diff --git a/sdext/source/pdfimport/inc/pdfihelper.hxx b/sdext/source/pdfimport/inc/pdfihelper.hxx
index 50e982557d01..ce0ddf50c7ad 100644
--- a/sdext/source/pdfimport/inc/pdfihelper.hxx
+++ b/sdext/source/pdfimport/inc/pdfihelper.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -49,8 +49,8 @@ namespace com { namespace sun { namespace star { namespace task
namespace pdfi
{
- typedef std::hash_map< rtl::OUString, rtl::OUString, rtl::OUStringHash > PropertyMap;
- typedef sal_Int32 ImageId;
+ typedef std::hash_map< rtl::OUString, rtl::OUString, rtl::OUStringHash > PropertyMap;
+ typedef sal_Int32 ImageId;
/// What to do with a polygon. values can be ORed together
enum PolygonAction { PATH_STROKE=1, PATH_FILL=2, PATH_EOFILL=4 };
@@ -64,14 +64,14 @@ namespace pdfi
fPix *= px2mm;
return fPix;
}
-
+
inline double convmm2Px( double fMM )
{
const double mm2px = PDFI_OUTDEV_RESOLUTION/25.4;
fMM *= mm2px;
return fMM;
}
-
+
inline double convPx2mmPrec2( double fPix )
{
return rtl_math_round( convPx2mm( fPix ), 2, rtl_math_RoundingMode_Floor );
@@ -148,12 +148,12 @@ namespace pdfi
Transformation == rRight.Transformation &&
Clip == rRight.Clip;
}
-
+
bool isRotatedOrSkewed() const
{ return Transformation.get( 0, 1 ) != 0.0 ||
Transformation.get( 1, 0 ) != 0.0; }
};
-
+
struct GraphicsContextHash
{
size_t operator()(const GraphicsContext& rGC ) const
@@ -188,7 +188,7 @@ namespace pdfi
/** retrieve password from user
*/
- bool getPassword( const ::com::sun::star::uno::Reference<
+ bool getPassword( const ::com::sun::star::uno::Reference<
::com::sun::star::task::XInteractionHandler >& xHandler,
rtl::OUString& rOutPwd,
bool bFirstTry,
diff --git a/sdext/source/pdfimport/inc/pdfparse.hxx b/sdext/source/pdfimport/inc/pdfparse.hxx
index 6dae97c309b7..76db849b6b30 100644
--- a/sdext/source/pdfimport/inc/pdfparse.hxx
+++ b/sdext/source/pdfimport/inc/pdfparse.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -48,15 +48,15 @@ class EmitContext
virtual unsigned int getCurPos() = 0;
virtual bool copyOrigBytes( unsigned int nOrigOffset, unsigned int nLen ) = 0;
virtual unsigned int readOrigBytes( unsigned int nOrigOffset, unsigned int nLen, void* pBuf ) = 0;
-
+
EmitContext( const PDFContainer* pTop = NULL );
virtual ~EmitContext();
-
+
// set this to deflate contained streams
bool m_bDeflate;
// set this to decrypt the PDF file
bool m_bDecrypt;
-
+
private:
friend struct PDFEntry;
EmitImplData* m_pImplData;
@@ -66,10 +66,10 @@ struct PDFEntry
{
PDFEntry() {}
virtual ~PDFEntry();
-
+
virtual bool emit( EmitContext& rWriteContext ) const = 0;
virtual PDFEntry* clone() const = 0;
-
+
protected:
EmitImplData* getEmitData( EmitContext& rContext ) const;
void setEmitData( EmitContext& rContext, EmitImplData* pNewEmitData ) const;
@@ -102,7 +102,7 @@ struct PDFName : public PDFValue
virtual ~PDFName();
virtual bool emit( EmitContext& rWriteContext ) const;
virtual PDFEntry* clone() const;
-
+
rtl::OUString getFilteredName() const;
};
@@ -115,7 +115,7 @@ struct PDFString : public PDFValue
virtual ~PDFString();
virtual bool emit( EmitContext& rWriteContext ) const;
virtual PDFEntry* clone() const;
-
+
rtl::OString getFilteredString() const;
};
@@ -145,7 +145,7 @@ struct PDFObjectRef : public PDFValue
{
unsigned int m_nNumber;
unsigned int m_nGeneration;
-
+
PDFObjectRef( unsigned int nNr, unsigned int nGen )
: PDFValue(), m_nNumber( nNr ), m_nGeneration( nGen ) {}
virtual ~PDFObjectRef();
@@ -173,7 +173,7 @@ struct PDFContainer : public PDFEntry
virtual ~PDFContainer();
virtual bool emitSubElements( EmitContext& rWriteContext ) const;
virtual void cloneSubElements( std::vector<PDFEntry*>& rNewSubElements ) const;
-
+
PDFObject* findObject( unsigned int nNumber, unsigned int nGeneration ) const;
PDFObject* findObject( PDFObjectRef* pRef ) const
{ return findObject( pRef->m_nNumber, pRef->m_nGeneration ); }
@@ -191,12 +191,12 @@ struct PDFDict : public PDFContainer
{
typedef std::hash_map<rtl::OString,PDFEntry*,rtl::OStringHash> Map;
Map m_aMap;
-
+
PDFDict() {}
virtual ~PDFDict();
virtual bool emit( EmitContext& rWriteContext ) const;
virtual PDFEntry* clone() const;
-
+
// inserting a value of NULL will remove rName and the previous value
// from the dictionary
void insertValue( const rtl::OString& rName, PDFEntry* pValue );
@@ -212,20 +212,20 @@ struct PDFStream : public PDFEntry
unsigned int m_nBeginOffset;
unsigned int m_nEndOffset; // offset of the byte after the stream
PDFDict* m_pDict;
-
+
PDFStream( unsigned int nBegin, unsigned int nEnd, PDFDict* pStreamDict )
: PDFEntry(), m_nBeginOffset( nBegin ), m_nEndOffset( nEnd ), m_pDict( pStreamDict ) {}
virtual ~PDFStream();
virtual bool emit( EmitContext& rWriteContext ) const;
virtual PDFEntry* clone() const;
-
+
unsigned int getDictLength( const PDFContainer* pObjectContainer = NULL ) const; // get contents of the "Length" entry of the dict
};
struct PDFTrailer : public PDFContainer
{
PDFDict* m_pDict;
-
+
PDFTrailer() : PDFContainer(), m_pDict( NULL ) {}
virtual ~PDFTrailer();
virtual bool emit( EmitContext& rWriteContext ) const;
@@ -241,23 +241,23 @@ struct PDFFile : public PDFContainer
public:
unsigned int m_nMajor; // PDF major
unsigned int m_nMinor; // PDF minor
-
+
PDFFile()
: PDFContainer(),
m_pData( NULL ),
m_nMajor( 0 ), m_nMinor( 0 )
{}
virtual ~PDFFile();
-
+
virtual bool emit( EmitContext& rWriteContext ) const;
virtual PDFEntry* clone() const;
-
+
bool isEncrypted() const;
// this method checks whether rPwd is compatible with
// either user or owner password and sets up decrypt data in that case
// returns true if decryption can be done
bool setupDecryptionData( const rtl::OString& rPwd ) const;
-
+
bool decrypt( const sal_uInt8* pInBuffer, sal_uInt32 nLen,
sal_uInt8* pOutBuffer,
unsigned int nObject, unsigned int nGeneration ) const;
@@ -269,16 +269,16 @@ struct PDFObject : public PDFContainer
PDFStream* m_pStream;
unsigned int m_nNumber;
unsigned int m_nGeneration;
-
+
PDFObject( unsigned int nNr, unsigned int nGen )
: m_pObject( NULL ), m_pStream( NULL ), m_nNumber( nNr ), m_nGeneration( nGen ) {}
virtual ~PDFObject();
virtual bool emit( EmitContext& rWriteContext ) const;
virtual PDFEntry* clone() const;
-
+
// writes only the contained stream, deflated if necessary
bool writeStream( EmitContext& rContext, const PDFFile* pPDFFile ) const;
-
+
private:
// returns true if stream is deflated
// fills *ppStream and *pBytes with start of stream and count of bytes
@@ -300,7 +300,7 @@ class PDFReader
public:
PDFReader() {}
~PDFReader() {}
-
+
PDFEntry* read( const char* pFileName );
PDFEntry* read( const char* pBuffer, unsigned int nLen );
};
diff --git a/sdext/source/pdfimport/inc/saxemitter.hxx b/sdext/source/pdfimport/inc/saxemitter.hxx
index c8a394ab746e..c2871f8124cc 100644
--- a/sdext/source/pdfimport/inc/saxemitter.hxx
+++ b/sdext/source/pdfimport/inc/saxemitter.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -40,7 +40,7 @@ namespace sax
namespace pdfi
{
- XmlEmitterSharedPtr createSaxEmitter( const com::sun::star::uno::Reference<
+ XmlEmitterSharedPtr createSaxEmitter( const com::sun::star::uno::Reference<
com::sun::star::xml::sax::XDocumentHandler >& xDocHdl );
}
diff --git a/sdext/source/pdfimport/inc/treevisitorfactory.hxx b/sdext/source/pdfimport/inc/treevisitorfactory.hxx
index 064b23864043..fd9ad74fc5f4 100644
--- a/sdext/source/pdfimport/inc/treevisitorfactory.hxx
+++ b/sdext/source/pdfimport/inc/treevisitorfactory.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
diff --git a/sdext/source/pdfimport/inc/wrapper.hxx b/sdext/source/pdfimport/inc/wrapper.hxx
index a7ca18574a39..119510c6c22a 100644
--- a/sdext/source/pdfimport/inc/wrapper.hxx
+++ b/sdext/source/pdfimport/inc/wrapper.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -33,7 +33,7 @@
#include <com/sun/star/uno/Reference.hxx>
namespace rtl { class OUString; }
-namespace com { namespace sun { namespace star {
+namespace com { namespace sun { namespace star {
namespace uno {
class XComponentContext;
}
@@ -49,15 +49,15 @@ namespace pdfi
const com::sun::star::uno::Reference<
com::sun::star::task::XInteractionHandler >& xIHdl,
const rtl::OUString& rPwd,
- const com::sun::star::uno::Reference<
+ const com::sun::star::uno::Reference<
com::sun::star::uno::XComponentContext >& xContext );
- bool xpdf_ImportFromStream( const com::sun::star::uno::Reference<
+ bool xpdf_ImportFromStream( const com::sun::star::uno::Reference<
com::sun::star::io::XInputStream >& xInput,
const ContentSinkSharedPtr& rSink,
const com::sun::star::uno::Reference<
com::sun::star::task::XInteractionHandler >& xIHdl,
const rtl::OUString& rPwd,
- const com::sun::star::uno::Reference<
+ const com::sun::star::uno::Reference<
com::sun::star::uno::XComponentContext >& xContext );
}
diff --git a/sdext/source/pdfimport/inc/xmlemitter.hxx b/sdext/source/pdfimport/inc/xmlemitter.hxx
index 3700e67b8006..66a43d609656 100644
--- a/sdext/source/pdfimport/inc/xmlemitter.hxx
+++ b/sdext/source/pdfimport/inc/xmlemitter.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -42,7 +42,7 @@ namespace pdfi
{
public:
virtual ~XmlEmitter() {}
-
+
/** Open up a tag with the given properties
*/
virtual void beginTag( const char* pTag, const PropertyMap& rProperties ) = 0;
diff --git a/sdext/source/pdfimport/misc/pdfihelper.cxx b/sdext/source/pdfimport/misc/pdfihelper.cxx
index 1c888e1e6d1f..8209346b478a 100644
--- a/sdext/source/pdfimport/misc/pdfihelper.cxx
+++ b/sdext/source/pdfimport/misc/pdfihelper.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -65,7 +65,7 @@ rtl::OUString pdfi::unitMMString( double fMM )
rtl::OUStringBuffer aBuf( 32 );
aBuf.append( rtl_math_round( fMM, 2, rtl_math_RoundingMode_Floor ) );
aBuf.appendAscii( "mm" );
-
+
return aBuf.makeStringAndClear();
}
@@ -74,7 +74,7 @@ rtl::OUString pdfi::convertPixelToUnitString( double fPix )
rtl::OUStringBuffer aBuf( 32 );
aBuf.append( rtl_math_round( convPx2mm( fPix ), 2, rtl_math_RoundingMode_Floor ) );
aBuf.appendAscii( "mm" );
-
+
return aBuf.makeStringAndClear();
}
diff --git a/sdext/source/pdfimport/misc/pwdinteract.cxx b/sdext/source/pdfimport/misc/pwdinteract.cxx
index 6ef2a17c2875..3280beafe3d7 100644
--- a/sdext/source/pdfimport/misc/pwdinteract.cxx
+++ b/sdext/source/pdfimport/misc/pwdinteract.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
diff --git a/sdext/source/pdfimport/odf/odfemitter.cxx b/sdext/source/pdfimport/odf/odfemitter.cxx
index c2d30ac16304..665d351e6dd7 100644
--- a/sdext/source/pdfimport/odf/odfemitter.cxx
+++ b/sdext/source/pdfimport/odf/odfemitter.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
diff --git a/sdext/source/pdfimport/pdfiadaptor.cxx b/sdext/source/pdfimport/pdfiadaptor.cxx
index 3b800f242396..f40e35480c5a 100644
--- a/sdext/source/pdfimport/pdfiadaptor.cxx
+++ b/sdext/source/pdfimport/pdfiadaptor.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -168,7 +168,7 @@ sal_Bool SAL_CALL PDFIHybridAdaptor::filter( const uno::Sequence< beans::Propert
catch(uno::Exception& e)
{
(void)e;
- OSL_TRACE( "subfilter exception: %s\n",
+ OSL_TRACE( "subfilter exception: %s\n",
OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr() );
}
@@ -182,7 +182,7 @@ sal_Bool SAL_CALL PDFIHybridAdaptor::filter( const uno::Sequence< beans::Propert
{
nPwPos = aFilterData.getLength();
aFilterData.realloc( nPwPos+1 );
- aFilterData[nPwPos].Name = rtl::OUString(
+ aFilterData[nPwPos].Name = rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "Password" ) );
}
aFilterData[nPwPos].Value <<= aPwd;
@@ -201,7 +201,7 @@ sal_Bool SAL_CALL PDFIHybridAdaptor::filter( const uno::Sequence< beans::Propert
else
OSL_TRACE( "PDFIAdaptor::filter: no model set\n" );
#endif
-
+
return bRet;
}
@@ -238,12 +238,12 @@ bool PDFIRawAdaptor::parse( const uno::Reference<io::XInputStream>& xInput
const uno::Reference<task::XInteractionHandler>& xIHdl,
const rtl::OUString& rPwd,
const uno::Reference<task::XStatusIndicator>& xStatus,
- const XmlEmitterSharedPtr& rEmitter,
+ const XmlEmitterSharedPtr& rEmitter,
const rtl::OUString& rURL )
{
// container for metaformat
boost::shared_ptr<PDFIProcessor> pSink(
- new PDFIProcessor(xStatus, m_xContext));
+ new PDFIProcessor(xStatus, m_xContext));
// TEMP! TEMP!
if( m_bEnableToplevelText )
@@ -274,7 +274,7 @@ bool PDFIRawAdaptor::odfConvert( const rtl::OUString& r
// tell input stream that it is no longer needed
xOutput->closeOutput();
-
+
return bSuccess;
}
@@ -313,8 +313,8 @@ sal_Bool SAL_CALL PDFIRawAdaptor::importer( const uno::Sequence< beans::Property
// tell input stream that it is no longer needed
xInput->closeInput();
- xInput.clear();
-
+ xInput.clear();
+
return bSuccess;
}
diff --git a/sdext/source/pdfimport/pdfiadaptor.hxx b/sdext/source/pdfimport/pdfiadaptor.hxx
index d9d6d71356f7..2b0b0b915be1 100644
--- a/sdext/source/pdfimport/pdfiadaptor.hxx
+++ b/sdext/source/pdfimport/pdfiadaptor.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -48,7 +48,7 @@
namespace pdfi
{
- typedef ::cppu::WeakComponentImplHelper2<
+ typedef ::cppu::WeakComponentImplHelper2<
com::sun::star::document::XFilter,
com::sun::star::document::XImporter > PDFIHybridAdaptorBase;
@@ -56,13 +56,13 @@ namespace pdfi
public PDFIHybridAdaptorBase
{
private:
- com::sun::star::uno::Reference<
+ com::sun::star::uno::Reference<
com::sun::star::uno::XComponentContext > m_xContext;
- com::sun::star::uno::Reference<
+ com::sun::star::uno::Reference<
com::sun::star::frame::XModel > m_xModel;
public:
- explicit PDFIHybridAdaptor( const ::com::sun::star::uno::Reference<
+ explicit PDFIHybridAdaptor( const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext >& xContext );
// XFilter
@@ -75,7 +75,7 @@ namespace pdfi
};
- typedef ::cppu::WeakComponentImplHelper2<
+ typedef ::cppu::WeakComponentImplHelper2<
com::sun::star::xml::XImportFilter,
com::sun::star::document::XImporter > PDFIAdaptorBase;
@@ -85,9 +85,9 @@ namespace pdfi
public PDFIAdaptorBase